From 4479103ccceef2d99508e4ffea7ccc54bfd68a62 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Tue, 27 Jul 2021 03:45:49 +0300
Subject: [PATCH] Deprecation of Building.xpForNewUnits, in favor of an
 existing unique :)

---
 android/assets/jsons/Civ V - Vanilla/Buildings.json | 13 ++++++-------
 core/src/com/unciv/models/ruleset/Building.kt       |  1 +
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/android/assets/jsons/Civ V - Vanilla/Buildings.json b/android/assets/jsons/Civ V - Vanilla/Buildings.json
index e0a8a2383d..0e0914a9b3 100644
--- a/android/assets/jsons/Civ V - Vanilla/Buildings.json	
+++ b/android/assets/jsons/Civ V - Vanilla/Buildings.json	
@@ -161,19 +161,19 @@
 	},
 	{
 		"name": "Barracks",
-		"xpForNewUnits": 15,
 		"hurryCostModifier": 25,
 		"maintenance": 1,
+		"uniques": ["New [Military] units start with [15] Experience [in this city]"]
 		"requiredTech": "Bronze Working"
 	},
 	{
 		"name": "Krepost",
 		"replaces": "Barracks",
 		"uniqueTo": "Russia",
-		"xpForNewUnits": 15,
 		"hurryCostModifier": 25,
 		"maintenance": 1,
-		"uniques": ["-[25]% Culture cost of acquiring tiles [in this city]","-[25]% Gold cost of acquiring tiles [in this city]"],
+		"uniques": ["-[25]% Culture cost of acquiring tiles [in this city]","-[25]% Gold cost of acquiring tiles [in this city]",
+			"New [Military] units start with [15] Experience [in this city]"],
 		"requiredTech": "Bronze Working"
 	},
 	{
@@ -625,10 +625,10 @@
 	},
 	{
 		"name": "Armory",
-		"xpForNewUnits": 15,
 		"hurryCostModifier": 25,
 		"maintenance": 1,
 		"requiredBuilding": "Barracks",
+		"uniques": ["New [Military] units start with [15] Experience [in this city]"]
 		"requiredTech": "Steel"
 	},
 	
@@ -853,19 +853,18 @@
 	},
 	{
 		"name": "Military Academy",
-		"xpForNewUnits": 15,
 		"hurryCostModifier": 0,
 		"maintenance": 1,
 		"requiredBuilding": "Armory",
+		"uniques": ["New [Military] units start with [15] Experience [in this city]"],
 		"requiredTech": "Military Science"
 	},
 	{
 		"name": "Brandenburg Gate",
 		"culture": 3,
-		"xpForNewUnits": 15,
 		"greatPersonPoints": {"Great Scientist": 2},
 		"isWonder": true,
-		"uniques": ["Free [Great General] appears"],
+		"uniques": ["Free [Great General] appears", "New [Military] units start with [15] Experience [in this city]"],
 		"requiredTech": "Military Science",
 		"quote": "'Pale Death beats equally at the poor man's gate and at the palaces of kings.'  - Horace"
 	},
diff --git a/core/src/com/unciv/models/ruleset/Building.kt b/core/src/com/unciv/models/ruleset/Building.kt
index 7132bf1226..8693cc8a04 100644
--- a/core/src/com/unciv/models/ruleset/Building.kt
+++ b/core/src/com/unciv/models/ruleset/Building.kt
@@ -59,6 +59,7 @@ class Building : NamedStats(), IConstruction, ICivilopediaText {
     private var cannotBeBuiltWith: String? = null
     var cityStrength = 0
     var cityHealth = 0
+    @Deprecated("As of 3.15.16, replace with 'New [Military] units start with [15] Experience [in this city]'")
     var xpForNewUnits = 0
     var replaces: String? = null
     var uniqueTo: String? = null