Fixed crash and some visuals

Author: johnklipi

PolyMod.csproj

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

src/Managers/Compatibility.cs

@@ -151,7 +151,7 @@ private static bool GameInfoPopup_OnMainButtonClicked(GameInfoPopup __instance,
     [HarmonyPatch(typeof(StartScreen), nameof(StartScreen.OnResumeButtonClick))]
     private static bool StartScreen_OnResumeButtonClick(StartScreen __instance, int id, BaseEventData eventData)
     {
-        return CheckSignatures(__instance.OnResumeButtonClick, id, eventData, ClientBase.GetSinglePlayerSessions(GameManager.LocalPlayer.Id)[0]);
+        return CheckSignatures(__instance.OnResumeButtonClick, id, eventData, ClientBase.GetSinglePlayerSessions(0)[0]);
     }
 
     /// <summary>
@@ -198,11 +198,11 @@ private static void GameManager_MatchEnded(bool localPlayerIsWinner, ScoreDetail
     /// Creates a signature file when a new game session is created.
     /// </summary>
     [HarmonyPostfix]
-    [HarmonyPatch(typeof(ClientBase), nameof(ClientBase.CreateSession), typeof(GameSettings), typeof(Il2CppSystem.Guid))]
-    private static void ClientBase_CreateSession(GameSettings settings, Il2CppSystem.Guid gameId)
+    [HarmonyPatch(typeof(ClientBase), nameof(ClientBase.CreateSession), typeof(GameSettings), typeof(Il2CppSystem.Collections.Generic.List<PlayerState>))]
+    private static void ClientBase_CreateSession(ClientBase __instance, GameSettings settings, Il2CppSystem.Collections.Generic.List<PlayerState> players)
     {
         File.WriteAllTextAsync(
-            Path.Combine(Application.persistentDataPath, $"{gameId}.signatures"),
+            Path.Combine(Application.persistentDataPath, $"{__instance.gameId}.signatures"),
             checksum
         );
     }

src/Managers/Visual.cs

@@ -8,6 +8,7 @@
 using PolyMod.Json;
 using System.Text.Json.Serialization;
 using UnityEngine.EventSystems;
+using PolytopiaBackendBase.Auth;
 
 namespace PolyMod.Managers;
 
@@ -428,27 +429,28 @@ private static void CityRenderer_GetHouse(ref PolytopiaSpriteRenderer __result,
 	/// <summary>Provides custom sprites for houses in the UI city renderer.</summary>
 	[HarmonyPostfix]
 	[HarmonyPatch(typeof(UICityRenderer), nameof(UICityRenderer.GetResource))]
-	private static void UICityRenderer_GetResource(ref GameObject __result, string baseName, TribeData.Type tribe, SkinType skin)
+	private static void UICityRenderer_GetResource(ref GameObject __result, Il2CppInterop.Runtime.InteropTypes.Arrays.Il2CppReferenceArray<SpriteAddress> spriteAddresses)
 	{
-		Image imageComponent = __result.GetComponent<Image>();
-		string[] tokens = baseName.Split('_');
-		if (tokens.Length > 0)
+		foreach (var address in spriteAddresses)
 		{
-			if (tokens[0] == "House")
+			Image imageComponent = __result.GetComponent<Image>();
+			string[] tokens = address.sprite.Split('_');
+			if (tokens.Length == 3 && tokens[0] == "House")
 			{
-				int level = 0;
-				if (tokens.Length > 1)
+				if (tokens[0] == "House")
 				{
-					_ = int.TryParse(tokens[1], out level);
-				}
-
-				Sprite? sprite = Registry.GetSprite("house", Util.GetStyle(tribe, skin), level);
-				if (sprite == null)
-				{
-					return;
+					string style = tokens[1];
+					if(int.TryParse(tokens[2], out int level) && !string.IsNullOrEmpty(style))
+					{
+						Sprite? sprite = Registry.GetSprite("house", style, level);
+						if (sprite == null)
+						{
+							return;
+						}
+						imageComponent.sprite = sprite;
+						imageComponent.SetNativeSize();
+					}
 				}
-				imageComponent.sprite = sprite;
-				imageComponent.SetNativeSize();
 			}
 		}
 	}
@@ -514,12 +516,17 @@ private static void GameInfoRow_LoadFaceIcon(GameInfoRow __instance, TribeData.T
 
 	/// <summary>Provides custom sprites for player info icons.</summary>
 	[HarmonyPostfix]
-	[HarmonyPatch(typeof(PlayerInfoIcon), nameof(PlayerInfoIcon.SetData), typeof(TribeData.Type), typeof(SkinType), typeof(SpriteData.SpecialFaceIcon), typeof(Color), typeof(DiplomacyRelationState), typeof(PlayerInfoIcon.Mood))]
-	private static void PlayerInfoIcon_SetData(PlayerInfoIcon __instance, TribeData.Type tribe, SkinType skin, SpriteData.SpecialFaceIcon face, Color color, DiplomacyRelationState diplomacyState, PlayerInfoIcon.Mood mood)
+	[HarmonyPatch(typeof(PlayerInfoIcon), nameof(PlayerInfoIcon.SetData))]
+	private static void PlayerInfoIcon_SetData(PlayerInfoIcon __instance, PlayerState player, PlayerState otherPlayer, PlayerInfoIcon.Mood mood, bool shouldShowDiplomaticState, bool forceKnownPlayer)
 	{
-		if (face == SpriteData.SpecialFaceIcon.neutral)
+		GameState gameState = GameManager.GameState;
+		bool flag = player.IsAlive(gameState);
+		PlayerState localPlayer = GameManager.LocalPlayer;
+		bool flag2 = localPlayer.KnowsPlayer(player.Id) || forceKnownPlayer;
+
+		if (flag && !(localPlayer.Id != player.Id && !flag2))
 		{
-			Sprite? sprite = Registry.GetSprite("head", Util.GetStyle(tribe, skin));
+			Sprite? sprite = Registry.GetSprite("head", Util.GetStyle(player.tribe, player.skinType));
 			if (sprite != null)
 			{
 				__instance.HeadImage.sprite = sprite;

src/Plugin.cs

@@ -79,6 +79,7 @@ internal static readonly string CHECKSUM_PATH
 		"Couldn't find prefab for type",
 		"MARKET: id:",
 		"Missing name for value",
+		"Can't find atlas for raw name",
 	};