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

3.11.17-patch1

Browse Source
This commit is contained in:
Yair Morgenstern 2020-12-04 00:11:29 +02:00
parent 91e58f45bb
commit 4bb6426b79
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
buildSrc/src/main/kotlin/BuildConfig.kt
View File

@ -3,8 +3,8 @@ package com.unciv.build
object BuildConfig { object BuildConfig {
const val kotlinVersion = "1.3.71" const val kotlinVersion = "1.3.71"
const val appName = "Unciv" const val appName = "Unciv"
const val appCodeNumber = 505 const val appCodeNumber = 506
const val appVersion = "3.11.17" const val appVersion = "3.11.17-patch1"
const val gdxVersion = "1.9.12" const val gdxVersion = "1.9.12"
const val roboVMVersion = "2.3.1" const val roboVMVersion = "2.3.1"

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

@ -524,7 +524,7 @@ class CityInfo {
} }
} }
fun moveToCiv(newCivInfo: CivilizationInfo){ fun moveToCiv(newCivInfo: CivilizationInfo) {
val oldCiv = civInfo val oldCiv = civInfo
civInfo.cities = civInfo.cities.toMutableList().apply { remove(this@CityInfo) } civInfo.cities = civInfo.cities.toMutableList().apply { remove(this@CityInfo) }
newCivInfo.cities = newCivInfo.cities.toMutableList().apply { add(this@CityInfo) } newCivInfo.cities = newCivInfo.cities.toMutableList().apply { add(this@CityInfo) }
@ -533,33 +533,37 @@ class CityInfo {
turnAcquired = civInfo.gameInfo.turns turnAcquired = civInfo.gameInfo.turns
// now that the tiles have changed, we need to reassign population // now that the tiles have changed, we need to reassign population
workedTiles.filterNot { tiles.contains(it) } for (it in workedTiles.filterNot { tiles.contains(it) }) {
.forEach { workedTiles = workedTiles.withoutItem(it); population.autoAssignPopulation() } workedTiles = workedTiles.withoutItem(it)
population.autoAssignPopulation()
// Remove all national wonders }
for(building in cityConstructions.getBuiltBuildings().filter { it.isNationalWonder })
cityConstructions.removeBuilding(building.name)
// Remove/relocate palace for old Civ // Remove/relocate palace for old Civ
val capitalCityIndicator = capitalCityIndicator() val capitalCityIndicator = capitalCityIndicator()
if(cityConstructions.isBuilt(capitalCityIndicator)){ if (cityConstructions.isBuilt(capitalCityIndicator)) {
cityConstructions.removeBuilding(capitalCityIndicator) cityConstructions.removeBuilding(capitalCityIndicator)
if(oldCiv.cities.isNotEmpty()){ if (oldCiv.cities.isNotEmpty()) {
oldCiv.cities.first().cityConstructions.addBuilding(capitalCityIndicator) // relocate palace oldCiv.cities.first().cityConstructions.addBuilding(capitalCityIndicator) // relocate palace
} }
} }
// Remove all national wonders (must come after the palace relocation because that's a national wonder too!)
for (building in cityConstructions.getBuiltBuildings().filter { it.isNationalWonder })
cityConstructions.removeBuilding(building.name)
// Locate palace for newCiv if this is the only city they have // Locate palace for newCiv if this is the only city they have
if (newCivInfo.cities.count() == 1) { if (newCivInfo.cities.count() == 1) {
cityConstructions.addBuilding(capitalCityIndicator) cityConstructions.addBuilding(capitalCityIndicator)
} }
isBeingRazed=false isBeingRazed = false
// Transfer unique buildings // Transfer unique buildings
for(building in cityConstructions.getBuiltBuildings()) { for (building in cityConstructions.getBuiltBuildings()) {
val civEquivalentBuilding = newCivInfo.getEquivalentBuilding(building.name) val civEquivalentBuilding = newCivInfo.getEquivalentBuilding(building.name)
if(building != civEquivalentBuilding) { if (building != civEquivalentBuilding) {
cityConstructions.removeBuilding(building.name) cityConstructions.removeBuilding(building.name)
cityConstructions.addBuilding(civEquivalentBuilding.name) cityConstructions.addBuilding(civEquivalentBuilding.name)
} }