ui2 multiplayer part update

Demonofpower · Demonofpower · commit d103aed34e6c · 2026-07-06T21:54:05.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -406,4 +406,6 @@ dist/
 
 # End of https://www.toptal.com/developers/gitignore/api/csharp
 
-run.bat
+run.bat
+
+.idea/
diff --git a/PolyMod.csproj b/PolyMod.csproj
@@ -12,11 +12,14 @@
         <Configurations>IL2CPP</Configurations>
         <RootNamespace>PolyMod</RootNamespace>
         <Version>1.3.0-pre</Version>
-        <PolytopiaVersion>2.16.4.15698</PolytopiaVersion>
+        <PolytopiaVersion>2.17.2.16299</PolytopiaVersion>
         <Authors>PolyModdingTeam</Authors>
         <Description>The Battle of Polytopia's mod loader.</Description>
         <NoWarn>IDE0130</NoWarn>
         <NoWarn>NU5104</NoWarn>
+        <NoWarn>$(NoWarn);NU1902</NoWarn>
+        <NoWarn>$(NoWarn);NU1903</NoWarn>
+        <NoWarn>$(NoWarn);NU1904</NoWarn>
     </PropertyGroup>
 
     <ItemGroup>
diff --git a/docs/.gitignore b/docs/.gitignore
@@ -0,0 +1,3 @@
+_site/
+api/
+.cache/
diff --git a/docs/docfx.json b/docs/docfx.json
@@ -0,0 +1,46 @@
+{
+  "$schema": "https://raw.githubusercontent.com/dotnet/docfx/main/schemas/docfx.schema.json",
+  "metadata": [
+    {
+      "src": [
+        {
+          "src": "..",
+          "files": [
+            "**/*.csproj"
+          ]
+        }
+      ],
+      "dest": "api"
+    }
+  ],
+  "build": {
+    "content": [
+      {
+        "files": [
+          "**/*.{md,yml}"
+        ],
+        "exclude": [
+          "_site/**"
+        ]
+      }
+    ],
+    "resource": [
+      {
+        "files": [
+          "images/**"
+        ]
+      }
+    ],
+    "output": "_site",
+    "template": [
+      "default",
+      "modern"
+    ],
+    "globalMetadata": {
+      "_appName": "PolyMod",
+      "_appTitle": "PolyMod",
+      "_enableSearch": true,
+      "pdf": false
+    }
+  }
+}
diff --git a/docs/docs/introduction.md b/docs/docs/introduction.md
@@ -0,0 +1 @@
+# Introduction
diff --git a/docs/docs/toc.yml b/docs/docs/toc.yml
@@ -0,0 +1,2 @@
+- name: Introduction
+  href: introduction.md
diff --git a/docs/index.md b/docs/index.md
@@ -0,0 +1,11 @@
+---
+_layout: landing
+---
+
+# This is the **HOMEPAGE**.
+
+Refer to [Markdown](http://daringfireball.net/projects/markdown/) for how to write markdown files.
+
+## Quick Start Notes:
+
+1. Add images to the *images* folder if the file is referencing an image.
diff --git a/docs/toc.yml b/docs/toc.yml
@@ -0,0 +1,4 @@
+- name: Docs
+  href: docs/
+- name: API
+  href: api/
diff --git a/src/Loader.cs b/src/Loader.cs
@@ -61,7 +61,7 @@ internal record TypeMapping(Type type, bool shouldCreateCache = true);
 			{
 				if (duringEnumCacheCreation)
 				{
-					Registry.customTribes.Add((TribeType)Registry.autoidx);
+					Registry.customTribes.Add((TribeType)(int)token["idx"]);
 					token["style"] = Registry.climateAutoidx;
 					token["climate"] = Registry.climateAutoidx;
 					Registry.climateAutoidx++;
@@ -183,18 +183,21 @@ out TribeAbility.Type tribeAbilityType
 			}
 			else
 			{
+				string improvementId = Util.GetJTokenName(token);
 				if (token["attractsResource"] != null)
 				{
-					string improvementId = Util.GetJTokenName(token);
 					string attractsId = token["attractsResource"].ToString();
 					Main.attractsResourceNames[improvementId] = attractsId;
 				}
 				if (token["attractsToTerrain"] != null)
 				{
-					string improvementId = Util.GetJTokenName(token);
 					string attractsId = token["attractsToTerrain"].ToString();
 					Main.attractsTerrainNames[improvementId] = attractsId;
 				}
+				if(token["infoOverride"] != null)
+				{
+					Loc.buildingsInfoOverrides[improvementId] = Loc.ReplaceDashesWithDots(token["infoOverride"].ToString());
+				}
 			}
 		})
 		},
@@ -912,6 +915,7 @@ internal static void ProcessGameLogicData(GameLogicData gameLogicData, JObject r
 		try
 		{
 			CreateMappings(rootObject);
+			ProcessCustomTribes();
 			ProcessPrefabs();
 			ProcessEmbarkOverrides();
 			ProcessAttractOverrides();
@@ -922,6 +926,17 @@ internal static void ProcessGameLogicData(GameLogicData gameLogicData, JObject r
 		}
 	}
 
+	internal static void ProcessCustomTribes()
+	{
+		foreach (var tribe in Registry.customTribes)
+		{
+			if(!GameLogicData.legacyTribeTypesOrder.Contains(tribe))
+			{
+				GameLogicData.legacyTribeTypesOrder.Add(tribe);
+			}
+		}
+	}
+
 	/// <summary>
 	/// Creates EnumCache mappings for custom enum values and invokes type handlers.
 	/// </summary>
diff --git a/src/Managers/AutoUpdate.cs b/src/Managers/AutoUpdate.cs
@@ -15,8 +15,8 @@ internal static class AutoUpdate
     /// Checks for updates when the start screen is shown.
     /// </summary>
     [HarmonyPostfix]
-    [HarmonyPatch(typeof(StartScreen), nameof(StartScreen.Start))]
-    private static void StartScreen_Start()
+    [HarmonyPatch(typeof(StartScreen_UI2), nameof(StartScreen_UI2.OnShow))]
+    private static void StartScreen_UI2_OnShow()
     {
         if (!Plugin.config.autoUpdate) return;
         if (Environment.GetEnvironmentVariable("WINEPREFIX") != null)
@@ -154,7 +154,7 @@ exit 0
             }
 
             // Show a popup to the user asking if they want to update
-            PopupManager.GetBasicPopup(new(
+            PopupManager.GetBasicPopupWithData(new(
                 Localization.Get("polymod.autoupdate"),
                 Localization.Get("polymod.autoupdate.description"),
                 new(new PopupBase.PopupButtonData[] {
diff --git a/src/Managers/Compatibility.cs b/src/Managers/Compatibility.cs
@@ -34,7 +34,7 @@ public static void HashSignatures(StringBuilder checksumString)
     /// Checks the signature of a saved game to ensure it is compatible with the current mods.
     /// </summary>
     /// <returns>True if the signatures match or if the check is ignored, false otherwise.</returns>
-    private static bool CheckSignatures(Action<int, BaseEventData> action, int id, BaseEventData eventData, Il2CppSystem.Guid gameId)
+    private static bool CheckSignatures(Action action, Il2CppSystem.Guid gameId)
     {
         if (sawSignatureWarning)
         {
@@ -67,13 +67,14 @@ private static bool CheckSignatures(Action<int, BaseEventData> action, int id, B
         }
         if (!doChecksumsMatch)
         {
-            PopupManager.GetBasicPopup(new(
+            PopupManager.GetBasicPopupWithData(new(
                 Localization.Get("polymod.signature.mismatch"),
                 Localization.Get("polymod.signature.incompatible"),
                 new(new PopupBase.PopupButtonData[] {
                     new("OK")
                 })
             )).Show();
+
             return false;
         }
         return true;
@@ -83,8 +84,8 @@ private static bool CheckSignatures(Action<int, BaseEventData> action, int id, B
     /// Performs compatibility checks when the start screen is shown.
     /// </summary>
     [HarmonyPostfix]
-    [HarmonyPatch(typeof(StartScreen), nameof(StartScreen.Start))]
-    private static void StartScreen_Start()
+    [HarmonyPatch(typeof(StartScreen_UI2), nameof(StartScreen_UI2.OnShow))]
+    private static void StartScreen_UI2_OnShow()
     {
         string lastChecksum = checksum;
         try
@@ -113,18 +114,20 @@ private static void StartScreen_Start()
                 VersionManager.SemanticVersion.Cast().CutRevision().ToString()
             );
             PlayerPrefs.Save();
-            PopupManager.GetBasicPopup(new(
-                Localization.Get("polymod.version.mismatch"),
-                Localization.Get("polymod.version.mismatch.description"),
-                new(new PopupBase.PopupButtonData[] {
-                    new("buttons.stay", customColorStates: ColorConstants.redButtonColorStates),
-                    new(
-                        "buttons.exitgame",
-                        PopupBase.PopupButtonData.States.None,
-                        (Il2CppSystem.Action)Application.Quit,
-                        closesPopup: false
-                    )
-                }))
+            PopupManager.GetBasicPopupWithData(
+                new(
+                    Localization.Get("polymod.version.mismatch"),
+                    Localization.Get("polymod.version.mismatch.description"),
+                    new PopupBase.PopupButtonData[] {
+                        new("buttons.stay", customColorStates: ColorConstants.redButtonColorStates),
+                        new(
+                            "buttons.exitgame",
+                            PopupBase.PopupButtonData.States.None,
+                            (Il2CppSystem.Action)Application.Quit,
+                            closesPopup: false
+                        )
+                    }
+                )
             ).Show();
         }
     }
@@ -134,19 +137,19 @@ private static void StartScreen_Start()
     /// </summary>
     [HarmonyPrefix]
     [HarmonyPatch(typeof(GameInfoPopup), nameof(GameInfoPopup.OnMainButtonClicked))]
-    private static bool GameInfoPopup_OnMainButtonClicked(GameInfoPopup __instance, int id, BaseEventData eventData)
+    private static bool GameInfoPopup_OnMainButtonClicked(GameInfoPopup __instance)
     {
-        return CheckSignatures(__instance.OnMainButtonClicked, id, eventData, __instance.gameId);
+        return CheckSignatures(__instance.OnMainButtonClicked, __instance.gameId);
     }
 
     /// <summary>
     /// Checks the signature of a single-player game before resuming it.
     /// </summary>
     [HarmonyPrefix]
-    [HarmonyPatch(typeof(StartScreen), nameof(StartScreen.OnResumeButtonClick))]
-    private static bool StartScreen_OnResumeButtonClick(StartScreen __instance, int id, BaseEventData eventData)
+    [HarmonyPatch(typeof(StartScreen_UI2), nameof(StartScreen_UI2.OnResumeButtonLongPress))]
+    private static bool StartScreen_OnResumeButtonClick(StartScreen_UI2 __instance)
     {
-        return CheckSignatures(__instance.OnResumeButtonClick, id, eventData, LocalSaveFileUtils.GetSaveFiles(PolytopiaBackendBase.Game.GameType.SinglePlayer)[0]);
+        return CheckSignatures(__instance.OnResumeButtonLongPress, LocalSaveFileUtils.GetSaveFiles(PolytopiaBackendBase.Game.GameType.SinglePlayer)[0]);
     }
 
     /// <summary>
diff --git a/src/Managers/Hub.cs b/src/Managers/Hub.cs
diff --git a/src/Managers/Loc.cs b/src/Managers/Loc.cs
diff --git a/src/Managers/Main.cs b/src/Managers/Main.cs
diff --git a/src/Managers/Visual.cs b/src/Managers/Visual.cs
diff --git a/src/Multiplayer/Multiplayer.cs b/src/Multiplayer/Multiplayer.cs

-Original file line number
+Diff line change
 # End of https://www.toptal.com/developers/gitignore/api/csharp
 -run.bat
 +run.bat
++
 +.idea/
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+- name: Introduction`
	`2`	`+ href: introduction.md`
Original file line number	Diff line number	Diff line change
`@@ -61,7 +61,7 @@ internal record TypeMapping(Type type, bool shouldCreateCache = true);`
`61`	`61`	`{`
`62`	`62`	`if (duringEnumCacheCreation)`
`63`	`63`	`{`
`64`		`- Registry.customTribes.Add((TribeType)Registry.autoidx);`
	`64`	`+ Registry.customTribes.Add((TribeType)(int)token["idx"]);`
`65`	`65`	`token["style"] = Registry.climateAutoidx;`
`66`	`66`	`token["climate"] = Registry.climateAutoidx;`
`67`	`67`	`Registry.climateAutoidx++;`
`@@ -183,18 +183,21 @@ out TribeAbility.Type tribeAbilityType`
`183`	`183`	`}`
`184`	`184`	`else`
`185`	`185`	`{`
	`186`	`+ string improvementId = Util.GetJTokenName(token);`
`186`	`187`	`if (token["attractsResource"] != null)`
`187`	`188`	`{`
`188`		`- string improvementId = Util.GetJTokenName(token);`
`189`	`189`	`string attractsId = token["attractsResource"].ToString();`
`190`	`190`	`Main.attractsResourceNames[improvementId] = attractsId;`
`191`	`191`	`}`
`192`	`192`	`if (token["attractsToTerrain"] != null)`
`193`	`193`	`{`
`194`		`- string improvementId = Util.GetJTokenName(token);`
`195`	`194`	`string attractsId = token["attractsToTerrain"].ToString();`
`196`	`195`	`Main.attractsTerrainNames[improvementId] = attractsId;`
`197`	`196`	`}`
	`197`	`+ if(token["infoOverride"] != null)`
	`198`	`+ {`
	`199`	`+ Loc.buildingsInfoOverrides[improvementId] = Loc.ReplaceDashesWithDots(token["infoOverride"].ToString());`
	`200`	`+ }`
`198`	`201`	`}`
`199`	`202`	`})`
`200`	`203`	`},`
`@@ -912,6 +915,7 @@ internal static void ProcessGameLogicData(GameLogicData gameLogicData, JObject r`
`912`	`915`	`try`
`913`	`916`	`{`
`914`	`917`	`CreateMappings(rootObject);`
	`918`	`+ ProcessCustomTribes();`
`915`	`919`	`ProcessPrefabs();`
`916`	`920`	`ProcessEmbarkOverrides();`
`917`	`921`	`ProcessAttractOverrides();`
`@@ -922,6 +926,17 @@ internal static void ProcessGameLogicData(GameLogicData gameLogicData, JObject r`
`922`	`926`	`}`
`923`	`927`	`}`
`924`	`928`
	`929`	`+ internal static void ProcessCustomTribes()`
	`930`	`+ {`
	`931`	`+ foreach (var tribe in Registry.customTribes)`
	`932`	`+ {`
	`933`	`+ if(!GameLogicData.legacyTribeTypesOrder.Contains(tribe))`
	`934`	`+ {`
	`935`	`+ GameLogicData.legacyTribeTypesOrder.Add(tribe);`
	`936`	`+ }`
	`937`	`+ }`
	`938`	`+ }`
	`939`	`+`
`925`	`940`	`/// <summary>`
`926`	`941`	`/// Creates EnumCache mappings for custom enum values and invokes type handlers.`
`927`	`942`	`/// </summary>`