1 files changed, 10 insertions, 8 deletions

@@ -40,25 +40,27 @@ func evaluate_solvability():
         solvable = true
         var missing = []
 
-        if apclient._color_shuffle:
+        if locked:
+                solvable = false
+        elif apclient._color_shuffle:
                 for color in data["color"]:
                         if not apclient._has_colors.has(color):
                                 missing.append(color)
                                 solvable = false
 
-        if locked:
-                self.get_parent().get_node("Viewport/GUI/Panel/Label").text = "Locked"
-                self.get_parent().get_node("Viewport/GUI/Panel/TextEdit").editable = false
-                self.get_parent().get_node("Quad").get_surface_material(0).albedo_color = Color(
-                        0.2, 0.7, 0.7
-                )
-        elif solvable:
+        if solvable:
                 if effects.atbash_remaining > 0:
                         self.get_parent().get_node("Viewport/GUI/Panel/Label").text = atbash_text
                 else:
                         self.get_parent().get_node("Viewport/GUI/Panel/Label").text = orig_text
                 self.get_parent().get_node("Viewport/GUI/Panel/TextEdit").editable = true
                 self.get_parent().get_node("Quad").get_surface_material(0).albedo_color = orig_color
+        elif locked:
+                self.get_parent().get_node("Viewport/GUI/Panel/Label").text = "Locked"
+                self.get_parent().get_node("Viewport/GUI/Panel/TextEdit").editable = false
+                self.get_parent().get_node("Quad").get_surface_material(0).albedo_color = Color(
+                        0.2, 0.7, 0.7
+                )
         else:
                 var missing_text = "Missing: "
                 for thing in missing: