5 files changed, 210 insertions, 3 deletions

@@ -0,0 +1,10 @@
+extends "res://scripts/nodes/allowNumbers.gd"
+
+
+func _readier():
+        var ap = global.get_node("Archipelago")
+        var gamedata = global.get_node("Gamedata")
+
+        var item_id = gamedata.objects.get_special_ids()["Numbers"]
+        if ap.client.getItemAmount(item_id) >= 1:
+                global.allow_numbers = true
@@ -221,7 +221,11 @@ func _get_generated_door_location_name(door):
         if door.get_type() != SCRIPT_proto.DoorType.STANDARD:
                 return null
 
-        if door.get_keyholders().size() > 0 or door.get_endings().size() > 0 or door.has_complete_at():
+        if (
+                door.get_keyholders().size() > 0
+                or (door.has_white_ending() and door.get_white_ending())
+                or door.has_complete_at()
+        ):
                 return null
 
         if door.get_panels().size() > 4:
@@ -36,6 +36,7 @@ func _ready():
                 global.add_child(ap_instance)
 
                 # Let's also inject any scripts we need to inject now.
+                installScriptExtension(runtime.load_script("allowNumbers.gd"))
                 installScriptExtension(runtime.load_script("animationListener.gd"))
                 installScriptExtension(runtime.load_script("collectable.gd"))
                 installScriptExtension(runtime.load_script("door.gd"))
@@ -83,6 +84,13 @@ func _ready():
                 compass_overlay_instance.SCRIPT_compass = runtime.load_script("compass.gd")
                 global.add_child(compass_overlay_instance)
 
+                unlocks.data["advanced_mastery"] = ""
+                unlocks.data["charismatic_mastery"] = ""
+                unlocks.data["crystalline_mastery"] = ""
+                unlocks.data["fuzzy_mastery"] = ""
+                unlocks.data["icarus_mastery"] = ""
+                unlocks.data["stellar_mastery"] = ""
+
         var ap = global.get_node("Archipelago")
         var gamedata = global.get_node("Gamedata")
         ap.ap_connected.connect(connectionSuccessful)
@@ -224,11 +232,11 @@ func startGame():
 
         unlocks.resetCollectables()
         unlocks.resetData()
+        unlocks.loadCollectables()
+        unlocks.loadData()
 
         ap.setup_keys()
 
-        unlocks.loadCollectables()
-        unlocks.loadData()
         unlocks.unlockKey("capslock", 1)
 
         if ap.shuffle_worldports:
@@ -237,6 +245,7 @@ func startGame():
                 settings.worldport_fades = "never"
 
         clearResourceCache("res://objects/meshes/gridDoor.tscn")
+        clearResourceCache("res://objects/nodes/allowNumbers.tscn")
         clearResourceCache("res://objects/nodes/collectable.tscn")
         clearResourceCache("res://objects/nodes/door.tscn")
         clearResourceCache("res://objects/nodes/keyHolder.tscn")
@@ -65,7 +65,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
@@ -259,6 +261,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"])
@@ -443,7 +448,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))
@@ -19,6 +19,85 @@ func _ready():
 
         ap.start_batching_locations()
 
