From d0975ebc38c7152d0bfafe203d258b5c28a16329 Mon Sep 17 00:00:00 2001
From: Yair Morgenstern <yairm210@hotmail.com>
Date: Thu, 28 Nov 2019 19:57:55 +0200
Subject: [PATCH] I don't think you should be able to see other tech's tech
 trees from the victory screen.

---
 android/Images/FlagIcons/Malay.png            | Bin 0 -> 3595 bytes
 core/src/com/unciv/ui/VictoryScreen.kt        |   6 ---
 .../ui/pickerscreens/TechPickerScreen.kt      |  50 +++++++++---------
 3 files changed, 24 insertions(+), 32 deletions(-)
 create mode 100644 android/Images/FlagIcons/Malay.png

diff --git a/android/Images/FlagIcons/Malay.png b/android/Images/FlagIcons/Malay.png
new file mode 100644
index 0000000000000000000000000000000000000000..594cdc4c8350deb6e9236aff7f2b854b12d793c0
GIT binary patch
literal 3595
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
LdMee*))D^$`$&R-

literal 0
HcmV?d00001

diff --git a/core/src/com/unciv/ui/VictoryScreen.kt b/core/src/com/unciv/ui/VictoryScreen.kt
index b93571eb0e..7b666e905a 100644
--- a/core/src/com/unciv/ui/VictoryScreen.kt
+++ b/core/src/com/unciv/ui/VictoryScreen.kt
@@ -12,7 +12,6 @@ import com.unciv.models.gamebasics.tr
 import com.unciv.ui.newgamescreen.NewGameScreen
 import com.unciv.ui.pickerscreens.PickerScreen
 import com.unciv.ui.pickerscreens.PolicyPickerScreen
-import com.unciv.ui.pickerscreens.TechPickerScreen
 import com.unciv.ui.utils.addSeparator
 import com.unciv.ui.utils.enable
 import com.unciv.ui.utils.onClick
@@ -228,11 +227,6 @@ class VictoryScreen : PickerScreen() {
         for (entry in civsToPartsRemaining) {
             val civToPartsBeRemaining=(EmpireOverviewScreen.getCivGroup(entry.civ, " - " + entry.partsRemaining, playerCivInfo))
             scientificVictoryColumn.add(civToPartsBeRemaining).row()
-            civToPartsBeRemaining.touchable= Touchable.enabled
-            civToPartsBeRemaining.onClick {
-                game.setScreen(TechPickerScreen(entry.civ, false))
-                dispose()
-            }
         }
         return scientificVictoryColumn
     }
diff --git a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt
index e15fc615a3..d97d8d58b4 100644
--- a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt
+++ b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt
@@ -15,7 +15,7 @@ import com.unciv.ui.utils.*
 import java.util.*
 
 
-class TechPickerScreen(internal val civInfo: CivilizationInfo, switchfromWorldScreen: Boolean = true, centerOnTech: Technology? = null) : PickerScreen() {
+class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Technology? = null) : PickerScreen() {
 
     private var techNameToButton = HashMap<String, TechButton>()
     private var isFreeTechPick: Boolean = false
@@ -61,32 +61,10 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, switchfromWorldSc
         }
 
         // Create tech table (row by row)
-        for (i in 0..9) {
-            topTable.row().pad(5f).padRight(40f)
-
-            for (j in techMatrix.indices) {
-                val tech = techMatrix[j][i]
-                if (tech == null)
-                    topTable.add() // empty cell
-
-                else {
-                    val techButton = TechButton(tech.name, civTech,false)
-
-                    techNameToButton[tech.name] = techButton
-                    techButton.onClick { selectTechnology(tech, false, switchfromWorldScreen) }
-                    topTable.add(techButton)
-                }
-            }
-        }
+        createTechTable(techMatrix)
 
         setButtonsInfo()
-        if (!switchfromWorldScreen){
-            rightSideButton.apply {
-                disable()
-                setText("Tech Tree Of [${civInfo.civName}]".tr())
-            }
-        }
-        else rightSideButton.setText("Pick a tech".tr())
+        rightSideButton.setText("Pick a tech".tr())
         rightSideButton.onClick("paper") {
             if (isFreeTechPick) civTech.getFreeTechnology(selectedTech!!.name)
             else civTech.techsToResearch = tempTechsToResearch
@@ -105,12 +83,32 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, switchfromWorldSc
         if (tech != null) {
             // select only if there it doesn't mess up tempTechsToResearch
             if (civInfo.tech.isResearched(tech.name) || civInfo.tech.techsToResearch.size <= 1)
-                selectTechnology(tech, true, switchfromWorldScreen)
+                selectTechnology(tech, true)
             else centerOnTechnology(tech)
         }
 
     }
 
+    private fun createTechTable(techMatrix: Array<Array<Technology?>>) {
+        for (i in 0..9) {
+            topTable.row().pad(5f).padRight(40f)
+
+            for (j in techMatrix.indices) {
+                val tech = techMatrix[j][i]
+                if (tech == null)
+                    topTable.add() // empty cell
+
+                else {
+                    val techButton = TechButton(tech.name, civTech, false)
+
+                    techNameToButton[tech.name] = techButton
+                    techButton.onClick { selectTechnology(tech, false) }
+                    topTable.add(techButton)
+                }
+            }
+        }
+    }
+
     private fun setButtonsInfo() {
         for (techName in techNameToButton.keys) {
             val techButton = techNameToButton[techName]!!