From dc2f88765b70152b41a247919fbccb8f6ae4f8cb Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Fri, 12 Apr 2019 13:33:59 +0300
Subject: [PATCH] Added Foreign Legion unique unit - #563

---
 Credits.md                                    |   1 +
 android/Images/UnitIcons/Foreign Legion.png   | Bin 0 -> 1164 bytes
 android/assets/jsons/Translations.json        |  10 ++++++-
 android/assets/jsons/Units.json               |  14 ++++++++++
 android/build.gradle                          |   4 +--
 .../com/unciv/logic/battle/BattleDamage.kt    |  25 ++++++++++++------
 6 files changed, 43 insertions(+), 11 deletions(-)
 create mode 100644 android/Images/UnitIcons/Foreign Legion.png

diff --git a/Credits.md b/Credits.md
index 5a4219d0de..2d291476df 100644
--- a/Credits.md
+++ b/Credits.md
@@ -68,6 +68,7 @@ All the following are from [the Noun Project](https://thenounproject.com) licenc
 ### Modern
 
 * [Helmet](https://thenounproject.com/term/helmet/25216/) By Daniel Turner for Great War Infantry
+* [Cap](https://thenounproject.com/search/?q=kepi&i=950267) By Creative Mania for Foreign Legion
 * [Tank](https://thenounproject.com/term/tank/1287510/) By corpus delicti for Landship
 * [Warship](https://thenounproject.com/term/warship/1597474/) By zidney for Destroyer
 * [Battleship](https://thenounproject.com/search/?q=battleship&i=1986807) By Vitaliy Gorbachev, KZ for Battleship
diff --git a/android/Images/UnitIcons/Foreign Legion.png b/android/Images/UnitIcons/Foreign Legion.png
new file mode 100644
index 0000000000000000000000000000000000000000..9803e6ddf15f5e9f1f9c443e5ad1e001c7913588
GIT binary patch
literal 1164
zcmeAS@N?(olHy`uVBq!ia0vp^DIm<j1|$m}O$`B3jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85p>QK$!8;-MT+OL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt3(
zJ<}BT2%t60e?46sLn`9l-u3qvc9dW%$h)_v^4qhM&G!%LFX%M)f8{CM!~Xc-j0~q9
z&h2$fj~RV9JTH4I3MiB?%e5R?vTTM(=ILqm-rkA}6EbzrCEv>uZB)B)&U*KG{mdkR
zvh;iD<=^^^F1x$Hz}#%J+0&mrdzR<x<6|>_-n_b<Tef^TR-+rY`s$>gHUCxzMn^_w
z&N^Rs`}yvlRVTmy)&H@txw(0JaB%SY51()FZEJsfO7Dfq(WH;JZrr$$EK*xsY@FM5
z>(0G<cJJ77uIKFEw{hb~&fkaYHr8i)nLO0+T^dxbHTBd4%T=epR>hu5J$~_`;JI~1
zx0=gbpXr=RF}m)(^wNcE*RJim;-tDIzp$`S;O*39?cO$W`*-fy^JZpY?5;O$hYuf4
z6JS}KvA^VKuEn8EH*>h0n@(S-`?7fd{{LMiXKkOYdzQF0s?@r3{|xD-+T!Ei9Cp26
zlX10}l@q^WH|yV7bLZB+J<=+lI3vB`{H1RJ#(#TO^RuS6Z7~-rSmts4>%kjR*Aicu
zym<fT&!1S$MmdYpt@hC+-IX)GT;+{5Ha7mgq;_IUc}ftM?1xW&x2~1;x;g(_a{S4Y
zC)}E?d=;MRx!o#z0;dJNNH}(3#}?g55*<c7E|P4Ec$fp*8Z{0(Oi5HYWgw7Bq43SS
zcYS9_z4)oSY6Uyf)1sT_Q;e9kmOV~T*q``Iz(+Z$)Qa!?=XdUJ%?r*qzqDAxHrYo_
zey7<^AN>Vt+1c6elQ-T-)eL>FqoZ@@-p!kwOLVWOO+THwc8+f1{MS#E3brMvObq%e
zmR7bRZ1w#mx+(>^8^yTV4C2E5oO}bMHG}gXW)##iZO&T}qUEYBUge=8<X_=ysX5p0
z_H4$al$0lu&Oax=|IMn|FFPaN>y{InTK%+3HyXtYUcY{Q_|m)+hdUCpib78%vpb!9
z{`tK{&EFztuVnG{nqKE7l<oN4^+|W**X$GfU4AZI@^$x`%PwD+F1h-A!siD|pS*gN
zrSj|#>zPTpZ$0-0XDoPL*_<eUsKD@e$eT;Ke-GKU%$%4Ivg=jfwf(DG-s-Ih(5MNp
z51GrF&V8@PtA0*v;;EUQf6g~6pJFi<U}>DZIo*2a8CUhFgA1B3g<mzeW3^wv2gu8q
zn=j`W@qd4$S%S^6J)fhlZ8u`~P!7osi)Fc{bY!yrHODup7B|Gdb=F$fe!t?owpHu<
zw{LA5KdFnY`Xiq|Z6j|E_w6Iwc4|Cj-Qsk}i*Ide%-Ij01dkq_w6@~2*8KUWw?BIS
u!S+YopEEyx{0J7C-vI?LbZTqu8LDz#-D0|x`yN<WFnGH9xvX<aXaWFLo+l9i

literal 0
HcmV?d00001

diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json
index 3977f744cd..ab2b3ebd8b 100644
--- a/android/assets/jsons/Translations.json
+++ b/android/assets/jsons/Translations.json
@@ -6763,7 +6763,7 @@
 		German:"Panzerschiff"
 	}
 	
-	// Modern units (do these, yes)
+	// Modern units
 	"Landship":{
 		Italian:"Nave di terra"
 		Romanian:"Vehicul terestru"
@@ -6773,6 +6773,7 @@
 		German:"Landschiff"
 		French:"Véhicule terrestre" //official translation but ugly
 	}
+	
 	"Great War Infantry":{
 		Italian:"Fante della Grande Guerra"
 		Romanian:"Infanteria Marelui Război"
@@ -6782,6 +6783,13 @@
 		German:"Weltkriegs Infanterie"
 		French:"Infanterie de la grande guerre"
 	}
+	
+	"Foreign Legion":{}
+	"+20% bonus outside friendly territory":{}
+	"Foreign Land":{ // for battle table combat percentage
+	}
+	
+	
 	"Destroyer":{
 		Italian:"Cacciatorpediniere"
 		Romanian:"Distrugător"
diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json
index ec69f5b668..286e940e30 100644
--- a/android/assets/jsons/Units.json
+++ b/android/assets/jsons/Units.json
@@ -991,6 +991,20 @@
 		obsoleteTech:"Plastics"
 		attackSound:"shot"
 	},
+	{
+		name:"Foreign Legion",
+		unitType:"Melee",
+		replaces:"Great War Infantry",
+		uniqueTo:"France",
+		movement:2,
+		strength:50,
+		cost: 320,
+		requiredTech:"Replaceable Parts",
+		hurryCostModifier:20,
+		upgradesTo:"Infantry",
+		obsoleteTech:"Plastics"
+		attackSound:"shot"
+	},
 	{
 		name:"Infantry",
 		unitType:"Melee",
diff --git a/android/build.gradle b/android/build.gradle
index 665ebf202f..f11ecce6bd 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.app"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 226
-        versionName "2.14.6"
+        versionCode 227
+        versionName "2.14.7"
     }
 
     // Had to add this crap for Travis to build, it wanted to sign the app
diff --git a/core/src/com/unciv/logic/battle/BattleDamage.kt b/core/src/com/unciv/logic/battle/BattleDamage.kt
index 35bec71f10..96563b652d 100644
--- a/core/src/com/unciv/logic/battle/BattleDamage.kt
+++ b/core/src/com/unciv/logic/battle/BattleDamage.kt
@@ -1,6 +1,7 @@
 package com.unciv.logic.battle
 
 import com.unciv.logic.map.MapUnit
+import com.unciv.logic.map.TileInfo
 import com.unciv.models.gamebasics.unit.UnitType
 import kotlin.math.max
 
@@ -88,6 +89,8 @@ class BattleDamage{
         val modifiers = getGeneralModifiers(attacker, defender)
 
         if(attacker is MapUnitCombatant) {
+            modifiers.putAll(getTileSpecificModifiers(attacker,defender.getTile()))
+
             val defenderTile = defender.getTile()
             val isDefenderInRoughTerrain = defenderTile.baseTerrain=="Hill" || defenderTile.terrainFeature == "Forest" || defenderTile.terrainFeature == "Jungle"
             for (BDM in getBattleDamageModifiersOfUnit(attacker.unit)) {
@@ -112,11 +115,8 @@ class BattleDamage{
                     modifiers["Attacker Bonus"] =modifiers["Attacker Bonus"]!! + bonus
                 else modifiers["Attacker Bonus"] = bonus
             }
-
-            if(defenderTile.getOwner()!=null && !attacker.getCivInfo().isAtWarWith(defenderTile.getOwner()!!)
-                    && attacker.getCivInfo().getBuildingUniques().contains("+15% combat strength for units fighting in friendly territory"))
-                modifiers["Himeji Castle"] = 0.15f
         }
+
         else if (attacker is CityCombatant) {
             if (attacker.getCivInfo().policies.isAdopted("Oligarchy") && attacker.city.getCenterTile().militaryUnit != null)
                 modifiers["Oligarchy"] = 0.5f
@@ -144,6 +144,8 @@ class BattleDamage{
 
         val modifiers = getGeneralModifiers(defender, attacker)
 
+        modifiers.putAll(getTileSpecificModifiers(defender, defender.getTile()))
+
         if (!defender.unit.hasUnique("No defensive terrain bonus")) {
             val tileDefenceBonus = defender.getTile().getDefensiveBonus()
             if (tileDefenceBonus > 0) modifiers["Terrain"] = tileDefenceBonus
@@ -170,16 +172,23 @@ class BattleDamage{
             }
         }
 
-        if(defenderTile.getOwner()!=null && !defender.getCivInfo().isAtWarWith(defenderTile.getOwner()!!)
-                && defender.getCivInfo().getBuildingUniques().contains("+15% combat strength for units fighting in friendly territory"))
-            modifiers["Himeji Castle"] = 0.15f
-
         if (defender.unit.isFortified())
             modifiers["Fortification"] = 0.2f * defender.unit.getFortificationTurns()
 
         return modifiers
     }
 
+    private fun getTileSpecificModifiers(unit: MapUnitCombatant, tile: TileInfo): HashMap<String,Float> {
+        val modifiers = HashMap<String,Float>()
+        val isFriendlyTerritory = tile.getOwner()!=null && !unit.getCivInfo().isAtWarWith(tile.getOwner()!!)
+        if(isFriendlyTerritory && unit.getCivInfo().getBuildingUniques().contains("+15% combat strength for units fighting in friendly territory"))
+            modifiers["Himeji Castle"] = 0.15f
+        if(!isFriendlyTerritory && unit.unit.hasUnique("+20% bonus outside friendly territory"))
+            modifiers["Foreign Land"] = 0.2f
+
+        return modifiers
+    }
+
     private fun modifiersToMultiplicationBonus(modifiers: HashMap<String, Float>): Float {
         // modifiers are like 0.1 for a 10% bonus, -0.1 for a 10% loss
         var finalModifier = 1f