Victory screen no longer shows every turn on "one more turn" mode

Moved Nation jsons

android/assets/jsons/Nations/Nations.json

@@ -541,7 +541,45 @@
 			"Changwon","Andong","Gongju","Haeju","Cheongju","Mokpo","Dongducheon","Geoje","Suncheon","Jinju","Sangju",
 			"Rason","Gyeongju","Chungju","Sacheon","Gimje","Anju"]
 	},
+	
 	/*
+	{
+		name:"Iroquois",
+		leaderName:"Hiawatha",
+		adjective:["Irochese"],
+		startBias:["Forest"],
+		preferredVictoryType:"Scientific",
+		
+		startIntroPart1: "Greetings, noble Hiawatha, leader of the mighty Iroquois nations! Long have your people lived near the great and holy lake Ontario in the land that has come to be known as the New York state in North America. In the mists of antiquity, the five peoples of Seneca, Onondaga, Mohawks, Cayugas and Oneida united into one nation, the Haudenosaunee, the Iroquois. With no written language, the wise men of your nation created the great law of peace, the model for many contitutions including that of the United States. For many years, your people battled great enemies, such as the Huron, and the French and English invaders. Tought outnumbered and facing weapons far more advanced than the ones your warriors wielded, the Iroquois survived and prospered, until they were finally overwhelmed by the mighty armies of the new United States."
+		startIntroPart2: "Oh noble Hiawatha, listen to the cries of your people! They call out to you to lead them in peace and war, to rebuild the great longhouse and unite the tribes once again. Will you accept this challenge, great leader? Will you build a civilization that will stand the test of time?"
+		
+		declaringWar:"You are a plague upon Mother Earth! Prepare for battle!"
+		attacked:"You evil creature! My braves will slaughter you!"
+		defeated:"You have defeated us... but our spirits will never be vanquished! We shall return!"
+		introduction:"Greetings, stranger. I am Hiawatha, speaker for the Iroquois. We seek peace with all, but we do not shrink from war."
+		
+		neutralHello:"Good day."
+		neutralLetsHearIt:["Yes?","I'm listening"]
+		neutralNo:["No.","Certainly not."]
+		neutralYes:["Very well.","Alright."]
+
+		hateHello:"Oh, it's you."
+		hateLetsHearIt:["I'm listening.","Speak."]
+		hateNo:["That's unacceptable","You cannot be serious!"]
+		hateYes:["I suppose I must.","Very well."]
+		
+		afterPeace:"I thank you for your mercy. I pray that we can now be friends."
+		tradeRequest:"Does this trade work for you, my friend?"
+				
+		outerColor:[88,109,109],
+		innerColor:[246,205,137],
+		uniqueName:"The Great Warpath"
+		unique:"All units move through Forest and Jungle tiles in friendly territory as if it is Road. These tiles can be used to establish City Connections upon researching the Wheel.",
+		cities:["Onoondaga","Osininka","Grand River","Akwesasme","Buffalo Creek","Brantford","Montreal","Genesse River",
+			"Canandaigua Lake","Lake Simcoe","Salamanca","Gowanda","Cuba","Akron","Kanesatake","Ganienkeh","Cayuga Castle",
+			"Chondote","Canajoharie","Nedrow","Oneida Lake","Kanonwalohale","Green Bay","Southwold","Mohawk Valley",
+			"Schoharie","Bay of Quinte","Kanawale","Kanatsiokareke","Tyendinaga","Hahta"]
+	},
 	{
 		name:"Australia",
 		leaderName:"John Curtin",
@@ -920,43 +958,6 @@
 			"Nan","Tak","Suphanburi","Hongsawadee","Thawaii","Ayutthuya","Taphan Hin","Uthai Thani","Lap Buri","Ratchasima",
 			"Ban Phai","Loci","Khan Kaen","Surin"]
 	},
-	{
-		name:"Iroquois",
-		leaderName:"Hiawatha",
-		adjective:["Irochese"],
-		startBias:["Forest"],
-		preferredVictoryType:"Scientific",
-		
-		startIntroPart1: "Greetings, noble Hiawatha, leader of the mighty Iroquois nations! Long have your people lived near the great and holy lake Ontario in the land that has come to be known as the New York state in North America. In the mists of antiquity, the five peoples of Seneca, Onondaga, Mohawks, Cayugas and Oneida united into one nation, the Haudenosaunee, the Iroquois. With no written language, the wise men of your nation created the great law of peace, the model for many contitutions including that of the United States. For many years, your people battled great enemies, such as the Huron, and the French and English invaders. Tought outnumbered and facing weapons far more advanced than the ones your warriors wielded, the Iroquois survived and prospered, until they were finally overwhelmed by the mighty armies of the new United States."
-		startIntroPart2: "Oh noble Hiawatha, listen to the cries of your people! They call out to you to lead them in peace and war, to rebuild the great longhouse and unite the tribes once again. Will you accept this challenge, great leader? Will you build a civilization that will stand the test of time?"
-		
-		declaringWar:"You are a plague upon Mother Earth! Prepare for battle!"
-		attacked:"You evil creature! My braves will slaughter you!"
-		defeated:"You have defeated us... but our spirits will never be vanquished! We shall return!"
-		introduction:"Greetings, stranger. I am Hiawatha, speaker for the Iroquois. We seek peace with all, but we do not shrink from war."
-		
-		neutralHello:"Good day."
-		neutralLetsHearIt:["Yes?","I'm listening"]
-		neutralNo:["No.","Certainly not."]
-		neutralYes:["Very well.","Alright."]
-
-		hateHello:"Oh, it's you."
-		hateLetsHearIt:["I'm listening.","Speak."]
-		hateNo:["That's unacceptable","You cannot be serious!"]
-		hateYes:["I suppose I must.","Very well."]
-		
-		afterPeace:"I thank you for your mercy. I pray that we can now be friends."
-		tradeRequest:"Does this trade work for you, my friend?"
-				
-		outerColor:[0,25,51],
-		innerColor:[255,255,102],
-		uniqueName:"The Great Warpath"
-		unique:"All units move through Forest and Jungle tiles in friendly territory as if it is Road. These tiles can be used to establish City Connections upon researching the Wheel.",
-		cities:["Onoondaga","Osininka","Grand River","Akwesasme","Buffalo Creek","Brantford","Montreal","Genesse River",
-			"Canandaigua Lake","Lake Simcoe","Salamanca","Gowanda","Cuba","Akron","Kanesatake","Ganienkeh","Cayuga Castle",
-			"Chondote","Canajoharie","Nedrow","Oneida Lake","Kanonwalohale","Green Bay","Southwold","Mohawk Valley",
-			"Schoharie","Bay of Quinte","Kanawale","Kanatsiokareke","Tyendinaga","Hahta"]
-	},
 	{
 		//NEEDS SNOW AND ICE
 		name:"Denmark",

android/build.gradle

@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.app"
         minSdkVersion 14
         targetSdkVersion 29
-        versionCode 297
-        versionName "3.0.4"
+        versionCode 298
+        versionName "3.0.5"
     }
 
     // Had to add this crap for Travis to build, it wanted to sign the app

core/src/com/unciv/logic/GameInfo.kt

@@ -41,6 +41,7 @@ class GameInfo {
         toReturn.difficulty=difficulty
         toReturn.gameParameters = gameParameters
         toReturn.gameId = gameId
+        toReturn.oneMoreTurnMode = oneMoreTurnMode
         return toReturn
     }
 

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

@@ -109,8 +109,8 @@ class CivilizationInfo {
 
     fun getTranslatedNation(): Nation {
         val language = UnCivGame.Current.settings.language.replace(" ","_")
-        if(!Gdx.files.internal("jsons/Nations_$language.json").exists()) return nation
-        val translatedNation = GameBasics.getFromJson(Array<Nation>::class.java, "Nations_$language")
+        if(!Gdx.files.internal("jsons/Nations/Nations_$language.json").exists()) return nation
+        val translatedNation = GameBasics.getFromJson(Array<Nation>::class.java, "Nations/Nations_$language")
                 .firstOrNull { it.name==civName}
         if(translatedNation==null)  // this language's trnslation doesn't contain this nation yet,
             return nation      // default to english

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

@@ -5,40 +5,39 @@ import com.unciv.Constants
 import com.unciv.logic.civilization.CivilizationInfo
 
 class UnitMovementAlgorithms(val unit:MapUnit) {
+
+    // This function is called ALL THE TIME and should be as time-optimal as possible!
     private fun getMovementCostBetweenAdjacentTiles(from: TileInfo, to: TileInfo, civInfo: CivilizationInfo): Float {
-        var cost = getMovementCostBetweenAdjacentTiles(from,to)
 
-        val toOwner = to.getOwner()
-        if(toOwner!=null &&  to.isLand && civInfo.isAtWarWith(toOwner) && toOwner.hasActiveGreatWall)
-            cost += 1
-        return cost
-    }
-
-    private fun getMovementCostBetweenAdjacentTiles(from: TileInfo, to: TileInfo): Float {
-
-        if(unit.type.isLandUnit() && (from.isLand != to.isLand))
+        if ((from.isLand != to.isLand) && unit.type.isLandUnit())
             return 100f // this is embarkment or disembarkment, and will take the entire turn
 
+        var extraCost = 0f
+
+        val toOwner = to.getOwner()
+        if (toOwner != null && to.isLand && toOwner.hasActiveGreatWall && civInfo.isAtWarWith(toOwner))
+            extraCost += 1
+
         if (from.roadStatus === RoadStatus.Railroad && to.roadStatus === RoadStatus.Railroad)
-            return 1 / 10f
+            return 1 / 10f + extraCost
 
         if (from.roadStatus !== RoadStatus.None && to.roadStatus !== RoadStatus.None) //Road
         {
-            if (unit.civInfo.tech.movementSpeedOnRoadsImproved) return 1 / 3f
-            else return 1 / 2f
+            if (unit.civInfo.tech.movementSpeedOnRoadsImproved) return 1 / 3f + extraCost
+            else return 1 / 2f + extraCost
         }
-        if (unit.ignoresTerrainCost) return 1f
-        if(unit.doubleMovementInForestAndJungle && (to.baseTerrain==Constants.forest || to.baseTerrain==Constants.jungle))
-            return 1f
+        if (unit.ignoresTerrainCost) return 1f + extraCost
+        if (unit.doubleMovementInForestAndJungle && (to.baseTerrain == Constants.forest || to.baseTerrain == Constants.jungle))
+            return 1f + extraCost
 
         if (unit.roughTerrainPenalty
                 && (to.baseTerrain == Constants.hill || to.terrainFeature == Constants.forest || to.terrainFeature == Constants.jungle))
-            return 4f
+            return 4f + extraCost
 
-        if(unit.doubleMovementInCoast && to.baseTerrain==Constants.coast)
-            return 1/2f
+        if (unit.doubleMovementInCoast && to.baseTerrain == Constants.coast)
+            return 1 / 2f + extraCost
 
-        return to.getLastTerrain().movementCost.toFloat() // no road
+        return to.getLastTerrain().movementCost.toFloat() + extraCost // no road
     }
 
     class ParentTileAndTotalDistance(val parentTile:TileInfo, val totalDistance: Float)

core/src/com/unciv/models/gamebasics/GameBasics.kt

@@ -45,7 +45,7 @@ object GameBasics {
             Units += createHashmap(getFromJson(Array<BaseUnit>::class.java, "Units"))
             UnitPromotions += createHashmap(getFromJson(Array<Promotion>::class.java, "UnitPromotions"))
             PolicyBranches += createHashmap(getFromJson(Array<PolicyBranch>::class.java, "Policies"))
-            Nations += createHashmap(getFromJson(Array<Nation>::class.java, "Nations"))
+            Nations += createHashmap(getFromJson(Array<Nation>::class.java, "Nations/Nations"))
             Difficulties += createHashmap(getFromJson(Array<Difficulty>::class.java, "Difficulties"))
 
             val techColumns = getFromJson(Array<TechColumn>::class.java, "Techs")