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

Merge pull request #431 from ninjatao/fix_city_defeated_info

Browse Source 
Fix city defeated info.
This commit is contained in:
Yair Morgenstern 2019-01-23 09:56:12 +02:00 committed by GitHub
commit 1a6089ead1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 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 = 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") else " has " + (if (defender.isDefeated()) "destroyed" else "attacked")
val attackerString = val attackerString =
if (attacker.getUnitType() == UnitType.City) "Enemy city [" + attacker.getName() + "]" if (attacker.getUnitType() == UnitType.City) "Enemy city [" + attacker.getName() + "]"