Added Siam civ - #703

android/assets/jsons/Buildings.json

@@ -425,6 +425,19 @@
 		uniques:["+2 Science from each worked Jungle tile"],
 		requiredTech:"Education"
 	},
+	{
+		name:"Wat",
+		replaces:"University",
+		uniqueTo:"Siam",
+		maintenance:2,
+		hurryCostModifier:15,
+		percentStatBonus:{science:33},
+		specialistSlots:{science:2},
+		culture:3,
+		requiredBuilding:"Library",
+		uniques:["+2 Science from each worked Jungle tile"],
+		requiredTech:"Education"
+	},
 	{
 		name:"Oxford University",
 		science:3,
@@ -435,21 +448,6 @@
 		uniques:["Free Technology"],
 		requiredTech:"Education"
 	},
-	/*
-	{
-		name:"Wat",
-		replaces:"University",
-		uniqueTo:"Siam",
-		maintenance:2,
-		hurryCostModifier:15,
-		percentStatBonus:{science:33},
-		specialistSlots:{science:2},
-		culture:1,
-		requiredBuilding:"Library",
-		uniques:["+2 Science from each worked Jungle tile"],
-		requiredTech:"Education"
-	},
-	*/
 	{
 		name:"Castle",
 		cityStrength:7,

android/assets/jsons/Nations/Nations.json

@@ -646,7 +646,7 @@
 		afterPeace:"Perhaps the stars were mistakenly placed... I will consult my Kahuna."
 		tradeRequest:"Come, let our people feast together!"
 				
-		outerColor:[210,51,0],
+		outerColor:[225,105,0],
 		innerColor:[255,255,78],
 		uniqueName:"Wayfinding"
 		unique:"Can embark and move over Coasts and Oceans immediately. +1 Sight when embarked. +10% Combat Strength bonus if within 2 tiles of a Moai.",
@@ -655,6 +655,43 @@
 			"Rakahanga","Bora Bora","Kailua","Uvea","Futuna","Rotuma","Tokelau","Lahaina","Bellona","Mungava","Tikopia",
 			"Emae","Kapingamarangi","Takuu","Nukuoro","Sikaiana","Anuta","Nuguria","Pileni","Nukumanu"]
 	},
