From 56d7be5334580e51a2207fef06d35e44a91236a5 Mon Sep 17 00:00:00 2001
From: fahad-accordion-19 <fahad.1979.hassan@gmail.com>
Date: Mon, 20 Oct 2025 06:30:56 +0500
Subject: [PATCH] Remove `<type>` from minimap schema and templates

The <minimap> element in resource templates previously included a <type>
child element that was required by CCmpMinimap.cpp. This commit removes
the <type> field from the minimap schema in CCmpMinimap.cpp and from all
affected templates, making the minimap component resource-agnostic and
simplifying template definitions.

Refs: #8170
---
 .../public/simulation/templates/mixins/shrine.xml    |  1 -
 .../simulation/templates/mixins/trading_post.xml     |  1 -
 .../simulation/templates/template_gaia_fish.xml      |  1 -
 .../simulation/templates/template_gaia_fruit.xml     |  1 -
 .../simulation/templates/template_gaia_ore.xml       |  1 -
 .../simulation/templates/template_gaia_rock.xml      |  1 -
 .../simulation/templates/template_gaia_ruins.xml     |  1 -
 .../simulation/templates/template_gaia_treasure.xml  |  1 -
 .../simulation/templates/template_gaia_tree.xml      |  1 -
 .../simulation/templates/template_structure.xml      |  1 -
 .../template_structure_civic_civil_centre.xml        |  1 -
 .../templates/template_structure_wonder.xml          |  1 -
 .../public/simulation/templates/template_unit.xml    |  1 -
 .../simulation/templates/template_unit_fauna.xml     |  1 -
 .../simulation/templates/template_unit_hero.xml      |  1 -
 .../simulation/templates/template_unit_support.xml   |  1 -
 .../templates/units/han/support_minister.xml         |  1 -
 source/simulation2/components/CCmpMinimap.cpp        | 12 ------------
 18 files changed, 29 deletions(-)

diff --git a/binaries/data/mods/public/simulation/templates/mixins/shrine.xml b/binaries/data/mods/public/simulation/templates/mixins/shrine.xml
index 7dd7f0cfdd..af1eec0980 100644
--- a/binaries/data/mods/public/simulation/templates/mixins/shrine.xml
+++ b/binaries/data/mods/public/simulation/templates/mixins/shrine.xml
@@ -19,7 +19,6 @@
     <Undeletable>true</Undeletable>
   </Identity>
   <Minimap>
-    <Type>structure</Type>
     <Icon size="16.0">other.png</Icon>
   </Minimap>
   <Obstruction>
diff --git a/binaries/data/mods/public/simulation/templates/mixins/trading_post.xml b/binaries/data/mods/public/simulation/templates/mixins/trading_post.xml
index 3df00ed197..8a6774e189 100644
--- a/binaries/data/mods/public/simulation/templates/mixins/trading_post.xml
+++ b/binaries/data/mods/public/simulation/templates/mixins/trading_post.xml
@@ -9,7 +9,6 @@
     <Undeletable>true</Undeletable>
   </Identity>
   <Minimap>
-    <Type>structure</Type>
     <Icon size="16.0">other.png</Icon>
   </Minimap>
   <Researcher>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_fish.xml b/binaries/data/mods/public/simulation/templates/template_gaia_fish.xml
index 02e51d8b99..493cc507a0 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_fish.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_fish.xml
@@ -10,7 +10,6 @@
     <Tooltip>Catch fish for food.</Tooltip>
   </Identity>
   <Minimap>
-    <Type>food</Type>
     <Color r="227" g="130" b="141"/>
   </Minimap>
   <Obstruction>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_fruit.xml b/binaries/data/mods/public/simulation/templates/template_gaia_fruit.xml
index 855ac6edd9..1576c63bef 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_fruit.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_fruit.xml
@@ -10,7 +10,6 @@
     <Icon>gaia/flora_bush_berry.png</Icon>
   </Identity>
   <Minimap>
-    <Type>food</Type>
     <Color r="155" g="204" b="102"/>
   </Minimap>
   <Obstruction>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_ore.xml b/binaries/data/mods/public/simulation/templates/template_gaia_ore.xml
index 47531f3eab..7490793e9c 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_ore.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_ore.xml
@@ -10,7 +10,6 @@
     <Icon>gaia/geology_metal.png</Icon>
   </Identity>
   <Minimap>
-    <Type>metal</Type>
     <Color r="227" g="159" b="12"/>
     <Icon size="16.0">metal.png</Icon>
   </Minimap>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_rock.xml b/binaries/data/mods/public/simulation/templates/template_gaia_rock.xml
index 892d53f26d..d218941e87 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_rock.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_rock.xml
@@ -10,7 +10,6 @@
     <Icon>gaia/geology_stone.png</Icon>
   </Identity>
   <Minimap>
-    <Type>stone</Type>
     <Color r="170" g="170" b="170"/>
     <Icon size="16.0">stone.png</Icon>
   </Minimap>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml b/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml
index e95abcc902..1adeffcfe2 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_ruins.xml
@@ -10,7 +10,6 @@
     <Icon>gaia/geology_stone.png</Icon>
   </Identity>
   <Minimap>
