Merge branch 'main' into panels

1 files changed, 88 insertions, 65 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 = ""
@@ -15,55 +16,24 @@ var ap_pass = ""
 var confusify_world = false
 var enable_multiplayer = false
 var track_player = false
+var connection_history = []
 
-const my_version = "2.1.1"
-const ap_version = {"major": 0, "minor": 4, "build": 5, "class": "Version"}
+const my_version = "3.0.1"
+const ap_version = {"major": 0, "minor": 4, "build": 6, "class": "Version"}
 const color_items = [
         "White", "Black", "Red", "Blue", "Green", "Brown", "Gray", "Orange", "Purple", "Yellow"
 ]
 const door_progressive_items = {
         "Progressive Orange Tower":
-        [
-                {"item": "Orange Tower - Second Floor", "display": "Second Floor"},
-                {"item": "Orange Tower - Third Floor", "display": "Third Floor"},
-                {"item": "Orange Tower - Fourth Floor", "display": "Fourth Floor"},
-                {"item": "Orange Tower - Fifth Floor", "display": "Fifth Floor"},
-                {"item": "Orange Tower - Sixth Floor", "display": "Sixth Floor"},
-                {"item": "Orange Tower - Seventh Floor", "display": "Seventh Floor"},
-        ],
+        ["Second Floor", "Third Floor", "Fourth Floor", "Fifth Floor", "Sixth Floor", "Seventh Floor"],
         "Progressive Art Gallery":
-        [
-                {"item": "Art Gallery - Second Floor", "display": "Second Floor"},
-                {"item": "Art Gallery - Third Floor", "display": "Third Floor"},
-                {"item": "Art Gallery - Fourth Floor", "display": "Fourth Floor"},
-                {"item": "Art Gallery - Fifth Floor", "display": "Fifth Floor"},
-                {"item": "Art Gallery - Exit", "display": "Exit"},
-        ],
-        "Progressive Hallway Room":
-        [
-                {"item": "Outside The Agreeable - Hallway Door", "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"},
-        ],
-        "Progressive Fearless":
-        [
-                {"item": "The Fearless (First Floor) - Second Floor", "display": "Second Floor"},
-                {"item": "The Fearless (Second Floor) - Third Floor", "display": "Third Floor"},
-        ],
+        ["Second Floor", "Third Floor", "Fourth Floor", "Fifth Floor", "Exit"],
+        "Progressive Hallway Room": ["First Door", "Second Door", "Third Door", "Fourth Door"],
+        "Progressive Fearless": ["Second Floor", "Third Floor"],
         "Progressive Colorful":
-        [
-                {"item": "The Colorful - White Door", "display": "White"},
-                {"item": "The Colorful - Black Door", "display": "Black"},
-                {"item": "The Colorful - Red Door", "display": "Red"},
-                {"item": "The Colorful - Yellow Door", "display": "Yellow"},
-                {"item": "The Colorful - Blue Door", "display": "Blue"},
-                {"item": "The Colorful - Purple Door", "display": "Purple"},
-                {"item": "The Colorful - Orange Door", "display": "Orange"},
-                {"item": "The Colorful - Green Door", "display": "Green"},
-                {"item": "The Colorful - Brown Door", "display": "Brown"},
-                {"item": "The Colorful - Gray Door", "display": "Gray"},
-        ]
+        ["White", "Black", "Red", "Yellow", "Blue", "Purple", "Orange", "Green", "Brown", "Gray"],
+        "Progressive Pilgrimage":
+        ["1 Sunwarp", "2 Sunwarp", "3 Sunwarp", "4 Sunwarp", "5 Sunwarp", "6 Sunwarp"]
 }
 const panel_progressive_items = {
         "Progressive Hallway Room":
@@ -103,6 +73,7 @@ const panel_progressive_items = {
 const kTHE_END = 0
 const kTHE_MASTER = 1
 const kLEVEL_2 = 2
+const kPILGRIMAGE = 3
 
 const kNO_PANEL_SHUFFLE = 0
 const kREARRANGE_PANELS = 1
@@ -115,6 +86,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
@@ -148,10 +125,17 @@ var _panel_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_compatibility = false  # set to true for pre-0.4.6
+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
@@ -197,6 +181,8 @@ func _init():
                         enable_multiplayer = data[5]
                 if data.size() > 6:
                         track_player = data[6]
+                if data.size() > 7:
+                        connection_history = data[7]
 
                 processDatapackages()
 
@@ -325,6 +311,10 @@ 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"]
+                        else:
+                                _sunwarp_access = kSUNWARP_ACCESS_NORMAL
                         if _slot_data.has("seed"):
                                 _slot_seed = _slot_data["seed"]
                         if _slot_data.has("painting_entrance_to_exit"):
@@ -342,6 +332,25 @@ 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"]
+                        else:
+                                _pilgrimage_compatibility = true
+                                _pilgrimage_enabled = true
+                        if _slot_data.has("pilgrimage_allows_roof_access"):
+                                _pilgrimage_allows_roof_access = _slot_data["pilgrimage_allows_roof_access"]
+                        else:
+                                _pilgrimage_allows_roof_access = true
+                        if _slot_data.has("pilgrimage_allows_paintings"):
+                                _pilgrimage_allows_paintings = _slot_data["pilgrimage_allows_paintings"]
+                        else:
+                                _pilgrimage_allows_paintings = true
+                        if _slot_data.has("shuffle_sunwarps"):
+                                _sunwarp_shuffle = _slot_data["shuffle_sunwarps"]
+                        else:
+                                _sunwarp_shuffle = false
+                        if _slot_data.has("sunwarp_permutation"):
+                                _sunwarp_mapping = _slot_data["sunwarp_permutation"]
 
                         if track_player:
                                 setValue("PlayerPos", {"x": 0, "z": 0})
@@ -527,7 +536,8 @@ func saveSettings():
                 _datapackages,
                 confusify_world,
                 enable_multiplayer,
-                track_player
+                track_player,
+                connection_history
         ]
         file.store_var(data, true)
         file.close()
@@ -730,26 +740,35 @@ 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 _door_shuffle and item_name in door_progressive_items.keys():
-                if not item_name in _progressive_progress:
-                        _progressive_progress[item_name] = 0
-
-                if _progressive_progress[item_name] < door_progressive_items[item_name].size():
-                        var subitem_name = door_progressive_items[item_name][_progressive_progress[item_name]]["item"]
-                        global._print(subitem_name)
-                        processItem(_item_name_to_id[subitem_name], null, null, null)
-                        _progressive_progress[item_name] += 1
-
-        if _panel_door_shuffle and item_name in panel_progressive_items.keys():
-                if not item_name in _progressive_progress:
-                        _progressive_progress[item_name] = 0
-
-                if _progressive_progress[item_name] < panel_progressive_items[item_name].size():
-                        var subitem_name = panel_progressive_items[item_name][_progressive_progress[item_name]]["item"]
-                        global._print(subitem_name)
-                        processItem(_item_name_to_id[subitem_name], null, null, null)
-                        _progressive_progress[item_name] += 1
+        var is_progressive_door = int(item) in gamedata.door_items_by_progressive_id
+        var is_progressive_panel = int(item) in gamedata.panel_items_by_progressive_id
+        var progitems = null
+
+        if is_progressive_door and is_progressive_panel:
+                if _door_shuffle:
+                        progitems = gamedata.door_items_by_progressive_id[int(item)]
+                else:
+                        progitems = gamedata.panel_items_by_progressive_id[int(item)]
+        elif is_progressive_door:
+                progitems = gamedata.door_items_by_progressive_id[int(item)]
+        elif is_progressive_panel:
+                progitems = gamedata.panel_items_by_progressive_id[int(item)]
+
+        if progitems != null:
+                if not int(item) in _progressive_progress:
+                        _progressive_progress[int(item)] = 0
+
+                if _progressive_progress[int(item)] < progitems.size():
+                        var subitem_id = progitems[_progressive_progress[int(item)]]
+                        global._print("Subitem: %d" % subitem_id)
+                        processItem(subitem_id, null, null, null)
+                        _progressive_progress[int(item)] += 1
 
         if _color_shuffle and color_items.has(_item_id_to_name[item]):
                 var lcol = _item_id_to_name[item].to_lower()
@@ -763,11 +782,11 @@ func processItem(item, index, from, flags):
                 saveLocaldata()
 
                 if _door_shuffle and item_name in door_progressive_items:
-                        var subitem = door_progressive_items[item_name][_progressive_progress[item_name] - 1]
+                        var subitem = door_progressive_items[item_name][_progressive_progress[int(item)] - 1]
                         item_name += " (%s)" % subitem["display"]
 
                 if _panel_door_shuffle and item_name in panel_progressive_items:
-                        var subitem = panel_progressive_items[item_name][_progressive_progress[item_name] - 1]
+                        var subitem = panel_progressive_items[item_name][_progressive_progress[int(item)] - 1]
                         item_name += " (%s)" % subitem["display"]
 
                 var player_name = "Unknown"
@@ -804,6 +823,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")
 
@@ -849,5 +872,5 @@ func compareVersion(lhs, rhs):
                 return lhs["major"] < rhs["major"]
 
 
-func wasGeneratedBeforeVersion(rhs):
-        return compareVersion(_gen_version, rhs)
+func wasGeneratedBeforeVersion(major, minor, build):
+        return compareVersion(_gen_version, {"major": major, "minor": minor, "build": build})