1 files changed, 48 insertions, 1 deletions

@@ -29,6 +29,8 @@ var _inverse_item_locks = {}
 var _held_letters = {}
 var _letters_setup = false
 var _already_connected = false
+var _ignored_locations = []
+var _map_scripts = {}
 
 const kSHUFFLE_LETTERS_VANILLA = 0
 const kSHUFFLE_LETTERS_UNLOCKED = 1
@@ -65,7 +67,9 @@ var cyan_door_behavior = kCYAN_DOOR_BEHAVIOR_H2
 var daedalus_roof_access = false
 var enable_gift_maps = []
 var enable_icarus = false
+var endings_requirement = 0
 var keyholder_sanity = false
+var masteries_requirement = 0
 var port_pairings = {}
 var shuffle_control_center_colors = false
 var shuffle_doors = false
@@ -142,6 +146,8 @@ func _ready():
         client.hint_received.connect(_process_hint_received)
         client.accessible_locations_updated.connect(_on_accessible_locations_updated)
         client.checked_locations_updated.connect(_on_checked_locations_updated)
+        client.ignored_locations_updated.connect(_on_ignored_locations_updated)
+        client.hinted_locations_updated.connect(_on_hinted_locations_updated)
         client.checked_worldports_updated.connect(_on_checked_worldports_updated)
         client.door_latched.connect(_on_door_latched)
 
@@ -259,6 +265,9 @@ func _process_item(item, amount):
         if item_id == gamedata.objects.get_special_ids()["A Job Well Done"]:
                 update_job_well_done_sign()
 
+        if item_id == gamedata.objects.get_special_ids()["Numbers"] and global.map == "the_fuzzy":
+                global.allow_numbers = true
+
         # Show a message about the item if it's new.
         if int(item["index"]) > _last_new_item:
                 _last_new_item = int(item["index"])
@@ -379,6 +388,20 @@ func _on_checked_worldports_updated():
                 textclient_node.update_worldports()
 
 
+func _on_ignored_locations_updated(locations):
+        _ignored_locations = locations
+
+        var textclient_node = global.get_node("Textclient")
+        if textclient_node != null:
+                textclient_node.update_locations()
+
+
+func _on_hinted_locations_updated():
+        var textclient_node = global.get_node("Textclient")
+        if textclient_node != null:
+                textclient_node.update_locations()
+
+
 func _on_door_latched(door_id):
         var gamedata = global.get_node("Gamedata")
         if gamedata.get_door_map_name(door_id) != global.map:
@@ -443,7 +466,9 @@ func _client_connected(slot_data):
         daedalus_roof_access = bool(slot_data.get("daedalus_roof_access", false))
         enable_gift_maps = slot_data.get("enable_gift_maps", [])
         enable_icarus = bool(slot_data.get("enable_icarus", false))
+        endings_requirement = int(slot_data.get("endings_requirement", 0))
         keyholder_sanity = bool(slot_data.get("keyholder_sanity", false))
+        masteries_requirement = int(slot_data.get("masteries_requirement", 0))
         shuffle_control_center_colors = bool(slot_data.get("shuffle_control_center_colors", false))
         shuffle_doors = bool(slot_data.get("shuffle_doors", false))
         shuffle_gallery_paintings = bool(slot_data.get("shuffle_gallery_paintings", false))
@@ -465,7 +490,9 @@ func _client_connected(slot_data):
                 var raw_pp = slot_data.get("port_pairings")
 
                 for p1 in raw_pp.keys():
-                        port_pairings[int(p1)] = int(raw_pp[p1])
+                        port_pairings[gamedata.port_id_by_ap_id[int(p1)]] = gamedata.port_id_by_ap_id[int(
+                                raw_pp[p1]
+                        )]
 
         # Set up item locks.
         _item_locks = {}
@@ -668,3 +695,23 @@ func update_job_well_done_sign():
 
                 sign2.get_node("MeshInstance3D").mesh.text = sign2.text
                 sign3.get_node("MeshInstance3D").mesh.text = sign3.text
+
+
+func toggle_ignored_location(loc_id):
+        if loc_id in _ignored_locations:
+                client.removeIgnoredLocation(loc_id)
+        else:
+                client.addIgnoredLocation(loc_id)
+
+
+func get_map_script(map_name):
+        if !_map_scripts.has(map_name):
+                var runtime = global.get_node("Runtime")
+                var script_path = "maps/%s.gd" % map_name
+                if runtime.path_exists(script_path):
+                        var script = runtime.load_script(script_path)
+                        _map_scripts[map_name] = script.new()
+                else:
+                        _map_scripts[map_name] = null
+
+        return _map_scripts[map_name]