about summary refs log tree commit diff stats
diff options
context:
space:
mode:
-rw-r--r--Archipelago/client.gd5
-rw-r--r--util/generate_gamedata.rb6
2 files changed, 8 insertions, 3 deletions
diff --git a/Archipelago/client.gd b/Archipelago/client.gd index 896673a..2aa4697 100644 --- a/Archipelago/client.gd +++ b/Archipelago/client.gd
@@ -740,6 +740,11 @@ func processItem(item, index, from, flags):
740 for warp_id in gamedata.warp_ids_by_item_id[int(item)]: 740 for warp_id in gamedata.warp_ids_by_item_id[int(item)]:
741 warpsNode.get_node(warp_id).unlock_warp() 741 warpsNode.get_node(warp_id).unlock_warp()
742 742
743 if gamedata.warp_ids_by_item_id.has(int(item)):
744 var warpsNode = get_tree().get_root().get_node("Spatial/Warps")
745 for warp_id in gamedata.warp_ids_by_item_id[int(item)]:
746 warpsNode.get_node(warp_id).unlock_warp()
747
743 # Handle progressive items. 748 # Handle progressive items.
744 if item_name in progressive_items.keys(): 749 if item_name in progressive_items.keys():
745 if not item_name in _progressive_progress: 750 if not item_name in _progressive_progress:
diff --git a/util/generate_gamedata.rb b/util/generate_gamedata.rb index 6923bc5..cf57395 100644 --- a/util/generate_gamedata.rb +++ b/util/generate_gamedata.rb
@@ -175,9 +175,9 @@ config.each do |room_name, room_data|
175 internal_warp_ids = door["warp_id"] 175 internal_warp_ids = door["warp_id"]
176 end 176 end
177 177
178 if door.include? "group" 178 if door.include? "door_group"
179 warp_groups[door["group"]] ||= Set[] 179 warp_groups[door["door_group"]] ||= Set[]
180 warp_groups[door["group"]].merge(internal_warp_ids) 180 warp_groups[door["door_group"]].merge(internal_warp_ids)
181 end 181 end
182 182
183 warp_ids_by_item_id[item_id] = internal_warp_ids 183 warp_ids_by_item_id[item_id] = internal_warp_ids