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

Merge pull request #7507 from SimonCeder/marriagebug

Browse Source 
avoid potential marriage bug
This commit is contained in:
SimonCeder 2022-07-23 09:04:10 +02:00 committed by GitHub
commit 2f52b6bf1a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -303,11 +303,18 @@ class CityStateFunctions(val civInfo: CivilizationInfo) {
civInfo.getCapital()!!.location, civInfo.civName, NotificationIcon.Diplomacy, otherCiv.civName) civInfo.getCapital()!!.location, civInfo.civName, NotificationIcon.Diplomacy, otherCiv.civName)
for (unit in civInfo.getCivUnits()) for (unit in civInfo.getCivUnits())
unit.gift(otherCiv) unit.gift(otherCiv)
// 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) { for (city in civInfo.cities) {
city.moveToCiv(otherCiv) city.moveToCiv(otherCiv)
city.isPuppet = true // Human players get a popup that allows them to annex instead 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() civInfo.destroy()
} }