From b8aa4932a03504665df6ef1ea0d2e8dd3488eeac Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 7 Jan 2019 18:44:42 +0200
Subject: [PATCH] Added unique ability for Egypt and France

---
 android/assets/jsons/Nations.json          |  2 ++
 android/assets/jsons/Translations.json     | 12 ++++++++----
 core/src/com/unciv/logic/city/CityStats.kt | 12 ++++++++++--
 3 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/android/assets/jsons/Nations.json b/android/assets/jsons/Nations.json
index 576129448b..8b436f980b 100644
--- a/android/assets/jsons/Nations.json
+++ b/android/assets/jsons/Nations.json
@@ -29,6 +29,7 @@
 		name:"Egypt",
 		mainColor:[ 231, 213, 0],
 		secondaryColor:[98,10,210],
+		unique:"+20% production towards Wonder construction"
 		cities:["Thebes","Memphis","Heliopolis","Elephantine","Alexandria","Pi-Ramesses","Giza","Byblos","Akhetaten","Hieraconpolis",
 			"Abydos","Asyut","Avaris","Lisht","Buto","Edfu","Pithom","Busiris","Kahun","Athribis",
 			"Mendes","Elashmunein","Tanis","Bubastis","Oryx","Sebennytus","Akhmin","Karnak","Luxor","El Kab"]
@@ -46,6 +47,7 @@
 		name:"France",
 		mainColor:[ 38, 98, 255],
 		secondaryColor:[239,236,148],
+		unique:"+2 Culture per turn from Cities before discovering Steam Power"
 		cities:["Paris","Orleans","Lyon","Troyes","Tours","Marseille","Chartres","Avignon","Rouen","Grenoble",
 			"Dijon","Amiens","Cherbourg","Poitiers","Toulouse","Bayonne","Strasbourg","Brest","Bordeaux","Rennes",
 			"Nice","Saint Etienne","Nantes","Reims","Le Mans","Montpellier","Limoges","Nancy","Lille","Caen"]
diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json
index 421ab26fa5..8c52ab4e40 100644
--- a/android/assets/jsons/Translations.json
+++ b/android/assets/jsons/Translations.json
@@ -3498,6 +3498,11 @@
         Simplified_Chinese:"中华"
         Portuguese:"China"
 	}
+	"Great general provides double combat bonus, and spawns 50% faster":{
+		Romanian:"Marele general oferă bonus de luptă dublu și se crează cu 50% mai repede"
+		Simplified_Chinese:"大军事家提供双倍战斗加成，出生速率+50%"
+	}
+	
 	"Egypt":{	
 		Italian:"Egitto"
 		Russian:"Египет"
@@ -3507,6 +3512,8 @@
         Simplified_Chinese:"埃及"
         Portuguese:"Egito"
 	}
+	"+20% production towards Wonder construction":{}
+	
 	"England":{	
 		Italian:"Inghilterra"
 		Russian:"Англия"
@@ -3521,10 +3528,6 @@
 		Spanish:"+2 de movimiento a las unidades navales"
 		Simplified_Chinese:"所有有海军+2行动力"
 	}
-	"Great general provides double combat bonus, and spawns 50% faster":{
-		Romanian:"Marele general oferă bonus de luptă dublu și se crează cu 50% mai repede"
-		Simplified_Chinese:"大军事家提供双倍战斗加成，出生速率+50%"
-	}
 	
 	"France":{	
 		Italian:"Francia"
@@ -3535,6 +3538,7 @@
         Simplified_Chinese:"法兰西"
         Portuguese:"França"
 	}
+	"+2 Culture per turn from cities before discovering Steam Power":{}
 	
 	"Russia":{
 		Romanian:"Rusia"
diff --git a/core/src/com/unciv/logic/city/CityStats.kt b/core/src/com/unciv/logic/city/CityStats.kt
index 6c4b752478..2eedf27f96 100644
--- a/core/src/com/unciv/logic/city/CityStats.kt
+++ b/core/src/com/unciv/logic/city/CityStats.kt
@@ -108,12 +108,20 @@ class CityStats {
         val stats = Stats()
 
         val civUnique = cityInfo.civInfo.getNation().unique
+        val currentConstruction = cityInfo.cityConstructions.getCurrentConstruction()
         if(civUnique=="+25% Production towards any buildings that already exist in the Capital"
-            && cityInfo.cityConstructions.getCurrentConstruction() is Building
+            && currentConstruction is Building
             && cityInfo.civInfo.getCapital().cityConstructions.builtBuildings
-                        .contains(cityInfo.cityConstructions.currentConstruction))
+                        .contains(currentConstruction.name))
             stats.production+=25f
 
+        if(civUnique=="+20% production towards Wonder construction"
+            && currentConstruction is Building && currentConstruction.isWonder)
+            stats.production+=20
+
+        if(civUnique == "+2 Culture per turn from cities before discovering Steam Power")
+            stats.culture += 2
+        
         return stats
     }