Removed placeholder arrow, fixed loop missing, added player puppet

LifeHckr · LifeHckr · commit 450197b6264e · 2025-02-06T21:52:42.000-08:00
Replaced old arrow graphic with new custom one
Player arrow is unique color
Reverted CheckMiss(), upon looping, without input no notes would miss
Player puppet with WIP player stats object.
RelicTemplate class to placehold for inventory
diff --git a/Classes/Note.cs b/Classes/Note.cs
@@ -10,6 +10,8 @@ public partial class Note : Resource
 {
     private string _effect;
 
+    //public Puppet_Template Owner;
+
     public Note(string effect = "")
     {
         _effect = effect;
diff --git a/Classes/RelicTemplate.cs b/Classes/RelicTemplate.cs
@@ -0,0 +1,12 @@
+using System;
+using Godot;
+
+public partial class RelicTemplate : Resource
+{
+    public string[] EffectTags;
+    public string Name;
+
+    //public Texture2D Texture
+    //public string Tooltip
+    public RelicTemplate(string Name = "", string[] EffectTags = null) { }
+}
diff --git a/README.md b/README.md
@@ -14,8 +14,6 @@ Current team members include:
 
 
 #### Attributions:
-Note icon: <a href="https://www.flaticon.com/free-icons/next" title="next icons">Next icons created by Pixel perfect - Flaticon</a>
-
 First Song: <a href="https://freesound.org/people/Magntron/sounds/335571/" title="gameMusic">gameMusic by Magntron - freesound.org</a>
 
 
diff --git a/scenes/BattleDirector/assets/Character1.png b/scenes/BattleDirector/assets/Character1.png
diff --git a/scenes/BattleDirector/scripts/BattleDirector.cs b/scenes/BattleDirector/scripts/BattleDirector.cs
@@ -10,10 +10,11 @@
  * @brief Higher priority director to manage battle effects. Can directly access managers, which should signal up to Director WIP
  */
 public partial class BattleDirector : Node2D
-{
+{ //TODO: Maybe move some Director functionality to a sub node.
     #region Declarations
-    private Puppet_Template Player;
-    private Puppet_Template Enemy;
+    //private Puppet_Template[] ActivePuppets;
+    private PuppetTemplate Player;
+    private PuppetTemplate Enemy;
 
     [Export]
     private ChartManager CM;
@@ -78,14 +79,21 @@ private bool AddNoteToLane(ArrowType type, int beat, bool isActive = true)
             return false;
         }
         //Get noteArrow from CM
-        var arrow = CM.AddArrowToLane(type, beat, _notes.Length - 1);
+        NoteArrow arrow;
+        if (isActive)
+        {
+            arrow = CM.AddArrowToLane(type, beat, _notes.Length - 1);
+        }
+        else
+        {
+            arrow = CM.AddArrowToLane(type, beat, _notes.Length - 1, new Color(1, 0.43f, 0.26f));
+        }
         arrow.IsActive = isActive;
         _laneData[(int)type][beat] = arrow;
         return true;
     }
     #endregion
 
-    //Creeate dummy notes
     private void AddExampleNotes()
     {
         GD.Print(CM.BeatsPerLoop);
@@ -116,7 +124,7 @@ public override void _Ready()
             NumLoops = 5,
         };
 
-        Player = new Puppet_Template();
+        Player = new PlayerPuppet();
         AddChild(Player);
         Player.Init(
             GD.Load<Texture2D>("res://scenes/BattleDirector/assets/Character1.png"),
@@ -125,7 +133,7 @@ public override void _Ready()
         Player.SetPosition(new Vector2(80, 0));
         Player.Sprite.Position += Vector2.Down * 30; //TEMP
 
-        Enemy = new Puppet_Template();
+        Enemy = new PuppetTemplate();
         Enemy.SetPosition(new Vector2(400, 0));
         AddChild(Enemy);
         Enemy.Init(GD.Load<Texture2D>("res://scenes/BattleDirector/assets/Enemy1.png"), "Enemy");
@@ -184,9 +192,12 @@ private void CheckMiss()
         double realBeat = TimeKeeper.CurrentTime / (60 / (double)_curSong.Bpm) % CM.BeatsPerLoop;
         for (int i = 0; i < _laneData.Length; i++)
         {
-            if (!(_laneLastBeat[i] < Math.Floor(realBeat)))
+            if (
+                !(_laneLastBeat[i] < Math.Floor(realBeat))
+                && (_laneLastBeat[i] != CM.BeatsPerLoop - 1 || Math.Floor(realBeat) != 0)
+            )
                 continue;
-            if (!IsNoteActive((ArrowType)i, _laneLastBeat[i]))
+            if (_laneData[i][_laneLastBeat[i]] == null || !_laneData[i][_laneLastBeat[i]].IsActive)
             {
                 _laneLastBeat[i] = (_laneLastBeat[i] + 1) % CM.BeatsPerLoop;
                 continue;
diff --git a/scenes/ChartViewport/ChartManager.cs b/scenes/ChartViewport/ChartManager.cs
@@ -59,16 +59,16 @@ public void PrepChart(BattleDirector.SongData songData)
         tween
             .TweenMethod(
                 Callable.From((Vector2 scale) => TweenArrows(scale)),
-                new Vector2(0.07f, 0.07f),
-                new Vector2(0.07f, 0.07f) * 1.25f,
+                Vector2.One * .8f,
+                Vector2.One,
                 60f / TimeKeeper.Bpm / 2
             )
             .SetEase(Tween.EaseType.Out)
             .SetTrans(Tween.TransitionType.Elastic);
         tween.TweenMethod(
             Callable.From((Vector2 scale) => TweenArrows(scale)),
-            new Vector2(0.07f, 0.07f) * 1.25f,
-            new Vector2(0.07f, 0.07f),
+            Vector2.One,
+            Vector2.One * .8f,
             60f / TimeKeeper.Bpm / 2
         );
         tween.SetLoops().Play();
@@ -98,10 +98,20 @@ private void TweenArrows(Vector2 scale)
         }
     }
 
-    public NoteArrow AddArrowToLane(ArrowType type, int beat, int noteIdx)
+    public NoteArrow AddArrowToLane(
+        ArrowType type,
+        int beat,
+        int noteIdx,
+        Color colorOverride = default
+    )
     {
         var newNote = CreateNote(type, beat);
-        CreateNote(type, beat + BeatsPerLoop); //Create a dummy arrow for looping visuals
+        var loopArrow = CreateNote(type, beat + BeatsPerLoop); //Create a dummy arrow for looping visuals
+        if (colorOverride != default)
+        {
+            newNote.Modulate = colorOverride;
+            loopArrow.Modulate = colorOverride;
+        }
         newNote.NoteIdx = noteIdx;
         return newNote;
     }
diff --git a/scenes/NoteManager/assets/outline_white.png b/scenes/NoteManager/assets/outline_white.png
diff --git a/scenes/NoteManager/assets/outline_white.png.import b/scenes/NoteManager/assets/outline_white.png.import
@@ -2,16 +2,16 @@
 
 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bucvj4fquqpkr"
-path="res://.godot/imported/right-arrow.png-b3005485b42777a77a9d39fbba48875d.ctex"
+uid="uid://xtygvpk7s8e4"
+path="res://.godot/imported/outline_white.png-eff17a86b93281db885f81fdb608ab83.ctex"
 metadata={
 "vram_texture": false
 }
 
 [deps]
 
-source_file="res://scenes/NoteManager/assets/right-arrow.png"
-dest_files=["res://.godot/imported/right-arrow.png-b3005485b42777a77a9d39fbba48875d.ctex"]
+source_file="res://scenes/NoteManager/assets/outline_white.png"
+dest_files=["res://.godot/imported/outline_white.png-eff17a86b93281db885f81fdb608ab83.ctex"]
 
 [params]
 
diff --git a/scenes/NoteManager/assets/right-arrow.png b/scenes/NoteManager/assets/right-arrow.png
diff --git a/scenes/NoteManager/note.tscn b/scenes/NoteManager/note.tscn
@@ -1,9 +1,8 @@
 [gd_scene load_steps=3 format=3 uid="uid://ck3bfqy30rjbq"]
 
-[ext_resource type="Texture2D" uid="uid://bucvj4fquqpkr" path="res://scenes/NoteManager/assets/right-arrow.png" id="1_kubiy"]
+[ext_resource type="Texture2D" uid="uid://xtygvpk7s8e4" path="res://scenes/NoteManager/assets/outline_white.png" id="1_vs4mw"]
 [ext_resource type="Script" path="res://scenes/NoteManager/scripts/NoteArrow.cs" id="2_lbl4b"]
 
 [node name="Right-arrow" type="Sprite2D"]
-scale = Vector2(0.07, 0.07)
-texture = ExtResource("1_kubiy")
+texture = ExtResource("1_vs4mw")
 script = ExtResource("2_lbl4b")
diff --git a/scenes/NoteManager/note_manager.tscn b/scenes/NoteManager/note_manager.tscn
@@ -1,7 +1,7 @@
 [gd_scene load_steps=5 format=3 uid="uid://bn8txx53xlguw"]
 
 [ext_resource type="Script" path="res://scenes/NoteManager/scripts/InputHandler.cs" id="1_2oeuf"]
-[ext_resource type="Texture2D" uid="uid://bucvj4fquqpkr" path="res://scenes/NoteManager/assets/right-arrow.png" id="2_ldmuy"]
+[ext_resource type="Texture2D" uid="uid://xtygvpk7s8e4" path="res://scenes/NoteManager/assets/outline_white.png" id="2_7ue4e"]
 [ext_resource type="Script" path="res://scenes/NoteManager/scripts/NoteChecker.cs" id="3_0cioe"]
 [ext_resource type="Texture2D" uid="uid://b0tvsewgnf2x7" path="res://icon.svg" id="4_foklt"]
 
@@ -13,28 +13,24 @@ script = ExtResource("1_2oeuf")
 [node name="arrowUp" type="Sprite2D" parent="noteCheckers"]
 position = Vector2(0, 24)
 rotation = -1.5708
-scale = Vector2(0.09, 0.09)
-texture = ExtResource("2_ldmuy")
+texture = ExtResource("2_7ue4e")
 script = ExtResource("3_0cioe")
 
 [node name="arrowLeft" type="Sprite2D" parent="noteCheckers"]
 position = Vector2(0, 76)
 rotation = 3.14159
-scale = Vector2(0.09, 0.09)
-texture = ExtResource("2_ldmuy")
+texture = ExtResource("2_7ue4e")
 script = ExtResource("3_0cioe")
 
 [node name="arrowDown" type="Sprite2D" parent="noteCheckers"]
 position = Vector2(0, 129)
 rotation = 1.5708
-scale = Vector2(0.09, 0.09)
-texture = ExtResource("2_ldmuy")
+texture = ExtResource("2_7ue4e")
 script = ExtResource("3_0cioe")
 
 [node name="arrowRight" type="Sprite2D" parent="noteCheckers"]
 position = Vector2(0, 181)
-scale = Vector2(0.09, 0.09)
-texture = ExtResource("2_ldmuy")
+texture = ExtResource("2_7ue4e")
 script = ExtResource("3_0cioe")
 
 [node name="ui" type="Node2D" parent="."]
diff --git a/scenes/NoteManager/scripts/NoteArrow.cs b/scenes/NoteManager/scripts/NoteArrow.cs
@@ -20,7 +20,7 @@ public void Init(ArrowData parentArrowData, int beat)
         Type = parentArrowData.Type;
         Beat = beat;
 
-        SelfModulate = parentArrowData.Color;
+        //SelfModulate = parentArrowData.Color;
         Position += Vector2.Down * (parentArrowData.Node.GlobalPosition.Y);
         RotationDegrees = parentArrowData.Node.RotationDegrees;
     }
diff --git a/scenes/Puppets/scripts/PlayerPuppet.cs b/scenes/Puppets/scripts/PlayerPuppet.cs
@@ -0,0 +1,12 @@
+using System;
+using Godot;
+
+public partial class PlayerPuppet : PuppetTemplate
+{
+    public PlayerStats Stats;
+
+    public override void _Ready()
+    {
+        base._Ready();
+    }
+}
diff --git a/scenes/Puppets/scripts/PlayerStats.cs b/scenes/Puppets/scripts/PlayerStats.cs
@@ -0,0 +1,10 @@
+using System;
+using Godot;
+
+public partial class PlayerStats : Resource
+{
+    public int MaxHealth = 300;
+    public Note[] CurNotes = new Note[5];
+    public RelicTemplate[] CurRelics = new RelicTemplate[5];
+    public int Attack = 1;
+}
diff --git a/scenes/Puppets/scripts/PuppetTemplate.cs b/scenes/Puppets/scripts/PuppetTemplate.cs
@@ -4,13 +4,13 @@
 /** Essentially a battle entity. Has HP and can be healed or damaged.
  * TODO: Look into interfaces
  */
-public partial class Puppet_Template : Node2D
+public partial class PuppetTemplate : Node2D
 {
-    private HealthBar _healthBar;
+    protected HealthBar _healthBar;
     public Sprite2D Sprite = new Sprite2D();
 
-    private int _maxHealth = 100;
-    private int _currentHealth = 100;
+    protected int _maxHealth = 100;
+    protected int _currentHealth = 100;
 
     //Stats would go here.
 

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,8 @@ public partial class Note : Resource`
`10`	`10`	`{`
`11`	`11`	`private string _effect;`
`12`	`12`
	`13`	`+ //public Puppet_Template Owner;`
	`14`	`+`
`13`	`15`	`public Note(string effect = "")`
`14`	`16`	`{`
`15`	`17`	`_effect = effect;`