+        if global.map == "control_center":
+                get_node("/root/scene/Components/Doors/entry_18").queue_free()
+
+                _set_up_mastery_listener("advanced")
+                _set_up_mastery_listener("charismatic")
+                _set_up_mastery_listener("crystalline")
+                _set_up_mastery_listener("fuzzy")
+                _set_up_mastery_listener("icarus")
+                _set_up_mastery_listener("stellar")
+
+                if ap.endings_requirement != 12 or ap.masteries_requirement != 0:
+                        # Set up listeners for the potential White Ending requirements.
+                        var merging_prefab = preload("res://objects/nodes/listeners/mergingListener.tscn")
+
+                        var old_door = get_node("/root/scene/Components/Doors/entry_19")
+                        var new_door = old_door.duplicate()
+                        new_door.name = "entry_19_new"
+                        new_door.senders.clear()
+                        new_door.senderGroup.clear()
+                        new_door.excludeSenders.clear()
+
+                        if ap.endings_requirement == 12:
+                                new_door.senderGroup.append(NodePath("/root/scene/Meshes/Trophies/Listeners"))
+                        elif ap.endings_requirement > 0:
+                                if ap.masteries_requirement == 0:
+                                        new_door.senderGroup.append(NodePath("/root/scene/Meshes/Trophies/Listeners"))
+                                        new_door.complete_at = ap.endings_requirement
+                                else:
+                                        var endings_merge = merging_prefab.instantiate()
+                                        endings_merge.name = "EndingsMerge"
+                                        endings_merge.senderGroup.append(
+                                                NodePath("/root/scene/Meshes/Trophies/Listeners")
+                                        )
+                                        endings_merge.complete_at = ap.endings_requirement
+                                        get_node("/root/scene/Components").add_child.call_deferred(endings_merge)
+                                        new_door.senders.append(NodePath("/root/scene/Components/EndingsMerge"))
+
+                        var max_masteries = 13 + ap.enable_gift_maps.size()
+                        if ap.enable_icarus:
+                                max_masteries += 1
+
+                        if ap.masteries_requirement == max_masteries:
+                                new_door.senderGroup.append(
+                                        NodePath("/root/scene/Meshes/Trophies/MasteryListeners")
+                                )
+                                new_door.excludeSenders.append(
+                                        NodePath(
+                                                "/root/scene/Meshes/Trophies/MasteryListeners/unlockReaderListenerWhite"
+                                        )
+                                )
+                        elif ap.masteries_requirement > 0:
+                                if ap.endings_requirement == 0:
+                                        new_door.senderGroup.append(
+                                                NodePath("/root/scene/Meshes/Trophies/MasteryListeners")
+                                        )
+                                        new_door.excludeSenders.append(
+                                                NodePath(
+                                                        "/root/scene/Meshes/Trophies/MasteryListeners/unlockReaderListenerWhite"
+                                                )
+                                        )
+                                        new_door.complete_at = ap.masteries_requirement
+                                else:
+                                        var masteries_merge = merging_prefab.instantiate()
+                                        masteries_merge.name = "MasteriesMerge"
+                                        masteries_merge.senderGroup.append(
+                                                NodePath("/root/scene/Meshes/Trophies/MasteryListeners")
+                                        )
+                                        masteries_merge.excludeSenders.append(
+                                                NodePath(
+                                                        "/root/scene/Meshes/Trophies/MasteryListeners/unlockReaderListenerWhite"
+                                                )
+                                        )
+                                        masteries_merge.complete_at = ap.masteries_requirement
+                                        get_node("/root/scene/Components").add_child.call_deferred(masteries_merge)
+                                        new_door.senders.append(NodePath("/root/scene/Components/MasteriesMerge"))
+
+                        old_door.queue_free()
+                        get_node("/root/scene/Components/Doors").add_child.call_deferred(new_door)
+
         # Block off roof access in Daedalus.
         if global.map == "daedalus" and not ap.daedalus_roof_access:
                 _set_up_invis_wall(75.5, 11, -24.5, 1, 10, 49)
@@ -141,6 +220,29 @@ func _ready():
                                 q_wpl.senders.append(NodePath("../QPanel"))
                                 giftmap_parent.add_child.call_deferred(q_wpl)
 
