From 7ff81ac901c0d7ffaaa0cdc5ff1a88133d25b025 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Sat, 21 Apr 2018 23:00:23 +0300 Subject: [PATCH] When a unit takes over a city, it now gets moved to that city --- core/src/com/unciv/logic/battle/Battle.kt | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index 852acf0db6..225b358827 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -109,15 +109,15 @@ class Battle(val gameInfo:GameInfo) { } - if (defender.isDefeated() && attacker.getCombatantType() == CombatantType.Melee) - (attacker as MapUnitCombatant).unit.moveToTile(attackedTile) - if(defender.isDefeated() && defender.getCombatantType() == CombatantType.City && attacker.getCombatantType() == CombatantType.Melee){ conquerCity((defender as CityCombatant).city, attacker) } + if (defender.isDefeated() && attacker.getCombatantType() == CombatantType.Melee) + (attacker as MapUnitCombatant).unit.moveToTile(attackedTile) + if(attacker is MapUnitCombatant) attacker.unit.currentMovement = 0f } @@ -141,6 +141,7 @@ class Battle(val gameInfo:GameInfo) { enemyCiv.cities.first().cityConstructions.builtBuildings.add("Palace") // relocate palace } } + (attacker as MapUnitCombatant).unit.moveToTile(city.getCenterTile()) } } \ No newline at end of file