merge identicals and better equality checker

DREDGE-Mods · Sep 14, 2024 · b103d3c · b103d3c
1 parent 41b8853
commit b103d3c
Show file tree

Hide file tree

Showing 2 changed files with 41 additions and 4 deletions.
diff --git a/Winch/Data/ExtendedSaveData.cs b/Winch/Data/ExtendedSaveData.cs
@@ -106,6 +106,8 @@ internal void ExtractModdedData()
             }
         }
 
+        baseSaveData.serializedCrabPotPOIs = baseSaveData.serializedCrabPotPOIs.MergeIdenticals();
+
         var potsToRemove = new List<SerializedCrabPotPOIData>();
         foreach (var crabPotPOI in baseSaveData.serializedCrabPotPOIs)
         {
@@ -185,6 +187,8 @@ internal void InsertModdedData()
             }
         }
 
+        saveData.serializedCrabPotPOIs = saveData.serializedCrabPotPOIs.MergeIdenticals();
+
         var potsToRemove = new List<SerializedCrabPotPOIData>();
         foreach (var crabPotPOI in saveData.serializedCrabPotPOIs)
         {
@@ -213,7 +217,7 @@ internal void InsertModdedData()
                 crabPotPOI.grid.spatialUnderlayItems = existingUnderlayItems;
             }
 
-            if (baseSaveData.serializedCrabPotPOIs.TryGetValue(pot => pot.Identical(crabPotPOI), out var baseCrabPotPOI))
+            if (baseSaveData.serializedCrabPotPOIs.TryGetValue(pot => pot.Identical(crabPotPOI) && pot != crabPotPOI, out var baseCrabPotPOI))
             {
                 baseCrabPotPOI.grid.spatialItems.AddRange(existingItems);
                 baseCrabPotPOI.grid.spatialUnderlayItems.AddRange(existingUnderlayItems);

diff --git a/Winch/Util/WinchExtensions.cs b/Winch/Util/WinchExtensions.cs
@@ -1053,14 +1053,17 @@ public static string ToPrintedString(this AchievementData achievement)
         return printStr;
     }
 
+    public static string ToIdentity(this SerializedCrabPotPOIData crabPotPOI)
+    {
+        return $"{crabPotPOI.deployableItemId}: ({crabPotPOI.x}, {crabPotPOI.z}), {crabPotPOI.lastUpdate}, {crabPotPOI.timeUntilNextCatchRoll}, {crabPotPOI.durability}, {crabPotPOI.hadDurabilityRemaining}";
+    }
+
     /// <summary>
     /// Checks if both crab pot POI datas have identical serializable data excluding <see cref="SerializedCrabPotPOIData.grid"/>
     /// </summary>
     public static bool Identical(this SerializedCrabPotPOIData a, SerializedCrabPotPOIData b)
     {
-        return a.deployableItemId == b.deployableItemId && a.x == b.x && a.z == b.z
-                    && a.lastUpdate == b.lastUpdate && a.timeUntilNextCatchRoll == b.timeUntilNextCatchRoll
-                    && a.durability == b.durability && a.hadDurabilityRemaining == b.hadDurabilityRemaining;
+        return a.ToIdentity() == b.ToIdentity();
     }
 
     /// <summary>
@@ -1080,6 +1083,36 @@ public static SerializedCrabPotPOIData MakeIdentical(this SerializedCrabPotPOIDa
         return partialCrabPot;
     }
 
+    public static List<SerializedCrabPotPOIData> MergeIdenticals(this List<SerializedCrabPotPOIData> list)
+    {
+        var rootDict = new Dictionary<string, SerializedCrabPotPOIData>();
+        var duplicatesDict = new Dictionary<string, List<SerializedCrabPotPOIData>>();
+        foreach (var crabPotPOI in list)
+        {
+            var identity = crabPotPOI.ToIdentity();
+            if (!rootDict.ContainsKey(identity))
+            {
+                rootDict.Add(identity, crabPotPOI);
+                duplicatesDict.Add(identity, new List<SerializedCrabPotPOIData>());
+            }
+            else
+                duplicatesDict[identity].Add(crabPotPOI);
+        }
+
+        foreach (var identity in duplicatesDict.Keys)
+        {
+            var root = rootDict[identity];
+            var duplicates = duplicatesDict[identity];
+            foreach (var duplicate in duplicates)
+            {
+                root.grid.spatialItems.AddRange(duplicate.grid.spatialItems);
+                root.grid.spatialUnderlayItems.AddRange(duplicate.grid.spatialUnderlayItems);
+            }
+        }
+
+        return rootDict.Values.ToList();
+    }
+
     public static IEnumerator CheckIsSaveAllowedToBeLoaded(this TitleController titleController, int slotNum, SaveData s, Selectable selectable, Action<bool> callback)
     {
         WinchCore.Log.Debug("[TitleController] CheckIsSaveAllowedToBeLoaded()");