From eeaca08f57e60707d8e4b26b796b7c80deac79e0 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Wed, 16 Jan 2019 21:45:46 +0200
Subject: [PATCH] Added Alhambra #245

---
 Credits.md                                       |   2 ++
 android/Images/BuildingIcons/Alhambra.png        | Bin 0 -> 3997 bytes
 android/assets/jsons/Buildings.json              |  10 ++++++++++
 android/assets/jsons/Translations.json           |   3 +++
 .../com/unciv/models/gamebasics/unit/BaseUnit.kt |   5 +++++
 5 files changed, 20 insertions(+)
 create mode 100644 android/Images/BuildingIcons/Alhambra.png

diff --git a/Credits.md b/Credits.md
index 4cc4659976..ccf7328ecb 100644
--- a/Credits.md
+++ b/Credits.md
@@ -151,7 +151,9 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
 * [College](https://thenounproject.com/term/college/1203703/) By Vectors Market for National College
 * [Chichen Itza](https://thenounproject.com/term/chichen-itza/668065/) By Hea Poh Lin
 * [Christian Church](https://thenounproject.com/term/christian-church/1174183/) By Andrejs Kirma for Monastery
+* [Castle](https://thenounproject.com/search/?q=castle&i=390189) By Mint Shirt
 * [Cambodia](https://thenounproject.com/term/cambodia/1809152/) By Wichai Wi for Angkor Wat
+* [Alhambra](https://thenounproject.com/search/?q=alhambra&i=403759) By parkjisun
 * [Books](https://thenounproject.com/term/books/1140218/) By Abir Alward for Oxford University
 * [Forge](https://thenounproject.com/term/forge/1044767/) By Monjin Friends
 * [Anchor](https://thenounproject.com/term/anchor/1258518/) By Saeful Muslim for Harbor
diff --git a/android/Images/BuildingIcons/Alhambra.png b/android/Images/BuildingIcons/Alhambra.png
new file mode 100644
index 0000000000000000000000000000000000000000..acd790d9c90686f8e051bbe46b5fd09593ed20df
GIT binary patch
literal 3997
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
D491);

literal 0
HcmV?d00001

diff --git a/android/assets/jsons/Buildings.json b/android/assets/jsons/Buildings.json
index 80ce78c91c..7913def1ea 100644
--- a/android/assets/jsons/Buildings.json
+++ b/android/assets/jsons/Buildings.json
@@ -328,6 +328,16 @@
 		uniques:["Cost of acquiring new tiles reduced by 25%"],
 		requiredTech:"Chivalry"
 	},
+	{
+		name:"Alhambra",
+		culture:1,
+		greatPersonPoints:{culture:1},
+		isWonder:true,
+		providesFreeBuilding:"Castle",
+		percentStatBonus:{culture:20},
+		uniques:["All newly-trained melee, mounted, and armored units in this city receive the Drill I promotion"],
+		requiredTech:"Chivalry"
+	},
 	{
 		name:"Ironworks",
 		production:8,
diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json
index c620876273..24b79c0c6c 100644
--- a/android/assets/jsons/Translations.json
+++ b/android/assets/jsons/Translations.json
@@ -4464,6 +4464,9 @@
         Portuguese:"Castelo"
 	}
 	
+	"Alhambra":{}
+	"All newly-trained melee, mounted, and armored units in this city receive the Drill I promotion":{}
+	
 	"Angkor Wat":{	
 		Italian:"Angkor Wat"
 		Russian:"Ангкор-Ват"
diff --git a/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt b/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt
index 47e4f375de..ee91b883f2 100644
--- a/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt
+++ b/core/src/com/unciv/models/gamebasics/unit/BaseUnit.kt
@@ -112,6 +112,11 @@ class BaseUnit : INamed, IConstruction, ICivilopedia {
         unit.promotions.XP += construction.getBuiltBuildings().sumBy { it.xpForNewUnits }
         if(construction.cityInfo.civInfo.policies.isAdopted("Total War"))
             unit.promotions.XP += 15
+
+        if(unit.type in listOf(UnitType.Melee,UnitType.Mounted,UnitType.Armor)
+            && construction.cityInfo.getBuildingUniques()
+                .contains("All newly-trained melee, mounted, and armored units in this city receive the Drill I promotion"))
+            unit.promotions.addPromotion("Drill I")
     }
 
     fun getUpgradeUnit(civInfo: CivilizationInfo):BaseUnit{