Merge pull request #77 from Project-Funk-Engine/Note_Feedback

Note feedback

Author: LifeHckr

README.md

@@ -15,6 +15,4 @@ Current team members include:
 
 #### Attributions:
 First Song: <a href="https://freesound.org/people/Magntron/sounds/335571/" title="gameMusic">gameMusic by Magntron - freesound.org</a>
-Input buttons by <a href="https://thoseawesomeguys.com/prompts/" title="inputkeys">Nicolae (Xelu) Berbece</a>
-
-
+Input buttons by <a href="https://thoseawesomeguys.com/prompts/" title="inputkeys">Nicolae (Xelu) Berbece</a>

scenes/BattleDirector/NotePlacementBar.tscn

@@ -23,7 +23,7 @@ width = 32
 height = 98
 fill_to = Vector2(0, 1)
 
-[node name="NotePlacementBar" type="Control" node_paths=PackedStringArray("notePlacementBar", "currentComboMultText", "_currentNote", "_nextNote")]
+[node name="NotePlacementBar" type="Control" node_paths=PackedStringArray("notePlacementBar", "currentComboMultText", "_currentNote", "_nextNote", "fullBarParticles")]
 layout_mode = 3
 anchors_preset = 15
 anchor_right = 1.0
@@ -35,6 +35,7 @@ notePlacementBar = NodePath("ProgressBar")
 currentComboMultText = NodePath("TextEdit")
 _currentNote = NodePath("NoteQueueSprite/NextNote")
 _nextNote = NodePath("NoteQueueSprite/CurrentNote")
+fullBarParticles = NodePath("ProgressBar/CPUParticles2D")
 
 [node name="ProgressBar" type="TextureProgressBar" parent="."]
 layout_mode = 0
@@ -47,6 +48,19 @@ texture_under = SubResource("GradientTexture2D_hhds4")
 texture_progress = SubResource("GradientTexture2D_0bqho")
 texture_progress_offset = Vector2(1, 1)
 
+[node name="CPUParticles2D" type="CPUParticles2D" parent="ProgressBar"]
+position = Vector2(14, 98)
+emitting = false
+amount = 10
+lifetime = 1.5
+direction = Vector2(0, -1)
+spread = 15.0
+gravity = Vector2(0, 0)
+initial_velocity_min = 25.0
+initial_velocity_max = 50.0
+scale_amount_max = 2.0
+color = Color(1, 1, 0.0745098, 1)
+
 [node name="TextEdit" type="TextEdit" parent="."]
 z_as_relative = false
 layout_mode = 0

scenes/BattleDirector/scripts/BattleDirector.cs

@@ -169,9 +169,11 @@ private void OnTimedInput(Note note, ArrowType arrowType, int beat, double beatD
         else
         {
             note.OnHit(this, timed);
+
             NotePlacementBar.HitNote();
         }
-        NotePlacementBar.ComboText(timed.ToString());
+        //NotePlacementBar.ComboText(timed.ToString());
+        CM.ComboText(timed.ToString(), arrowType, NotePlacementBar.GetCurrentCombo());
     }
 
     private Timing CheckTiming(double beatDif)

scenes/BattleDirector/scripts/NotePlacementBar.cs

@@ -24,6 +24,9 @@ public partial class NotePlacementBar : Node
     [Export]
     private Sprite2D _nextNote;
 
+    [Export]
+    private CpuParticles2D fullBarParticles;
+
     private Note[] _noteDeck;
     private Queue<Note> _noteQueue = new Queue<Note>();
 
@@ -105,13 +108,6 @@ private Note GetNote(bool getNextNote = false)
         return result;
     }
 
-    public void ComboText(string text)
-    {
-        TextParticle newText = new TextParticle();
-        AddChild(newText);
-        newText.Text = text + $" {_currentCombo}";
-    }
-
     // Hitting a note increases combo, combo mult, and note placement bar
     public void HitNote()
     {
@@ -120,6 +116,7 @@ public void HitNote()
         _currentBarValue = Math.Min(_currentBarValue + comboMult, MaxValue);
         UpdateNotePlacementBar(_currentBarValue);
         UpdateComboMultText();
+        //fullBarParticles.Emitting = CanPlaceNote();
     }
 
     // Missing a note resets combo
@@ -136,6 +133,7 @@ public Note PlacedNote()
         _currentBarValue -= (int)(_currentNoteInstance.CostModifier * MaxValue);
 
         UpdateNotePlacementBar(_currentBarValue);
+        //fullBarParticles.Emitting = false;
         return GetNote();
     }
 
@@ -149,6 +147,11 @@ private void DetermineComboMult()
         comboMult = _currentCombo / notesToIncreaseCombo + 1;
     }
 