+	{
+		name:"Siam",
+		leaderName:"Ramkhamhaeng",
+		adjective:["Siamese"],
+		startBias:["Avoid Forest"],
+		//preferredVictoryType:"Diplomatic",
+		
+		startIntroPart1: "Greetings to you, Great King Ramkhamhaeng, leader of the glorious Siamese people! O mighty King, your people bow down before you in awe and fear! You are the ruler of Siam, an ancient country in the heart of Southeast Asia, a beautiful and mysterious land. Surrounded by foes, beset by bloody war and grinding poverty, the clever and loyal Siamese people have endured and trumphed. King Ramkhamhaeng, your empire was once part of the Khmer Empire, until the 13th century AD, when your ancestors revolted, forming the small Sukhothai kingdom. Through successful battle and cunning diplomacy, the tiny kingdom grew into a mighty empire, an empire which would dominate South East Asia for more than a century!"
+		startIntroPart2: "Oh, wise and puissant King Ramkhamhaeng, your people need you to once again lead them to greatness! Cann you use your wits and strenght of arms to protect your people and defeat your foes? Can you build a civilization that will stand the test of time?"
+		
+		declaringWar:"You lowly, arrogant fool! I will make you regret of your insolence!"
+		attacked:"You scoundrel! I shall prepare to fend you off!"
+		defeated:"Althought I lost, my honor shall endure. I wish you good luck."
+		introduction:"I, Pho Kun Ramkhamhaeng, King of Siam, consider it a great honor that you have walked to visit my country of Siam."
+		
+		neutralHello:"Welcome."
+		neutralLetsHearIt:["Let us hear it.","You say?","I'm listening"]
+		neutralNo:["No.","Certainly no.","No way."]
+		neutralYes:["In that case...","Of course.","Agreed."]
+
+		hateHello:"Greetings."
+		hateLetsHearIt:["You were saying?.","Please proceed","So?"]
+		hateNo:["That is unacceptable.","You probably didn't mean that.","What did you say?"]
+		hateYes:["I think I must do as such.","Very well."]
+		
+		afterPeace:"You have won, but I shall return to repay this debt."
+		tradeRequest:"Greetings. I believe this is a fair proposal for both parties. What do you think?"
+				
+		outerColor:[228,208,43],
+		innerColor:[193,21,17],
+		uniqueName:"Father Governs Children"
+		unique:"Food and Culture from Friendly City-States are increased by 50%",
+		cities:["Sukhothai","Si Satchanalai","Muang Saluang","Lampang","Phitsanulok","Kamphaeng Pet","Nakhom Chum","Vientiane",
+			"Nakhon Si Thammarat","Martaban","Nakhon Sawan","Chainat","Luang Prabang","Uttaradit","Chiang Thong","Phrae",
+			"Nan","Tak","Suphanburi","Hongsawadee","Thawaii","Ayutthuya","Taphan Hin","Uthai Thani","Lap Buri","Ratchasima",
+			"Ban Phai","Loci","Khan Kaen","Surin"]
+	},
 	
 	/*
 	
@@ -844,43 +881,6 @@
 			"Kebbi","Boussa","Motpi","Bamako","Wa","Kayes","Awdaghost","Ouadane","Dakar","Tadmekket","Tekedda","Kano",
 			"Agadez","Niamey","Torodi","Ouatagouna","Dori","Bamba","Segou"]
 	},
-	{
-		name:"Siam",
-		leaderName:"Ramkhamhaeng",
-		adjective:["Siamese"],
-		startBias:["Avoid Forest"],
-		//preferredVictoryType:"Diplomatic",
-		
-		startIntroPart1: "Greetings to you, Great King Ramkhamhaeng, leader of the glorious Siamese people! O mighty King, your people bow down before you in awe and fear! You are the ruler of Siam, an ancient country in the heart of Southeast Asia, a beautiful and mysterious land. Surrounded by foes, beset by bloody war and grinding poverty, the clever and loyal Siamese people have endured and trumphed. King Ramkhamhaeng, your empire was once part of the Khmer Empire, until the 13th century AD, when your ancestors revolted, forming the small Sukhothai kingdom. Through successful battle and cunning diplomacy, the tiny kingdom grew into a mighty empire, an empire which would dominate South East Asia for more than a century!"
-		startIntroPart2: "Oh, wise and puissant King Ramkhamhaeng, your people need you to once again lead them to greatness! Cann you use your wits and strenght of arms to protect your people and defeat your foes? Can you build a civilization that will stand the test of time?"
-		
-		declaringWar:"You lowly, arrogant fool! I will make you regret of your insolence!"
-		attacked:"You scoundrel! I shall prepare to fend you off!"
-		defeated:"Althought I lost, my honor shall endure. I wish you good luck."
-		introduction:"I, Pho Kun Ramkhamhaeng, King of Siam, consider it a great honor that you have walked to visit my country of Siam."
-		
-		neutralHello:"Welcome."
-		neutralLetsHearIt:["Let us hear it.","You say?","I'm listening"]
-		neutralNo:["No.","Certainly no.","No way."]
-		neutralYes:["In that case...","Of course.","Agreed."]
-
-		hateHello:"Greetings."
-		hateLetsHearIt:["You were saying?.","Please proceed","So?"]
-		hateNo:["That is unacceptable.","You probably didn't mean that.","What did you say?"]
-		hateYes:["I think I must do as such.","Very well."]
-		
-		afterPeace:"You have won, but I shall return to repay this debt."
-		tradeRequest:"Greetings. I believe this is a fair proposal for both parties. What do you think?"
-				
-		outerColor:[51,25,0],
-		innerColor:[255,255,102],
-		uniqueName:"Father Governs Children"
-		unique:"Food and Culture from Friendly City-States are increased by 50%",
-		cities:["Sukhothai","Si Satchanalai","Muang Saluang","Lampang","Phitsanulok","Kamphaeng Pet","Nakhom Chum","Vientiane",
-			"Nakhon Si Thammarat","Martaban","Nakhon Sawan","Chainat","Luang Prabang","Uttaradit","Chiang Thong","Phrae",
-			"Nan","Tak","Suphanburi","Hongsawadee","Thawaii","Ayutthuya","Taphan Hin","Uthai Thani","Lap Buri","Ratchasima",
-			"Ban Phai","Loci","Khan Kaen","Surin"]
-	},
 	{
 		//NEEDS SNOW AND ICE
 		name:"Denmark",

android/assets/jsons/Translations/Buildings.json

@@ -1141,15 +1141,12 @@
 		Polish:"+2 nauki z pól dżungli"
 		Czech:"+2 Výzkum za každého dělníka na políčku džungle"
 }
-
-	/*
 	"Wat":{	//Siamese unique
 		Italian:"Wat"
 		Polish:"Wat"
 		//same in French
 		Czech:"Vat"
 }
-	*/
 
 	"Oxford University":{
 		Italian:"Università di Oxford"

android/assets/jsons/Units.json

@@ -584,6 +584,21 @@
 		attackSound:"arrow"
 		//Camel Archer should have no penalty attacking cities
 	},
