From d206f362ef6242c7319694e5d00bc504c2419431 Mon Sep 17 00:00:00 2001
From: Stan <stan@wildfiregames.com>
Date: Tue, 10 Jan 2023 16:48:28 +0000
Subject: [PATCH] [Gameplay A27] - Han fixes:

- Remove crossbow_training.json from the Han academy
- Adjust the cost of poison arrows and poison blades so that the ranged
upgrade should be the one to cost metal, since ranged units currently
dominate most battles.
- Reduce the obstruction area of rice paddies so that they are easier to
place.

Patch by: @real_tabasco_sauce
Accepted by: @chrstgtr, @wowgetoffyourcellphone
Differential Revision: https://code.wildfiregames.com/D4873
This was SVN commit r27406.
---
 .../public/simulation/data/technologies/crossbow_training.json  | 2 +-
 .../mods/public/simulation/data/technologies/poison_arrows.json | 2 +-
 .../mods/public/simulation/data/technologies/poison_blades.json | 2 +-
 .../mods/public/simulation/templates/structures/han/academy.xml | 1 +
 .../mods/public/simulation/templates/structures/han/field.xml   | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/binaries/data/mods/public/simulation/data/technologies/crossbow_training.json b/binaries/data/mods/public/simulation/data/technologies/crossbow_training.json
index 47aa29dbf8..ffc18ce23c 100644
--- a/binaries/data/mods/public/simulation/data/technologies/crossbow_training.json
+++ b/binaries/data/mods/public/simulation/data/technologies/crossbow_training.json
@@ -14,7 +14,7 @@
 	"requirementsTooltip": "Unlocked in Town Phase.",
 	"icon": "armor_plates_ranged.png",
 	"researchTime": 40,
-	"tooltip": "Crossbow Infantry and Cavalry −20% train time.",
+	"tooltip": "Crossbow Infantry −20% train time.",
 	"modifications": [
 		{ "value": "Cost/BuildTime", "multiply": 0.8 }
 	],
diff --git a/binaries/data/mods/public/simulation/data/technologies/poison_arrows.json b/binaries/data/mods/public/simulation/data/technologies/poison_arrows.json
index 6ff9d7fa5e..0785fc10a2 100644
--- a/binaries/data/mods/public/simulation/data/technologies/poison_arrows.json
+++ b/binaries/data/mods/public/simulation/data/technologies/poison_arrows.json
@@ -3,7 +3,7 @@
 	"description": "",
 	"cost": {
 		"food": 1200,
-		"wood": 1200
+		"metal": 1200
 	},
 	"requirements": {
 		"all": [
diff --git a/binaries/data/mods/public/simulation/data/technologies/poison_blades.json b/binaries/data/mods/public/simulation/data/technologies/poison_blades.json
index dcf6cb0275..e0b47ae318 100644
--- a/binaries/data/mods/public/simulation/data/technologies/poison_blades.json
+++ b/binaries/data/mods/public/simulation/data/technologies/poison_blades.json
@@ -3,7 +3,7 @@
 	"description": "",
 	"cost": {
 		"food": 1200,
-		"metal": 1200
+		"wood": 1200
 	},
 	"requirements": {
 		"all": [
diff --git a/binaries/data/mods/public/simulation/templates/structures/han/academy.xml b/binaries/data/mods/public/simulation/templates/structures/han/academy.xml
index 59100a210d..0862ecc95a 100644
--- a/binaries/data/mods/public/simulation/templates/structures/han/academy.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/han/academy.xml
@@ -40,6 +40,7 @@
   <Researcher>
     <Technologies datatype="tokens">
       -barracks_batch_training
+      -crossbow_training
       -unlock_champion_infantry
     </Technologies>
   </Researcher>
diff --git a/binaries/data/mods/public/simulation/templates/structures/han/field.xml b/binaries/data/mods/public/simulation/templates/structures/han/field.xml
index ea7aac3bc7..9ce9c72c01 100644
--- a/binaries/data/mods/public/simulation/templates/structures/han/field.xml
+++ b/binaries/data/mods/public/simulation/templates/structures/han/field.xml
@@ -16,7 +16,7 @@
     <GenericName>Rice Paddy</GenericName>
   </Identity>
   <Obstruction>
-    <Static depth="20.0" width="20.0"/>
+    <Static depth="18.0" width="18.0"/>
   </Obstruction>
   <ResourceSupply>
     <MaxGatherers>3</MaxGatherers>