Refine Shortcut Logic

This should be more elegant?
Especially if we add any other sources of shortcuts.
Only faulty aspect, is if we change values later, save files won't be accurate across versions, but whatever, because saves are readable text.

Author: LifeHckr

Globals/SaveSystem.cs

@@ -385,7 +385,7 @@ public class SaveFile
         public int[] NoteIds { get; init; }
         public int[] RelicIds { get; init; }
         public int PlayerHealth { get; init; }
-        public int UsedShortcuts { get; init; }
+        public int Shortcuts { get; init; }
 
         public SaveFile(
             ulong rngSeed,
@@ -396,7 +396,7 @@ public SaveFile(
             int playerHealth,
             int area,
             int money,
-            int usedShortcuts
+            int shortcuts
         )
         {
             RngSeed = rngSeed;
@@ -407,7 +407,7 @@ int usedShortcuts
             PlayerHealth = playerHealth;
             Area = area;
             Money = money;
-            UsedShortcuts = usedShortcuts;
+            Shortcuts = shortcuts;
         }
     }
 
@@ -424,7 +424,7 @@ public static void SaveGame()
             StageProducer.PlayerStats.CurrentHealth,
             StageProducer.CurLevel.Id,
             StageProducer.PlayerStats.Money,
-            StageProducer.PlayerStats.usedShortcuts
+            StageProducer.PlayerStats.Shortcuts
         );
         string json = JsonSerializer.Serialize(sv);
 

Globals/Scribe.cs

@@ -401,8 +401,9 @@ e is BattleDirector.Harbinger.OnDamageInstanceArgs dmgArgs
                 new RelicEffect(
                     BattleEffectTrigger.OnPickup,
                     1,
-                    (e, self, val) => {
-                        // this no longer has an effect, we just check that the player has looted it :)
+                    (e, self, val) =>
+                    {
+                        StageProducer.PlayerStats.Shortcuts += 1;
                     }
                 ),
             }

Globals/StageProducer.cs

@@ -103,7 +103,7 @@ private bool LoadGame()
         }
         PlayerStats.CurrentHealth = sv.PlayerHealth;
         PlayerStats.Money = sv.Money;
-        PlayerStats.usedShortcuts = sv.UsedShortcuts;
+        PlayerStats.Shortcuts = sv.Shortcuts;
         IsInitialized = true;
         return true;
     }

Scenes/Maps/Scripts/Cartographer.cs

@@ -87,11 +87,9 @@ private void DrawMapSprite(MapGrid.Room room)
         AddChild(newButton);
         bool isChild = StageProducer.GetCurRoom().Children.Contains(room.Idx);
 
-        // checks if the next room is one below current room, player has shortcut, and player hasn't used all its charges
+        // checks if the next room is one below current room, player has shortcuts
         bool isLaneChangeAllowed =
-            room.Y == StageProducer.GetCurRoom().Y + 1
-            && StageProducer.PlayerStats.usedShortcuts < Scribe.RelicDictionary[13].Effects[0].Value
-            && StageProducer.PlayerStats.CurRelics.Any(r => r.Id == Scribe.RelicDictionary[13].Id);
+            room.Y == StageProducer.GetCurRoom().Y + 1 && StageProducer.PlayerStats.Shortcuts > 0;
 
         //button is disabled if it is not a child of current room.
         //unless player has charges of lane changing
@@ -111,7 +109,7 @@ private void DrawMapSprite(MapGrid.Room room)
             newButton.Pressed += () =>
             {
                 if (!isChild)
-                    StageProducer.PlayerStats.usedShortcuts++;
+                    StageProducer.PlayerStats.Shortcuts--;
 
                 EnterStage(room.Idx, newButton);
             };

Scenes/Puppets/Scripts/PlayerStats.cs

@@ -14,7 +14,7 @@ public partial class PlayerStats : Resource
     public int NotesToIncreaseCombo = 4;
     public int RewardAmountModifier = 0;
     public int Rerolls = 0;
-    public int usedShortcuts = 0;
+    public int Shortcuts = 0;
 
     //Array in order of descending rarities, Legendary -> ... Common. Int odds out of 100.
     public int[] RarityOdds = [1, 5, 10, 20, 100];