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

Fixed bug where all units could move after attacking (#4325)

Browse Source
This commit is contained in:
Xander Lenstra
2021-07-01 21:18:49 +02:00
committed by GitHub
parent c350a3c923
commit dd283248c2
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -248,6 +248,7 @@ object Battle {
private fun reduceAttackerMovementPointsAndAttacks(attacker: ICombatant, defender: ICombatant) { private fun reduceAttackerMovementPointsAndAttacks(attacker: ICombatant, defender: ICombatant) {
if (attacker is MapUnitCombatant) { if (attacker is MapUnitCombatant) {
val unit = attacker.unit val unit = attacker.unit
unit.attacksThisTurn += 1
if (unit.hasUnique("Can move after attacking") || unit.maxAttacksPerTurn() > unit.attacksThisTurn) { if (unit.hasUnique("Can move after attacking") || unit.maxAttacksPerTurn() > unit.attacksThisTurn) {
// if it was a melee attack and we won, then the unit ALREADY got movement points deducted, // if it was a melee attack and we won, then the unit ALREADY got movement points deducted,
// for the movement to the enemy's tile! // for the movement to the enemy's tile!
@ -255,7 +256,6 @@ object Battle {
if (!attacker.unit.baseUnit.movesLikeAirUnits() && !(attacker.getUnitType().isMelee() && defender.isDefeated())) if (!attacker.unit.baseUnit.movesLikeAirUnits() && !(attacker.getUnitType().isMelee() && defender.isDefeated()))
unit.useMovementPoints(1f) unit.useMovementPoints(1f)
} else unit.currentMovement = 0f } else unit.currentMovement = 0f
unit.attacksThisTurn += 1
if (unit.isFortified() || unit.isSleeping()) if (unit.isFortified() || unit.isSleeping())
attacker.unit.action = null // but not, for instance, if it's Set Up - then it should definitely keep the action! attacker.unit.action = null // but not, for instance, if it's Set Up - then it should definitely keep the action!
} else if (attacker is CityCombatant) { } else if (attacker is CityCombatant) {