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

Resolved #13734 - Post-battle movement doesn't occur if during the battle the unit lost movement points

Browse Source
This commit is contained in:
yairm210 2025-08-23 22:55:27 +03:00
parent 4a1f444ce5
commit 2d8effe059
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -498,17 +498,19 @@ object Battle {
private fun postBattleMoveToAttackedTile(attacker: ICombatant, defender: ICombatant, attackedTile: Tile) {
if (!attacker.isMelee()) return
if (!defender.isDefeated() && defender.getCivInfo() != attacker.getCivInfo()) return
if (attacker is MapUnitCombatant && attacker.unit.cache.cannotMove) return
if (attacker !is MapUnitCombatant) return
if (attacker.unit.cache.cannotMove) return
// Example: If the unit we attacked made us lose movement points
if (!attacker.unit.movement.canReachInCurrentTurn(attackedTile)) return
// This is so that if we attack e.g. a barbarian in enemy territory that we can't enter, we won't enter it
if ((attacker as MapUnitCombatant).unit.movement.canMoveTo(attackedTile)) {
// Units that can move after attacking are not affected by zone of control if the
// movement is caused by killing a unit. Effectively, this means that attack movements
// are exempt from zone of control, since units that cannot move after attacking already
// lose all remaining movement points anyway.
attacker.unit.movement.moveToTile(attackedTile, considerZoneOfControl = false)
attacker.unit.mostRecentMoveType = UnitMovementMemoryType.UnitAttacked
}
if (!attacker.unit.movement.canMoveTo(attackedTile)) return
// Units that can move after attacking are not affected by zone of control if the
// movement is caused by killing a unit. Effectively, this means that attack movements
// are exempt from zone of control, since units that cannot move after attacking already
// lose all remaining movement points anyway.
attacker.unit.movement.moveToTile(attackedTile, considerZoneOfControl = false)
attacker.unit.mostRecentMoveType = UnitMovementMemoryType.UnitAttacked
}
private fun postBattleAddXp(attacker: ICombatant, defender: ICombatant) {