AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-08-03 12:37:42 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix 'in this city' for everyone

Browse Source
This commit is contained in:
yairm210 2025-05-25 18:45:00 +03:00
parent 325b8dcc38
commit e76d444003
1 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -93,6 +93,9 @@ object UniqueTriggerActivation {
val relevantCity by lazy {
city?: tile?.getCity()
}
fun getApplicableCities(cityFilter: String) =
if (cityFilter == "in this city") sequenceOf(relevantCity).filterNotNull()
else civInfo.cities.asSequence().filter { it.matchesFilter(unique.params[0]) }
val timingConditional = unique.getModifiers(UniqueType.ConditionalTimedUnique).firstOrNull()
if (timingConditional != null) {
@ -398,9 +401,7 @@ object UniqueTriggerActivation {
}
UniqueType.OneTimeGainPopulation -> {
val applicableCities =
if (unique.params[1] == "in this city") sequenceOf(relevantCity).filterNotNull()
else civInfo.cities.asSequence().filter { it.matchesFilter(unique.params[1]) }
val applicableCities = getApplicableCities(unique.params[1])
if (applicableCities.none()) return null
return {
for (applicableCity in applicableCities) {
@ -913,9 +914,7 @@ object UniqueTriggerActivation {
UniqueType.GainFreeBuildings -> {
val freeBuilding = civInfo.getEquivalentBuilding(unique.params[0])
val applicableCities =
if (unique.params[1] == "in this city") sequenceOf(relevantCity!!)
else civInfo.cities.asSequence().filter { it.matchesFilter(unique.params[1]) }
val applicableCities = getApplicableCities(unique.params[1])
if (applicableCities.none()) return null
return {
@ -944,9 +943,7 @@ object UniqueTriggerActivation {
}
UniqueType.RemoveBuilding -> {
val applicableCities =
if (unique.params[1] == "in this city") if (relevantCity == null) emptySequence() else sequenceOf(relevantCity!!)
else civInfo.cities.asSequence().filter { it.matchesFilter(unique.params[1]) }
val applicableCities = getApplicableCities(unique.params[1])
if (applicableCities.none()) return null
return {
@ -961,9 +958,7 @@ object UniqueTriggerActivation {
}
UniqueType.OneTimeSellBuilding -> {
val applicableCities =
if (unique.params[1] == "in this city") sequenceOf(relevantCity!!)
else civInfo.cities.asSequence().filter { it.matchesFilter(unique.params[1]) }
val applicableCities = getApplicableCities(unique.params[1])
if (applicableCities.none()) return null
return {