From 500df85a650382563740bc8cf6fbe5f58ae703ee Mon Sep 17 00:00:00 2001 From: Star Rauchenberger Date: Mon, 26 Feb 2024 19:12:23 -0500 Subject: Sun Painting should be vanilla when pilgrimage is on --- Archipelago/client.gd | 3 +++ 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 var _level_2_requirement = 223 var _location_classification_bit = 0 var _early_color_hallways = false +var _pilgrimage_enabled = false var _slot_seed = 0 var _map_loaded = false @@ -310,6 +311,8 @@ func _on_data(): _location_classification_bit = kCLASSIFICATION_LOCAL_INSANITY if _slot_data.has("early_color_hallways"): _early_color_hallways = _slot_data["early_color_hallways"] + if _slot_data.has("enable_pilgrimage"): + _pilgrimage_enabled = _slot_data["enable_pilgrimage"] _puzzle_skips = 0 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(): func _answer_correct(): var apclient = global.get_node("Archipelago") - if not apclient._door_shuffle or apclient.paintingIsVanilla(self.get_parent().name): - movePainting() + if self.get_parent().name == "pilgrim_painting2": + # When pilgrimage is enabled, the HOT CRUST panel should actually move the sun painting. + if apclient._pilgrimage_enabled: + movePainting() + else: + if not apclient._door_shuffle or apclient.paintingIsVanilla(self.get_parent().name): + movePainting() func movePainting(): -- cgit 1.4.1