Game now saves MaxComboBar, added field medic event

We never actually needed to save MaxComboBar since energy drink was an onPickup effect. With this event, we now need to save the MaxComboBar value between sessions.

Also adjusted event 2's translations and healing effect since I messed up both of those.

Author: cornerloan

Classes/Events/EventDatabase.cs

@@ -47,40 +47,40 @@ public partial class EventDatabase
             1,
             "EVENT_EVENT2_DESC",
             ["EVENT_EVENT2_OPTION1", "EVENT_EVENT2_OPTION2"],
-            ["", "EVENT_EVENT1_OUTCOME1"],
+            ["", "EVENT_EVENT2_OUTCOME1"],
             [
                 (self) =>
                 {
                     StageProducer.PlayerStats.Money -= 20;
                     // [do nothing, get money back, win money, get note, get relic, heal]
                     int spinOutcome = (int)
-                        StageProducer.GlobalRng.RandWeighted([13, 8, 5, 5, 3, 3]);
+                        StageProducer.GlobalRng.RandWeighted([13, 8, 5, 5, 3, 3]); //TODO: adjust odds
                     switch (spinOutcome)
                     {
                         case 0: //do nothing AKA lose
                             GD.Print("owned lol");
-                            self.OutcomeDescriptions[0] = "EVENT_EVENT1_OUTCOME2";
+                            self.OutcomeDescriptions[0] = "EVENT_EVENT2_OUTCOME2";
                             break;
                         case 1: // get money back
                             GD.Print("refund");
-                            self.OutcomeDescriptions[0] = "EVENT_EVENT1_OUTCOME3";
+                            self.OutcomeDescriptions[0] = "EVENT_EVENT2_OUTCOME3";
                             StageProducer.PlayerStats.Money += 20;
                             break;
                         case 2: // get triple money
                             GD.Print("triple money");
-                            self.OutcomeDescriptions[0] = "EVENT_EVENT1_OUTCOME4";
+                            self.OutcomeDescriptions[0] = "EVENT_EVENT2_OUTCOME4";
                             StageProducer.PlayerStats.Money += 60;
                             break;
                         case 3: // get random note
                             GD.Print("random note");
-                            self.OutcomeDescriptions[0] = "EVENT_EVENT1_OUTCOME5";
+                            self.OutcomeDescriptions[0] = "EVENT_EVENT2_OUTCOME5";
                             StageProducer.PlayerStats.AddNote(
                                 Scribe.GetRandomRewardNotes(1, StageProducer.CurRoom + 10)[0]
                             );
                             break;
                         case 4: // get random relic
                             GD.Print("random relic");
-                            self.OutcomeDescriptions[0] = "EVENT_EVENT1_OUTCOME6";
+                            self.OutcomeDescriptions[0] = "EVENT_EVENT2_OUTCOME6";
                             StageProducer.PlayerStats.AddRelic(
                                 Scribe.GetRandomRelics(
                                     1,
@@ -91,8 +91,8 @@ public partial class EventDatabase
                             break;
                         case 5:
                             GD.Print("heal");
-                            self.OutcomeDescriptions[0] = "EVENT_EVENT1_OUTCOME7";
-                            StageProducer.PlayerStats.CurrentHealth = Math.Max(
+                            self.OutcomeDescriptions[0] = "EVENT_EVENT2_OUTCOME7";
+                            StageProducer.PlayerStats.CurrentHealth = Math.Min(
                                 StageProducer.PlayerStats.CurrentHealth + 20,
                                 StageProducer.PlayerStats.MaxHealth
                             );
@@ -104,7 +104,34 @@ public partial class EventDatabase
                 },
             ],
             GD.Load<Texture2D>("res://Classes/Events/Assets/TEMP.png"),
-            [() => StageProducer.PlayerStats.Money > 20, () => true]
+            [() => StageProducer.PlayerStats.Money >= 20, () => true]
+        ),
+        new EventTemplate(
+            2,
+            "EVENT_EVENT3_DESC",
+            ["EVENT_EVENT3_OPTION1", "EVENT_EVENT3_OPTION2", "EVENT_EVENT3_OPTION3"],
+            ["EVENT_EVENT3_OUTCOME1", "EVENT_EVENT3_OUTCOME2", "EVENT_EVENT3_OUTCOME3"],
+            [
+                (self) =>
+                {
+                    StageProducer.PlayerStats.CurrentHealth = Math.Min(
+                        StageProducer.PlayerStats.CurrentHealth + 10,
+                        StageProducer.PlayerStats.MaxHealth
+                    );
+                },
+                (self) =>
+                {
+                    StageProducer.PlayerStats.MaxComboBar -= 5;
+                },
+                (self) =>
+                {
+                    StageProducer.PlayerStats.Money -= 30;
+                    StageProducer.PlayerStats.AddNote(Scribe.NoteDictionary[3]);
+                    StageProducer.PlayerStats.AddNote(Scribe.NoteDictionary[3]);
+                },
+            ],
+            GD.Load<Texture2D>("res://Classes/Events/Assets/TEMP.png"),
+            [() => true, () => true, () => StageProducer.PlayerStats.Money >= 30]
         ),
     };
 }

Globals/SaveSystem.cs

@@ -386,6 +386,7 @@ public class SaveFile
         public int[] RelicIds { get; init; }
         public int PlayerHealth { get; init; }
         public int Shortcuts { get; init; }
+        public int PlayerMaxCombo { get; init; }
 
         public SaveFile(
             ulong rngSeed,
@@ -396,7 +397,8 @@ public SaveFile(
             int playerHealth,
             int area,
             int money,
-            int shortcuts
+            int shortcuts,
+            int playerMaxCombo
         )
         {
             RngSeed = rngSeed;
@@ -408,6 +410,7 @@ int shortcuts
             Area = area;
             Money = money;
             Shortcuts = shortcuts;
+            PlayerMaxCombo = playerMaxCombo;
         }
     }
 
@@ -424,7 +427,8 @@ public static void SaveGame()
             StageProducer.PlayerStats.CurrentHealth,
             StageProducer.CurLevel.Id,
             StageProducer.PlayerStats.Money,
-            StageProducer.PlayerStats.Shortcuts
+            StageProducer.PlayerStats.Shortcuts,
+            StageProducer.PlayerStats.MaxComboBar
         );
         string json = JsonSerializer.Serialize(sv);
 

