Clean up

For now I think baseVal should multiple into effect.
Have Miss return, so its easier to add OnMiss effect later.
Hardcode Timing.Okay for now in on place effect hit.

Author: LifeHckr

Globals/Scribe.cs

@@ -20,7 +20,7 @@ public partial class Scribe : Node
             1,
             (director, note, timing) =>
             {
-                director.Player.TakeDamage((3 - (int)timing) + note.GetBaseVal());
+                director.Player.TakeDamage((3 - (int)timing) * note.GetBaseVal());
             }
         ),
         new Note(
@@ -32,8 +32,9 @@ public partial class Scribe : Node
             1,
             (director, note, timing) =>
             {
-                if (timing != Timing.Miss)
-                    director.Enemy.TakeDamage((int)timing + note.GetBaseVal());
+                if (timing == Timing.Miss)
+                    return;
+                director.Enemy.TakeDamage((int)timing * note.GetBaseVal());
             }
         ),
         new Note(
@@ -42,11 +43,12 @@ public partial class Scribe : Node
             "Basic player note, deals double damage to enemy.",
             GD.Load<Texture2D>("res://Classes/Notes/assets/double_note.png"),
             null,
-            1,
+            2,
             (director, note, timing) =>
             {
-                if (timing != Timing.Miss)
-                    director.Enemy.TakeDamage((2 * (int)timing) + note.GetBaseVal());
+                if (timing == Timing.Miss)
+                    return;
+                director.Enemy.TakeDamage(note.GetBaseVal() * (int)timing);
             }
         ),
         new Note(
@@ -58,8 +60,9 @@ public partial class Scribe : Node
             1,
             (director, note, timing) =>
             {
-                if (timing != Timing.Miss)
-                    director.Player.Heal((int)timing + note.GetBaseVal());
+                if (timing == Timing.Miss)
+                    return;
+                director.Player.Heal((int)timing * note.GetBaseVal());
             }
         ),
         new Note(
@@ -71,11 +74,10 @@ public partial class Scribe : Node
             1,
             (director, note, timing) =>
             {
-                if (timing != Timing.Miss)
-                {
-                    director.Player.Heal((int)timing);
-                    director.Enemy.TakeDamage((int)timing + note.GetBaseVal());
-                }
+                if (timing == Timing.Miss)
+                    return;
+                director.Player.Heal((int)timing * note.GetBaseVal());
+                director.Enemy.TakeDamage((int)timing * note.GetBaseVal());
             }
         ),
         new Note(
@@ -87,8 +89,9 @@ public partial class Scribe : Node
             1,
             (director, note, timing) =>
             {
-                if (timing != Timing.Miss)
-                    director.Enemy.TakeDamage((int)timing + note.GetBaseVal());
+                if (timing == Timing.Miss)
+                    return;
+                director.Enemy.TakeDamage((int)timing + note.GetBaseVal());
             },
             0.25f
         ),

project.godot

@@ -37,9 +37,6 @@ window/stretch/scale_mode="integer"
 
 project/assembly_name="Funk Engine"
 
-[game]
-
-
 [input]
 
 ui_accept={

scenes/BattleDirector/scripts/BattleDirector.cs

@@ -47,10 +47,10 @@ private bool PlayerAddNote(ArrowType type, int beat)
             !CD.AddNoteToLane(
                 type,
                 beat % CM.BeatsPerLoop,
-                NotePlacementBar.PlacedNote(this, Timing.Okay),
+                NotePlacementBar.PlacedNote(this),
                 false
             )
-        )
+        ) //TODO: Remove passing BD into NPB
             return false;
         NotePlaced?.Invoke(this);
         return true;

scenes/BattleDirector/scripts/Conductor.cs

@@ -45,11 +45,11 @@ public bool AddNoteToLane(ArrowType type, int beat, Note note, bool isActive = t
     {
         beat %= CM.BeatsPerLoop;
         Note newNote = note.Clone();
-        if (beat == 0 || _laneData[(int)type][beat] != null)
+        if (beat == 0 || _laneData[(int)type][beat] != null) //TODO: Double check if this is still necessary, doesn't seem to matter for player placed notes
             return false;
 
         NoteArrow arrow;
-        if (isActive) //Currently an enemy note.
+        if (isActive) //Currently isActive means an enemy note.
         {
             arrow = CM.AddArrowToLane(type, beat, newNote);
         }

scenes/BattleDirector/scripts/NotePlacementBar.cs

@@ -184,15 +184,15 @@ public void IncreaseCharge(int amount = 1)
     }
 
     // Placing a note resets the note placement bar
-    public Note PlacedNote(BattleDirector BD, Timing timing)
+    public Note PlacedNote(BattleDirector BD)
     {
         _currentBarValue -= (int)(_currentNoteInstance.CostModifier * MaxValue);
 
         UpdateNotePlacementBar(_currentBarValue);
         //fullBarParticles.Emitting = false;
 
         Note placedNote = GetNote(Input.IsActionPressed("Secondary"));
-        placedNote?.OnHit(BD, timing);
+        placedNote?.OnHit(BD, Timing.Okay); //Hardcode for now, eventually the note itself could have its default
         return placedNote;
     }