From d0975ebc38c7152d0bfafe203d258b5c28a16329 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern 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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 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>) { + 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]!!