Updated to Cymanti Rework. Rewrote (and fixed) json merging logic and fixed audio crash.

Author: johnklipi

PolyMod.csproj

@@ -10,8 +10,8 @@
             https://polymod.dev/nuget/v3/index.json;
         </RestoreAdditionalProjectSources>
         <Configurations>IL2CPP</Configurations>
-        <Version>1.2.3-pre.1</Version>
-        <PolytopiaVersion>2.15.0.15019</PolytopiaVersion>
+        <Version>1.2.3</Version>
+        <PolytopiaVersion>2.15.0.15024</PolytopiaVersion>
         <Authors>PolyModdingTeam</Authors>
         <Description>The Battle of Polytopia's mod loader.</Description>
         <NoWarn>IDE0130</NoWarn>

src/Json/JsonMerger.cs

@@ -15,6 +15,19 @@ public static class JsonMerger
     /// <param name="patch">The patch JObject to merge.</param>
     /// <returns>The merged JObject.</returns>
     public static JObject Merge(JObject original, JObject patch)
+    {
+        patch = MergeRecursive(original, patch);
+        original.Merge(patch, new() { MergeArrayHandling = MergeArrayHandling.Replace, MergeNullValueHandling = MergeNullValueHandling.Merge });
+        return original;
+    }
+
+    /// <summary>
+    /// Recursively applies custom merging logic to arrays.
+    /// </summary>
+    /// <param name="original"></param>
+    /// <param name="patch"></param>
+    /// <returns></returns>
+    private static JObject MergeRecursive(JObject original, JObject patch)
     {
         foreach (var property in patch.Properties().ToArray().ToList())
         {
@@ -25,43 +38,26 @@ public static JObject Merge(JObject original, JObject patch)
             JToken? originalValue = original[propName];
             JToken patchValue = property.Value;
 
-            if (originalValue == null)
-            {
-                JArray? patchArray = patchValue.TryCast<JArray>();
-                if (patchArray != null)
-                {
-                    bool isSkins = propName.Equals("skins", StringComparison.OrdinalIgnoreCase);
-                    JArray merged = MergeArrays(new JArray(), patchArray, isSkins);
-                    original[propName] = merged;
-                }
-                else
-                {
-                    original[propName] = patchValue;
-                }
-                continue;
-            }
-
-            JObject? originalObj = originalValue.TryCast<JObject>();
-            JObject? patchObj = patchValue.TryCast<JObject>();
-            if (originalObj != null && patchObj != null)
+            if (patchValue.Type == JTokenType.Array)
             {
-                Merge(originalObj, patchObj);
-                continue;
-            }
+                if (originalValue == null)
+                    originalValue = new JArray();
 
-            JArray? originalArr = originalValue.TryCast<JArray>();
-            JArray? patchArr = patchValue.TryCast<JArray>();
-            if (originalArr != null && patchArr != null)
-            {
+                JArray originalArr = originalValue.Cast<JArray>();
+                JArray patchArr = patchValue.Cast<JArray>();
                 bool isSkins = propName.Equals("skins", StringComparison.OrdinalIgnoreCase);
                 JArray merged = MergeArrays(originalArr, patchArr, isSkins);
-                original[propName] = merged;
-                continue;
+                patch[propName] = merged;
             }
-            original[propName] = patchValue;
-        }
+            else if (patchValue.Type == JTokenType.Object)
+            {
+                if (originalValue == null || originalValue.Type != JTokenType.Object)
+                    originalValue = new JObject();
 
-        return original;
+                MergeRecursive(originalValue.Cast<JObject>(), patchValue.Cast<JObject>());
+            }
+        }
+        return patch;
     }
 
     /// <summary>
@@ -73,22 +69,10 @@ public static JObject Merge(JObject original, JObject patch)
     /// <returns>The merged JArray.</returns>
     private static JArray MergeArrays(JArray original, JArray patch, bool isSkins)
     {
-        if (patch.Count == 0)
-            return new JArray();
-
         var result = new JArray(original);
         var patchList = patch._values.ToArray().ToList();
 
-        bool hasDirectValues = patchList.Any(v =>
-            v.Type == JTokenType.String &&
-            !v.ToString().StartsWith("+") &&
-            !v.ToString().StartsWith("-"));
-
-        if (!isSkins && hasDirectValues)
-        {
-            result = new JArray();
-        }
-
+        bool hasCustomValues = false;
         foreach (var token in patchList)
         {
             if (token.Type != JTokenType.String)
@@ -102,10 +86,8 @@ private static JArray MergeArrays(JArray original, JArray patch, bool isSkins)
             if (str.StartsWith("+"))
             {
                 string value = str.Substring(1);
-                if (!result._values.ToArray().Any(t => t.Type == JTokenType.String && t.ToString() == value))
-                {
-                    result.Add(value);
-                }
+                result.Add(value);
+                hasCustomValues = true;
             }
             else if (str.StartsWith("-"))
             {
@@ -115,23 +97,18 @@ private static JArray MergeArrays(JArray original, JArray patch, bool isSkins)
                     .ToList();
                 foreach (var rem in toRemove)
                     result.Remove(rem);
+                hasCustomValues = true;
             }
-            else
+            else if(isSkins)
             {
-                if (isSkins)
-                {
-                    if (!result._values.ToArray().Any(t => t.Type == JTokenType.String && t.ToString() == str))
-                    {
-                        result.Add(str);
-                    }
-                }
-                else
-                {
-                    result.Add(str);
-                }
+                result.Add(str);
+                hasCustomValues = true;
             }
         }
-
+        if(!hasCustomValues)
+        {
+            result = new JArray(patch);
+        }
         return result;
     }
 }

src/Managers/Audio.cs

@@ -17,11 +17,11 @@ public static class Audio
     [HarmonyPatch(typeof(AudioManager), nameof(AudioManager.SetupData))]
     private static void AudioManager_SetupData()
     {
-        foreach (var item in Registry.customTribes)
+        foreach (var item in PolytopiaDataManager.GetLatestGameLogicData().AllTribeData)
         {
-            if (PolytopiaDataManager.GetLatestGameLogicData().TryGetData(item, out TribeData data))
+            if((int)item.Key >= Plugin.AUTOIDX_STARTS_FROM)
             {
-                AudioManager.instance.climateTribeMap.Add(data.climate, item);
+                AudioManager.instance.climateTribeMap.Add(item.Value.climate, item.Key);
             }
         }
     }