Refactor Loose Change increase display

Add relic bonus directly into BattleScore
Fix issue where battleend could be called multiple times
Fix issue where min stage heights weren't being applied correctly

Author: LifeHckr

Globals/FunkEngineNameSpace.cs

@@ -365,7 +365,8 @@ private Stages PickRoomType(int x, int y, MapLevels.MapConfig curConfig)
         }
 
         //Random roll for the room type.
-        float[] validRooms = curConfig.StageOdds;
+        float[] validRooms = new float[curConfig.StageOdds.Length];
+        curConfig.StageOdds.CopyTo(validRooms, 0);
         foreach ((Stages stage, int height) in curConfig.MinHeights)
         {
             if (y < height)

Globals/Scribe.cs

@@ -344,7 +344,7 @@ public partial class Scribe : Node
                     10,
                     (e, self, val) =>
                     {
-                        StageProducer.PlayerStats.Money += val;
+                        e.BD.BattleScore.IncRelicBonus(val);
                     }
                 ),
             }

Globals/Translations/Translations.csv

@@ -88,6 +88,7 @@ HOW_TO_PLAY,How to Play,如何游玩
 HOW_TO_PLAY_BLOCK1,"Hit notes to\nbuild combo","点击音符\n以建立连击"
 HOW_TO_PLAY_BLOCK2,"Place notes when\ncombo is full","当连击满\n时放置音符"
 HOW_TO_PLAY_BLOCK3,"Only placed notes\nhave effects","只有已放置\n的音符才有效"
+SCORING_RELICS,"Loose Change income:","零钱收入:"
 TUTORIAL_NODYING,"No dying during a tutorial!",(TODO)
 TUTORIAL_DIALOGUE_1,"Hello, welcome to Midnight Riff!",(TODO)
 TUTORIAL_DIALOGUE_2,"This is a rhythm game where notes more right to left.",(TODO)
@@ -107,5 +108,4 @@ TUTORIAL_PLACE_6,"Now go ahead, place a note in the bottom lane!",(TODO)
 TUTORIAL_FINAL_1,"Good job, you placed a note! You either healed yourself, or dealt damage. I can't tell I'm just a Strawman.",(TODO)
 TUTORIAL_FINAL_2,"As a refresher: Hit notes to build a combo and fill the bar. When the bar is full, press one of your buttons for a lane that doesn't have a note at the current beat. Notes in the chart will loop around. Keep it up to win.",(TODO)
 TUTORIAL_FINAL_3,"Good luck! I believe in you.",(TODO)
-TUTORIAL_BOSS,"This may take some getting used to, but death is ok in the grand scheme of things. Just have some patience with yourself, you'll learn in the end.",(TODO)
-RELIC_PLACED,"Loose Change income:","零钱收入:"
+TUTORIAL_BOSS,"This may take some getting used to, but death is ok in the grand scheme of things. Just have some patience with yourself, you'll learn in the end.",(TODO)

Scenes/BattleDirector/Scripts/BattleDirector.cs

@@ -110,7 +110,7 @@ public override void _Ready()
         Harbinger.Instance.InvokeBattleStarted();
     }
 
-    private ScoringScreen.ScoreGuide _battleScore;
+    public ScoringScreen.ScoreGuide BattleScore;
 
     private void InitScoringGuide()
     {
@@ -119,20 +119,20 @@ private void InitScoringGuide()
         {
             baseMoney += enem.BaseMoney;
         }
-        _battleScore = new ScoringScreen.ScoreGuide(baseMoney, Player.GetCurrentHealth());
+        BattleScore = new ScoringScreen.ScoreGuide(baseMoney, Player.GetCurrentHealth());
         Harbinger.Instance.NotePlaced += (_) =>
         {
-            _battleScore.IncPlaced();
+            BattleScore.IncPlaced();
         };
         Harbinger.Instance.NoteHit += (_) =>
         {
-            _battleScore.IncHits();
+            BattleScore.IncHits();
         };
         Harbinger.Instance.NoteHit += (e) =>
         {
             if (e is Harbinger.NoteHitArgs { Timing: Timing.Perfect })
-                _battleScore.IncPerfects();
-            _battleScore.IncHits();
+                BattleScore.IncPerfects();
+            BattleScore.IncHits();
         };
     }
 
