Merge branch 'dev1.2' into techbranch

Author: IExploitableMan

PolyMod.csproj

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

resources/localization.json

@@ -160,5 +160,29 @@
 		"Portuguese (Brazil)": "Essa versão do PolyMod não foi desenvolvida para a versão atual do aplicativo e pode não funcionar corretamente!",
 		"Elyrion": "πȱ∫ỹmȱδ ƒƒƒƒƒƒƒ ŋȱŧ ȱrrȱ #₺rr∑ŋŧ ƒƒƒƒƒƒƒ ỹ maỹ ŋȱŧ ~ȱr§ #ȱrr∑#ŧ∫ỹ!",
 		"German (Germany)": "Diese Version von PolyMod ist nicht für die aktuelle Version der Anwendung ausgelegt und könnte nicht funktionieren!"
+	},
+	"polymod_hub_config": {
+		"English": "SETTINGS"
+	},
+	"polymod_hub_debugenable": {
+		"English": "ENABLE DEBUG"
+	},
+	"polymod_hub_debugdisable": {
+		"English": "DISABLE DEBUG"
+	},
+	"polymod_hub_debugswitch": {
+		"English": "Debug set to {0}."
+	},
+	"polymod_hub_updatespriteinfos": {
+		"English": "UPDATE SPRITES"
+	},
+	"polymod_spriteinfo_updated": {
+		"English": "Sprite info for mod {0} updated."
+	},
+	"polymod_spriteinfo_notupdated": {
+		"English": "No sprite infos were found."
+	},
+	"polymod_popup_header": {
+		"English": "POLYMOD"
 	}
 }

src/Loader.cs

@@ -303,24 +303,44 @@ public static void LoadSpriteFile(Mod mod, Mod.File file)
 		Registry.sprites.Add(name, sprite);
 	}
 
-	public static void LoadSpriteInfoFile(Mod mod, Mod.File file)
+	public static void UpdateSprite(string name)
+	{
+		if (Registry.spriteInfos.ContainsKey(name) && Registry.sprites.ContainsKey(name))
+		{
+			Visual.SpriteInfo spriteData = Registry.spriteInfos[name];
+			Sprite sprite = Visual.BuildSpriteWithTexture(Registry.sprites[name].texture, spriteData.pivot, (float)spriteData.pixelsPerUnit);
+			GameManager.GetSpriteAtlasManager().cachedSprites["Heads"][name] = sprite;
+			Registry.sprites[name] = sprite;
+		}
+	}
+
+	public static Dictionary<string, Visual.SpriteInfo>? LoadSpriteInfoFile(Mod mod, Mod.File file)
 	{
 		try
 		{
-			Registry.spriteInfos = Registry.spriteInfos
-				.Concat(JsonSerializer.Deserialize<Dictionary<string, Visual.SpriteInfo>>(
-					file.bytes,
-					new JsonSerializerOptions()
-					{
-						Converters = { new Vector2Json() },
-					}
-				)!)
-				.ToDictionary(e => e.Key, e => e.Value);
-			Plugin.logger.LogInfo($"Registried sprite data from {mod.id} mod");
+			var deserialized = JsonSerializer.Deserialize<Dictionary<string, Visual.SpriteInfo>>(
+				file.bytes,
+				new JsonSerializerOptions()
+				{
+					Converters = { new Vector2Json() },
+				}
+			);
+
+			if (deserialized != null)
+			{
+				foreach (var kvp in deserialized)
+				{
+					Registry.spriteInfos[kvp.Key] = kvp.Value;
+				}
+			}
+
+			Plugin.logger.LogInfo($"Registered sprite data from {mod.id} mod");
+			return deserialized;
 		}
 		catch (Exception e)
 		{
 			Plugin.logger.LogError($"Error on loading sprite data from {mod.id} mod: {e.Message}");
+			return null;
 		}
 	}
 

src/Managers/Compatibility.cs

