27 files changed, 527 insertions, 52 deletions

@@ -132,7 +132,9 @@ class Lingo2World(World):
             "daedalus_roof_access",
             "enable_gift_maps",
             "enable_icarus",
+            "endings_requirement",
             "keyholder_sanity",
+            "masteries_requirement",
             "shuffle_control_center_colors",
             "shuffle_doors",
             "shuffle_gallery_paintings",
@@ -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)
@@ -181,6 +181,26 @@ class VictoryCondition(Choice):
     option_white_ending = 12
 
 
+class EndingsRequirement(Range):
+    """The number of endings required to unlock White Ending."""
+    display_name = "Endings Requirement"
+    range_start = 0
+    range_end = 12
+    default = 12
+
+
+class MasteriesRequirement(Range):
+    """The number of masteries required to unlock White Ending.
+
+    There are only 13 masteries in the base game, but some of the other slot options may add more masteries to the
+    world. If the chosen number of masteries is higher than the total in your world, it will be automatically lowered to
+    the maximum."""
+    display_name = "Masteries Requirement"
+    range_start = 0
+    range_end = 18
+    default = 0
+
+
 class TrapPercentage(Range):
     """Replaces junk items with traps, at the specified rate."""
     display_name = "Trap Percentage"
@@ -205,4 +225,6 @@ class Lingo2Options(PerGameCommonOptions):
     strict_purple_ending: StrictPurpleEnding
     strict_cyan_ending: StrictCyanEnding
     victory_condition: VictoryCondition
+    endings_requirement: EndingsRequirement
+    masteries_requirement: MasteriesRequirement
     trap_percentage: TrapPercentage
@@ -241,6 +241,8 @@ class Lingo2PlayerLogic:
                     return "The Charismatic" in world.options.enable_gift_maps.value
                 elif game_map.name == "the_crystalline":
                     return "The Crystalline" in world.options.enable_gift_maps.value
+                elif game_map.name == "the_fuzzy":
+                    return "The Fuzzy" in world.options.enable_gift_maps.value
                 elif game_map.name == "the_stellar":
                     return "The Stellar" in world.options.enable_gift_maps.value
 
@@ -249,6 +251,16 @@ class Lingo2PlayerLogic:
         self.shuffled_maps = set(game_map.id for game_map in world.static_logic.objects.maps
                                  if should_shuffle_map(game_map))
 
+        maximum_masteries = 13 + len(world.options.enable_gift_maps.value)
+        if world.options.enable_icarus:
+            maximum_masteries += 1
+
+        if world.options.masteries_requirement > maximum_masteries:
+            world.options.masteries_requirement.value = maximum_masteries
+
+        if "The Fuzzy" in world.options.enable_gift_maps.value:
+            self.real_items.append("Numbers")
+
         if self.world.options.shuffle_doors:
             for progressive in world.static_logic.objects.progressives:
                 for i in range(0, len(progressive.doors)):
@@ -362,18 +374,23 @@ class Lingo2PlayerLogic:
             self.locations_by_room.setdefault(mastery.room_id, []).append(PlayerLocation(mastery.ap_id,
                                                                                          AccessRequirements()))
 
+            if world.options.masteries_requirement > 0:
+                event_name = f"{world.static_logic.get_room_object_map_name(mastery)} - Mastery (Collected)"
+                self.event_loc_item_by_room.setdefault(mastery.room_id, {})[event_name] = "Mastery"
+
         for ending in world.static_logic.objects.endings:
             if world.static_logic.get_room_object_map_id(ending) not in self.shuffled_maps:
                 continue
 
-            # Don't create a location for your selected ending, and never create a location for White Ending.
+            # Don't create a location for your selected ending. Also don't create a location for White Ending if it's
+            # necessarily in the postgame, i.e. it requires all 12 other endings.
             if world.options.victory_condition.current_key.removesuffix("_ending").upper() != ending.name\
-                    and ending.name != "WHITE":
+                    and (ending.name != "WHITE" or world.options.endings_requirement < 12):
                 self.locations_by_room.setdefault(ending.room_id, []).append(PlayerLocation(ending.ap_id,
                                                                                             AccessRequirements()))
 
             event_name = f"{ending.name.capitalize()} Ending (Achieved)"
