diff --git a/mods/randomizer/generator/data/entrance_shuffle_data.yaml b/mods/randomizer/generator/data/entrance_shuffle_data.yaml index d967cc0e48..510bbbb3fc 100644 --- a/mods/randomizer/generator/data/entrance_shuffle_data.yaml +++ b/mods/randomizer/generator/data/entrance_shuffle_data.yaml @@ -7,10 +7,10 @@ Connection: Links Spawn -> Outside Links House Stage: 43 Room: 1 - Spawn: "01" + Spawn: 1 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 ############################### # WARP PORTALS # @@ -19,152 +19,152 @@ - Type: Warp Portal Forward: Connection: Ordon Spring Warp Portal -> Ordon Spring - Stage: -1 - Room: -1 - Spawn: "" + Stage: 44 + Room: 1 + Spawn: -4 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Warp Portal Forward: Connection: South Faron Woods Warp Portal -> South Faron Woods - Stage: -1 - Room: -1 - Spawn: "" + Stage: 45 + Room: 0 + Spawn: -4 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Warp Portal Forward: Connection: North Faron Woods Warp Portal -> North Faron Woods - Stage: -1 - Room: -1 - Spawn: "" + Stage: 45 + Room: 6 + Spawn: -4 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Warp Portal Forward: Connection: Sacred Grove Warp Portal -> Sacred Grove Lower - Stage: -1 - Room: -1 - Spawn: "" + Stage: 54 + Room: 1 + Spawn: -4 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Warp Portal Forward: Connection: Kakariko Gorge Warp Portal -> Kakariko Gorge - Stage: -1 - Room: -1 - Spawn: "" + Stage: 56 + Room: 3 + Spawn: -4 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Warp Portal Forward: Connection: Kakariko Village Warp Portal -> Lower Kakariko Village - Stage: -1 - Room: -1 - Spawn: "" + Stage: 46 + Room: 0 + Spawn: -4 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Warp Portal Forward: Connection: Death Mountain Warp Portal -> Death Mountain Volcano - Stage: -1 - Room: -1 - Spawn: "" + Stage: 47 + Room: 3 + Spawn: -4 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Warp Portal Forward: Connection: Bridge of Eldin Warp Portal -> Eldin Field North of Bridge - Stage: -1 - Room: -1 - Spawn: "" + Stage: 56 + Room: 0 + Spawn: -4 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Warp Portal Forward: Connection: Castle Town Warp Portal -> Outside Castle Town West - Stage: -1 - Room: -1 - Spawn: "" + Stage: 57 + Room: 8 + Spawn: -4 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Warp Portal Forward: Connection: Lake Hylia Warp Portal -> Lake Hylia - Stage: -1 - Room: -1 - Spawn: "" + Stage: 52 + Room: 0 + Spawn: -4 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Warp Portal Forward: Connection: Upper Zoras River Warp Portal -> Upper Zoras River - Stage: -1 - Room: -1 - Spawn: "" + Stage: 61 + Room: 0 + Spawn: -4 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Warp Portal Forward: Connection: Zoras Domain Warp Portal -> Zoras Throne Room - Stage: -1 - Room: -1 - Spawn: "" + Stage: 50 + Room: 0 + Spawn: -4 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Warp Portal Forward: Connection: Snowpeak Warp Portal -> Snowpeak Summit Upper - Stage: -1 - Room: -1 - Spawn: "" + Stage: 51 + Room: 1 + Spawn: -4 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Warp Portal Forward: Connection: Gerudo Desert Warp Portal -> Gerudo Desert Cave of Ordeals Plateau - Stage: -1 - Room: -1 - Spawn: "" + Stage: 59 + Room: 0 + Spawn: -4 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Warp Portal Forward: Connection: Mirror Chamber Warp Portal -> Mirror Chamber Upper - Stage: -1 - Room: -1 - Spawn: "" + Stage: 60 + Room: 4 + Spawn: -4 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 ############################### # DUNGEONS # @@ -176,19 +176,19 @@ Alias: Faron Woods -> Forest Temple Stage: 6 Room: 22 - Spawn: "00" + Spawn: 0 Spawn Type: "00" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Forest Temple Entrance -> North Faron Woods Alias: Forest Temple -> Faron Woods Stage: 45 Room: 6 - Spawn: "01" + Spawn: 1 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 - Type: Dungeon Forward: @@ -196,19 +196,19 @@ Alias: Death Mountain Sumo Hall -> Goron Mines Stage: 3 Room: 1 - Spawn: "01" + Spawn: 1 Spawn Type: "00" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Goron Mines Entrance -> Death Mountain Sumo Hall Goron Mines Tunnel Alias: Goron Mines -> Death Mountain Sumo Hall Stage: 69 Room: 0 - Spawn: "01" + Spawn: 1 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 - Type: Dungeon Forward: @@ -216,19 +216,19 @@ Alias: Lake Hylia -> Lakebed Temple Stage: 0 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "00" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Lakebed Temple Entrance -> Lake Hylia Lakebed Temple Entrance Alias: Lakebed Temple -> Lake Hylia Stage: 52 Room: 0 - Spawn: "0B" + Spawn: 11 Spawn Type: "D0" Parameters: "F01F" - State: "FF" + State: -1 - Type: Dungeon Forward: @@ -236,61 +236,61 @@ Alias: Outside Arbiters Grounds -> Arbiters Grounds Stage: 24 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "00" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Arbiters Grounds Entrance -> Outside Arbiters Grounds Alias: Arbiters Grounds -> Outside Arbiters Grounds Stage: 55 Room: 3 - Spawn: "03" + Spawn: 3 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 - Type: Dungeon - Door Couple Tag: Snowpeak Ruins Entrance + Entrance Couple Tag: Snowpeak Ruins Entrance Forward: Connection: Snowpeak Ruins East Door Exterior -> Snowpeak Ruins East Door Interior Alias: Outside Snowpeak Ruins -> Snowpeak Ruins East Door Stage: 27 Room: 0 - Spawn: "02" + Spawn: 2 Spawn Type: "A0" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Snowpeak Ruins East Door Interior -> Snowpeak Ruins East Door Exterior Alias: Snowpeak Ruins East Door -> Outside Snowpeak Ruins Stage: 51 Room: 1 - Spawn: "0A" + Spawn: 10 Spawn Type: "0B" Parameters: "F01F" - State: "FF" + State: -1 - Type: Dungeon - Door Couple Tag: Snowpeak Ruins Entrance + Entrance Couple Tag: Snowpeak Ruins Entrance Forward: Connection: Snowpeak Ruins West Door Exterior -> Snowpeak Ruins West Door Interior Alias: Outside Snowpeak Ruins -> Snowpeak Ruins West Door Stage: 27 Room: 0 - Spawn: "01" + Spawn: 1 Spawn Type: "A0" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Snowpeak Ruins West Door Interior -> Snowpeak Ruins West Door Exterior Alias: Snowpeak Ruins West Door -> Outside Snowpeak Ruins Stage: 51 Room: 1 - Spawn: "09" + Spawn: 9 Spawn Type: "0B" Parameters: "F01F" - State: "FF" + State: -1 - Type: Dungeon Forward: @@ -298,19 +298,19 @@ Alias: Sacred Grove Past -> Temple of Time Stage: 9 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Temple of Time Entrance -> Sacred Grove Past Behind Window Alias: Temple of Time -> Sacred Grove Past Stage: 54 Room: 2 - Spawn: "01" + Spawn: 1 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 - Type: Dungeon Forward: @@ -318,19 +318,19 @@ Alias: Lake Hylia -> City in the Sky Stage: 12 Room: 0 - Spawn: "02" + Spawn: 2 Spawn Type: "00" Parameters: "C00F" - State: "FF" + State: -1 Return: Connection: City in the Sky Entrance -> Lake Hylia Alias: City in the Sky -> Lake Hylia Stage: 52 Room: 0 - Spawn: "4D" + Spawn: 77 Spawn Type: "40" Parameters: "C00F" - State: "FF" + State: -1 - Type: Dungeon Forward: @@ -338,19 +338,19 @@ Alias: Mirror Chamber -> Palace of Twilight Stage: 15 Room: 0 - Spawn: "0A" + Spawn: 10 Spawn Type: "00" Parameters: "F01F" - State: "E" + State: 14 Return: Connection: Palace of Twilight Entrance -> Twilight Realm Portal Alias: Palace of Twilight -> Mirror Chamber Stage: 60 Room: 4 - Spawn: "04" + Spawn: 4 Spawn Type: "00" Parameters: "F01F" - State: "FF" + State: -1 - Type: Dungeon Forward: @@ -358,19 +358,19 @@ Alias: Castle Town -> Hyrule Castle Stage: 20 Room: 11 - Spawn: "00" + Spawn: 0 Spawn Type: "00" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Hyrule Castle Entrance -> Castle Town North Inside Barrier Alias: Hyrule Castle -> Castle Town Stage: 53 Room: 1 - Spawn: "32" + Spawn: 50 Spawn Type: "10" Parameters: "F01F" - State: "FF" + State: -1 ############################### # BOSSES # @@ -382,19 +382,19 @@ Alias: Forest Temple -> Forest Temple Boss Room Stage: 7 Room: 50 - Spawn: "01" + Spawn: 0 Spawn Type: "60" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Forest Temple Boss Room -> South Faron Woods Alias: Forest Temple Boss Room -> Faron Woods - Stage: -1 - Room: -1 - Spawn: "" + Stage: 45 + Room: 1 + Spawn: 1 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Boss Forward: @@ -402,19 +402,19 @@ Alias: Goron Mines -> Goron Mines Boss Room Stage: 4 Room: 50 - Spawn: "01" + Spawn: 0 Spawn Type: "60" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Goron Mines Boss Room -> Lower Kakariko Village Alias: Goron Mines Boss Room -> Kakariko Village - Stage: -1 - Room: -1 - Spawn: "" + Stage: 46 + Room: 0 + Spawn: 70 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Boss Forward: @@ -422,19 +422,19 @@ Alias: Lakebed Temple -> Lakebed Temple Boss Room Stage: 1 Room: 50 - Spawn: "01" + Spawn: 1 Spawn Type: "00" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Lakebed Temple Boss Room -> Lake Hylia Lanayru Spring Alias: Lakebed Temple Boss Room -> Lanayru Spring - Stage: -1 - Room: -1 - Spawn: "" + Stage: 52 + Room: 1 + Spawn: 22 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Boss Forward: @@ -442,19 +442,40 @@ Alias: Arbiters Grounds -> Arbiters Grounds Boss Room Stage: 25 Room: 50 - Spawn: "00" + Spawn: 0 Spawn Type: "60" Parameters: "F01F" - State: "FF" + State: -1 Return: - Connection: Arbiters Grounds Boss Room -> Mirror Chamber Lower + Connection: Mirror Chamber Lower -> Arbiters Grounds Boss Room Alias: Arbiters Grounds Boss Room -> Mirror Chamber - Stage: 60 - Room: 4 - Spawn: "00" + Stage: 25 + Room: 50 + Spawn: 3 Spawn Type: "10" Parameters: "501F" - State: "FF" + State: -1 + +# Leave disabled for now: Mirror Chamber is the return location from Arbiters Grounds Boss +# - Type: Overworld +# Forward: +# Connection: Arbiters Grounds Boss Room -> Mirror Chamber Lower +# Alias: Arbiters Grounds Boss Room -> Mirror Chamber +# Stage: 60 +# Room: 4 +# Spawn: 0 +# Spawn Type: "10" +# Parameters: "501F" +# State: -1 +# Return: +# Connection: Mirror Chamber Lower -> Arbiters Grounds Boss Room +# Alias: Arbiters Grounds Boss Room -> Mirror Chamber +# Stage: 25 +# Room: 50 +# Spawn: 3 +# Spawn Type: "10" +# Parameters: "501F" +# State: -1 - Type: Boss Forward: @@ -462,19 +483,19 @@ Alias: Snowpeak Ruins -> Snowpeak Ruins Boss Room Stage: 28 Room: 50 - Spawn: "01" + Spawn: 1 Spawn Type: "60" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Snowpeak Ruins Boss Room -> Snowpeak Summit Lower Alias: Snowpeak Ruins Boss Room -> Outside Snowpeak Ruins - Stage: -1 - Room: -1 - Spawn: "" + Stage: 51 + Room: 1 + Spawn: 11 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Boss Forward: @@ -482,19 +503,19 @@ Alias: Temple of Time -> Temple of Time Boss Room Stage: 10 Room: 50 - Spawn: "00" + Spawn: 0 Spawn Type: "60" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Temple of Time Boss Room -> Sacred Grove Past Behind Window Alias: Temple of Time Boss Room -> Sacred Grove Past - Stage: -1 - Room: -1 - Spawn: "" + Stage: 54 + Room: 2 + Spawn: 101 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Boss Forward: @@ -502,18 +523,18 @@ Alias: City in the Sky -> City in the Sky Boss Room Stage: 13 Room: 50 - Spawn: "01" + Spawn: 1 Spawn Type: "60" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: City in the Sky Boss Room -> City in the Sky Entrance - Stage: -1 - Room: -1 - Spawn: "" + Stage: 12 + Room: 0 + Spawn: 4 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 - Type: Boss Forward: @@ -521,18 +542,18 @@ Alias: Palace of Twilight -> Palace of Twilight Boss Room Stage: 16 Room: 10 - Spawn: "00" + Spawn: 0 Spawn Type: "60" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Palace of Twilight Boss Room -> Palace of Twilight Entrance - Stage: -1 - Room: -1 - Spawn: "" + Stage: 15 + Room: 0 + Spawn: 4 Spawn Type: "" Parameters: "" - State: "FF" + State: -1 ############################### # GROTTOS # @@ -543,18 +564,18 @@ Connection: Ordon Ranch -> Ordon Ranch Grotto Stage: 35 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "C0" Parameters: "F013" - State: "2" + State: 2 Return: Connection: Ordon Ranch Grotto -> Ordon Ranch Stage: 41 Room: 0 - Spawn: "05" + Spawn: 5 Spawn Type: "90" Parameters: "F01F" - State: "FF" + State: -1 - Type: Grotto Forward: @@ -562,109 +583,109 @@ Alias: Lost Woods -> Lost Woods Baba Serpent Grotto Stage: 36 Room: 1 - Spawn: "00" + Spawn: 0 Spawn Type: "C0" Parameters: "F01F" - State: "2" + State: 2 Return: Connection: Lost Woods Baba Serpent Grotto -> Lost Woods Lower Battle Arena Alias: Lost Woods Baba Serpent Grotto -> Lost Woods Stage: 54 Room: 3 - Spawn: "05" + Spawn: 5 Spawn Type: "90" Parameters: "F01F" - State: "FF" + State: -1 - Type: Grotto Forward: Connection: Faron Field -> Faron Field Corner Grotto Stage: 36 Room: 1 - Spawn: "00" + Spawn: 0 Spawn Type: "C0" Parameters: "F01F" - State: "1" + State: 1 Return: Connection: Faron Field Corner Grotto -> Faron Field Stage: 56 Room: 6 - Spawn: "02" + Spawn: 2 Spawn Type: "90" Parameters: "F01F" - State: "FF" + State: -1 - Type: Grotto Forward: Connection: Faron Field -> Faron Field Fishing Grotto Stage: 39 Room: 4 - Spawn: "00" + Spawn: 0 Spawn Type: "00" Parameters: "F010" - State: "1" + State: 1 Return: Connection: Faron Field Fishing Grotto -> Faron Field Stage: 56 Room: 6 - Spawn: "03" + Spawn: 3 Spawn Type: "90" Parameters: "F01F" - State: "FF" + State: -1 - Type: Grotto Forward: Connection: Kakariko Gorge -> Kakariko Gorge Keese Grotto Stage: 36 Room: 1 - Spawn: "00" + Spawn: 0 Spawn Type: "C0" Parameters: "F01F" - State: "3" + State: 3 Return: Connection: Kakariko Gorge Keese Grotto -> Kakariko Gorge Stage: 56 Room: 3 - Spawn: "04" + Spawn: 4 Spawn Type: "90" Parameters: "F01F" - State: "FF" + State: -1 - Type: Grotto Forward: Connection: Eldin Field -> Eldin Field Bomskit Grotto Stage: 35 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "C0" Parameters: "F013" - State: "1" + State: 1 Return: Connection: Eldin Field Bomskit Grotto -> Eldin Field Stage: 56 Room: 0 - Spawn: "0C" + Spawn: 12 Spawn Type: "90" Parameters: "F01F" - State: "FF" + State: -1 - Type: Grotto Forward: Connection: Eldin Field -> Eldin Field Water Bomb Fish Grotto Stage: 39 Room: 4 - Spawn: "00" + Spawn: 0 Spawn Type: "00" Parameters: "F010" - State: "3" + State: 3 Return: Connection: Eldin Field Water Bomb Fish Grotto -> Eldin Field Stage: 56 Room: 0 - Spawn: "0D" + Spawn: 13 Spawn Type: "90" Parameters: "F01F" - State: "FF" + State: -1 - Type: Grotto Forward: @@ -672,73 +693,73 @@ Alias: Eldin Field -> Eldin Field Stalfos Grotto Stage: 36 Room: 1 - Spawn: "00" + Spawn: 0 Spawn Type: "C0" Parameters: "F01F" - State: "0" + State: 0 Return: Connection: Eldin Field Stalfos Grotto -> Eldin Field Grotto Platform Alias: Eldin Field Stalfos Grotto -> Eldin Field Stage: 56 Room: 7 - Spawn: "02" + Spawn: 2 Spawn Type: "90" Parameters: "F01F" - State: "FF" + State: -1 - Type: Grotto Forward: Connection: Lanayru Field -> Lanayru Field Chu Grotto Stage: 37 Room: 2 - Spawn: "00" + Spawn: 0 Spawn Type: "C0" Parameters: "F013" - State: "3" + State: 3 Return: Connection: Lanayru Field Chu Grotto -> Lanayru Field Stage: 56 Room: 10 - Spawn: "08" + Spawn: 8 Spawn Type: "90" Parameters: "F01F" - State: "FF" + State: -1 - Type: Grotto Forward: Connection: Lanayru Field -> Lanayru Field Skulltula Grotto Stage: 38 Room: 3 - Spawn: "00" + Spawn: 0 Spawn Type: "C0" Parameters: "F013" - State: "3" + State: 3 Return: Connection: Lanayru Field Skulltula Grotto -> Lanayru Field Stage: 56 Room: 10 - Spawn: "06" + Spawn: 6 Spawn Type: "90" Parameters: "F01F" - State: "FF" + State: -1 - Type: Grotto Forward: Connection: Lanayru Field -> Lanayru Field Poe Grotto Stage: 35 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "C0" Parameters: "F013" - State: "3" + State: 3 Return: Connection: Lanayru Field Poe Grotto -> Lanayru Field Stage: 56 Room: 10 - Spawn: 07"" + Spawn: 7 Spawn Type: "90" Parameters: "F01F" - State: "FF" + State: -1 - Type: Grotto Forward: @@ -746,19 +767,19 @@ Alias: Outside Castle Town West -> Outside Castle Town West Helmasaur Grotto Stage: 35 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "C0" Parameters: "F013" - State: "0" + State: 0 Return: Connection: Outside Castle Town West Helmasaur Grotto -> Outside Castle Town West Grotto Exit Alias: Outside Castle Town West Helmasaur Grotto -> Outside Castle Town West Stage: 57 Room: 8 - Spawn: "05" + Spawn: 5 Spawn Type: "90" Parameters: F01F"" - State: "FF" + State: -1 - Type: Grotto Forward: @@ -766,19 +787,19 @@ Alias: Outside Castle Town South -> Outside Castle Town South Tektite Grotto Stage: 39 Room: 4 - Spawn: "00" + Spawn: 0 Spawn Type: "00" Parameters: "F010" - State: "0" + State: 0 Return: Connection: Outside Castle Town South Tektite Grotto -> Outside Castle Town South Tektite Grotto Platform Alias: Outside Castle Town South Tektite Grotto -> Outside Castle Town South Stage: 57 Room: 16 - Spawn: "03" + Spawn: 3 Spawn Type: "90" Parameters: "F01F" - State: "FF" + State: -1 - Type: Grotto Forward: @@ -786,19 +807,19 @@ Alias: Lake Hylia Bridge -> Lake Hylia Bridge Bubble Grotto Stage: 38 Room: 3 - Spawn: "00" + Spawn: 0 Spawn Type: "C0" Parameters: "F013" - State: "0" + State: 0 Return: Connection: Lake Hylia Bridge Bubble Grotto -> Lake Hylia Bridge Grotto Ledge Alias: Lake Hylia Bridge Bubble Grotto -> Lake Hylia Bridge Stage: 56 Room: 13 - Spawn: "03" + Spawn: 3 Spawn Type: "90" Parameters: "F01F" - State: "FF" + State: -1 - Type: Grotto Forward: @@ -806,19 +827,19 @@ Alias: Lake Hylia -> Lake Hylia Water Toadpoli Grotto Stage: 39 Room: 4 - Spawn: "00" + Spawn: 0 Spawn Type: "00" Parameters: "F010" - State: "2" + State: 2 Return: Connection: Lake Hylia Water Toadpoli Grotto -> Lake Hylia Upper Area Alias: Lake Hylia Water Toadpoli Grotto -> Lake Hylia Stage: 52 Room: 0 - Spawn: "04" + Spawn: 4 Spawn Type: "90" Parameters: "F01F" - State: "FF" + State: -1 - Type: Grotto Forward: @@ -826,37 +847,37 @@ Alias: Lake Hylia -> Lake Hylia Shell Blade Grotto Stage: 39 Room: 4 - Spawn: "00" + Spawn: 0 Spawn Type: "00" Parameters: "F010" - State: "4" + State: 4 Return: Connection: Lake Hylia Shell Blade Grotto -> Lake Hylia Shell Blade Grotto Ledge Alias: Lake Hylia Shell Blade Grotto -> Lake Hylia Stage: 52 Room: 0 - Spawn: "63" + Spawn: 99 Spawn Type: "90" Parameters: "F01F" - State: "FF" + State: -1 - Type: Grotto Forward: Connection: Gerudo Desert -> Gerudo Desert Skulltula Grotto Stage: 38 Room: 3 - Spawn: "00" + Spawn: 0 Spawn Type: "C0" Parameters: "F013" - State: "1" + State: 1 Return: Connection: Gerudo Desert Skulltula Grotto -> Gerudo Desert Stage: 59 Room: 0 - Spawn: "08" + Spawn: 8 Spawn Type: "90" Parameters: "F01F" - State: "0" + State: 0 - Type: Grotto Forward: @@ -864,19 +885,19 @@ Alias: Gerudo Desert -> Gerudo Desert Chu Grotto Stage: 37 Room: 2 - Spawn: "00" + Spawn: 0 Spawn Type: "C0" Parameters: "F013" - State: "1" + State: 1 Return: Connection: Gerudo Desert Chu Grotto -> Gerudo Desert Basin Alias: Gerudo Desert Chu Grotto -> Gerudo Desert Stage: 59 Room: 0 - Spawn: "0A" + Spawn: 10 Spawn Type: "90" Parameters: "F01F" - State: "0" + State: 0 - Type: Grotto Forward: @@ -884,19 +905,19 @@ Alias: Gerudo Desert -> Gerudo Desert Rock Grotto Stage: 37 Room: 2 - Spawn: "00" + Spawn: 0 Spawn Type: "C0" Parameters: "F013" - State: "0" + State: 0 Return: Connection: Gerudo Desert Rock Grotto -> Gerudo Desert North East Ledge Alias: Gerudo Desert Rock Grotto -> Gerudo Desert Stage: 59 Room: 0 - Spawn: "09" + Spawn: 9 Spawn Type: "90" Parameters: "F01F" - State: "0" + State: 0 - Type: Grotto Forward: @@ -904,19 +925,19 @@ Alias: Snowpeak Climb -> Snowpeak Ice Keese Grotto Stage: 37 Room: 2 - Spawn: "00" + Spawn: 0 Spawn Type: "C0" Parameters: "F013" - State: "2" + State: 2 Return: Connection: Snowpeak Ice Keese Grotto -> Snowpeak Climb Upper Alias: Snowpeak Ice Keese Grotto -> Snowpeak Climb Stage: 51 Room: 0 - Spawn: "02" + Spawn: 2 Spawn Type: "90" Parameters: "F01F" - State: "FF" + State: -1 - Type: Grotto Forward: @@ -924,19 +945,19 @@ Alias: Snowpeak Climb -> Snowpeak Freezard Grotto Stage: 38 Room: 3 - Spawn: "00" + Spawn: 0 Spawn Type: "C0" Parameters: "F013" - State: "2" + State: 2 Return: Connection: Snowpeak Freezard Grotto -> Snowpeak Climb Upper Alias: Snowpeak Freezard Grotto -> Snowpeak Climb Stage: 51 Room: 0 - Spawn: "01" + Spawn: 1 Spawn Type: "90" Parameters: "F01F" - State: "FF" + State: -1 ############################### # INTERIORS # @@ -948,151 +969,151 @@ Alias: Outside Links House -> Links House Stage: 65 Room: 4 - Spawn: "00" + Spawn: 0 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Ordon Links House -> Outside Links House Alias: Links House -> Outside Links House Stage: 43 Room: 1 - Spawn: "03" + Spawn: 3 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior Forward: Connection: Ordon Village -> Ordon Seras Shop Stage: 65 Room: 1 - Spawn: "00" + Spawn: 0 Spawn Type: "10" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Ordon Seras Shop -> Ordon Village Stage: 43 Room: 0 - Spawn: "05" + Spawn: 5 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior Forward: Connection: Ordon Village -> Ordon Sword House Stage: 65 Room: 5 - Spawn: "00" + Spawn: 0 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Ordon Sword House -> Ordon Village Stage: 43 Room: 0 - Spawn: "09" + Spawn: 9 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior Forward: Connection: Ordon Village -> Ordon Shield House Stage: 65 Room: 2 - Spawn: "00" + Spawn: 0 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Ordon Shield House -> Ordon Village Stage: 43 Room: 0 - Spawn: "06" + Spawn: 6 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 + +# - Type: Interior +# Forward: +# Connection: Ordon Village -> Ordon Shield House Upper Ledge +# Stage: +# Room: +# Spawn: +# Spawn Type: "" +# Parameters: "" +# State: -1 +# Return: +# Connection: Ordon Shield House Upper Ledge -> Ordon Village +# Stage: +# Room: +# Spawn: +# Spawn Type: "" +# Parameters: "" +# State: -1 + +# - Type: Interior +# Forward: +# Connection: Ordon Village -> Ordon Fados House +# Stage: +# Room: +# Spawn: +# Spawn Type: "" +# Parameters: "" +# State: -1 +# Return: +# Connection: Ordon Fados House -> Ordon Village +# Stage: +# Room: +# Spawn: +# Spawn Type: "" +# Parameters: "" +# State: -1 - Type: Interior - Forward: - Connection: Ordon Village -> Ordon Shield House Upper Ledge - Stage: - Room: - Spawn: "" - Spawn Type: "" - Parameters: "" - State: "FF" - Return: - Connection: Ordon Shield House Upper Ledge -> Ordon Village - Stage: - Room: - Spawn: "" - Spawn Type: "" - Parameters: "" - State: "FF" - -- Type: Interior - Forward: - Connection: Ordon Village -> Ordon Fados House - Stage: - Room: - Spawn: "" - Spawn Type: "" - Parameters: "" - State: "FF" - Return: - Connection: Ordon Fados House -> Ordon Village - Stage: - Room: - Spawn: "" - Spawn Type: "" - Parameters: "" - State: "FF" - -- Type: Interior - Door Couple Tag: Ordon Bos House + Entrance Couple Tag: Ordon Bos House Forward: Connection: Ordon Bos House Left Door Exterior -> Ordon Bos House Left Door Interior Alias: Ordon Village -> Ordon Bos House Left Door Stage: 65 Room: 0 - Spawn: "01" + Spawn: 1 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Ordon Bos House Left Door Interior -> Ordon Bos House Left Door Exterior Alias: Ordon Bos House Left Door -> Ordon Village Stage: 43 Room: 0 - Spawn: "0B" + Spawn: 11 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior - Door Couple Tag: Ordon Bos House + Entrance Couple Tag: Ordon Bos House Forward: Connection: Ordon Bos House Right Door Exterior -> Ordon Bos House Right Door Interior Alias: Ordon Village -> Ordon Bos House Right Door Stage: 65 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Ordon Bos House Right Door Interior -> Ordon Bos House Right Door Exterior Alias: Ordon Bos House Right Door -> Ordon Village Stage: 43 Room: 0 - Spawn: "04" + Spawn: 4 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior Forward: @@ -1100,19 +1121,19 @@ Alias: Faron Woods -> Coros House Door Stage: 67 Room: 0 - Spawn: "01" + Spawn: 1 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Faron Woods Coros House Lower -> South Faron Woods Alias: Coros House Door -> Faron Woods Stage: 45 Room: 4 - Spawn: "01" + Spawn: 1 Spawn Type: "A0" Parameters: "F01F" - State: "FF" + State: -1 - Type: Interior Forward: @@ -1120,121 +1141,121 @@ Alias: Faron Woods -> Coros House Window Stage: 67 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "00" Parameters: "F05F" - State: "FF" + State: -1 Return: Connection: Faron Woods Coros House Upper -> South Faron Woods Coros Ledge Alias: Coros House Window -> Faron Woods Stage: 45 Room: 4 - Spawn: "09" + Spawn: 9 Spawn Type: "00" Parameters: "F05F" - State: "FF" + State: -1 - Type: Interior - Door Couple Tag: Renados Sanctuary Front Door + Entrance Couple Tag: Renados Sanctuary Front Door Forward: Connection: Renados Sanctuary Front East Door Exterior -> Renados Sanctuary Front East Door Interior Alias: Kakriko Village -> Renados Sanctuary Front East Door Stage: 68 Room: 0 - Spawn: "06" + Spawn: 6 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Renados Sanctuary Front East Door Interior -> Renados Sanctuary Front East Door Exterior Alias: Renados Sanctuary Front East Door -> Kakariko Village Stage: 46 Room: 0 - Spawn: "30" + Spawn: 48 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior - Door Couple Tag: Renados Sanctuary Front Door + Entrance Couple Tag: Renados Sanctuary Front Door Forward: Connection: Renados Sanctuary Front West Door Exterior -> Renados Sanctuary Front West Door Interior Alias: Kakriko Village -> Renados Sanctuary Front West Door Stage: 68 Room: 0 - Spawn: "05" + Spawn: 5 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Renados Sanctuary Front West Door Interior -> Renados Sanctuary Front West Door Exterior Alias: Renados Sanctuary Front West Door -> Kakariko Village Stage: 46 Room: 0 - Spawn: "2E" + Spawn: 46 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior - Door Couple Tag: Renados Sanctuary Back Door + Entrance Couple Tag: Renados Sanctuary Back Door Forward: Connection: Renados Sanctuary Back East Door Exterior -> Renados Sanctuary Back East Door Interior Alias: Kakriko Village -> Renados Sanctuary Back East Door Stage: 68 Room: 0 - Spawn: "08" + Spawn: 8 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Renados Sanctuary Back East Door Interior -> Renados Sanctuary Back East Door Exterior Alias: Renados Sanctuary Back East Door -> Kakariko Village Stage: 46 Room: 0 - Spawn: "33" + Spawn: 51 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior - Door Couple Tag: Renados Sanctuary Back Door + Entrance Couple Tag: Renados Sanctuary Back Door Forward: Connection: Renados Sanctuary Back West Door Exterior -> Renados Sanctuary Back West Door Interior Alias: Kakriko Village -> Renados Sanctuary Back West Door Stage: 68 Room: 0 - Spawn: "07" + Spawn: 7 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Renados Sanctuary Back West Door Interior -> Renados Sanctuary Back West Door Exterior Alias: Renados Sanctuary Back West Door -> Kakariko Village Stage: 46 Room: 0 - Spawn: "32" + Spawn: 50 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior Forward: Connection: Kakariko Renados Sanctuary -> Kakariko Renados Sanctuary Basement Stage: 75 Room: 7 - Spawn: "00" + Spawn: 0 Spawn Type: "FF" Parameters: "FFFF" - State: "FF" + State: -1 Return: Connection: Kakariko Renados Sanctuary Basement -> Kakariko Renados Sanctuary Stage: 68 Room: 0 - Spawn: "02" + Spawn: 2 Spawn Type: "FF" Parameters: "FFFF" - State: "FF" + State: -1 - Type: Interior Forward: @@ -1242,61 +1263,61 @@ Alias: Kakariko Village -> Kakariko Malo Mart Stage: 68 Room: 3 - Spawn: "00" + Spawn: 0 Spawn Type: "10" Parameters: "f09f" - State: "FF" + State: -1 Return: Connection: Kakariko Malo Mart -> Lower Kakariko Village Alias: Kakariko Malo Mart -> Kakariko Village Stage: 46 Room: 0 - Spawn: "28" + Spawn: 40 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior - Door Couple Tag: Elde Inn + Entrance Couple Tag: Elde Inn Forward: Connection: Elde Inn North Door Exterior -> Elde Inn North Door Interior Alias: Kakariko Village -> Edle Inn North Door Stage: 68 Room: 2 - Spawn: "02" + Spawn: 2 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Elde Inn North Door Interior -> Elde Inn North Door Exterior Alias: Elde Inn North Door -> Kakariko Village Stage: 46 Room: 0 - Spawn: "31" + Spawn: 49 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior - Door Couple Tag: Elde Inn + Entrance Couple Tag: Elde Inn Forward: Connection: Elde Inn South Door Exterior -> Elde Inn South Door Interior Alias: Kakariko Village -> Elde Inn South Door Stage: 68 Room: 2 - Spawn: "00" + Spawn: 0 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Elde Inn South Door Interior -> Elde Inn South Door Exterior Alias: Elde Inn South Door -> Kakariko Village Stage: 46 Room: 0 - Spawn: "2A" + Spawn: 42 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior Forward: @@ -1304,19 +1325,19 @@ Alias: Kakariko Village -> Kakariko Bug House Door Stage: 68 Room: 6 - Spawn: "05" + Spawn: 5 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Kakariko Bug House -> Kakariko Bug House Door Alias: Kakariko Bug House Door -> Kakariko Village Stage: 46 Room: 0 - Spawn: "29" + Spawn: 41 Spawn Type: "90" Parameters: "F03F" - State: "FF" + State: -1 - Type: Interior Forward: @@ -1324,19 +1345,19 @@ Alias: Kakariko Village -> Kakariko Bug House Ceiling Hole Stage: 68 Room: 6 - Spawn: "00" + Spawn: 0 Spawn Type: "00" Parameters: "F03F" - State: "FF" + State: -1 Return: Connection: Kakariko Bug House -> Kakariko Bug House Ceiling Hole Alias: Kakariko Bug House Ceiling Hole -> Kakariko Village Stage: 46 Room: 0 - Spawn: "04" + Spawn: 4 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 - Type: Interior Forward: @@ -1344,19 +1365,19 @@ Alias: Kakariko Village -> Kakariko Barnes Bomb Shop Door Stage: 68 Room: 1 - Spawn: "02" + Spawn: 2 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Kakariko Barnes Bomb Shop Lower -> Lower Kakariko Village Alias: Kakariko Barnes Bomb Shop Door -> Kakariko Village Stage: 46 Room: 0 - Spawn: "2C" + Spawn: 44 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior Forward: @@ -1364,19 +1385,19 @@ Alias: Kakariko Village -> Kakariko Barnes Bomb Shop Window Stage: 68 Room: 1 - Spawn: "00" + Spawn: 0 Spawn Type: "00" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Kakariko Barnes Bomb Shop Upper -> Upper Kakariko Village Alias: Kakariko Barnes Bomb Shop Window -> Kakariko Village Stage: 46 Room: 0 - Spawn: "0A" + Spawn: 10 Spawn Type: "10" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior Forward: @@ -1384,19 +1405,19 @@ Alias: Kakariko Village -> Kakariko Watchtower Lower Door Stage: 68 Room: 4 - Spawn: "00" + Spawn: 0 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Kakariko Watchtower Lower Interior -> Kakariko Watchtower Lower Door Alias: Kakariko Watchtower Lower Door -> Kakariko Village Stage: 46 Room: 0 - Spawn: "2D" + Spawn: 45 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior Forward: @@ -1404,19 +1425,19 @@ Alias: Kakariko Village -> Kakariko Watchtower Dig Spot Stage: 68 Room: 4 - Spawn: "01" + Spawn: 1 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Kakariko Watchtower Lower Interior -> Kakariko Watchtower Dig Spot Alias: Kakariko Watchtower Dig Spot -> Kakariko Village Stage: 46 Room: 0 - Spawn: "03" + Spawn: 3 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 - Type: Interior Forward: @@ -1424,19 +1445,19 @@ Alias: Kakariko Village -> Kakariko Watchtower Upper Door Stage: 68 Room: 4 - Spawn: "02" + Spawn: 2 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Kakariko Watchtower Upper Interior -> Kakariko Top of Watchtower Alias: Kakariko Watchtower Upper Door -> Kakariko Village Stage: 46 Room: 0 - Spawn: "2F" + Spawn: 47 Spawn Type: "00" Parameters: "F01F" - State: "FF" + State: -1 - Type: Interior Forward: @@ -1444,19 +1465,19 @@ Alias: Death Mountain -> Death Mountain Sumo Hall Stage: 69 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Death Mountain Sumo Hall -> Death Mountain Outside Sumo Hall Alias: Death Mountain Sumo Hall -> Death Mountain Stage: 47 Room: 3 - Spawn: "01" + Spawn: 1 Spawn Type: "00" Parameters: "F01F" - State: "FF" + State: -1 - Type: Interior Forward: @@ -1464,194 +1485,194 @@ Alias: Death Mountain Elevator -> Death Mountain Sumo Hall Stage: 69 Room: 0 - Spawn: "03" + Spawn: 3 Spawn Type: "E0" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Death Mountain Sumo Hall Elevator -> Death Mountain Lower Elevator Alias: Death Mountain Sumo Hall -> Death Mountain Elevator Stage: 47 Room: 3 - Spawn: "03" + Spawn: 3 Spawn Type: "E0" Parameters: "F01F" - State: "FF" + State: -1 - Type: Interior Forward: Connection: Hidden Village -> Hidden Village Impaz House Stage: 72 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Hidden Village Impaz House -> Hidden Village Stage: 63 Room: 0 - Spawn: "01" + Spawn: 1 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior Forward: Connection: Upper Zoras River -> Upper Zoras River Izas House Stage: 49 Room: 1 - Spawn: "01" + Spawn: 1 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Upper Zoras River Izas House -> Upper Zoras River Stage: 61 Room: 0 - Spawn: "04" + Spawn: 4 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior Forward: Connection: Fishing Hole -> Fishing Hole House Stage: 71 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "A0" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Fishing Hole House -> Fishing Hole Stage: 62 Room: 0 - Spawn: "03" + Spawn: 3 Spawn Type: "B0" Parameters: "F01F" - State: "FF" + State: -1 + +# Leave Disabled for now: The Spawn point changes based on progression +# - Type: Interior +# Forward: +# Connection: Castle Town West -> Castle Town STAR Game +# Stage: 74 +# Room: 7 +# Spawn: 3 +# Spawn Type: "10" +# Parameters: "F090" +# State: -1 +# Return: +# Connection: Castle Town STAR Game -> Castle Town West +# Stage: 53 +# Room: 2 +# Spawn: 1 +# Spawn Type: "10" +# Parameters: "F01F" +# State: -1 - Type: Interior - Forward: - Connection: Castle Town West -> Castle Town STAR Game - Stage: 74 - Room: 7 - Spawn: "03" - Spawn Type: "10" - Parameters: "F090" - State: "FF" - Return: - Connection: Castle Town STAR Game -> Castle Town West - Stage: 53 - Room: 2 - Spawn: "01" - Spawn Type: "10" - Parameters: "F01F" - State: "FF" - - -- Type: Interior - Door Couple Tag: Castle Town Goron House + Entrance Couple Tag: Castle Town Goron House Forward: Connection: Castle Town Goron House West Door Exterior -> Castle Town Goron House West Door Interior Alias: Castle Town Center -> Castle Town Goron House West Door Stage: 73 Room: 4 - Spawn: "00" + Spawn: 0 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Castle Town Goron House West Door Interior -> Castle Town Goron House West Door Exterior Alias: Castle Town Goron House West Door -> Castle Town Center Stage: 53 Room: 0 - Spawn: "0E" + Spawn: 14 Spawn Type: "00" Parameters: "F01F" - State: "FF" + State: -1 - Type: Interior - Door Couple Tag: Castle Town Goron House + Entrance Couple Tag: Castle Town Goron House Forward: Connection: Castle Town Goron House East Door Exterior -> Castle Town Goron House East Door Interior Alias: Castle Town Center -> Castle Town Goron House East Door Stage: 73 Room: 4 - Spawn: "02" + Spawn: 2 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Castle Town Goron House East Door Interior -> Castle Town Goron House East Door Exterior Alias: Castle Town Goron House East Door -> Castle Town Center Stage: 53 Room: 0 - Spawn: "10" + Spawn: 16 Spawn Type: "00" Parameters: "F01F" - State: "FF" + State: -1 - Type: Interior Forward: Connection: Castle Town Center -> Castle Town Malo Mart Stage: 73 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Castle Town Malo Mart -> Castle Town Center Stage: 53 Room: 0 - Spawn: "0C" + Spawn: 12 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior - Door Couple Tag: Castle Town Doctors Office + Entrance Couple Tag: Castle Town Doctors Office Forward: Connection: Castle Town Doctors Office West Door Exterior -> Castle Town Doctors Office West Door Interior Alias: Castle Town East -> Castle Town Doctors Office West Door Stage: 73 Room: 2 - Spawn: "01" + Spawn: 1 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Castle Town Doctors Office West Door Interior -> Castle Town Doctors Office West Door Exterior Alias: Castle Town Doctors Office West Door -> Castle Town East Stage: 53 Room: 4 - Spawn: "04" + Spawn: 4 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior - Door Couple Tag: Castle Town Doctors Office + Entrance Couple Tag: Castle Town Doctors Office Forward: Connection: Castle Town Doctors Office East Door Exterior -> Castle Town Doctors Office East Door Interior Alias: Castle Town East -> Castle Town Doctors Office East Door Stage: 73 Room: 2 - Spawn: "00" + Spawn: 0 Spawn Type: "B0" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Castle Town Doctors Office East Door Interior -> Castle Town Doctors Office East Door Exterior Alias: Castle Town Doctors Office East Door -> Castle Town East Stage: 53 Room: 4 - Spawn: "03" + Spawn: 3 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior Forward: @@ -1659,91 +1680,91 @@ Alias: Castle Town Doctors Office Balcony -> Castle Town Doctors Office Stage: 73 Room: 2 - Spawn: "02" + Spawn: 2 Spawn Type: "10" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Castle Town Doctors Office Upper -> Castle Town Doctors Office Balcony Alias: Castle Town Doctors Office -> Castle Town Doctors Office Balcony Stage: 53 Room: 4 - Spawn: "05" + Spawn: 5 Spawn Type: "00" Parameters: "F05F" - State: "FF" + State: -1 - Type: Interior Forward: Connection: Castle Town South -> Castle Town Agithas House Stage: 73 Room: 3 - Spawn: "01" + Spawn: 1 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Castle Town Agithas House -> Castle Town South Stage: 53 Room: 3 - Spawn: "05" + Spawn: 5 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior Forward: Connection: Castle Town South -> Castle Town Seer House Stage: 73 Room: 1 - Spawn: "00" + Spawn: 0 Spawn Type: "10" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Castle Town Seer House -> Castle Town South Stage: 53 Room: 3 - Spawn: "04" + Spawn: 4 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 - Type: Interior Forward: Connection: Castle Town South -> Castle Town Jovanis House Stage: 73 Room: 5 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Castle Town Jovanis House -> Castle Town South Stage: 53 Room: 3 - Spawn: "0A" + Spawn: 10 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 - Type: Interior Forward: Connection: Castle Town South -> Castle Town Telmas Bar Stage: 70 Room: 5 - Spawn: "00" + Spawn: 0 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Castle Town Telmas Bar -> Castle Town South Stage: 53 Room: 3 - Spawn: "01" + Spawn: 1 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 ############################### # CAVES # @@ -1755,19 +1776,19 @@ Alias: South Faron Woods -> Faron Woods Cave Stage: 40 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Faron Woods Cave South -> South Faron Woods Behind Gate Alias: Faron Woods Cave -> South Faron Woods Stage: 45 Room: 3 - Spawn: "63" + Spawn: 99 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Cave Forward: @@ -1775,19 +1796,19 @@ Alias: Faron Woods Mist Area -> Faron Woods Cave Stage: 40 Room: 0 - Spawn: "01" + Spawn: 1 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Faron Woods Cave North -> Mist Area Near Faron Woods Cave Alias: Faron Woods Cave -> Faron Woods Mist Area Stage: 45 Room: 5 - Spawn: "04" + Spawn: 4 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 - Type: Cave Forward: @@ -1795,19 +1816,19 @@ Alias: Faron Woods Mist Area -> Faron Woods Mist Cave Stage: 45 Room: 14 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Mist Area Faron Mist Cave -> Mist Area Outside Faron Mist Cave Alias: Faron Woods Mist Cave -> Faron Woods Mist Area Stage: 45 Room: 5 - Spawn: "06" + Spawn: 6 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Cave Forward: @@ -1815,19 +1836,19 @@ Alias: Kakariko Gorge -> Eldin Lantern Cave Stage: 32 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "00" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Eldin Lantern Cave -> Kakariko Gorge Cave Entrance Alias: Eldin Lantern Cave -> Kakariko Gorge Stage: 56 Room: 3 - Spawn: "0F" + Spawn: 15 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 - Type: Cave Forward: @@ -1835,19 +1856,19 @@ Alias: Eldin Field -> Eldin Field Lava Cave Upper Stage: 34 Room: 10 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Eldin Field Lava Cave Upper -> Eldin Field Lava Cave Upper Ledge Alias: Eldin Field Lava Cave Upper -> Eldin Field Stage: 56 Room: 0 - Spawn: "14" + Spawn: 20 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Cave Forward: @@ -1855,19 +1876,19 @@ Alias: Eldin Field Lava Cave Lower -> Eldin Field Stage: 56 Room: 0 - Spawn: "15" + Spawn: 21 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Eldin Field Lava Cave Lower Ledge -> Eldin Field Lava Cave Lower Alias: Eldin Field -> Eldin Field Lava Cave Lower Stage: 34 Room: 10 - Spawn: "01" + Spawn: 1 Spawn Type: "00" Parameters: "F09F" - State: "FF" + State: -1 - Type: Cave Forward: @@ -1875,19 +1896,19 @@ Alias: Lanayru Field -> Lanayru Ice Puzzle Cave Stage: 30 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "00" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Lanayru Ice Puzzle Cave -> Lanayru Field Cave Entrance Alias: Lanayru Ice Puzzle Cave -> Lanayru Field Stage: 56 Room: 10 - Spawn: "0F" + Spawn: 15 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 - Type: Cave Forward: @@ -1895,19 +1916,19 @@ Alias: Lake Hylia -> Lanayru Spring Stage: 52 Room: 1 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "C000" - State: "FF" + State: -1 Return: Connection: Lake Hylia Lanayru Spring -> Lake Hylia Alias: Lanayru Spring -> Lake Hylia Stage: 52 Room: 0 - Spawn: "07" + Spawn: 7 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Cave Forward: @@ -1915,19 +1936,19 @@ Alias: Lake Hylia -> Lake Hylia Long Cave Stage: 33 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Lake Hylia Long Cave -> Lake Hylia Cave Entrance Alias: Lake Hylia Long Cave -> Lake Hylia Stage: 52 Room: 0 - Spawn: "1D" + Spawn: 29 Spawn Type: "00" Parameters: "F01F" - State: "FF" + State: -1 - Type: Cave Forward: @@ -1935,19 +1956,19 @@ Alias: Gerudo Desert -> Cave of Ordeals Stage: 31 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Cave of Ordeals -> Gerudo Desert Cave of Ordeals Plateau Alias: Cave of Ordeals -> Gerudo Desert Stage: 59 Room: 0 - Spawn: "06" + Spawn: 6 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 ############################### # OVERWORLD # @@ -1958,36 +1979,36 @@ Connection: Outside Links House -> Ordon Village Stage: 43 Room: 0 - Spawn: "01" + Spawn: 1 Spawn Type: "00" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Ordon Village -> Outside Links House Stage: 43 Room: 1 - Spawn: "00" + Spawn: 0 Spawn Type: "10" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: Connection: Outside Links House -> Ordon Spring Stage: 44 Room: 1 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Ordon Spring -> Outside Links House Stage: 43 Room: 1 - Spawn: "02" + Spawn: 2 Spawn Type: "50" Parameters: "3091" - State: "FF" + State: -1 - Type: Overworld Forward: @@ -1995,37 +2016,37 @@ Alias: Ordon Village -> Ordon Ranch Stage: 41 Room: 0 - Spawn: "01" + Spawn: 1 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Ordon Ranch Village Pathway -> Ordon Village Alias: Ordon Ranch -> Ordon Village Stage: 43 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "00" Parameters: "F01F" - State: "FF" + State: -1 - Type: Overworld Forward: Connection: Ordon Bridge -> South Faron Woods Stage: 45 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: South Faron Woods -> Ordon Bridge Stage: 44 Room: 1 - Spawn: "01" + Spawn: 1 Spawn Type: "00" Parameters: "F01F" - State: "FF" + State: -1 - Type: Overworld Forward: @@ -2033,19 +2054,19 @@ Alias: South Faron Woods -> Faron Woods Mist Area Stage: 45 Room: 5 - Spawn: "62" + Spawn: 98 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Mist Area Near Owl Statue Chest -> South Faron Woods Above Owl Statue Alias: Faron Woods Mist Area -> South Faron Woods Stage: 45 Room: 8 - Spawn: "02" + Spawn: 2 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: @@ -2053,19 +2074,19 @@ Alias: Faron Woods Mist Area -> North Faron Woods Stage: 45 Room: 6 - Spawn: "02" + Spawn: 2 Spawn Type: "00" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: North Faron Woods -> Mist Area Near North Faron Woods Alias: North Faron Woods -> Faron Woods Mist Area Stage: 45 Room: 11 - Spawn: "00" + Spawn: 0 Spawn Type: "00" Parameters: "F01F" - State: "FF" + State: -1 - Type: Overworld Forward: @@ -2073,19 +2094,19 @@ Alias: North Faron Woods -> Lost Woods Stage: 54 Room: 3 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Lost Woods -> North Faron Lost Woods Ledge Alias: Lost Woods -> North Faron Woods Stage: 45 Room: 6 - Spawn: "03" + Spawn: 3 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 - Type: Overworld Forward: @@ -2093,19 +2114,19 @@ Alias: Lost Woods Lower Battle Arena -> Sacred Grove Stage: 54 Room: 1 - Spawn: "03" + Spawn: 3 Spawn Type: "50" Parameters: "" - State: "FF" + State: -1 Return: Connection: Sacred Grove Lower -> Lost Woods Lower Battle Arena Alias: Sacred Grove -> Lost Woods Lower Battle Arena Stage: 54 Room: 1 - Spawn: "01" + Spawn: 1 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 - Type: Overworld Forward: @@ -2113,19 +2134,19 @@ Alias: Lost Woods Upper Battle Arena -> Sacred Grove Stage: 54 Room: 1 - Spawn: "06" + Spawn: 6 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Sacred Grove Before Block -> Lost Woods Upper Battle Arena Alias: Sacred Grove -> Lost Woods Upper Battle Arena Stage: 54 Room: 3 - Spawn: "02" + Spawn: 2 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 - Type: Overworld Forward: @@ -2133,37 +2154,37 @@ Alias: Sacred Grove -> Sacred Grove Past Stage: 54 Room: 2 - Spawn: "00" + Spawn: 0 Spawn Type: "00" Parameters: "F012" - State: "FF" + State: 2 Return: Connection: Sacred Grove Past -> Sacred Grove Upper Alias: Sacred Grove Past -> Sacred Grove Stage: 54 Room: 1 - Spawn: "05" + Spawn: 5 Spawn Type: "10" Parameters: "F032" - State: "FF" + State: 2 - Type: Overworld Forward: Connection: South Faron Woods -> Faron Field Stage: 56 Room: 6 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Faron Field -> South Faron Woods Stage: 45 Room: 4 - Spawn: "08" + Spawn: 8 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: @@ -2171,19 +2192,19 @@ Alias: Faron Field -> Outside Castle Town South Stage: 57 Room: 16 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Outside Castle Town South -> Faron Field Behind Boulder Alias: Outside Castle Town South -> Faron Field Stage: 56 Room: 6 - Spawn: "01" + Spawn: 1 Spawn Type: "00" Parameters: "F01F" - State: "FF" + State: -1 - Type: Overworld Forward: @@ -2191,19 +2212,19 @@ Alias: Kakariko Gorge -> Kakariko Village Stage: 46 Room: 0 - Spawn: "3C" + Spawn: 60 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Lower Kakariko Village -> Kakariko Gorge Behind Gate Alias: Kakariko Village -> Kakariko Gorge Stage: 56 Room: 3 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: @@ -2211,19 +2232,19 @@ Alias: Kakariko Village -> Kakariko Graveyard Stage: 48 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "00" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Kakariko Graveyard -> Lower Kakariko Village Alias: Kakariko Graveyard -> Kakariko Village Stage: 46 Room: 0 - Spawn: "06" + Spawn: 6 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: @@ -2231,39 +2252,40 @@ Alias: Kakariko Village -> Death Mountain Stage: 47 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Death Mountain Near Kakariko -> Lower Kakariko Village Alias: Death Mountain -> Kakariko Village Stage: 46 Room: 0 - Spawn: "01" + Spawn: 1 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 -- Type: Overworld - Forward: - Connection: Kakariko Graveyard Pond -> Lake Hylia - Alias: Kakariko Graveyard -> Lake Hylia - Stage: 52 - Room: 0 - Spawn: "19" - Spawn Type: "D0" - Parameters: "00FF" - State: "FF" - Return: - Connection: Lake Hylia -> Kakariko Graveyard Pond - Alias: Lake Hylia -> Kakariko Graveyard - Stage: -1 - Room: -1 - Spawn: "" - Spawn Type: "" - Parameters: "" - State: "FF" +# Disabled until we use stage service to create a spawn in graveyard +# - Type: Overworld +# Forward: +# Connection: Kakariko Graveyard Pond -> Lake Hylia +# Alias: Kakariko Graveyard -> Lake Hylia +# Stage: 52 +# Room: 0 +# Spawn: 25 +# Spawn Type: "D0" +# Parameters: "00FF" +# State: -1 + # Return: + # Connection: Lake Hylia -> Kakariko Graveyard Pond + # Alias: Lake Hylia -> Kakariko Graveyard + # Stage: -1 + # Room: -1 + # Spawn: + # Spawn Type: "" + # Parameters: "" + # State: -1 - Type: Overworld Forward: @@ -2271,19 +2293,19 @@ Alias: Kakariko Village -> Eldin Field Stage: 56 Room: 0 - Spawn: "01" + Spawn: 1 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Eldin Field -> Kakariko Village Behind Gate Alias: Eldin Field -> Kakariko Village Stage: 46 Room: 0 - Spawn: "08" + Spawn: 8 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: @@ -2291,19 +2313,19 @@ Alias: Eldin Field -> Outside Castle Town East Stage: 57 Room: 17 - Spawn: "01" + Spawn: 1 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Outside Castle Town East -> Eldin Field Near Castle Town Alias: Outside Castle Town East -> Eldin Field Stage: 56 Room: 0 - Spawn: "07" + Spawn: 7 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: @@ -2311,19 +2333,19 @@ Alias: Eldin Field -> Hidden Village Stage: 63 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Hidden Village -> Eldin Field Outside Hidden Village Alias: Hidden Village -> Eldin Field Stage: 56 Room: 7 - Spawn: "01" + Spawn: 1 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: @@ -2331,93 +2353,203 @@ Alias: Lanayru Field -> Zoras Domain Stage: 50 Room: 1 - Spawn: "0F" + Spawn: 15 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Zoras Domain West Ledge -> Lanayru Field Near Zoras Domain Alias: Zoras Domain -> Lanayru Field Stage: 56 Room: 10 - Spawn: "03" + Spawn: 3 Spawn Type: "00" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: Connection: Upper Zoras River -> Fishing Hole Stage: 62 Room: 0 - Spawn: "02" + Spawn: 2 Spawn Type: "B0" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Fishing Hole -> Upper Zoras River Stage: 61 Room: 0 - Spawn: "0A" + Spawn: 10 Spawn Type: "A0" Parameters: "F01F" - State: "FF" + State: -1 + +# Disabled until we use stage service to create a spawn in Upper Zoras River +# - Type: Overworld +# Forward: +# Connection: Upper Zoras River -> Lanayru Field +# Stage: 56 +# Room: 10 +# Spawn: 2 +# Spawn Type: D0"" +# Parameters: "00FF" +# State: -1 + # Return: + # Connection: Lanayru Field -> Upper Zoras River + # Stage: + # Room: + # Spawn: + # Spawn Type: "" + # Parameters: "" + # State: -1 - Type: Overworld + Entrance Couple Tag: Zoras Domain From Upper Zoras River Forward: - Connection: Upper Zoras River -> Lanayru Field - Stage: 56 - Room: 10 - Spawn: "02" - Spawn Type: D0"" - Parameters: "00FF" - State: "FF" - Return: - Connection: Lanayru Field -> Upper Zoras River - Stage: - Room: - Spawn: "" - Spawn Type: "" - Parameters: "" - State: "FF" - -- Type: Overworld - Forward: - Connection: Upper Zoras River -> Zoras Domain + Connection: Upper Zoras River To Zoras Domain (Swimming) -> Zoras Domain To Upper Zoras River (Swimming) + Alias: Upper Zoras River -> Zoras Domain Stage: 50 Room: 1 - Spawn: "0A" + Spawn: 11 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: - Connection: Zoras Domain -> Upper Zoras River + Connection: Zoras Domain To Upper Zoras River (Swimming) -> Upper Zoras River To Zoras Domain (Swimming) + Alias: Zoras Domain -> Upper Zoras River Stage: 61 Room: 0 - Spawn: "07" + Spawn: 6 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld + Entrance Couple Tag: Zoras Domain From Upper Zoras River Forward: - Connection: Zoras Domain Top of Waterfall -> Zoras Throne Room + Connection: Upper Zoras River To Zoras Domain (Underwater) -> Zoras Domain To Upper Zoras River (Underwater) + Alias: Upper Zoras River -> Zoras Domain + Stage: 50 + Room: 1 + Spawn: 12 + Spawn Type: "50" + Parameters: "F09F" + State: -1 + Return: + Connection: Zoras Domain To Upper Zoras River (Underwater) -> Upper Zoras River To Zoras Domain (Underwater) + Alias: Zoras Domain -> Upper Zoras River + Stage: 61 + Room: 0 + Spawn: 8 + Spawn Type: "50" + Parameters: "F09F" + State: -1 + +- Type: Overworld + Entrance Couple Tag: Zoras Domain From Upper Zoras River + Forward: + Connection: Upper Zoras River To Zoras Domain (On Land) -> Zoras Domain To Upper Zoras River (On Land) + Alias: Upper Zoras River -> Zoras Domain + Stage: 50 + Room: 1 + Spawn: 10 + Spawn Type: "50" + Parameters: "F09F" + State: -1 + Return: + Connection: Zoras Domain To Upper Zoras River (On Land) -> Upper Zoras River To Zoras Domain (On Land) + Alias: Zoras Domain -> Upper Zoras River + Stage: 61 + Room: 0 + Spawn: 7 + Spawn Type: "50" + Parameters: "F09F" + State: -1 + +- Type: Overworld + Entrance Couple Tag: Zoras Domain Throne Room + Forward: + Connection: Zoras Domain Top of Waterfall Underwater -> Zoras Throne Room Underwater Alias: Zoras Domain -> Zoras Throne Room Stage: 50 Room: 0 - Spawn: "01" - Spawn Type: "50" + Spawn: 7 + Spawn Type: "80" Parameters: "F09F" - State: "FF" + State: -1 Return: - Connection: Zoras Throne Room -> Zoras Domain Top of Waterfall + Connection: Zoras Throne Room Underwater -> Zoras Domain Top of Waterfall Underwater Alias: Zoras Throne Room -> Zoras Domain Stage: 50 Room: 1 - Spawn: "00" + Spawn: 9 + Spawn Type: "80" + Parameters: "F09F" + State: -1 + +- Type: Overworld + Entrance Couple Tag: Zoras Domain Throne Room + Forward: + Connection: Zoras Domain Top of Waterfall West -> Zoras Throne Room West + Alias: Zoras Domain -> Zoras Throne Room + Stage: 50 + Room: 0 + Spawn: 1 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 + Return: + Connection: Zoras Throne Room West -> Zoras Domain Top of Waterfall West + Alias: Zoras Throne Room -> Zoras Domain + Stage: 50 + Room: 1 + Spawn: 0 + Spawn Type: "50" + Parameters: "F09F" + State: -1 + +- Type: Overworld + Entrance Couple Tag: Zoras Domain Throne Room + Forward: + Connection: Zoras Domain Top of Waterfall East -> Zoras Throne Room East + Alias: Zoras Domain -> Zoras Throne Room + Stage: 50 + Room: 0 + Spawn: 4 + Spawn Type: "50" + Parameters: "F09F" + State: -1 + Return: + Connection: Zoras Throne Room East -> Zoras Domain Top of Waterfall East + Alias: Zoras Throne Room -> Zoras Domain + Stage: 50 + Room: 1 + Spawn: 4 + Spawn Type: "50" + Parameters: "F09F" + State: -1 + +- Type: Overworld + Entrance Couple Tag: Zoras Domain Throne Room + Forward: + Connection: Zoras Domain Top of Waterfall Center -> Zoras Throne Room Center + Alias: Zoras Domain -> Zoras Throne Room + Stage: 50 + Room: 0 + Spawn: 3 + Spawn Type: "50" + Parameters: "F09F" + State: -1 + Return: + Connection: Zoras Throne Room Center -> Zoras Domain Top of Waterfall Center + Alias: Zoras Throne Room -> Zoras Domain + Stage: 50 + Room: 1 + Spawn: 8 + Spawn Type: "50" + Parameters: "F09F" + State: -1 - Type: Overworld Forward: @@ -2425,19 +2557,19 @@ Alias: Zoras Domain -> Snowpeak Province Stage: 51 Room: 0 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Snowpeak Climb Lower -> Zoras Domain Alias: Snowpeak Province -> Zoras Domain Stage: 50 Room: 1 - Spawn: "06" + Spawn: 6 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: @@ -2445,271 +2577,273 @@ Alias: Snowpeak Climb -> Snowpeak Summit Cave Stage: 51 Room: 2 - Spawn: "08" + Spawn: 8 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Snowpeak Summit Cave -> Snowpeak Climb Upper Alias: Snowpeak Summit Cave -> Snowpeak Climb Stage: 51 Room: 0 - Spawn: "0F" + Spawn: 15 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 - Type: Overworld Forward: Connection: Lanayru Field -> Outside Castle Town West Stage: 57 Room: 8 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Outside Castle Town West -> Lanayru Field Stage: 56 Room: 10 - Spawn: "04" + Spawn: 4 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: Connection: Outside Castle Town West -> Lake Hylia Bridge Stage: 56 Room: 12 - Spawn: "01" + Spawn: 1 Spawn Type: "00" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Lake Hylia Bridge -> Outside Castle Town West Stage: 57 Room: 8 - Spawn: "02" + Spawn: 2 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: Connection: Outside Castle Town West -> Castle Town West Stage: 53 Room: 2 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Castle Town West -> Outside Castle Town West Stage: 57 Room: 8 - Spawn: "01" + Spawn: 1 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: Connection: Castle Town West -> Castle Town Center Stage: 53 Room: 0 - Spawn: "04" + Spawn: 4 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Castle Town Center -> Castle Town West Stage: 53 Room: 2 - Spawn: "02" + Spawn: 2 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 - Type: Overworld Forward: Connection: Castle Town West -> Castle Town South Stage: 53 Room: 3 - Spawn: "08" + Spawn: 8 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Castle Town South -> Castle Town West Stage: 53 Room: 2 - Spawn: "03" + Spawn: 3 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: Connection: Castle Town Center -> Castle Town North Stage: 53 Room: 1 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Castle Town North -> Castle Town Center Stage: 53 Room: 0 - Spawn: "03" + Spawn: 3 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: Connection: Castle Town Center -> Castle Town East Stage: 53 Room: 4 - Spawn: "02" + Spawn: 2 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Castle Town East -> Castle Town Center Stage: 53 Room: 0 - Spawn: "06" + Spawn: 6 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: Connection: Castle Town Center -> Castle Town South Stage: 53 Room: 3 - Spawn: "02" + Spawn: 2 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Castle Town South -> Castle Town Center Stage: 53 Room: 0 - Spawn: "05" + Spawn: 5 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: Connection: Castle Town East -> Outside Castle Town East Stage: 57 Room: 17 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Outside Castle Town East -> Castle Town East Stage: 53 Room: 4 - Spawn: "00" + Spawn: 0 Spawn Type: "10" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: Connection: Castle Town East -> Castle Town South Stage: 53 Room: 3 - Spawn: "09" + Spawn: 9 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Castle Town South -> Castle Town East Stage: 53 Room: 4 - Spawn: "06" + Spawn: 6 Spawn Type: "50" Parameters: "F09F" - State: "FF" + State: -1 - Type: Overworld Forward: Connection: Castle Town South -> Outside Castle Town South Stage: 57 Room: 16 - Spawn: "01" + Spawn: 1 Spawn Type: "05" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Outside Castle Town South -> Castle Town South Stage: 53 Room: 3 - Spawn: "00" + Spawn: 0 Spawn Type: "10" Parameters: "F09F" - State: "FF" + State: -1 -- Type: Overworld - Forward: - Connection: Outside Castle Town South -> Lake Hylia - Stage: 57 - Room: 16 - Spawn: "01" - Spawn Type: "05" - Parameters: "F09F" - State: "FF" - Return: - Connection: Lake Hylia -> Outside Castle Town South - Stage: -1 - Room: -1 - Spawn: "" - Spawn Type: "" - Parameters: "" - State: "FF" +# Disabled until we use stage service to create a spawn Outside Castle Town +# - Type: Overworld +# Forward: +# Connection: Outside Castle Town South -> Lake Hylia +# Stage: 57 +# Room: 16 +# Spawn: 1 +# Spawn Type: "05" +# Parameters: "F09F" +# State: -1 + # Return: + # Connection: Lake Hylia -> Outside Castle Town South + # Stage: -1 + # Room: -1 + # Spawn: + # Spawn Type: "" + # Parameters: "" + # State: -1 - Type: Overworld Forward: Connection: Lake Hylia Bridge -> Flight by Fowl Stage: 52 Room: 0 - Spawn: "08" + Spawn: 8 Spawn Type: "B0" Parameters: "F09F" - State: "FF" + State: -1 Return: Connection: Flight by Fowl -> Lake Hylia Bridge Stage: 56 Room: 13 - Spawn: "01" + Spawn: 1 Spawn Type: "A0" Parameters: "F09F" - State: "FF" + State: -1 -- Type: Overworld - Forward: - Connection: Lake Hylia -> Gerudo Desert - Stage: 59 - Room: 0 - Spawn: "00" - Spawn Type: "00" - Parameters: "F018" - State: "FF" - Return: - Connection: Gerudo Desert -> Lake Hylia - Stage: - Room: - Spawn: "" - Spawn Type: "" - Parameters: "" - State: "FF" +# Disabled until we use stage service to create a spawn in Lake Hylia +# - Type: Overworld +# Forward: +# Connection: Lake Hylia -> Gerudo Desert +# Stage: 59 +# Room: 0 +# Spawn: 0 +# Spawn Type: "00" +# Parameters: "F018" +# State: -1 + # Return: + # Connection: Gerudo Desert -> Lake Hylia + # Stage: + # Room: + # Spawn: + # Spawn Type: "" + # Parameters: "" + # State: -1 - Type: Overworld Forward: @@ -2717,34 +2851,34 @@ Alias: Gerudo Desert -> Bulblin Camp Stage: 55 Room: 1 - Spawn: "00" + Spawn: 0 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Bulblin Camp -> Gerudo Desert Outside Bulblin Camp Alias: Bulblin Camp -> Gerudo Desert Stage: 59 Room: 0 - Spawn: "02" + Spawn: 2 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 - Type: Overworld Forward: Connection: Bulblin Camp -> Outside Arbiters Grounds Stage: 55 Room: 3 - Spawn: "07" + Spawn: 7 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 Return: Connection: Outside Arbiters Grounds -> Bulblin Camp Stage: 55 Room: 1 - Spawn: "02" + Spawn: 2 Spawn Type: "50" Parameters: "F01F" - State: "FF" + State: -1 diff --git a/mods/randomizer/generator/data/world/overworld/Lanayru Province.yaml b/mods/randomizer/generator/data/world/overworld/Lanayru Province.yaml index 2a26a3e65f..6bd59e4216 100644 --- a/mods/randomizer/generator/data/world/overworld/Lanayru Province.yaml +++ b/mods/randomizer/generator/data/world/overworld/Lanayru Province.yaml @@ -665,9 +665,35 @@ Exits: Upper Zoras River Izas House: Can_Open_Doors and Upper_Zoras_River_Portal Fishing Hole: Can_Open_Doors - Zoras Domain: Nothing + Upper Zoras River To Zoras Domain (On Land): Nothing + Upper Zoras River To Zoras Domain (Swimming): Nothing + Upper Zoras River To Zoras Domain (Underwater): Iron_Boots or Zora_Armor Lanayru Field: Nothing +- Name: Upper Zoras River To Zoras Domain (On Land) + Map Sector: Lanayru Province + Region: Upper Zoras River + Twilight: Lanayru + Exits: + Zoras Domain To Upper Zoras River (On Land): Nothing + Upper Zoras River: Nothing + +- Name: Upper Zoras River To Zoras Domain (Swimming) + Map Sector: Lanayru Province + Region: Upper Zoras River + Twilight: Lanayru + Exits: + Zoras Domain To Upper Zoras River (Swimming): Nothing + Upper Zoras River: Nothing + +- Name: Upper Zoras River To Zoras Domain (Underwater) + Map Sector: Lanayru Province + Region: Upper Zoras River + Twilight: Lanayru + Exits: + Zoras Domain To Upper Zoras River (Underwater): Iron_Boots or Zora_Armor + Upper Zoras River: Nothing + - Name: Upper Zoras River Izas House Can Warp: True Locations: @@ -718,7 +744,33 @@ Zoras Domain West Ledge: Clawshot or Can_Midna_Jump or Twilight Zoras Domain Top of Waterfall: Clawshot or Can_Midna_Jump or Twilight Snowpeak Climb Lower: Not_Twilight - Upper Zoras River: Nothing + Zoras Domain To Upper Zoras River (On Land): Nothing + Zoras Domain To Upper Zoras River (Swimming): Nothing + Zoras Domain To Upper Zoras River (Underwater): Iron_Boots or Zora_Armor + +- Name: Zoras Domain To Upper Zoras River (On Land) + Map Sector: Lanayru Province + Region: Zoras Domain + Twilight: Lanayru + Exits: + Upper Zoras River To Zoras Domain (On Land): Nothing + Zoras Domain: Nothing + +- Name: Zoras Domain To Upper Zoras River (Swimming) + Map Sector: Lanayru Province + Region: Zoras Domain + Twilight: Lanayru + Exits: + Upper Zoras River To Zoras Domain (Swimming): Nothing + Zoras Domain: Nothing + +- Name: Zoras Domain To Upper Zoras River (Underwater) + Map Sector: Lanayru Province + Region: Zoras Domain + Twilight: Lanayru + Exits: + Upper Zoras River To Zoras Domain (Underwater): Nothing + Zoras Domain: Iron_Boots or Zora_Armor - Name: Zoras Domain West Ledge Map Sector: Lanayru Province @@ -747,10 +799,45 @@ Zoras Domain Shortcut Lower Boulder Rupee: Can_Smash Zoras Domain Shortcut Upper Boulder Rupee: Can_Smash Exits: - Zoras Throne Room: Nothing + Zoras Domain Top of Waterfall Center: Nothing + Zoras Domain Top of Waterfall West: Nothing + Zoras Domain Top of Waterfall East: Nothing + Zoras Domain Top of Waterfall Underwater: Iron_Boots or Zora_Armor Zoras Domain West Ledge: Can_Smash Zoras Domain: Nothing +- Name: Zoras Domain Top of Waterfall Center + Map Sector: Lanayru Province + Region: Zoras Domain + Twilight: Lanayru + Exits: + Zoras Domain Top of Waterfall: Nothing + Zoras Throne Room Center: Nothing + +- Name: Zoras Domain Top of Waterfall West + Map Sector: Lanayru Province + Region: Zoras Domain + Twilight: Lanayru + Exits: + Zoras Domain Top of Waterfall: Nothing + Zoras Throne Room West: Nothing + +- Name: Zoras Domain Top of Waterfall East + Map Sector: Lanayru Province + Region: Zoras Domain + Twilight: Lanayru + Exits: + Zoras Domain Top of Waterfall: Nothing + Zoras Throne Room East: Iron_Boots or Zora_Armor + +- Name: Zoras Domain Top of Waterfall Underwater + Map Sector: Lanayru Province + Region: Zoras Domain + Twilight: Lanayru + Exits: + Zoras Domain Top of Waterfall: Nothing + Zoras Throne Room Underwater: Iron_Boots or Zora_Armor + - Name: Zoras Throne Room Map Sector: Lanayru Province Region: Zoras Domain @@ -769,4 +856,39 @@ Zoras Domain Underwater Goron: Water_Bombs and Iron_Boots and Zora_Armor Zoras Domain Throne Room Twilit Insect: Can_Defeat_Lanayru_Twilit_Insect Exits: - Zoras Domain Top of Waterfall: Nothing + Zoras Throne Room Center: Nothing + Zoras Throne Room West: Nothing + Zoras Throne Room East: Nothing + Zoras Throne Room Underwater: Iron_Boots or Zora_Armor + +- Name: Zoras Throne Room Center + Map Sector: Lanayru Province + Region: Zoras Domain + Twilight: Lanayru + Exits: + Zoras Domain Top of Waterfall Center: Nothing + Zoras Throne Room: Nothing + +- Name: Zoras Throne Room West + Map Sector: Lanayru Province + Region: Zoras Domain + Twilight: Lanayru + Exits: + Zoras Domain Top of Waterfall West: Nothing + Zoras Throne Room: Nothing + +- Name: Zoras Throne Room East + Map Sector: Lanayru Province + Region: Zoras Domain + Twilight: Lanayru + Exits: + Zoras Domain Top of Waterfall East: Nothing + Zoras Throne Room: Nothing + +- Name: Zoras Throne Room Underwater + Map Sector: Lanayru Province + Region: Zoras Domain + Twilight: Lanayru + Exits: + Zoras Domain Top of Waterfall Underwater: Nothing + Zoras Throne Room: Iron_Boots or Zora_Armor diff --git a/mods/randomizer/generator/logic/entrance.cpp b/mods/randomizer/generator/logic/entrance.cpp index a9095d914b..cecd220a81 100644 --- a/mods/randomizer/generator/logic/entrance.cpp +++ b/mods/randomizer/generator/logic/entrance.cpp @@ -357,30 +357,10 @@ namespace randomizer::logic::entrance return {parentAreaName, connectedAreaName}; } - bool Entrance::SetGameInfo(const YAML::Node& node) { - bool ret = true; - std::string stageIdString = node["Stage"].as(); - if (stageIdString == "null") { - stageIdString = "-1"; - ret = false; - } - int stageId = std::stoi(stageIdString); - if (stageId == -1) { - stageId = 0xFF; - } - SetStageId(static_cast(stageId)); - std::string roomNoString = node["Room"].as(); - if (roomNoString == "null") { - roomNoString = "-1"; - ret = false; - } - SetRoomNo(static_cast(std::stoi(roomNoString))); - SetPointNo(static_cast(std::stoi("0x0"+node["Spawn"].as(),nullptr,16))); - int layer = std::stoi("0x0"+node["State"].as(),nullptr,16); - if (layer == 0xFF) { - layer = -1; - } - SetLayerNo(static_cast(layer)); - return ret; + void Entrance::SetGameInfo(const YAML::Node& node) { + SetStageId(node["Stage"].as()); + SetRoomNo(node["Room"].as()); + SetPointNo(node["Spawn"].as()); + SetLayerNo(node["State"].as()); } } // namespace randomizer::logic::entrance diff --git a/mods/randomizer/generator/logic/entrance.hpp b/mods/randomizer/generator/logic/entrance.hpp index 78c1df9bf2..01762fdc35 100644 --- a/mods/randomizer/generator/logic/entrance.hpp +++ b/mods/randomizer/generator/logic/entrance.hpp @@ -158,9 +158,9 @@ namespace randomizer::logic::entrance int8_t GetRoomNo() const { return _roomNo; } int8_t GetLayerNo() const { return _layerNo; } int16_t GetPointNo() const { return _pointNo; } - bool SetGameInfo(const YAML::Node& node); - void SetCoupledDoor(int16_t entrance) { _coupledEntrance = entrance; } - int16_t getCoupledDoor() { return _coupledEntrance; } + void SetGameInfo(const YAML::Node& node); + void SetCoupledEntrances(const std::vector& entrances) { _coupledEntrances = entrances; } + const std::vector& getCoupledEntrances() const { return _coupledEntrances; } private: int _id = -1; @@ -223,7 +223,7 @@ namespace randomizer::logic::entrance Entrance* _assumed = nullptr; // If the entrance is a coupled door, this is the other door's point to override - int16_t _coupledEntrance = -1; + std::vector _coupledEntrances = {}; }; using EntrancePool = std::vector; diff --git a/mods/randomizer/generator/logic/entrance_shuffle.cpp b/mods/randomizer/generator/logic/entrance_shuffle.cpp index d042f2d264..8868d1d8dc 100644 --- a/mods/randomizer/generator/logic/entrance_shuffle.cpp +++ b/mods/randomizer/generator/logic/entrance_shuffle.cpp @@ -42,8 +42,8 @@ namespace randomizer::logic::entrance_shuffle void SetAllEntrancesData(world::World* world) { - // Keep track of which double door entrances are together - std::unordered_map> coupledDoors = {}; + // Keep track of which entrances are together + std::unordered_map> coupledEntrances = {}; auto entranceDataTree = LOAD_EMBED_YAML(RANDO_DATA_PATH "entrance_shuffle_data.yaml"); for (const auto& entranceDataNode : entranceDataTree) @@ -60,6 +60,21 @@ namespace randomizer::logic::entrance_shuffle } auto& forwardEntry = entranceDataNode["Forward"]; + + // If the entrance can't actually be mapped in-game, skip it + auto stageString = forwardEntry["Stage"].as(); + auto roomString = forwardEntry["Stage"].as(); + if (stageString == "null" || stageString == "-1" || roomString == "null" || roomString == "-1") { + continue; + } + if (entranceDataNode["Return"]) { + stageString = entranceDataNode["Return"]["Stage"].as(); + roomString = entranceDataNode["Return"]["Stage"].as(); + if (stageString == "null" || stageString == "-1" || roomString == "null" || roomString == "-1") { + continue; + } + } + // Check to make sure all required fields are present for the forward entry YAMLVerifyFields(forwardEntry, "Connection" /*, "Info" */); @@ -84,45 +99,50 @@ namespace randomizer::logic::entrance_shuffle returnEntry["Alias"] ? returnEntry["Alias"].as() : ""); forwardEntrance->BindTwoWay(returnEntrance); - // Add double door entrances to their respective tag group - if (entranceDataNode["Door Couple Tag"]) + // Add coupled entrances to their respective tag group + if (entranceDataNode["Entrance Couple Tag"]) { - auto tag = entranceDataNode["Door Couple Tag"].as(); - if (!coupledDoors.contains(tag)) + auto tag = entranceDataNode["Entrance Couple Tag"].as(); + if (!coupledEntrances.contains(tag)) { - coupledDoors[tag] = {}; + coupledEntrances[tag] = {}; } - coupledDoors.at(tag).push_back(forwardEntrance); - coupledDoors.at(tag).push_back(returnEntrance); + coupledEntrances.at(tag).push_back(forwardEntrance); + coupledEntrances.at(tag).push_back(returnEntrance); } } } - // If double doors are coupled, add the coupled door's info to the main door, remove the coupled door entrance, and + // If entrances are coupled, add the coupled entrance's spawn point to the main door, remove the coupled door entrance, and // rename the main door to be more general if (world->Setting("Decouple Double Door Entrances") == "Off") { - for (auto& [tag, doors] : coupledDoors) + for (auto& [tag, entrances] : coupledEntrances) { - while (!doors.empty()) + while (!entrances.empty()) { - auto mainDoor = doors.back(); - doors.pop_back(); + auto mainEntrance = entrances.back(); + entrances.pop_back(); - auto coupledDoorItr = - std::ranges::find_if(doors, - [&](const auto& door) { return door->IsPrimary() == mainDoor->IsPrimary(); }); - auto coupledDoor = *coupledDoorItr; + std::vector coupledPoints; + for (auto it = entrances.begin(); it != entrances.end();) { + auto coupledEntrance = *it; + if (coupledEntrance->IsPrimary() == mainEntrance->IsPrimary()) { + coupledPoints.push_back(coupledEntrance->GetPointNo()); - mainDoor->SetCoupledDoor(coupledDoor->GetPointNo()); + // Completely remove the coupled door from the world graph + coupledEntrance->GetConnectedArea()->RemoveEntrance(coupledEntrance); + coupledEntrance->GetParentArea()->RemoveExit(coupledEntrance); + it = entrances.erase(it); + }else{ + ++it; + } + } - // Completely remove the coupled door from the world graph - doors.erase(coupledDoorItr); - coupledDoor->GetConnectedArea()->RemoveEntrance(coupledDoor); - coupledDoor->GetParentArea()->RemoveExit(coupledDoor); + mainEntrance->SetCoupledEntrances(std::move(coupledPoints)); // Change the main door's name to be more general - mainDoor->GeneralizeName(); + mainEntrance->GeneralizeName(); } } } diff --git a/mods/randomizer/src/randomizer_context.cpp b/mods/randomizer/src/randomizer_context.cpp index 55edcd5ab9..25d60b29f2 100644 --- a/mods/randomizer/src/randomizer_context.cpp +++ b/mods/randomizer/src/randomizer_context.cpp @@ -867,17 +867,17 @@ void randomizer_checkAndOverrideEntranceData(const char*& stageName, s8& roomNo, // Debugging: Dump mEntranceOverrides // for (const auto& [key,val] : randomizer_GetContext().mEntranceOverrides) { - // mods::log::debug("({},{},{},{}) -> ({},{},{},{})",key.stageId,key.roomNo,key.mapLayer,key.pointNo,val.stageId,val.roomNo,val.mapLayer,val.pointNo); + // mods::log::info("({},{},{},{}) -> ({},{},{},{})",key.stageId,key.roomNo,key.mapLayer,key.pointNo,val.stageId,val.roomNo,val.mapLayer,val.pointNo); // } - // mods::log::debug("Original Stage:{}, {}, {}, {}",stageName,roomNo,pointNo,mapLayer); + // mods::log::info("Original Stage:{}, {}, {}, {}",stageName,roomNo,pointNo,mapLayer); if (randomizer_GetContext().mEntranceOverrides.contains(override)) { auto& newOverride = randomizer_GetContext().mEntranceOverrides[override]; stageName = allStages[newOverride.stageId]; pointNo = newOverride.pointNo; roomNo = newOverride.roomNo; mapLayer = newOverride.mapLayer; - // mods::log::debug("New Stage:{}, {}, {}, {}",stageName,roomNo,pointNo,mapLayer); + // mods::log::info("New Stage:{}, {}, {}, {}",stageName,roomNo,pointNo,mapLayer); } } @@ -1751,7 +1751,6 @@ RandomizerContext WriteSeedData(randomizer::logic::world::World* world) { } // Apply entrance randomization - auto shuffleData = LOAD_EMBED_YAML(RANDO_DATA_PATH "entrance_shuffle_data.yaml"); if (world->AnyEntranceRandomizerEnabled()) { for (const auto& entrance : world->GetShuffledEntrances()) { randomizer::logic::entrance::Entrance* replacesEntrance = entrance->GetReplaces(); @@ -1762,9 +1761,9 @@ RandomizerContext WriteSeedData(randomizer::logic::world::World* world) { } randoData.mEntranceOverrides[forward] = replaces; - // Set an override for the second door, if the entrance is coupled - if (entrance->getCoupledDoor() != -1) { - RandomizerContext::EntranceOverride coupled = {.stageId = entrance->GetStageId(), .roomNo = entrance->GetRoomNo(), .mapLayer = entrance->GetLayerNo(), .pointNo = entrance->getCoupledDoor()}; + // Set overrides for all coupled entrances + for (const auto& point : entrance->getCoupledEntrances()) { + RandomizerContext::EntranceOverride coupled = {.stageId = entrance->GetStageId(), .roomNo = entrance->GetRoomNo(), .mapLayer = entrance->GetLayerNo(), .pointNo = point}; randoData.mEntranceOverrides[coupled] = replaces; } } diff --git a/mods/randomizer/src/session.cpp b/mods/randomizer/src/session.cpp index dc5c74218f..26e2951333 100644 --- a/mods/randomizer/src/session.cpp +++ b/mods/randomizer/src/session.cpp @@ -300,7 +300,7 @@ void registerStartingLocation() { return; } - // Check that we aren't playing only with the setting "Mirror Chamber Access") == "Closed" + // Check that we aren't playing only with the setting Mirror Chamber Access set to Closed bool isExclusivelyMirrorChamber = false; const auto& mirrorChamberIt = ctx.mEntranceOverrides.find(RandomizerContext::EntranceOverride{ .stageId = StageIDs::Mirror_Chamber, @@ -323,20 +323,10 @@ void registerStartingLocation() { return; } - constexpr std::array kDungeonNames = { - "D_MN01","D_MN04","D_MN05","D_MN06","D_MN07","D_MN08","D_MN09","D_MN10","D_MN11" - }; - dSv_player_return_place_c& returnPlace = dComIfGs_getSaveData()->mPlayer.getPlayerReturnPlace(); - bool isDungeon = false; - for (const auto& name : kDungeonNames) { - if (returnPlace.getName() == name) { - isDungeon = true; - break; - } - } - - if (isDungeon) { + + // If we are loading into a dungeon, preserve our original return place + if (std::string(returnPlace.getName()).find("D_MN") == 0) { // Force-set the entrance without the override g_dComIfG_gameInfo.play.mNextStage.getStartStage()->set(returnPlace.getName(), returnPlace.getRoomNo(), returnPlace.mPlayerStatus, -1); return; @@ -344,7 +334,6 @@ void registerStartingLocation() { // Set the spawn to outside of link's house, which will get overrided later if we are replacing it returnPlace.set("F_SP103",1,1); - // g_dComIfG_gameInfo.play.mNextStage.getStartStage()->set("F_SP103", 1, 1, -1); dComIfGp_setNextStage("F_SP103", 1, 1, -1); } diff --git a/mods/randomizer/src/ui/rando_config.cpp b/mods/randomizer/src/ui/rando_config.cpp index d4b7d85a95..9b8a17c8a9 100644 --- a/mods/randomizer/src/ui/rando_config.cpp +++ b/mods/randomizer/src/ui/rando_config.cpp @@ -264,9 +264,11 @@ ModResult buildSeedManagementTab(ModContext* ctx, UiWindowHandle, UiElementHandl add_string_input(leftPane, "Seed String", "Current value of the seed used by the randomizer for generation. Leave blank for a random value.", - 32, + 31, [](ModContext*, void*, UiControlValue* out_value) { - out_value->string_value = GetRandomizerConfig().GetSeed().c_str(); + static char buffer[32]; + strncpy(buffer,GetRandomizerConfig().GetSeed().c_str(),31); + out_value->string_value = buffer; }, [](ModContext*, void*, const UiControlValue* value) { GetRandomizerConfig().SetSeed(value->string_value);