Sun Painting should be vanilla when pilgrimage is on

2 files changed, 10 insertions, 2 deletions

@@ -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
 
@@ -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():