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

City bombardment is counted as ranged.

Browse Source
This commit is contained in:
Duan Tao 2019-01-09 18:56:52 +08:00
parent 730111993e
commit 2f22b1d576
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,10 +48,13 @@ class Battle(val gameInfo:GameInfo) {
val whatHappenedString = val whatHappenedString =
if (attacker.isDefeated()) " {was destroyed while attacking}" if (attacker.isDefeated()) " {was destroyed while attacking}"
else " has " + (if (defender.isDefeated()) "destroyed" else "attacked") 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 = val defenderString =
if (defender.getUnitType() == UnitType.City) " [" + defender.getName()+"]" if (defender.getUnitType() == UnitType.City) " [" + defender.getName()+"]"
else " our [" + 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) defender.getCivilization().addNotification(notificationString, attackedTile.position, Color.RED)
} }

1
core/src/com/unciv/models/gamebasics/unit/UnitType.kt
View File

@ -26,6 +26,7 @@ enum class UnitType{
|| this == Siege || this == Siege
|| this == WaterRanged || this == WaterRanged
|| this == WaterSubmarine || this == WaterSubmarine
|| this == City
} }
fun isLandUnit(): Boolean { fun isLandUnit(): Boolean {