Skip to content

Options for elements in or near their vanilla dungeons #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

Options for elements in or near their vanilla dungeons #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion MinishCapRandomizerUI/Resources/Presets/Mystery Settings/Expert_3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ settings:
BIG_KEYS_REGDUN: 10 # Any Region
BIG_KEYSANITY: 20 # Anywhere (Keysanity)
SHUFFLE_ELEMENTS: # Shuffle Elements
SHUFFLE_ELEMENTS_VANILLA: 5 # Vanilla
SHUFFLE_ELEMENTS_VANILLA: 2 # Vanilla
SHUFFLE_ELEMENTS_VANILLA_DUNGEON: 2 # Vanilla Dungeon
SHUFFLE_ELEMENTS_VANILLA_REGION: 1 # Vanilla Region
SHUFFLE_ELEMENTS_OFF: 40 # Dungeon Rewards
SHUFFLE_ELEMENTS_DUNGEON: 25 # Own Dungeon
SHUFFLE_ELEMENTS_REGION: 10 # Own Region
Expand Down
4 changes: 3 additions & 1 deletion MinishCapRandomizerUI/Resources/Presets/Mystery Settings/Friendly_1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,9 @@ settings:
BIG_KEYS_REGDUN: 0 # Any Region
BIG_KEYSANITY: 20 # Anywhere (Keysanity)
SHUFFLE_ELEMENTS: # Shuffle Elements
SHUFFLE_ELEMENTS_VANILLA: 10 # Vanilla
SHUFFLE_ELEMENTS_VANILLA: 5 # Vanilla
SHUFFLE_ELEMENTS_VANILLA_DUNGEON: 5 # Vanilla Dungeon
SHUFFLE_ELEMENTS_VANILLA_REGION: 0 # Vanilla Region
SHUFFLE_ELEMENTS_OFF: 50 # Dungeon Rewards
SHUFFLE_ELEMENTS_DUNGEON: 30 # Own Dungeon
SHUFFLE_ELEMENTS_REGION: 0 # Own Region
Expand Down
2 changes: 2 additions & 0 deletions MinishCapRandomizerUI/Resources/Presets/Mystery Settings/Unweighted_4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ settings:
BIG_KEYSANITY: 1 # Anywhere (Keysanity)
SHUFFLE_ELEMENTS: # Shuffle Elements
SHUFFLE_ELEMENTS_VANILLA: 1 # Vanilla
SHUFFLE_ELEMENTS_VANILLA_DUNGEON: 1 # Vanilla Dungeon
SHUFFLE_ELEMENTS_VANILLA_REGION: 1 # Vanilla Region
SHUFFLE_ELEMENTS_OFF: 1 # Dungeon Rewards
SHUFFLE_ELEMENTS_DUNGEON: 1 # Own Dungeon
SHUFFLE_ELEMENTS_REGION: 1 # Own Region
Expand Down
45 changes: 36 additions & 9 deletions RandomizerCore/Resources/default.logic
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@
!dropdown - Main Settings - Setting - Dungeon Settings - COMPASS_SETTING - Compasses - Compasses - COMPASS_STANDARD - Start With - COMPASS_KEASY - 'Start With': Compasses are given to you from the start. - Vanilla - COMPASS_VANILLA - 'Vanilla': Compasses are in the same places they appear in the vanilla game. - Own Dungeon - COMPASS_STANDARD - 'Own Dungeon': Compasses are randomized to locations in the dungeon they are used in. - Own Region - COMPASS_REGION - 'Own Region': Compasses are randomized inside and in the vicinity of their own dungeon. - Any Dungeon - COMPASS_DUNGEON - 'Any Dungeon': Compasses are randomized inside all dungeons. - Any Region - COMPASS_REGDUN - 'Any Region': Compasses are randomized inside and in the vicinity of all dungeons. - Anywhere (Keysanity) - COMPASS_KEYSANITY - 'Anywhere': Compasses are randomized to any location in the world.\n\nDWS Region: 'Minish Village', 'Belari's House', 'Chest near Belari', 'Minish Cave near Belari'.\nCoF Region: 'Melari's Mines', 'Melari's Mines Outside Path', 'Pre Melari Block Puzzle Chest'.\nFOW Region: 'Wind Ruins'.\nTOD Region: 'Nothing'.\nRC Region: 'Graveyard (Not Dampe)'.\nPOW Region: If Red Fusions are Removed: 'Wind Tribe', Otherwise: 'Upper Wind Tribe'.\nDHC Region: 'Castle Gardens (Not Moat)', If Pedestal Items is enabled: 'Sanctuary Pedestal'.
!dropdown - Main Settings - Setting - Dungeon Settings - SMALL_KEYS_SETTING - Small Keys - Small Keys - SMALL_KEYS_STANDARD - Removed (Keasy) - SMALL_KEASY - 'Removed': Small keys are removed, All small locked doors are open from the start. - Vanilla - SMALL_KEYS_VANILLA - 'Vanilla': Small keys are in the same places they appear in the vanilla game. - Own Dungeon - SMALL_KEYS_STANDARD - 'Own Dungeon': Small keys are randomized to locations in the dungeon they are used in. - Own Region - SMALL_KEYS_REGION - 'Own Region': Small keys are randomized inside and in the vicinity of their own dungeon. - Any Dungeon - SMALL_KEYS_DUNGEON - 'Any Dungeon': Small keys are randomized inside all dungeons. - Any Region - SMALL_KEYS_REGDUN - 'Any Region': Small keys are randomized inside and in the vicinity of all dungeons. - Anywhere (Keysanity) - SMALL_KEYSANITY - 'Anywhere': Small keys are randomized to any location in the world, expect to return to dungeons multiple times.\n\nDWS Region: 'Minish Village', 'Belari's House', 'Chest near Belari', 'Minish Cave near Belari'.\nCoF Region: 'Melari's Mines', 'Melari's Mines Outside Path', 'Pre Melari Block Puzzle Chest'.\nFOW Region: 'Wind Ruins'.\nTOD Region: 'Nothing'.\nRC Region: 'Graveyard (Not Dampe)'.\nPOW Region: If Red Fusions are Removed: 'Wind Tribe', Otherwise: 'Upper Wind Tribe'.\nDHC Region: 'Castle Gardens (Not Moat)', If Pedestal Items is enabled: 'Sanctuary Pedestal'.
!dropdown - Main Settings - Setting - Dungeon Settings - BIG_KEYS_SETTING - Big Keys - Big Keys - BIG_KEYS_STANDARD - Removed (Keasy) - BIG_KEASY - 'Removed': Big keys are removed, All locked Boss doors are open from the start. - Vanilla - BIG_KEYS_VANILLA - 'Vanilla': Big keys are in the same places they appear in the vanilla game. - Own Dungeon - BIG_KEYS_STANDARD - 'Own Dungeon': Big keys are randomized to locations in the dungeon they are used in. - Own Region - BIG_KEYS_REGION - 'Own Region': Big keys are randomized inside and in the vicinity of their own dungeon. - Any Dungeon - BIG_KEYS_DUNGEON - 'Any Dungeon': Big keys are randomized inside all dungeons. - Any Region - BIG_KEYS_REGDUN - 'Any Region': Big keys are randomized inside and in the vicinity of all dungeons. - Anywhere (Keysanity) - BIG_KEYSANITY - 'Anywhere': Big keys are randomized to any location in the world, expect to return to dungeons multiple times.\n\nDWS Region: 'Minish Village', 'Belari's House', 'Chest near Belari', 'Minish Cave near Belari'.\nCoF Region: 'Melari's Mines', 'Melari's Mines Outside Path', 'Pre Melari Block Puzzle Chest'.\nFOW Region: 'Wind Ruins'.\nTOD Region: 'Nothing'.\nRC Region: 'Graveyard (Not Dampe)'.\nPOW Region: If Red Fusions are Removed: 'Wind Tribe', Otherwise: 'Upper Wind Tribe'.\nDHC Region: 'Castle Gardens (Not Moat)', If Pedestal Items is enabled: 'Sanctuary Pedestal'.
!dropdown - Main Settings - Setting - Dungeon Settings - SHUFFLE_ELEMENTS - Shuffle Elements - Shuffle Elements - SHUFFLE_ELEMENTS_OFF - Vanilla - SHUFFLE_ELEMENTS_VANILLA - 'Vanilla': The Elements are found in their vanilla locations. Will shuffle dungeon rewards if all 4 elements are required to complete the seed but the vanilla location is not accessible. - Dungeon Rewards - SHUFFLE_ELEMENTS_OFF - 'Dungeon Rewards': Elements are shuffled among the 6 Dungeon Rewards. - Own Dungeon - SHUFFLE_ELEMENTS_DUNGEON - 'Own Dungeon': Elements are shuffled among the 6 Dungeons that have a Reward at the end, but are then placed in a random location within that Dungeon. - Own Region - SHUFFLE_ELEMENTS_REGION - 'Own Region': Elements are shuffled among the 6 Dungeons that have a Reward at the end, but are then placed in a random location inside or in the vicinity of that Dungeon. - Any Dungeon - SHUFFLE_ELEMENTS_ON_DUNGEONS - 'Any Dungeon': Elements are freely shuffled across all locations in all 7 Dungeons. The Element icons on the map are removed. - Any Region - SHUFFLE_ELEMENTS_ON_REGIONS - 'Any Region': Elements are freely shuffled inside and in the vicinity of all 7 Dungeons. The Element icons on the map are removed. - Anywhere - SHUFFLE_ELEMENTS_ON - 'Anywhere': Elements are shuffled anywhere in the world. The Element icons on the map are removed.\n\nDWS Region: 'Minish Village', 'Belari's House', 'Chest near Belari', 'Minish Cave near Belari'.\nCoF Region: 'Melari's Mines', 'Melari's Mines Outside Path', 'Pre Melari Block Puzzle Chest'.\nFOW Region: 'Wind Ruins'.\nTOD Region: 'Nothing'.\nRC Region: 'Graveyard (Not Dampe)'.\nPOW Region: If Red Fusions are Removed: 'Wind Tribe', Otherwise: 'Upper Wind Tribe'.\nDHC Region: 'Castle Gardens (Not Moat)', If Pedestal Items is enabled: 'Sanctuary Pedestal'.
!dropdown - Main Settings - Setting - Dungeon Settings - SHUFFLE_ELEMENTS - Shuffle Elements - Shuffle Elements - SHUFFLE_ELEMENTS_OFF - Vanilla - SHUFFLE_ELEMENTS_VANILLA - 'Vanilla': The Elements are found in their vanilla locations. Will shuffle dungeon rewards if all 4 elements are required to complete the seed but the vanilla location is not accessible. - Vanilla Dungeon - SHUFFLE_ELEMENTS_VANILLA_DUNGEON - 'Vanilla Dungeon': Each Element is found in a random location within its vanilla Dungeon. Will shuffle dungeon rewards if all 4 elements are required to complete the seed but the vanilla location is not accessible. - Vanilla Region - SHUFFLE_ELEMENTS_VANILLA_REGION - 'Vanilla Region': Each Element is found in a random location within its vanilla Dungeon or its vicinity. Will shuffle dungeon rewards if all 4 elements are required to complete the seed but the vanilla location is not accessible. - Dungeon Rewards - SHUFFLE_ELEMENTS_OFF - 'Dungeon Rewards': Elements are shuffled among the 6 Dungeon Rewards. - Own Dungeon - SHUFFLE_ELEMENTS_DUNGEON - 'Own Dungeon': Elements are shuffled among the 6 Dungeons that have a Reward at the end, but are then placed in a random location within that Dungeon. - Own Region - SHUFFLE_ELEMENTS_REGION - 'Own Region': Elements are shuffled among the 6 Dungeons that have a Reward at the end, but are then placed in a random location inside or in the vicinity of that Dungeon. - Any Dungeon - SHUFFLE_ELEMENTS_ON_DUNGEONS - 'Any Dungeon': Elements are freely shuffled across all locations in all 7 Dungeons. The Element icons on the map are removed. - Any Region - SHUFFLE_ELEMENTS_ON_REGIONS - 'Any Region': Elements are freely shuffled inside and in the vicinity of all 7 Dungeons. The Element icons on the map are removed. - Anywhere - SHUFFLE_ELEMENTS_ON - 'Anywhere': Elements are shuffled anywhere in the world. The Element icons on the map are removed.\n\nDWS Region: 'Minish Village', 'Belari's House', 'Chest near Belari', 'Minish Cave near Belari'.\nCoF Region: 'Melari's Mines', 'Melari's Mines Outside Path', 'Pre Melari Block Puzzle Chest'.\nFOW Region: 'Wind Ruins'.\nTOD Region: 'Nothing'.\nRC Region: 'Graveyard (Not Dampe)'.\nPOW Region: If Red Fusions are Removed: 'Wind Tribe', Otherwise: 'Upper Wind Tribe'.\nDHC Region: 'Castle Gardens (Not Moat)', If Pedestal Items is enabled: 'Sanctuary Pedestal'.
!dropdown - Main Settings - Setting - Dungeon Settings - DUNGEON - NonElement Dungeons - NonElement Dungeons, This setting is disabled when 'Shuffle Elements' is set to 'Any Dungeon', 'Any Region' or 'Anywhere' or when 'Dungeons Required' is higher than the number of Elements placed. - NONE - Standard - NONE - 'Standard': NonElement Dungeons have no special rules. - Unrequired - UNREQ - 'Unrequired': NonElement Dungeons do not have items required to beat the game. - Barren - BARREN - 'Barren': NonElement Dungeons only contain junk items. - Regions Unrequired - UNREQSUR - 'Regions Unrequired': NonElement Dungeons and their Regions do not contain items needed to beat the game. - Regions Barren - BARRENSUR - 'Regions Barren': NonElement Dungeons and their Regions only contain junk items. \n\nDWS Region: 'Minish Village', 'Belari's House', 'Chest near Belari', 'Minish Cave near Belari'.\nCoF Region: 'Melari's Mines', 'Melari's Mines Outside Path', 'Pre Melari Block Puzzle Chest'.\nFOW Region: 'Wind Ruins'.\nTOD Region: 'Nothing'.\nRC Region: 'Graveyard (Not Dampe)'.\nPOW Region: If Red Fusions are Removed: 'Wind Tribe', Otherwise: 'Upper Wind Tribe'.
!flag - Main Settings - Setting - Dungeon Settings - DHC_BARREN - DHC is Barren - If enabled will completely fill the interior of Dark Hyrule Castle with junk aside from dungeon items that have to be placed in there because of the dungeon item settings.\n\nFor technical reasons, dungeon items that are allowed to be placed outside of DHC (and its region) will always be placed outside DHC. Also, setting dungeon items to 'Own Region' will make the corresponding DHC items behave like in 'Own Dungeon'.

