wbrawner/Unciv
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Resolved #613 - policy choice & city conquer collision

Browse source
This commit is contained in:
Yair Morgenstern 2019-03-29 15:20:30 +03:00
parent 38f732b461
commit b0830ba487
1 changed files with 3 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/src/com/unciv/ui/worldscreen/WorldScreen.kt
View file

@ -219,6 +219,9 @@ class WorldScreen : CameraStageBaseScreen() {
private fun createNextTurnButton(): TextButton {
val nextTurnButton = TextButton("Next turn".tr(), CameraStageBaseScreen.skin)
nextTurnButton.onClick {
if(currentPlayerCiv.policies.shouldOpenPolicyPicker && !currentPlayerCiv.policies.canAdoptPolicy())
currentPlayerCiv.policies.shouldOpenPolicyPicker = false // something has chanhed and we can no longer adopt the policy, e.g. we conquered another city
if (currentPlayerCiv.tech.freeTechs != 0) {
game.screen = TechPickerScreen(true, currentPlayerCiv)
return@onClick