about summary refs log tree commit diff stats
path: root/Archipelago/client.gd
diff options
context:
space:
mode:
Diffstat (limited to 'Archipelago/client.gd')
-rw-r--r--Archipelago/client.gd9
1 files changed, 8 insertions, 1 deletions
diff --git a/Archipelago/client.gd b/Archipelago/client.gd index 7cf1d01..964c642 100644 --- a/Archipelago/client.gd +++ b/Archipelago/client.gd
@@ -7,6 +7,7 @@ var SCRIPT_multiplayer
7var SCRIPT_mypainting 7var SCRIPT_mypainting
8var SCRIPT_notifier 8var SCRIPT_notifier
9var SCRIPT_panel 9var SCRIPT_panel
10var SCRIPT_pilgrimage_terminator
10var SCRIPT_uuid 11var SCRIPT_uuid
11 12
12var ap_server = "" 13var ap_server = ""
@@ -133,6 +134,8 @@ var _level_2_requirement = 223
133var _location_classification_bit = 0 134var _location_classification_bit = 0
134var _early_color_hallways = false 135var _early_color_hallways = false
135var _pilgrimage_enabled = false 136var _pilgrimage_enabled = false
137var _pilgrimage_allows_roof_access = false
138var _pilgrimage_allows_paintings = false
136var _slot_seed = 0 139var _slot_seed = 0
137 140
138var _map_loaded = false 141var _map_loaded = false
@@ -315,6 +318,10 @@ func _on_data():
315 _early_color_hallways = _slot_data["early_color_hallways"] 318 _early_color_hallways = _slot_data["early_color_hallways"]
316 if _slot_data.has("enable_pilgrimage"): 319 if _slot_data.has("enable_pilgrimage"):
317 _pilgrimage_enabled = _slot_data["enable_pilgrimage"] 320 _pilgrimage_enabled = _slot_data["enable_pilgrimage"]
321 if _slot_data.has("pilgrimage_allows_roof_access"):
322 _pilgrimage_allows_roof_access = _slot_data["pilgrimage_allows_roof_access"]
323 if _slot_data.has("pilgrimage_allows_paintings"):
324 _pilgrimage_allows_paintings = _slot_data["pilgrimage_allows_paintings"]
318 325
319 _puzzle_skips = 0 326 _puzzle_skips = 0
320 327
@@ -654,7 +661,7 @@ func processItem(item, index, from, flags):
654 painting_node = fake_parent_node.get_node_or_null(painting_id) 661 painting_node = fake_parent_node.get_node_or_null(painting_id)
655 if painting_node != null: 662 if painting_node != null:
656 painting_node.get_node("Script").movePainting() 663 painting_node.get_node("Script").movePainting()
657 664
658 if gamedata.warp_ids_by_item_id.has(int(item)): 665 if gamedata.warp_ids_by_item_id.has(int(item)):
659 var warpsNode = get_tree().get_root().get_node("Spatial/Warps") 666 var warpsNode = get_tree().get_root().get_node("Spatial/Warps")
660 for warp_id in gamedata.warp_ids_by_item_id[int(item)]: 667 for warp_id in gamedata.warp_ids_by_item_id[int(item)]: