Songhai (#1636)

* Songhai, Burial Tomb, Gold for capturing city

* Burial Tomb unique: double gold gained when city is captured

* Rebuilt Atlas and Translations

* Italian translation + fix missing translations

* Barbarian Camp Reward

Is now modified by Speed and Difficulty

android/assets/jsons/Buildings.json

@@ -245,6 +245,7 @@
 		name:"Burial Tomb",
 		replaces:"Temple",
 		uniqueTo:"Egypt",
+		uniques:["Doubles Gold given to enemy if city is captured"],
 		culture:3,
 		happiness:1,
 		specialistSlots:{culture:1},
@@ -252,18 +253,16 @@
 		hurryCostModifier:25,
 		requiredTech:"Philosophy"
 	},
-	/*
 	{
 		name:"Mud Pyramid Mosque",
 		replaces:"Temple",
 		uniqueTo:"Songhai",
-		//No manteinance
+		maintenance:0,
 		hurryCostModifier:15,
 		culture:4,
 		requiredBuilding:"Monument",
 		requiredTech:"Philosophy"
 	},
-	*/
 	{
 		name:"The Oracle",
 		culture:3,

android/assets/jsons/Difficulties.json

@@ -19,7 +19,8 @@
 		aiFreeUnits:[],
 		aiUnhappinessModifier:1,
 		aisExchangeTechs:false,
-		turnBarbariansCanEnterPlayerTiles:10000
+		turnBarbariansCanEnterPlayerTiles:10000,
+		clearBarbarianCampReward: 50
 	},
 	{
 		name:"Chieftain",
@@ -41,7 +42,8 @@
 		aiFreeUnits:[],
 		aiUnhappinessModifier:1,
 		aisExchangeTechs:false,
-		turnBarbariansCanEnterPlayerTiles:60
+		turnBarbariansCanEnterPlayerTiles:60,
+		clearBarbarianCampReward: 40
 	},
 	{
 		name:"Warlord",
@@ -63,7 +65,8 @@
 		aiFreeUnits:[],
 		aiUnhappinessModifier:1,
 		aisExchangeTechs:false,
-		turnBarbariansCanEnterPlayerTiles:20
+		turnBarbariansCanEnterPlayerTiles:20,
+		clearBarbarianCampReward: 30
 	},
 	{
 		name:"Prince",
@@ -85,7 +88,8 @@
 		aiFreeUnits:[],
 		aiUnhappinessModifier:1,
 		aisExchangeTechs:true,
-		turnBarbariansCanEnterPlayerTiles:0
+		turnBarbariansCanEnterPlayerTiles:0,
+		clearBarbarianCampReward: 25
 	},
 	{
 		name:"King",
@@ -107,7 +111,8 @@
 		aiFreeUnits:["Warrior"],
 		aiUnhappinessModifier:0.9,
 		aisExchangeTechs:true,
-		turnBarbariansCanEnterPlayerTiles:0
+		turnBarbariansCanEnterPlayerTiles:0,
+		clearBarbarianCampReward: 25
 	},
 	{
 		name:"Emperor",
@@ -129,7 +134,8 @@
 		aiFreeUnits:["Warrior", "Scout"],
 		aiUnhappinessModifier:0.85,
 		aisExchangeTechs:true,
-		turnBarbariansCanEnterPlayerTiles:0
+		turnBarbariansCanEnterPlayerTiles:0,
+		clearBarbarianCampReward: 25
 	},
 	{
 		name:"Immortal",
@@ -151,7 +157,8 @@
 		aiFreeUnits:["Warrior", "Warrior", "Worker", "Scout"],
 		aiUnhappinessModifier:0.75,
 		aisExchangeTechs:true,
-		turnBarbariansCanEnterPlayerTiles:0
+		turnBarbariansCanEnterPlayerTiles:0,
+		clearBarbarianCampReward: 25
 	},
 	{
 		name:"Deity",
@@ -173,6 +180,7 @@
 		aiFreeUnits:["Settler", "Warrior", "Warrior", "Worker", "Worker", "Scout"],
 		aiUnhappinessModifier:0.6,
 		aisExchangeTechs:true,
-		turnBarbariansCanEnterPlayerTiles:0
+		turnBarbariansCanEnterPlayerTiles:0,
+		clearBarbarianCampReward: 25
 	}
 ]

android/assets/jsons/Nations/Nations.json

@@ -729,6 +729,43 @@
 			"Lugo","Alicante","Càdiz","Eiche","Alcorcon","Burgos","Vigo","Badajoz","La Coruña","Guadalquivir","Bilbao",
 			"San Sebastian","Granada","Mérida","Huelva","Ibiza","Las Palmas","Tenerife"]
 	},
