fix: add patch to get random map seed for randomizer

ryantanrk · Jun 13, 2024 · 4b99bf2 · 4b99bf2
1 parent 2168c9f
commit 4b99bf2
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 6 deletions.
diff --git a/Behaviours/KeyboardPhysicsProp.cs b/Behaviours/KeyboardPhysicsProp.cs
@@ -8,12 +8,17 @@ internal class KeyboardPhysicsProp : PhysicsProp
 
         float _lastTriggeredTime;
 
-        private System.Random? randomizer;
+        private static System.Random? randomizer;
+
+        public static void OnSeedUpdate()
+        {
+            randomizer = new System.Random(DingusThings.GetRandomMapSeed());
+        }
 
         public override void Start()
         {
             base.Start();
-            int seed = StartOfRound.Instance.randomMapSeed + StartOfRound.Instance.currentLevelID + itemProperties.itemId;
+            int seed = itemProperties.itemId;
             randomizer = new System.Random(seed);
         }
 

diff --git a/DingusThings.cs b/DingusThings.cs
@@ -1,5 +1,6 @@
 using BepInEx;
 using BepInEx.Logging;
+using DingusThings.Behaviours;
 using DingusThings.CustomScriptableObject;
 using DingusThings.Patches;
 using HarmonyLib;
@@ -23,10 +24,7 @@ public class DingusThings : BaseUnityPlugin
 
         private static Terminal? terminalInstance;
 
-        public static void SetTerminalInstance(Terminal terminal)
-        {
-            terminalInstance = terminal;
-        }
+        private static int randomMapSeed = 0;
 
         public static Terminal? GetTerminalInstance()
         {
@@ -40,6 +38,23 @@ public static void SetTerminalInstance(Terminal terminal)
             }
         }
 
+        public static void SetTerminalInstance(Terminal terminal)
+        {
+            terminalInstance = terminal;
+        }
+
+        public static int GetRandomMapSeed()
+        {
+            return randomMapSeed;
+        }
+
+        public static void SetRandomMapSeed(int s)
+        {
+            randomMapSeed = s;
+            // update keyboard physics prop seed
+            KeyboardPhysicsProp.OnSeedUpdate();
+        }
+
         private void Awake()
         {
             Logger = base.Logger;

diff --git a/Patches/SeedPatch.cs b/Patches/SeedPatch.cs
@@ -0,0 +1,16 @@
+using DingusThings.Behaviours;
+using HarmonyLib;
+
+namespace DingusThings.Patches
+{
+    internal class SeedPatch
+    {
+        [HarmonyPatch(typeof(StartOfRound), nameof(StartOfRound.ChooseNewRandomMapSeed))]
+        [HarmonyPostfix]
+        public static void StartOfRound_ChooseNewRandomMapSeed(StartOfRound __instance)
+        {
+            // save random map seed to our instance
+            DingusThings.SetRandomMapSeed(__instance.randomMapSeed);
+        }
+    }
+}