Merge branch 'main' into dev1.3

Author: johnklipi

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.16.5.15700</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>

docs/.gitignore

@@ -0,0 +1,3 @@
+_site/
+api/
+.cache/

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
+    }
+  }
+}

docs/docs/introduction.md

@@ -0,0 +1 @@
+# Introduction

docs/docs/toc.yml

@@ -0,0 +1,2 @@
+- name: Introduction
+  href: introduction.md

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.

docs/toc.yml

@@ -0,0 +1,4 @@
+- name: Docs
+  href: docs/
+- name: API
+  href: api/

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++;
@@ -912,6 +912,7 @@ internal static void ProcessGameLogicData(GameLogicData gameLogicData, JObject r
 		try
 		{
 			CreateMappings(rootObject);
+			ProcessCustomTribes();
 			ProcessPrefabs();
 			ProcessEmbarkOverrides();
 			ProcessAttractOverrides();
@@ -922,6 +923,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>

src/Managers/Visual.cs

@@ -413,6 +413,19 @@ private static void PolytopiaSpriteRenderer_ForceUpdateMesh(PolytopiaSpriteRende
 		}
 	}
 
+    [HarmonyPostfix]
+    [HarmonyPatch(typeof(Tile), nameof(Tile.Render), typeof(MapRenderContext), typeof(SkinVisualsTransientData))]
+    private static void Tile_Render(Tile __instance, MapRenderContext ctx, SkinVisualsTransientData transientSkinningData)
+    {
+        Sprite? sprite = Registry.GetSprite("hidden");
+		if(sprite != null)
+		{
+			__instance.fogOfWarRenderer.atlasName = "";
+			__instance.fogOfWarRenderer.sprite = sprite;
+			__instance.fogOfWarRenderer.spriteRenderer.sprite = sprite;
+		}
+    }
+
 	#endregion
 	#region TribePreview