mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-02-09 10:29:02 +07:00
Code Issues Packages Projects Releases Wiki Activity

Victory screen now contains Conquest victory

Browse Source
This commit is contained in:
Yair Morgenstern 2018-05-06 18:15:44 +03:00
parent be5cd0c334
commit 3eaf1afef4
2 changed files with 24 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/unciv/logic/civilization/CivilizationInfo.kt
View File

@ -184,4 +184,6 @@ class CivilizationInfo {
} }
override fun toString(): String {return civName} // for debug override fun toString(): String {return civName} // for debug
fun isDefeated()= cities.isEmpty() && !getCivUnits().any{it.name=="Settler"}
} }

27
core/src/com/unciv/ui/VictoryScreen.kt
View File

@ -17,24 +17,31 @@ class VictoryScreen : PickerScreen() {
topTable.defaults().pad(10f) topTable.defaults().pad(10f)
topTable.add("Science victory") topTable.add("Science victory")
topTable.add("Cultural victory") topTable.add("Cultural victory")
topTable.add("Conquest victory")
topTable.row() topTable.row()
topTable.add(scienceVictoryColumn()) topTable.add(scienceVictoryColumn())
topTable.add(culturalVictoryColumn()) topTable.add(culturalVictoryColumn())
topTable.add(conquestVictoryColumn())
topTable.row() topTable.row()
topTable.add("Complete all the spaceship parts to win!") topTable.add("Complete all the spaceship parts\n to win!")
topTable.add("Complete 4 policy branches to win!") topTable.add("Complete 4 policy branches\n to win!")
topTable.add("Destroy all enemies\n to win!")
rightSideButton.isVisible=false rightSideButton.isVisible=false
if(civInfo.scienceVictory.hasWon()){ if(civInfo.scienceVictory.hasWon()){
rightSideButton.setText("Start new game")
rightSideButton.isVisible=true
closeButton.isVisible=false
descriptionLabel.setText("You have won a scientific victory!") descriptionLabel.setText("You have won a scientific victory!")
won()
} }
if(civInfo.policies.adoptedPolicies.count{it.endsWith("Complete")} > 3){ if(civInfo.policies.adoptedPolicies.count{it.endsWith("Complete")} > 3){
descriptionLabel.setText("You have won a cultural victory!") descriptionLabel.setText("You have won a cultural victory!")
won()
}
if(civInfo.gameInfo.civilizations.all { it.isPlayerCivilization() || it.isDefeated() }){
descriptionLabel.setText("You have won a cultural victory!")
won()
} }
} }
@ -69,6 +76,16 @@ class VictoryScreen : PickerScreen() {
return t return t
} }
fun conquestVictoryColumn():Table{
val t=Table()
t.defaults().pad(5f)
for (civ in civInfo.gameInfo.civilizations){
if(civ.isPlayerCivilization() || civ == civInfo.gameInfo.getBarbarianCivilization()) continue
t.add(getMilestone("Destroy "+civ.civName, civ.isDefeated())).row()
}
return t
}
fun getMilestone(text:String, achieved:Boolean): TextButton { fun getMilestone(text:String, achieved:Boolean): TextButton {
val TB = TextButton(text,skin) val TB = TextButton(text,skin)
if(achieved) TB.setColor(Color.GREEN) if(achieved) TB.setColor(Color.GREEN)