1 files changed, 45 insertions, 1 deletions

@@ -7,6 +7,7 @@ var SCRIPT_multiplayer
 var SCRIPT_mypainting
 var SCRIPT_notifier
 var SCRIPT_panel
+var SCRIPT_pilgrimage_terminator
 var SCRIPT_uuid
 
 var ap_server = ""
@@ -40,7 +41,7 @@ const progressive_items = {
         ],
         "Progressive Hallway Room":
         [
-                {"item": "Outside The Agreeable - Hallway Door", "display": "First Door"},
+                {"item": "Hallway Room (1) - Exit", "display": "First Door"},
                 {"item": "Hallway Room (2) - Exit", "display": "Second Door"},
                 {"item": "Hallway Room (3) - Exit", "display": "Third Door"},
                 {"item": "Hallway Room (4) - Exit", "display": "Fourth Door"},
@@ -62,12 +63,22 @@ const progressive_items = {
                 {"item": "The Colorful - Green Door", "display": "Green"},
                 {"item": "The Colorful - Brown Door", "display": "Brown"},
                 {"item": "The Colorful - Gray Door", "display": "Gray"},
+        ],
+        "Progressive Pilgrimage":
+        [
+                {"item": "1 Sunwarp", "display": "1 Sunwarp"},
+                {"item": "2 Sunwarp", "display": "2 Sunwarp"},
+                {"item": "3 Sunwarp", "display": "3 Sunwarp"},
+                {"item": "4 Sunwarp", "display": "4 Sunwarp"},
+                {"item": "5 Sunwarp", "display": "5 Sunwarp"},
+                {"item": "6 Sunwarp", "display": "6 Sunwarp"},
         ]
 }
 
 const kTHE_END = 0
 const kTHE_MASTER = 1
 const kLEVEL_2 = 2
+const kPILGRIMAGE = 3
 
 const kNO_PANEL_SHUFFLE = 0
 const kREARRANGE_PANELS = 1
@@ -80,6 +91,12 @@ const kCLASSIFICATION_REMOTE_NORMAL = 0
 const kCLASSIFICATION_REMOTE_REDUCED = 1
 const kCLASSIFICATION_REMOTE_INSANITY = 2
 
+const kSUNWARP_ACCESS_NORMAL = 0
+const kSUNWARP_ACCESS_DISABLED = 1
+const kSUNWARP_ACCESS_UNLOCK = 2
+const kSUNWARP_ACCESS_INDIVIDUAL = 3
+const kSUNWARP_ACCESS_PROGRESSIVE = 4
+
 var _client = WebSocketClient.new()
 var _should_process = false
 var _initiated_disconnect = false
@@ -111,10 +128,16 @@ var _door_shuffle = false
 var _color_shuffle = false
 var _panel_shuffle = 0  # none, rearrange
 var _painting_shuffle = false
+var _sunwarp_access = 0  # normal, disabled, unlock, progressive
 var _mastery_achievements = 21
 var _level_2_requirement = 223
 var _location_classification_bit = 0
 var _early_color_hallways = false
+var _pilgrimage_enabled = false
+var _pilgrimage_allows_roof_access = false
+var _pilgrimage_allows_paintings = false
+var _sunwarp_shuffle = false
+var _sunwarp_mapping = []
 var _slot_seed = 0
 
 var _map_loaded = false
@@ -276,6 +299,8 @@ func _on_data():
                                 _painting_shuffle = _slot_data["shuffle_paintings"]
                         if _slot_data.has("shuffle_panels"):
                                 _panel_shuffle = _slot_data["shuffle_panels"]
+                        if _slot_data.has("sunwarp_access"):
+                                _sunwarp_access = _slot_data["sunwarp_access"]
                         if _slot_data.has("seed"):
                                 _slot_seed = _slot_data["seed"]
                         if _slot_data.has("painting_entrance_to_exit"):
@@ -293,6 +318,16 @@ 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"]
+                        if _slot_data.has("pilgrimage_allows_roof_access"):
+                                _pilgrimage_allows_roof_access = _slot_data["pilgrimage_allows_roof_access"]
+                        if _slot_data.has("pilgrimage_allows_paintings"):
+                                _pilgrimage_allows_paintings = _slot_data["pilgrimage_allows_paintings"]
+                        if _slot_data.has("shuffle_sunwarps"):
+                                _sunwarp_shuffle = _slot_data["shuffle_sunwarps"]
+                        if _slot_data.has("sunwarp_permutation"):
+                                _sunwarp_mapping = _slot_data["sunwarp_permutation"]
 
                         _puzzle_skips = 0
 
@@ -633,6 +668,11 @@ func processItem(item, index, from, flags):
                                 if painting_node != null:
                                         painting_node.get_node("Script").movePainting()
 
+        if gamedata.warp_ids_by_item_id.has(int(item)):
+                var warpsNode = get_tree().get_root().get_node("Spatial/Warps")
+                for warp_id in gamedata.warp_ids_by_item_id[int(item)]:
+                        warpsNode.get_node(warp_id).unlock_warp()
+
         # Handle progressive items.
         if item_name in progressive_items.keys():
                 if not item_name in _progressive_progress:
@@ -693,6 +733,10 @@ func paintingIsVanilla(painting):
         return !$Gamedata.mentioned_paintings.has(painting)
 
 
+func warpIsVanilla(warp):
+        return !$Gamedata.mentioned_warps.has(warp)
+
+
 func evaluateSolvability():
         emit_signal("evaluate_solvability")