Added Minuteman, American unique, and England special ability

android/assets/jsons/Nations.json

@@ -35,6 +35,7 @@
 		name:"England",
 		mainColor:[ 114, 0, 0],
 		secondaryColor:[255,255,255],
+		unique:"+2 movement for all naval units"
 		cities:["London","York","Nottingham","Hastings","Canterbury","Coventry","Warwick","Newcastle","Oxford","Liverpool",
 			"Dover","Brighton","Norwich","Leeds","Reading","Birmingham","Richmond","Exeter","Cambridge","Gloucester",
 			"Manchester","Bristol","Leicester","Carlisle","Ipswich","Portsmouth","Berwick","Bath","Mumbles","Southampton"]

android/assets/jsons/Policies.json

@@ -18,7 +18,7 @@
 			},
 			{
 				name:"Oligarchy",
-				description:"Units in cities cost no maintainance",
+				description:"Units in cities cost no Maintenance",
 				row:1,
 				column:5
 			},
@@ -179,7 +179,7 @@
 		policies:[
 			{
 				name:"Trade Unions",
-				description:"Maintainance on roads & railroads reduced by 33%, +2 gold from all trade routes",
+				description:"Maintenance on roads & railroads reduced by 33%, +2 gold from all trade routes",
 				row:1,
 				column:2
 			},

android/assets/jsons/Translations.json

@@ -4027,7 +4027,7 @@
 		Russian:"Олигархия"
 		Spanish:"Oligarquía"
 	}
-	"Units in cities cost no maintainance":{
+	"Units in cities cost no Maintenance":{
 		Italian:"Nessuna manutenzione per le unità nelle città"
 		Russian:"Юниты в городах содержаться бесплатно"
 		Spanish:"Unidades en las ciudades no cuestan mantenimiento"
@@ -4274,7 +4274,7 @@
 		Russian:"Караваны фургонов"
 		Spanish:"Sindicatos"
 	}
-	"Maintainance on roads & railroads reduced by 33%, +2 gold from all trade routes":{
+	"Maintenance on roads & railroads reduced by 33%, +2 gold from all trade routes":{
 		Italian:"-33% manutenzioni su strade e ferrovie, +2 oro per ogni rotta commerciale"
 		Russian:"Стоимость содержания дорог и железных дорог уменьшена на 33%, +2 золота от всех торговых маршрутов"
 		Spanish:"Mantenimiento de carreteras y líneas de ferrocarril reducido un 33%, +2 oro de todas las rutas comerciales"

android/assets/jsons/Tutorials_English.json

@@ -196,7 +196,7 @@
 			"You have founded your second city!",
 			"Connecting your cities to the capital by roads",
 			"  will generate gold via the trade route.",
-			"Note that each road costs 1 gold maintainance per turn, "
+			"Note that each road costs 1 gold Maintenance per turn, "
 			"  so it may be more economical to wait until the cities grow!"
 		]
 	]

android/assets/jsons/Units.json

@@ -317,6 +317,20 @@
 		obsoleteTech:"Rifling",
 		hurryCostModifier:20
 	},
