From 2f22b1d5768a61a58a149ecc5c80c99c86519081 Mon Sep 17 00:00:00 2001
From: Duan Tao <duantao@live.cn>
Date: Wed, 9 Jan 2019 18:56:52 +0800
Subject: [PATCH] City bombardment is counted as ranged.

---
 core/src/com/unciv/logic/battle/Battle.kt             | 5 ++++-
 core/src/com/unciv/models/gamebasics/unit/UnitType.kt | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt
index 3ac53e0af7..2c7eb86f71 100644
--- a/core/src/com/unciv/logic/battle/Battle.kt
+++ b/core/src/com/unciv/logic/battle/Battle.kt
@@ -48,10 +48,13 @@ class Battle(val gameInfo:GameInfo) {
             val whatHappenedString =
                     if (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() + "]"
+                    else "An enemy [" + attacker.getName() + "]"
             val defenderString =
                     if (defender.getUnitType() == UnitType.City) " [" + defender.getName()+"]"
                     else " our [" + defender.getName()+"]"
-            val notificationString = "An enemy [" + attacker.getName()+"]" + whatHappenedString + defenderString
+            val notificationString = attackerString + whatHappenedString + defenderString
             defender.getCivilization().addNotification(notificationString, attackedTile.position, Color.RED)
         }
 
diff --git a/core/src/com/unciv/models/gamebasics/unit/UnitType.kt b/core/src/com/unciv/models/gamebasics/unit/UnitType.kt
index 72cbabf143..4eb3ef6441 100644
--- a/core/src/com/unciv/models/gamebasics/unit/UnitType.kt
+++ b/core/src/com/unciv/models/gamebasics/unit/UnitType.kt
@@ -26,6 +26,7 @@ enum class UnitType{
                 || this == Siege
                 || this == WaterRanged
                 || this == WaterSubmarine
+                || this == City
     }
 
     fun isLandUnit(): Boolean {