@@ -6,14 +6,13 @@
 namespace PolyMod.Managers;
 internal static class Compatibility
 {
-    internal static string signature = string.Empty;
-    internal static string looseSignature = string.Empty;
+    internal static string checksum = string.Empty;
+    internal static bool shouldResetSettings = false;
     private static bool sawSignatureWarning;
 
-    public static void HashSignatures(StringBuilder looseSignatureString, StringBuilder signatureString)
+    public static void HashSignatures(StringBuilder checksumString)
     {
-        looseSignature = Util.Hash(looseSignatureString);
-        signature = Util.Hash(signatureString);
+        checksum = Util.Hash(checksumString);
     }
 
     private static bool CheckSignatures(Action<int, BaseEventData> action, int id, BaseEventData eventData, Il2CppSystem.Guid gameId)
@@ -24,15 +23,15 @@ private static bool CheckSignatures(Action<int, BaseEventData> action, int id, B
             return true;
         }
 
-        string[] signatures = { string.Empty, string.Empty };
+        string signature = string.Empty;
         try
         {
-            signatures = File.ReadAllLines(Path.Combine(Application.persistentDataPath, $"{gameId}.signatures"));
+            signature = File.ReadAllText(Path.Combine(Application.persistentDataPath, $"{gameId}.signatures"));
         }
         catch { }
-        if (signatures[0] == string.Empty && signatures[1] == string.Empty) return true;
+        if (signature == string.Empty) return true;
         if (Plugin.config.debug) return true;
-        if (looseSignature != signatures[0])
+        if (checksum != signature)
         {
             PopupManager.GetBasicPopup(new(
                 Localization.Get("polymod.signature.mismatch"),
@@ -43,30 +42,29 @@ private static bool CheckSignatures(Action<int, BaseEventData> action, int id, B
             )).Show();
             return false;
         }
-        if (signature != signatures[1])
-        {
-            PopupManager.GetBasicPopup(new(
-                Localization.Get("polymod.signature.mismatch"),
-                Localization.Get("polymod.signature.maybe.incompatible"),
-                new(new PopupBase.PopupButtonData[] {
-                    new(
-                        "OK",
-                        callback: (UIButtonBase.ButtonAction)((int _, BaseEventData _) => {
-                            sawSignatureWarning = true;
-                            action(id, eventData);
-                        })
-                    )
-                })
-            )).Show();
-            return false;
-        }
         return true;
     }
 
     [HarmonyPostfix]
     [HarmonyPatch(typeof(StartScreen), nameof(StartScreen.Start))]
     private static void StartScreen_Start()
     {
+        string lastChecksum = checksum;
+        try
+        {
+            lastChecksum = new(File.ReadAllText(Plugin.CHECKSUM_PATH));
+        }
+        catch (FileNotFoundException){}
+
+        File.WriteAllText(
+            Plugin.CHECKSUM_PATH,
+            checksum
+        );
+        if (lastChecksum != checksum)
+        {
+            shouldResetSettings = true;
+        }
+
         Version incompatibilityWarningLastVersion = Plugin.POLYTOPIA_VERSION.CutRevision();
         try
         {
@@ -139,10 +137,29 @@ private static void ClientBase_CreateSession(GameSettings settings, Il2CppSystem
     {
         File.WriteAllLinesAsync(
             Path.Combine(Application.persistentDataPath, $"{gameId}.signatures"),
-            new string[] { looseSignature, signature }
+            new string[] { checksum }
         );
     }
 
+    [HarmonyPrefix]
+    [HarmonyPatch(typeof(TribeSelectorScreen), nameof(TribeSelectorScreen.Show))]
+    private static bool TribeSelectorScreen_Show(bool instant = false)
+    {
+        if (shouldResetSettings)
+        {
+            RestorePreliminaryGameSettings();
+            shouldResetSettings = false;
+        }
+        return true;
+    }
+
+    internal static void RestorePreliminaryGameSettings()
+    {
+        GameManager.PreliminaryGameSettings.disabledTribes.Clear();
+        GameManager.PreliminaryGameSettings.selectedSkins.Clear();
+        GameManager.PreliminaryGameSettings.SaveToDisk();
+    }
+
     internal static void Init()
     {
         Harmony.CreateAndPatchAll(typeof(Compatibility));