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

Unit that was set up doesn't lose its Set Up status if it attacks

Browse Source
This commit is contained in:
Yair Morgenstern 2018-06-11 18:37:19 +03:00
parent 9aa41d3d13
commit 135a502990
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,13 +170,14 @@ class Battle(val gameInfo:GameInfo=UnCivGame.Current.gameInfo) {
}
if(attacker is MapUnitCombatant) {
if (attacker.unit.hasUnique("Can move after attacking")){
val unit = attacker.unit
if (unit.hasUnique("Can move after attacking")){
if(!attacker.getUnitType().isMelee() || !defender.isDefeated()) // if it was a melee attack and we won, then the unit ALREADY got movement points deducted, for the movement to the enemie's tile!
attacker.unit.currentMovement = max(0f, attacker.unit.currentMovement - 1)
unit.currentMovement = max(0f, unit.currentMovement - 1)
}
else attacker.unit.currentMovement = 0f
attacker.unit.attacksThisTurn+=1
attacker.unit.action=null // for instance, if it was fortified
else unit.currentMovement = 0f
unit.attacksThisTurn+=1
if(unit.isFortified()) attacker.unit.action=null // but not, for instance, if it's Set Up - then it should definitely keep the action!
}
}