From 0af880877fbd0b0831ce45be7a7ec0019e567c93 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 18 Jun 2018 23:33:49 +0300
Subject: [PATCH] Added longbowman (Engand unique unit) Techs now don't display
 units that are unique to other civs, or the base unit if you have a unique
 that replaces it

---
 android/assets/UnitIcons/Longbowman.png          | Bin 0 -> 4274 bytes
 android/assets/jsons/Translations.json           |   3 +++
 android/assets/jsons/Units.json                  |  13 +++++++++++++
 .../com/unciv/logic/automation/UnitAutomation.kt |   2 +-
 .../com/unciv/models/gamebasics/Technology.kt    |   5 ++++-
 .../src/com/unciv/models/gamebasics/unit/Unit.kt |   1 +
 6 files changed, 22 insertions(+), 2 deletions(-)
 create mode 100644 android/assets/UnitIcons/Longbowman.png

diff --git a/android/assets/UnitIcons/Longbowman.png b/android/assets/UnitIcons/Longbowman.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f61324ee90e56ea667ee1a78be034bc0b2c8da0
GIT binary patch
literal 4274
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

literal 0
HcmV?d00001

diff --git a/android/assets/jsons/Translations.json b/android/assets/jsons/Translations.json
index e63e184c5d..be4861ab4e 100644
--- a/android/assets/jsons/Translations.json
+++ b/android/assets/jsons/Translations.json
@@ -102,6 +102,9 @@
 		Romanian:"Dispune"
 	}
 	
+	"Found city":{
+	}
+	
 	"Promote":{
 	}
 
diff --git a/android/assets/jsons/Units.json b/android/assets/jsons/Units.json
index 07934da2d2..548cd08511 100644
--- a/android/assets/jsons/Units.json
+++ b/android/assets/jsons/Units.json
@@ -136,6 +136,19 @@
 		requiredTech:"Machinery",
 		hurryCostModifier:20
 	},
+	{
+		name:"Longbowman",
+		unitType:"Ranged",
+		range:3,
+		movement:2,
+		strength:13,
+		rangedStrength:18,
+		replaces:"Crossbowman",
+		uniqueTo:"England",
+		cost: 120,
+		requiredTech:"Machinery",
+		hurryCostModifier:20
+	},
 	{
 		name:"Trebuchet",
 		unitType:"Siege",
diff --git a/core/src/com/unciv/logic/automation/UnitAutomation.kt b/core/src/com/unciv/logic/automation/UnitAutomation.kt
index 996af3d845..582f622e2f 100644
--- a/core/src/com/unciv/logic/automation/UnitAutomation.kt
+++ b/core/src/com/unciv/logic/automation/UnitAutomation.kt
@@ -59,7 +59,7 @@ class UnitAutomation{
         }
 
         else { // Range attack, so enemy needs to be in range
-            return attackableTiles.filter { unit.getTile().getTilesInDistance(2).contains(it) }
+            return attackableTiles.filter { unit.getTile().getTilesInDistance(unit.getBaseUnit().range).contains(it) }
         }
 
     }
diff --git a/core/src/com/unciv/models/gamebasics/Technology.kt b/core/src/com/unciv/models/gamebasics/Technology.kt
index 9cb2099371..3e14dfe4d1 100644
--- a/core/src/com/unciv/models/gamebasics/Technology.kt
+++ b/core/src/com/unciv/models/gamebasics/Technology.kt
@@ -1,5 +1,6 @@
 package com.unciv.models.gamebasics
 
+import com.unciv.UnCivGame
 import com.unciv.ui.utils.tr
 import java.util.*
 
@@ -16,7 +17,9 @@ class Technology : ICivilopedia {
                 SB.appendln(impimpString.tr())
             }
 
-            val enabledUnits = GameBasics.Units.values.filter { it.requiredTech==name }
+            var enabledUnits = GameBasics.Units.values.filter { it.requiredTech==name && (it.uniqueTo==null || it.uniqueTo==UnCivGame.Current.gameInfo.getPlayerCivilization().civName) }
+            val replacedUnits = enabledUnits.map { it.replaces }.filterNotNull()
+            enabledUnits = enabledUnits.filter { it.name !in replacedUnits}
             if(enabledUnits.isNotEmpty()) SB.appendln("{Units enabled}: "+enabledUnits.map { it.name + " ("+it.getShortDescription()+")" }.joinToString())
 
             val enabledBuildings = GameBasics.Buildings.values.filter { it.requiredTech==name }
diff --git a/core/src/com/unciv/models/gamebasics/unit/Unit.kt b/core/src/com/unciv/models/gamebasics/unit/Unit.kt
index 0e292d2776..c2ca187050 100644
--- a/core/src/com/unciv/models/gamebasics/unit/Unit.kt
+++ b/core/src/com/unciv/models/gamebasics/unit/Unit.kt
@@ -18,6 +18,7 @@ class Unit : INamed, IConstruction, ICivilopedia {
     var movement: Int = 0
     var strength:Int = 0
     var rangedStrength:Int = 0
+    var range:Int = 2
     lateinit var unitType: UnitType
     internal var unbuildable: Boolean = false // for special units like great people
     var requiredTech:String? = null