From cc0e76ba002003324b2edbf1464b2b7ab4c60a92 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Sun, 28 Oct 2018 12:37:00 +0200
Subject: [PATCH] Added info of tile's unit defence bonus to tile info (not
 everyone is a veteren Civ player...)

---
 android/assets/jsons/Translations.json               |  2 ++
 android/build.gradle                                 |  4 ++--
 core/src/com/unciv/logic/map/TileInfo.kt             |  6 ++++++
 core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt | 10 ++++------
 4 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json
index c9826b114c..c969b6b054 100644
--- a/android/assets/jsons/Translations.json
+++ b/android/assets/jsons/Translations.json
@@ -1046,6 +1046,8 @@
 		Spanish:"Ataque"
 	}
 	
+	"[percentage] to unit defence":{} // e.g. +25% to unit defence
+	
 	// Terrains
 	
 	"Grassland":{
diff --git a/android/build.gradle b/android/build.gradle
index 1b3770d4e8..1718ec1f7b 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.game"
         minSdkVersion 14
         targetSdkVersion 26
-        versionCode 150
-        versionName "2.9.3"
+        versionCode 151
+        versionName "2.9.5"
     }
     buildTypes {
         release {
diff --git a/core/src/com/unciv/logic/map/TileInfo.kt b/core/src/com/unciv/logic/map/TileInfo.kt
index 0e39faa86b..cb917b04cb 100644
--- a/core/src/com/unciv/logic/map/TileInfo.kt
+++ b/core/src/com/unciv/logic/map/TileInfo.kt
@@ -218,6 +218,12 @@ open class TileInfo {
             if(militaryUnit!!.health<100) milUnitString += "(" + militaryUnit!!.health + ")"
             SB.appendln(milUnitString)
         }
+        if(getDefensiveBonus()!=0f){
+            var defencePercentString = (getDefensiveBonus()*100).toInt().toString()+"%"
+            if(!defencePercentString.startsWith("-")) defencePercentString = "+$defencePercentString"
+            SB.appendln("[$defencePercentString] to unit defence".tr())
+        }
+
         return SB.toString().trim()
     }
 
diff --git a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt
index 9cc340f3c5..a37ff2ce22 100644
--- a/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt
+++ b/core/src/com/unciv/ui/utils/CameraStageBaseScreen.kt
@@ -156,21 +156,19 @@ fun String.tr(): String {
 val fontCache = HashMap<Int,BitmapFont>()
 fun getFont(size: Int): BitmapFont {
     if(fontCache.containsKey(size)) return fontCache[size]!!
-//    var screenScale = Gdx.graphics.width / 1000f // screen virtual width as defined in CameraStageBaseScreen
-//    if(screenScale<1) screenScale=1f
 
     val generator = FreeTypeFontGenerator(Gdx.files.internal("skin/Arial.ttf"))
     val parameter = FreeTypeFontGenerator.FreeTypeFontParameter()
     parameter.size = size
-//    parameter.genMipMaps = true
     parameter.minFilter = Texture.TextureFilter.Linear
     parameter.magFilter = Texture.TextureFilter.Linear
-    parameter.characters = "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽaäàâăbcčćdđeéfghiîjklmnoöpqrsșštțuüvwxyzžАБВГҐДЂЕЁЄЖЗЅИІЇЙЈКЛЉМНЊОПРСТЋУЎФХЦЧЏШЩЪЫЬЭЮЯабвгґдђеёєжзѕиіїйјклљмнњопрстћуўфхцчџшщъыьэюяΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρστυφχψωάΆέΈέΉίϊΐΊόΌύΰϋΎΫΏĂÂÊÔƠƯăâêôơưáéíóú1234567890‘?’'“!”(%)[#]{@}/&\\<-+÷×=>®©\$€£¥¢:;,.*|"
-    //generator.scaleForPixelHeight(size)
 
+    parameter.characters = "ABCČĆDĐEFGHIJKLMNOPQRSŠTUVWXYZŽaäàâăbcčćdđeéfghiîjklmnoöpqrsșštțuüvwxyzž" +
+            "АБВГҐДЂЕЁЄЖЗЅИІЇЙЈКЛЉМНЊОПРСТЋУЎФХЦЧЏШЩЪЫЬЭЮЯабвгґдђеёєжзѕиіїйјклљмнњопрстћуўфхцчџшщъыьэюя" +
+            "ΑΒΓΔΕΖΗΘΙΚΛΜΝΞΟΠΡΣΤΥΦΧΨΩαβγδεζηθικλμνξοπρστυφχψωάΆέΈέΉίϊΐΊόΌύΰϋΎΫΏĂÂÊÔƠƯăâêôơưáéíóú1234567890" +
+            "‘?’'“!”(%)[#]{@}/&\\<-+÷×=>®©\$€£¥¢:;,.*|"
 
     val font = generator.generateFont(parameter)
-//    font.data.setScale(1f/screenScale)
     generator.dispose() // don't forget to dispose to avoid memory leaks!
     fontCache[size]=font
     return font