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

Fixed a bug where "[+amount] population [in this city]" did not work (#5476)

Browse Source
This commit is contained in:
Xander Lenstra 2021-10-13 22:16:38 +02:00 committed by GitHub
parent ff67e66348
commit 67650fec00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
core/src/com/unciv/models/ruleset/unique/UniqueTriggerActivation.kt
View File

@ -114,6 +114,7 @@ object UniqueTriggerActivation {
}
return true
}
OneTimeFreeGreatPerson, MayanGainGreatPerson -> {
if (civInfo.isSpectator()) return false
val greatPeople = civInfo.getGreatPeople()
@ -155,18 +156,21 @@ object UniqueTriggerActivation {
return civInfo.addUnit(greatPerson.name, chosenCity) != null
}
}
OneTimeGainPopulation -> {
val citiesWithPopulationChanged: MutableList<Vector2> = mutableListOf()
for (city in civInfo.cities) {
if (city.matchesFilter(unique.params[1])) {
city.population.addPopulation(unique.params[0].toInt())
citiesWithPopulationChanged.add(city.location)
}
val applicableCities = when (unique.params[1]) {
"in this city" -> listOf(cityInfo!!)
"in other cities" -> civInfo.cities.filter { it != cityInfo }
else -> civInfo.cities.filter { it.matchesFilter(unique.params[1]) }
}
if (notification != null && citiesWithPopulationChanged.isNotEmpty())
for (city in applicableCities) {
city.population.addPopulation(unique.params[0].toInt())
}
if (notification != null && applicableCities.isNotEmpty())
civInfo.addNotification(
notification,
LocationAction(citiesWithPopulationChanged),
LocationAction(applicableCities.map { it.location }),
NotificationIcon.Population
)
return citiesWithPopulationChanged.isNotEmpty()