This commit is contained in:
YueR
2019-09-08 03:29:43 +08:00
parent 340f70dc45
commit bbfe5d7c3f

View File

@ -124,7 +124,7 @@ class VictoryScreen : PickerScreen() {
for (key in victoryManager.requiredSpaceshipParts.keys) for (key in victoryManager.requiredSpaceshipParts.keys)
for (i in 0 until victoryManager.requiredSpaceshipParts[key]!!) for (i in 0 until victoryManager.requiredSpaceshipParts[key]!!)
t.add(getMilestone(key.tr(), victoryManager.currentsSpaceshipParts[key]!! > i)).row() //(key, builtSpaceshipParts) t.add(getMilestone(key, victoryManager.currentsSpaceshipParts[key]!! > i)).row() //(key, builtSpaceshipParts)
return t return t
} }
@ -134,7 +134,7 @@ class VictoryScreen : PickerScreen() {
t.defaults().pad(5f) t.defaults().pad(5f)
for(branch in GameBasics.PolicyBranches.values) { for(branch in GameBasics.PolicyBranches.values) {
val finisher = branch.policies.last().name val finisher = branch.policies.last().name
t.add(getMilestone(finisher.tr(), playerCivInfo.policies.isAdopted(finisher))).row() t.add(getMilestone(finisher, playerCivInfo.policies.isAdopted(finisher))).row()
} }
return t return t
} }
@ -175,7 +175,7 @@ class VictoryScreen : PickerScreen() {
private fun getGlobalDominationVictoryColumn(majorCivs: List<CivilizationInfo>): Table { private fun getGlobalDominationVictoryColumn(majorCivs: List<CivilizationInfo>): Table {
val dominationVictoryColumn = Table().apply { defaults().pad(10f) } val dominationVictoryColumn = Table().apply { defaults().pad(10f) }
dominationVictoryColumn.add("Undefeated civs".tr().toLabel()).row() dominationVictoryColumn.add("Undefeated civs".toLabel()).row()
dominationVictoryColumn.addSeparator() dominationVictoryColumn.addSeparator()
for (civ in majorCivs.filter { !it.isDefeated() }) for (civ in majorCivs.filter { !it.isDefeated() })
@ -189,7 +189,7 @@ class VictoryScreen : PickerScreen() {
private fun getGlobalCulturalVictoryColumn(majorCivs: List<CivilizationInfo>): Table { private fun getGlobalCulturalVictoryColumn(majorCivs: List<CivilizationInfo>): Table {
val policyVictoryColumn = Table().apply { defaults().pad(10f) } val policyVictoryColumn = Table().apply { defaults().pad(10f) }
policyVictoryColumn.add("Branches completed".tr().toLabel()).row() policyVictoryColumn.add("Branches completed".toLabel()).row()
policyVictoryColumn.addSeparator() policyVictoryColumn.addSeparator()
data class civToBranchesCompleted(val civ: CivilizationInfo, val branchesCompleted: Int) data class civToBranchesCompleted(val civ: CivilizationInfo, val branchesCompleted: Int)
@ -206,7 +206,7 @@ class VictoryScreen : PickerScreen() {
private fun getGlobalScientificVictoryColumn(majorCivs: List<CivilizationInfo>): Table { private fun getGlobalScientificVictoryColumn(majorCivs: List<CivilizationInfo>): Table {
val scientificVictoryColumn = Table().apply { defaults().pad(10f) } val scientificVictoryColumn = Table().apply { defaults().pad(10f) }
scientificVictoryColumn.add("Spaceship parts remaining".tr().toLabel()).row() scientificVictoryColumn.add("Spaceship parts remaining".toLabel()).row()
scientificVictoryColumn.addSeparator() scientificVictoryColumn.addSeparator()
data class civToSpaceshipPartsRemaining(val civ: CivilizationInfo, val partsRemaining: Int) data class civToSpaceshipPartsRemaining(val civ: CivilizationInfo, val partsRemaining: Int)