diff --git a/android/assets/jsons/Civilizations.json b/android/assets/jsons/Civilizations.json index d35c3c1630..69c8167e9b 100644 --- a/android/assets/jsons/Civilizations.json +++ b/android/assets/jsons/Civilizations.json @@ -1,7 +1,15 @@ [ { name:"Babylon", - RGB:[220,20,60] + RGB:[220,20,60], + cities:["Babylon","Akkad","Dur-Kurigalzu","Nippur","Borsippa","Sippar","Opis","Mari","Shushan","Eshnunna", + "Ellasar","Erech","Kutha","Sirpurla","Neribtum"] + }, + { + name:"Greece", + RGB:[ 101, 153, 255], + cities:["Athens","Sparta","Corinth","Argos","Knossos","Mycenae","Pharsalos","Ephesus","Halicarnassus","Rhodes", + "Eretria","Pergamon","Miletos","Megara","Phocaea"] }, { name:"Barbarians", diff --git a/core/src/com/unciv/logic/city/CityInfo.kt b/core/src/com/unciv/logic/city/CityInfo.kt index 6a0d59644d..abfec6517a 100644 --- a/core/src/com/unciv/logic/city/CityInfo.kt +++ b/core/src/com/unciv/logic/city/CityInfo.kt @@ -31,9 +31,6 @@ class CityInfo { val tilesInRange: List get() = tileMap.getTilesInDistance(cityLocation, 3).filter { civInfo.civName == it.owner } - private val CityNames = arrayOf("New Bark", "Cherrygrove", "Violet", "Azalea", "Goldenrod", "Ecruteak", "Olivine", - "Cianwood", "Mahogany", "Blackthorn", "Pallet", "Viridian", "Pewter", "Cerulean", "Vermillion", "Lavender", - "Celadon", "Fuchsia", "Saffron", "Cinnibar") // Remove resources required by buildings fun getCityResources(): Counter { @@ -81,7 +78,7 @@ class CityInfo { this.civInfo = civInfo setTransients() - name = CityNames[civInfo.cities.size] + name = civInfo.getCivilization().cities[civInfo.cities.size] this.cityLocation = cityLocation civInfo.cities.add(this) civInfo.gameInfo.addNotification("$name has been founded!", cityLocation) diff --git a/core/src/com/unciv/models/gamebasics/Civilization.kt b/core/src/com/unciv/models/gamebasics/Civilization.kt index 4e09c4a419..4c450e5a1f 100644 --- a/core/src/com/unciv/models/gamebasics/Civilization.kt +++ b/core/src/com/unciv/models/gamebasics/Civilization.kt @@ -9,4 +9,5 @@ class Civilization : INamed { fun getColor(): Color { return Color(RGB[0]/256f, RGB[1]/256f, RGB[2]/256f, 1f) } + lateinit var cities: List }