Updated to last poly ver, fixed custom resources not appearing, adjusted the way unit prefabs are added to units.

Author: johnklipi

PolyMod.csproj

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

src/Loader.cs

@@ -143,7 +143,8 @@ internal record TypeMapping(Type type, bool shouldCreateCache = true);
 					if (Enum.TryParse(prefabId, out ImprovementData.Type parsedType))
 						improvementPrefabType = parsedType;
 				}
-				PrefabManager.improvements.TryAdd((ImprovementData.Type)Registry.autoidx, PrefabManager.improvements[improvementPrefabType]);
+				if(token["idx"] != null)
+					PrefabManager.improvements.TryAdd((ImprovementData.Type)(int)token["idx"], PrefabManager.improvements[improvementPrefabType]);
 			}
 			else
 			{
@@ -173,7 +174,8 @@ internal record TypeMapping(Type type, bool shouldCreateCache = true);
 					if (Enum.TryParse(prefabId, out ResourceData.Type parsedType))
 						resourcePrefabType = parsedType;
 				}
-				PrefabManager.resources.TryAdd((ResourceData.Type)Registry.autoidx, PrefabManager.resources[resourcePrefabType]);
+				if(token["idx"] != null)
+					PrefabManager.resources.TryAdd((ResourceData.Type)(int)token["idx"], PrefabManager.resources[resourcePrefabType]);
 			}
 		}),
 
@@ -926,13 +928,15 @@ internal static void ProcessPrefabs()
 			else
 			{
 				KeyValuePair<Visual.PrefabInfo, Unit> prefabInfo = Registry.unitPrefabs.FirstOrDefault(kv => kv.Key.name == prefabId);
+				int hashKey = PrefabManager.GetSkinnedHashKey((UnitData.Type)item.Key, TribeType.None, SkinType.Default);
 				if (!EqualityComparer<Visual.PrefabInfo>.Default.Equals(prefabInfo.Key, default))
 				{
-					PrefabManager.units.TryAdd(item.Key, prefabInfo.Value);
+					PrefabManager.units.TryAdd(hashKey, prefabInfo.Value);
 				}
 				else
 				{
-					PrefabManager.units.TryAdd(item.Key, PrefabManager.units[(int)unitPrefabType]);
+					int existingPrefabKey = PrefabManager.GetSkinnedHashKey(unitPrefabType, TribeType.None, SkinType.Default);
+					PrefabManager.units.TryAdd(hashKey, PrefabManager.units[existingPrefabKey]);
 				}
 			}
 		}