Don't introduce rice resource subtype:

* This is not compatible with the public mod.
* Making it only available to Han China means their fields are useless when captured by other civs, whereas the reverse is not true.
* Zapotecs don't have a food.maize resource either.
* food.grain does not represent only wheat, but also other grains:cereals (e.g. barley, oats, rye, spelt, sorghum, millet, maize, and yes, rice)
pseudocereals (e.g. buckwheat, quinoa) and pulses (beans, chickpeas, lentils, peas).

simulation/data/civs/han.json

@@ -79,33 +79,6 @@
 			"Requirements": "",
 			"Phase": "Town",
 			"Special": ""
-		},
-		{
-			"Name": "Cavalry Stable",
-			"Class": "",
-			"Emblem": "",
-			"History": "The Han Dynasty's best soldiers were Horsemen.",
-			"Requirements": "",
-			"Phase": "Town",
-			"Special": "Train Cavalry citizen-soldiers."
-		},
-		{
-			"Name": "Siege Workshop",
-			"Class": "",
-			"Emblem": "",
-			"History": "The Han were innovators in area of siegecraft.",
-			"Requirements": "",
-			"Phase": "City",
-			"Special": "Constructs and upgrades all Han siege engines."
-		},
-		{
-			"Name": "Rice field",
-			"Class": "",
-			"Emblem": "",
-			"History": "The Han cultivated rice in the south.",
-			"Requirements": "",
-			"Phase": "",
-			"Special": "High yield rice fields"
 		}
 	],
 	"WallSets": [

simulation/templates/structures/han_farmstead.xml

@@ -1,38 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Entity parent="template_structure_economic_farmstead">
-    <Footprint>
-        <Square width="18.0" depth="18.0"/>
-        <Height>5.0</Height>
-    </Footprint>
-    <GarrisonHolder>
-        <BuffHeal>0</BuffHeal>
-        <EjectHealth>0.1</EjectHealth>
-        <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
-        <List datatype="tokens">Minister</List>
-        <LoadingRange>1</LoadingRange>
-        <Max>1</Max>
-    </GarrisonHolder>
-    <Identity>
-        <Civ>han</Civ>
-        <SpecificName>Cāng</SpecificName>
-    </Identity>
-    <ProductionQueue>
-        <BatchTimeModifier>0.7</BatchTimeModifier>
-        <Technologies datatype="tokens">
-            gather_wicker_baskets
-            han/gather_seed_drill
-            han/gather_water_weeding
-            han/gather_chain_pump
-            -gather_farming_plows
-            -gather_farming_training
-            -gather_farming_fertilizer
-        </Technologies>
-    </ProductionQueue>
-    <Obstruction>
-        <Static width="16.0" depth="16.0"/>
-    </Obstruction>
-    <VisualActor>
-        <Actor>structures/han/farmstead.xml</Actor>
-        <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
-    </VisualActor>
+  <Footprint>
+    <Square width="18.0" depth="18.0"/>
+    <Height>5.0</Height>
+  </Footprint>
+  <GarrisonHolder>
+    <BuffHeal>0</BuffHeal>
+    <EjectHealth>0.1</EjectHealth>
+    <EjectClassesOnDestroy datatype="tokens">Unit</EjectClassesOnDestroy>
+    <List datatype="tokens">Minister</List>
+    <LoadingRange>1</LoadingRange>
+    <Max>1</Max>
+  </GarrisonHolder>
+  <Identity>
+    <Civ>han</Civ>
+    <SpecificName>Cāng</SpecificName>
+  </Identity>
+  <Obstruction>
+    <Static width="16.0" depth="16.0"/>
+  </Obstruction>
+  <VisualActor>
+    <Actor>structures/han/farmstead.xml</Actor>
+    <FoundationActor>structures/fndn_4x4.xml</FoundationActor>
+  </VisualActor>
 </Entity>

simulation/templates/structures/han_field.xml

@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Entity parent="template_structure_resource_field_rice">
-    <Identity>
-        <Civ>han</Civ>
-        <SpecificName>Tián</SpecificName>
-        <History>South China cultivated rice instead of wheat</History>
-    </Identity>
-    <VisualActor>
-        <Actor>structures/plot_field_rice_4x4.xml</Actor>
-    </VisualActor>
+<Entity parent="template_structure_resource_field">
+  <Identity>
+    <Civ>han</Civ>
+    <SpecificName>Tián</SpecificName>
+  </Identity>
+  <VisualActor>
+    <Actor>structures/plot_field_medit.xml</Actor>
+  </VisualActor>
 </Entity>

simulation/templates/units/han_infantry_archer_b.xml

@@ -20,11 +20,6 @@
     <Promotion>
         <Entity>units/han_infantry_archer_a</Entity>
     </Promotion>
-    <ResourceGatherer>
-        <Rates>
-            <food.rice>0.35</food.rice>
-        </Rates>
-    </ResourceGatherer>
     <Cost>
         <Resources>
             <food op="add">-10</food>

simulation/templates/units/han_infantry_crossbowman_b.xml

@@ -20,11 +20,6 @@
     <Promotion>
         <Entity>units/han_infantry_crossbowman_a</Entity>
     </Promotion>
-    <ResourceGatherer>
-        <Rates>
-            <food.rice>0.35</food.rice>
-        </Rates>
-    </ResourceGatherer>
     <VisualActor>
         <Actor>units/han/infantry_crossbowman_b.xml</Actor>
     </VisualActor>

simulation/templates/units/han_infantry_spearman_b.xml

@@ -23,11 +23,6 @@
     <Promotion>
         <Entity>units/han_infantry_spearman_a</Entity>
     </Promotion>
-    <ResourceGatherer>
-        <Rates>
-            <food.rice>0.35</food.rice>
-        </Rates>
-    </ResourceGatherer>
     <VisualActor>
         <Actor>units/han/infantry_spearman_b.xml</Actor>
     </VisualActor>

simulation/templates/units/han_infantry_swordsman_b.xml

@@ -18,11 +18,6 @@
         <Icon>units/han_infantry_swordsman.png</Icon>
         <RequiredTechnology>phase_town</RequiredTechnology>
     </Identity>
-    <ResourceGatherer>
-        <Rates>
-            <food.rice>0.35</food.rice>
-        </Rates>
-    </ResourceGatherer>
     <Promotion>
         <Entity>units/han_infantry_swordsman_a</Entity>
     </Promotion>

simulation/templates/units/han_support_female_citizen.xml

@@ -23,11 +23,6 @@
         <Phenotype>female</Phenotype>
         <Icon>units/han_support_female_citizen.png</Icon>
     </Identity>
-    <ResourceGatherer>
-        <Rates>
-            <food.rice>0.6</food.rice>
-        </Rates>
-    </ResourceGatherer>
     <Promotion disable=""/>
     <VisualActor>
         <Actor>units/han/female_citizen.xml</Actor>