@@ -290,7 +290,6 @@ private void CheckBattleStatus(PuppetTemplate puppet) //Called when a puppet die
         {
             if (!IsBattleWon())
                 return;
-            Harbinger.Instance.InvokeBattleEnded();
             CM.ProcessMode = ProcessModeEnum.Disabled;
             tween.TweenCallback(Callable.From(OnBattleWon));
         }
@@ -303,10 +302,11 @@ private bool IsBattleWon()
 
     private void OnBattleWon()
     {
+        Harbinger.Instance.InvokeBattleEnded();
         CleanUpRelics();
-        _battleScore.SetEndHp(Player.GetCurrentHealth());
+        BattleScore.SetEndHp(Player.GetCurrentHealth());
         Audio.ProcessMode = ProcessModeEnum.Always;
-        ScoringScreen.CreateScore(this, _battleScore).Finished += () =>
+        ScoringScreen.CreateScore(this, BattleScore).Finished += () =>
         {
             ShowRewardSelection(3);
         };

Scenes/UI/ScoreScreen.tscn

@@ -148,7 +148,7 @@ text = "SCORING_PLACED"
 
 [node name="RelicLabel" type="Label" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/LabelMargin/LabelVbox"]
 layout_mode = 2
-text = "RELIC_PLACED"
+text = "SCORING_RELICS"
 
 [node name="Placeholder" type="Label" parent="Bg/WindowMargin/PanelBg/VBoxContainer/MarginContainer/BottomPanelBg/HBoxContainer/LabelMargin/LabelVbox"]
 layout_mode = 2

Scenes/UI/Scripts/ScoringScreen.cs

@@ -12,6 +12,7 @@ public struct ScoreGuide
         public int TotalHits = 0;
         public int TotalPerfects = 0;
         public int TotalPlaced = 0;
+        public int RelicBonus = 0;
         public float StartingHealth = 0;
         public float EndingHealth = 0;
 
@@ -41,6 +42,11 @@ public void IncPlaced()
             TotalPlaced++;
         }
 
+        public void IncRelicBonus(int amount)
+        {
+            RelicBonus += amount;
+        }
+
         public void SetEndHp(float amount)
         {
             EndingHealth = amount;
@@ -83,24 +89,15 @@ public void SetEndHp(float amount)
     private int _totalBaseMoney;
     private float _perfectMulti;
     private float _placedMulti;
-    private bool _hasChange;
-    private int _changeAmount = Scribe.RelicDictionary[10].Effects[0].Value;
-    private int FinalMoney =>
-        (int)(_totalBaseMoney * _perfectMulti * _placedMulti) + (_hasChange ? _changeAmount : 0);
+    private int _relicBonus;
+    private int FinalMoney => (int)(_totalBaseMoney * _perfectMulti * _placedMulti) + _relicBonus;
 
     public delegate void FinishedHandler();
     public event FinishedHandler Finished;
 
     public override void _Ready()
     {
         _acceptButton.Pressed += FinishScoring;
-
-        _hasChange = StageProducer.PlayerStats.CurRelics.Contains(Scribe.RelicDictionary[10]);
-        if (!_hasChange)
-        {
-            _relicLabel.Visible = false;
-            _relicAmount.Visible = false;
-        }
     }
 
     public override void _Process(double delta)
@@ -128,6 +125,7 @@ private void GenerateScore(ScoreGuide info)
         if (float.IsNaN(_perfectMulti))
             _perfectMulti = 1;
         _placedMulti = Math.Max(2 - (float)Math.Abs(info.TotalPlaced - info.BaseMoney) / 10, 1);
+        _relicBonus = info.RelicBonus;
         DrawScoreLabels();
     }
 
@@ -141,10 +139,15 @@ private int CalcTotalBase(ScoreGuide info)
 
     private void DrawScoreLabels()
     {
+        if (_relicBonus <= 0)
+        {
+            _relicLabel.Visible = false;
+            _relicAmount.Visible = false;
+        }
         _styleAmount.Text = $"{_totalBaseMoney}";
         _perfectsAmount.Text = $"X{_perfectMulti:0.00}";
         _placedAmount.Text = $"X{_placedMulti:0.00}";
-        _relicAmount.Text = $"+{_changeAmount}";
+        _relicAmount.Text = $"+{_relicBonus}";
         _totalAmount.Text = $"{FinalMoney}";
     }