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

When attacking a tile that has both a military and civilian unit, and defeating the militaryunit, the civilian unit is now destroyed

Browse Source
This commit is contained in:
Yair Morgenstern
2018-06-04 10:15:41 +03:00
parent 0fb3c2256e
commit 6d059fb6ed
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,8 +164,10 @@ class Battle(val gameInfo:GameInfo=UnCivGame.Current.gameInfo) {
conquerCity((defender as CityCombatant).city, attacker) conquerCity((defender as CityCombatant).city, attacker)
} }
if (defender.isDefeated() && attacker.isMelee()) if (defender.isDefeated() && attacker.isMelee()) {
attackedTile.civilianUnit = null // Maybe we defeated the military unit (so it's now removed) but the civilian unit is still there
(attacker as MapUnitCombatant).unit.moveToTile(attackedTile) (attacker as MapUnitCombatant).unit.moveToTile(attackedTile)
}
if(attacker is MapUnitCombatant) { if(attacker is MapUnitCombatant) {
if (attacker.unit.hasUnique("Can move after attacking")) if (attacker.unit.hasUnique("Can move after attacking"))