From a8663dda911af54ee5126203629230e26e9ede82 Mon Sep 17 00:00:00 2001
From: lishaoxia1985 <49801619+lishaoxia1985@users.noreply.github.com>
Date: Tue, 10 Sep 2019 03:43:00 +0800
Subject: [PATCH] fix that researched tech can be picked when we pick a free
 tech (#1049)

* systemProp

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* update

* fix that researched tech can be picked when we pick a free tech

* update to master

* update

* Update TechPickerScreen.kt
---
 android/assets/jsons/Translations/Buildings.json        | 2 +-
 core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/android/assets/jsons/Translations/Buildings.json b/android/assets/jsons/Translations/Buildings.json
index c7daa7ff73..ed4bb887ed 100644
--- a/android/assets/jsons/Translations/Buildings.json
+++ b/android/assets/jsons/Translations/Buildings.json
@@ -298,7 +298,7 @@
 		German:"Kostenloser Solzialgrundsatz"
 		Dutch:"Gratis sociaalbeleid"
 		Spanish:"Política social gratis"
-		Simplified_Chinese:"获得1次免费推行社会政策的机会"
+		Simplified_Chinese:"可免费推行1项社会政策"
 		Portuguese:"Politica social gratis"
 		Polish:"Darmowy ustrój społeczny"
 	}
diff --git a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt
index 9c9fd3d14b..401090acf5 100644
--- a/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt
+++ b/core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt
@@ -125,9 +125,10 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
                 civTech.isResearched(techName) && techName!="Future Tech" -> techButton.color = researchedTechColor
                 tempTechsToResearch.isNotEmpty() && tempTechsToResearch.first() == techName -> techButton.color = currentTechColor
                 tempTechsToResearch.contains(techName) -> techButton.color = queuedTechColor
-                researchableTechs.contains(techName) -> techButton.color = researchableTechColor
                 else -> techButton.color = Color.BLACK
             }
+            //the tech that can be selected to research immediately should be always researchableTechColor, it's very good when we pick a free tech.
+            if (researchableTechs.contains(techName)&&!civTech.isResearched(techName)) techButton.color = researchableTechColor
 
             var text = techName.tr()
 
@@ -161,6 +162,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
 
         if (isFreeTechPick) {
             selectTechnologyForFreeTech(tech)
+            setButtonsInfo()
             return
         }
 
@@ -189,7 +191,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
 
 
     private fun selectTechnologyForFreeTech(tech: Technology) {
-        if (researchableTechs.contains(tech.name)) {
+        if (researchableTechs.contains(tech.name)&&!civTech.isResearched(tech.name)) {
             pick("Pick [${selectedTech!!.name}] as free tech".tr())
         } else {
             rightSideButton.setText("Pick a free tech".tr())
@@ -197,4 +199,4 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
         }
     }
 
-}
\ No newline at end of file
+}