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

avoid potential marriage bug

Browse Source
This commit is contained in:
SimonCeder 2022-07-22 14:06:29 +02:00
parent acd71617cc
commit 73ad76b59c
1 changed files with 12 additions and 2 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

@ -10,6 +10,7 @@ import com.unciv.models.ruleset.unique.UniqueType
import com.unciv.models.ruleset.unit.BaseUnit
import com.unciv.models.stats.Stat
import com.unciv.ui.victoryscreen.RankingType
import com.unciv.utils.debug
import java.util.*
import kotlin.collections.HashMap
import kotlin.collections.HashSet
@ -303,11 +304,20 @@ class CityStateFunctions(val civInfo: CivilizationInfo) {
civInfo.getCapital()!!.location, civInfo.civName, NotificationIcon.Diplomacy, otherCiv.civName)
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
}
for (city in civInfo.cities) {
city.moveToCiv(otherCiv)
city.isPuppet = true // Human players get a popup that allows them to annex instead
city.foundingCiv = "" // This is no longer a city-state
city.isOriginalCapital = false // It's now an ordinary city and can be razed in later conquests
}
civInfo.destroy()
}