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

Military unit capturing respects "Uncapturable" unique

Browse Source
This commit is contained in:
Yair Morgenstern
2024-04-16 00:16:57 +03:00
parent f69539ab92
commit 66656de5fc
1 changed files with 3 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,6 +23,9 @@ object BattleUnitCapture {
// There are 3 ways of capturing a unit, we separate them for cleaner code but we also need to ensure a unit isn't captured twice // There are 3 ways of capturing a unit, we separate them for cleaner code but we also need to ensure a unit isn't captured twice
if (defender !is MapUnitCombatant || attacker !is MapUnitCombatant) return false if (defender !is MapUnitCombatant || attacker !is MapUnitCombatant) return false
if (defender.hasUnique(UniqueType.Uncapturable, StateForConditionals(unit = defender.unit,
ourCombatant = defender, theirCombatant = attacker, attackedTile = attackedTile)))
return false
if (!defender.isDefeated() || defender.unit.isCivilian()) return false if (!defender.isDefeated() || defender.unit.isCivilian()) return false