+    public int GetCurrentCombo()
+    {
+        return _currentCombo;
+    }
+
     private void UpdateNotePlacementBar(int newValue)
     {
         notePlacementBar.Value = newValue;

scenes/BattleDirector/scripts/TextParticle.cs

@@ -9,12 +9,13 @@ public override void _Ready()
         Tween tween = GetTree().CreateTween();
         ZIndex = 2;
         Position += Vector2.Left * (GD.Randf() * 40 - 20);
-        tween.SetTrans(Tween.TransitionType.Quad);
+        tween.SetTrans(Tween.TransitionType.Elastic);
         tween.SetEase(Tween.EaseType.Out);
-        tween.TweenProperty(this, "position", Position + Vector2.Up * 10, .5f);
-        tween.TweenProperty(this, "position", Position + Vector2.Down * 20, .5f);
+        tween.TweenProperty(this, "position", Position + Vector2.Up * 10, .25f).AsRelative();
+        tween.TweenProperty(this, "position", Position + Vector2.Down * 20, .1f).AsRelative();
         tween.SetParallel();
-        tween.TweenProperty(this, "modulate:a", 0, 1f);
+        tween.SetTrans(Tween.TransitionType.Quad);
+        tween.TweenProperty(this, "modulate:a", 0, .15f);
         tween.SetParallel(false);
         tween.TweenCallback(Callable.From(QueueFree));
     }

scenes/ChartViewport/ChartViewport.tscn

@@ -1,8 +1,8 @@
 [gd_scene load_steps=7 format=3 uid="uid://dfevfib11kou1"]
 
-[ext_resource type="Script" path="res://scenes/ChartViewport/ChartManager.cs" id="1_ruh2l"]
+[ext_resource type="Script" path="res://scenes/ChartViewport/scripts/ChartManager.cs" id="1_ruh2l"]
 [ext_resource type="Texture2D" uid="uid://cp78odda2doab" path="res://scenes/ChartViewport/LoopMarker.png" id="2_q5cjc"]
-[ext_resource type="Script" path="res://scenes/ChartViewport/Loopable.cs" id="3_5u57h"]
+[ext_resource type="Script" path="res://scenes/ChartViewport/scripts/Loopable.cs" id="3_5u57h"]
 [ext_resource type="PackedScene" uid="uid://bn8txx53xlguw" path="res://scenes/NoteManager/note_manager.tscn" id="4_fd5fw"]
 [ext_resource type="Shader" path="res://scenes/ChartViewport/StarryNight.gdshader" id="5_kqrxg"]
 
@@ -30,6 +30,7 @@ position = Vector2(-50, 0)
 anchor_mode = 0
 
 [node name="StarShader" type="ColorRect" parent="SubViewport"]
+z_index = -1
 material = SubResource("ShaderMaterial_5uw0y")
 offset_left = -60.0
 offset_right = 415.0

scenes/ChartViewport/hit_particles.tscn

@@ -0,0 +1,17 @@
+[gd_scene load_steps=2 format=3 uid="uid://bcf6vs4aqoxr5"]
+
+[ext_resource type="Script" path="res://scenes/ChartViewport/scripts/HitParticles.cs" id="1_tr2t2"]
+
+[node name="HitParticles" type="CPUParticles2D"]
+z_index = -1
+emitting = false
+amount = 1
+lifetime = 0.25
+speed_scale = 2.01
+explosiveness = 0.5
+spread = 180.0
+gravity = Vector2(0, 0)
+initial_velocity_min = 50.0
+initial_velocity_max = 200.0
+scale_amount_max = 2.0
+script = ExtResource("1_tr2t2")

scenes/ChartViewport/ChartManager.cs …es/ChartViewport/scripts/ChartManager.csscenes/ChartViewport/ChartManager.cs renamed to scenes/ChartViewport/scripts/ChartManager.cs scenes/ChartViewport/ChartManager.cs renamed to scenes/ChartViewport/scripts/ChartManager.cs

@@ -114,6 +114,15 @@ private NoteArrow CreateNote(ArrowType arrow, Note note, int beat = 0)
         return newArrow;
     }
 
+    public void ComboText(string text, ArrowType arrow, int currentCombo)
+    {
+        TextParticle newText = new TextParticle();
+        AddChild(newText);
+        newText.Position = IH.Arrows[(int)arrow].Node.Position - newText.Size/2;
+        IH.FeedbackEffect(arrow, text);
+        newText.Text = text + $" {currentCombo}";
+    }
+
     public override void _ExitTree()
     {
         GD.Print("[DEBUG] Stopping tweens before exiting the scene...");

scenes/ChartViewport/scripts/HitParticles.cs

@@ -0,0 +1,25 @@
+using System;
+using Godot;
+
+public partial class HitParticles : CpuParticles2D
+{
+    public void Emit(int particleAmount)
+    {
+        // Apply the particle amount and start emitting
+        Amount = particleAmount;
+        Emitting = true;
+
+        // Stop particles after a short delay using a Timer
+        Timer timer = new Timer();
+        timer.WaitTime = 0.25f; // Stop emitting after 0.5 seconds
+        timer.OneShot = true;
+        timer.Timeout += () =>
+        {
+            Emitting = false;
+            timer.QueueFree(); // Clean up the timer
+        };
+
+        AddChild(timer);
+        timer.Start();
+    }
+}