AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-24 20:31:51 -04:00
Code Issues Packages Projects Releases Wiki Activity

Resolved #12279 - Units that can withdraw before melee do not do so when escorting civilian units

Browse Source
This commit is contained in:
yairm210 2024-10-13 16:30:37 +03:00
parent edad6d794b
commit d25a436391
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
core/src/com/unciv/logic/battle/Battle.kt
View File

@ -639,6 +639,7 @@ object Battle {
private fun doWithdrawFromMeleeAbility(attacker: MapUnitCombatant, defender: MapUnitCombatant): Boolean { private fun doWithdrawFromMeleeAbility(attacker: MapUnitCombatant, defender: MapUnitCombatant): Boolean {
if (defender.unit.isEmbarked()) return false if (defender.unit.isEmbarked()) return false
if (defender.unit.cache.cannotMove) return false if (defender.unit.cache.cannotMove) return false
if (defender.unit.isEscorting()) return false // running away and leaving the escorted unit defeats the purpose of escorting
// Promotions have no effect as per what I could find in available documentation // Promotions have no effect as per what I could find in available documentation
val fromTile = defender.getTile() val fromTile = defender.getTile()