diff options
| -rw-r--r-- | Archipelago/client.gd | 17 | ||||
| -rw-r--r-- | Archipelago/load.gd | 14 | ||||
| -rw-r--r-- | util/generate_gamedata.rb | 6 |
3 files changed, 31 insertions, 6 deletions
| diff --git a/Archipelago/client.gd b/Archipelago/client.gd index 05294d5..1ba52d7 100644 --- a/Archipelago/client.gd +++ b/Archipelago/client.gd | |||
| @@ -15,8 +15,8 @@ var ap_pass = "" | |||
| 15 | var confusify_world = false | 15 | var confusify_world = false |
| 16 | var enable_multiplayer = false | 16 | var enable_multiplayer = false |
| 17 | 17 | ||
| 18 | const my_version = "1.2.0" | 18 | const my_version = "2.0.0-beta2" |
| 19 | const ap_version = {"major": 0, "minor": 4, "build": 4, "class": "Version"} | 19 | const ap_version = {"major": 0, "minor": 4, "build": 5, "class": "Version"} |
| 20 | const color_items = [ | 20 | const color_items = [ |
| 21 | "White", "Black", "Red", "Blue", "Green", "Brown", "Gray", "Orange", "Purple", "Yellow" | 21 | "White", "Black", "Red", "Blue", "Green", "Brown", "Gray", "Orange", "Purple", "Yellow" |
| 22 | ] | 22 | ] |
| @@ -49,6 +49,19 @@ const progressive_items = { | |||
| 49 | [ | 49 | [ |
| 50 | {"item": "The Fearless (First Floor) - Second Floor", "display": "Second Floor"}, | 50 | {"item": "The Fearless (First Floor) - Second Floor", "display": "Second Floor"}, |
| 51 | {"item": "The Fearless (Second Floor) - Third Floor", "display": "Third Floor"}, | 51 | {"item": "The Fearless (Second Floor) - Third Floor", "display": "Third Floor"}, |
| 52 | ], | ||
| 53 | "Progressive Colorful": | ||
| 54 | [ | ||
| 55 | {"item": "The Colorful - White Door", "display": "White"}, | ||
| 56 | {"item": "The Colorful - Black Door", "display": "Black"}, | ||
| 57 | {"item": "The Colorful - Red Door", "display": "Red"}, | ||
| 58 | {"item": "The Colorful - Yellow Door", "display": "Yellow"}, | ||
| 59 | {"item": "The Colorful - Blue Door", "display": "Blue"}, | ||
| 60 | {"item": "The Colorful - Purple Door", "display": "Purple"}, | ||
| 61 | {"item": "The Colorful - Orange Door", "display": "Orange"}, | ||
| 62 | {"item": "The Colorful - Green Door", "display": "Green"}, | ||
| 63 | {"item": "The Colorful - Brown Door", "display": "Brown"}, | ||
| 64 | {"item": "The Colorful - Gray Door", "display": "Gray"}, | ||
| 52 | ] | 65 | ] |
| 53 | } | 66 | } |
| 54 | 67 | ||
| diff --git a/Archipelago/load.gd b/Archipelago/load.gd index dc4049e..566ee39 100644 --- a/Archipelago/load.gd +++ b/Archipelago/load.gd | |||
| @@ -96,9 +96,21 @@ func _load(): | |||
| 96 | 96 | ||
| 97 | wanderer_achieve.translation = Vector3(-51, -33, 35) # way under the map | 97 | wanderer_achieve.translation = Vector3(-51, -33, 35) # way under the map |
| 98 | 98 | ||
| 99 | # Turn THE COLORFUL into a cdp. | ||
| 100 | var real_colorful = panels_parent.get_node("Countdown Panels/Panel_colorful_colorful") | ||
| 101 | var cdp_auto_scene = load("res://nodes/panel_countdown_auto.tscn") | ||
| 102 | var colorful_cdp = cdp_auto_scene.instance() | ||
| 103 | colorful_cdp.name = "CountdownPanel_colorful" | ||
| 104 | colorful_cdp.replace_with = "../../Panels/Countdown Panels/Panel_colorful_colorful" | ||
| 105 | colorful_cdp.panels = "../../Panels/Doorways Room" | ||
| 106 | colorful_cdp.translation = real_colorful.translation | ||
| 107 | colorful_cdp.rotation = real_colorful.rotation | ||
| 108 | get_node("CountdownPanels").add_child(colorful_cdp) | ||
| 109 | real_colorful.translation = Vector3(-51, -35, 35) # way under the map | ||
| 110 | get_node("Doors/Doorway Room Doors/Door_gray2").queue_free() | ||
| 111 | |||
| 99 | # Set up The Master to be variable. | 112 | # Set up The Master to be variable. |
| 100 | var old_master_cdp = get_node("CountdownPanels/CountdownPanel_countdown_16") | 113 | var old_master_cdp = get_node("CountdownPanels/CountdownPanel_countdown_16") |
| 101 | var cdp_auto_scene = load("res://nodes/panel_countdown_auto.tscn") | ||
| 102 | var new_master_cdp = cdp_auto_scene.instance() | 114 | var new_master_cdp = cdp_auto_scene.instance() |
| 103 | new_master_cdp.name = "AP_variable_master" | 115 | new_master_cdp.name = "AP_variable_master" |
| 104 | new_master_cdp.replace_with = old_master_cdp.replace_with | 116 | new_master_cdp.replace_with = old_master_cdp.replace_with |
| diff --git a/util/generate_gamedata.rb b/util/generate_gamedata.rb index 5e03655..f63e062 100644 --- a/util/generate_gamedata.rb +++ b/util/generate_gamedata.rb | |||
| @@ -132,9 +132,9 @@ config.each do |room_name, room_data| | |||
| 132 | internal_door_ids = door["id"] | 132 | internal_door_ids = door["id"] |
| 133 | end | 133 | end |
| 134 | 134 | ||
| 135 | if door.include? "group" | 135 | if door.include? "door_group" |
| 136 | door_groups[door["group"]] ||= Set[] | 136 | door_groups[door["door_group"]] ||= Set[] |
| 137 | door_groups[door["group"]].merge(internal_door_ids) | 137 | door_groups[door["door_group"]].merge(internal_door_ids) |
| 138 | end | 138 | end |
| 139 | 139 | ||
| 140 | door_ids_by_item_id[item_id] = internal_door_ids | 140 | door_ids_by_item_id[item_id] = internal_door_ids |
