From 88449a819b1b7ff2d81060381228f7a1c429e4c7 Mon Sep 17 00:00:00 2001 From: SomeTroglodyte <63000004+SomeTroglodyte@users.noreply.github.com> Date: Thu, 24 Aug 2023 09:09:09 +0200 Subject: [PATCH] Fix next-turn not offering Policy Picker for free Policies (#9963) --- .../com/unciv/ui/screens/worldscreen/status/NextTurnAction.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/core/src/com/unciv/ui/screens/worldscreen/status/NextTurnAction.kt b/core/src/com/unciv/ui/screens/worldscreen/status/NextTurnAction.kt index 15f49fe4b4..a3683671ef 100644 --- a/core/src/com/unciv/ui/screens/worldscreen/status/NextTurnAction.kt +++ b/core/src/com/unciv/ui/screens/worldscreen/status/NextTurnAction.kt @@ -54,7 +54,8 @@ enum class NextTurnAction(protected val text: String, val color: Color) { }, PickPolicy("Pick a policy", Color.VIOLET) { override fun isChoice(worldScreen: WorldScreen) = - worldScreen.viewingCiv.policies.shouldOpenPolicyPicker + worldScreen.viewingCiv.policies.shouldOpenPolicyPicker || + worldScreen.viewingCiv.policies.freePolicies > 0 && worldScreen.viewingCiv.policies.canAdoptPolicy() override fun action(worldScreen: WorldScreen) { worldScreen.game.pushScreen(PolicyPickerScreen(worldScreen.selectedCiv, worldScreen.canChangeState)) worldScreen.viewingCiv.policies.shouldOpenPolicyPicker = false