Merge branch 'main' into color-hallways

1 files changed, 15 insertions, 1 deletions

@@ -3,9 +3,23 @@ extends "res://scripts/painting_eye.gd"
 
 func _answer_correct():
         var apclient = global.get_node("Archipelago")
-        if not apclient._door_shuffle or apclient.paintingIsVanilla(self.name):
+        if !apclient._pilgrimage_compatibility and get_name() == "pilgrim_painting2":
+                # When pilgrimage is enabled, the HOT CRUST panel should actually move the sun painting.
+                if apclient._pilgrimage_enabled:
+                        movePainting()
+        elif not apclient._door_shuffle or apclient.paintingIsVanilla(self.name):
                 ._answer_correct()
 
 
 func movePainting():
         ._answer_correct()
+
+
+func _looked_at(var body, var painting):
+        ._looked_at(body, painting)
+
+        if body.is_in_group("player") && (painting.get_name() == self.get_name()):
+                var apclient = global.get_node("Archipelago")
+                if !apclient._pilgrimage_allows_paintings:
+                        global.sunwarp = 1
+                        body.get_node("pivot/camera/sunwarp_background").visible = false