diff options
author | Star Rauchenberger <fefferburbia@gmail.com> | 2024-02-26 19:12:23 -0500 |
---|---|---|
committer | Star Rauchenberger <fefferburbia@gmail.com> | 2024-02-26 19:12:23 -0500 |
commit | 500df85a650382563740bc8cf6fbe5f58ae703ee (patch) | |
tree | a019c5a7355147bcb2429c581c8a8032356c04f4 | |
parent | b2b098573ef5bcd03d61e827d11b969460d992af (diff) | |
download | lingo-archipelago-500df85a650382563740bc8cf6fbe5f58ae703ee.tar.gz lingo-archipelago-500df85a650382563740bc8cf6fbe5f58ae703ee.tar.bz2 lingo-archipelago-500df85a650382563740bc8cf6fbe5f58ae703ee.zip |
Sun Painting should be vanilla when pilgrimage is on
-rw-r--r-- | Archipelago/client.gd | 3 | ||||
-rw-r--r-- | Archipelago/mypainting.gd | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Archipelago/client.gd b/Archipelago/client.gd index db79e15..68528f6 100644 --- a/Archipelago/client.gd +++ b/Archipelago/client.gd | |||
@@ -130,6 +130,7 @@ var _mastery_achievements = 21 | |||
130 | var _level_2_requirement = 223 | 130 | var _level_2_requirement = 223 |
131 | var _location_classification_bit = 0 | 131 | var _location_classification_bit = 0 |
132 | var _early_color_hallways = false | 132 | var _early_color_hallways = false |
133 | var _pilgrimage_enabled = false | ||
133 | var _slot_seed = 0 | 134 | var _slot_seed = 0 |
134 | 135 | ||
135 | var _map_loaded = false | 136 | var _map_loaded = false |
@@ -310,6 +311,8 @@ func _on_data(): | |||
310 | _location_classification_bit = kCLASSIFICATION_LOCAL_INSANITY | 311 | _location_classification_bit = kCLASSIFICATION_LOCAL_INSANITY |
311 | if _slot_data.has("early_color_hallways"): | 312 | if _slot_data.has("early_color_hallways"): |
312 | _early_color_hallways = _slot_data["early_color_hallways"] | 313 | _early_color_hallways = _slot_data["early_color_hallways"] |
314 | if _slot_data.has("enable_pilgrimage"): | ||
315 | _pilgrimage_enabled = _slot_data["enable_pilgrimage"] | ||
313 | 316 | ||
314 | _puzzle_skips = 0 | 317 | _puzzle_skips = 0 |
315 | 318 | ||
diff --git a/Archipelago/mypainting.gd b/Archipelago/mypainting.gd index 5e9c703..1420c03 100644 --- a/Archipelago/mypainting.gd +++ b/Archipelago/mypainting.gd | |||
@@ -20,8 +20,13 @@ func _ready(): | |||
20 | 20 | ||
21 | func _answer_correct(): | 21 | func _answer_correct(): |
22 | var apclient = global.get_node("Archipelago") | 22 | var apclient = global.get_node("Archipelago") |
23 | if not apclient._door_shuffle or apclient.paintingIsVanilla(self.get_parent().name): | 23 | if self.get_parent().name == "pilgrim_painting2": |
24 | movePainting() | 24 | # When pilgrimage is enabled, the HOT CRUST panel should actually move the sun painting. |
25 | if apclient._pilgrimage_enabled: | ||
26 | movePainting() | ||
27 | else: | ||
28 | if not apclient._door_shuffle or apclient.paintingIsVanilla(self.get_parent().name): | ||
29 | movePainting() | ||
25 | 30 | ||
26 | 31 | ||
27 | func movePainting(): | 32 | func movePainting(): |