diff options
Diffstat (limited to 'Archipelago')
-rw-r--r-- | Archipelago/client.gd | 12 | ||||
-rw-r--r-- | Archipelago/painting_eye.gd | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/Archipelago/client.gd b/Archipelago/client.gd index 13a7635..896673a 100644 --- a/Archipelago/client.gd +++ b/Archipelago/client.gd | |||
@@ -136,6 +136,7 @@ var _mastery_achievements = 21 | |||
136 | var _level_2_requirement = 223 | 136 | var _level_2_requirement = 223 |
137 | var _location_classification_bit = 0 | 137 | var _location_classification_bit = 0 |
138 | var _early_color_hallways = false | 138 | var _early_color_hallways = false |
139 | var _pilgrimage_compatibility = false # set to true for pre-0.4.6 | ||
139 | var _pilgrimage_enabled = false | 140 | var _pilgrimage_enabled = false |
140 | var _pilgrimage_allows_roof_access = false | 141 | var _pilgrimage_allows_roof_access = false |
141 | var _pilgrimage_allows_paintings = false | 142 | var _pilgrimage_allows_paintings = false |
@@ -313,6 +314,8 @@ func _on_data(): | |||
313 | _panel_shuffle = _slot_data["shuffle_panels"] | 314 | _panel_shuffle = _slot_data["shuffle_panels"] |
314 | if _slot_data.has("sunwarp_access"): | 315 | if _slot_data.has("sunwarp_access"): |
315 | _sunwarp_access = _slot_data["sunwarp_access"] | 316 | _sunwarp_access = _slot_data["sunwarp_access"] |
317 | else: | ||
318 | _sunwarp_access = kSUNWARP_ACCESS_NORMAL | ||
316 | if _slot_data.has("seed"): | 319 | if _slot_data.has("seed"): |
317 | _slot_seed = _slot_data["seed"] | 320 | _slot_seed = _slot_data["seed"] |
318 | if _slot_data.has("painting_entrance_to_exit"): | 321 | if _slot_data.has("painting_entrance_to_exit"): |
@@ -332,12 +335,21 @@ func _on_data(): | |||
332 | _early_color_hallways = _slot_data["early_color_hallways"] | 335 | _early_color_hallways = _slot_data["early_color_hallways"] |
333 | if _slot_data.has("enable_pilgrimage"): | 336 | if _slot_data.has("enable_pilgrimage"): |
334 | _pilgrimage_enabled = _slot_data["enable_pilgrimage"] | 337 | _pilgrimage_enabled = _slot_data["enable_pilgrimage"] |
338 | else: | ||
339 | _pilgrimage_compatibility = true | ||
340 | _pilgrimage_enabled = true | ||
335 | if _slot_data.has("pilgrimage_allows_roof_access"): | 341 | if _slot_data.has("pilgrimage_allows_roof_access"): |
336 | _pilgrimage_allows_roof_access = _slot_data["pilgrimage_allows_roof_access"] | 342 | _pilgrimage_allows_roof_access = _slot_data["pilgrimage_allows_roof_access"] |
343 | else: | ||
344 | _pilgrimage_allows_roof_access = true | ||
337 | if _slot_data.has("pilgrimage_allows_paintings"): | 345 | if _slot_data.has("pilgrimage_allows_paintings"): |
338 | _pilgrimage_allows_paintings = _slot_data["pilgrimage_allows_paintings"] | 346 | _pilgrimage_allows_paintings = _slot_data["pilgrimage_allows_paintings"] |
347 | else: | ||
348 | _pilgrimage_allows_paintings = true | ||
339 | if _slot_data.has("shuffle_sunwarps"): | 349 | if _slot_data.has("shuffle_sunwarps"): |
340 | _sunwarp_shuffle = _slot_data["shuffle_sunwarps"] | 350 | _sunwarp_shuffle = _slot_data["shuffle_sunwarps"] |
351 | else: | ||
352 | _sunwarp_shuffle = false | ||
341 | if _slot_data.has("sunwarp_permutation"): | 353 | if _slot_data.has("sunwarp_permutation"): |
342 | _sunwarp_mapping = _slot_data["sunwarp_permutation"] | 354 | _sunwarp_mapping = _slot_data["sunwarp_permutation"] |
343 | 355 | ||
diff --git a/Archipelago/painting_eye.gd b/Archipelago/painting_eye.gd index c6994b1..b2e6973 100644 --- a/Archipelago/painting_eye.gd +++ b/Archipelago/painting_eye.gd | |||
@@ -3,7 +3,7 @@ extends "res://scripts/painting_eye.gd" | |||
3 | 3 | ||
4 | func _answer_correct(): | 4 | func _answer_correct(): |
5 | var apclient = global.get_node("Archipelago") | 5 | var apclient = global.get_node("Archipelago") |
6 | if get_name() == "pilgrim_painting2": | 6 | if !apclient._pilgrimage_compatibility and get_name() == "pilgrim_painting2": |
7 | # When pilgrimage is enabled, the HOT CRUST panel should actually move the sun painting. | 7 | # When pilgrimage is enabled, the HOT CRUST panel should actually move the sun painting. |
8 | if apclient._pilgrimage_enabled: | 8 | if apclient._pilgrimage_enabled: |
9 | movePainting() | 9 | movePainting() |