From a03482477d340f67b40e29cdedb1fd35ad229100 Mon Sep 17 00:00:00 2001 From: Duan Tao Date: Wed, 23 Jan 2019 15:27:37 +0800 Subject: [PATCH] Fix city defeated info. --- core/src/com/unciv/logic/battle/Battle.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt index fa396fba43..76704c8773 100644 --- a/core/src/com/unciv/logic/battle/Battle.kt +++ b/core/src/com/unciv/logic/battle/Battle.kt @@ -46,7 +46,7 @@ class Battle(val gameInfo:GameInfo) { if(attacker.getCivilization()!=defender.getCivilization()) { // If what happened was that a civilian unit was captures, that's dealt with in the CaptureCilvilianUnit function val whatHappenedString = - if (attacker.isDefeated()) " {was destroyed while attacking}" + if (attacker !is CityCombatant && attacker.isDefeated()) " {was destroyed while attacking}" else " has " + (if (defender.isDefeated()) "destroyed" else "attacked") val attackerString = if (attacker.getUnitType() == UnitType.City) "Enemy city [" + attacker.getName() + "]"