diff options
Diffstat (limited to 'client/Archipelago/teleportListener.gd')
-rw-r--r-- | client/Archipelago/teleportListener.gd | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/client/Archipelago/teleportListener.gd b/client/Archipelago/teleportListener.gd index 4bb08c9..4a7deec 100644 --- a/client/Archipelago/teleportListener.gd +++ b/client/Archipelago/teleportListener.gd | |||
@@ -1,6 +1,7 @@ | |||
1 | extends "res://scripts/nodes/listeners/teleportListener.gd" | 1 | extends "res://scripts/nodes/listeners/teleportListener.gd" |
2 | 2 | ||
3 | var item_id | 3 | var item_id |
4 | var item_amount | ||
4 | 5 | ||
5 | 6 | ||
6 | func _ready(): | 7 | func _ready(): |
@@ -8,17 +9,16 @@ func _ready(): | |||
8 | get_tree().get_root().get_node("scene").get_path_to(self).get_concatenated_names() | 9 | get_tree().get_root().get_node("scene").get_path_to(self).get_concatenated_names() |
9 | ) | 10 | ) |
10 | 11 | ||
11 | print("node: %s" % node_path) | ||
12 | |||
13 | var gamedata = global.get_node("Gamedata") | 12 | var gamedata = global.get_node("Gamedata") |
14 | var door_id = gamedata.get_door_for_map_node_path(global.map, node_path) | 13 | var door_id = gamedata.get_door_for_map_node_path(global.map, node_path) |
15 | if door_id != null: | 14 | if door_id != null: |
16 | print("door_id: %d" % door_id) | ||
17 | |||
18 | var ap = global.get_node("Archipelago") | 15 | var ap = global.get_node("Archipelago") |
19 | item_id = ap.get_item_id_for_door(door_id) | 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] | ||
20 | 21 | ||
21 | if item_id != null: | ||
22 | self.senders = [] | 22 | self.senders = [] |
23 | self.senderGroup = [] | 23 | self.senderGroup = [] |
24 | self.nested = false | 24 | self.nested = false |
@@ -34,5 +34,5 @@ func _ready(): | |||
34 | func _readier(): | 34 | func _readier(): |
35 | var ap = global.get_node("Archipelago") | 35 | var ap = global.get_node("Archipelago") |
36 | 36 | ||
37 | if ap.has_item(item_id): | 37 | if ap.client.getItemAmount(item_id) >= item_amount: |
38 | handleTriggered() | 38 | handleTriggered() |