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

When capturing settlers, fix finding the Worker units with conditionals (#13565)

Browse Source 
* Fix capturing Settlers when Workers have conditional build improvements

* The ignore conditional for build improvement should apply to OneTimeFreeUnitsRuins too
This commit is contained in:
Rob Loach 2025-07-03 04:02:16 -04:00 committed by GitHub
parent 4f44c7236c
commit 212a772190
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/com/unciv/logic/battle/BattleUnitCapture.kt
View File

@ -218,8 +218,8 @@ object BattleUnitCapture {
capturedUnit.cache.state = StateForConditionals(capturedUnit)
val workerTypeUnit = capturingCiv.gameInfo.ruleset.units.values
.firstOrNull { it.isCivilian() && it.getMatchingUniques(UniqueType.BuildImprovements)
.any { unique -> unique.params[0] == "Land" } }
.firstOrNull { it.isCivilian() && it.getMatchingUniques(UniqueType.BuildImprovements, StateForConditionals.IgnoreConditionals)
.any { unique -> unique.params[0] == "Land" } }
?: return null
return capturingCiv.units.placeUnitNearTile(capturedUnit.currentTile.position, workerTypeUnit, capturedUnit.id)
?.currentTile?.position

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

@ -247,7 +247,7 @@ object UniqueTriggerActivation {
if (civUnit.isCityFounder() && civInfo.isOneCityChallenger()) {
val replacementUnit = ruleset.units.values
.firstOrNull {
it.getMatchingUniques(UniqueType.BuildImprovements)
it.getMatchingUniques(UniqueType.BuildImprovements, StateForConditionals.IgnoreConditionals)
.any { unique -> unique.params[0] == "Land" }
} ?: return null
civUnit = civInfo.getEquivalentUnit(replacementUnit.name)