+	{
+		name:"Songhai",
+		leaderName:"Askia",
+		adjective:["Songhai"],
+		startBias:["Avoid Tundra"],
+		preferredVictoryType:"Domination",
+
+		startIntroPart1: "May the blessings of God, who is greatest of all, be upon you Askia, leader of the Songhai people! For many years your kingdom was a vassal of the mighty West African state of Mali, until the middle of the 14th century, when King Sunni Ali Ber wrested independence from the Mali, conquering much territory and fighting off numerous foes who sought to destroy him. Ultimately, his conquest of the wealthy cities of Timbuktu and Jenne gave the growing Songhai empire the economic power to survive for some 100 years, until the empire was destroyed by foes with advanced technology - muskets against spearmen."
+		startIntroPart2: "King Askia, your people look yo you to lead them to glory. To make them powerful and wealthy, to keep them supplied with the weapons they need to defeat any foe. Can you save them from destruction, oh King? Can you build a civilization that will stand the test of time?"
+
+		declaringWar:"You are an abomination to heaven and earth, the chief of ignorant savages! You must be destroyed!"
+		attacked:"Fool! You have doomed your people to fire and destruction!"
+		defeated:"We have been consumed by the fires of hatred and rage. Enjoy your victory in this world - you shall pay a heavy price in the next!"
+		introduction:"I am Askia of the Songhai. We are a fair people - but those who cross us will find only destruction. You would do well to avoid repeating the mistakes others have made in the past."
+
+		neutralHello:"Greetings."
+		neutralLetsHearIt:["Yes?","Proceed."]
+		neutralNo:["No","Of course not."]
+		neutralYes:["Very well.","Yes.","Fine."]
+
+		hateHello:"Oh, it's you."
+		hateLetsHearIt:["And?","Continue."]
+		hateNo:["You cannot be serious!","That's unacceptable!","We decline."]
+		hateYes:["Oh, very well.","Alright."]
+
+		afterPeace:"We thank you for bringing an end to this pointless war."
+		tradeRequest:"Can I interest you in this deal?"
+
+		outerColor:[214,145,19],
+		innerColor:[90,0,10],
+		uniqueName:"River Warlord",
+		// Vanilla unique: triple gold and embarked defense
+		unique:"Receive triple Gold from Barbarian encampments and pillaging Cities. Embarked units can defend themselves.",
+		cities:["Gao","Tombouctu","Jenne","Taghaza","Tondibi","Kumbi Saleh","Kukia","Walata","Tegdaoust","Argungu","Gwandu",
+			"Kebbi","Boussa","Motpi","Bamako","Wa","Kayes","Awdaghost","Ouadane","Dakar","Tadmekket","Tekedda","Kano",
+			"Agadez","Niamey","Torodi","Ouatagouna","Dori","Bamba","Segou"]
+	},
 	/*
 	
 	{   // REQUIRES RIVERS
@@ -842,42 +879,6 @@
 			"Andahuaylas","Ica","Arequipa","Nasca","Atico","Juli","Chuito","Chuquiapo","Huanuco Pampa","Tamboccocha",
 			"Huaras","Riobamba","Caxamalca","Sausa","Tambo Colorado","Huaca","Tumbes","Chan Chan","Sipan","Pachacamac",
 			"Llactapata","Pisac","Kuelap","Pajaten","Chucuito","Choquequirao"]
-	}
-	{
-		name:"Songhai",
-		leaderName:"Askia",
-		adjective:["Songhai"],
-		startBias:["Avoid Tundra"],
-		preferredVictoryType:"Domination",
-		
-		startIntroPart1: "May the blessings of God, who is greatest of all, be upon you Askia, leader of the Songhai people! For many years your kingdom was a vassal of the mighty West African state of Mali, until the middle of the 14th century, when King Sunni Ali Ber wrested independence from the Mali, conquering much territory and fighting off numerous foes who sought to destroy him. Ultimately, his conquest of the wealthy cities of Timbuktu and Jenne gave the growing Songhai empire the economic power to survive for some 100 years, until the empire was destroyed by foes with advanced technology - muskets against spearmen."
-		startIntroPart2: "King Askia, your people look yo you to lead them to glory. To make them powerful and wealthy, to keep them supplied with the weapons they need to defeat any foe. Can you save them from destruction, oh King? Can you build a civilization that will stand the test of time?"
-		
-		declaringWar:"You are an abomination to heaven and earth, the chief of ignorant savages! You must be destroyed!"
-		attacked:"Fool! You have doomed your people to fire and destruction!"
-		defeated:"We have been consumed by the fires of hatred and rage. Enjoy your victory in this world - you shall pay a heavy price in the next!"
-		introduction:"I am Askia of the Songhai. We are a fair people - but those who cross us will find only destruction. You would do well to avoid repeating the mistakes others have made in the past."
-		
-		neutralHello:"Greetings."
-		neutralLetsHearIt:["Yes?","Proceed."]
-		neutralNo:["No","Of course not."]
-		neutralYes:["Very well.","Yes.","Fine."]
-
-		hateHello:"Oh, it's you."
-		hateLetsHearIt:["And?","Continue."]
-		hateNo:["You cannot be serious!","That's unacceptable!","We decline."]
-		hateYes:["Oh, very well.","Alright."]
-		
-		afterPeace:"We thank you for bringing an end to this pointless war."
-		tradeRequest:"Can I interest you in this deal?"
-				
-		outerColor:[204,102,0],
-		innerColor:[255,0,0],
-		uniqueName:"River Warlord"
-		unique:"Embarked units gain the War Canoes and Amphibious promotions, strengthening them while embarked.",
-		cities:["Gao","Tombouctu","Jenne","Taghaza","Tondibi","Kumbi Saleh","Kukia","Walata","Tegdaoust","Argungu","Gwandu",
-			"Kebbi","Boussa","Motpi","Bamako","Wa","Kayes","Awdaghost","Ouadane","Dakar","Tadmekket","Tekedda","Kano",
-			"Agadez","Niamey","Torodi","Ouatagouna","Dori","Bamba","Segou"]
 	},
 	{
 		//NEEDS SNOW AND ICE

android/assets/jsons/Units.json

@@ -614,7 +614,6 @@
 		hurryCostModifier:20,
 		attackSound:"shot"
 	},
-	/*
 	{
 		name:"Mandekalu Cavalry",
 		replaces:"Knight",
@@ -630,8 +629,8 @@
 		uniques:["Can move after attacking","No defensive terrain bonus"],
 		hurryCostModifier:20,
 		attackSound:"horse"
-		//Songhai unique unit. Costs slightly less and is more powerful than a Knight
 	},
+	/*
 	{
 		name:"Keshik",
 		replaces:"Knight",

android/assets/jsons/translationsByLanguage/Czech.properties

@@ -63,6 +63,10 @@ Colossus = Rhodský kolos
 
 Temple = Chrám
 Burial Tomb = Hrobka
+ # Requires translation!
+Doubles Gold given to enemy if city is captured = 
+ # Requires translation!
+Mud Pyramid Mosque = 
 
 The Oracle = Věštírna
 'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing'  - Socrates = 'Starověké Orakulum řeklo, že jsem nejmoudřejší ze všech Řeků. Je to proto, že já sám ze všech Řeků vím, že nic nevím' - Sókratés
@@ -703,6 +707,8 @@ Your relationship with [cityStateName] is about to degrade =
 Your relationship with [cityStateName] degraded = 
  # Requires translation!
 A new barbarian encampment has spawned! = 
+ # Requires translation!
+Received [goldAmount] Gold for capturing [cityName] = 
 
 # World Screen UI
 
@@ -1490,6 +1496,8 @@ Camel Archer = Lučištník na velbloudu
  # Requires translation!
 Conquistador = 
  # Requires translation!
+Mandekalu Cavalry = 
+ # Requires translation!
 Defense bonus when embarked = 
 Naresuan's Elephant = Naresuanův slon
 Samurai = Samuraj

android/assets/jsons/translationsByLanguage/Dutch.properties

@@ -77,6 +77,10 @@ Colossus =
 
 Temple = Tempel
 Burial Tomb = Graftombe
+ # Requires translation!
+Doubles Gold given to enemy if city is captured = 
+ # Requires translation!
+Mud Pyramid Mosque = 
 
 The Oracle = Het Orakel
  # Requires translation!
@@ -1117,6 +1121,8 @@ Your relationship with [cityStateName] is about to degrade =
 Your relationship with [cityStateName] degraded = 
  # Requires translation!
 A new barbarian encampment has spawned! = 
+ # Requires translation!
+Received [goldAmount] Gold for capturing [cityName] = 
 
 # World Screen UI
 
@@ -2336,6 +2342,8 @@ Camel Archer =
  # Requires translation!
 Conquistador = 
  # Requires translation!
+Mandekalu Cavalry = 
+ # Requires translation!
 Defense bonus when embarked = 
  # Requires translation!
 Naresuan's Elephant = 

android/assets/jsons/translationsByLanguage/English.properties

@@ -106,6 +106,10 @@ Colossus =
 Temple = 
  # Requires translation!
 Burial Tomb = 
+ # Requires translation!
+Doubles Gold given to enemy if city is captured = 
+ # Requires translation!
+Mud Pyramid Mosque = 
 
  # Requires translation!
 The Oracle = 
@@ -1241,6 +1245,8 @@ Your relationship with [cityStateName] is about to degrade =
 Your relationship with [cityStateName] degraded = 
  # Requires translation!
 A new barbarian encampment has spawned! = 
+ # Requires translation!
+Received [goldAmount] Gold for capturing [cityName] = 
 
 # World Screen UI
 
@@ -2688,6 +2694,8 @@ Camel Archer =
  # Requires translation!
 Conquistador = 
  # Requires translation!
+Mandekalu Cavalry = 
+ # Requires translation!
 Defense bonus when embarked = 
  # Requires translation!
 Naresuan's Elephant = 

android/assets/jsons/translationsByLanguage/French.properties

@@ -61,6 +61,10 @@ Colossus = Colosse
 
 Temple = Temple
 Burial Tomb = Tombeau
+ # Requires translation!
+Doubles Gold given to enemy if city is captured = 
+ # Requires translation!
+Mud Pyramid Mosque = 
 
 The Oracle = L'oracle
 'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing'  - Socrates = 'L'Oracle a dit que j'étais le plus sage de tous les grecs. C'est parce que je suis le seul, de tous les grecs, à savoir que je ne sais rien' - Socrate
@@ -688,6 +692,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Nous avons
 Your relationship with [cityStateName] is about to degrade = Notre relation avec [cityStateName] va se dégrader
 Your relationship with [cityStateName] degraded = Notre relation avec [cityStateName] est dégradée
 A new barbarian encampment has spawned! = Un nouveau campement barbare est apparu !
+ # Requires translation!
+Received [goldAmount] Gold for capturing [cityName] = 
 
 # World Screen UI
 
@@ -1444,6 +1450,8 @@ Landsknecht = Lansquenet
 Knight = Chevalier
 Camel Archer = Archer méhariste
 Conquistador = Conquistador
+ # Requires translation!
+Mandekalu Cavalry = 
 Defense bonus when embarked = Bonus de défense quand embarqué
 Naresuan's Elephant = Elephant de Naresuan
 Samurai = Samuraï

android/assets/jsons/translationsByLanguage/German.properties

@@ -62,6 +62,10 @@ Colossus = Koloss
 
 Temple = Tempel
 Burial Tomb = Grabstätte
+ # Requires translation!
+Doubles Gold given to enemy if city is captured = 
+ # Requires translation!
+Mud Pyramid Mosque = 
 
 The Oracle = Das Orakel
 'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing'  - Socrates = 'Das alte Orakel sagte, dass ich der weiseste aller Griechen sei. Weil ich allein, von allen Griechen, weiß, dass ich nichts weiß.'  -Socrates
@@ -706,6 +710,8 @@ Your relationship with [cityStateName] is about to degrade =
 Your relationship with [cityStateName] degraded = 
  # Requires translation!
 A new barbarian encampment has spawned! = 
+ # Requires translation!
+Received [goldAmount] Gold for capturing [cityName] = 
 
 # World Screen UI
 
@@ -1498,6 +1504,8 @@ Camel Archer = Kamel-Bogenschütze
  # Requires translation!
 Conquistador = 
  # Requires translation!
+Mandekalu Cavalry = 
+ # Requires translation!
 Defense bonus when embarked = 
 Naresuan's Elephant = Naresuans Elefant
 Samurai = Samurai

android/assets/jsons/translationsByLanguage/Indonesian.properties

@@ -62,6 +62,10 @@ Colossus = Kolosus
 
 Temple = Kuil
 Burial Tomb = Makam Terkubur
+ # Requires translation!
+Doubles Gold given to enemy if city is captured = 
+ # Requires translation!
+Mud Pyramid Mosque = 
 
 The Oracle = Oracle
 'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing'  - Socrates = 'Sang Oracle telah berkata bahwa saya adalah orang yang paling bijak di Yunani. Semua itu karena saya sendirian, dari semua orang Yunani, ketahuilah bahwa saya tidak tahu apa - apa' - Socrates
@@ -704,6 +708,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Kita telah
 Your relationship with [cityStateName] is about to degrade = Hubungan Anda dengan Kota Negara [cityStateName] akan memudar
 Your relationship with [cityStateName] degraded = Hubungan Anda dengan Kota Negara [cityStateName] telah pudar
 A new barbarian encampment has spawned! = Sebuah perkemahan orang barbar telah muncul!
+ # Requires translation!
+Received [goldAmount] Gold for capturing [cityName] = 
 
 # World Screen UI
 
@@ -1773,6 +1779,8 @@ Camel Archer =
  # Requires translation!
 Conquistador = 
  # Requires translation!
+Mandekalu Cavalry = 
+ # Requires translation!
 Defense bonus when embarked = 
  # Requires translation!
 Naresuan's Elephant = 

android/assets/jsons/translationsByLanguage/Italian.properties

@@ -61,6 +61,8 @@ Colossus = Colosso
 
 Temple = Tempio
 Burial Tomb = Sepolcro
+Doubles Gold given to enemy if city is captured = Raddoppia i Gold razziati se la città è conquistata
+Mud Pyramid Mosque = Moschea piramidale di fango
 
 The Oracle = Oracolo
 'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing'  - Socrates = 'L'antico Oracolo ha detto che sono il più saggio di tutti i greci. Questo perché io solo, di tutti i greci, so di non sapere nulla.' - Socrate
@@ -688,6 +690,7 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Abbiamo ric
 Your relationship with [cityStateName] is about to degrade = Stai perdendo il controllo di [cityStateName]
 Your relationship with [cityStateName] degraded = Tu e [cityStateName] non siete più amici
 A new barbarian encampment has spawned! = È sorto un nuovo accampamento barbaro!
+Received [goldAmount] Gold for capturing [cityName] = Hai ricevuto [goldAmount] per la conquista di [cityName]
 
 # World Screen UI
 
@@ -1443,6 +1446,7 @@ Landsknecht = Lanzichenecco
 Knight = Cavaliere
 Camel Archer = Arciere su cammello
 Conquistador = Conquistador
+Mandekalu Cavalry = Cavalleria Mandekalu
 Defense bonus when embarked = Difesa bonus quando imbarcato
 Naresuan's Elephant = Elefante di Naresuan
 Samurai = Samurai

android/assets/jsons/translationsByLanguage/Korean.properties

@@ -76,6 +76,10 @@ Colossus = 로도스의 거상
 
 Temple = 사원
 Burial Tomb = 왕릉
+ # Requires translation!
+Doubles Gold given to enemy if city is captured = 
+ # Requires translation!
+Mud Pyramid Mosque = 
 
 The Oracle = 오라클
 'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing'  - Socrates = '고대 오라클은 내가 그리스에서 가장 현명하다 하였다. 그것은, 모든 그리스인 중 나만이, 내가 아무것도 모른다는 사실을 알기 때문이다.' - 소크라테스
@@ -726,6 +730,8 @@ Your relationship with [cityStateName] is about to degrade =
 Your relationship with [cityStateName] degraded = 
  # Requires translation!
 A new barbarian encampment has spawned! = 
+ # Requires translation!
+Received [goldAmount] Gold for capturing [cityName] = 
 
 # World Screen UI
 
@@ -1522,6 +1528,8 @@ Camel Archer = 낙타궁병
  # Requires translation!
 Conquistador = 
  # Requires translation!
+Mandekalu Cavalry = 
+ # Requires translation!
 Defense bonus when embarked = 
 Naresuan's Elephant = 나레수안 전투코끼리
 Samurai = 사무라이

android/assets/jsons/translationsByLanguage/Malay.properties

@@ -93,6 +93,10 @@ Colossus =
 
 Temple = Kuil
 Burial Tomb = Tempat Persemadian
+ # Requires translation!
+Doubles Gold given to enemy if city is captured = 
+ # Requires translation!
+Mud Pyramid Mosque = 
 
  # Requires translation!
 The Oracle = 
@@ -1130,6 +1134,8 @@ Your relationship with [cityStateName] is about to degrade =
 Your relationship with [cityStateName] degraded = 
  # Requires translation!
 A new barbarian encampment has spawned! = 
+ # Requires translation!
+Received [goldAmount] Gold for capturing [cityName] = 
 
 # World Screen UI
 
@@ -2499,6 +2505,8 @@ Camel Archer =
  # Requires translation!
 Conquistador = 
  # Requires translation!
+Mandekalu Cavalry = 
+ # Requires translation!
 Defense bonus when embarked = 
  # Requires translation!
 Naresuan's Elephant = 

android/assets/jsons/translationsByLanguage/Polish.properties

@@ -61,6 +61,10 @@ Colossus = Kolos Rodyjski
 
 Temple = Świątynia
 Burial Tomb = Grobowiec
+ # Requires translation!
+Doubles Gold given to enemy if city is captured = 
+ # Requires translation!
+Mud Pyramid Mosque = 
 
 The Oracle = Wyrocznia
 'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing'  - Socrates = 'Starożytna Wyrocznia powiedziała, że jestem najmądrzejszym z Greków. Bo tylko ja ze wszystkich Greków wiem, że nic nie wiem.' - Sokrates
@@ -688,6 +692,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Otrzymaliś
 Your relationship with [cityStateName] is about to degrade = Twoja relacje z [cityStateName] jest bliska degradacji
 Your relationship with [cityStateName] degraded = Twoja relacja z [cityStateName] została zdegradowana
 A new barbarian encampment has spawned! = Nowy obóz barbarzyńców został utworzony!
+ # Requires translation!
+Received [goldAmount] Gold for capturing [cityName] = 
 
 # World Screen UI
 
@@ -1444,6 +1450,8 @@ Landsknecht = Landsknecht
 Knight = Rycerz
 Camel Archer = Łucznik na wielbłądzie
 Conquistador = Zdobywca
+ # Requires translation!
+Mandekalu Cavalry = 
 Defense bonus when embarked = Premia obronna przy wejściu w tryb statku
 Naresuan's Elephant = Słoń Naresuan
 Samurai = Samuraj

android/assets/jsons/translationsByLanguage/Portuguese.properties

@@ -63,6 +63,10 @@ Colossus = Colossos
 
 Temple = Templo
 Burial Tomb = Tumba
+ # Requires translation!
+Doubles Gold given to enemy if city is captured = 
+ # Requires translation!
+Mud Pyramid Mosque = 
 
 The Oracle = O Oráculo
 'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing'  - Socrates = 'O Oráculo ancião falou que eu era o mais sábio de todos os Gregos. Isso porque apenas eu, de todos os gregos, só sei que nada sei' - Sócrates
@@ -745,6 +749,8 @@ Your relationship with [cityStateName] is about to degrade =
 Your relationship with [cityStateName] degraded = 
  # Requires translation!
 A new barbarian encampment has spawned! = 
+ # Requires translation!
+Received [goldAmount] Gold for capturing [cityName] = 
 
 # World Screen UI
 
@@ -1673,6 +1679,8 @@ Camel Archer = Arqueiro de camelo
  # Requires translation!
 Conquistador = 
  # Requires translation!
+Mandekalu Cavalry = 
+ # Requires translation!
 Defense bonus when embarked = 
 Naresuan's Elephant = Elefante de Naresuan
 Samurai = Samurai

android/assets/jsons/translationsByLanguage/Romanian.properties

@@ -86,6 +86,10 @@ Colossus =
 
 Temple = Templu
 Burial Tomb = Loc de veci
+ # Requires translation!
+Doubles Gold given to enemy if city is captured = 
+ # Requires translation!
+Mud Pyramid Mosque = 
 
 The Oracle = Oracolul
  # Requires translation!
@@ -1024,6 +1028,8 @@ Your relationship with [cityStateName] is about to degrade =
 Your relationship with [cityStateName] degraded = 
  # Requires translation!
 A new barbarian encampment has spawned! = 
+ # Requires translation!
+Received [goldAmount] Gold for capturing [cityName] = 
 
 # World Screen UI
 
@@ -2057,6 +2063,8 @@ Camel Archer = Arcaș pe cămilă
  # Requires translation!
 Conquistador = 
  # Requires translation!
+Mandekalu Cavalry = 
+ # Requires translation!
 Defense bonus when embarked = 
  # Requires translation!
 Naresuan's Elephant = 

android/assets/jsons/translationsByLanguage/Russian.properties

@@ -61,6 +61,10 @@ Colossus = Колосс Родосский
 
 Temple = Храм
 Burial Tomb = Гробница
+ # Requires translation!
+Doubles Gold given to enemy if city is captured = 
+ # Requires translation!
+Mud Pyramid Mosque = 
 
 The Oracle = Оракул
 'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing'  - Socrates = 'Он спросил, есть ли кто-нибудь на свете мудрее меня, и Пифия ему ответила, что никого нет мудрее... потому что я коли уж не знаю, то и не думаю, что знаю' - Сократ в «Апологии Сократа» Платона
@@ -688,6 +692,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Мы пол
 Your relationship with [cityStateName] is about to degrade = Ваши отношения с [cityStateName] скоро ухудшатся
 Your relationship with [cityStateName] degraded = Ваши отношения с [cityStateName] ухудшились
 A new barbarian encampment has spawned! = Появился новый лагерь варваров!
+ # Requires translation!
+Received [goldAmount] Gold for capturing [cityName] = 
 
 # World Screen UI
 
@@ -1443,6 +1449,8 @@ Landsknecht = Ландскнехт
 Knight = Рыцарь
 Camel Archer = Лучник на верблюде
 Conquistador = Конкистадор
+ # Requires translation!
+Mandekalu Cavalry = 
 Defense bonus when embarked = Бонус к защите когда погружен на корабль
 Naresuan's Elephant = Слон Наресуана
 Samurai = Самурай

android/assets/jsons/translationsByLanguage/Simplified_Chinese.properties

@@ -62,6 +62,10 @@ Colossus = 太阳神巨像
 
 Temple = 神庙
 Burial Tomb = 陵墓
+ # Requires translation!
+Doubles Gold given to enemy if city is captured = 
+ # Requires translation!
+Mud Pyramid Mosque = 
 
 The Oracle = 神谕所
 'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing'  - Socrates = “先知的神谕曾说我是全希腊最聪明的人。因为我是所有希腊人中唯一知道自己一无所知的人。”——苏格拉底
@@ -704,6 +708,8 @@ Your relationship with [cityStateName] is about to degrade =
 Your relationship with [cityStateName] degraded = 
  # Requires translation!
 A new barbarian encampment has spawned! = 
+ # Requires translation!
+Received [goldAmount] Gold for capturing [cityName] = 
 
 # World Screen UI
 
@@ -1488,6 +1494,8 @@ Camel Archer = 骆驼骑射手
  # Requires translation!
 Conquistador = 
  # Requires translation!
+Mandekalu Cavalry = 
+ # Requires translation!
 Defense bonus when embarked = 
 Naresuan's Elephant = 纳黎萱战象
 Samurai = 日本武士

android/assets/jsons/translationsByLanguage/Spanish.properties

@@ -61,6 +61,10 @@ Colossus = Coloso
 
 Temple = Templo
 Burial Tomb = Tumba Sagrada
+ # Requires translation!
+Doubles Gold given to enemy if city is captured = 
+ # Requires translation!
+Mud Pyramid Mosque = 
 
 The Oracle = El Oráculo
 'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing'  - Socrates = 'El oráculo de Delfos ha dicho que soy el más sabio de todos los griegos. Eso es porque, de todos ellos, solo yo sé que no sé nada.' - Sócrates
@@ -692,6 +696,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Hemos recib
 Your relationship with [cityStateName] is about to degrade = Tus relaciones con [cityStateName] están a punto de empeorar
 Your relationship with [cityStateName] degraded = Tus relaciones con [cityStateName] han empeorado
 A new barbarian encampment has spawned! = ¡Ha aparecido un nuevo campamento bárbaro!
+ # Requires translation!
+Received [goldAmount] Gold for capturing [cityName] = 
 
 # World Screen UI
 
@@ -1456,6 +1462,8 @@ Camel Archer = Arquero a camello
  # Requires translation!
 Conquistador = 
  # Requires translation!
+Mandekalu Cavalry = 
+ # Requires translation!
 Defense bonus when embarked = 
 Naresuan's Elephant = Elefante Naresuan
 Samurai = Samurai

android/assets/jsons/translationsByLanguage/Traditional_Chinese.properties

@@ -62,6 +62,10 @@ Colossus = 太陽神巨像
 
 Temple = 神廟
 Burial Tomb = 陵墓
+ # Requires translation!
+Doubles Gold given to enemy if city is captured = 
+ # Requires translation!
+Mud Pyramid Mosque = 
 
 The Oracle = 神諭所
 'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing'  - Socrates = “先知的神諭曾說我是全希臘最聰明的人。因為我是所有希臘人中唯一知道自己一無所知的人。”——蘇格拉底
@@ -704,6 +708,8 @@ Your relationship with [cityStateName] is about to degrade =
 Your relationship with [cityStateName] degraded = 
  # Requires translation!
 A new barbarian encampment has spawned! = 
+ # Requires translation!
+Received [goldAmount] Gold for capturing [cityName] = 
 
 # World Screen UI
 
@@ -1488,6 +1494,8 @@ Camel Archer = 駱駝騎射手
  # Requires translation!
 Conquistador = 
  # Requires translation!
+Mandekalu Cavalry = 
+ # Requires translation!
 Defense bonus when embarked = 
 Naresuan's Elephant = 納黎萱戰象
 Samurai = 日本武士

android/assets/jsons/translationsByLanguage/Ukrainian.properties

@@ -61,6 +61,10 @@ Colossus = Колос Родоський
 
 Temple = Храм
 Burial Tomb = Гробниця
+ # Requires translation!
+Doubles Gold given to enemy if city is captured = 
+ # Requires translation!
+Mud Pyramid Mosque = 
 
 The Oracle = Оракул
 'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing'  - Socrates = «Давній оракул сказав, що я наймудріший з греків. Бо я єдиний, хто знає, що нічого не знає.» - Сократ
@@ -688,6 +692,8 @@ We have received [goldAmount] Gold for discovering [naturalWonder] = Ми отр
 Your relationship with [cityStateName] is about to degrade = Ваші стосунки з [cityStateName] близькі до погіршення
 Your relationship with [cityStateName] degraded = Ваші стосунки з [cityStateName] погіршилися
 A new barbarian encampment has spawned! = З’явився новий варварський табір!
+ # Requires translation!
+Received [goldAmount] Gold for capturing [cityName] = 
 
 # World Screen UI
 
@@ -1443,6 +1449,8 @@ Landsknecht = Ландскнехт
 Knight = Лицар
 Camel Archer = Лучник на верблюді
 Conquistador = Конкістадор
+ # Requires translation!
+Mandekalu Cavalry = 
 Defense bonus when embarked = Бонус до захисту при підйомі на борт
 Naresuan's Elephant = Слон Наресуана
 Samurai = Самурай

android/assets/jsons/translationsByLanguage/completionPercentages.properties

@@ -1,17 +1,17 @@
 Traditional_Chinese = 96
 Italian = 100
+Russian = 99
 Polish = 99
-Russian = 100
 Romanian = 48
-Korean = 94
+Korean = 93
 Simplified_Chinese = 96
 German = 95
 English = 0
-Ukrainian = 100
+Ukrainian = 99
 French = 99
 Portuguese = 83
 Indonesian = 66
-Czech = 96
-Malay = 13
 Spanish = 98
+Malay = 13
+Czech = 96
 Dutch = 25

android/assets/jsons/translationsByLanguage/template.properties

@@ -61,6 +61,8 @@ Colossus =
 
 Temple = 
 Burial Tomb = 
+Doubles Gold given to enemy if city is captured = 
+Mud Pyramid Mosque = 
 
 The Oracle = 
 'The ancient Oracle said that I was the wisest of all the Greeks. It is because I alone, of all the Greeks, know that I know nothing'  - Socrates = 
@@ -688,6 +690,7 @@ We have received [goldAmount] Gold for discovering [naturalWonder] =
 Your relationship with [cityStateName] is about to degrade = 
 Your relationship with [cityStateName] degraded = 
 A new barbarian encampment has spawned! = 
+Received [goldAmount] Gold for capturing [cityName] = 
 
 # World Screen UI
 
@@ -1443,6 +1446,7 @@ Landsknecht =
 Knight = 
 Camel Archer = 
 Conquistador = 
+Mandekalu Cavalry = 
 Defense bonus when embarked = 
 Naresuan's Elephant = 
 Samurai = 

core/src/com/unciv/logic/battle/BattleDamage.kt

@@ -145,7 +145,8 @@ class BattleDamage{
 
         if (defender.unit.isEmbarked()) {
             // embarked units get no defensive modifiers apart from this unique
-            if (defender.unit.hasUnique("Defense bonus when embarked"))
+            if (defender.unit.hasUnique("Defense bonus when embarked") ||
+                    defender.getCivInfo().nation.unique == "Receive triple Gold from Barbarian encampments and pillaging Cities. Embarked units can defend themselves.")
                 modifiers["Embarkation"] = 1f
 
             return modifiers

core/src/com/unciv/logic/city/CityInfo.kt

@@ -19,10 +19,8 @@ import com.unciv.models.ruleset.tile.ResourceSupplyList
 import com.unciv.models.ruleset.tile.ResourceType
 import com.unciv.models.stats.Stats
 import com.unciv.ui.utils.withoutItem
-import kotlin.math.ceil
+import kotlin.math.*
-import kotlin.math.floor
+import java.util.*
-import kotlin.math.min
-import kotlin.math.roundToInt
 
 class CityInfo {
     @Transient lateinit var civInfo: CivilizationInfo
@@ -35,6 +33,7 @@ class CityInfo {
     var location: Vector2 = Vector2.Zero
     var name: String = ""
     var foundingCiv = ""
+    var turnAcquired = 0
     var health = 200
     var resistanceCounter = 0
 
@@ -54,6 +53,7 @@ class CityInfo {
     constructor(civInfo: CivilizationInfo, cityLocation: Vector2) {  // new city!
         this.civInfo = civInfo
         foundingCiv = civInfo.civName
+        turnAcquired = civInfo.gameInfo.turns
         this.location = cityLocation
         setTransients()
 
@@ -111,6 +111,7 @@ class CityInfo {
         toReturn.attackedThisTurn = attackedThisTurn
         toReturn.resistanceCounter = resistanceCounter
         toReturn.foundingCiv = foundingCiv
+        toReturn.turnAcquired = turnAcquired
         toReturn.isPuppet = isPuppet
         return toReturn
     }
@@ -366,6 +367,11 @@ class CityInfo {
     /** This happens when we either puppet OR annex, basically whenever we conquer a city and don't liberate it */
     fun puppetCity(conqueringCiv: CivilizationInfo) {
 
+        // Gain gold for plundering city
+        val goldPlundered = getGoldForCapturingCity(conqueringCiv)
+        conqueringCiv.gold += goldPlundered
+        conqueringCiv.addNotification("Received [$goldPlundered] Gold for capturing [$name]", centerTileInfo.position, Color.GOLD)
+
         val oldCiv = civInfo
         moveToCiv(conqueringCiv)
         if(oldCiv.isDefeated()) {
@@ -469,7 +475,8 @@ class CityInfo {
         civInfo.cities = civInfo.cities.toMutableList().apply { remove(this@CityInfo) }
         newCivInfo.cities = newCivInfo.cities.toMutableList().apply { add(this@CityInfo) }
         civInfo = newCivInfo
-        hasJustBeenConquered=false
+        hasJustBeenConquered = false
+        turnAcquired = civInfo.gameInfo.turns
 
         // now that the tiles have changed, we need to reassign population
         workedTiles.filterNot { tiles.contains(it) }
@@ -539,6 +546,15 @@ class CityInfo {
         civInfo.updateDetailedCivResources() // this building could be a resource-requiring one
     }
 
+    fun getGoldForCapturingCity(conqueringCiv: CivilizationInfo): Int {
+        val baseGold = 20 + 10 * population.population + Random().nextInt(40)
+        val turnModifier = max(0, min(50, civInfo.gameInfo.turns - turnAcquired)) / 50f
+        val cityModifier = if (containsBuildingUnique("Doubles Gold given to enemy if city is captured")) 2f else 1f
+        val conqueringCivModifier = if (conqueringCiv.nation.unique == "Receive triple Gold from Barbarian encampments and pillaging Cities. Embarked units can defend themselves.") 3f else 1f
+
+        val goldPlundered = baseGold * turnModifier * cityModifier * conqueringCivModifier
+        return goldPlundered.toInt()
+    }
 
     /*
      When someone settles a city within 6 tiles of another civ,

core/src/com/unciv/logic/map/MapUnit.kt

@@ -449,10 +449,14 @@ class MapUnit {
     }
 
     private fun clearEncampment(tile: TileInfo) {
-        tile.improvement=null
+        tile.improvement = null
-        val goldToAdd = 25 // game-speed-dependant
+
-        civInfo.gold+=goldToAdd
+        var goldGained = civInfo.getDifficulty().clearBarbarianCampReward * civInfo.gameInfo.gameParameters.gameSpeed.getModifier()
-        civInfo.addNotification("We have captured a barbarian encampment and recovered [$goldToAdd] gold!", tile.position, Color.RED)
+        if (civInfo.nation.unique == "Receive triple Gold from Barbarian encampments and pillaging Cities. Embarked units can defend themselves.")
+            goldGained *= 3f
+
+        civInfo.gold += goldGained.toInt()
+        civInfo.addNotification("We have captured a barbarian encampment and recovered [${goldGained.toInt()}] gold!", tile.position, Color.RED)
     }
 
     fun disband(){

core/src/com/unciv/models/ruleset/Difficulty.kt

@@ -24,4 +24,5 @@ class Difficulty: INamed {
     var aiUnhappinessModifier = 1f
     var aisExchangeTechs = false
     var turnBarbariansCanEnterPlayerTiles = 0
+    var clearBarbarianCampReward = 25
 }