Integrate and adjust NPB

Don't let the rewritten history fool you,
NotePlacementBar was just integrated now.
I need sleep.

Author: LifeHckr

scenes/BattleDirector/BattleDirector.cs

@@ -13,7 +13,7 @@ public partial class BattleDirector : Node2D
     #region Declarations
     private HealthBar Player;
     private HealthBar Enemy;
-    
+
     [Export]
     public ChartManager CM;
 
@@ -94,6 +94,11 @@ private bool AddNoteToLane(Note note)
     //Creeate dummy notes
     private void AddExampleNotes()
     {
+        for (int i = 0; i < 1; i++)
+        {
+            Note exampleNote = new Note(NoteArrow.ArrowType.Down, i + 5);
+            AddNoteToLane(exampleNote);
+        }
         for (int i = 0; i < 4; i++)
         {
             Note exampleNote = new Note(NoteArrow.ArrowType.Up, i + 20);
@@ -177,7 +182,10 @@ private void CheckNoteTiming(NoteArrow.ArrowType type)
             return;
         double beatDif = Math.Abs(curBeat - GetFirstNote(type).Beat);
         if (beatDif > 1)
+        {
+            PlayerAddNote(type, (int)Math.Round(curBeat));
             return;
+        }
         GD.Print("Note Hit. Dif: " + beatDif);
         _laneData[(int)type].First().NoteHit();
         HandleTiming(type, beatDif);
@@ -215,11 +223,9 @@ private void HandleTiming(NoteArrow.ArrowType type, double beatDif)
 
     private void PlayerAddNote(NoteArrow.ArrowType type, int beat)
     {
-        //TODO: notes currently can only be placed in first loop.
-        // placed notes are also non-interactable
-
         // can also add some sort of keybind here to also have pressed
         // in case the user just presses the note too early and spawns a note
+        //TODO: Sync new notes animations with the rest.
         GD.Print(
             $"Player trying to place {type} typed note at beat: "
                 + beat

scenes/BattleDirector/NotePlacementBar.cs

@@ -10,7 +10,7 @@ public partial class NotePlacementBar : Node
     int notesToIncreaseCombo;
 
     [Export]
-    ProgressBar notePlacementBar;
+    TextureProgressBar notePlacementBar;
 
     [Export]
     TextEdit currentComboMultText;

scenes/BattleDirector/NotePlacementBar.tscn

@@ -1,7 +1,25 @@
-[gd_scene load_steps=2 format=3 uid="uid://duhiilcv4tat3"]
+[gd_scene load_steps=6 format=3 uid="uid://duhiilcv4tat3"]
 
 [ext_resource type="Script" path="res://scenes/BattleDirector/NotePlacementBar.cs" id="1_456es"]
 
+[sub_resource type="Gradient" id="Gradient_0u6yv"]
+colors = PackedColorArray(0, 0, 0, 1, 0, 0, 0, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_hhds4"]
+gradient = SubResource("Gradient_0u6yv")
+width = 26
+height = 100
+
+[sub_resource type="Gradient" id="Gradient_lyd0l"]
+offsets = PackedFloat32Array(0, 0.485915, 0.739437, 1)
+colors = PackedColorArray(0, 1, 0, 1, 0.68, 0, 0.272, 1, 0, 0.64, 0.608, 1, 0.4, 0, 0, 1)
+
+[sub_resource type="GradientTexture2D" id="GradientTexture2D_k7kvy"]
+gradient = SubResource("Gradient_lyd0l")
+width = 24
+height = 98
+fill_to = Vector2(0, 1)
+
 [node name="NotePlacementBar" type="Control" node_paths=PackedStringArray("notePlacementBar", "currentComboMultText")]
 layout_mode = 3
 anchors_preset = 15
@@ -13,19 +31,20 @@ script = ExtResource("1_456es")
 notePlacementBar = NodePath("ProgressBar")
 currentComboMultText = NodePath("TextEdit")
 
-[node name="ProgressBar" type="ProgressBar" parent="."]
+[node name="ProgressBar" type="TextureProgressBar" parent="."]
 layout_mode = 0
-offset_left = 29.0
-offset_top = 50.0
-offset_right = 229.0
-offset_bottom = 85.0
+offset_right = 26.0
+offset_bottom = 100.0
+fill_mode = 3
+texture_under = SubResource("GradientTexture2D_hhds4")
+texture_progress = SubResource("GradientTexture2D_k7kvy")
+texture_progress_offset = Vector2(1, 1)
 
 [node name="TextEdit" type="TextEdit" parent="."]
 layout_mode = 0
-offset_left = 240.0
-offset_top = 50.0
-offset_right = 290.0
-offset_bottom = 85.0
+offset_top = -41.0
+offset_right = 50.0
+offset_bottom = -6.0
 mouse_filter = 2
 text = "x1"
 context_menu_enabled = false

scenes/BattleDirector/test_battle_scene.tscn

@@ -63,3 +63,7 @@ offset_right = 443.0
 SpriteText = ExtResource("6_0k4pw")
 
 [node name="NotePlacementBar" parent="." instance=ExtResource("7_3ko4g")]
+offset_left = 12.0
+offset_top = 145.0
+offset_right = 12.0
+offset_bottom = 145.0

scenes/ChartViewport/ChartViewport.tscn

@@ -17,6 +17,13 @@ handle_input_locally = false
 size = Vector2i(480, 220)
 render_target_update_mode = 4
 
+[node name="ColorFill" type="ColorRect" parent="SubViewport"]
+z_index = -2
+offset_left = -30.0
+offset_right = 610.0
+offset_bottom = 360.0
+color = Color(0.258824, 0.290196, 0.392157, 1)
+
 [node name="Camera2D" type="Camera2D" parent="SubViewport"]
 position = Vector2(-25, 0)
 anchor_mode = 0