diff options
Diffstat (limited to 'Archipelago')
-rw-r--r-- | Archipelago/client.gd | 17 | ||||
-rw-r--r-- | Archipelago/load.gd | 14 |
2 files changed, 28 insertions, 3 deletions
diff --git a/Archipelago/client.gd b/Archipelago/client.gd index 06fb3a6..24c8134 100644 --- a/Archipelago/client.gd +++ b/Archipelago/client.gd | |||
@@ -15,7 +15,7 @@ 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-beta1" |
19 | const ap_version = {"major": 0, "minor": 4, "build": 4, "class": "Version"} | 19 | const ap_version = {"major": 0, "minor": 4, "build": 4, "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" |
@@ -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 | ||
@@ -300,7 +313,7 @@ func _on_data(): | |||
300 | 313 | ||
301 | if localdata.size() > 1: | 314 | if localdata.size() > 1: |
302 | _puzzle_skips = localdata[1] | 315 | _puzzle_skips = localdata[1] |
303 | 316 | ||
304 | if localdata.size() > 2: | 317 | if localdata.size() > 2: |
305 | _cached_slowness = localdata[2] | 318 | _cached_slowness = localdata[2] |
306 | else: | 319 | else: |
diff --git a/Archipelago/load.gd b/Archipelago/load.gd index a277817..59d2ac2 100644 --- a/Archipelago/load.gd +++ b/Archipelago/load.gd | |||
@@ -91,9 +91,21 @@ func _load(): | |||
91 | 91 | ||
92 | wanderer_achieve.translation = Vector3(-51, -33, 35) # way under the map | 92 | wanderer_achieve.translation = Vector3(-51, -33, 35) # way under the map |
93 | 93 | ||
94 | # Turn THE COLORFUL into a cdp. | ||
95 | var real_colorful = panels_parent.get_node("Countdown Panels/Panel_colorful_colorful") | ||
96 | var cdp_auto_scene = load("res://nodes/panel_countdown_auto.tscn") | ||
97 | var colorful_cdp = cdp_auto_scene.instance() | ||
98 | colorful_cdp.name = "CountdownPanel_colorful" | ||
99 | colorful_cdp.replace_with = "../../Panels/Countdown Panels/Panel_colorful_colorful" | ||
100 | colorful_cdp.panels = "../../Panels/Doorways Room" | ||
101 | colorful_cdp.translation = real_colorful.translation | ||
102 | colorful_cdp.rotation = real_colorful.rotation | ||
103 | get_node("CountdownPanels").add_child(colorful_cdp) | ||
104 | real_colorful.translation = Vector3(-51, -35, 35) # way under the map | ||
105 | get_node("Doors/Doorway Room Doors/Door_gray2").queue_free() | ||
106 | |||
94 | # Set up The Master to be variable. | 107 | # Set up The Master to be variable. |
95 | var old_master_cdp = get_node("CountdownPanels/CountdownPanel_countdown_16") | 108 | var old_master_cdp = get_node("CountdownPanels/CountdownPanel_countdown_16") |
96 | var cdp_auto_scene = load("res://nodes/panel_countdown_auto.tscn") | ||
97 | var new_master_cdp = cdp_auto_scene.instance() | 109 | var new_master_cdp = cdp_auto_scene.instance() |
98 | new_master_cdp.name = "AP_variable_master" | 110 | new_master_cdp.name = "AP_variable_master" |
99 | new_master_cdp.replace_with = old_master_cdp.replace_with | 111 | new_master_cdp.replace_with = old_master_cdp.replace_with |