Merge branch 'future'

3 files changed, 31 insertions, 6 deletions

@@ -15,8 +15,8 @@ var ap_pass = ""
 var confusify_world = false
 var enable_multiplayer = false
 
-const my_version = "1.2.0"
-const ap_version = {"major": 0, "minor": 4, "build": 4, "class": "Version"}
+const my_version = "2.0.0-beta2"
+const ap_version = {"major": 0, "minor": 4, "build": 5, "class": "Version"}
 const color_items = [
         "White", "Black", "Red", "Blue", "Green", "Brown", "Gray", "Orange", "Purple", "Yellow"
 ]
@@ -49,6 +49,19 @@ const progressive_items = {
         [
                 {"item": "The Fearless (First Floor) - Second Floor", "display": "Second Floor"},
                 {"item": "The Fearless (Second Floor) - Third Floor", "display": "Third Floor"},
+        ],
+        "Progressive Colorful":
+        [
+                {"item": "The Colorful - White Door", "display": "White"},
+                {"item": "The Colorful - Black Door", "display": "Black"},
+                {"item": "The Colorful - Red Door", "display": "Red"},
+                {"item": "The Colorful - Yellow Door", "display": "Yellow"},
+                {"item": "The Colorful - Blue Door", "display": "Blue"},
+                {"item": "The Colorful - Purple Door", "display": "Purple"},
+                {"item": "The Colorful - Orange Door", "display": "Orange"},
+                {"item": "The Colorful - Green Door", "display": "Green"},
+                {"item": "The Colorful - Brown Door", "display": "Brown"},
+                {"item": "The Colorful - Gray Door", "display": "Gray"},
         ]
 }
 
@@ -96,9 +96,21 @@ func _load():
 
         wanderer_achieve.translation = Vector3(-51, -33, 35)  # way under the map
 
+        # Turn THE COLORFUL into a cdp.
+        var real_colorful = panels_parent.get_node("Countdown Panels/Panel_colorful_colorful")
+        var cdp_auto_scene = load("res://nodes/panel_countdown_auto.tscn")
+        var colorful_cdp = cdp_auto_scene.instance()
+        colorful_cdp.name = "CountdownPanel_colorful"
+        colorful_cdp.replace_with = "../../Panels/Countdown Panels/Panel_colorful_colorful"
+        colorful_cdp.panels = "../../Panels/Doorways Room"
+        colorful_cdp.translation = real_colorful.translation
+        colorful_cdp.rotation = real_colorful.rotation
+        get_node("CountdownPanels").add_child(colorful_cdp)
+        real_colorful.translation = Vector3(-51, -35, 35)  # way under the map
+        get_node("Doors/Doorway Room Doors/Door_gray2").queue_free()
+
         # Set up The Master to be variable.
         var old_master_cdp = get_node("CountdownPanels/CountdownPanel_countdown_16")
-        var cdp_auto_scene = load("res://nodes/panel_countdown_auto.tscn")
         var new_master_cdp = cdp_auto_scene.instance()
         new_master_cdp.name = "AP_variable_master"
         new_master_cdp.replace_with = old_master_cdp.replace_with
@@ -132,9 +132,9 @@ config.each do |room_name, room_data|
             internal_door_ids = door["id"]
           end
           
-          if door.include? "group"
-            door_groups[door["group"]] ||= Set[]
-            door_groups[door["group"]].merge(internal_door_ids)
+          if door.include? "door_group"
+            door_groups[door["door_group"]] ||= Set[]
+            door_groups[door["door_group"]].merge(internal_door_ids)
           end
 
           door_ids_by_item_id[item_id] = internal_door_ids