Merge branch 'panels'

3 files changed, 59 insertions, 11 deletions

@@ -24,7 +24,7 @@ const ap_version = {"major": 0, "minor": 5, "build": 0, "class": "Version"}
 const color_items = [
         "White", "Black", "Red", "Blue", "Green", "Brown", "Gray", "Orange", "Purple", "Yellow"
 ]
-const progressive_items = {
+const door_progressive_items = {
         "Progressive Orange Tower":
         ["Second Floor", "Third Floor", "Fourth Floor", "Fifth Floor", "Sixth Floor", "Seventh Floor"],
         "Progressive Art Gallery":
@@ -36,6 +36,15 @@ const progressive_items = {
         "Progressive Pilgrimage":
         ["1 Sunwarp", "2 Sunwarp", "3 Sunwarp", "4 Sunwarp", "5 Sunwarp", "6 Sunwarp"]
 }
+const panel_progressive_items = {
+        "Progressive Hallway Room": ["First Door", "Second Door", "Third Door", "Fourth Door"],
+        "Progressive Colorful":
+        ["White", "Black", "Red", "Yellow", "Blue", "Purple", "Orange", "Green", "Brown", "Gray"],
+        "Progressive Number Hunt":
+        ["Two", "Three", "Four", "Five", "Six", "Seven", "Eight", "Nine", "Zero"],
+        "Progressive Symmetry Room": ["Near Far", "Warts Straw", "Leaf Feel"],
+        "Progressive Suits Area": ["Words Sword", "Lost", "Amen Name"]
+}
 
 const kTHE_END = 0
 const kTHE_MASTER = 1
@@ -90,6 +99,7 @@ var _localdata_file = ""
 var _death_link = false
 var _victory_condition = 0  # THE END, THE MASTER, LEVEL 2
 var _door_shuffle = false
+var _panel_door_shuffle = false
 var _color_shuffle = false
 var _panel_shuffle = 0  # none, rearrange
 var _painting_shuffle = false
@@ -280,9 +290,15 @@ func _on_data():
                                 _color_shuffle = _slot_data["shuffle_colors"]
 
                         if _slot_data.has("shuffle_doors"):
-                                _door_shuffle = (_slot_data["shuffle_doors"] > 0)
+                                if _slot_data.has("group_doors"):
+                                        _door_shuffle = (_slot_data["shuffle_doors"] == 2)
+                                        _panel_door_shuffle = (_slot_data["shuffle_doors"] == 1)
+                                else:
+                                        _door_shuffle = (_slot_data["shuffle_doors"] > 0)
+                                        _panel_door_shuffle = false
                         else:
                                 _door_shuffle = false
+                                _panel_door_shuffle = false
 
                         if _slot_data.has("shuffle_paintings"):
                                 _painting_shuffle = _slot_data["shuffle_paintings"]
@@ -762,6 +778,12 @@ func processItem(item, index, from, flags):
                 for door_id in gamedata.door_ids_by_item_id[int(item)]:
                         doorsNode.get_node(door_id).openDoor()
 
+        if gamedata.panel_ids_by_item_id.has(int(item)):
+                var panelsNode = get_tree().get_root().get_node("Spatial/Panels")
+                for panel_id in gamedata.panel_ids_by_item_id[int(item)]:
+                        panelsNode.get_node(panel_id).get_node("AP_Panel").locked = false
+                emit_signal("evaluate_solvability")
+
         if gamedata.painting_ids_by_item_id.has(int(item)):
                 var real_parent_node = get_tree().get_root().get_node("Spatial/Decorations/Paintings")
                 var fake_parent_node = get_tree().get_root().get_node_or_null("Spatial/AP_Paintings")
@@ -782,15 +804,34 @@ func processItem(item, index, from, flags):
                         warpsNode.get_node(warp_id).unlock_warp()
 
         # Handle progressive items.
-        if int(item) in gamedata.items_by_progressive_id.keys():
+        var is_progressive_door = int(item) in gamedata.door_items_by_progressive_id
+        var is_progressive_panel = int(item) in gamedata.panel_items_by_progressive_id
+        var progitems = null
+        var prognames = null
+
+        if is_progressive_door and is_progressive_panel:
+                if _door_shuffle:
+                        progitems = gamedata.door_items_by_progressive_id[int(item)]
+                        prognames = door_progressive_items
+                else:
+                        progitems = gamedata.panel_items_by_progressive_id[int(item)]
+                        prognames = panel_progressive_items
+        elif is_progressive_door:
+                progitems = gamedata.door_items_by_progressive_id[int(item)]
+                prognames = door_progressive_items
+        elif is_progressive_panel:
+                progitems = gamedata.panel_items_by_progressive_id[int(item)]
+                prognames = panel_progressive_items
+
+        if progitems != null:
                 if not int(item) in _progressive_progress:
                         _progressive_progress[int(item)] = 0
 
-                if _progressive_progress[int(item)] < gamedata.items_by_progressive_id[int(item)].size():
-                        var subitems = gamedata.items_by_progressive_id[int(item)]
-                        var subitem_id = subitems[_progressive_progress[int(item)]]
+                if _progressive_progress[int(item)] < progitems.size():
+                        var subitem_id = progitems[_progressive_progress[int(item)]]
                         global._print("Subitem: %d" % subitem_id)
                         processItem(subitem_id, null, null, null)
+                        item_name += " (%s)" % prognames[item_name][_progressive_progress[int(item)]]
                         _progressive_progress[int(item)] += 1
 
         if _color_shuffle and color_items.has(_item_id_to_name["Lingo"][item]):
@@ -804,10 +845,6 @@ func processItem(item, index, from, flags):
                 _last_new_item = index
                 saveLocaldata()
 
-                if item_name in progressive_items:
-                        var subitem = progressive_items[item_name][_progressive_progress[int(item)] - 1]
-                        item_name += " (%s)" % subitem
-
                 var player_name = "Unknown"
                 if _player_name_by_slot.has(from):
                         player_name = _player_name_by_slot[from]
@@ -564,6 +564,8 @@ func _load():
                 var script_instance = panel_script.new()
                 script_instance.name = "AP_Panel"
                 script_instance.data = panel
+                if apclient._panel_door_shuffle and gamedata.mentioned_panels.has(panel["id"]):
+                        script_instance.locked = true
                 panel_node.add_child(script_instance)
                 apclient.connect("evaluate_solvability", script_instance, "evaluate_solvability")
 
@@ -5,6 +5,7 @@ var orig_text = ""
 var atbash_text = ""
 var orig_color = Color(0, 0, 0, 0)
 var solvable = true
+var locked = false
 
 const kAtbashPre = "abcdefghijklmnopqrstuvwxyz1234567890+-"
 const kAtbashPost = "zyxwvutsrqponmlkjihgfedcba0987654321-+"
@@ -39,7 +40,9 @@ 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)
@@ -52,6 +55,12 @@ func evaluate_solvability():
                         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: