mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-03-11 18:39:43 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'temp'

Browse Source
This commit is contained in:
yairm210 2021-09-18 23:03:00 +03:00
commit 81a12920df
2 changed files with 3 additions and 2 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.5.30" const val kotlinVersion = "1.5.30"
const val appName = "Unciv" const val appName = "Unciv"
const val appCodeNumber = 626 const val appCodeNumber = 627
const val appVersion = "3.16.15-patch1" const val appVersion = "3.16.15-patch2"
const val gdxVersion = "1.10.0" const val gdxVersion = "1.10.0"
const val roboVMVersion = "2.3.1" const val roboVMVersion = "2.3.1"

1
core/src/com/unciv/logic/city/CityInfoConquestFunctions.kt
View File

@ -37,6 +37,7 @@ class CityInfoConquestFunctions(val city: CityInfo){
for (building in cityConstructions.getBuiltBuildings()) { for (building in cityConstructions.getBuiltBuildings()) {
when { when {
building.hasUnique("Never destroyed when the city is captured") || building.isWonder -> continue building.hasUnique("Never destroyed when the city is captured") || building.isWonder -> continue
building.hasUnique("Indicates the capital city") -> continue // Palace needs to stay a just a bit longer so moveToCiv isn't confused
building.hasUnique("Destroyed when the city is captured") -> building.hasUnique("Destroyed when the city is captured") ->
cityConstructions.removeBuilding(building.name) cityConstructions.removeBuilding(building.name)
else -> { else -> {