Merge pull request #500 from hubastard/fix-exploration

NebulaModTeam · Jan 15, 2022 · b22ea81 · b22ea81
2 parents 2324c64 + acf72f1
commit b22ea81
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,9 +1,10 @@
 ## Changelog
 
-0.8.0:
+0.7.10:
 
 - @starfish: Added WarningSystem syncing
 - @PhantomGamers: Fixed case of NRE when arriving on another planet
+- @PhantomGamers: Fixed issue where Universe Exploration tech would break while in a multiplayer game
 
 0.7.9:
 

diff --git a/NebulaPatcher/Patches/Dynamic/UIPlanetDetail_Patch.cs b/NebulaPatcher/Patches/Dynamic/UIPlanetDetail_Patch.cs
@@ -9,8 +9,6 @@ namespace NebulaPatcher.Patches.Dynamic
     [HarmonyPatch(typeof(UIPlanetDetail))]
     internal class UIPlanetDetail_Patch
     {
-        private static int BackupUniverseObserveLevel = -1;
-
         [HarmonyPostfix]
         [HarmonyPatch(nameof(UIPlanetDetail.OnNameInputEndEdit))]
         public static void OnNameInputEndEdit_Postfix(UIPlanetDetail __instance)
@@ -58,10 +56,9 @@ public static bool _OnUpdate_Prefix(UIPlanetDetail __instance)
         [HarmonyPatch(nameof(UIPlanetDetail.RefreshDynamicProperties))]
         public static bool OnPlanetDataSet_Prefix(UIPlanetDetail __instance)
         {
-            if(UIRoot.instance.galaxySelect.starmap.clickText != "")
+            if(Multiplayer.IsActive && Multiplayer.Session.IsInLobby)
             {
-                BackupUniverseObserveLevel = GameMain.history.universeObserveLevel;
-                GameMain.history.universeObserveLevel = 3;
+                GameMain.history.universeObserveLevel = 4;
             }
             return true;
         }
@@ -71,10 +68,9 @@ public static bool OnPlanetDataSet_Prefix(UIPlanetDetail __instance)
         [HarmonyPatch(nameof(UIPlanetDetail.RefreshDynamicProperties))]
         public static void OnPlanetDataSet_Postfix(UIPlanetDetail __instance)
         {
-            if(BackupUniverseObserveLevel != -1)
+            if(Multiplayer.IsActive && Multiplayer.Session.IsInLobby)
             {
-                GameMain.history.universeObserveLevel = BackupUniverseObserveLevel;
-                BackupUniverseObserveLevel = -1;
+                GameMain.history.universeObserveLevel = SimulatedWorld.GetUniverseObserveLevel();
             }
         }
     }

diff --git a/NebulaWorld/MultiplayerSession.cs b/NebulaWorld/MultiplayerSession.cs
@@ -140,6 +140,11 @@ public void OnGameLoadCompleted()
                 Log.Info("Game load completed");
                 IsGameLoaded = true;
 
+                if (Multiplayer.Session.LocalPlayer.IsHost)
+                {
+                    GameMain.history.universeObserveLevel = SimulatedWorld.GetUniverseObserveLevel();
+                }
+
                 if (Multiplayer.Session.LocalPlayer.IsInitialDataReceived)
                 {
                     Multiplayer.Session.World.SetupInitialPlayerState();

diff --git a/NebulaWorld/SimulatedWorld.cs b/NebulaWorld/SimulatedWorld.cs
@@ -651,5 +651,21 @@ public void SetPauseIndicator(bool canPause)
             }
 
         }
+
+        public static int GetUniverseObserveLevel()
+        {
+            int level = 0;
+            // the tech ids of the 4 tiers of Universe Exploration from https://dsp-wiki.com/Upgrades
+            for (int i = 4104; i >= 4101; i--)
+            {
+                if (GameMain.history.TechUnlocked(i))
+                {
+                    // set level to last digit of tech id
+                    level = (i % 10);
+                    break;
+                }
+            }
+            return level;
+        }
     }
 }
diff --git a/version.json b/version.json
@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "0.7.9",
+  "version": "0.7.10",
   "assemblyVersion": {
     "precision": "build"
   },