Added simple money system (#191)

* Smooth out end of battle

Pause chart scrolling and tween fade last enemy(s)
Allow audio to continue if it doesn't need to be stopped on battle end and chest open

* Prototype score screen

* Added money vars

Saveable player money
Enemies have a base money amount

* Money implemented

A player can gain money from battle
TODO: Where to see current money
TODO: What to use money on

* Update inventory to show money

Author: LifeHckr

Globals/SaveSystem.cs

@@ -373,6 +373,7 @@ public class SaveFile
         public int LastRoomIdx { get; init; }
         public int Area { get; init; }
 
+        public int Money { get; init; }
         public int[] NoteIds { get; init; }
         public int[] RelicIds { get; init; }
         public int PlayerHealth { get; init; }
@@ -384,7 +385,8 @@ public SaveFile(
             int[] noteIds,
             int[] relicIds,
             int playerHealth,
-            int area
+            int area,
+            int money
         )
         {
             RngSeed = rngSeed;
@@ -394,6 +396,7 @@ int area
             RelicIds = relicIds;
             PlayerHealth = playerHealth;
             Area = area;
+            Money = money;
         }
     }
 
@@ -408,7 +411,8 @@ public static void SaveGame()
             noteIds,
             relicIds,
             StageProducer.PlayerStats.CurrentHealth,
-            (int)StageProducer.CurArea
+            (int)StageProducer.CurArea,
+            StageProducer.PlayerStats.Money
         );
         string json = JsonSerializer.Serialize(sv);
 

Globals/StageProducer.cs

@@ -114,6 +114,7 @@ private bool LoadGame()
             PlayerStats.AddRelic(Scribe.RelicDictionary[relicId]);
         }
         PlayerStats.CurrentHealth = sv.PlayerHealth;
+        PlayerStats.Money = sv.Money;
         IsInitialized = true;
         return true;
     }

Scenes/BattleDirector/Scripts/BattleDirector.cs

@@ -67,13 +67,41 @@ public override void _Ready()
         Harbinger.Init(this);
         InitPlayer();
         InitEnemies();
+        InitScoringGuide();
         CD.Initialize(curSong);
         CD.NoteInputEvent += OnTimedInput;
 
         _focusedButton.GrabFocus();
         _focusedButton.Pressed += SyncStartWithMix;
     }
 
+    private ScoringScreen.ScoreGuide _battleScore;
+
+    private void InitScoringGuide()
+    {
+        int baseMoney = 0;
+        foreach (EnemyPuppet enem in _enemies)
+        {
+            baseMoney += enem.BaseMoney;
+        }
+
+        _battleScore = new ScoringScreen.ScoreGuide(baseMoney, Player.GetCurrentHealth());
+        Harbinger.Instance.NotePlaced += (_) =>
+        {
+            _battleScore.IncPlaced();
+        };
+        Harbinger.Instance.NoteHit += (_) =>
+        {
+            _battleScore.IncHits();
+        };
+        Harbinger.Instance.NoteHit += (e) =>
+        {
+            if (e is Harbinger.NoteHitArgs { Timing: Timing.Perfect })
+                _battleScore.IncPerfects();
+            _battleScore.IncHits();
+        };
+    }
+
     private void InitPlayer()
     {
         Player = GD.Load<PackedScene>(PlayerPuppet.LoadPath).Instantiate<PlayerPuppet>();
@@ -213,8 +241,21 @@ private void CheckBattleStatus(PuppetTemplate puppet) //Called when a puppet die
             OnBattleLost();
             return;
         }
-        if (puppet is EnemyPuppet && IsBattleWon())
-            OnBattleWon(); //will have to adjust this to account for when we have multiple enemies at once
+
+        if (puppet is EnemyPuppet)
+        {
+            if (IsBattleWon())
+            {
+                CM.ProcessMode = ProcessModeEnum.Disabled;
+                var tween = CreateTween();
+                tween.TweenProperty(puppet, "modulate:a", 0, 2f);
+                tween.TweenCallback(Callable.From(OnBattleWon));
+            }
+            else
+            {
+                puppet.Visible = false;
+            }
+        }
     }
 
     private bool IsBattleWon()
@@ -224,9 +265,13 @@ private bool IsBattleWon()
 
     private void OnBattleWon()
     {
-        Audio.StreamPaused = true;
         CleanUpRelics();
-        ShowRewardSelection(3);
+        _battleScore.SetEndHp(Player.GetCurrentHealth());
+        Audio.ProcessMode = ProcessModeEnum.Always;
+        ScoringScreen.CreateScore(this, _battleScore).Finished += () =>
+        {
+            ShowRewardSelection(3);
+        };
     }
 
     private void OnBattleLost()

Scenes/ChestScene/ChestScene.cs

@@ -33,6 +33,7 @@ public override void _Process(double delta)
 
     private void GetLoot()
     {
+        GetNode<AudioStreamPlayer>("%Audio").ProcessMode = ProcessModeEnum.Always;
         ChestButton.Disabled = true;
         RewardSelect.CreateSelection(this, _player.Stats, 3, Stages.Chest).Selected += EndBattle;
     }

Scenes/ChestScene/ChestScene.tscn

@@ -23,7 +23,8 @@ script = ExtResource("1_ardd2")
 ChestButton = NodePath("CenterContainer/VBoxContainer/ChestButton")
 PlayerMarker = NodePath("PlayerMarker")
 
-[node name="AudioStreamPlayer" type="AudioStreamPlayer" parent="."]
+[node name="Audio" type="AudioStreamPlayer" parent="."]
+unique_name_in_owner = true
 stream = ExtResource("2_x78jo")
 autoplay = true
 

Scenes/Puppets/Enemies/BossBlood/P_BossBlood.cs

@@ -10,6 +10,7 @@ public override void _Ready()
     {
         CurrentHealth = 100;
         MaxHealth = 100;
+        BaseMoney = 15;
         base._Ready();
         var enemTween = CreateTween();
         enemTween.TweenProperty(Sprite, "position", Vector2.Down * 5, 1f).AsRelative();

Scenes/Puppets/Enemies/EnemyPuppet.cs

@@ -3,6 +3,7 @@
 public partial class EnemyPuppet : PuppetTemplate
 {
     protected EnemyEffect[] BattleEvents = Array.Empty<EnemyEffect>();
+    public int BaseMoney { get; protected set; } = 0;
 
     public virtual EnemyEffect[] GetBattleEvents()
     {

Scenes/Puppets/Enemies/Parasifly/P_Parasifly.cs

@@ -10,6 +10,7 @@ public override void _Ready()
     {
         CurrentHealth = 50;
         MaxHealth = 50;
+        BaseMoney = 5;
         base._Ready();
         var enemTween = CreateTween();
         enemTween.TweenProperty(Sprite, "position", Vector2.Down * 2, 2f).AsRelative();

Scenes/Puppets/Enemies/TheGWS/P_TheGWS.cs

@@ -9,6 +9,7 @@ public override void _Ready()
     {
         CurrentHealth = 75;
         MaxHealth = 75;
+        BaseMoney = 10;
         base._Ready();
         var enemTween = CreateTween();
         enemTween.TweenProperty(Sprite, "position", Vector2.Down * 10, 3f).AsRelative();

Scenes/Puppets/Scripts/PlayerStats.cs

@@ -5,6 +5,8 @@
 
 public partial class PlayerStats : Resource
 {
+    public int Money = 0;
+
     public int MaxHealth = 100;
     public int CurrentHealth = 100;
     public int MaxComboBar = 60;