From 748e84f2659ae945670799be97afa1ac912581f9 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Mon, 11 Feb 2019 22:07:34 +0200
Subject: [PATCH] Resolved #449 - added "go to unit" button in unit overview

---
 android/build.gradle                               |  2 +-
 build.gradle                                       |  2 +-
 .../logic/civilization/ScienceVictoryManager.kt    | 14 --------------
 core/src/com/unciv/logic/map/TileMap.kt            |  2 +-
 core/src/com/unciv/ui/EmpireOverviewScreen.kt      |  7 +++++++
 core/src/com/unciv/ui/pickerscreens/TechButton.kt  |  4 ----
 6 files changed, 10 insertions(+), 21 deletions(-)

diff --git a/android/build.gradle b/android/build.gradle
index c25e4f48f4..e2729f0f67 100644
--- a/android/build.gradle
+++ b/android/build.gradle
@@ -21,7 +21,7 @@ android {
         applicationId "com.unciv.app"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 201
+        versionCode 202
         versionName "2.13.3"
     }
 
diff --git a/build.gradle b/build.gradle
index a7bded603e..27780e45c1 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.0'
+        classpath 'com.android.tools.build:gradle:3.3.1'
         classpath 'com.mobidevelop.robovm:robovm-gradle-plugin:2.3.1'
     }
 }
diff --git a/core/src/com/unciv/logic/civilization/ScienceVictoryManager.kt b/core/src/com/unciv/logic/civilization/ScienceVictoryManager.kt
index b0c0782b10..84c97cd439 100644
--- a/core/src/com/unciv/logic/civilization/ScienceVictoryManager.kt
+++ b/core/src/com/unciv/logic/civilization/ScienceVictoryManager.kt
@@ -13,18 +13,4 @@ class ScienceVictoryManager {
         requiredParts.add("SS Engine", 1)
         requiredParts.add("SS Stasis Chamber", 1)
     }
-
-    fun clone(): ScienceVictoryManager {
-        val toReturn = ScienceVictoryManager()
-        toReturn.currentParts.putAll(currentParts)
-        return toReturn
-    }
-
-    fun unconstructedParts(): Counter<String> {
-        val counter = requiredParts.clone()
-        counter.remove(currentParts)
-        return counter
-    }
-
-    fun hasWon() = requiredParts.equals(currentParts)
 }
diff --git a/core/src/com/unciv/logic/map/TileMap.kt b/core/src/com/unciv/logic/map/TileMap.kt
index f67616599c..1c7537ce3a 100644
--- a/core/src/com/unciv/logic/map/TileMap.kt
+++ b/core/src/com/unciv/logic/map/TileMap.kt
@@ -136,7 +136,7 @@ class TileMap {
     }
 
     fun setTransients() {
-        if(tiles.any()) //
+        if(tiles.any())
             tileList.addAll(tiles.values)
 
         val topY= tileList.asSequence().map { it.position.y.toInt() }.max()!!
diff --git a/core/src/com/unciv/ui/EmpireOverviewScreen.kt b/core/src/com/unciv/ui/EmpireOverviewScreen.kt
index c7ec4613c8..c4614f47a1 100644
--- a/core/src/com/unciv/ui/EmpireOverviewScreen.kt
+++ b/core/src/com/unciv/ui/EmpireOverviewScreen.kt
@@ -262,6 +262,7 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
         table.add("Ranged strength".tr())
         table.add("Movement".tr())
         table.add("Closest city".tr())
+        table.add("Go to unit".tr())
         table.row()
         table.addSeparator()
 
@@ -273,6 +274,12 @@ class EmpireOverviewScreen : CameraStageBaseScreen(){
             table.add(DecimalFormat("0.#").format(unit.currentMovement)+"/"+unit.getMaxMovement())
             val closestCity = unit.getTile().getTilesInDistance(3).firstOrNull{it.isCityCenter()}
             if (closestCity!=null) table.add(closestCity.getCity()!!.name) else table.add()
+            val goToUnitButton = TextButton("Go to unit".tr(),skin)
+            goToUnitButton.onClick {
+                UnCivGame.Current.setWorldScreen()
+                UnCivGame.Current.worldScreen.tileMapHolder.setCenterPosition(unit.currentTile.position)
+            }
+            table.add(goToUnitButton)
             table.row()
         }
         table.pack()
diff --git a/core/src/com/unciv/ui/pickerscreens/TechButton.kt b/core/src/com/unciv/ui/pickerscreens/TechButton.kt
index e01fa14bfb..0c7c459158 100644
--- a/core/src/com/unciv/ui/pickerscreens/TechButton.kt
+++ b/core/src/com/unciv/ui/pickerscreens/TechButton.kt
@@ -34,10 +34,6 @@ class TechButton(techName:String, val techManager: TechManager) : Table(CameraSt
         val techEnabledIcons = Table()
         techEnabledIcons.defaults().pad(5f)
 
-        val units = GameBasics.Units.values.filter { it.requiredTech==techName }
-                .filter { it.uniqueTo==null || it.uniqueTo==techManager.civInfo.civName }
-
-
         for(unit in GameBasics.Units.values.filter { it.requiredTech==techName
                 && (it.uniqueTo==null || it.uniqueTo==techManager.civInfo.civName) })
             techEnabledIcons.add(ImageGetter.getConstructionImage(unit.name).surroundWithCircle(30f))