Merge

johnklipi · johnklipi · commit 9262d6d8ba9b · 2025-05-22T18:02:30.000+02:00
diff --git a/PolyMod.csproj b/PolyMod.csproj
@@ -10,8 +10,8 @@
             https://polymod.dev/nuget/v3/index.json;
         </RestoreAdditionalProjectSources>
         <Configurations>IL2CPP</Configurations>
-        <Version>1.2.0-pre.1</Version>
-        <PolytopiaVersion>2.13.0.14200</PolytopiaVersion>
+        <Version>1.2.0-pre</Version>
+        <PolytopiaVersion>2.13.0.14218</PolytopiaVersion>
         <Authors>PolyModdingTeam</Authors>
         <Description>The Battle of Polytopia's mod loader.</Description>
         <NoWarn>IDE0130</NoWarn>
diff --git a/src/Managers/Loc.cs b/src/Managers/Loc.cs
@@ -14,7 +14,15 @@ private static void SetDescription(SelectTribePopup __instance)
 	{
 		if ((int)__instance.SkinType >= Plugin.AUTOIDX_STARTS_FROM)
 		{
-			__instance.Description = Localization.Get(__instance.SkinType.GetLocalizationDescriptionKey()) + "\n\n" + Localization.GetSkinned(__instance.SkinType, __instance.tribeData.description2, new Il2CppSystem.Object[]
+			string description = Localization.Get(__instance.SkinType.GetLocalizationDescriptionKey());
+			if (description == __instance.SkinType.GetLocalizationDescriptionKey())
+			{
+				description = Localization.Get(__instance.tribeData.description, new Il2CppSystem.Object[]
+				{
+					Localization.Get(__instance.tribeData.displayName),
+				});
+			}
+			__instance.Description = description + "\n\n" + Localization.GetSkinned(__instance.SkinType, __instance.tribeData.description2, new Il2CppSystem.Object[]
 			{
 				__instance.tribeName,
 				Localization.Get(__instance.startTechSid, Array.Empty<Il2CppSystem.Object>())

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,15 @@ private static void SetDescription(SelectTribePopup __instance)`
`14`	`14`	`{`
`15`	`15`	`if ((int)__instance.SkinType >= Plugin.AUTOIDX_STARTS_FROM)`
`16`	`16`	`{`
`17`		`- __instance.Description = Localization.Get(__instance.SkinType.GetLocalizationDescriptionKey()) + "\n\n" + Localization.GetSkinned(__instance.SkinType, __instance.tribeData.description2, new Il2CppSystem.Object[]`
	`17`	`+ string description = Localization.Get(__instance.SkinType.GetLocalizationDescriptionKey());`
	`18`	`+ if (description == __instance.SkinType.GetLocalizationDescriptionKey())`
	`19`	`+ {`
	`20`	`+ description = Localization.Get(__instance.tribeData.description, new Il2CppSystem.Object[]`
	`21`	`+ {`
	`22`	`+ Localization.Get(__instance.tribeData.displayName),`
	`23`	`+ });`
	`24`	`+ }`
	`25`	`+ __instance.Description = description + "\n\n" + Localization.GetSkinned(__instance.SkinType, __instance.tribeData.description2, new Il2CppSystem.Object[]`
`18`	`26`	`{`
`19`	`27`	`__instance.tribeName,`
`20`	`28`	`Localization.Get(__instance.startTechSid, Array.Empty<Il2CppSystem.Object>())`