Added Korean civ

android/assets/jsons/Nations.json

@@ -505,6 +505,42 @@
 			"Bodrum","Eregli","Silifke","Sivas","Amasya","Marmaris","Trabzon","Erzurum","Urfa","Izmit","Afyonkarhisar",
 			"Bitlis","Yalova"]
 	},
+	{
+		name:"Korea",
+		leaderName:"Sejong",
+		adjective:["Korean"],
+		startBias:["Coast"],
+		preferredVictoryType:"Scientific",
+		
+		startIntroPart1: "Greetings to you, exalted King Sejong the Great, servant to the people and protector of the Choson Dynasty! Your glorious vision of prosperity and overwhelming benevolence towards the common man made you the most beloved of all Korean kings. From the earliest days of your reign, the effort you took to provide a fair and just society for all was surpassed only by the technological advances spurred onwards by your unquenched thirst for knowledge. Guided by your wisdom, the scholars of the Jade Hall developed Korea's first written language, Hangul, bringing the light of literature and science to the masses after centuries of literary darkness."
+		startIntroPart2: "Honorable Sejong, once more the people look to your for guidance. Will you rise to the occasion, bringing harmony and understanding to the people? Can you once again advance your kingdom's standing to such wondrous heights? Can you build a civilization that stands the test of time?"
+		
+		declaringWar:"Jip-hyun-jun (Hall of Worthies) will no longer tolerate your irksome behavior. We will liberate the citizens under your oppression even with force, and enlighten them!"
+		attacked:"Foolish, miserable wretch! You will be crushed by this country's magnificent scientific power!"
+		defeated:"Now the question is who will protect my people. A dark age has come."
+		introduction:"Welcome to the palace of Choson, stanger. I am the learned King Sejong, who looks after his great people."
+		
+		neutralHello:"Hello."
+		neutralLetsHearIt:["I will hear it.","Go on","Continue."]
+		neutralNo:["I cannot do that.","Apologies, but I will not accept it."]
+		neutralYes:["That is good.","I understand.","Of course!"]
+
+		hateHello:"Oh, it's you"
+		hateLetsHearIt:["What do you wish to say?","So?","Continue your speech."]
+		hateNo:["Heaven forbid","That is crazy talk!","I cannot do that."]
+		hateYes:["Hm... very well, fine.","I suppose I should agree...","Very well..."]
+		
+		afterPeace:"It seems you implemented some interesting strategies... Very well, perhaps we should call it a tie."
+		tradeRequest:"We have many things to discuss and have much to benefit from each other."
+				
+		outerColor:[20,25,73],
+		innerColor:[187,33,51],
+		uniqueName:"Scholars of the Jade Hall"
+		unique:"+2 Science for all specialists and Great Person tile improvements",
+		cities:["Seoul","Busan","Jeonju","Daegu","Pyongyang","Kaesong","Suwon","Gwangju","Gangneung","Hamhung","Wonju","Ulsan",
+			"Changwon","Andong","Gongju","Haeju","Cheongju","Mokpo","Dongducheon","Geoje","Suncheon","Jinju","Sangju",
+			"Rason","Gyeongju","Chungju","Sacheon","Gimje","Anju"]
+	},
 	
 	/*
 	{   // REQUIRES RIVERS
@@ -695,42 +731,6 @@
 			"Rakahanga","Bora Bora","Kailua","Uvea","Futuna","Rotuma","Tokelau","Lahaina","Bellona","Mungava","Tikopia",
 			"Emae","Kapingamarangi","Takuu","Nukuoro","Sikaiana","Anuta","Nuguria","Pileni","Nukumanu"]
 	},
-	{
-		name:"Korean",
-		leaderName:"Sejong",
-		adjective:["Korean"],
-		startBias:["Coast"],
-		preferredVictoryType:"Scientific",
-		
-		startIntroPart1: "Greetings to you, exalted King Sejong the Great, servant to the people and protector of the Choson Dynasty! Your glorious vision of prosperity and overwhelming benevolence towards the common man made you the most beloved of all Korean kings. From the earliest days of your reign, the effort you took to provide a fair and just society for all was surpassed only by the technological advances spurred onwards by your unquenched thirst for knowledge. Guided by your wisdom, the scholars of the Jade Hall developed Korea's first written language, Hangul, bringing the light of literature and science to the masses after centuries of literary darkness."
-		startIntroPart2: "Honorable Sejong, once more the people look to your for guidance. Will you rise to the occasion, bringing harmony and understanding to the people? Can you once again advance your kingdom's standing to such wondrous heights? Can you build a civilization that stands the test of time?"
-		
-		declaringWar:"Jip-hyun-jun (Hall of Worthies) will no longer tolerate your irksome behavior. We will liberate the citizens under your oppression even with force, and enlighten them!"
-		attacked:"Foolish, miserable wretch! You will be crushed by this country's magnificent scientific power!"
-		defeated:"Now the question is who will protect my people. A dark age has come."
-		introduction:"Welcome to the palace of Choson, stanger. I am the learned King Sejong, who looks after his great people."
-		
-		neutralHello:"Hello."
-		neutralLetsHearIt:["I will hear it.","Go on","Continue."]
-		neutralNo:["I cannot do that.","Apologies, but I will not accept it."]
-		neutralYes:["That is good.","I understand.","Of course!"]
-
-		hateHello:"Oh, it's you"
-		hateLetsHearIt:["What do you wish to say?","So?","Continue your speech."]
-		hateNo:["Heaven forbid","That is crazy talk!","I cannot do that."]
-		hateYes:["Hm... very well, fine.","I suppose I should agree...","Very well..."]
-		
-		afterPeace:"It seems you implemented some interesting strategies... Very well, perhaps we should call it a tie."
-		tradeRequest:"We have many things to discuss and have much to benefit from each other."
-				
-		outerColor:[0,0,255],
-		innerColor:[255,0,0],
-		uniqueName:"Scholars of the Jade Hall"
-		unique:"+2 Science for all Great Person tile improvements. Receive a tech boost each time a scientific building/Wonder is built in the Korean capital.",
-		cities:["Seoul","Busan","Jeonju","Daegu","Pyongyang","Kaesong","Suwon","Gwangju","Gangneung","Hamhung","Wonju","Ulsan",
-			"Changwon","Andong","Gongju","Haeju","Cheongju","Mokpo","Dongducheon","Geoje","Suncheon","Jinju","Sangju",
-			"Rason","Gyeongju","Chungju","Sacheon","Gimje","Anju"]
-	},
 	{
 		name:"Songhai",
 		leaderName:"Askia",
@@ -873,7 +873,7 @@
 		outerColor:[51,25,0],
 		innerColor:[255,255,102],
 		uniqueName:"Viking Fury"
-		unique:"+1 Movement to all embarked units, whom pay just 1 movement point to move from sea to land and viceversa. Melee units pay no movement cost to pillage.",
+		unique:"+1 Movement to all embarked units, units pay only 1 movement point to embark and disembark. Melee units pay no movement cost to pillage.",
 		cities:["Copenhagen","Aarhus","Kaupang","Ribe","Viborg","Tunsbers","Roskilde","Hedeby","Oslo","Jelling","Truso",
 			"Bergen","Faeroerne","Reykjavik","Trondheim","Godthab","Helluland","Lillehammer","Markland","Elsinore",
 			"Sarpsborg","Odense","Aalborg","Stavanger","Vorbasse","Schleswig","Kristiansand","Halogaland","Randers",

android/assets/jsons/Translations/Diplomacy,Trade,Nations.json

@@ -696,6 +696,9 @@
 		Portuguese:"[resourceName] não requirido"
 	}
 	
+	"Does not have ":{ // as in Does not have +1 Visibility Range (or any other unit unique)
+	}
+	
 	"National ability":{ // the unique ability that each nation has
 		Italian:"Abilità della civiltà"
 		Romanian:"Abilitate a națiunii"

android/assets/jsons/Units.json

@@ -448,7 +448,6 @@
 		hurryCostModifier:20,
 		attackSound:"throw"
 	},
-	/*
 	{
 		name:"Hwach'a",
 		unitType:"Siege",
@@ -461,11 +460,10 @@
 		requiredTech:"Physics",
 		obsoleteTech:"Chemistry",
 		upgradesTo:"Cannon",
-		uniques:["Bonus vs City 200%","No defensive terrain bonus","Must set up to ranged attack"],
+		uniques:["No defensive terrain bonus","Must set up to ranged attack"],
 		hurryCostModifier:20,
 		attackSound:"throw"
 	},
-	*/
 	{
 		name:"Longswordsman",
 		unitType:"Melee",
@@ -661,7 +659,6 @@
 		uniques:["+1 Visibility Range"],
 		hurryCostModifier:20
 	},