-            item_name = event_name
+            item_name = "Ending"
 
             if world.options.victory_condition.current_key.removesuffix("_ending").upper() == ending.name:
                 item_name = "Victory"
@@ -520,13 +537,12 @@ class Lingo2PlayerLogic:
         for room in door.rooms:
             reqs.rooms.add(self.world.static_logic.get_room_region_name(room))
 
-        for ending_id in door.endings:
-            ending = self.world.static_logic.objects.endings[ending_id]
+        if door.white_ending:
+            if self.world.options.endings_requirement > 0:
+                reqs.progressives["Ending"] = self.world.options.endings_requirement.value
 
-            if self.world.options.victory_condition.current_key.removesuffix("_ending").upper() == ending.name:
-                reqs.items.add("Victory")
-            else:
-                reqs.items.add(f"{ending.name.capitalize()} Ending (Achieved)")
+            if self.world.options.masteries_requirement > 0:
+                reqs.progressives["Mastery"] = self.world.options.masteries_requirement.value
 
         for sub_door_id in door.doors:
             sub_reqs = self.get_door_open_reqs(sub_door_id)
@@ -588,3 +604,6 @@ class Lingo2PlayerLogic:
 
             if needed > 0:
                 reqs.letters[l] = max(reqs.letters.get(l, 0), needed)
+
+        if any(l.isnumeric() for l in solution):
+            reqs.items.add("Numbers")
@@ -68,6 +68,7 @@ class Lingo2StaticLogic:
                 self.location_name_groups.setdefault("Keyholders", []).append(location_name)
 
         self.item_id_to_name[self.objects.special_ids["A Job Well Done"]] = "A Job Well Done"
+        self.item_id_to_name[self.objects.special_ids["Numbers"]] = "Numbers"
 
         for symbol_name in SYMBOL_ITEMS.values():
             self.item_id_to_name[self.objects.special_ids[symbol_name]] = symbol_name
@@ -105,7 +106,7 @@ class Lingo2StaticLogic:
         if door.type != data_pb2.DoorType.STANDARD:
             return None
 
-        if len(door.keyholders) > 0 or len(door.endings) > 0 or door.HasField("complete_at"):
+        if len(door.keyholders) > 0 or door.white_ending or door.HasField("complete_at"):
             return None
 
         if len(door.panels) > 4:
@@ -2688,3 +2688,53 @@ connections {
   }
   oneway: true
 }
