AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-26 13:27:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Center the research screen (#1887)

Browse Source 
* Correct list of the researchable techs

* Center on the researchable technology
This commit is contained in:
JackRainy 2020-02-09 20:16:34 +02:00 committed by GitHub
parent ddf86ecf2f
commit 66ac364045
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -26,7 +26,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
// All these are to counter performance problems when updating buttons for all techs. // All these are to counter performance problems when updating buttons for all techs.
private var researchableTechs = civInfo.gameInfo.ruleSet.technologies.keys private var researchableTechs = civInfo.gameInfo.ruleSet.technologies.keys
.filter { civTech.canBeResearched(it) }.toHashSet() .filter { civTech.canBeResearched(it) && !civTech.isResearched(it) }.toHashSet()
private val currentTechColor = colorFromRGB(7,46,43) private val currentTechColor = colorFromRGB(7,46,43)
private val researchedTechColor = colorFromRGB(133,112,39) private val researchedTechColor = colorFromRGB(133,112,39)
@ -65,12 +65,18 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
// per default show current/recent technology, // per default show current/recent technology,
// and possibly select it to show description, // and possibly select it to show description,
// which is very helpful when just discovered and clicking the notification // which is very helpful when just discovered and clicking the notification
val tech = if (centerOnTech != null) centerOnTech else civInfo.tech.currentTechnology() val tech = centerOnTech ?: civInfo.tech.currentTechnology()
if (tech != null) { if (tech != null) {
// select only if there it doesn't mess up tempTechsToResearch // select only if there it doesn't mess up tempTechsToResearch
if (civInfo.tech.isResearched(tech.name) || civInfo.tech.techsToResearch.size <= 1) if (civInfo.tech.isResearched(tech.name) || civInfo.tech.techsToResearch.size <= 1)
selectTechnology(tech, true) selectTechnology(tech, true)
else centerOnTechnology(tech) else centerOnTechnology(tech)
} else {
// center on any possible technology which is ready for the research right now
val firstAvailable = researchableTechs.firstOrNull()
val firstAvailableTech = civInfo.gameInfo.ruleSet.technologies[firstAvailable]
if (firstAvailableTech != null)
centerOnTechnology(firstAvailableTech)
} }
} }
@ -116,7 +122,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
civTech.isResearched(techName) && techName != Constants.futureTech -> researchedTechColor civTech.isResearched(techName) && techName != Constants.futureTech -> researchedTechColor
// if we're here to pick a free tech, show the current tech like the rest of the researchables so it'll be obvious what we can pick // if we're here to pick a free tech, show the current tech like the rest of the researchables so it'll be obvious what we can pick
tempTechsToResearch.firstOrNull() == techName && !isFreeTechPick -> currentTechColor tempTechsToResearch.firstOrNull() == techName && !isFreeTechPick -> currentTechColor
researchableTechs.contains(techName) && !civTech.isResearched(techName) -> researchableTechColor researchableTechs.contains(techName) -> researchableTechColor
tempTechsToResearch.contains(techName) -> queuedTechColor tempTechsToResearch.contains(techName) -> queuedTechColor
else -> Color.GRAY else -> Color.GRAY
} }
@ -221,7 +227,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, centerOnTech: Tec
private fun selectTechnologyForFreeTech(tech: Technology) { private fun selectTechnologyForFreeTech(tech: Technology) {
if (researchableTechs.contains(tech.name)&& (!civTech.isResearched(tech.name) || tech.name==Constants.futureTech)) { if (researchableTechs.contains(tech.name) || tech.name==Constants.futureTech) {
pick("Pick [${selectedTech!!.name}] as free tech".tr()) pick("Pick [${selectedTech!!.name}] as free tech".tr())
} else { } else {
rightSideButton.setText("Pick a free tech".tr()) rightSideButton.setText("Pick a free tech".tr())