-	/*
 	{
 		name:"Turtle Ship",
 		unitType:"WaterMelee",
@@ -673,10 +670,9 @@
 		requiredTech:"Astronomy",
 		upgradesTo:"Ironclad",
 		obsoleteTech:"Combustion",
-		uniques:["+1 Visibility Range"],
+		uniques:["Cannot enter ocean tiles"],
 		hurryCostModifier:20
 	},
-	*/
 	{
 		name:"Cannon",
 		unitType:"Siege",

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

@@ -230,6 +230,8 @@ class CityStats {
         if (policies.contains("Secularism")) stats.science += 2
         if (cityInfo.containsBuildingUnique("+1 Production from specialists"))
             stats.production += 1
+        if(cityInfo.civInfo.nation.unique=="+2 Science for all specialists and Great Person tile improvements")
+            stats.science+=2
         return stats
     }
 

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

@@ -430,7 +430,7 @@ class CivilizationInfo {
         updateStatsForNextTurn()
     }
 
-    fun giftMilitaryUnitBy(otherCiv: CivilizationInfo) {
+    fun giftMilitaryUnitTo(otherCiv: CivilizationInfo) {
         val city = NextTurnAutomation().getClosestCities(this, otherCiv).city1
         val militaryUnit = city.cityConstructions.getConstructableUnits()
                 .filter { !it.unitType.isCivilian() && it.unitType.isLandUnit() }

core/src/com/unciv/logic/civilization/diplomacy/DiplomacyManager.kt

@@ -269,13 +269,13 @@ class DiplomacyManager() {
         for(flag in flagsCountdown.keys.toList()) {
             flagsCountdown[flag] = flagsCountdown[flag]!! - 1
             if(flagsCountdown[flag]==0) {
-                if(flag==DiplomacyFlags.ProvideMilitaryUnit.name && civInfo.cities.isEmpty())
+                if(flag==DiplomacyFlags.ProvideMilitaryUnit.name && civInfo.cities.isEmpty() || otherCiv().cities.isEmpty())
                     continue
                 flagsCountdown.remove(flag)
                 if(flag==DiplomacyFlags.AgreedToNotSettleNearUs.name)
                     addModifier(DiplomaticModifiers.FulfilledPromiseToNotSettleCitiesNearUs,10f)
                 else if(flag==DiplomacyFlags.ProvideMilitaryUnit.name)
-                    civInfo.giftMilitaryUnitBy(otherCiv())
+                    civInfo.giftMilitaryUnitTo(otherCiv())
             }
         }
 

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

@@ -182,6 +182,8 @@ open class TileInfo {
                 stats.science += 1f
             if (containsGreatImprovement() && observingCiv.policies.isAdopted("Freedom Complete"))
                 stats.add(improvement) // again, for the double effect
+            if (containsGreatImprovement() && city != null && city.civInfo.nation.unique == "+2 Science for all specialists and Great Person tile improvements")
+                stats.science += 2
         }
 
         if(city!=null && isWater && city.containsBuildingUnique("+1 gold from worked water tiles in city"))

core/src/com/unciv/ui/newgamescreen/NationTable.kt

@@ -83,8 +83,11 @@ class NationTable(val nation: Nation, width:Float, onClick:()->Unit)
                     textList += "  " + "[${originalUnit.requiredResource}] not required".tr()
                 for (unique in unit.uniques.filterNot { it in originalUnit.uniques })
                     textList += "  " + Translations.translateBonusOrPenalty(unique)
+                for(unique in originalUnit.uniques.filterNot { it in unit.uniques })
+                    textList += "  "+"Does not have ".tr()+Translations.translateBonusOrPenalty(unique)
                 for (promotion in unit.promotions.filter { it !in originalUnit.promotions })
                     textList += "  " + promotion.tr() + " (" + Translations.translateBonusOrPenalty(GameBasics.UnitPromotions[promotion]!!.effect) + ")"
+
                 textList += ""
             }
 

docs/Credits.md

@@ -436,6 +436,7 @@ Unless otherwise specified, all the following are from [the Noun Project](https:
 * [Family Crest Komon](https://thenounproject.com/search/?q=oda&i=2293528) by sahua d for Japan
 * [Ashika Chakra](https://thenounproject.com/search/?q=ashoka%20chakra&i=2328559) by sahua d for India
 * Variation on [crecent moon](https://thenounproject.com/search/?q=crescents&i=1438333) by Estu Suhartono for The Ottomans
+* [Korea](https://thenounproject.com/search/?q=korea&i=1689701) by CJS for Korea
 
 ## Others