+	{
+		name:"Minuteman",
+		unitType:"Melee",
+		replaces:"Musketman",
+		uniqueTo:"America",
+		movement:2,
+		strength:24,
+		cost: 150,
+		requiredTech:"Gunpowder",
+		upgradesTo:"Rifleman"
+		obsoleteTech:"Rifling",
+		uniques:["Bonus vs units in rough terrain 15%","Ignores terrain cost"]
+		hurryCostModifier:20
+	},
 	{
 		name:"Frigate",
 		unitType:"WaterRanged",

core/src/com/unciv/UnCivGame.kt

@@ -20,6 +20,9 @@ class UnCivGame : Game() {
      */
     val viewEntireMapForDebug = false
 
+    // For when you need to test something in an advanced game and don't have time to faff around
+    val SuperchagedForDebug = false
+
     lateinit var worldScreen: WorldScreen
 
     override fun create() {

core/src/com/unciv/logic/automation/Automation.kt

@@ -62,7 +62,7 @@ class Automation {
 
             val goldBuildings = buildableNotWonders.filter { it.gold>0 }
             val wartimeBuildings = buildableNotWonders.filter { it.xpForNewUnits>0 || it.cityStrength>0 }.sortedBy { it.maintenance }
-            val zeroMaintainanceBuildings = buildableNotWonders.filter { it.maintenance == 0 && it !in wartimeBuildings }
+            val zeroMaintenanceBuildings = buildableNotWonders.filter { it.maintenance == 0 && it !in wartimeBuildings }
             val isAtWar = cityInfo.civInfo.isAtWar()
 
             when {
@@ -77,7 +77,7 @@ class Automation {
                 buildableNotWonders.any { it.name=="Market"} -> currentConstruction = "Market"
                 militaryUnits==0 -> trainCombatUnit(cityInfo)
                 workers==0 -> currentConstruction = CityConstructions.Worker
-                zeroMaintainanceBuildings.isNotEmpty() -> currentConstruction = zeroMaintainanceBuildings.getRandom().name
+                zeroMaintenanceBuildings.isNotEmpty() -> currentConstruction = zeroMaintenanceBuildings.getRandom().name
                 isAtWar && militaryUnits<cities -> trainCombatUnit(cityInfo)
                 isAtWar && wartimeBuildings.isNotEmpty() -> currentConstruction = wartimeBuildings.getRandom().name
                 workers<cities/2 -> currentConstruction = CityConstructions.Worker

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

@@ -1,5 +1,6 @@
 package com.unciv.logic.city
 
+import com.unciv.UnCivGame
 import com.unciv.logic.map.BFS
 import com.unciv.logic.map.RoadStatus
 import com.unciv.models.gamebasics.Building
@@ -275,7 +276,14 @@ class CityStats {
         newStatPercentBonusList["Railroad"]=getStatPercentBonusesFromRailroad()
         newStatPercentBonusList["Marble"]=getStatPercentBonusesFromMarble()
         newStatPercentBonusList["Computers"]=getStatPercentBonusesFromComputers()
-        newStatPercentBonusList["Difficutly"]=getStatPercentBonusesFromDifficulty()
+        newStatPercentBonusList["Difficulty"]=getStatPercentBonusesFromDifficulty()
+
+        if(UnCivGame.Current.SuperchagedForDebug) {
+            val stats = Stats()
+            for(stat in Stat.values()) stats.add(stat,10000f)
+            newStatPercentBonusList["Supercharged"] = stats
+        }
+
         statPercentBonusList=newStatPercentBonusList
 
         val statPercentBonuses = Stats()
@@ -310,8 +318,8 @@ class CityStats {
         if (!newBaseStatList.containsKey("Policies")) newBaseStatList["Policies"] = Stats()
         newBaseStatList["Policies"]!!.food += getGrowthBonusFromPolicies() * excessFood
 
-        val buildingsMaintainance = cityInfo.cityConstructions.getMaintenanceCosts().toFloat() // this is AFTER the bonus calculation!
+        val buildingsMaintenance = cityInfo.cityConstructions.getMaintenanceCosts().toFloat() // this is AFTER the bonus calculation!
-        newBaseStatList["Maintenance"] = Stats().apply { gold = -buildingsMaintainance }
+        newBaseStatList["Maintenance"] = Stats().apply { gold = -buildingsMaintenance }
 
         baseStatList = newBaseStatList
 

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

@@ -134,7 +134,7 @@ class CivilizationInfo {
         var unitsToPayFor = getCivUnits()
         if(policies.isAdopted("Oligarchy")) unitsToPayFor = unitsToPayFor.filterNot { it.getTile().isCityCenter() }
         val totalPaidUnits = max(0,unitsToPayFor.count()-freeUnits)
-        val gameProgress = gameInfo.turns/400f // as game progresses maintainance cost rises
+        val gameProgress = gameInfo.turns/400f // as game progresses Maintenance cost rises
         var cost = baseUnitCost*totalPaidUnits*(1+gameProgress)
         cost = cost.pow(1+gameProgress/3) // Why 3? To spread 1 to 1.33
         if(!isPlayerCivilization())

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

@@ -57,6 +57,9 @@ class MapUnit {
                 && civInfo.getBuildingUniques().contains("All military naval units receive +1 movement and +1 sight"))
             movement += 1
 
+        if(type.isWaterUnit() && civInfo.getNation().unique=="+2 movement for all naval units")
+            movement+=2
+        
         return movement
     }
 

core/src/com/unciv/ui/NewGameScreen.kt

@@ -42,40 +42,51 @@ class NewGameScreen: PickerScreen(){
             update()
         }
 
-        private fun getUniqueLabel(nation: Nation): CharSequence? {
+        private fun getUniqueLabel(nation: Nation): String {
+            val textList = ArrayList<String>()
+
+            if(nation.unique!=null) {
+                textList += nation.unique!!
+                textList += ""
+            }
+
             for (building in GameBasics.Buildings.values)
                 if (building.uniqueTo == nation.name) {
-                    var text = building.name.tr() + " - {replaces} " + building.replaces!!.tr() + "\n"
                     val originalBuilding = GameBasics.Buildings[building.replaces!!]!!
+
+                    textList += building.name.tr() + " - {replaces} " + originalBuilding.name.tr()
                     val originalBuildingStatMap = originalBuilding.toHashMap()
                     for (stat in building.toHashMap())
                         if (stat.value != originalBuildingStatMap[stat.key])
-                            text += stat.value.toInt().toString() + " " + stat.key + " vs " + originalBuildingStatMap[stat.key]!!.toInt() + "\n"
+                            textList += "  "+stat.value.toInt() + " " + stat.key + " vs " + originalBuildingStatMap[stat.key]!!.toInt()
                     for(unique in building.uniques.filter { it !in originalBuilding.uniques })
-                        text += unique.tr()+"\n"
+                        textList += "  "+unique.tr()
                     if (building.maintenance != originalBuilding.maintenance)
-                        text += "{Maintainance} " + building.maintenance + " vs " + originalBuilding.maintenance + "\n"
+                        textList += "  {Maintenance} " + building.maintenance + " vs " + originalBuilding.maintenance
-                    return text.tr()
+                    textList+=""
                 }
 
             for (unit in GameBasics.Units.values)
                 if (unit.uniqueTo == nation.name) {
-                    var text = unit.name.tr() + " - {replaces} " + unit.replaces!!.tr() + "\n"
                     val originalUnit = GameBasics.Units[unit.replaces!!]!!
+
+                    textList += unit.name.tr() + " - {replaces} " + originalUnit.name.tr()
                     if (unit.strength != originalUnit.strength)
-                        text += "{Combat strength} " + unit.strength + " vs " + originalUnit.strength + "\n"
+                        textList += "  {Combat strength} " + unit.strength + " vs " + originalUnit.strength
                     if (unit.rangedStrength!= originalUnit.rangedStrength)
-                        text += "{Ranged strength} " + unit.rangedStrength+ " vs " + originalUnit.rangedStrength + "\n"
+                        textList+= "  {Ranged strength} " + unit.rangedStrength+ " vs " + originalUnit.rangedStrength
                     if (unit.range!= originalUnit.range)
-                        text += "{Range} " + unit.range+ " vs " + originalUnit.range + "\n"
+                        textList+= "  {Range} " + unit.range+ " vs " + originalUnit.range
                     if (unit.movement!= originalUnit.movement)
-                        text += "{Movement} " + unit.movement+ " vs " + originalUnit.movement + "\n"
+                        textList+= "  {Movement} " + unit.movement+ " vs " + originalUnit.movement
-                    return text.tr()
+                    val newUniques = unit.uniques.filterNot { it in originalUnit.uniques }
+                    if(newUniques.isNotEmpty())
+                        textList+="  {Uniques}: "+newUniques.joinToString()
+                    textList+=""
                 }
 
-            if(nation.unique!=null) return nation.unique
 
-            return ""
+            return textList.joinToString("\n").tr().trim()
         }