Fix saves with missing last dock

DREDGE-Mods · Sep 7, 2024 · c02d7a5 · c02d7a5
1 parent f9a5f0a
commit c02d7a5
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/Winch/Data/ExtendedSaveData.cs b/Winch/Data/ExtendedSaveData.cs
@@ -132,10 +132,6 @@ internal void ExtractModdedData()
 
         internal void InsertModdedData()
         {
-            if (baseSaveData.dockId == "exampleitems.dock") // TODO: make save data handle last dock
-            {
-                baseSaveData.dockId = "dock.pontoon-gc";
-            }
             var gridsToRemove = new List<string>();
             foreach (var gridByKey in saveData.grids)
             {

diff --git a/Winch/Patches/API/GameSceneInitializerPatch.cs b/Winch/Patches/API/GameSceneInitializerPatch.cs
@@ -21,6 +21,7 @@ public static void Prefix(GameSceneInitializer __instance)
             HarvestZoneUtil.CreateModdedHarvestZones();
             WorldEventUtil.CreateModdedStaticWorldEvents();
             ItemUtil.Encyclopedia();
+            DockUtil.Fix();
             DredgeEvent.TriggerOnGameLoading(__instance);
         }
         catch (Exception ex)

diff --git a/Winch/Util/DockUtil.cs b/Winch/Util/DockUtil.cs
@@ -232,6 +232,9 @@ public static Dock GetDock(string id)
         if (ModdedDockDict.TryGetValue(id, out var moddedDock))
             return moddedDock;
 
+        if (ModdedDockDict.Values.TryGetValue(dock => dock.Data.Id == id, out var moddedDock2))
+            return moddedDock2;
+
         return null;
     }
 
@@ -284,6 +287,16 @@ public static void Populate()
         ResearchBottomlessLines = hceds.FirstOrDefault(hced => hced.name == "ResearchBottomlessLines");
     }
 
+    public static void Fix()
+    {
+        var id = GameManager.Instance.SaveData.dockId;
+        if (!AllDockDict.ContainsKey(id) && !ModdedDockDict.Values.Any(dock => dock.Data.Id == id))
+        {
+            GameManager.Instance.SaveData.dockId = AllDockDataDict.Keys.FirstOrDefault();
+            GameManager.Instance.SaveData.dockSlotIndex = 0;
+        }
+    }
+
     internal static void Clear()
     {
         AllDockDataDict.Clear();