+                        if ap.enable_gift_maps.has("The Fuzzy"):
+                                var gongus_panel = panel_prefab.instantiate()
+                                gongus_panel.name = "GongusPanel"
+                                gongus_panel.answer = "gongus"
+                                gongus_panel.position = Vector3(33.5, -260, 5.5)
+                                giftmap_panel.proxies.append(NodePath("../GongusPanel"))
+                                giftmap_parent.add_child.call_deferred(gongus_panel)
+
+                                var kiwi_panel = panel_prefab.instantiate()
+                                kiwi_panel.name = "KiwiPanel"
+                                kiwi_panel.answer = "kiwi"
+                                kiwi_panel.position = Vector3(33.5, -270, 5.5)
+                                giftmap_panel.proxies.append(NodePath("../KiwiPanel"))
+                                giftmap_parent.add_child.call_deferred(kiwi_panel)
+
+                                var fuzzy_wpl = wpl_prefab.instantiate()
+                                fuzzy_wpl.name = "FuzzyWpl"
+                                fuzzy_wpl.exit = "the_fuzzy"
+                                fuzzy_wpl.senders.append(NodePath("../GongusPanel"))
+                                fuzzy_wpl.senders.append(NodePath("../KiwiPanel"))
+                                fuzzy_wpl.complete_at = 1
+                                giftmap_parent.add_child.call_deferred(fuzzy_wpl)
+
                         if ap.enable_gift_maps.has("The Stellar"):
                                 var hatkirby_panel = panel_prefab.instantiate()
                                 hatkirby_panel.name = "HatkirbyPanel"
@@ -297,6 +399,7 @@ func _ready():
                 var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
                 var saver_prefab = preload("res://objects/nodes/saver.tscn")
                 var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
+                var usl_prefab = preload("res://objects/nodes/listeners/unlockSetterListener.tscn")
 
                 var mastery = collectable_prefab.instantiate()
                 mastery.name = "collectable"
@@ -314,6 +417,13 @@ func _ready():
                 tpl.nested = true
                 mastery.add_child.call_deferred(tpl)
 
+                var usl = usl_prefab.instantiate()
+                usl.name = "unlockSetterListenerMastery"
+                usl.key = "icarus_mastery"
+                usl.value = "unlocked"
+                usl.senders.append(NodePath("/root/scene/Components/Collectables/collectable"))
+                get_node("/root/scene/Components").add_child.call_deferred(usl)
+
                 var saver = saver_prefab.instantiate()
                 saver.name = "saver_collectables"
                 saver.type = "collectables"
@@ -325,6 +435,7 @@ func _ready():
                 var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
                 var saver_prefab = preload("res://objects/nodes/saver.tscn")
                 var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
+                var usl_prefab = preload("res://objects/nodes/listeners/unlockSetterListener.tscn")
 
                 var mastery = collectable_prefab.instantiate()
                 mastery.name = "collectable"
@@ -343,6 +454,13 @@ func _ready():
                 tpl.senders.append(NodePath("/root/scene/Panels/Room_1/panel_31"))
                 mastery.add_child.call_deferred(tpl)
 
+                var usl = usl_prefab.instantiate()
+                usl.name = "unlockSetterListenerMastery"
+                usl.key = "advanced_mastery"
+                usl.value = "unlocked"
+                usl.senders.append(NodePath("/root/scene/Components/Collectables/collectable"))
+                get_node("/root/scene/Components").add_child.call_deferred(usl)
+
                 var saver = saver_prefab.instantiate()
                 saver.name = "saver_collectables"
                 saver.type = "collectables"
@@ -353,6 +471,7 @@ func _ready():
         if global.map == "the_charismatic":
                 var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
                 var saver_prefab = preload("res://objects/nodes/saver.tscn")
+                var usl_prefab = preload("res://objects/nodes/listeners/unlockSetterListener.tscn")
 
                 var mastery = collectable_prefab.instantiate()
                 mastery.name = "collectable"
@@ -362,6 +481,13 @@ func _ready():
                 mastery.material_override = load("res://assets/materials/gold.material")
                 get_node("/root/scene/Components/Collectables").add_child.call_deferred(mastery)
 
+                var usl = usl_prefab.instantiate()
+                usl.name = "unlockSetterListenerMastery"
+                usl.key = "charismatic_mastery"
+                usl.value = "unlocked"
+                usl.senders.append(NodePath("/root/scene/Components/Collectables/collectable"))
+                get_node("/root/scene/Components").add_child.call_deferred(usl)
+
                 var saver = saver_prefab.instantiate()
                 saver.name = "saver_collectables"
                 saver.type = "collectables"
