From c27bcb00c4dd65396972c9338d6989867fcb5b5b Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Tue, 12 Jun 2018 09:09:11 +0300
Subject: [PATCH] Fixed notification when capturing a civilian unit

---
 android/build.gradle                      | 4 ++--
 core/src/com/unciv/logic/battle/Battle.kt | 8 +++++---
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index cd10a71559..070e6d0fcc 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.game"
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 77
-        versionName "2.4.7"
+        versionCode 78
+        versionName "2.4.8"
     }
     buildTypes {
         release {
diff --git a/core/src/com/unciv/logic/battle/Battle.kt b/core/src/com/unciv/logic/battle/Battle.kt
index f64d2041dc..95a8e93b81 100644
--- a/core/src/com/unciv/logic/battle/Battle.kt
+++ b/core/src/com/unciv/logic/battle/Battle.kt
@@ -145,15 +145,15 @@ class Battle(val gameInfo:GameInfo=UnCivGame.Current.gameInfo) {
 
     private fun postBattleAction(attacker: ICombatant, defender: ICombatant, attackedTile:TileInfo){
 
-        if (defender.getCivilization().isPlayerCivilization()) {
+        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"
                     else " has " + (if (defender.isDefeated()) "destroyed" else "attacked")
             val defenderString =
-                    if (defender.getUnitType() == UnitType.City) " "+defender.getName()
+                    if (defender.getUnitType() == UnitType.City) " " + defender.getName()
                     else " our " + defender.getName()
             val notificationString = "An enemy " + attacker.getName() + whatHappenedString + defenderString
-            gameInfo.getPlayerCivilization().addNotification(notificationString, attackedTile.position, Color.RED)
+            defender.getCivilization().addNotification(notificationString, attackedTile.position, Color.RED)
         }
 
 
@@ -224,6 +224,8 @@ class Battle(val gameInfo:GameInfo=UnCivGame.Current.gameInfo) {
     fun captureCivilianUnit(attacker: ICombatant, defender: ICombatant){
         if(attacker.getCivilization().isBarbarianCivilization()) defender.takeDamage(100) // barbarians don't capture civilians!
         val capturedUnit = (defender as MapUnitCombatant).unit
+        capturedUnit.civInfo.addNotification("Our "+defender.getName()+" was captured by an enemy "+attacker.getName(),
+                defender.getTile().position, Color.RED)
         capturedUnit.civInfo = attacker.getCivilization()
         capturedUnit.owner = capturedUnit.civInfo.civName
     }