From 81e9cd317d7238723ab708cb5672221c5ce632a5 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Fri, 22 Jun 2018 13:07:52 +0300
Subject: [PATCH] Started normalizing tech tree to be like G&K - Added Guilds
 between Currreny and Chivalry

---
 android/assets/jsons/Buildings.json           |  2 +-
 android/assets/jsons/Techs.json               | 17 ++++++++-----
 android/assets/jsons/TileImprovements.json    |  2 +-
 android/assets/jsons/Translations.json        | 25 +++++++++++++++++++
 .../src/com/unciv/logic/city/IConstruction.kt |  2 +-
 5 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json
index 9eff045679..0cfb87cdd2 100644
--- a/android/assets/jsons/Buildings.json
+++ b/android/assets/jsons/Buildings.json
@@ -200,7 +200,7 @@
 		culture:1,
 		isWonder:true,
 		unique:"Gold from all trade routes +25%",
-		requiredTech:"Currency"
+		requiredTech:"Guilds"
 	},
 	{
 		name:"Aqueduct",
diff --git a/android/assets/jsons/Techs.json b/android/assets/jsons/Techs.json
index 0144cdc1d0..f77882a576 100644
--- a/android/assets/jsons/Techs.json
+++ b/android/assets/jsons/Techs.json
@@ -54,7 +54,7 @@
 			},
 			{
 				name:"The Wheel",
-				row:6,
+				row:7,
 				prerequisites:["Animal Husbandry", "Archery"]
 			},
 			{
@@ -115,8 +115,7 @@
 			{
 				name:"Currency",
 				row:7,
-				prerequisites:["Mathematics"],
-				baseDescription:"Enables conversion of city production to gold"
+				prerequisites:["Mathematics"]
 			},
 			{
 				name:"Engineering",
@@ -144,9 +143,15 @@
 			},
 			{
 				name:"Civil Service",
-				row:4,
+				row:5,
 				prerequisites:["Currency","Horseback Riding","Philosophy"]
 			},
+			{
+				name:"Guilds",
+				row:7,
+				prerequisites:["Currency"],
+				baseDescription:"Enables conversion of city production to gold"
+			},
 			{
 				name:"Physics",
 				row:8,
@@ -181,8 +186,8 @@
 			},
 			{
 				name:"Chivalry",
-				row:5,
-				prerequisites:["Civil Service","Currency"]
+				row:6,
+				prerequisites:["Civil Service","Guilds"]
 			},
 			{
 				name:"Machinery",
diff --git a/android/assets/jsons/TileImprovements.json b/android/assets/jsons/TileImprovements.json
index 4ff7c09b81..c31bcf86b0 100644
--- a/android/assets/jsons/TileImprovements.json
+++ b/android/assets/jsons/TileImprovements.json
@@ -30,7 +30,7 @@
 		terrainsCanBeBuiltOn:["Plains","Grassland","Desert","Hill","Tundra","Forest","Jungle","Flood plains"],
 		gold:1,
 		turnsToBuild:7,
-		techRequired:"Chivalry",
+		techRequired:"Guilds",
 		improvingTech:"Economics",
 		improvingTechStats: {gold:1}
 	},
diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json
index 5ce62300c0..e4f8ce45ff 100644
--- a/android/assets/jsons/Translations.json
+++ b/android/assets/jsons/Translations.json
@@ -1530,4 +1530,29 @@
 		German:"Raumschiffteil"
 	}
 	
+	// Unit types
+	"Civilian":{}
+	"Melee":{}
+	"Ranged":{}
+	"Siege":{}
+	"Mounted":{}
+	"Scout":{}
+	"City":{}
+	
+	
+	// Unit uniques
+	"Can build improvements on tiles":{}
+	"Founds a new city":{}
+	"Ignores terrain cost":{}
+	"No defensive terrain bonus":{}
+	"Rough terrain penalty":{}
+	"Bonus vs [unitType]":{}
+	"Penalty vs [unitType]":{}
+	"Must set up to ranged attack":{}
+	"Can move after attacking":{}
+	"Limited Visibility":{}
+	"Can start an 8-turn golden age or construct a Landmark (+6 culture)":{}
+	"Can discover a technology, or construct an Academy (+4 science)" :{}
+	"Can undertake a trade mission, giving a large sum of gold, or construct a Customs House (+4 gold)":{}
+	"Can speed up construction of a wonder, or construct a Manufactory (+4 production)":{}
 }
diff --git a/core/src/com/unciv/logic/city/IConstruction.kt b/core/src/com/unciv/logic/city/IConstruction.kt
index 580964d71e..6a04117caf 100644
--- a/core/src/com/unciv/logic/city/IConstruction.kt
+++ b/core/src/com/unciv/logic/city/IConstruction.kt
@@ -23,7 +23,7 @@ open class SpecialConstruction(override var name: String, override val descripti
             }
             val gold =  object:SpecialConstruction("Gold", "Convert production to gold at a rate of 4 to 1"){
                 override fun isBuildable(construction: CityConstructions): Boolean {
-                    return construction.cityInfo.civInfo.tech.isResearched("Currency")
+                    return construction.cityInfo.civInfo.tech.isResearched("Guilds")
                 }
             }
             val idle =  object:SpecialConstruction("Nothing", "The city will not produce anything."){