Refactor Capturable Farmstead feature/templates

Attempts to address Invalid warning messages for capturable farmsteads
and creates a mixin as suggested by @Langbart

Renames the "farmsteads_" template files to "mill_" to eliminate
confusion with standard buildable farmsteads and changes the refs in the
skirmish maps to suit.

Genericizes the name to Rotary Mill instead of Farmstead, again to
eliminate confusion between the two (the former is a capturable map
object, while the latter is a player-buildable structure).

Fixes #6818
Differential revision: https://code.wildfiregames.com/D5113
This was SVN commit r27835.

binaries/data/mods/public/simulation/data/auras/structures/farmstead_60.json

@@ -1,12 +1,12 @@
 {
 	"type": "range",
 	"radius": 60,
-	"affects": ["Gatherer", "Field"],
+	"affects": ["Worker", "Field"],
 	"modifications": [
 		{ "value": "ResourceGatherer/Rates/food.grain", "multiply": 1.75 }
 	],
 	"auraName": "Farmland",
-	"auraDescription": "Gatherers +75% farming rate around a captured Farmstead.",
+	"auraDescription": "Workers +75% grain gather rate around a captured Rotary Mill.",
 	"overlayIcon": "art/textures/ui/session/auras/farm_bonus.png",
 	"rangeOverlay" : {
 		"lineTexture": "outline_border.png",

binaries/data/mods/public/simulation/templates/mixins/rotary_mill.xml

@@ -1,59 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special">
+<Entity>
   <Auras datatype="tokens">
     structures/farmstead_60
   </Auras>
-  <BuildRestrictions>
-    <Territory>own neutral</Territory>
-    <Category>RotaryMill</Category>
-  </BuildRestrictions>
   <Capturable>
     <CapturePoints>500</CapturePoints>
     <RegenRate>0</RegenRate>
     <GarrisonRegenRate>3</GarrisonRegenRate>
   </Capturable>
-  <Cost>
-    <BuildTime>100</BuildTime>
-    <Resources>
-      <food>0</food>
-      <wood>200</wood>
-      <stone>100</stone>
-      <metal>0</metal>
-    </Resources>
-  </Cost>
   <Footprint replace="">
     <Circle radius="10.0"/>
     <Height>6.0</Height>
   </Footprint>
-  <GarrisonHolder disable=""/>
   <Health disable=""/>
   <Identity>
-    <Civ>gaia</Civ>
+    <GenericName>Rotary Mill</GenericName>
-    <GenericName>Farmstead</GenericName>
     <SpecificName>Rotary Mill</SpecificName>
-    <VisibleClasses datatype="tokens">Farmstead</VisibleClasses>
+    <VisibleClasses datatype="tokens">
-    <Classes datatype="tokens">
 	  RotaryMill
-	</Classes>
+	</VisibleClasses>
     <Tooltip>Dropsite for harvested Food. Capture one of these to increase nearby food production.</Tooltip>
     <Icon>structures/rotarymill.png</Icon>
+    <Undeletable>true</Undeletable>
   </Identity>
-  <Loot>
-    <xp>100</xp>
-    <food>100</food>
-  </Loot>
   <Minimap>
-    <Type>structure</Type>
     <Icon size="16.0">other.png</Icon>
   </Minimap>
   <Obstruction>
     <Static width="16.0" depth="16.0"/>
   </Obstruction>
-  <RallyPoint disable=""/>
+  <Researcher disable=""/>
-  <ResourceDropsite>
+  <Resistance replace=""/>
-    <Types>food</Types>
-    <Sharable>true</Sharable>
-  </ResourceDropsite>
   <Selectable>
     <Overlay>
       <Outline>
@@ -79,7 +56,6 @@
     <Range>30</Range>
   </Vision>
   <VisualActor>
-    <Actor>structures/celts/special.xml</Actor>
+    <FoundationActor>structures/fndn_5x5.xml</FoundationActor>
-    <FoundationActor>structures/fndn_6x6.xml</FoundationActor>
   </VisualActor>
 </Entity>

binaries/data/mods/public/simulation/templates/structures/brit/rotarymill.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
   <Identity>
     <Civ>brit</Civ>
     <SpecificName>Melonas</SpecificName>

binaries/data/mods/public/simulation/templates/structures/gaul/rotarymill.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
   <Identity>
     <Civ>gaul</Civ>
     <SpecificName>Brauon</SpecificName>

binaries/data/mods/public/simulation/templates/structures/mill_desert.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
-  <Footprint replace="">
+  <Footprint>
     <Circle radius="12.0"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
-    <Civ>ptol</Civ>
-    <Lang>napatan</Lang>
     <SpecificName>snwt</SpecificName>
   </Identity>
   <Obstruction>

binaries/data/mods/public/simulation/templates/structures/mill_field_wheat.xml

@@ -3,7 +3,6 @@
   <Capturable disable=""/>
   <Health disable=""/>
   <Identity>
-    <Civ>gaia</Civ>
     <SpecificName>Wheat Field</SpecificName>
   </Identity>
   <Resistance replace=""/>

binaries/data/mods/public/simulation/templates/structures/mill_greek.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
-  <Footprint replace="">
+  <Footprint>
     <Circle radius="11.0"/>
     <Height>10.0</Height>
   </Footprint>

binaries/data/mods/public/simulation/templates/structures/mill_indian.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
-  <Footprint replace="">
+  <Footprint>
     <Circle radius="11.0"/>
     <Height>10.0</Height>
   </Footprint>

binaries/data/mods/public/simulation/templates/structures/mill_italian.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
-  <Footprint replace="">
+  <Footprint>
     <Circle radius="12.0"/>
     <Height>10.0</Height>
   </Footprint>

binaries/data/mods/public/simulation/templates/structures/mill_middle_eastern.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
-  <Footprint replace="">
+  <Footprint>
     <Circle radius="13.0"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
-    <Lang>persian</Lang>
     <SpecificName>Kaštašta</SpecificName>
   </Identity>
   <Obstruction>

binaries/data/mods/public/simulation/templates/structures/mill_saharan.xml

@@ -1,12 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
-  <Footprint replace="">
+  <Footprint>
     <Circle radius="12.0"/>
     <Height>10.0</Height>
   </Footprint>
   <Identity>
-    <Civ>kush</Civ>
-    <Lang>napatan</Lang>
     <SpecificName>snwt</SpecificName>
   </Identity>
   <Obstruction>

binaries/data/mods/public/simulation/templates/structures/mill_temperate_europe.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_special_rotarymill">
+<Entity parent="rotary_mill|template_structure_economic_farmstead">
   <Identity>
     <SpecificName>Melonas</SpecificName>
   </Identity>