From e93ed68a2bcf56bf600e2aeaaa3ceef6255a2cda Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Tue, 2 Apr 2019 21:53:36 +0300
Subject: [PATCH] Icons for units replaced by civ unique units are no longer
 shown in tech button

---
 android/build.gradle                              | 4 ++--
 build.gradle                                      | 2 +-
 core/src/com/unciv/ui/pickerscreens/TechButton.kt | 9 +++++++--
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index 0b84d5a86c..084be43192 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,8 +21,8 @@ android {
         applicationId "com.unciv.app"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 223
-        versionName "2.14.3"
+        versionCode 224
+        versionName "2.14.4"
     }
 
     // Had to add this crap for Travis to build, it wanted to sign the app
diff --git a/build.gradle b/build.gradle
index 27780e45c1..72846a9793 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,7 +16,7 @@ buildscript {
     }
     dependencies {
         classpath 'de.richsource.gradle.plugins:gwt-gradle-plugin:0.6'
-        classpath 'com.android.tools.build:gradle:3.3.1'
+        classpath 'com.android.tools.build:gradle:3.3.2'
         classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1'
     }
 }
diff --git a/core/src/com/unciv/ui/pickerscreens/TechButton.kt b/core/src/com/unciv/ui/pickerscreens/TechButton.kt
index 0c7c459158..d2489f3700 100644
--- a/core/src/com/unciv/ui/pickerscreens/TechButton.kt
+++ b/core/src/com/unciv/ui/pickerscreens/TechButton.kt
@@ -34,8 +34,13 @@ class TechButton(techName:String, val techManager: TechManager) : Table(CameraSt
         val techEnabledIcons = Table()
         techEnabledIcons.defaults().pad(5f)
 
-        for(unit in GameBasics.Units.values.filter { it.requiredTech==techName
-                && (it.uniqueTo==null || it.uniqueTo==techManager.civInfo.civName) })
+        val techEnabledUnits = GameBasics.Units.values.filter { it.requiredTech==techName }
+        val ourUniqueUnits = techEnabledUnits.filter { it.uniqueTo == techManager.civInfo.civName }
+        val replacedUnits = ourUniqueUnits.map { it.replaces!! }
+        val ourEnabledUnits = techEnabledUnits.filter { it.uniqueTo == null && !replacedUnits.contains(it.name) }
+                .union(ourUniqueUnits)
+
+        for(unit in ourEnabledUnits)
             techEnabledIcons.add(ImageGetter.getConstructionImage(unit.name).surroundWithCircle(30f))
 
         for(building in GameBasics.Buildings.values.filter { it.requiredTech==techName