mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-01-25 22:59:12 +07:00
Code Issues Packages Projects Releases Wiki Activity

cover more cases

Browse Source
This commit is contained in:
SimonCeder 2022-07-22 20:14:08 +02:00 committed by GitHub
parent 73ad76b59c
commit 5846da6f8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
core/src/com/unciv/logic/civilization/CityStateFunctions.kt
View File

@ -305,14 +305,12 @@ class CityStateFunctions(val civInfo: CivilizationInfo) {
for (unit in civInfo.getCivUnits())
unit.gift(otherCiv)
// We want to get rid of the original capital flag for this city state so it can't be liberated in the future.
// We do this step to be extra certain to find the correct one since a CS can rarely capture and lose cities
val originalCapital = civInfo.gameInfo.getCities().firstOrNull {
it.isOriginalCapital && it.foundingCiv == civInfo.civName
}
if (originalCapital != null) {
originalCapital.foundingCiv = ""
originalCapital.isOriginalCapital = false
// Make sure this CS can never be liberated
civInfo.gameInfo.getCities().filter {
it.foundingCiv == civInfo.civName
}.forEach {
it.foundingCiv = ""
it.isOriginalCapital = false
}
for (city in civInfo.cities) {