From f60ebbb7e1afdef10cfa583f224395d481db8cf9 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sat, 1 Jun 2019 22:47:41 +0300
Subject: [PATCH] Civs clearing an encampment now get gold

---
 .../assets/jsons/Translations/Notifications.json   | 14 ++++++++------
 core/src/com/unciv/UnCivGame.kt                    |  2 +-
 core/src/com/unciv/logic/map/MapUnit.kt            |  9 ++++++++-
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/android/assets/jsons/Translations/Notifications.json b/android/assets/jsons/Translations/Notifications.json
index 3ab1e69226..81e47b6e3f 100644
--- a/android/assets/jsons/Translations/Notifications.json
+++ b/android/assets/jsons/Translations/Notifications.json
@@ -226,9 +226,9 @@
             Japanese:"敵[unit]が私たちの[ourUnit]を攻撃しました"
         }
 
-	"Enemy city [cityName] has attacked our [ourUnit]":{
-            Italian:"La città nemica [cityName] ha attaccato [ourUnit]"
-	}
+		"Enemy city [cityName] has attacked our [ourUnit]":{
+			Italian:"La città nemica [cityName] ha attaccato [ourUnit]"
+		}
 		
         "An enemy [unit] has captured [cityname]":{
             Italian:"Un'unità nemica [unit] ha conquistato [cityname]"
@@ -269,9 +269,9 @@
             Japanese:"敵[unit]が私たちの[ourUnit]を破壊しました"
         }
 		
-	"Enemy city [cityName] has destroyed our [ourUnit]":{
-            Italian:"La città nemica [cityName] ha distrutto [ourUnit]"
-	}
+		"Enemy city [cityName] has destroyed our [ourUnit]":{
+			Italian:"La città nemica [cityName] ha distrutto [ourUnit]"
+		}
         
         "An enemy [unit] was destroyed while attacking [cityname]":{
             Italian:"Un'unità nemica [unit] è stata distrutta mentre attaccava [cityname]"
@@ -349,6 +349,8 @@
             Portuguese:"A civilização de [civName] foi destruida!"
             Japanese:"[civName]の文明は破壊されました！"
         }
+		
+		"We have captured a barbarian encampment and recovered [goldAmount] gold!":{}
         
     /////////////////	ruins
 
diff --git a/core/src/com/unciv/UnCivGame.kt b/core/src/com/unciv/UnCivGame.kt
index 3fcc574599..a84c9f87ec 100644
--- a/core/src/com/unciv/UnCivGame.kt
+++ b/core/src/com/unciv/UnCivGame.kt
@@ -17,7 +17,7 @@ class UnCivGame(val version: String) : Game() {
      * This exists so that when debugging we can see the entire map.
      * Remember to turn this to false before commit and upload!
      */
-    val viewEntireMapForDebug = true
+    val viewEntireMapForDebug = false
 
     // For when you need to test something in an advanced game and don't have time to faff around
     val superchargedForDebug = false
diff --git a/core/src/com/unciv/logic/map/MapUnit.kt b/core/src/com/unciv/logic/map/MapUnit.kt
index b5b15d1af3..d654d8a209 100644
--- a/core/src/com/unciv/logic/map/MapUnit.kt
+++ b/core/src/com/unciv/logic/map/MapUnit.kt
@@ -459,11 +459,18 @@ class MapUnit {
         if(tile.improvement==Constants.ancientRuins && !civInfo.isBarbarianCivilization())
             getAncientRuinBonus()
         if(tile.improvement==Constants.barbarianEncampment && !civInfo.isBarbarianCivilization())
-            tile.improvement=null // todo get bonus from clearing encampment
+            clearEncampment(tile)
 
         updateViewableTiles()
     }
 
+    private fun clearEncampment(tile: TileInfo) {
+        tile.improvement=null
+        val goldToAdd = 25 // game-speed-dependant
+        civInfo.gold+=goldToAdd
+        civInfo.addNotification("We have captured a barbarian encampment and recovered [$goldToAdd] gold!", tile.position, Color.RED)
+    }
+
     fun disband(){
         destroy()
         if(currentTile.isCityCenter() && currentTile.getOwner()==civInfo)