80 files changed, 296 insertions, 5 deletions

@@ -140,6 +140,7 @@ class Lingo2World(World):
             "enable_gift_maps",
             "enable_icarus",
             "endings_requirement",
+            "fast_travel_access",
             "keyholder_sanity",
             "masteries_requirement",
             "shuffle_control_center_colors",
@@ -155,6 +156,7 @@ class Lingo2World(World):
 
         slot_data: dict[str, object] = {
             **self.options.as_dict(*slot_options),
+            "rte": [self.static_logic.objects.maps[map_id].name for map_id in self.player_logic.rte_mapping],
             "version": self.static_logic.get_data_version(),
         }
 
@@ -91,6 +91,27 @@ class CyanDoorBehavior(Choice):
     option_item = 2
 
 
+class ShuffleFastTravel(Toggle):
+    """If enabled, the list of maps you can fast travel to is randomized, except for The Entry, which is always
+    accessible."""
+    display_name = "Shuffle Fast Travel"
+
+
+class FastTravelAccess(Choice):
+    """
+    Controls how the fast travel buttons on the pause menu work.
+
+    - **Vanilla**: You can only fast travel to maps once you have been to them and stepped foot in the general area that
+      the warp would place you. This option means that fast travel has no impact on logic.
+    - **Unlocked**: All five fast travel maps will be available from the start.
+    - **Items**: Only The Entry is available from the start. The other fast travel buttons are locked behind items.
+    """
+    display_name = "Fast Travel Access"
+    option_vanilla = 0
+    option_unlocked = 1
+    option_items = 2
+
+
 class EnableIcarus(Toggle):
     """
     Controls whether Icarus is randomized. If disabled, which is the default, no locations or items will be created for
@@ -234,6 +255,8 @@ class Lingo2Options(PerGameCommonOptions):
     shuffle_worldports: ShuffleWorldports
     keyholder_sanity: KeyholderSanity
     cyan_door_behavior: CyanDoorBehavior
+    shuffle_fast_travel: ShuffleFastTravel
+    fast_travel_access: FastTravelAccess
     enable_icarus: EnableIcarus
     enable_gift_maps: EnableGiftMaps
     daedalus_only: DaedalusOnly
@@ -5,7 +5,7 @@ from .generated import data_pb2 as data_pb2
 from .items import SYMBOL_ITEMS
 from typing import TYPE_CHECKING, NamedTuple
 
-from .options import ShuffleLetters, CyanDoorBehavior, VictoryCondition
+from .options import ShuffleLetters, CyanDoorBehavior, VictoryCondition, FastTravelAccess
 
 if TYPE_CHECKING:
     from . import Lingo2World
@@ -221,6 +221,7 @@ class Lingo2PlayerLogic:
 
     double_letter_amount: dict[str, int]
     goal_room_id: int
+    rte_mapping: list[int]
 
     def __init__(self, world: "Lingo2World"):
         self.world = world
@@ -304,6 +305,19 @@ class Lingo2PlayerLogic:
         if "The Fuzzy" in world.options.enable_gift_maps.value:
             self.real_items.append("Numbers")
 
+        if world.options.shuffle_fast_travel:
+            travelable_maps = [map_id for map_id in self.shuffled_maps
+                               if world.static_logic.objects.maps[map_id].HasField("rte_room")]
+            self.rte_mapping = world.random.sample(travelable_maps, 4)
+        else:
+            canonical_rtes = ["the_plaza", "the_gallery", "daedalus", "control_center"]
+            self.rte_mapping = [world.static_logic.map_id_by_name[map_name] for map_name in canonical_rtes
+                                if world.static_logic.map_id_by_name[map_name] in self.shuffled_maps]
+
+        if world.options.fast_travel_access == FastTravelAccess.option_items:
+            for rte_map in self.rte_mapping:
+                self.real_items.append(world.static_logic.get_map_rte_item_name(rte_map))
+
         if self.world.options.shuffle_doors:
             for progressive in world.static_logic.objects.progressives:
                 for i in range(0, len(progressive.doors)):
@@ -5,6 +5,7 @@ from BaseClasses import Region, ItemClassification, Entrance
 from entrance_rando import randomize_entrances
 from .items import Lingo2Item
 from .locations import Lingo2Location
+from .options import FastTravelAccess
 from .player_logic import AccessRequirements
 from .rules import make_location_lambda
 
@@ -153,6 +154,23 @@ def create_regions(world: "Lingo2World"):
         for region in reqs.get_referenced_rooms():
             world.multiworld.register_indirect_condition(regions[region], connection)
 
+    if world.options.fast_travel_access != FastTravelAccess.option_vanilla:
+        for rte_map_id in world.player_logic.rte_mapping:
+            rte_map = world.static_logic.objects.maps[rte_map_id]
+            to_region = world.static_logic.get_room_region_name(rte_map.rte_room)
+
+            if to_region not in regions:
+                continue
+
+            connection_name = f"Return to {to_region}"
+
+            reqs = AccessRequirements()
+
+            if world.options.fast_travel_access == FastTravelAccess.option_items:
+                reqs.items.add(world.static_logic.get_map_rte_item_name(rte_map_id))
+
+            regions["Menu"].connect(regions[to_region], connection_name, make_location_lambda(reqs, world, None))
+
     world.multiworld.regions += regions.values()
 
 
@@ -18,6 +18,8 @@ class Lingo2StaticLogic:
     door_id_by_ap_id: dict[int, int]
     port_id_by_ap_id: dict[int, int]
 
+    map_id_by_name: dict[str, int]
+
     def __init__(self):
         self.item_id_to_name = {}
         self.location_id_to_name = {}
@@ -79,6 +81,10 @@ class Lingo2StaticLogic:
         for trap_name in ANTI_COLLECTABLE_TRAPS:
             self.item_id_to_name[self.objects.special_ids[trap_name]] = trap_name
 
+        for game_map in self.objects.maps:
+            if game_map.HasField("rte_room"):
+                self.item_id_to_name[game_map.rte_ap_id] = self.get_map_rte_item_name(game_map.id)
+
         self.item_name_to_id = {name: ap_id for ap_id, name in self.item_id_to_name.items()}
         self.location_name_to_id = {name: ap_id for ap_id, name in self.location_id_to_name.items()}
 
@@ -90,6 +96,8 @@ class Lingo2StaticLogic:
         self.door_id_by_ap_id = {door.ap_id: door.id for door in self.objects.doors if door.HasField("ap_id")}
         self.port_id_by_ap_id = {port.ap_id: port.id for port in self.objects.ports if port.HasField("ap_id")}
 
+        self.map_id_by_name = {game_map.name: game_map.id for game_map in self.objects.maps}
+
     def get_door_item_name(self, door: data_pb2.Door) -> str:
         return f"{self.get_map_object_map_name(door)} - {door.name}"
 
@@ -177,6 +185,10 @@ class Lingo2StaticLogic:
     def get_room_object_map_id(self, obj) -> int:
         return self.objects.rooms[obj.room_id].map_id
 
+    def get_map_rte_item_name(self, map_id: int) -> str:
+        game_map = self.objects.maps[map_id]
+        return f"Return to {game_map.display_name}"
+
     def get_data_version(self) -> list[int]:
         version = self.objects.version
         return [version.major, version.minor, version.patch]
@@ -86,6 +86,7 @@ maps:
       Unkempt Door: 2712
       Unyielding Door: 2720
       X1 Door: 2711
+    rte: 3385
   daedalus:
     rooms:
       After Bee Room:
@@ -1228,6 +1229,7 @@ maps:
       Zoo Prize Door: 1599
       Zoo South Entrance: 1596
       Zoo West Entrance: 1594
+    rte: 3376
   demo:
     rooms:
       Backside Area:
@@ -1370,6 +1372,7 @@ maps:
       Keyholder Door: 5
       Synonyms Door: 2
       Time Door: 3
+    rte: 3415
   icarus:
     rooms:
       Above Trans Rights:
@@ -1499,6 +1502,7 @@ maps:
       These Door: 2874
       Troupe Door: 2867
       Woman Door: 2859
+    rte: 3416
   the_advanced:
     rooms:
       CBA:
@@ -1543,6 +1547,7 @@ maps:
           MASTERY: 2969
     doors:
       Side Room Puzzles: 2934
+    rte: 3380
   the_ancient:
     rooms:
       Inside:
@@ -1554,6 +1559,7 @@ maps:
     doors:
       Front Door: 41
       Lavender Cubes: 43
+    rte: 3412
   the_bearer:
     rooms:
       Back Area:
@@ -1641,6 +1647,7 @@ maps:
       Control Center Color Panel: 3303
       Exit Door: 47
       Overlook Door: 46
+    rte: 3373
   the_between:
     rooms:
       Control Center Side:
@@ -1696,6 +1703,7 @@ maps:
       Purple Puzzles: 87
       Red Puzzles: 81
       Yellow Puzzles: 82
+    rte: 3408
   the_butterfly:
     rooms:
       Main Area:
@@ -1723,6 +1731,7 @@ maps:
       Mastery:
         masteries:
           MASTERY: 140
+    rte: 3395
   the_charismatic:
     rooms:
       Latitude Middle:
@@ -1760,6 +1769,7 @@ maps:
       Mastery:
         masteries:
           MASTERY: 2988
+    rte: 3396
   the_colorful:
     rooms:
       Black Room:
@@ -1826,6 +1836,7 @@ maps:
       White Door: 141
       Window Door: 152
       Yellow Door: 146
+    rte: 3365
   the_congruent:
     rooms:
       Flipped Magenta Room:
@@ -1885,6 +1896,7 @@ maps:
       Obverse Magenta Door: 173
       Obverse Yellow Door: 178
       Obverse Yellow Puzzles: 179
+    rte: 3369
   the_crystalline:
     rooms:
       Flip Area:
@@ -1902,6 +1914,7 @@ maps:
           MASTERY: 2993
     doors:
       Checkpoint Panels: 3307
+    rte: 3367
   the_darkroom:
     rooms:
       Congruent Entrance:
@@ -1956,6 +1969,7 @@ maps:
       Double Sided Entrance: 224
       Second Room Entrance: 219
       Third Room Entrance: 220
+    rte: 3409
   the_digital:
     rooms:
       Chamber:
@@ -1995,6 +2009,7 @@ maps:
       Control Center Blue Panel: 3308
       Gallery Entrance: 245
       Tree Entrance: 247
+    rte: 3403
   the_door:
     rooms:
       Main Area:
@@ -2062,6 +2077,7 @@ maps:
       10 Panels: 3310
       15 Panels: 3311
       5 Panels: 3309
+    rte: 3384
   the_entry:
     rooms:
       Blue Alcove:
@@ -2312,6 +2328,7 @@ maps:
         panels:
           CACTUS: 410
           TAIL: 411
+    rte: 3397
   the_fuzzy:
     rooms:
       Main Area:
@@ -2339,6 +2356,7 @@ maps:
     doors:
       Black Panels: 3021
       Green Panels: 3321
+    rte: 3420
   the_gallery:
     rooms:
       Back Room:
@@ -2373,6 +2391,7 @@ maps:
       Wise Painting: 416
       Wondrous Painting: 422
       Words Painting: 424
+    rte: 3394
   the_gold:
     rooms:
       The Whole Thing:
@@ -2391,6 +2410,7 @@ maps:
           SEVERE: 437
     doors:
       Remember Panel: 3323
+    rte: 3370
   the_great:
     rooms:
       Back Area:
@@ -2698,6 +2718,7 @@ maps:
       West/East Divider: 443
       Why Is It Not Red: 3325
       Zero Room Panels: 470
+    rte: 3405
   the_hinterlands:
     rooms:
       Main Area:
@@ -2764,6 +2785,7 @@ maps:
           WILDFLOWER: 670
     doors:
       Room 8 Door: 627
+    rte: 3401
   the_impressive:
     rooms:
       Green Eye:
@@ -2793,6 +2815,7 @@ maps:
       Front Door: 671
       Green Eye Panels: 3337
       Side Door: 672
+    rte: 3386
   the_invisible:
     rooms:
       Entrance:
@@ -2807,6 +2830,7 @@ maps:
           ENTRY: 3215
     doors:
       Maze Entrance: 684
+    rte: 3410
   the_jubilant:
     rooms:
       Main Area:
@@ -2838,6 +2862,7 @@ maps:
     doors:
       Side Door: 687
       Side Room Puzzles: 3339
+    rte: 3411
   the_keen:
     rooms:
       Main Area:
@@ -2855,6 +2880,7 @@ maps:
           GREAT: 3217
     doors:
       All Panels: 707
+    rte: 3402
   the_liberated:
     rooms:
       Puzzle Room:
@@ -2871,6 +2897,7 @@ maps:
           ENTRY: 3218
     doors:
       Door: 718
+    rte: 3422
   the_linear:
     rooms:
       Room:
@@ -2887,6 +2914,7 @@ maps:
           GREAT: 3219
     doors:
       Behind The Keen Gravestone: 727
+    rte: 3393
   the_lionized:
     rooms:
       Puzzle Room:
@@ -2901,6 +2929,7 @@ maps:
           ROCK: 740
         ports:
           ENTRY: 3220
+    rte: 3404
   the_literate:
     rooms:
       Puzzle Room:
@@ -2917,6 +2946,7 @@ maps:
           ENTRY: 3221
     doors:
       Door: 745
+    rte: 3382
   the_lively:
     rooms:
       Puzzle Room:
@@ -2931,6 +2961,7 @@ maps:
           SOPRANO: 757
         ports:
           BETWEEN: 3222
+    rte: 3383
   the_nuanced:
     rooms:
       Back Room:
@@ -2968,6 +2999,7 @@ maps:
       Green Side Puzzles: 764
       Main Room Door: 2750
       Stores Panel: 3340
+    rte: 3398
   the_orb:
     rooms:
       B Room:
@@ -2992,6 +3024,7 @@ maps:
       Middle Room:
         ports:
           MID: 3226
+    rte: 3381
   the_owl:
     rooms:
       Blue Room:
@@ -3075,6 +3108,7 @@ maps:
       Sky Owl: 813
       Sky Top Doors: 805
       White Owl: 816
+    rte: 3414
   the_parthenon:
     rooms:
       Lavender Area:
@@ -3100,6 +3134,7 @@ maps:
     doors:
       K2 Door: 852
       Lavender Area Puzzles: 3351
+    rte: 3418
   the_partial:
     rooms:
       Control Center Entrance:
@@ -3139,11 +3174,13 @@ maps:
       L Entered: 2843
       Main Room Puzzles: 863
       P Door: 864
+    rte: 3407
   the_perceptive:
     rooms:
       Main Area:
         ports:
           CC: 3235
+    rte: 3374
   the_plaza:
     rooms:
       Bottom Left Room:
@@ -3263,6 +3300,7 @@ maps:
       Southwest Puzzles: 898
       Symbolic Entrance: 889
       Turtle Entrance: 891
+    rte: 3390
   the_quiet:
     rooms:
       Keyholder Room:
@@ -3286,6 +3324,7 @@ maps:
           DAEDALUS: 3242
     doors:
       Side Door: 970
+    rte: 3419
   the_relentless:
     rooms:
       All:
@@ -3481,6 +3520,7 @@ maps:
       Magenta Puzzles: 1033
       Yellow Door: 1030
       Yellow Puzzles: 1034
+    rte: 3377
   the_revitalized:
     rooms:
       Bye Room:
@@ -3508,6 +3548,7 @@ maps:
           WON: 1135
     doors:
       Return Panel: 1128
+    rte: 3378
   the_shop:
     rooms:
       Main Area:
@@ -3542,6 +3583,7 @@ maps:
       Books Puzzles: 1136
       Games Puzzles: 1137
       N Entered: 2971
+    rte: 3421
   the_sirenic:
     rooms:
       Mastery:
@@ -3572,6 +3614,7 @@ maps:
           PLAZA: 3248
     doors:
       Entrance: 1161
+    rte: 3389
   the_stellar:
     rooms:
       Blue Panel:
@@ -3624,6 +3667,7 @@ maps:
       Entrance: 2995
       Question Panels: 3017
       Welcome Back Panels: 3359
+    rte: 3387
   the_stormy:
     rooms:
       Center:
@@ -3654,6 +3698,7 @@ maps:
         panels:
           RAIN: 1191
           SNOW: 1190
+    rte: 3368
   the_sturdy:
     rooms:
       Main Area:
@@ -3672,6 +3717,7 @@ maps:
       S2 Area:
         panels:
           COLORS: 1201
+    rte: 3391
   the_sun_temple:
     rooms:
       Entrance:
@@ -3693,6 +3739,7 @@ maps:
           LAWN: 1215
     doors:
       Entrance: 1210
+    rte: 3375
   the_sweet:
     rooms:
       Main Area:
@@ -3728,6 +3775,7 @@ maps:
         ports:
           EXIT1: 3254
           EXIT2: 3255
+    rte: 3400
   the_symbolic:
     rooms:
       Black Room:
@@ -3924,6 +3972,7 @@ maps:
       Tutorial Door: 2754
       Tutorial Panels: 2283
       Whirred Room Panels: 2284
+    rte: 3379
   the_talented:
     rooms:
       Back Room:
@@ -3961,6 +4010,7 @@ maps:
       Brown Side Panels: 2428
       Keyholder Hint Panel: 3360
       Main Room Door: 2429
+    rte: 3388
   the_tenacious:
     rooms:
       Color Room:
@@ -3989,6 +4039,7 @@ maps:
     doors:
       K Entered: 2844
       Paintings Door: 2453
+    rte: 3399
   the_three_doors:
     rooms:
       Dead End Room:
@@ -4032,6 +4083,7 @@ maps:
           NEXT: 3266
     doors:
       The Three Doors Gravestone: 2460
+    rte: 3392
   the_tower:
     rooms:
       First Floor:
@@ -4111,6 +4163,7 @@ maps:
       Fourth Floor Puzzles: 2481
       Second Floor Puzzles: 2479
       Third Floor Puzzles: 2480
+    rte: 3413
   the_tree:
     rooms:
       Bearer Entrance:
@@ -4156,6 +4209,7 @@ maps:
     doors:
       Control Center Brown Door: 2548
       The Tree Gravestone: 2549
+    rte: 3371
   the_unkempt:
     rooms:
       Control Center Entrance:
@@ -4277,6 +4331,7 @@ maps:
       Near Teal Door Panels: 3361
       Routine Out Chute: 2584
       W2 Room Door: 2581
+    rte: 3417
   the_unyielding:
     rooms:
       Bearer Entrance:
@@ -4539,6 +4594,7 @@ maps:
       Southwest Corner Behind: 1254
       Southwest Room: 1431
       Yellow Room Puzzles: 1250
+    rte: 3366
   the_wise:
     rooms:
       Entry:
@@ -4571,6 +4627,7 @@ maps:
           WORDS: 2688
     doors:
       Front Door: 2666
+    rte: 3372
   the_wondrous:
     rooms:
       Entry:
@@ -4593,6 +4650,7 @@ maps:
           SHRINK: 2699
     doors:
       Shrink Door: 2689
+    rte: 3406
   the_words:
     rooms:
       Main Area:
@@ -4607,6 +4665,7 @@ maps:
           TREE: 2705
         ports:
           ENTRY: 3283
+    rte: 3423
 letters:
   a1: 596
   a2: 6
@@ -1 +1,2 @@
 display_name: "Control Center"
+rte_room: "Main Area"
@@ -1,4 +1,5 @@
 display_name: "Daedalus"
+rte_room: "Starting Room"
 daedalus_only_mode: DAED_ONLY_ALLOW
 # These paintings can't be shuffled because they are behind panels.
 excluded_nodes: "Components/Paintings/Group3/mouse"
@@ -1,5 +1,7 @@
 display_name: "Demo"
 type: DEMO
+# No RTE because this is a secret map.
+
 # This painting is above a panel and can't be entered.
 excluded_nodes: "Meshes/owl"
 # The map's mastery is created at runtime.
@@ -1 +1,2 @@
 display_name: "Four Rooms"
+rte_room: "Synonyms Room"
@@ -1,4 +1,5 @@
 display_name: "Icarus"
 type: ICARUS
+rte_room: "Welcome Spine (Obverse)"
 # The map's mastery is created at runtime.
 custom_nodes: "Components/Collectables/collectable"
@@ -1,4 +1,5 @@
 display_name: "The Advanced"
 type: GIFT_MAP
+rte_room: "Main Area"
 # The map's mastery is created at runtime.
 custom_nodes: "Components/Collectables/collectable"
@@ -1 +1,2 @@
 display_name: "The Ancient"
+rte_room: "Outside"
@@ -1 +1,2 @@
 display_name: "The Bearer"
+rte_room: "Entry"
@@ -1 +1,2 @@
 display_name: "The Between"
+rte_room: "Main Area"
@@ -1 +1,2 @@
 display_name: "The Butterfly"
+rte_room: "Main Area"
@@ -1,4 +1,5 @@
 display_name: "The Charismatic"
 type: GIFT_MAP
+rte_room: "Main Area"
 # The map's mastery is created at runtime.
 custom_nodes: "Components/Collectables/collectable"
@@ -1,3 +1,4 @@
 display_name: "The Colorful"
+rte_room: "White Room"
 # This has something to do with the FISH/FISHES proxy.
 excluded_nodes: "Components/panel_fake"
@@ -1,4 +1,5 @@
 display_name: "The Congruent"
+rte_room: "Main Area"
 worldport_entrance {
   room: "Main Area"
   name: "DARKROOM"
@@ -1,4 +1,5 @@
 display_name: "The Crystalline"
 type: GIFT_MAP
+rte_room: "Main Area"
 # The map's mastery is created at runtime.
 custom_nodes: "Components/Collectables/collectable"
@@ -1 +1,2 @@
 display_name: "The Darkroom"
+rte_room: "First Room"
@@ -1 +1,2 @@
 display_name: "The Digital"
+rte_room: "Main Area"
@@ -1 +1,2 @@
 display_name: "The Door"
+# No RTE because it would make The Wondrous pointless.
@@ -1,4 +1,5 @@
 display_name: "The Double Sided"
+rte_room: "Start"
 worldport_entrance {
   room: "Start"
   name: "DARKROOM"
@@ -1,4 +1,6 @@
 display_name: "The Entry"
+# No RTE because this map is always an RTE.
+
 # This is a debug warp to The Ancient and as far as I can tell there is no way
 # to access it.
 excluded_nodes: "Components/Warps/worldport-test"
@@ -1,3 +1,4 @@
 display_name: "The Extravagant"
+rte_room: "Y Minus First Floor"
 # This appears to be completely inaccessible.
 excluded_nodes: "Components/Warps/worldport"
@@ -1,4 +1,5 @@
 display_name: "The Fuzzy"
 type: GIFT_MAP
+rte_room: "Main Area"
 # The map's mastery is created at runtime.
 custom_nodes: "Components/Collectables/collectable"
@@ -1,4 +1,5 @@
 display_name: "The Gallery"
+rte_room: "Main Area"
 daedalus_only_mode: DAED_ONLY_PARTIAL
 # These are the eyes in the foyer, and aren't normal paintings.
 excluded_nodes: "Components/Paintings/Starting/eye"
@@ -1,2 +1,3 @@
 display_name: "The Gold"
 daedalus_only_mode: DAED_ONLY_ALLOW
+# No RTE because it would trivialize Gold Ending.
@@ -1,4 +1,5 @@
 display_name: "The Graveyard"
+rte_room: "Outside"
 # These really shouldn't be shuffled because it would make Black Ending trivial.
 excluded_nodes: "Components/Paintings/grave"
 excluded_nodes: "Components/Paintings/grave2"
@@ -1,4 +1,5 @@
 display_name: "The Great"
+rte_room: "Main Area"
 # This can't be shuffled because it is tilted.
 excluded_nodes: "Components/Paintings/u"
 # This can't be shuffled because it is on the ground.
@@ -1,4 +1,6 @@
 display_name: "The Hinterlands"
+# No RTE because the map is not randomized.
+
 # I'm not currently planning on shuffling anything in here.
 excluded_nodes: "Components/Paintings/C"
 excluded_nodes: "Components/Paintings/E"
@@ -1 +1,2 @@
 display_name: "The Hive"
+rte_room: "Main Area"
@@ -1,4 +1,5 @@
 display_name: "The Impressive"
+rte_room: "Lobby"
 # These are apparently little eyes on the Green Eye panel pedestals? I don't
 # think they're ever visible in gameplay.
 excluded_nodes: "Meshes/eye"
@@ -1 +1,2 @@
 display_name: "The Invisible"
+rte_room: "Entrance"
@@ -1,4 +1,5 @@
 display_name: "The Jubilant"
+rte_room: "Main Area"
 worldport_entrance {
   room: "Main Area"
   name: "GREAT"
@@ -1,4 +1,5 @@
 display_name: "The Keen"
+rte_room: "Main Area"
 worldport_entrance {
   room: "Main Area"
   name: "GREAT"
@@ -1,4 +1,5 @@
 display_name: "The Liberated"
+rte_room: "Puzzle Room"
 worldport_entrance {
   room: "Puzzle Room"
   name: "ENTRY"
@@ -1,4 +1,5 @@
 display_name: "The Linear"
+rte_room: "Room"
 worldport_entrance {
   room: "Room"
   name: "GREAT"
@@ -1,4 +1,5 @@
 display_name: "The Lionized"
+rte_room: "Puzzle Room"
 worldport_entrance {
   room: "Puzzle Room"
   name: "ENTRY"
@@ -1,4 +1,5 @@
 display_name: "The Literate"
+rte_room: "Puzzle Room"
 worldport_entrance {
   room: "Puzzle Room"
   name: "ENTRY"
@@ -1,4 +1,5 @@
 display_name: "The Lively"
+rte_room: "Puzzle Room"
 worldport_entrance {
   room: "Puzzle Room"
   name: "BETWEEN"
@@ -1,4 +1,5 @@
 display_name: "The Nuanced"
+rte_room: "Main Room"
 worldport_entrance {
   room: "Main Room"
   name: "UNYIELDING"
@@ -1,4 +1,5 @@
 display_name: "The Orb"
+rte_room: "Main Area"
 # These are inaccessible, and were probably just copy pasted from the other
 # rooms.
 excluded_nodes: "Components/Warps/worldport2"
@@ -1 +1,2 @@
 display_name: "The Owl"
+rte_room: "R2C2 Bottom"
@@ -1 +1,2 @@
 display_name: "The Parthenon"
+rte_room: "Main Area"
@@ -1 +1,2 @@
 display_name: "The Partial"
+rte_room: "Obverse Side"
@@ -1,4 +1,5 @@
 display_name: "The Perceptive"
+rte_room: "Main Area"
 worldport_entrance {
   room: "Main Area"
   name: "CC"
@@ -1 +1,2 @@
 display_name: "The Plaza"
+rte_room: "Main Area"
@@ -1,4 +1,5 @@
 display_name: "The Quiet"
+rte_room: "Main Area"
 worldport_entrance {
   room: "Main Area"
   name: "DAEDALUS"
@@ -1 +1,2 @@
 display_name: "The Relentless"
+# No RTE in order to preserve the gimmick of the map.
@@ -1,4 +1,5 @@
 display_name: "The Repetitive"
+rte_room: "Main Room"
 # These paintings are directly above/behind panels and thus can't be entered.
 excluded_nodes: "Meshes/eyeRed3"
 excluded_nodes: "Meshes/eyeRed4"
@@ -1,3 +1,4 @@
 display_name: "The Revitalized"
+rte_room: "Bye Room"
 # Let's not include the demo (for now).
 excluded_nodes: "Components/panel_demo"
@@ -1 +1,2 @@
 display_name: "The Shop"
+rte_room: "Main Area"
@@ -1,4 +1,5 @@
 display_name: "The Sirenic"
+rte_room: "Start"
 worldport_entrance {
   room: "Start"
   name: "PLAZA"
@@ -1,5 +1,6 @@
 display_name: "The Stellar"
 type: GIFT_MAP
+rte_room: "Starting Room"
 # This panel does not appear to be accessible without sniping.
 excluded_nodes: "Panels/Room_1/panel_2"
 # The map's mastery is created at runtime.
@@ -1 +1,2 @@
 display_name: "The Stormy"
+rte_room: "Center"
@@ -1,4 +1,5 @@
 display_name: "The Sturdy"
+rte_room: "Main Area"
 # Let's ignore the second half of the rainbows for now.
 #excluded_nodes: "Components/Doors/Rainbow2/Hinge/rainbowMirrored"
 #excluded_nodes: "Components/Doors/Rainbow/Hinge/rainbowMirrored"
@@ -1,4 +1,5 @@
 display_name: "The Sun Temple"
+rte_room: "Entrance"
 worldport_entrance {
   room: "Entrance"
   name: "UNKEMPT"
@@ -1 +1,2 @@
 display_name: "The Sweet"
+rte_room: "Main Area"
@@ -1,4 +1,5 @@
 display_name: "The Symbolic"
+rte_room: "White Room"
 worldport_entrance {
   room: "White Room"
   name: "PLAZA"
@@ -1,4 +1,5 @@
 display_name: "The Talented"
+rte_room: "Main Area"
 worldport_entrance {
   room: "Main Area"
   name: "GREAT"
@@ -1,2 +1,3 @@
 display_name: "The Tenacious"
+rte_room: "Control Center Entrance"
 daedalus_only_mode: DAED_ONLY_ALLOW
@@ -1 +1,2 @@
 display_name: "The Three Doors"
+rte_room: "First Second Room"
@@ -1,4 +1,5 @@
 display_name: "The Tower"
+rte_room: "First Floor"
 worldport_entrance {
   room: "First Floor"
   name: "GREAT"
@@ -1 +1,2 @@
 display_name: "The Tree"
+rte_room: "Main Area"
@@ -1 +1,2 @@
 display_name: "The Unkempt"
+rte_room: "Main Area"
@@ -1 +1,2 @@
 display_name: "The Unyielding"
+rte_room: "Digital Entrance"
@@ -1,3 +1,4 @@
 display_name: "The Wise"
+rte_room: "Entry"
 # This port is out of bounds.
 excluded_nodes: "Components/Warps/worldport"
@@ -1,4 +1,5 @@
 display_name: "The Wondrous"
+rte_room: "Entry"
 worldport_entrance {
   room: "Entry"
   name: "DAEDALUS"
@@ -1,4 +1,5 @@
 display_name: "The Words"
+rte_room: "Main Area"
 # These are old proxies of the main room's panels that are not linked up
 # anymore.
 excluded_nodes: "Panels/Proxies/panel_3"
@@ -288,6 +288,9 @@ message Map {
   optional DaedalusOnlyMode daedalus_only_mode = 6;
   optional uint64 worldport_entrance = 4;
   optional MapType type = 5;
+
+  optional uint64 rte_room = 7;
+  optional uint64 rte_ap_id = 8;
 }
 
 message Progressive {
@@ -238,6 +238,7 @@ message HumanMap {
   optional DaedalusOnlyMode daedalus_only_mode = 6;
 
   optional PortIdentifier worldport_entrance = 3;
+  optional string rte_room = 7;
 
   // These two fields are used by the validator and nothing else. excluded_nodes
   // are objects in the tscn that are intentionally not mentioned in the txtpb.
@@ -286,6 +287,7 @@ message IdMappings {
   message MapIds {
     map<string, uint64> doors = 1;
     map<string, RoomIds> rooms = 2;
+    optional uint64 rte = 3;
   }
 
   map<string, MapIds> maps = 1;
@@ -67,6 +67,10 @@ class AssignIds {
         UpdateNextId(room.keyholders());
         UpdateNextId(room.ports());
       }
+
+      if (map.has_rte()) {
+        UpdateNextId(map.rte());
+      }
     }
 
     UpdateNextId(id_mappings_.special());
@@ -93,10 +97,31 @@ class AssignIds {
   void ProcessMap(std::filesystem::path path) {
     std::string map_name = path.filename().string();
 
+    ProcessMapMetadata(path / "metadata.txtpb", map_name);
     ProcessDoorsFile(path / "doors.txtpb", map_name);
     ProcessRooms(path / "rooms", map_name);
   }
 
+  void ProcessMapMetadata(std::filesystem::path path,
+                          const std::string& current_map_name) {
+    if (!std::filesystem::exists(path)) {
+      return;
+    }
+
+    auto metadata = ReadMessageFromFile<HumanMap>(path.string());
+    auto& maps = *output_.mutable_maps();
+
+    if (metadata.has_rte_room()) {
+      if (!id_mappings_.maps().contains(current_map_name) ||
+          !id_mappings_.maps().at(current_map_name).has_rte()) {
+        maps[current_map_name].set_rte(next_id_++);
+      } else {
+        maps[current_map_name].set_rte(
+            id_mappings_.maps().at(current_map_name).rte());
+      }
+    }
+  }
+
   void ProcessDoorsFile(std::filesystem::path path,
                         const std::string& current_map_name) {
     if (!std::filesystem::exists(path)) {
@@ -342,9 +367,13 @@ class AssignIds {
  private:
   void UpdateNextId(const google::protobuf::Map<std::string, uint64_t>& ids) {
     for (const auto& [_, id] : ids) {
-      if (id > next_id_) {
-        next_id_ = id;
-      }
+      UpdateNextId(id);
+    }
+  }
+
+  void UpdateNextId(uint64_t id) {
+    if (id > next_id_) {
+      next_id_ = id;
     }
   }
 
@@ -100,6 +100,11 @@ class DataPacker {
           map_name, metadata.worldport_entrance().room(),
           metadata.worldport_entrance().name(), std::nullopt, std::nullopt));
     }
+
+    if (metadata.has_rte_room()) {
+      map.set_rte_room(container_.FindOrAddRoom(map_name, metadata.rte_room(),
+                                                std::nullopt));
+    }
   }
 
   void ProcessRooms(std::filesystem::path path,
@@ -711,6 +716,11 @@ class DataPacker {
           container_.all_objects().mutable_ports(port_id)->set_ap_id(ap_id);
         }
       }
+
+      if (map.has_rte()) {
+        uint64_t map_id = container_.FindOrAddMap(map_name);
+        container_.all_objects().mutable_maps(map_id)->set_rte_ap_id(map.rte());
+      }
     }
 
     auto& specials = *container_.all_objects().mutable_special_ids();
@@ -80,6 +80,10 @@ IdMappings ReadIdsFromYaml(const std::string& filename) {
               door_it.second.as<uint64_t>();
         }
       }
+
+      if (map_it.second["rte"]) {
+        map_ids.set_rte(map_it.second["rte"].as<uint64_t>());
+      }
     }
   }
 
@@ -168,6 +172,10 @@ void WriteIdsAsYaml(const IdMappings& ids, const std::string& filename) {
           map_node["doors"][door_name] = door_id;
         });
 
+    if (map_ids.has_rte()) {
+      map_node["rte"] = map_ids.rte();
+    }
+
     result["maps"][map_name] = std::move(map_node);
   });
 
@@ -74,6 +74,8 @@ class HumanProcessor {
     MapInfo& map_info = info_.maps[current_map_name];
 
     auto metadata = ReadMessageFromFile<HumanMap>(path.string());
+    map_info.definitions.push_back(metadata);
+
     for (const std::string& path : metadata.excluded_nodes()) {
       map_info.game_nodes[path].uses++;
     }
@@ -92,6 +94,15 @@ class HumanProcessor {
         map_info.malformed_worldport_entrance = metadata.worldport_entrance();
       }
     }
+
+    if (metadata.has_rte_room()) {
+      RoomIdentifier room_identifier;
+      room_identifier.set_map(current_map_name);
+      room_identifier.set_name(metadata.rte_room());
+
+      RoomInfo& room_info = info_.rooms[room_identifier];
+      room_info.map_rtes_referenced_by.push_back(current_map_name);
+    }
   }
 
   void ProcessRooms(std::filesystem::path path,
@@ -617,6 +628,11 @@ class HumanProcessor {
           port_info.has_id = true;
         }
       }
+
+      if (map.has_rte()) {
+        MapInfo& map_info = info_.maps[map_name];
+        map_info.has_rte_id = true;
+      }
     }
 
     for (const auto& [tag, id] : ids.special()) {
@@ -21,7 +21,9 @@ void Run(const std::string& mapdir, const std::string& repodir) {
 int main(int argc, char** argv) {
   if (argc != 3) {
     std::cout << "Incorrect argument count." << std::endl;
-    std::cout << "Usage: validator [path to map directory] [path to Lingo 2 repository]" << std::endl;
+    std::cout << "Usage: validator [path to map directory] [path to Lingo 2 "
+                 "repository]"
+              << std::endl;
     return 1;
   }
 
@@ -28,6 +28,9 @@ struct GameNodeInfo {
 struct MapInfo {
   std::map<std::string, GameNodeInfo> game_nodes;
 
+  std::vector<HumanMap> definitions;
+  bool has_rte_id = false;
+
   std::optional<PortIdentifier> malformed_worldport_entrance;
 };
 
@@ -37,6 +40,7 @@ struct RoomInfo {
   std::vector<DoorIdentifier> doors_referenced_by;
   std::vector<PanelIdentifier> panels_referenced_by;
   std::vector<HumanConnection> connections_referenced_by;
+  std::vector<std::string> map_rtes_referenced_by;
 };
 
 struct DoorInfo {
@@ -1,5 +1,6 @@
 #include "validator.h"
 
+#include <algorithm>
 #include <iostream>
 
 #include "proto/human.pb.h"
@@ -74,6 +75,22 @@ class Validator {
       std::cout << "The worldport entrance for map " << map_name
                 << " is malformed." << std::endl;
     }
+
+    if (map_info.has_rte_id) {
+      if (!std::any_of(
+              map_info.definitions.begin(), map_info.definitions.end(),
+              [](const HumanMap& h_map) { return h_map.has_rte_room(); })) {
+        std::cout << "Map " << map_name << " has an RTE ID but no RTE room."
+                  << std::endl;
+      }
+    } else {
+      if (std::any_of(
+              map_info.definitions.begin(), map_info.definitions.end(),
+              [](const HumanMap& h_map) { return h_map.has_rte_room(); })) {
+        std::cout << "Map " << map_name << " has an RTE room but no RTE ID."
+                  << std::endl;
+      }
+    }
   }
 
   void ValidateRoom(const RoomIdentifier& room_identifier,
@@ -99,6 +116,10 @@ class Validator {
         std::cout << "    CONNECTION " << connection.ShortDebugString()
                   << std::endl;
       }
+
+      for (const std::string& map_name : room_info.map_rtes_referenced_by) {
+        std::cout << "    MAP RTE " << map_name << std::endl;
+      }
     } else if (room_info.definitions.size() > 1) {
       std::cout << "Room " << room_identifier.ShortDebugString()
                 << " was defined multiple times." << std::endl;