+connections {
+  from {
+    panel {
+      map: "the_entry"
+      room: "Starting Room"
+      name: "Gift Maps"
+      answer: "gongus"
+    }
+  }
+  to {
+    room {
+      map: "the_fuzzy"
+      name: "Main Area"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    panel {
+      map: "the_entry"
+      room: "Starting Room"
+      name: "Gift Maps"
+      answer: "kiwi"
+    }
+  }
+  to {
+    room {
+      map: "the_fuzzy"
+      name: "Main Area"
+    }
+  }
+  oneway: true
+}
+connections {
+  from {
+    port {
+      map: "the_fuzzy"
+      room: "Main Area"
+      name: "WORLDPORT"
+    }
+  }
+  to {
+    room {
+      map: "the_entry"
+      name: "Starting Room"
+    }
+  }
+  oneway: true
+}
@@ -2022,6 +2022,30 @@ maps:
         panels:
           CACTUS: 410
           TAIL: 411
+  the_fuzzy:
+    rooms:
+      Main Area:
+        panels:
+          ACHIEVES: 3033
+          BEFORE: 3028
+          BOTH: 3036
+          Blank: 3022
+          CAGED: 3027
+          COMBINED: 3032
+          DICE: 3026
+          FIRST: 3035
+          FORGED: 3030
+          LOTTO: 3024
+          OTHERS: 3031
+          TOED: 3029
+          TUTU: 3023
+          UNVEILED: 3034
+          WHERETO: 3025
+      Mastery:
+        masteries:
+          MASTERY: 3037
+    doors:
+      Black Panels: 3021
   the_gallery:
     rooms:
       Back Room:
@@ -2871,8 +2895,9 @@ maps:
           HIDE (2): 1021
           MORE: 1022
     doors:
-      Left/Turn Door: 984
-      Turn/Shop Door: 985
+      Left Only Puzzles: 3020
+      Shop Only Puzzles: 3019
+      Turn Only Puzzles: 3018
   the_repetitive:
     rooms:
       Anti Room:
@@ -4153,6 +4178,7 @@ special:
   Job Symbol: 2798
   Lingo Symbol: 2799
   Null Symbol: 2800
+  Numbers: 3038
   Planet Symbol: 2801
   Pyramid Symbol: 2802
   Question Symbol: 2803
@@ -86,21 +86,7 @@ doors {
 doors {
   name: "White Ending Door"
   type: EVENT
-  # This is the only time a door depends on endings. However, it's nice to do it
-  # this way instead of just checking for ending room access because this lets
-  # us use events, which makes the playthrough more readable.
-  endings: "MINT"
-  endings: "ORANGE"
-  endings: "GREEN"
-  endings: "GRAY"
-  endings: "PLUM"
-  endings: "YELLOW"
-  endings: "GOLD"
-  endings: "BLACK"
-  endings: "CYAN"
-  endings: "PURPLE"
-  endings: "RED"
-  endings: "BLUE"
+  white_ending: true
 }
 doors {
   name: "Repetitive Entrance"
@@ -12,9 +12,11 @@ excluded_nodes: "Panels/Back Left/backleft_4_proxied_2"
 # This is a proxy related to the first panel and it doesn't seem useful.
 excluded_nodes: "Panels/Entry/entry_proxied_fake"
 # The gift map entrance is created by the mod.
+custom_nodes: "Components/GiftMapEntrance/GongusPanel"
 custom_nodes: "Components/GiftMapEntrance/HatkirbyPanel"
 custom_nodes: "Components/GiftMapEntrance/IcelyPanel"
 custom_nodes: "Components/GiftMapEntrance/KirbyPanel"
+custom_nodes: "Components/GiftMapEntrance/KiwiPanel"
 custom_nodes: "Components/GiftMapEntrance/Panel"
 custom_nodes: "Components/GiftMapEntrance/QPanel"
 custom_nodes: "Components/GiftMapEntrance/SouveyPanel"
@@ -55,9 +55,11 @@ panels {
   # The puzzle solution doesn't matter. We'll change it to the player's name
   # for fun.
   symbols: QUESTION
+  proxies { answer: "gongus" path: "Components/GiftMapEntrance/GongusPanel" }
   proxies { answer: "hatkirby" path: "Components/GiftMapEntrance/HatkirbyPanel" }
   proxies { answer: "icely" path: "Components/GiftMapEntrance/IcelyPanel" }
   proxies { answer: "kirby" path: "Components/GiftMapEntrance/KirbyPanel" }
+  proxies { answer: "kiwi" path: "Components/GiftMapEntrance/KiwiPanel" }
   proxies { answer: "q" path: "Components/GiftMapEntrance/QPanel" }
   proxies { answer: "souvey" path: "Components/GiftMapEntrance/SouveyPanel" }
   proxies { answer: "star" path: "Components/GiftMapEntrance/StarPanel" }
@@ -0,0 +1,5 @@
+connections {
+  from_room: "Main Area"
+  to_room: "Mastery"
+  door { name: "Mastery Door" }
+}
@@ -0,0 +1,12 @@
+doors {
+  name: "Black Panels"
+  type: LOCATION_ONLY
+  panels { room: "Main Area" name: "WHERETO" }
+  panels { room: "Main Area" name: "COMBINED" }
+  location_room: "Main Area"
+}
+doors {
+  name: "Mastery Door"
+  type: EVENT
+  panels { room: "Main Area" name: "OTHERS" }
+}
@@ -0,0 +1,4 @@
+display_name: "The Fuzzy"
+type: GIFT_MAP
+# The map's mastery is created at runtime.
+custom_nodes: "Components/Collectables/collectable"
@@ -0,0 +1,119 @@
+name: "Main Area"
+panels {
+  name: "Blank"
+  path: "Panels/Room_1/panel_1"
+  clue: ""
+  answer: "2475"
+  symbols: LINGO
+  symbols: QUESTION
+}
+panels {
+  name: "TUTU"
+  path: "Panels/Room_1/panel_2"
+  clue: "tutu"
+  answer: "22"
+  symbols: ZERO
+  symbols: EVAL
+}
+panels {
+  name: "LOTTO"
+  path: "Panels/Room_1/panel_3"
+  clue: "lotto"
+  answer: "22222222"
+  symbols: ZERO
+  symbols: EVAL
+}
+panels {
+  name: "WHERETO"
+  path: "Panels/Room_1/panel_10"
+  clue: "whereto"
+  answer: "sides"
+  symbols: QUESTION
+}
+panels {
+  name: "DICE"
+  path: "Panels/Room_1/panel_11"
+  clue: "dice"
+  answer: "4935"
+  symbols: QUESTION
+}
+panels {
+  name: "CAGED"
+  path: "Panels/Room_1/panel_12"
+  clue: "caged"
+  answer: "31754"
+  symbols: QUESTION
+}
+panels {
+  name: "BEFORE"
+  path: "Panels/Room_1/panel_13"
+  clue: "before"
+  answer: "100"
+  symbols: ZERO
+  symbols: EVAL
+}
+panels {
+  name: "TOED"
+  path: "Panels/Room_1/panel_14"
+  clue: "toed"
+  answer: "108"
+  symbols: ZERO
+  symbols: EVAL
+}
+panels {
+  name: "FORGED"
+  path: "Panels/Room_1/panel_15"
+  clue: "forged"
+  answer: "3016"
+  symbols: ZERO
+  symbols: EVAL
+}
+panels {
+  name: "OTHERS"
+  path: "Panels/Room_1/panel_4"
+  clue: "others"
+  answer: "34390869"
+  symbols: QUESTION
+}
+panels {
+  name: "COMBINED"
+  path: "Panels/Room_1/panel_9"
+  clue: "combined"
+  answer: "added"
+  symbols: SUN
+}
+panels {
+  name: "ACHIEVES"
+  path: "Panels/Room_1/panel_5"
+  clue: "achieves"
+  answer: "4214"
+  symbols: QUESTION
+}
+panels {
+  name: "UNVEILED"
+  path: "Panels/Room_1/panel_6"
+  clue: "unveiled"
+  answer: "12122021"
+  symbols: QUESTION
+}
+panels {
+  name: "FIRST"
+  path: "Panels/Room_1/panel_8"
+  clue: "first"
+  answer: "1"
+  symbols: QUESTION
+}
+panels {
+  name: "BOTH"
+  path: "Panels/Room_1/panel_7"
+  clue: "both"
+  answer: "2"
+  symbols: QUESTION
+}
+ports {
+  name: "WORLDPORT"
+  display_name: "Entrance"
+  path: "Components/Warps/worldport"
+  destination { x: 0 y: 0 z: 9 }
+  rotation: 0
+}
@@ -0,0 +1,5 @@
+name: "Mastery"
+masteries {
+  name: "MASTERY"
+  path: "Components/Collectables/collectable"
+}
@@ -1,17 +1,42 @@
 doors {
-  name: "Left/Turn Door"
+  name: "Turn Only Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Turn Room" name: "HIDE (1)" }
+  panels { room: "Turn Room" name: "HIDE (2)" }
+  panels { room: "Turn Room" name: "MORE" }
+  location_room: "Turn Room"
+}
+doors {
+  name: "Shop Only Puzzles"
+  type: LOCATION_ONLY
+  panels { room: "Shop Room" name: "LEFT (1)" }
+  panels { room: "Shop Room" name: "LEFT (2)" }
+  panels { room: "Shop Room" name: "EXIT (1)" }
+  panels { room: "Shop Room" name: "EXIT (2)" }
+  panels { room: "Shop Room" name: "EXIT (3)" }
+  location_room: "Shop Room"
+}
+doors {
+  name: "Left Only Puzzles"
   type: LOCATION_ONLY
   panels { room: "Left Room" name: "HIDE" }
   panels { room: "Left Room" name: "LEFT" }
   panels { room: "Left Room" name: "MORE" }
+  location_room: "Left Room"
+}
+doors {
+  name: "Left/Turn Door"
+  type: EVENT
+  panels { room: "Left Room" name: "HIDE" }
+  panels { room: "Left Room" name: "LEFT" }
+  panels { room: "Left Room" name: "MORE" }
   panels { room: "Turn Room" name: "HIDE (1)" }
   panels { room: "Turn Room" name: "HIDE (2)" }
   panels { room: "Turn Room" name: "MORE" }
-  location_room: "Turn Room"
 }
 doors {
   name: "Turn/Shop Door"
-  type: LOCATION_ONLY
+  type: EVENT
   panels { room: "Turn Room" name: "HIDE (1)" }
   panels { room: "Turn Room" name: "HIDE (2)" }
   panels { room: "Turn Room" name: "MORE" }
@@ -20,7 +45,6 @@ doors {
   panels { room: "Shop Room" name: "EXIT (1)" }
   panels { room: "Shop Room" name: "EXIT (2)" }
   panels { room: "Shop Room" name: "EXIT (3)" }
-  location_room: "Turn Room"
 }
 doors {
   name: "All Doors"
@@ -52,3 +52,5 @@ special_names: "Anti W"
 special_names: "Anti X"
 special_names: "Anti Y"
 special_names: "Anti Z"
+# Numbers for The Fuzzy
+special_names: "Numbers"
@@ -149,7 +149,7 @@ message Door {
   repeated KeyholderAnswer keyholders = 13;
   repeated uint64 rooms = 14;
   repeated uint64 doors = 15;
-  repeated uint64 endings = 16;
+  optional bool white_ending = 16;
   optional bool double_letters = 18;
   repeated string senders = 19;
 
@@ -104,7 +104,7 @@ message HumanDoor {
   repeated KeyholderIdentifier keyholders = 10;
   repeated RoomIdentifier rooms = 11;
   repeated DoorIdentifier doors = 12;
-  repeated string endings = 13;
+  optional bool white_ending = 13;
   optional bool double_letters = 15;
 
   // Sender nodes to be added to the list of requirements for triggering the
@@ -411,8 +411,8 @@ class DataPacker {
           container_.FindOrAddDoor(map_name, di.name(), current_map_name));
     }
 
-    for (const std::string& ending_name : h_door.endings()) {
-      door.add_endings(container_.FindOrAddEnding(ending_name));
+    if (h_door.has_white_ending()) {
+      door.set_white_ending(h_door.white_ending());
     }
 
     if (h_door.has_control_center_color()) {
@@ -373,11 +373,6 @@ class HumanProcessor {
       DoorInfo& other_door_info = info_.doors[complete_door_identifier];
       other_door_info.doors_referenced_by.push_back(door_identifier);
     }
-
-    for (const std::string& ei : h_door.endings()) {
-      EndingInfo& ending_info = info_.endings[ei];
-      ending_info.doors_referenced_by.push_back(door_identifier);
-    }
   }
 
   void ProcessConnectionsFile(std::filesystem::path path,
@@ -107,8 +107,6 @@ struct LetterInfo {
 struct EndingInfo {
   std::vector<RoomIdentifier> defined_in;
   bool has_id = false;
-
-  std::vector<DoorIdentifier> doors_referenced_by;
 };
 
 struct PanelNameInfo {
@@ -111,7 +111,7 @@ class Validator {
       return false;
     }
 
-    if (h_door.keyholders_size() > 0 || h_door.endings_size() > 0 ||
+    if (h_door.keyholders_size() > 0 || h_door.white_ending() ||
         h_door.complete_at() > 0) {
       return true;
     }
@@ -488,12 +488,6 @@ class Validator {
       std::cout << "Ending " << ending_name
                 << " has no definition, but was referenced:" << std::endl;
 
-      for (const DoorIdentifier& door_identifier :
-           ending_info.doors_referenced_by) {
-        std::cout << "    DOOR " << door_identifier.ShortDebugString()
-                  << std::endl;
-      }
-
       if (ending_info.has_id) {
         std::cout << "    An AP ID is present." << std::endl;
       }