AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-20 18:06:25 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added Greece to civilizations, city names no come from the Civilizations json

Browse Source
This commit is contained in:
Yair Morgenstern 2018-04-17 23:57:06 +03:00
parent 221a8668fa
commit c6ebb733a1
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
android/assets/jsons/Civilizations.json
View File

@ -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",

5
core/src/com/unciv/logic/city/CityInfo.kt
View File

@ -31,9 +31,6 @@ class CityInfo {
val tilesInRange: List<TileInfo>
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<TileResource> {
@ -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)

1
core/src/com/unciv/models/gamebasics/Civilization.kt
View File

@ -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<String>
}