2 files changed, 39 insertions, 8 deletions

@@ -177,3 +177,18 @@ var panels_mode_051_door_fixes = {
                 "Door_nine_hider_2"
         ]
 }
+
+var pilgrimage_061_painting_fixes = [
+        "outside2",
+        "outside_2",
+        "outside_3",
+        "outside_4",
+        "north2",
+        "south2",
+        "west2",
+        "east_enter",
+        "owl_painting_4",
+        "garden_painting",
+        "yinyang_painting",
+        "fruitbowl_painting2"
+]
@@ -1,10 +1,26 @@
 extends "res://scripts/painting.gd"
 
-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
+var breaks_pilgrimage = false
+
+
+func _ready():
+        var apclient = global.get_node("Archipelago")
+        if !apclient._pilgrimage_allows_paintings:
+                if apclient.wasGeneratedBeforeVersion(0, 6, 2):
+                        var extradata = apclient.get_node("Extradata")
+                        if not extradata.pilgrimage_061_painting_fixes.has(get_name()):
+                                breaks_pilgrimage = true
+                else:
+                        breaks_pilgrimage = true
+
+
+func _looked_at(body, painting):
+        ._looked_at(body, painting)
+
+        if (
+                breaks_pilgrimage
+                and body.is_in_group("player")
+                and (painting.get_name() == self.get_name())
+        ):
+                global.sunwarp = 1
+                body.get_node("pivot/camera/sunwarp_background").visible = false