Refactored Reward system

Distributed functions to more cohesive classes
Removed Reward class
Added PlayerStats into StageProducer, so its global and can be persistent.
Refined battle status checking

Author: LifeHckr

Globals/Scribe.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Linq;
 using FunkEngine;
 using Godot;
 
@@ -31,6 +32,20 @@ public partial class Scribe : Node
 
     public static readonly RelicTemplate[] RelicDictionary = new[]
     {
+        new RelicTemplate(
+            "Breakfast", //Reference ha ha, Item to give when relic pool is empty.
+            new RelicEffect[]
+            {
+                new RelicEffect(
+                    BattleEffectTrigger.NotePlaced,
+                    1,
+                    (director, val) =>
+                    {
+                        director.Player.Heal(val);
+                    }
+                ),
+            }
+        ),
         new RelicTemplate(
             "Good Vibes",
             new RelicEffect[]
@@ -60,4 +75,25 @@ public partial class Scribe : Node
             }
         ),
     };
+
+    //TODO: Item pool(s)
+
+    public static RelicTemplate[] GetRandomRelics(RelicTemplate[] ownedRelics, int count)
+    {
+        var availableRelics = Scribe
+            .RelicDictionary.Where(r => !ownedRelics.Any(o => o.Name == r.Name))
+            .ToArray();
+
+        availableRelics = availableRelics
+            .OrderBy(_ => StageProducer.GlobalRng.Randi())
+            .Take(count)
+            .Select(r => r.Clone())
+            .ToArray();
+
+        for (int i = availableRelics.Length; i < count; i++)
+        {
+            availableRelics = availableRelics.Append(RelicDictionary[0].Clone()).ToArray();
+        }
+        return availableRelics;
+    }
 }

Globals/StageProducer.cs

@@ -16,6 +16,10 @@ public partial class StageProducer : Node
 
     private MapGrid _map = new MapGrid();
 
+    //Hold here to persist between changes
+    //TODO: Allow for permanent changes and battle temporary stat changes.
+    public static PlayerStats PlayerStats;
+
     public class MapGrid
     {
         private int[,] _map;
@@ -108,6 +112,7 @@ public void StartGame()
         _map.InitMapGrid(2, 2, 1);
         _seed = GlobalRng.Seed;
         _lastRngState = GlobalRng.State;
+        PlayerStats = new PlayerStats();
     }
 
     public void TransitionStage(Stages nextStage)
@@ -119,6 +124,7 @@ public void TransitionStage(Stages nextStage)
                 GetTree().ChangeSceneToFile("res://scenes/SceneTransitions/TitleScreen.tscn");
                 break;
             case Stages.Battle:
+                StartGame();
                 GetTree().ChangeSceneToFile("res://scenes/BattleDirector/test_battle_scene.tscn");
                 break;
             case Stages.Quit:

Reward.cs

@@ -32,9 +32,6 @@ public partial class BattleDirector : Node2D
 
     private SongData _curSong;
 
-    private bool battleLost = false;
-    private bool battleWon = false;
-
     #endregion
 
     #region Note Handling
@@ -75,6 +72,7 @@ public override void _Ready()
 
         Player = new PlayerPuppet();
         AddChild(Player);
+        Player.Defeated += CheckBattleStatus;
         EventizeRelics();
         //TODO: Refine
         foreach (var note in Player.Stats.CurNotes)
@@ -88,6 +86,7 @@ public override void _Ready()
         Enemy = new PuppetTemplate();
         Enemy.SetPosition(new Vector2(400, 0));
         AddChild(Enemy);
+        Enemy.Defeated += CheckBattleStatus;
         Enemy.Init(GD.Load<Texture2D>("res://scenes/BattleDirector/assets/Enemy1.png"), "Enemy");
         Enemy.Sprite.Scale *= 2;
 
@@ -119,12 +118,6 @@ private void Begin()
 
     public override void _Process(double delta)
     {
-        //check if either one is dead until one is true, feel free to remove if we have a more efficent way of checking
-        //alternatively, stop the other process since the battle is over
-        if (!battleLost || !battleWon)
-        {
-            CheckBattleStatus();
-        }
         TimeKeeper.CurrentTime = Audio.GetPlaybackPosition();
         CD.CheckMiss();
     }
@@ -203,6 +196,31 @@ private Timing CheckTiming(double beatDif)
         return Timing.Miss;
     }
 
+    private void CheckBattleStatus(PuppetTemplate puppet)
+    {
+        if (puppet == Player)
+        {
+            GD.Print("Player is Dead");
+            return;
+        }
+
+        //will have to adjust this to account for when we have multiple enemies at once
+        if (puppet == Enemy)
+        {
+            GD.Print("Enemy is dead");
+            ShowRewardSelection(3);
+        }
+    }
+
+    private void ShowRewardSelection(int amount)
+    {
+        var rewardUI = GD.Load<PackedScene>("res://scenes/UI/RewardSelectionUI.tscn")
+            .Instantiate<RewardSelect>();
+        AddChild(rewardUI);
+        rewardUI.Initialize(Player.Stats, amount);
+        GetTree().Paused = true;
+    }
+
     #endregion
 
     #region BattleEffect Handling
