mirror/dusklight
1
0
Fork 0
mirror of https://github.com/TwilitRealm/dusklight synced 2026-07-11 13:08:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

update warp portal logic

Browse Source
This commit is contained in:
gymnast86
2026-04-26 16:31:30 -07:00
parent 01d217acb5
commit 33941d8ede
13 changed files with 179 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dusk/randomizer/generator/data/entrance_shuffle_data.yaml
+2 -2
View File
@@ -334,7 +334,7 @@
- Type: Dungeon
Forward:
Connection: Mirror Chamber Portal -> Palace of Twilight Entrance
Connection: Twilight Realm Portal -> Palace of Twilight Entrance
Alias: Mirror Chamber -> Palace of Twilight
Stage: 15
Room: 0
@@ -343,7 +343,7 @@
Parameters: "F01F"
State: "E"
Return:
Connection: Palace of Twilight Entrance -> Mirror Chamber Portal
Connection: Palace of Twilight Entrance -> Twilight Realm Portal
Alias: Palace of Twilight -> Mirror Chamber
Stage: 60
Room: 4
src/dusk/randomizer/generator/data/locations.yaml
+136 -1
View File
@@ -282,6 +282,15 @@
Metadata:
- None
- Name: Ordon Spring Warp Portal
Original Item: Ordon Spring Portal
Categories:
- Overworld
- Warp Portal
- Ordona Province
Metadata:
- None
# FARON PROVINCE
- Name: South Faron Woods Twilit Insect in Tunnel 1
@@ -428,6 +437,15 @@
Metadata:
- None
- Name: South Faron Warp Portal
Original Item: South Faron Portal
Categories:
- Overworld
- Warp Portal
- Faron Woods
Metadata:
- None
- Name: Coro Bottle
Original Item: Bottle with Lantern Oil
Categories:
@@ -555,6 +573,15 @@
- Tbox ID: 26
Stage: F_SP108
- Name: North Faron Warp Portal
Original Item: North Faron Portal
Categories:
- Overworld
- Warp Portal
- Faron Woods
Metadata:
- None
# TODO
- Name: Faron Woods Golden Wolf
Original Item: Progressive Hidden Skill
@@ -748,6 +775,15 @@
- Tbox ID: 2
Stage: F_SP117
- Name: Sacred Grove Warp Portal
Original Item: Sacred Grove Portal
Categories:
- Overworld
- Warp Portal
- Sacred Grove
Metadata:
- None
- Name: Sacred Grove Pedestal Master Sword
Original Item: Progressive Sword
Categories:
@@ -967,6 +1003,15 @@
Metadata:
- None
- Name: Kakariko Gorge Warp Portal
Original Item: Kakariko Gorge Portal
Categories:
- Overworld
- Warp Portal
- Hyrule Field - Eldin Province
Metadata:
- None
- Name: Kakariko Gorge Female Pill Bug
Original Item: Female Pill Bug
Categories:
@@ -1109,6 +1154,15 @@
- Flag: 0x60
Stage: 32
- Name: Kakariko Village Warp Portal
Original Item: Kakariko Village Portal
Categories:
- Overworld
- Warp Portal
- Kakariko Village
Metadata:
- None
- Name: Eldin Spring Underwater Chest
Original Item: Piece of Heart
Categories:
@@ -1428,6 +1482,15 @@
- Flag: 0x57
Stage: 48
- Name: Death Mountain Warp Portal
Original Item: Death Mountain Portal
Categories:
- Overworld
- Warp Portal
- Death Mountain
Metadata:
- None
- Name: Death Mountain Alcove Chest
Original Item: Piece of Heart
Categories:
@@ -1578,6 +1641,15 @@
- Tbox ID: 16
Stage: D_SB09
- Name: Bridge of Eldin Warp Portal
Original Item: Bridge of Eldin Portal
Categories:
- Overworld
- Warp Portal
- Hyrule Field - Eldin Province
Metadata:
- None
- Name: Bridge of Eldin Female Phasmid
Original Item: Female Phasmid
Categories:
@@ -2051,6 +2123,15 @@
Metadata:
- None
- Name: Castle Town Warp Portal
Original Item: Castle Town Portal
Categories:
- Overworld
- Warp Portal
- Hyrule Field - Lanayru Province
Metadata:
- None
- Name: West Hyrule Field Female Butterfly
Original Item: Female Butterfly
Categories:
@@ -2757,6 +2838,15 @@
Metadata:
- None
- Name: Lake Hylia Warp Portal
Original Item: Lake Hylia Portal
Categories:
- Overworld
- Warp Portal
- Ordona Province
Metadata:
- None
- Name: Auru Gift To Fyer
Original Item: Aurus Memo
Categories:
@@ -3279,6 +3369,15 @@
Metadata:
- None
- Name: Upper Zoras River Warp Portal
Original Item: Upper Zoras River Portal
Categories:
- Overworld
- Warp Portal
- Upper Zoras River
Metadata:
- None
- Name: Upper Zoras River Female Dragonfly
Original Item: Female Dragonfly
Categories:
@@ -3386,6 +3485,15 @@
- Stage: 62
Flag: 0x80
- Name: Zoras Domain Warp Portal
Original Item: Zoras Domain Portal
Categories:
- Overworld
- Warp Portal
- Zoras Domain
Metadata:
- None
- Name: Zoras Domain Male Dragonfly
Original Item: Male Dragonfly
Categories:
@@ -3647,6 +3755,15 @@
# SNOWPEAK PROVINCE
- Name: Snowpeak Warp Portal
Original Item: Snowpeak Portal
Categories:
- Overworld
- Warp Portal
- Snowpeak Province
Metadata:
- None
# TODO
- Name: Ashei Sketch
Original Item: Asheis Sketch
@@ -3971,6 +4088,15 @@
# DESERT PROVINCE
- Name: Gerudo Desert Warp Portal
Original Item: Gerudo Desert Portal
Categories:
- Overworld
- Warp Portal
- Gerudo Desert
Metadata:
- None
- Name: Gerudo Desert East Poe
Original Item: Poe Soul
Categories:
@@ -4389,7 +4515,16 @@
- ARC
Metadata:
- None
- Name: Mirror Chamber Warp Portal
Original Item: Mirror Chamber Portal
Categories:
- Overworld
- Warp Portal
- Mirror Chamber
Metadata:
- None
# FOREST TEMPLE
- Name: Forest Temple Entrance Vines Chest
src/dusk/randomizer/generator/data/macros.yaml
+1 -18
View File
@@ -251,22 +251,5 @@ Can Open Hyrule Castle Big Key Gate: Hyrule_Castle_Big_Key_Requirements == None
(Hyrule_Castle_Big_Key_Requirements == Poe_Souls and count(Poe_Soul, Hyrule_Castle_Big_Key_Poe_Souls)) or
(Hyrule_Castle_Big_Key_Requirements == Hearts and hearts(Hyrule_Castle_Big_Key_Hearts))
# WARP PORTALS
Ordon Spring Warp Portal: Can_Complete_Prologue
South Faron Woods Warp Portal: Can_Complete_Faron_Twilight
North Faron Woods Warp Portal: Can_Complete_Faron_Twilight
Sacred Grove Warp Portal: Sacred_Grove_Does_Not_Require_Skull_Kid == On or (Has_Sword_For_Temple_of_Time and 'Can_Access_Sacred_Grove_Lower' and Can_Defeat_Shadow_Beast)
Kakariko Gorge Warp Portal: Can_Complete_Eldin_Twilight
Kakariko Village Warp Portal: Can_Complete_Eldin_Twilight
Death Mountain Warp Portal: Can_Complete_Eldin_Twilight
Bridge of Eldin Warp Portal: Can_Defeat_Shadow_Beast and 'Can_Access_Eldin_Field_North_of_Bridge'
Castle Town Warp Portal: Can_Complete_Lanayru_Twilight
Lake Hylia Warp Portal: Can_Complete_Lanayru_Twilight
Upper Zoras River Warp Portal: (Sword or (Can_Defeat_Shadow_Beast and Logic_Transform_Anywhere == On)) and 'Can_Access_Upper_Zoras_River'
Zoras Domain Warp Portal: Can_Complete_Lanayru_Twilight
Snowpeak Warp Portal: Snowpeak_Does_Not_Require_Reekfish_Scent == On or (Can_Defeat_Shadow_Beast and 'Can_Access_Snowpeak_Summit_Upper')
Gerudo Desert Warp Portal: Can_Defeat_Shadow_Beast and 'Can_Access_Gerudo_Desert_Cave_of_Ordeals_Plateau'
Mirror Chamber Warp Portal: Can_Defeat_Shadow_Beast and 'Can_Access_Mirror_Chamber_Upper'
Can Talk to Springwater Goron: Nothing # Change later
Can Talk to Springwater Goron: Nothing # TODO
src/dusk/randomizer/generator/data/world/Root.yaml
+15 -15
View File
@@ -86,21 +86,21 @@
- Name: Warp Portals
Exits:
Ordon Spring Warp Portal: Ordon_Spring_Warp_Portal and (Unlock_Map_Regions == On or 'Ordona_Province_Map_Sector')
South Faron Woods Warp Portal: South_Faron_Woods_Warp_Portal and (Unlock_Map_Regions == On or 'Faron_Province_Map_Sector')
North Faron Woods Warp Portal: North_Faron_Woods_Warp_Portal and (Unlock_Map_Regions == On or 'Faron_Province_Map_Sector')
Sacred Grove Warp Portal: Sacred_Grove_Warp_Portal and (Unlock_Map_Regions == On or 'Faron_Province_Map_Sector')
Kakariko Gorge Warp Portal: Kakariko_Gorge_Warp_Portal and (Unlock_Map_Regions == On or 'Eldin_Province_Map_Sector')
Kakariko Village Warp Portal: Kakariko_Village_Warp_Portal and (Unlock_Map_Regions == On or 'Eldin_Province_Map_Sector')
Death Mountain Warp Portal: Death_Mountain_Warp_Portal and (Unlock_Map_Regions == On or 'Eldin_Province_Map_Sector')
Bridge of Eldin Warp Portal: Bridge_of_Eldin_Warp_Portal and (Unlock_Map_Regions == On or 'Eldin_Province_Map_Sector')
Castle Town Warp Portal: Castle_Town_Warp_Portal and (Unlock_Map_Regions == On or 'Lanayru_Province_Map_Sector')
Lake Hylia Warp Portal: Lake_Hylia_Warp_Portal and (Unlock_Map_Regions == On or 'Lanayru_Province_Map_Sector')
Upper Zoras River Warp Portal: Upper_Zoras_River_Warp_Portal and (Unlock_Map_Regions == On or 'Lanayru_Province_Map_Sector')
Zoras Domain Warp Portal: Zoras_Domain_Warp_Portal and (Unlock_Map_Regions == On or 'Lanayru_Province_Map_Sector')
Snowpeak Warp Portal: Snowpeak_Warp_Portal and (Unlock_Map_Regions == On or 'Snowpeak_Province_Map_Sector')
Gerudo Desert Warp Portal: Gerudo_Desert_Warp_Portal and 'Desert_Province_Map_Sector'
Mirror Chamber Warp Portal: Mirror_Chamber_Warp_Portal and 'Desert_Province_Map_Sector'
Ordon Spring Warp Portal: Ordon_Spring_Portal and (Unlock_Map_Regions == On or 'Ordona_Province_Map_Sector')
South Faron Woods Warp Portal: South_Faron_Portal and (Unlock_Map_Regions == On or 'Faron_Province_Map_Sector')
North Faron Woods Warp Portal: North_Faron_Portal and (Unlock_Map_Regions == On or 'Faron_Province_Map_Sector')
Sacred Grove Warp Portal: Sacred_Grove_Portal and (Unlock_Map_Regions == On or 'Faron_Province_Map_Sector')
Kakariko Gorge Warp Portal: Kakariko_Gorge_Portal and (Unlock_Map_Regions == On or 'Eldin_Province_Map_Sector')
Kakariko Village Warp Portal: Kakariko_Village_Portal and (Unlock_Map_Regions == On or 'Eldin_Province_Map_Sector')
Death Mountain Warp Portal: Death_Mountain_Portal and (Unlock_Map_Regions == On or 'Eldin_Province_Map_Sector')
Bridge of Eldin Warp Portal: Bridge_of_Eldin_Portal and (Unlock_Map_Regions == On or 'Eldin_Province_Map_Sector')
Castle Town Warp Portal: Castle_Town_Portal and (Unlock_Map_Regions == On or 'Lanayru_Province_Map_Sector')
Lake Hylia Warp Portal: Lake_Hylia_Portal and (Unlock_Map_Regions == On or 'Lanayru_Province_Map_Sector')
Upper Zoras River Warp Portal: Upper_Zoras_River_Portal and (Unlock_Map_Regions == On or 'Lanayru_Province_Map_Sector')
Zoras Domain Warp Portal: Zoras_Domain_Portal and (Unlock_Map_Regions == On or 'Lanayru_Province_Map_Sector')
Snowpeak Warp Portal: Snowpeak_Portal and (Unlock_Map_Regions == On or 'Snowpeak_Province_Map_Sector')
Gerudo Desert Warp Portal: Gerudo_Desert_Portal and 'Desert_Province_Map_Sector'
Mirror Chamber Warp Portal: Mirror_Chamber_Portal and 'Desert_Province_Map_Sector'
- Name: Ordon Spring Warp Portal
Exits:
src/dusk/randomizer/generator/data/world/dungeons/Palace of Twilight.yaml
+1 -1
View File
@@ -13,7 +13,7 @@
Palace of Twilight West Wing First Room Near Entrance: Nothing
Palace of Twilight Entrance Near East Wing First Room: Nothing
Palace of Twilight Entrance Near North Wing: Light_Sword
Mirror Chamber Portal: Nothing
Twilight Realm Portal: Nothing
- Name: Palace of Twilight Entrance Near East Wing First Room
Region: Palace of Twilight
src/dusk/randomizer/generator/data/world/overworld/Eldin Province.yaml
+4
View File
@@ -7,6 +7,7 @@
Twilight: Eldin
Can Warp: True
Locations:
Kakariko Gorge Warp Portal: Nothing
Kakariko Gorge Owl Statue Chest: Restored_Dominion_Rod
Kakariko Gorge Double Clawshot Chest: Double_Clawshots
Kakariko Gorge Spire Heart Piece: Clawshot or Gale_Boomerang
@@ -63,6 +64,7 @@
Events:
Can Start Springwater Rush: Can_Talk_to_Springwater_Goron
Locations:
Kakariko Village Warp Portal: Nothing
Eldin Spring Underwater Chest: Can_Smash and Iron_Boots
Eldin Spring Underwater Boulder Rupee: Water_Bombs and (Iron_Boots or Zora_Armor) and Can_Complete_Eldin_Twilight
Kakariko Village Bomb Rock Spire Heart Piece: Bombs and Gale_Boomerang
@@ -400,6 +402,7 @@
Twilight: Eldin
Can Warp: True
Locations:
Death Mountain Warp Portal: Nothing
Death Mountain Volcano Pipe Ledge Rock Rupee: Can_Complete_Eldin_Twilight and (Can_Defeat_Goron or 'Can_Complete_Goron_Mines')
Death Mountain Trail Twilit Insect on Wall: Can_Defeat_Eldin_Twilit_Insect
Death Mountain Trail Twilit Insect in Hot Spring: Can_Defeat_Eldin_Twilit_Insect
@@ -463,6 +466,7 @@
Events:
Can Finish Goron Springwater Rush: "'Can_Start_Springwater_Rush' and (Skip_Bridge_Donation == On or 'Can_Fund_Malo_Mart')"
Locations:
Bridge of Eldin Warp Portal: Can_Defeat_Shadow_Beast
Eldin Field Bomb Rock Chest: Can_Smash
Bridge of Eldin Owl Statue Chest: Restored_Dominion_Rod
Goron Springwater Rush: "'Can_Finish_Goron_Springwater_Rush'"
src/dusk/randomizer/generator/data/world/overworld/Faron Province.yaml
+3
View File
@@ -10,6 +10,7 @@
Events:
Can Refill Lantern Oil: "'Can_Farm_Rupees'"
Locations:
South Faron Warp Portal: Can_Complete_Prologue
Faron Woods Coro Boulder Rupee 1: Can_Smash
Faron Woods Coro Boulder Rupee 2: Can_Smash
Faron Woods Coro Boulder Rupee 3: Can_Smash
@@ -228,6 +229,7 @@
Can Refill Lantern Oil: "'Can_Farm_Rupees'"
Can Refill Slingshot Seeds: Can_Defeat_Deku_Baba
Locations:
North Faron Warp Portal: Can_Complete_Prologue
North Faron Woods Deku Baba Chest: Nothing
Faron Woods Golden Wolf: Nothing
North Faron Woods Twilit Insect 1: Can_Defeat_Faron_Twilit_Insect
@@ -324,6 +326,7 @@
Region: Sacred Grove
Can Warp: True
Locations:
Sacred Grove Warp Portal: Can_Defeat_Shadow_Beast
Sacred Grove Male Snail: Clawshot or Gale_Boomerang
Sacred Grove Master Sword Poe: Can_Use_Senses and Night
Sacred Grove Pedestal Master Sword: Nothing
src/dusk/randomizer/generator/data/world/overworld/Gerudo Desert.yaml
+5 -2
View File
@@ -34,6 +34,7 @@
Region: South Gerudo Desert
Can Warp: True
Locations:
Gerudo Desert Warp Portal: Can_Defeat_Shadow_Beast
Gerudo Desert Poe Above Cave of Ordeals: Can_Use_Senses and Night
Exits:
Cave of Ordeals: Nothing
@@ -131,15 +132,17 @@
Map Sector: Desert Province
Region: Mirror Chamber
Can Warp: True
Locations:
Mirror Chamber Warp Portal: Can_Defeat_Shadow_Beast
Exits:
Mirror Chamber Portal: Can_Defeat_Shadow_Beast and
Twilight Realm Portal: Mirror_Chamber_Portal and
(Palace_of_Twilight_Requirements == Open or
(Palace_of_Twilight_Requirements == Fused_Shadows and count(Progressive_Fused_Shadow, 3)) or
(Palace_of_Twilight_Requirements == Mirror_Shards and count(Progressive_Mirror_Shard, 4)) or
(Palace_of_Twilight_Requirements == Vanilla and 'Can_Complete_City_in_the_Sky'))
Mirror Chamber Lower: Can_Defeat_Shadow_Beast
- Name: Mirror Chamber Portal
- Name: Twilight Realm Portal
Exits:
Palace of Twilight Entrance: Nothing
Mirror Chamber Upper: Can_Defeat_Shadow_Beast
src/dusk/randomizer/generator/data/world/overworld/Lanayru Province.yaml
+7 -3
View File
@@ -90,6 +90,7 @@
Twilight: Lanayru
Can Warp: True
Locations:
Castle Town Warp Portal: Nothing
Hyrule Field Amphitheater Owl Statue Chest: Restored_Dominion_Rod
Hyrule Field Amphitheater Owl Statue Sky Character: Restored_Dominion_Rod
West Hyrule Field Northern Boulder Rupee: Can_Smash
@@ -496,6 +497,7 @@
Events:
Can Farm Lots of Rupees: Nothing
Locations:
Lake Hylia Warp Portal: Nothing
Lake Hylia Underwater Chest: Iron_Boots
Lake Hylia Left Underwater Boulder Rupee: Zora_Armor and Iron_Boots and Water_Bombs and Can_Complete_Lanayru_Twilight
Lake Hylia Left Underwater Pillar Rupee: Zora_Armor and Can_Complete_Lanayru_Twilight
@@ -652,6 +654,7 @@
Events:
Howl at Upper Zoras River Howling Stone: Can_Howl
Locations:
Upper Zoras River Warp Portal: Sword or (Can_Defeat_Shadow_Beast and Logic_Transform_Anywhere == On)
Upper Zoras River Ledge Boulder Rupee: Can_Smash
Upper Zoras River East Underwater Boulder Rupee: Iron_Boots and Water_Bombs
Upper Zoras River West Underwater Boulder Rupee: Iron_Boots and Water_Bombs
@@ -660,7 +663,7 @@
Upper Zoras River Poe: Can_Use_Senses
Upper Zoras River Twilit Insect: Can_Defeat_Lanayru_Twilit_Insect
Exits:
Upper Zoras River Izas House: Can_Open_Doors and Upper_Zoras_River_Warp_Portal
Upper Zoras River Izas House: Can_Open_Doors and Upper_Zoras_River_Portal
Fishing Hole: Can_Open_Doors
Zoras Domain: Nothing
Lanayru Field: Nothing
@@ -668,8 +671,8 @@
- Name: Upper Zoras River Izas House
Can Warp: True
Locations:
Iza Helping Hand: Bow and Upper_Zoras_River_Warp_Portal
Iza Raging Rapids Minigame: Bow and Upper_Zoras_River_Warp_Portal
Iza Helping Hand: Bow and Upper_Zoras_River_Portal
Iza Raging Rapids Minigame: Bow and Upper_Zoras_River_Portal
Exits:
Upper Zoras River: Can_Open_Doors
@@ -754,6 +757,7 @@
Twilight: Lanayru
Can Warp: True
Locations:
Zoras Domain Warp Portal: Nothing
Zoras Domain Light All Torches Chest: Can_Light_Torches and Iron_Boots
Zoras Domain Extinguish All Torches Chest: Can_Extinguish_Torches and Iron_Boots
Zoras Domain Throne East Gate Underwater Rupee: Can_Complete_Lanayru_Twilight and Iron_Boots
src/dusk/randomizer/generator/data/world/overworld/Ordona Province.yaml
+1 -2
View File
@@ -27,9 +27,8 @@
Region: Ordon
Can Warp: True
Can Change Time: True
Events:
Ordon Spring Warp Portal: Nothing
Locations:
Ordon Spring Warp Portal: Nothing
Ordon Spring Golden Wolf: "'Howl_at_Death_Mountain_Howling_Stone'"
Exits:
Outside Links House: Nothing
src/dusk/randomizer/generator/data/world/overworld/Snowpeak Province.yaml
+2 -1
View File
@@ -51,10 +51,11 @@
Region: Snowpeak Mountain
Can Warp: True
Events:
Snowboarding Rupees: "(Snowpeak_Warp_Portal or Can_Defeat_Shadow_Beast)
Snowboarding Rupees: "(Snowpeak_Portal or Can_Defeat_Shadow_Beast)
and ((Bonks_Do_Damage == Off or (Bonks_Do_Damage == On
and (Damage_Multiplier != OHKO or Can_Use_Bottled_Fairy))) or 'Can_Complete_Snowpeak_Ruins')"
Locations:
Snowpeak Warp Portal: Can_Defeat_Shadow_Beast
Snowboarding Bridge Ledge Bottom Rupee: "'Snowboarding_Rupees'"
Snowboarding Bridge Ledge Middle Rupee: "'Snowboarding_Rupees'"
Snowboarding Bridge Ledge Upper Rupee: "'Snowboarding_Rupees'"
src/dusk/randomizer/generator/logic/item_pool.cpp
-5
View File
@@ -390,11 +390,6 @@ namespace randomizer::logic::item_pool
startingItems["Castle Town Portal"] = 1;
}
if (world->Setting("Snowpeak Does Not Require Reekfish Scent") == "On")
{
startingItems["Snowpeak Portal"] = 1;
}
// Add each item to the world's _startingItemPool and erase it from the regular _itemPool
for (const auto& [itemName, count] : startingItems)
{
src/dusk/randomizer/generator/logic/world.cpp
+2
View File
@@ -567,6 +567,8 @@ namespace randomizer::logic::world
(this->Setting("Freestanding Rupees") == "Off" && location->HasCategories("Rupee - Freestanding")) ||
// North Faron Woods Gate Key
(this->Setting("Skip Prologue") == "Off" && locationName == "Faron Mist Cave Open Chest") ||
// Warp Portals
(location->HasCategories("Warp Portal")) ||
// Some locations which will always be vanilla for the time being
(utility::str::Contains(locationName,
"Renados Letter",