Globals/StageProducer.cs

@@ -104,6 +104,7 @@ private bool LoadGame()
         PlayerStats.CurrentHealth = sv.PlayerHealth;
         PlayerStats.Money = sv.Money;
         PlayerStats.Shortcuts = sv.Shortcuts;
+        PlayerStats.MaxComboBar = sv.PlayerMaxCombo;
         IsInitialized = true;
         return true;
     }

Globals/Translations/Translations.csv

@@ -138,10 +138,17 @@ EVENT_EVENT1_OUTCOME3,"You got robbed of half your gold.",(TODO)
 EVENT_EVENT2_DESC,"There is a slot machine.",(TODO)
 EVENT_EVENT2_OPTION1,"Pay 20g to spin",(TODO)
 EVENT_EVENT2_OPTION2,"Ignore the machine",(TODO)
-EVENT_EVENT1_OUTCOME1,"You saved your money and moved on.",(TODO)
-EVENT_EVENT1_OUTCOME2,"You lost your money.",(TODO)
-EVENT_EVENT1_OUTCOME3,"You refunded your money.",(TODO)
-EVENT_EVENT1_OUTCOME4,"You tripled your money.",(TODO)
-EVENT_EVENT1_OUTCOME5,"You gained a random note.",(TODO)
-EVENT_EVENT1_OUTCOME6,"You gained a random relic.",(TODO)
-EVENT_EVENT1_OUTCOME7,"You gained some health.",(TODO)
+EVENT_EVENT2_OUTCOME1,"You saved your money and moved on.",(TODO)
+EVENT_EVENT2_OUTCOME2,"You lost your money.",(TODO)
+EVENT_EVENT2_OUTCOME3,"You refunded your money.",(TODO)
+EVENT_EVENT2_OUTCOME4,"You tripled your money.",(TODO)
+EVENT_EVENT2_OUTCOME5,"You gained a random note.",(TODO)
+EVENT_EVENT2_OUTCOME6,"You gained a random relic.",(TODO)
+EVENT_EVENT2_OUTCOME7,"You gained some health.",(TODO)
+EVENT_EVENT3_DESC,"There is a field medic on the side of the road.",(TODO)
+EVENT_EVENT3_OPTION1,"Receive a bit of healing",(TODO)
+EVENT_EVENT3_OPTION2,"Decrease max energy",(TODO)
+EVENT_EVENT3_OPTION3,"Purchase 2 heal notes (30g)",(TODO)
+EVENT_EVENT3_OUTCOME1,"The medic patched you up.\nYou restored 10 Health.",(TODO)
+EVENT_EVENT3_OUTCOME2,"The medic gave you a shot of adrenaline.\nMax Energy reduced by 5.",(TODO)
+EVENT_EVENT3_OUTCOME3,"The medic sold you some healing supplies.\nAdded 2 heal notes to your inventory.",(TODO)