From c71e8cb61a9cd69a5d478d47c361f3887609773a Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Sun, 2 Nov 2025 11:23:20 -0500 Subject: Make unlockReaderListener shuffleable --- apworld/client/main.gd | 2 ++ apworld/client/unlockReaderListener.gd | 46 ++++++++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 apworld/client/unlockReaderListener.gd (limited to 'apworld') diff --git a/apworld/client/main.gd b/apworld/client/main.gd index a543678..c90d6e7 100644 --- a/apworld/client/main.gd +++ b/apworld/client/main.gd @@ -51,6 +51,7 @@ func _ready(): installScriptExtension(runtime.load_script("saver.gd")) installScriptExtension(runtime.load_script("teleport.gd")) installScriptExtension(runtime.load_script("teleportListener.gd")) + installScriptExtension(runtime.load_script("unlockReaderListener.gd")) installScriptExtension(runtime.load_script("visibilityListener.gd")) installScriptExtension(runtime.load_script("worldport.gd")) installScriptExtension(runtime.load_script("worldportListener.gd")) @@ -253,6 +254,7 @@ func startGame(): clearResourceCache("res://objects/nodes/listeners/keyHolderChecker.tscn") clearResourceCache("res://objects/nodes/listeners/keyHolderResetterListener.tscn") clearResourceCache("res://objects/nodes/listeners/teleportListener.tscn") + clearResourceCache("res://objects/nodes/listeners/unlockReaderListener.tscn") clearResourceCache("res://objects/nodes/listeners/visibilityListener.tscn") clearResourceCache("res://objects/nodes/listeners/worldportListener.tscn") clearResourceCache("res://objects/nodes/panel.tscn") diff --git a/apworld/client/unlockReaderListener.gd b/apworld/client/unlockReaderListener.gd new file mode 100644 index 0000000..a5754b9 --- /dev/null +++ b/apworld/client/unlockReaderListener.gd @@ -0,0 +1,46 @@ +extends "res://scripts/nodes/listeners/unlockReaderListener.gd" + +var item_id = null +var item_amount + + +func _ready(): + var node_path = String( + get_tree().get_root().get_node("scene").get_path_to(self).get_concatenated_names() + ) + + var gamedata = global.get_node("Gamedata") + var door_id = gamedata.get_door_for_map_node_path(global.map, node_path) + if door_id != null: + var ap = global.get_node("Archipelago") + 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] + + self.senders = [] + self.senderGroup = [] + self.nested = false + self.complete_at = 0 + self.max_length = 0 + self.excludeSenders = [] + + super._ready() + + +func _readier(): + if item_id != null: + var ap = global.get_node("Archipelago") + + if ap.client.getItemAmount(item_id) >= item_amount: + handleTriggered() + else: + super._readier() + + +func handleTriggered(): + if item_id != null: + emit_signal("trigger") + else: + super.handleTriggered() -- cgit 1.4.1