+	{
+		name:"Naresuan's Elephant",
+		unitType:"Mounted",
+		replaces:"Knight",
+		uniqueTo:"Siam",
+		movement:3,
+		strength:25,
+		cost: 120,
+		requiredTech:"Chivalry",
+		obsoleteTech:"Military Science",
+		upgradesTo:"Cavalry",
+		uniques:["Can move after attacking","No defensive terrain bonus","Bonus vs Mounted 50%","Penalty vs City 33%"],
+		hurryCostModifier:20,
+		attackSound:"shot"
+	},
 	/*
 	{
 		name:"Mandekalu Cavalry",
@@ -620,22 +635,6 @@
 		attackSound:"arrow"
 		//Mongolian unique unit.
 	},
-	{
-		name:"Naresuan's Elephant",
-		unitType:"Mounted",
-		replaces:"Knight",
-		uniqueTo:"Siam",
-		movement:3,
-		strength:25,
-		cost: 225,
-		requiredTech:"Chivalry",
-		obsoleteTech:"Military Science",
-		upgradesTo:"Cavalry",
-		uniques:["Can move after attacking","No defensive terrain bonus","50% Bonus vs. Mounted","33% Penalty vs. Cities"],
-		hurryCostModifier:20,
-		attackSound:"shot"
-		//Siamese unique unit. Doesn't require Horses.
-	},
 	*/
 	
 	// Rennaisance Era

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

@@ -125,6 +125,9 @@ class CityStats {
                     && otherCiv.getDiplomacyManager(cityInfo.civInfo).relationshipLevel() >= RelationshipLevel.Friend) {
                 if (cityInfo.isCapital()) stats.food += 3
                 else stats.food += 1
+
+                if (cityInfo.civInfo.nation.unique == "Food and Culture from Friendly City-States are increased by 50%")
+                    stats.food *= 1.5f
             }
         }
 

core/src/com/unciv/logic/civilization/CivInfoStats.kt

@@ -65,7 +65,10 @@ class CivInfoStats(val civInfo: CivilizationInfo){
             if (otherCiv.isCityState() && otherCiv.getCityStateType() == CityStateType.Cultured
                     && otherCiv.getDiplomacyManager(civInfo.civName).relationshipLevel() >= RelationshipLevel.Friend) {
                 val cultureBonus = Stats()
-                cultureBonus.add(Stat.Culture, 3f * (civInfo.getEra().ordinal+1))
+                var culture = 3f * (civInfo.getEra().ordinal+1)
+                if(civInfo.nation.unique=="Food and Culture from Friendly City-States are increased by 50%")
+                    culture*=1.5f
+                cultureBonus.add(Stat.Culture, culture)
                 statMap.add("City States",cultureBonus)
             }
         }

core/src/com/unciv/ui/utils/ImageGetter.kt

@@ -85,15 +85,15 @@ object ImageGetter {
     }
 
     fun getNationIndicator(nation: Nation, size:Float): IconCircleGroup {
-        val civIndicator = getCircle().apply { color = nation.getInnerColor() }
-                .surroundWithCircle(size).apply { circle.color = nation.getOuterColor() }
+        val civIndicator = getCircle().apply { color = nation.getOuterColor() }
+                .surroundWithCircle(size).apply { circle.color = nation.getInnerColor() }
 
         val civIconName = if(nation.isCityState()) "CityState" else nation.name
         if(nationIconExists(civIconName)){
-            val cityStateIcon = ImageGetter.getNationIcon(civIconName)
+            val cityStateIcon = getNationIcon(civIconName)
             cityStateIcon.setSize(size*0.7f,size*0.7f)
             cityStateIcon.center(civIndicator)
-            cityStateIcon.color = nation.getOuterColor()
+            cityStateIcon.color = nation.getInnerColor()
             civIndicator.addActor(cityStateIcon)
         }
 

docs/Credits.md

@@ -183,6 +183,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
 ### Medieval Era
 
 * [College](https://thenounproject.com/term/college/129978/) By Alexander Skowalsky for University
+* [Wat Arun Ratchawararam Ratchawaramahawihan](https://thenounproject.com/term/wat-arun-ratchawararam-ratchawaramahawihan/320664/) By József Balázs-Hegedüs for Wat
 * [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
@@ -446,6 +447,8 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
 * [Korea](https://thenounproject.com/search/?q=korea&i=1689701) by CJS for Korea
 * Two [Sword] Scimitars(https://www.flaticon.com/free-icon/sword_812259#term=scimitar&page=1&position=2) by Those Icons for Persia
 * [Spiral](https://www.shutterstock.com/image-vector/maori-symbol-spiral-shape-based-on-1145645057?id=1145645057) by bc21 for Polynesia
+* [Dharmachakra](https://thenounproject.com/search/?q=dharmachakra&i=740796) by Parkjisun for Siam
+
 
 ## Promotions