1 files changed, 7 insertions, 7 deletions

@@ -1,6 +1,7 @@
 extends "res://scripts/nodes/painting.gd"
 
 var item_id
+var item_amount
 
 
 func _ready():
@@ -8,17 +9,16 @@ func _ready():
                 get_tree().get_root().get_node("scene").get_path_to(self).get_concatenated_names()
         )
 
-        print("node: %s" % node_path)
-
         var gamedata = global.get_node("Gamedata")
         var door_id = gamedata.get_door_for_map_node_path(global.map, node_path)
         if door_id != null:
-                print("door_id: %d" % door_id)
-
                 var ap = global.get_node("Archipelago")
-                item_id = ap.get_item_id_for_door(door_id)
+                var item_lock = ap.get_item_id_for_door(door_id)
+
+                if item_lock != null:
+                        item_id = item_lock[0]
+                        item_amount = item_lock[1]
 
-                if item_id != null:
                         self.senders = []
                         self.senderGroup = []
                         self.nested = false
@@ -34,5 +34,5 @@ func _ready():
 func _readier():
         var ap = global.get_node("Archipelago")
 
-        if ap.has_item(item_id):
+        if ap.client.getItemAmount(item_id) >= item_amount:
                 handleTriggered()