mirrors/Unciv
1
0
Fork 0
mirror of https://github.com/yairm210/Unciv.git synced 2025-07-06 16:28:40 +07:00
Code Issues Packages Projects Releases Wiki Activity

Policy pick and free tech pick moved to when clicking on next turn button

Browse Source
This commit is contained in:
Yair Morgenstern
2018-03-11 23:25:57 +02:00
parent 5db5272810
commit f59102a2a0
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View File

@ -81,12 +81,6 @@ class WorldScreen : CameraStageBaseScreen() {
civTable.update(this) civTable.update(this)
notificationsScroll.update() notificationsScroll.update()
unitTable.update() unitTable.update()
if (civInfo.tech.freeTechs != 0) {
game.screen = TechPickerScreen(true, civInfo)
} else if (civInfo.policies.shouldOpenPolicyPicker) {
game.screen = PolicyPickerScreen(civInfo)
civInfo.policies.shouldOpenPolicyPicker = false
}
} }
private fun updateTechButton() { private fun updateTechButton() {
@ -109,10 +103,19 @@ class WorldScreen : CameraStageBaseScreen() {
private fun createNextTurnButton() { private fun createNextTurnButton() {
val nextTurnButton = TextButton("Next turn", CameraStageBaseScreen.skin) val nextTurnButton = TextButton("Next turn", CameraStageBaseScreen.skin)
nextTurnButton.addClickListener { nextTurnButton.addClickListener {
if (civInfo.tech.currentTechnology() == null && civInfo.cities.isNotEmpty()) { if (civInfo.tech.freeTechs != 0) {
game.screen = TechPickerScreen(true, civInfo)
return@addClickListener
} else if (civInfo.policies.shouldOpenPolicyPicker) {
game.screen = PolicyPickerScreen(civInfo)
civInfo.policies.shouldOpenPolicyPicker = false
return@addClickListener
}
else if (civInfo.tech.currentTechnology() == null && civInfo.cities.isNotEmpty()) {
game.screen = TechPickerScreen(civInfo) game.screen = TechPickerScreen(civInfo)
return@addClickListener return@addClickListener
} }
game.gameInfo.nextTurn() game.gameInfo.nextTurn()
unitTable.selectedUnitTile = null unitTable.selectedUnitTile = null
unitTable.currentlyExecutingAction = null unitTable.currentlyExecutingAction = null