@@ -373,6 +499,7 @@ func _ready():
                 var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
                 var saver_prefab = preload("res://objects/nodes/saver.tscn")
                 var tpl_prefab = preload("res://objects/nodes/listeners/teleportListener.tscn")
+                var usl_prefab = preload("res://objects/nodes/listeners/unlockSetterListener.tscn")
 
                 var mastery = collectable_prefab.instantiate()
                 mastery.name = "collectable"
@@ -389,6 +516,39 @@ func _ready():
                 tpl.senders.append(NodePath("/root/scene/Panels/Room_1/panel_3"))
                 mastery.add_child.call_deferred(tpl)
 
+                var usl = usl_prefab.instantiate()
+                usl.name = "unlockSetterListenerMastery"
+                usl.key = "crystalline_mastery"
+                usl.value = "unlocked"
+                usl.senders.append(NodePath("/root/scene/Components/Collectables/collectable"))
+                get_node("/root/scene/Components").add_child.call_deferred(usl)
+
+                var saver = saver_prefab.instantiate()
+                saver.name = "saver_collectables"
+                saver.type = "collectables"
+                saver.senderGroup.append(NodePath("/root/scene/Components/Collectables"))
+                get_node("/root/scene").add_child.call_deferred(saver)
+
+        # Add the mastery to The Fuzzy.
+        if global.map == "the_fuzzy":
+                var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
+                var saver_prefab = preload("res://objects/nodes/saver.tscn")
+                var usl_prefab = preload("res://objects/nodes/listeners/unlockSetterListener.tscn")
+
+                var mastery = collectable_prefab.instantiate()
+                mastery.name = "collectable"
+                mastery.position = Vector3(0, 2, -20)
+                mastery.unlock_type = "smiley"
+                mastery.material_override = load("res://assets/materials/gold.material")
+                get_node("/root/scene/Components/Collectables").add_child.call_deferred(mastery)
+
+                var usl = usl_prefab.instantiate()
+                usl.name = "unlockSetterListenerMastery"
+                usl.key = "fuzzy_mastery"
+                usl.value = "unlocked"
+                usl.senders.append(NodePath("/root/scene/Components/Collectables/collectable"))
+                get_node("/root/scene/Components").add_child.call_deferred(usl)
+
                 var saver = saver_prefab.instantiate()
                 saver.name = "saver_collectables"
                 saver.type = "collectables"
@@ -399,6 +559,7 @@ func _ready():
         if global.map == "the_stellar":
                 var collectable_prefab = preload("res://objects/nodes/collectable.tscn")
                 var saver_prefab = preload("res://objects/nodes/saver.tscn")
+                var usl_prefab = preload("res://objects/nodes/listeners/unlockSetterListener.tscn")
 
                 var collectables = Node.new()
                 collectables.name = "Collectables"
@@ -412,6 +573,13 @@ func _ready():
                 collectables.add_child.call_deferred(mastery)
                 get_node("/root/scene/Components").add_child.call_deferred(collectables)
 
+                var usl = usl_prefab.instantiate()
+                usl.name = "unlockSetterListenerMastery"
+                usl.key = "stellar_mastery"
+                usl.value = "unlocked"
+                usl.senders.append(NodePath("/root/scene/Components/Collectables/collectable"))
+                get_node("/root/scene/Components").add_child.call_deferred(usl)
+
                 var saver = saver_prefab.instantiate()
                 saver.name = "saver_collectables"
                 saver.type = "collectables"
@@ -585,5 +753,14 @@ func _set_up_invis_wall(x, y, z, sx, sy, sz):
         get_parent().add_child.call_deferred(newwall)
 
 
+func _set_up_mastery_listener(name):
+        var prefab = preload("res://objects/nodes/listeners/unlockReaderListener.tscn")
+        var url = prefab.instantiate()
+        url.name = "unlockReaderListenerMastery_%s" % name
+        url.key = "%s_mastery" % name
+        url.value = "unlocked"
+        get_node("/root/scene/Meshes/Trophies/MasteryListeners").add_child.call_deferred(url)
+
+
 func _process(_dt):
         compass.update_rotation(global_rotation.y)