-    <Type>stone</Type>
     <Color r="128" g="128" b="128"/>
   </Minimap>
   <Obstruction>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_treasure.xml b/binaries/data/mods/public/simulation/templates/template_gaia_treasure.xml
index 59cee2717f..bda23274f2 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_treasure.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_treasure.xml
@@ -10,7 +10,6 @@
     <Icon>gaia/special_treasure.png</Icon>
   </Identity>
   <Minimap>
-    <Type>metal</Type>
     <Color r="250" g="250" b="250"/>
   </Minimap>
   <Obstruction>
diff --git a/binaries/data/mods/public/simulation/templates/template_gaia_tree.xml b/binaries/data/mods/public/simulation/templates/template_gaia_tree.xml
index be256fa46a..e207a674ee 100644
--- a/binaries/data/mods/public/simulation/templates/template_gaia_tree.xml
+++ b/binaries/data/mods/public/simulation/templates/template_gaia_tree.xml
@@ -10,7 +10,6 @@
     <Icon>gaia/flora_tree_generic.png</Icon>
   </Identity>
   <Minimap>
-    <Type>wood</Type>
     <Color r="69" g="107" b="68"/>
   </Minimap>
   <Obstruction>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure.xml b/binaries/data/mods/public/simulation/templates/template_structure.xml
index 2660820ba3..63e24fabbe 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure.xml
@@ -57,7 +57,6 @@
   </Loot>
   <Looter/>
   <Minimap>
-    <Type>structure</Type>
   </Minimap>
   <Obstruction>
     <Active>true</Active>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
index 961d0f80c6..2936b5f2e3 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_civic_civil_centre.xml
@@ -85,7 +85,6 @@
     <metal>50</metal>
   </Loot>
   <Minimap>
-    <Type>structure</Type>
     <Icon size="16.0">civil_centre.png</Icon>
   </Minimap>
   <Obstruction>
diff --git a/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml b/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
index b27eafe61f..d2cd9d271d 100644
--- a/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
+++ b/binaries/data/mods/public/simulation/templates/template_structure_wonder.xml
@@ -50,7 +50,6 @@
     <metal>200</metal>
   </Loot>
   <Minimap>
-    <Type>structure</Type>
     <Icon size="16.0">wonder.png</Icon>
   </Minimap>
   <Obstruction>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit.xml b/binaries/data/mods/public/simulation/templates/template_unit.xml
index a4ebb96111..96e4146cb2 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit.xml
@@ -43,7 +43,6 @@
   </Identity>
   <Looter/>
   <Minimap>
-    <Type>unit</Type>
   </Minimap>
   <Obstruction>
     <Unit/>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml b/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
index fcdf4b94fd..87fa591f4f 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_fauna.xml
@@ -14,7 +14,6 @@
   </Identity>
   <Loot disable=""/>
   <Minimap>
-    <Type>food</Type>
     <Color r="227" g="130" b="141"/>
   </Minimap>
   <Position>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
index 2a9108d415..d0cdb2ac71 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_hero.xml
@@ -37,7 +37,6 @@
     <metal>25</metal>
   </Loot>
   <Minimap>
-    <Type>hero</Type>
   </Minimap>
   <Selectable>
     <Overlay>
diff --git a/binaries/data/mods/public/simulation/templates/template_unit_support.xml b/binaries/data/mods/public/simulation/templates/template_unit_support.xml
index 3bb636c5e6..63f22d8450 100644
--- a/binaries/data/mods/public/simulation/templates/template_unit_support.xml
+++ b/binaries/data/mods/public/simulation/templates/template_unit_support.xml
@@ -6,7 +6,6 @@
     <GenericName>Support</GenericName>
   </Identity>
   <Minimap>
-    <Type>support</Type>
   </Minimap>
   <Position>
     <Anchor>upright</Anchor>
diff --git a/binaries/data/mods/public/simulation/templates/units/han/support_minister.xml b/binaries/data/mods/public/simulation/templates/units/han/support_minister.xml
index 12bd276521..9a3a1362d5 100644
--- a/binaries/data/mods/public/simulation/templates/units/han/support_minister.xml
+++ b/binaries/data/mods/public/simulation/templates/units/han/support_minister.xml
@@ -42,7 +42,6 @@
     <metal>10</metal>
   </Loot>
   <Minimap>
-    <Type>hero</Type>
   </Minimap>
   <Position>
     <TurnRate>8</TurnRate>
diff --git a/source/simulation2/components/CCmpMinimap.cpp b/source/simulation2/components/CCmpMinimap.cpp
index c6383b7aca..b452f50eb3 100644
--- a/source/simulation2/components/CCmpMinimap.cpp
+++ b/source/simulation2/components/CCmpMinimap.cpp
@@ -69,18 +69,6 @@ public:
 	static std::string GetSchema()
 	{
 		return
-			"<element name='Type'>"
-				"<choice>"
-					"<value>food</value>"
-					"<value>wood</value>"
-					"<value>stone</value>"
-					"<value>metal</value>"
-					"<value>structure</value>"
-					"<value>unit</value>"
-					"<value>support</value>"
-					"<value>hero</value>"
-				"</choice>"
-			"</element>"
 			"<optional>"
 				"<element name='Color'>"
 					"<attribute name='r'>"