diff options
-rw-r--r-- | client/Archipelago/settings_screen.gd | 2 | ||||
-rw-r--r-- | client/Archipelago/teleport.gd | 38 | ||||
-rw-r--r-- | data/maps/daedalus/rooms/Wonderland.txtpb | 1 |
3 files changed, 40 insertions, 1 deletions
diff --git a/client/Archipelago/settings_screen.gd b/client/Archipelago/settings_screen.gd index ff6f9df..81e7d3f 100644 --- a/client/Archipelago/settings_screen.gd +++ b/client/Archipelago/settings_screen.gd | |||
@@ -44,6 +44,7 @@ func _ready(): | |||
44 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/pauseMenu.gd")) | 44 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/pauseMenu.gd")) |
45 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/player.gd")) | 45 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/player.gd")) |
46 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/saver.gd")) | 46 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/saver.gd")) |
47 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/teleport.gd")) | ||
47 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/teleportListener.gd")) | 48 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/teleportListener.gd")) |
48 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/visibilityListener.gd")) | 49 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/visibilityListener.gd")) |
49 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/worldportListener.gd")) | 50 | installScriptExtension(ResourceLoader.load("user://maps/Archipelago/worldportListener.gd")) |
@@ -166,6 +167,7 @@ func connectionSuccessful(): | |||
166 | clearResourceCache("res://objects/nodes/panel.tscn") | 167 | clearResourceCache("res://objects/nodes/panel.tscn") |
167 | clearResourceCache("res://objects/nodes/player.tscn") | 168 | clearResourceCache("res://objects/nodes/player.tscn") |
168 | clearResourceCache("res://objects/nodes/saver.tscn") | 169 | clearResourceCache("res://objects/nodes/saver.tscn") |
170 | clearResourceCache("res://objects/nodes/teleport.tscn") | ||
169 | clearResourceCache("res://objects/scenes/menus/pause_menu.tscn") | 171 | clearResourceCache("res://objects/scenes/menus/pause_menu.tscn") |
170 | 172 | ||
171 | var paintings_dir = DirAccess.open("res://objects/meshes/paintings") | 173 | var paintings_dir = DirAccess.open("res://objects/meshes/paintings") |
diff --git a/client/Archipelago/teleport.gd b/client/Archipelago/teleport.gd new file mode 100644 index 0000000..428d50b --- /dev/null +++ b/client/Archipelago/teleport.gd | |||
@@ -0,0 +1,38 @@ | |||
1 | extends "res://scripts/nodes/teleport.gd" | ||
2 | |||
3 | var item_id | ||
4 | var item_amount | ||
5 | |||
6 | |||
7 | func _ready(): | ||
8 | var node_path = String( | ||
9 | get_tree().get_root().get_node("scene").get_path_to(self).get_concatenated_names() | ||
10 | ) | ||
11 | |||
12 | var gamedata = global.get_node("Gamedata") | ||
13 | var door_id = gamedata.get_door_for_map_node_path(global.map, node_path) | ||
14 | if door_id != null: | ||
15 | var ap = global.get_node("Archipelago") | ||
16 | var item_lock = ap.get_item_id_for_door(door_id) | ||
17 | |||
18 | if item_lock != null: | ||
19 | item_id = item_lock[0] | ||
20 | item_amount = item_lock[1] | ||
21 | |||
22 | self.senders = [] | ||
23 | self.senderGroup = [] | ||
24 | self.nested = false | ||
25 | self.complete_at = 0 | ||
26 | self.max_length = 0 | ||
27 | self.excludeSenders = [] | ||
28 | |||
29 | call_deferred("_readier") | ||
30 | |||
31 | super._ready() | ||
32 | |||
33 | |||
34 | func _readier(): | ||
35 | var ap = global.get_node("Archipelago") | ||
36 | |||
37 | if ap.client.getItemAmount(item_id) >= item_amount: | ||
38 | handleTriggered() | ||
diff --git a/data/maps/daedalus/rooms/Wonderland.txtpb b/data/maps/daedalus/rooms/Wonderland.txtpb index 4b69e99..ae9b3f1 100644 --- a/data/maps/daedalus/rooms/Wonderland.txtpb +++ b/data/maps/daedalus/rooms/Wonderland.txtpb | |||
@@ -1,6 +1,5 @@ | |||
1 | name: "Wonderland" | 1 | name: "Wonderland" |
2 | panel_display_name: "Northwest Area" | 2 | panel_display_name: "Northwest Area" |
3 | # TODO: There's a warp from The Entry into here. | ||
4 | panels { | 3 | panels { |
5 | name: "APRIL" | 4 | name: "APRIL" |
6 | path: "Panels/Wonderland/wonderland_1" | 5 | path: "Panels/Wonderland/wonderland_1" |