AnarchistGamers/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-09-28 06:16:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
YueR 2019-09-27 21:21:48 +08:00
parent 84336c2c95
commit f37c9a1f9c
1 changed files with 7 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -44,7 +44,7 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, switchfromWorldSc
setDefaultCloseAction() setDefaultCloseAction()
onBackButtonClicked { UnCivGame.Current.setWorldScreen() } onBackButtonClicked { UnCivGame.Current.setWorldScreen() }
scrollPane.style = skin.get(ScrollPane.ScrollPaneStyle::class.java) // So we can see scrollbars scrollPane.style = skin.get(ScrollPane.ScrollPaneStyle::class.java) // So we can see scrollbars
scrollPane.setOverscroll(false,false)
tempTechsToResearch = ArrayList(civTech.techsToResearch) tempTechsToResearch = ArrayList(civTech.techsToResearch)
val columns = GameBasics.Technologies.values.map { it.column!!.columnNumber}.max()!! +1 val columns = GameBasics.Technologies.values.map { it.column!!.columnNumber}.max()!! +1
@ -54,10 +54,12 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, switchfromWorldSc
techMatrix[technology.column!!.columnNumber][technology.row - 1] = technology techMatrix[technology.column!!.columnNumber][technology.row - 1] = technology
} }
val eras = ArrayList<Label>() val erasName = arrayOf("Ancient","Classical","Medieval","Renaissance","Industrial","Modern","Information","Future")
for(i in techMatrix.indices) for (i in 0..7) {
eras.add("".toLabel().setFontColor(Color.WHITE)) val j = if (erasName[i]!="Ancient" && erasName[i]!="Future") 2 else 3
eras.forEach { topTable.add(it) } if (i%2==0) topTable.add((erasName[i]+" era").toLabel().setFontColor(Color.WHITE).addBorder(2f, Color.BLUE)).fill().colspan(j)
else topTable.add((erasName[i]+" era").toLabel().setFontColor(Color.WHITE).addBorder(2f, Color.FIREBRICK)).fill().colspan(j)
}
// Create tech table (row by row) // Create tech table (row by row)
for (i in 0..9) { for (i in 0..9) {
@ -78,20 +80,6 @@ class TechPickerScreen(internal val civInfo: CivilizationInfo, switchfromWorldSc
} }
} }
// Set era names (column by column)
val alreadyDisplayedEras = HashSet<String>()
for(j in techMatrix.indices)
for(i in 0..9)
{
val tech = techMatrix[j][i]
if(tech==null) continue
val eraName = tech.era().name
if(!alreadyDisplayedEras.contains(eraName)) { // name of era was not yet displayed
eras[j].setText("$eraName era".tr())
alreadyDisplayedEras.add(eraName)
}
}
setButtonsInfo() setButtonsInfo()
if (!switchfromWorldScreen){ if (!switchfromWorldScreen){
rightSideButton.apply { rightSideButton.apply {