1 files changed, 7 insertions, 7 deletions

@@ -20,13 +20,8 @@ func _ready():
 
 func _answer_correct():
         var apclient = global.get_node("Archipelago")
-        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()
+        if not apclient._door_shuffle or apclient.paintingIsVanilla(self.get_parent().name):
+                movePainting()
 
 
 func movePainting():
@@ -91,6 +86,11 @@ func _looked_at(body, painting):
                         body.rotate_y(3 * PI / 2)
                         body.velocity = body.velocity.rotated(Vector3(0, 1, 0), 3 * PI / 2)
 
+                var apclient = global.get_node("Archipelago")
+                if !apclient._pilgrimage_allows_paintings:
+                        global.sunwarp = 1
+                        body.get_node("pivot/camera/sunwarp_background").visible = false
+
 
 func _dir_to_int(dir):
         if dir == "north":