diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_archer_a.xml b/binaries/data/mods/public/art/actors/units/han/infantry_archer_a.xml
index 94c5e1692c..eca7f07a8f 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_archer_a.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_archer_a.xml
@@ -46,7 +46,6 @@
-
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_archer_b.xml b/binaries/data/mods/public/art/actors/units/han/infantry_archer_b.xml
index 6344416093..c8f77b09e3 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_archer_b.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_archer_b.xml
@@ -40,7 +40,6 @@
-
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_archer_e.xml b/binaries/data/mods/public/art/actors/units/han/infantry_archer_e.xml
index 0185e16ef9..2c5ec449a2 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_archer_e.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_archer_e.xml
@@ -42,7 +42,6 @@
-
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_a.xml b/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_a.xml
index 31b396e563..bd41e76662 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_a.xml
@@ -41,7 +41,6 @@
-
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_b.xml b/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_b.xml
index 38e94b934f..68c716bb84 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_b.xml
@@ -39,7 +39,6 @@
-
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_e.xml b/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_e.xml
index 76ef8dce35..513263303c 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_crossbowman_e.xml
@@ -42,7 +42,6 @@
-
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_a.xml b/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_a.xml
index 72222f74d9..3f5e47e6c8 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_a.xml
@@ -49,7 +49,6 @@
-
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_b.xml b/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_b.xml
index 8ee5d4a62b..9fdec2bed6 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_b.xml
@@ -46,7 +46,6 @@
-
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_e.xml b/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_e.xml
index c8bdf8f264..8f0a9b54ca 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_halberdman_e.xml
@@ -49,7 +49,6 @@
-
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_spearman_a.xml b/binaries/data/mods/public/art/actors/units/han/infantry_spearman_a.xml
index 3a64fec6f5..640eebd3c7 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_spearman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_spearman_a.xml
@@ -43,7 +43,6 @@
-
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_spearman_b.xml b/binaries/data/mods/public/art/actors/units/han/infantry_spearman_b.xml
index 31ca3f5c3b..51503dd825 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_spearman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_spearman_b.xml
@@ -43,7 +43,6 @@
-
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_spearman_e.xml b/binaries/data/mods/public/art/actors/units/han/infantry_spearman_e.xml
index a1459759c4..6f72691f53 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_spearman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_spearman_e.xml
@@ -42,7 +42,6 @@
-
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_a.xml b/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_a.xml
index 27b0024f91..6525057651 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_a.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_a.xml
@@ -43,7 +43,6 @@
-
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_b.xml b/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_b.xml
index 00a6827e8d..75c55699e4 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_b.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_b.xml
@@ -40,7 +40,6 @@
-
diff --git a/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_e.xml b/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_e.xml
index 3eb8b3ef8d..7abf97a440 100644
--- a/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_e.xml
+++ b/binaries/data/mods/public/art/actors/units/han/infantry_swordsman_e.xml
@@ -42,7 +42,6 @@
-
diff --git a/binaries/data/mods/public/art/variants/biped/approach_rice.xml b/binaries/data/mods/public/art/variants/biped/approach_rice.xml
deleted file mode 100644
index ab16ec356a..0000000000
--- a/binaries/data/mods/public/art/variants/biped/approach_rice.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/binaries/data/mods/public/art/variants/capes/approach_rice.xml b/binaries/data/mods/public/art/variants/capes/approach_rice.xml
deleted file mode 100644
index 57b2350447..0000000000
--- a/binaries/data/mods/public/art/variants/capes/approach_rice.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
-
-
-
-
diff --git a/binaries/data/mods/public/simulation/ai/petra/researchManager.js b/binaries/data/mods/public/simulation/ai/petra/researchManager.js
index b7cf9cccde..a284a3384a 100644
--- a/binaries/data/mods/public/simulation/ai/petra/researchManager.js
+++ b/binaries/data/mods/public/simulation/ai/petra/researchManager.js
@@ -105,7 +105,7 @@ PETRA.ResearchManager.prototype.researchWantedTechs = function(gameState, techs)
return { "name": tech[0], "increasePriority": this.CostSum(template.cost) < 400 };
else if (template.modifications[i].value === "ResourceGatherer/Rates/food.fruit")
return { "name": tech[0], "increasePriority": this.CostSum(template.cost) < 400 };
- else if (template.modifications[i].value === "ResourceGatherer/Rates/food.grain" || template.modifications[i].value === "ResourceGatherer/Rates/food.rice")
+ else if (template.modifications[i].value === "ResourceGatherer/Rates/food.grain")
return { "name": tech[0], "increasePriority": false };
else if (template.modifications[i].value === "ResourceGatherer/Rates/wood.tree")
return { "name": tech[0], "increasePriority": this.CostSum(template.cost) < 400 };
diff --git a/binaries/data/mods/public/simulation/data/technologies/gather_farming_chain_pump.json b/binaries/data/mods/public/simulation/data/technologies/gather_farming_chain_pump.json
index d8c218a64d..d25bb4f2a7 100644
--- a/binaries/data/mods/public/simulation/data/technologies/gather_farming_chain_pump.json
+++ b/binaries/data/mods/public/simulation/data/technologies/gather_farming_chain_pump.json
@@ -15,9 +15,9 @@
"requirementsTooltip": "Unlocked in City Phase.",
"icon": "flood_control.png",
"researchTime": 70,
- "tooltip": "Workers +20% rice gather rate.",
+ "tooltip": "Workers +20% grain gather rate.",
"modifications": [
- { "value": "ResourceGatherer/Rates/food.rice", "multiply": 1.2 }
+ { "value": "ResourceGatherer/Rates/food.grain", "multiply": 1.2 }
],
"affects": ["Worker"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
diff --git a/binaries/data/mods/public/simulation/data/technologies/gather_farming_seed_drill.json b/binaries/data/mods/public/simulation/data/technologies/gather_farming_seed_drill.json
index aeb26cc265..e109e7ddbd 100644
--- a/binaries/data/mods/public/simulation/data/technologies/gather_farming_seed_drill.json
+++ b/binaries/data/mods/public/simulation/data/technologies/gather_farming_seed_drill.json
@@ -14,9 +14,9 @@
"requirementsTooltip": "Unlocked in Village Phase.",
"icon": "torsion_springs.png",
"researchTime": 50,
- "tooltip": "Workers +20% rice gather rate.",
+ "tooltip": "Workers +20% grain gather rate.",
"modifications": [
- { "value": "ResourceGatherer/Rates/food.rice", "multiply": 1.2 }
+ { "value": "ResourceGatherer/Rates/food.grain", "multiply": 1.2 }
],
"affects": ["Worker"],
"soundComplete": "interface/alarm/alarm_upgradearmory.xml"
diff --git a/binaries/data/mods/public/simulation/data/technologies/gather_farming_water_weeding.json b/binaries/data/mods/public/simulation/data/technologies/gather_farming_water_weeding.json
index dec6f019bc..02ded2dc8f 100644
--- a/binaries/data/mods/public/simulation/data/technologies/gather_farming_water_weeding.json
+++ b/binaries/data/mods/public/simulation/data/technologies/gather_farming_water_weeding.json
@@ -15,7 +15,7 @@
"requirementsTooltip": "Unlocked in Town Phase.",
"icon": "irrigation.png",
"researchTime": 60,
- "tooltip": "Workers +20% rice gather rate.",
+ "tooltip": "Workers +20% grain gather rate.",
"modifications": [
{ "value": "ResourceGatherer/Rates/food.grain", "multiply": 1.2 }
],