4 files changed, 43 insertions, 11 deletions

@@ -19,7 +19,7 @@ var enable_multiplayer = false
 var track_player = false
 var connection_history = []
 
-const my_version = "5.3.1"
+const my_version = "5.4.0"
 const ap_version = {"major": 0, "minor": 5, "build": 1, "class": "Version"}
 const color_items = [
         "White", "Black", "Red", "Blue", "Green", "Brown", "Gray", "Orange", "Purple", "Yellow"
@@ -908,8 +908,8 @@ func processItem(item, index, from, flags):
                         item_name += " (%s)" % prognames[item_name][_progressive_progress[int(item)]]
                         _progressive_progress[int(item)] += 1
 
-        if _color_shuffle and color_items.has(_item_id_to_name["Lingo"][item]):
-                var lcol = _item_id_to_name["Lingo"][item].to_lower()
+        if _color_shuffle and color_items.has(_item_id_to_name["Lingo"][float(item)]):
+                var lcol = _item_id_to_name["Lingo"][float(item)].to_lower()
                 if not _has_colors.has(lcol):
                         _has_colors.append(lcol)
                         emit_signal("evaluate_solvability")
@@ -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"
+]
@@ -120,6 +120,7 @@ func _load():
         new_master_cdp.translation = old_master_cdp.translation
         new_master_cdp.rotation = old_master_cdp.rotation
         get_node("CountdownPanels").add_child(new_master_cdp)
+        old_master_cdp.total = 5000
         old_master_cdp.queue_free()
 
         # Configure AN OTHER WAY.
@@ -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