Expand Down Expand Up @@ -590,6 +590,13 @@
!ifndef - SHUFFLE_ELEMENTS_ON_REGIONS
!ifndef - SHUFFLE_ELEMENTS_ON
!define - ELEMENTS_TIED_TO_DUNGEONS
!ifndef - SHUFFLE_ELEMENTS_OFF
!ifndef - SHUFFLE_ELEMENTS_DUNGEON
!ifndef - SHUFFLE_ELEMENTS_REGION
!define - ELEMENTS_TIED_TO_VANILLA_DUNGEONS
!endif
!endif
!endif
!endif
!endif
!endif
Expand Down Expand Up @@ -1525,15 +1532,17 @@
!endif
!endif
!endif
!ifdef - SHUFFLE_ELEMENTS_VANILLA
!ifdef - ELEMENTS_TIED_TO_VANILLA_DUNGEONS
!ifndef - POW_ACCESS
!ifdef - 4ELEMENT
!ifndef - OPENDHC
!undefine - SHUFFLE_ELEMENTS_VANILLA
!undefine - `SHUFFLE_ELEMENTS`
!undefine - ELEMENTS_TIED_TO_VANILLA_DUNGEONS
!define - SHUFFLE_ELEMENTS_OFF
!else
!ifdef - REQUIREMENT_ITEM_DHC_BK
!undefine - SHUFFLE_ELEMENTS_VANILLA
!undefine - `SHUFFLE_ELEMENTS`
!undefine - ELEMENTS_TIED_TO_VANILLA_DUNGEONS
!define - SHUFFLE_ELEMENTS_OFF
!else
!define - NO_PALACE
Expand All @@ -1542,11 +1551,13 @@
!else
!ifdef - AD_PED_4
!ifndef - OPENDHC
!undefine - SHUFFLE_ELEMENTS_VANILLA
!undefine - `SHUFFLE_ELEMENTS`
!undefine - ELEMENTS_TIED_TO_VANILLA_DUNGEONS
!define - SHUFFLE_ELEMENTS_OFF
!else
!ifdef - REQUIREMENT_ITEM_DHC_BK
!undefine - SHUFFLE_ELEMENTS_VANILLA
!undefine - `SHUFFLE_ELEMENTS`
!undefine - ELEMENTS_TIED_TO_VANILLA_DUNGEONS
!define - SHUFFLE_ELEMENTS_OFF
!else
!define - NO_PALACE
Expand Down Expand Up @@ -1578,7 +1589,7 @@
!define - RC_ACCESS
!define - FOW_ACCESS
!define - POW_ACCESS
!ifdef - SHUFFLE_ELEMENTS_VANILLA
!ifdef - ELEMENTS_TIED_TO_VANILLA_DUNGEONS
!ifndef - NO_GOLD_FUSIONS
!define - RUINS_ACCESS
!define - UWT_ACCESS
Expand Down Expand Up @@ -2607,7 +2618,23 @@
!endif
!endif
!endif
!ifndef - SHUFFLE_ELEMENTS_VANILLA
!ifdef - SHUFFLE_ELEMENTS_VANILLA_DUNGEON
!prizeplacement - Deepwood_Prize - DWSPrize
!prizeplacement - CoF_Prize - CoFPrize
!prizeplacement - Fortress_Prize - FoWPrize
!prizeplacement - Droplets_Prize - ToDPrize
!prizeplacement - Crypt_Prize - RCPrize
!prizeplacement - Palace_Prize - PoWPrize
!endif
!ifdef - SHUFFLE_ELEMENTS_VANILLA_REGION
!prizeplacement - Deepwood_Prize - DWSPrizeOutside
!prizeplacement - CoF_Prize - CoFPrizeOutside
!prizeplacement - Fortress_Prize - FoWPrizeOutside
!prizeplacement - Droplets_Prize - ToDPrize
!prizeplacement - Crypt_Prize - RCPrizeOutside
!prizeplacement - Palace_Prize - PoWPrizeOutside
!endif
!ifndef - ELEMENTS_TIED_TO_VANILLA_DUNGEONS
!ifdef - ELEMENTS_TIED_TO_DUNGEONS
!ifndef - START_EARTH_ELEMENT
Items.EarthElement; DungeonPrize;
Expand Down Expand Up @@ -6723,7 +6750,7 @@ Inaccessible; Helper;; Items.Untyped.0xFF:0xFF # ask for 255 of them for goo
# This whole section is a mess and wants refactoring

# Dungeon items
!ifndef - SHUFFLE_ELEMENTS_VANILLA
!ifndef - ELEMENTS_TIED_TO_VANILLA_DUNGEONS
!define - DUNGEONPRIZE - DungeonPrize
!else
!define - DUNGEONPRIZE - UnshuffledPrize
Expand Down