AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-30 07:21:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
YueR 2019-09-09 16:26:25 +08:00
parent 35ef7989bb
commit 74610b748a
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/assets/jsons/Translations/Buildings.json
View File

@ -298,7 +298,7 @@
German:"Kostenloser Solzialgrundsatz" German:"Kostenloser Solzialgrundsatz"
Dutch:"Gratis sociaalbeleid" Dutch:"Gratis sociaalbeleid"
Spanish:"Política social gratis" Spanish:"Política social gratis"
Simplified_Chinese:"获得1次免费推行社会政策的机会" Simplified_Chinese:"可免费推行1项社会政策"
Portuguese:"Politica social gratis" Portuguese:"Politica social gratis"
Polish:"Darmowy ustrój społeczny" Polish:"Darmowy ustrój społeczny"
} }

5
core/src/com/unciv/ui/pickerscreens/TechPickerScreen.kt
View File

@ -125,9 +125,10 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
civTech.isResearched(techName) && techName!="Future Tech" -> techButton.color = researchedTechColor civTech.isResearched(techName) && techName!="Future Tech" -> techButton.color = researchedTechColor
tempTechsToResearch.isNotEmpty() && tempTechsToResearch.first() == techName -> techButton.color = currentTechColor tempTechsToResearch.isNotEmpty() && tempTechsToResearch.first() == techName -> techButton.color = currentTechColor
tempTechsToResearch.contains(techName) -> techButton.color = queuedTechColor tempTechsToResearch.contains(techName) -> techButton.color = queuedTechColor
researchableTechs.contains(techName) -> techButton.color = researchableTechColor
else -> techButton.color = Color.BLACK 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() var text = techName.tr()
@ -161,11 +162,11 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
if (isFreeTechPick) { if (isFreeTechPick) {
selectTechnologyForFreeTech(tech) selectTechnologyForFreeTech(tech)
setButtonsInfo()
return return
} }
if (civTech.isResearched(tech.name) && tech.name != "Future Tech") { if (civTech.isResearched(tech.name) && tech.name != "Future Tech") {
rightSideButton.setText("Pick a tech".tr())
rightSideButton.disable() rightSideButton.disable()
setButtonsInfo() setButtonsInfo()
return return