@@ -228,47 +246,8 @@ private void EventizeRelics()
     }
     #endregion
 
-
-    private void CheckBattleStatus()
-    {
-        if (battleLost || battleWon)
-            return;
-
-        if (Player.GetCurrentHealth() <= 0)
-        {
-            GD.Print("Player is Dead");
-            battleLost = true;
-            return;
-        }
-
-        //will have to adjust this to account for when we have multiple enemies at once
-        if (Enemy.GetCurrentHealth() <= 0)
-        {
-            GD.Print("Enemy is dead");
-            battleWon = true;
-
-            //below, old method that just adds a random relic to the inventory
-            //Reward.GiveRandomRelic(Player.Stats);
-            //EventizeRelics(); //literally just here to force the ui to update and see if it was added, remove with the proper ui update
-            //probably won't even need it since we'll be loading to seperate scene anyways
-
-            //new method that allows player to choose a relic
-            ShowRewardSelection();
-
-            return;
-        }
-    }
-
     private void DebugKillEnemy()
     {
         Enemy.TakeDamage(1000);
     }
-
-    private void ShowRewardSelection()
-    {
-        var rewardUI = GD.Load<PackedScene>("res://RewardSelectionUI.tscn")
-            .Instantiate<RewardSelect>();
-        AddChild(rewardUI);
-        rewardUI.Initialize(Player.Stats);
-    }
 }

RewardSelectionUI.tscn

@@ -3,13 +3,30 @@
 
 public partial class PlayerPuppet : PuppetTemplate
 {
-    public PlayerStats Stats = new PlayerStats();
+    public PlayerStats Stats;
 
     public override void _Ready()
     {
-        base._Ready();
+        Stats = StageProducer.PlayerStats;
+
+        _currentHealth = Stats.CurrentHealth;
+        _maxHealth = Stats.MaxHealth;
+
         Init(GD.Load<Texture2D>("res://scenes/BattleDirector/assets/Character1.png"), "Player");
         SetPosition(new Vector2(80, 0));
         Sprite.Position += Vector2.Down * 30; //TEMP
+        base._Ready();
+    }
+
+    public override void TakeDamage(int amount)
+    {
+        base.TakeDamage(amount);
+        Stats.CurrentHealth = _currentHealth;
+    }
+
+    public override void Heal(int amount)
+    {
+        base.Heal(amount);
+        Stats.CurrentHealth = _currentHealth;
     }
 }

scenes/BattleDirector/scripts/BattleDirector.cs

@@ -4,9 +4,21 @@
 
 public partial class PlayerStats : Resource
 {
-    public int MaxHealth = 300;
-    public Note[] CurNotes = new Note[] { Scribe.NoteDictionary[1].Clone() };
+    public int MaxHealth = 100;
+    public int CurrentHealth = 100;
+    public Note[] CurNotes = new Note[] { Scribe.NoteDictionary[1].Clone() }; //TODO: Get a better method than .Clone
 
-    public RelicTemplate[] CurRelics = new[] { Scribe.RelicDictionary[0].Clone() };
+    public RelicTemplate[] CurRelics = Array.Empty<RelicTemplate>();
     public int Attack = 1;
+
+    public void AddRelic(RelicTemplate relic)
+    {
+        if (CurRelics.Any(r => r.Name == relic.Name))
+        {
+            GD.PrintErr("Relic already in inventory: " + relic.Name);
+            return;
+        }
+        CurRelics = CurRelics.Append(relic).ToArray();
+        GD.Print("Adding relic: " + relic.Name);
+    }
 }

scenes/Puppets/scripts/PlayerPuppet.cs

@@ -6,6 +6,9 @@
  */
 public partial class PuppetTemplate : Node2D
 {
+    public delegate void DefeatedHandler(PuppetTemplate self);
+    public event DefeatedHandler Defeated;
+
     protected HealthBar _healthBar;
     public Sprite2D Sprite = new Sprite2D();
 
@@ -34,14 +37,18 @@ public void Init(Texture2D texture, string name)
         UniqName = name;
     }
 
-    public void TakeDamage(int amount)
+    public virtual void TakeDamage(int amount)
     {
         _currentHealth = _healthBar.ChangeHP(-amount);
+        if (_currentHealth <= 0)
+        {
+            Defeated?.Invoke(this);
+        }
     }
 
-    public void Heal(int amount)
+    public virtual void Heal(int amount)
     {
-        _healthBar.ChangeHP(amount);
+        _currentHealth = _healthBar.ChangeHP(amount);
     }
 
     public int GetCurrentHealth()