Changed the way head position marker is handled and closes #126

Author: johnklipi

src/Json/JsonMerger.cs

@@ -27,7 +27,17 @@ public static JObject Merge(JObject original, JObject patch)
 
             if (originalValue == null)
             {
-                original[propName] = patchValue;
+                JArray? patchArray = patchValue.TryCast<JArray>();
+                if (patchArray != null)
+                {
+                    bool isSkins = propName.Equals("skins", StringComparison.OrdinalIgnoreCase);
+                    JArray merged = MergeArrays(new JArray(), patchArray, isSkins);
+                    original[propName] = merged;
+                }
+                else
+                {
+                    original[propName] = patchValue;
+                }
                 continue;
             }
 

src/Loader.cs

@@ -652,13 +652,23 @@ public static void LoadPrefabInfoFile(Mod mod, Mod.File file)
 			var spriteContainer = unitInstance.transform.GetChild(0);
 			var material = ClearExistingPartsAndExtractMaterial(spriteContainer);
 
-			var visualParts = ApplyVisualParts(prefab.visualParts, spriteContainer, material, out Transform headMarker);
+			var visualParts = ApplyVisualParts(prefab, spriteContainer, material);
+
+			Transform? headPositionMarker = null;
+			foreach (var vp in visualParts)
+			{
+				if (vp.visualPart.gameObject.name == prefab.headPositionMarker)
+				{
+					headPositionMarker = vp.visualPart.gameObject.transform;
+					break;
+				}
+			}
+
+			unitInstance.headPositionMarker = headPositionMarker ?? visualParts[0].visualPart.transform;
 
 			var svr = unitInstance.GetComponent<SkinVisualsReference>();
 			svr.visualParts = visualParts.ToArray();
 
-			unitInstance.headPositionMarker = headMarker;
-
 			GameObject.DontDestroyOnLoad(unitInstance.gameObject);
 			Registry.unitPrefabs.Add(prefab, unitInstance.GetComponent<Unit>());
 
@@ -700,26 +710,20 @@ public static void LoadPrefabInfoFile(Mod mod, Mod.File file)
 	/// <param name="material">The material to use for the parts.</param>
 	/// <returns>A list of the created visual parts.</returns>
 	private static List<SkinVisualsReference.VisualPart> ApplyVisualParts(
-		List<Visual.VisualPartInfo> partInfos,
+		Visual.PrefabInfo prefab,
 		Transform spriteContainer,
-		Material? material,
-		out Transform headMarker)
+		Material? material)
 	{
+		if (prefab.visualParts.Count == 0)
+			return new List<SkinVisualsReference.VisualPart>();
+
 		List<SkinVisualsReference.VisualPart> parts = new();
-		headMarker = spriteContainer;
 
-		foreach (var info in partInfos)
+		foreach (var info in prefab.visualParts)
 		{
-			var vp = CreateVisualPart(info, spriteContainer, material);
-			if (info.headPositionMarker)
-			{
-				headMarker = vp.visualPart.transform;
-			}
-			parts.Add(vp);
+			parts.Add(CreateVisualPart(info, spriteContainer, material));
 		}
 
-		if (headMarker == spriteContainer)
-			headMarker = parts[0].visualPart.gameObject.transform;
 		return parts;
 	}
 

src/Managers/Visual.cs

@@ -66,7 +66,12 @@ public enum PrefabType
 	}
 
 	/// <summary>Represents information about a custom prefab.</summary>
-	public record PrefabInfo(PrefabType type, string name, List<VisualPartInfo> visualParts);
+	public record PrefabInfo(
+		PrefabType type,
+		string name,
+		List<VisualPartInfo> visualParts,
+		string headPositionMarker = ""
+	);
 
 	/// <summary>Represents information about a visual part of a prefab.</summary>
 	public record VisualPartInfo(
@@ -75,8 +80,7 @@ public record VisualPartInfo(
 		float rotation = 0f,
 		Vector2 coordinates = new Vector2(),
 		Vector2 scale = new Vector2(),
-		bool tintable = false,
-		bool headPositionMarker = false
+		bool tintable = false
 	);
 	private static bool enableOutlines = false;
 	private static bool seenWarningWCPopup = false;