From 2c824532d81a30b07891ed1cd3170fe750960ca8 Mon Sep 17 00:00:00 2001 From: Yair Morgenstern Date: Mon, 13 Apr 2020 21:20:35 +0300 Subject: [PATCH] Free policies no longer 'stuck' the game when you have no adoptable policies --- core/src/com/unciv/ui/worldscreen/WorldScreen.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt index 2f32abad..8005b77f 100644 --- a/core/src/com/unciv/ui/worldscreen/WorldScreen.kt +++ b/core/src/com/unciv/ui/worldscreen/WorldScreen.kt @@ -536,7 +536,7 @@ class WorldScreen(val viewingCiv:CivilizationInfo) : CameraStageBaseScreen() { game.setScreen(TechPickerScreen(viewingCiv.tech.freeTechs != 0, viewingCiv)) } - viewingCiv.policies.shouldOpenPolicyPicker || viewingCiv.policies.freePolicies > 0 -> + viewingCiv.policies.shouldOpenPolicyPicker || (viewingCiv.policies.freePolicies > 0 && viewingCiv.policies.canAdoptPolicy()) -> NextTurnAction("Pick a policy") { game.setScreen(PolicyPickerScreen(this)) viewingCiv.policies.shouldOpenPolicyPicker = false