about summary refs log tree commit diff stats
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/Archipelago/manager.gd2
-rw-r--r--client/Archipelago/player.gd2
2 files changed, 3 insertions, 1 deletions
diff --git a/client/Archipelago/manager.gd b/client/Archipelago/manager.gd index 3aa3c50..d43e405 100644 --- a/client/Archipelago/manager.gd +++ b/client/Archipelago/manager.gd
@@ -20,6 +20,7 @@ var _batch_locations = false
20var _held_locations = [] 20var _held_locations = []
21var _item_locks = {} 21var _item_locks = {}
22 22
23var daedalus_roof_access = false
23var keyholder_sanity = false 24var keyholder_sanity = false
24var shuffle_doors = false 25var shuffle_doors = false
25var victory_condition = -1 26var victory_condition = -1
@@ -289,6 +290,7 @@ func _client_connected(slot_data):
289 _last_new_item = localdata[0] 290 _last_new_item = localdata[0]
290 291
291 # Read slot data. 292 # Read slot data.
293 daedalus_roof_access = bool(slot_data.get("daedalus_roof_access", false))
292 keyholder_sanity = bool(slot_data.get("keyholder_sanity", false)) 294 keyholder_sanity = bool(slot_data.get("keyholder_sanity", false))
293 shuffle_doors = bool(slot_data.get("shuffle_doors", false)) 295 shuffle_doors = bool(slot_data.get("shuffle_doors", false))
294 victory_condition = int(slot_data.get("victory_condition", 0)) 296 victory_condition = int(slot_data.get("victory_condition", 0))
diff --git a/client/Archipelago/player.gd b/client/Archipelago/player.gd index 93eb14f..4569af5 100644 --- a/client/Archipelago/player.gd +++ b/client/Archipelago/player.gd
@@ -139,7 +139,7 @@ func _ready():
139 get_parent().add_child.call_deferred(locationListener) 139 get_parent().add_child.call_deferred(locationListener)
140 140
141 # Block off roof access in Daedalus. 141 # Block off roof access in Daedalus.
142 if global.map == "daedalus": 142 if global.map == "daedalus" and not ap.daedalus_roof_access:
143 _set_up_invis_wall(75.5, 11, -24.5, 1, 10, 49) 143 _set_up_invis_wall(75.5, 11, -24.5, 1, 10, 49)
144 _set_up_invis_wall(51.5, 11, -17, 16, 10, 1) 144 _set_up_invis_wall(51.5, 11, -17, 16, 10, 1)
145 _set_up_invis_wall(46, 10, -9.5, 1, 10, 10) 145 _set_up_invis_wall(46, 10, -9.5, 1, 10, 10)
a id='n130' href='#n130'>130 131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176