mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-08-21 14:55:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Shuffle Silver (#5659)

Browse Source 
Co-authored-by: Pepper0ni <93387759+Pepper0ni@users.noreply.github.com>
Co-authored-by: leggettc18 <chris@leggett.dev>
This commit is contained in:
Philip Dubé
2026-08-06 01:51:59 +00:00
committed by GitHub
parent edfdfe1338
commit b76e303ceb
58 changed files with 3332 additions and 1104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/CMakeLists.txt
+1
View File
@@ -4,6 +4,7 @@ set(CMAKE_SYSTEM_VERSION 10.0 CACHE STRING "" FORCE)
project(soh LANGUAGES C CXX)
set(CMAKE_CXX_STANDARD 20 CACHE STRING "The C++ standard to use")
set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_C_STANDARD 23 CACHE STRING "The C standard to use")
if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
soh/include/z64save.h
+22
View File
@@ -227,6 +227,28 @@ typedef struct {
typedef struct ShipRandomizerSaveContextData {
u8 triforcePiecesCollected;
u8 bombchuUpgradeLevel;
s8 silverShadowBlades;
s8 silverShadowPit;
s8 silverShadowSpikes;
s8 silverSpiritChild;
s8 silverSpiritSun;
s8 silverSpiritBoulders;
s8 silverBotw;
s8 silverIceCavernBlades;
s8 silverIceCavernBlock;
s8 silverGtgSlope;
s8 silverGtgLava;
s8 silverGtgWater;
s8 silverGanonLight;
s8 silverGanonForest;
s8 silverGanonFire;
s8 silverGanonSpirit;
s8 silverMqDodongosCavern;
s8 silverMqShadowInvisibleBlades;
s8 silverMqSpiritLobby;
s8 silverMqSpiritBigWall;
s8 silverMqGanonWater;
s8 silverMqGanonShadow;
} ShipRandomizerSaveContextData;
typedef struct ShipBossRushSaveContextData {
soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h
+24
View File
@@ -2598,6 +2598,30 @@ typedef enum {
// - None
VB_SHOW_TITLE_CARD,
// #### `result`
// ```c
// this->actor.xyzDistToPlayerSq < 900.0f
// ```
// #### `args`
// - *EnGSwitch
VB_SILVER_COLLECT,
// #### `result`
// ```c
// true
// ```
// #### `args`
// - *EnGSwitch
VB_SILVER_COUNT_CHECK,
// #### `result`
// ```c
// Flags_GetSwitch(play, this->switchFlag)
// ```
// #### `args`
// - *EnGSwitch
VB_SILVER_DESPAWN,
// #### `result`
// ```c
// true
soh/soh/Enhancements/randomizer/3drando/fill.cpp
+2 -2
View File
@@ -403,8 +403,8 @@ bool AddCheckToLogic(LocationAccess& locPair, GetAccessibleLocationsStruct& gals
RandomizerGet locItem = location->GetPlacedRandomizerGet();
RandomizerCheckQuest quest = Rando::StaticData::GetLocation(loc)->GetQuest();
assert(ctx->GetOption(RSK_LOGIC_RULES).Is(RO_LOGIC_NO_LOGIC) || quest == RCQUEST_BOTH ||
(quest == RCQUEST_VANILLA && ctx->GetDungeons()->GetDungeonFromScene(parentRegion->scene)->IsVanilla()) ||
(quest == RCQUEST_MQ && ctx->GetDungeons()->GetDungeonFromScene(parentRegion->scene)->IsMQ()));
(quest == RCQUEST_VANILLA && ctx->GetDungeonFromScene(parentRegion->scene)->IsVanilla()) ||
(quest == RCQUEST_MQ && ctx->GetDungeonFromScene(parentRegion->scene)->IsMQ()));
if (!location->IsAddedToPool() && locPair.ConditionsMet(parentRegion, logic->CalculatingAvailableChecks) &&
!logic->ShopItemNotForSale(loc)) {
soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_exclude_dungeon.cpp
+9
View File
@@ -6,6 +6,15 @@ namespace Rando {
void StaticData::HintTable_Init_Exclude_Dungeon() {
// clang-format off
// TODO move these to region specific sections when hint text stable
hintTextTable[RHT_DODONGOS_CAVERN_SILVER] = HintText(CustomMessage("They say that a #silver rupee in Dodongo's Cavern# holds #[[1]]#.", TODO_TRANSLATE, TODO_TRANSLATE, {QM_RED, QM_GREEN}));
hintTextTable[RHT_SHADOW_TEMPLE_SILVER] = HintText(CustomMessage("They say that a #silver rupee in the Shadow Temple# holds #[[1]]#.", TODO_TRANSLATE, TODO_TRANSLATE, {QM_RED, QM_GREEN}));
hintTextTable[RHT_SPIRIT_TEMPLE_SILVER] = HintText(CustomMessage("They say that a #silver rupee in the Spirit Temple# holds #[[1]]#.", TODO_TRANSLATE, TODO_TRANSLATE, {QM_RED, QM_GREEN}));
hintTextTable[RHT_BOTW_SILVER] = HintText(CustomMessage("They say that a #silver rupee in the Bottom of the Well# holds #[[1]]#.", TODO_TRANSLATE, TODO_TRANSLATE, {QM_RED, QM_GREEN}));
hintTextTable[RHT_ICE_CAVERN_SILVER] = HintText(CustomMessage("They say that a #silver rupee in the Ice Cavern# holds #[[1]]#.", TODO_TRANSLATE, TODO_TRANSLATE, {QM_RED, QM_GREEN}));
hintTextTable[RHT_GTG_SILVER] = HintText(CustomMessage("They say that a #silver rupee in the Gerudo Training Ground# holds #[[1]]#.", TODO_TRANSLATE, TODO_TRANSLATE, {QM_RED, QM_GREEN}));
hintTextTable[RHT_GANONS_CASTLE_SILVER] = HintText(CustomMessage("They say that a #silver rupee in Ganon's Castle# holds #[[1]]#.", TODO_TRANSLATE, TODO_TRANSLATE, {QM_RED, QM_GREEN}));
/*--------------------------
| DEKU TREE |
---------------------------*/
soh/soh/Enhancements/randomizer/3drando/hint_list/hint_list_item.cpp
+8
View File
@@ -2108,6 +2108,14 @@ void StaticData::HintTable_Init_Item() {
}, {
CustomMessage("sack of mice", /*german*/"ein Sack Mäuse", /*french*/"un Sac rempli de souris")});
hintTextTable[RHT_SILVER_RUPEE_DODONGOS_CAVERN] = HintText(CustomMessage("a Dodongo's Cavern Silver Rupee", /*german*/ TODO_TRANSLATE, /*french*/ TODO_TRANSLATE));
hintTextTable[RHT_SILVER_RUPEE_SHADOW_TEMPLE] = HintText(CustomMessage("a Shadow Temple Silver Rupee", /*german*/ TODO_TRANSLATE, /*french*/ TODO_TRANSLATE));
hintTextTable[RHT_SILVER_RUPEE_SPIRIT_TEMPLE] = HintText(CustomMessage("a Spirit Temple Silver Rupee", /*german*/ TODO_TRANSLATE, /*french*/ TODO_TRANSLATE));
hintTextTable[RHT_SILVER_RUPEE_BOTW] = HintText(CustomMessage("a Bottom of the Well Silver Rupee", /*german*/ TODO_TRANSLATE, /*french*/ TODO_TRANSLATE));
hintTextTable[RHT_SILVER_RUPEE_ICE_CAVERN] = HintText(CustomMessage("an Ice Cavern Silver Rupee", /*german*/ TODO_TRANSLATE, /*french*/ TODO_TRANSLATE));
hintTextTable[RHT_SILVER_RUPEE_GTG] = HintText(CustomMessage("a Gerudo Training Ground Silver Rupee", /*german*/ TODO_TRANSLATE, /*french*/ TODO_TRANSLATE));
hintTextTable[RHT_SILVER_RUPEE_GANONS_CASTLE] = HintText(CustomMessage("a Ganon's Castle Silver Rupee", /*german*/ TODO_TRANSLATE, /*french*/ TODO_TRANSLATE));
hintTextTable[RHT_SKELETON_KEY] = HintText(CustomMessage("a Skeleton Key", /*german*/ "der Skelettschlüssel", /*french*/ "une Clé Squelette"),
// /*spanish*/una Llave Maestra
{
soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
+121 -4
View File
@@ -126,11 +126,12 @@ static void PlaceItemsForType(RandomizerCheckType rctype, bool overworldActive =
if (currentQuest == RCQUEST_BOTH) {
AddFixedItemToPool(loc->GetVanillaItem(), 1, false);
} else {
// Check if current item's dungeon is vanilla or MQ, and only add if quest corresponds to it.
// Check if current item's dungeon is vanilla or MQ, and only add if quest corresponds to it
SceneID itemScene = loc->GetScene();
auto dungeon = ctx->GetDungeonFromScene(itemScene);
if (itemScene >= SCENE_DEKU_TREE && itemScene <= SCENE_GERUDO_TRAINING_GROUND) {
bool isMQ = ctx->GetDungeon(itemScene)->IsMQ();
if (dungeon != nullptr) {
bool isMQ = dungeon->IsMQ();
if ((isMQ && currentQuest == RCQUEST_MQ) || (!isMQ && currentQuest == RCQUEST_VANILLA)) {
AddFixedItemToPool(loc->GetVanillaItem(), 1, false);
@@ -231,7 +232,7 @@ void GenerateItemPool() {
std::max(0, 1 + infiniteProgressive - startMagic));
//clang-format on
int extraWallets =(ctx->GetOption(RSK_SHUFFLE_CHILD_WALLET) ? 1 : 0) + (ctx->GetOption(RSK_INCLUDE_TYCOON_WALLET) ? 1 : 0);
int extraWallets = (ctx->GetOption(RSK_SHUFFLE_CHILD_WALLET) ? 1 : 0) + (ctx->GetOption(RSK_INCLUDE_TYCOON_WALLET) ? 1 : 0);
int startWallet = ctx->GetOption(RSK_STARTING_WALLET).Get();
AddItemToPool(RG_PROGRESSIVE_WALLET, std::max(0, 3 + infiniteProgressive + extraWallets - startWallet),
std::max(0, 2 + infiniteProgressive + extraWallets - startWallet),
@@ -913,6 +914,122 @@ void GenerateItemPool() {
}
}
bool silverActive = ctx->GetOption(RSK_SHUFFLE_SILVER).Get();
if (silverActive) {
PlaceItemsForType(RCTYPE_SILVER, silverActive, silverActive);
}
if (ctx->GetOption(RSK_SHUFFLE_SILVER).Is(RO_SHUFFLE_SILVER_ON) ||
ctx->GetOption(RSK_SHUFFLE_SILVER).Is(RO_SHUFFLE_SILVER_WALLET)) {
ctx->possibleIceTrapModels.insert(RG_SHADOW_SILVER_BLADES); // ice traps reroll this into a random silver rupee
bool isWallet = ctx->GetOption(RSK_SHUFFLE_SILVER).Is(RO_SHUFFLE_SILVER_WALLET);
auto dungeons = ctx->GetDungeons();
if (ctx->GetOption(RSK_SHUFFLE_SILVER).Is(RO_SHUFFLE_SILVER_ON)){
AddItemToPool(RG_SHADOW_SILVER_BLADES, 6,5,5,5, false);
AddItemToPool(RG_SHADOW_SILVER_PIT, 6,5,5,5, false);
AddItemToPool(RG_GTG_SILVER_SLOPE, 6,5,5,5, false);
AddItemToPool(RG_GANONS_CASTLE_SILVER_FIRE, 6,5,5,5, false);
if (dungeons->GetDungeonFromScene(SCENE_DODONGOS_CAVERN)->IsMQ()) {
AddItemToPool(RG_DODONGOS_CAVERN_MQ_SILVER, 6,5,5,5, false);
}
if (dungeons->GetDungeonFromScene(SCENE_SHADOW_TEMPLE)->IsMQ()) {
AddItemToPool(RG_SHADOW_MQ_SILVER_INVISIBLE_BLADES, 11,10,10,10, false);
AddItemToPool(RG_SHADOW_SILVER_SPIKES, 11,10,10,10, false);
} else {
AddItemToPool(RG_SHADOW_SILVER_SPIKES, 6,5,5,5, false);
}
if (dungeons->GetDungeonFromScene(SCENE_SPIRIT_TEMPLE)->IsVanilla()) {
AddItemToPool(RG_SPIRIT_SILVER_CHILD, 6,5,5,5, false);
AddItemToPool(RG_SPIRIT_SILVER_SUN, 6,5,5,5, false);
AddItemToPool(RG_SPIRIT_SILVER_BOULDERS, 6,5,5,5, false);
} else {
AddItemToPool(RG_SPIRIT_MQ_SILVER_LOBBY, 6,5,5,5, false);
AddItemToPool(RG_SPIRIT_MQ_SILVER_BIG_WALL, 6,5,5,5, false);
}
if (dungeons->GetDungeonFromScene(SCENE_BOTTOM_OF_THE_WELL)->IsVanilla()) {
AddItemToPool(RG_BOTW_SILVER, 6,5,5,5, false);
}
if (dungeons->GetDungeonFromScene(SCENE_ICE_CAVERN)->IsVanilla()) {
AddItemToPool(RG_ICE_CAVERN_SILVER_BLADES, 6,5,5,5, false);
AddItemToPool(RG_ICE_CAVERN_SILVER_BLOCK, 6,5,5,5, false);
}
if (dungeons->GetDungeonFromScene(SCENE_GERUDO_TRAINING_GROUND)->IsVanilla()) {
AddItemToPool(RG_GTG_SILVER_LAVA, 6,5,5,5, false);
AddItemToPool(RG_GTG_SILVER_WATER, 6,5,5,5, false);
} else {
AddItemToPool(RG_GTG_SILVER_LAVA, 7,6,6,6, false);
AddItemToPool(RG_GTG_SILVER_WATER, 4,3,3,3, false);
}
if (dungeons->GetDungeonFromScene(SCENE_INSIDE_GANONS_CASTLE)->IsVanilla()) {
AddItemToPool(RG_GANONS_CASTLE_SILVER_LIGHT, 6,5,5,5, false);
AddItemToPool(RG_GANONS_CASTLE_SILVER_FOREST, 6,5,5,5, false);
AddItemToPool(RG_GANONS_CASTLE_SILVER_SPIRIT, 6,5,5,5, false);
} else {
AddItemToPool(RG_GANONS_CASTLE_MQ_SILVER_WATER, 6,5,5,5, false);
AddItemToPool(RG_GANONS_CASTLE_MQ_SILVER_SHADOW, 6,5,5,5, false);
}
} else {
AddItemToPool(RG_SHADOW_SILVER_BLADES, 2,1,1,1, false);
AddItemToPool(RG_SHADOW_SILVER_PIT, 2,1,1,1, false);
AddItemToPool(RG_GTG_SILVER_SLOPE, 2,1,1,1, false);
AddItemToPool(RG_GANONS_CASTLE_SILVER_FIRE, 2,1,1,1, false);
if (dungeons->GetDungeonFromScene(SCENE_DODONGOS_CAVERN)->IsMQ()) {
AddItemToPool(RG_DODONGOS_CAVERN_MQ_SILVER, 2,1,1,1, false);
}
if (dungeons->GetDungeonFromScene(SCENE_SHADOW_TEMPLE)->IsMQ()) {
AddItemToPool(RG_SHADOW_MQ_SILVER_INVISIBLE_BLADES, 2,1,1,1, false);
AddItemToPool(RG_SHADOW_SILVER_SPIKES, 2,1,1,1, false);
} else {
AddItemToPool(RG_SHADOW_SILVER_SPIKES, 2,1,1,1, false);
}
if (dungeons->GetDungeonFromScene(SCENE_SPIRIT_TEMPLE)->IsVanilla()) {
AddItemToPool(RG_SPIRIT_SILVER_CHILD, 2,1,1,1, false);
AddItemToPool(RG_SPIRIT_SILVER_SUN, 2,1,1,1, false);
AddItemToPool(RG_SPIRIT_SILVER_BOULDERS, 2,1,1,1, false);
} else {
AddItemToPool(RG_SPIRIT_MQ_SILVER_LOBBY, 2,1,1,1, false);
AddItemToPool(RG_SPIRIT_MQ_SILVER_BIG_WALL, 2,1,1,1, false);
}
if (dungeons->GetDungeonFromScene(SCENE_BOTTOM_OF_THE_WELL)->IsVanilla()) {
AddItemToPool(RG_BOTW_SILVER, 2,1,1,1, false);
}
if (dungeons->GetDungeonFromScene(SCENE_ICE_CAVERN)->IsVanilla()) {
AddItemToPool(RG_ICE_CAVERN_SILVER_BLADES, 2,1,1,1, false);
AddItemToPool(RG_ICE_CAVERN_SILVER_BLOCK, 2,1,1,1, false);
}
if (dungeons->GetDungeonFromScene(SCENE_GERUDO_TRAINING_GROUND)->IsVanilla()) {
AddItemToPool(RG_GTG_SILVER_LAVA, 2,1,1,1, false);
AddItemToPool(RG_GTG_SILVER_WATER, 2,1,1,1, false);
} else {
AddItemToPool(RG_GTG_SILVER_LAVA, 2,1,1,1, false);
AddItemToPool(RG_GTG_SILVER_WATER, 2,1,1,1, false);
}
if (dungeons->GetDungeonFromScene(SCENE_INSIDE_GANONS_CASTLE)->IsVanilla()) {
AddItemToPool(RG_GANONS_CASTLE_SILVER_LIGHT, 2,1,1,1, false);
AddItemToPool(RG_GANONS_CASTLE_SILVER_FOREST, 2,1,1,1, false);
AddItemToPool(RG_GANONS_CASTLE_SILVER_SPIRIT, 2,1,1,1, false);
} else {
AddItemToPool(RG_GANONS_CASTLE_MQ_SILVER_WATER, 2,1,1,1, false);
AddItemToPool(RG_GANONS_CASTLE_MQ_SILVER_SHADOW, 2,1,1,1, false);
}
}
}
int maxHearts = 20;
switch (ctx->GetOption(RSK_ITEM_POOL).Get()) {
case RO_ITEM_POOL_PLENTIFUL:
soh/soh/Enhancements/randomizer/3drando/playthrough.cpp
+6 -8
View File
@@ -71,14 +71,12 @@ int Playthrough_Init(uint32_t seed, std::set<RandomizerCheck> excludedLocations,
GenerateHash();
if (true) {
// TODO: Handle different types of file output (Spoiler Log, Plando Template, Patch Files, Race Files, etc.)
SPDLOG_INFO("Writing Spoiler Log...");
StartPerformanceTimer(PT_SPOILER_LOG);
SpoilerLog_Write();
StopPerformanceTimer(PT_SPOILER_LOG);
SPDLOG_INFO("Writing Spoiler Log Done");
}
// TODO: Handle different types of file output (Spoiler Log, Plando Template, Patch Files, Race Files, etc.)
SPDLOG_INFO("Writing Spoiler Log...");
StartPerformanceTimer(PT_SPOILER_LOG);
SpoilerLog_Write();
StopPerformanceTimer(PT_SPOILER_LOG);
SPDLOG_INFO("Writing Spoiler Log Done");
ctx->playthroughLocations.clear();
ctx->playthroughBeatable = false;
soh/soh/Enhancements/randomizer/3drando/starting_inventory.cpp
+6
View File
@@ -54,6 +54,12 @@ void GenerateStartingInventory() {
AddItemToInventory(RG_SHADOW_TEMPLE_BOSS_KEY);
}
if (ctx->GetOption(RSK_SHUFFLE_SILVER).Is(RO_SHUFFLE_SILVER_STARTWITH)) {
for (int rg = (int)RG_SHADOW_SILVER_BLADES; rg <= (int)RG_GANONS_CASTLE_MQ_SILVER_SHADOW; rg++) {
AddItemToInventory((RandomizerGet)rg);
}
}
if (ctx->GetOption(RSK_GANONS_BOSS_KEY).Is(RO_GANON_BOSS_KEY_STARTWITH)) {
AddItemToInventory(RG_GANONS_CASTLE_BOSS_KEY);
}
soh/soh/Enhancements/randomizer/RCToRandInf.cpp
+154
View File
@@ -3067,4 +3067,158 @@ std::map<RandomizerCheck, RandomizerInf> rcToRandomizerInf = {
RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_SECOND_DOOR_RED_ICE_4 },
{ RC_GANONS_CASTLE_MQ_WATER_TRIAL_SECOND_DOOR_RED_ICE_5,
RAND_INF_GANONS_CASTLE_MQ_WATER_TRIAL_SECOND_DOOR_RED_ICE_5 },
{ RC_SHADOW_N_UNDER_BLADE_SILVER, RAND_INF_RC_SHADOW_N_UNDER_BLADE_SILVER },
{ RC_SHADOW_TALL_BLOCK_BLADE_SILVER, RAND_INF_RC_SHADOW_TALL_BLOCK_BLADE_SILVER },
{ RC_SHADOW_N_NOOK_BLADE_SILVER, RAND_INF_RC_SHADOW_N_NOOK_BLADE_SILVER },
{ RC_SHADOW_W_NOOK_BLADE_SILVER, RAND_INF_SHADOW_W_NOOK_BLADE_SILVER },
{ RC_SHADOW_S_UNDER_BLADE_SILVER, RAND_INF_SHADOW_S_UNDER_BLADE_SILVER },
{ RC_SHADOW_N_PIT_SILVER, RAND_INF_SHADOW_N_PIT_SILVER },
{ RC_SHADOW_S_PIT_SILVER, RAND_INF_SHADOW_S_PIT_SILVER },
{ RC_SHADOW_BEAMOS_PIT_SILVER, RAND_INF_SHADOW_BEAMOS_PIT_SILVER },
{ RC_SHADOW_E_PIT_SILVER, RAND_INF_SHADOW_E_PIT_SILVER },
{ RC_SHADOW_W_PIT_SILVER, RAND_INF_SHADOW_W_PIT_SILVER },
{ RC_SHADOW_PLATFORM_SPIKES_SILVER, RAND_INF_SHADOW_PLATFORM_SPIKES_SILVER },
{ RC_SHADOW_E_TARGET_SPIKES_SILVER, RAND_INF_SHADOW_E_TARGET_SPIKES_SILVER },
{ RC_SHADOW_FLOOR_SPIKES_SILVER, RAND_INF_SHADOW_FLOOR_SPIKES_SILVER },
{ RC_SHADOW_W_TARGET_SPIKES_SILVER, RAND_INF_SHADOW_W_TARGET_SPIKES_SILVER },
{ RC_SHADOW_AIRBORNE_SPIKES_SILVER, RAND_INF_SHADOW_AIRBORNE_SPIKES_SILVER },
{ RC_SPIRIT_W_HIGH_CHILD_SILVER, RAND_INF_SPIRIT_W_HIGH_CHILD_SILVER },
{ RC_SPIRIT_W_LOW_CHILD_SILVER, RAND_INF_SPIRIT_W_LOW_CHILD_SILVER },
{ RC_SPIRIT_E_LOW_CHILD_SILVER, RAND_INF_SPIRIT_E_LOW_CHILD_SILVER },
{ RC_SPIRIT_E_HIGH_CHILD_SILVER, RAND_INF_SPIRIT_E_HIGH_CHILD_SILVER },
{ RC_SPIRIT_TORCH_CHILD_SILVER, RAND_INF_SPIRIT_TORCH_CHILD_SILVER },
{ RC_SPIRIT_NEAR_LIGHT_SUN_SILVER, RAND_INF_SPIRIT_NEAR_LIGHT_SUN_SILVER },
{ RC_SPIRIT_AIRBORNE_SUN_SILVER, RAND_INF_SPIRIT_AIRBORNE_SUN_SILVER },
{ RC_SPIRIT_MID_PLATFORM_SUN_SILVER, RAND_INF_SPIRIT_MID_PLATFORM_SUN_SILVER },
{ RC_SPIRIT_NEAR_CHEST_SUN_SILVER, RAND_INF_SPIRIT_NEAR_CHEST_SUN_SILVER },
{ RC_SPIRIT_NEAR_DOOR_SUN_SILVER, RAND_INF_SPIRIT_NEAR_DOOR_SUN_SILVER },
{ RC_SPIRIT_NW_BOULDER_SILVER, RAND_INF_SPIRIT_NW_BOULDER_SILVER },
{ RC_SPIRIT_SW_BOULDER_SILVER, RAND_INF_SPIRIT_SW_BOULDER_SILVER },
{ RC_SPIRIT_SE_BOULDER_SILVER, RAND_INF_SPIRIT_SE_BOULDER_SILVER },
{ RC_SPIRIT_NE_BOULDER_SILVER, RAND_INF_SPIRIT_NE_BOULDER_SILVER },
{ RC_SPIRIT_AIRBORNE_BOULDER_SILVER, RAND_INF_SPIRIT_AIRBORNE_BOULDER_SILVER },
{ RC_BOTW_B1_LADDER_SILVER, RAND_INF_BOTW_B1_LADDER_SILVER },
{ RC_BOTW_B2_LADDER_SILVER, RAND_INF_BOTW_B2_LADDER_SILVER },
{ RC_BOTW_B3_LADDER_SILVER, RAND_INF_BOTW_B3_LADDER_SILVER },
{ RC_BOTW_NW_OOZE_SILVER, RAND_INF_BOTW_NW_OOZE_SILVER },
{ RC_BOTW_SE_OOZE_SILVER, RAND_INF_BOTW_SE_OOZE_SILVER },
{ RC_ICE_CAVERN_ICICLES_BLADE_SILVER, RAND_INF_ICE_CAVERN_ICICLES_BLADE_SILVER },
{ RC_ICE_CAVERN_W_INNER_BLADE_SILVER, RAND_INF_ICE_CAVERN_W_INNER_BLADE_SILVER },
{ RC_ICE_CAVERN_OUTER_BLADE_SILVER, RAND_INF_ICE_CAVERN_OUTER_BLADE_SILVER },
{ RC_ICE_CAVERN_E_INNER_BLADE_SILVER, RAND_INF_ICE_CAVERN_E_INNER_BLADE_SILVER },
{ RC_ICE_CAVERN_AIRBORNE_BLADE_SILVER, RAND_INF_ICE_CAVERN_AIRBORNE_BLADE_SILVER },
{ RC_ICE_CAVERN_NEAR_FIRE_BLOCK_SILVER, RAND_INF_ICE_CAVERN_NEAR_FIRE_BLOCK_SILVER },
{ RC_ICE_CAVERN_LOWER_BLOCK_SILVER, RAND_INF_ICE_CAVERN_LOWER_BLOCK_SILVER },
{ RC_ICE_CAVERN_NEAR_BLOCK_SILVER, RAND_INF_ICE_CAVERN_NEAR_BLOCK_SILVER },
{ RC_ICE_CAVERN_FROZEN_BLOCK_SILVER, RAND_INF_ICE_CAVERN_FROZEN_BLOCK_SILVER },
{ RC_ICE_CAVERN_NEAR_GS_BLOCK_SILVER, RAND_INF_ICE_CAVERN_NEAR_GS_BLOCK_SILVER },
{ RC_GTG_FIRE_WALL_SLOPE_SILVER, RAND_INF_GTG_FIRE_WALL_SLOPE_SILVER },
{ RC_GTG_LOWER_BOULDER_SLOPE_SILVER, RAND_INF_GTG_LOWER_BOULDER_SLOPE_SILVER },
{ RC_GTG_TARGET_SLOPE_SILVER, RAND_INF_GTG_TARGET_SLOPE_SILVER },
{ RC_GTG_JUMPDOWN_SLOPE_SILVER, RAND_INF_GTG_JUMPDOWN_SLOPE_SILVER },
{ RC_GTG_UPPER_BOULDER_SLOPE_SILVER, RAND_INF_GTG_UPPER_BOULDER_SLOPE_SILVER },
{ RC_GTG_NEAR_SWITCH_LAVA_SILVER, RAND_INF_GTG_NEAR_SWITCH_LAVA_SILVER },
{ RC_GTG_NEAR_BARRED_DOOR_LAVA_SILVER, RAND_INF_GTG_NEAR_BARRED_DOOR_LAVA_SILVER },
{ RC_GTG_FIRE_RING_LAVA_SILVER, RAND_INF_GTG_FIRE_RING_LAVA_SILVER },
{ RC_GTG_UPPER_LAVA_SILVER, RAND_INF_GTG_UPPER_LAVA_SILVER },
{ RC_GTG_UNDER_LEDGE_LAVA_SILVER, RAND_INF_GTG_UNDER_LEDGE_LAVA_SILVER },
{ RC_GTG_MIDDLE_WATER_SILVER, RAND_INF_GTG_MIDDLE_WATER_SILVER },
{ RC_GTG_ABOVE_TARGET_WATER_SILVER, RAND_INF_GTG_ABOVE_TARGET_WATER_SILVER },
{ RC_GTG_LEFT_WATER_SILVER, RAND_INF_GTG_LEFT_WATER_SILVER },
{ RC_GTG_UNDER_TARGET_WATER_SILVER, RAND_INF_GTG_UNDER_TARGET_WATER_SILVER },
{ RC_GTG_RIGHT_WATER_SILVER, RAND_INF_GTG_RIGHT_WATER_SILVER },
{ RC_GANONS_CASTLE_OUTER_RIGHT_LIGHT_SILVER, RAND_INF_GANONS_CASTLE_OUTER_RIGHT_LIGHT_SILVER },
{ RC_GANONS_CASTLE_OUTER_LEFT_LIGHT_SILVER, RAND_INF_GANONS_CASTLE_OUTER_LEFT_LIGHT_SILVER },
{ RC_GANONS_CASTLE_UPPER_LIGHT_SILVER, RAND_INF_GANONS_CASTLE_UPPER_LIGHT_SILVER },
{ RC_GANONS_CASTLE_INNER_RIGHT_LIGHT_SILVER, RAND_INF_GANONS_CASTLE_INNER_RIGHT_LIGHT_SILVER },
{ RC_GANONS_CASTLE_INNER_LEFT_LIGHT_SILVER, RAND_INF_GANONS_CASTLE_INNER_LEFT_LIGHT_SILVER },
{ RC_GANONS_CASTLE_LARGE_PLATFORM_FOREST_SILVER, RAND_INF_GANONS_CASTLE_LARGE_PLATFORM_FOREST_SILVER },
{ RC_GANONS_CASTLE_SOT_BLOCK_FOREST_SILVER, RAND_INF_GANONS_CASTLE_SOT_BLOCK_FOREST_SILVER },
{ RC_GANONS_CASTLE_SMALL_PLATFORM_FOREST_SILVER, RAND_INF_GANONS_CASTLE_SMALL_PLATFORM_FOREST_SILVER },
{ RC_GANONS_CASTLE_UNDER_LEDGE_FOREST_SILVER, RAND_INF_GANONS_CASTLE_UNDER_LEDGE_FOREST_SILVER },
{ RC_GANONS_CASTLE_ON_TARGET_FOREST_SILVER, RAND_INF_GANONS_CASTLE_ON_TARGET_FOREST_SILVER },
{ RC_GANONS_CASTLE_TORCH_SLUG_FIRE_SILVER, RAND_INF_GANONS_CASTLE_TORCH_SLUG_FIRE_SILVER },
{ RC_GANONS_CASTLE_FLAME_JETS_FIRE_SILVER, RAND_INF_GANONS_CASTLE_FLAME_JETS_FIRE_SILVER },
{ RC_GANONS_CASTLE_DISTANT_PLATFORM_FIRE_SILVER, RAND_INF_GANONS_CASTLE_DISTANT_PLATFORM_FIRE_SILVER },
{ RC_GANONS_CASTLE_CLOSE_PLATFORM_FIRE_SILVER, RAND_INF_GANONS_CASTLE_CLOSE_PLATFORM_FIRE_SILVER },
{ RC_GANONS_GANONS_CASTLE_UNDER_PILLAR_FIRE_SILVER, RAND_INF_GANONS_GANONS_CASTLE_UNDER_PILLAR_FIRE_SILVER },
{ RC_GANONS_CASTLE_AIRBORNE_SPIRIT_SILVER, RAND_INF_GANONS_CASTLE_AIRBORNE_SPIRIT_SILVER },
{ RC_GANONS_CASTLE_NEAR_DOORMAT_SPIRIT_SILVER, RAND_INF_GANONS_CASTLE_NEAR_DOORMAT_SPIRIT_SILVER },
{ RC_GANONS_CASTLE_LOWER_MIDDLE_SPIRIT_SILVER, RAND_INF_GANONS_CASTLE_LOWER_MIDDLE_SPIRIT_SILVER },
{ RC_GANONS_CASTLE_CORNER_SPIRIT_SILVER, RAND_INF_GANONS_CASTLE_CORNER_SPIRIT_SILVER },
{ RC_GANONS_CASTLE_NEAR_BARRED_DOOR_SPIRIT_SILVER, RAND_INF_GANONS_CASTLE_NEAR_BARRED_DOOR_SPIRIT_SILVER },
{ RC_DODONGOS_CAVERN_MQ_BEAMOS_SILVER, RAND_INF_DODONGOS_CAVERN_MQ_BEAMOS_SILVER },
{ RC_DODONGOS_CAVERN_MQ_1F_CRATE_SILVER, RAND_INF_DODONGOS_CAVERN_MQ_1F_CRATE_SILVER },
{ RC_DODONGOS_CAVERN_MQ_LOWER_2F_CRATE_SILVER, RAND_INF_DODONGOS_CAVERN_MQ_LOWER_2F_CRATE_SILVER },
{ RC_DODONGOS_CAVERN_MQ_VINES_SILVER, RAND_INF_DODONGOS_CAVERN_MQ_VINES_SILVER },
{ RC_DODONGOS_CAVERN_MQ_UPPER_2F_CRATE_SILVER, RAND_INF_DODONGOS_CAVERN_MQ_UPPER_2F_CRATE_SILVER },
{ RC_SHADOW_MQ_W_NOOK_SILVER, RAND_INF_SHADOW_MQ_W_NOOK_SILVER },
{ RC_SHADOW_MQ_TALL_BLOCK_BLADE_SILVER, RAND_INF_SHADOW_MQ_TALL_BLOCK_BLADE_SILVER },
{ RC_SHADOW_MQ_NE_UNDER_BLADE_SILVER, RAND_INF_SHADOW_MQ_NE_UNDER_BLADE_SILVER },
{ RC_SHADOW_MQ_S_UNDER_BLADE_SILVER, RAND_INF_SHADOW_MQ_S_UNDER_BLADE_SILVER },
{ RC_SHADOW_MQ_N_NOOK_BLADE_SILVER, RAND_INF_SHADOW_MQ_N_NOOK_BLADE_SILVER },
{ RC_SHADOW_MQ_W_PIT_SILVER, RAND_INF_SHADOW_MQ_W_PIT_SILVER },
{ RC_SHADOW_MQ_HIGH_PIT_SILVER, RAND_INF_SHADOW_MQ_HIGH_PIT_SILVER },
{ RC_SHADOW_MQ_HIGHEST_PIT_SILVER, RAND_INF_SHADOW_MQ_HIGHEST_PIT_SILVER },
{ RC_SHADOW_MQ_N_PIT_SILVER, RAND_INF_SHADOW_MQ_N_PIT_SILVER },
{ RC_SHADOW_MQ_E_PIT_SILVER, RAND_INF_SHADOW_MQ_E_PIT_SILVER },
{ RC_SHADOW_MQ_W_INVISIBLE_BLADE_SILVER, RAND_INF_SHADOW_MQ_W_INVISIBLE_BLADE_SILVER },
{ RC_SHADOW_MQ_SW_INVISIBLE_BLADE_SILVER, RAND_INF_SHADOW_MQ_SW_INVISIBLE_BLADE_SILVER },
{ RC_SHADOW_MQ_NW_INVISIBLE_BLADE_SILVER, RAND_INF_SHADOW_MQ_NW_INVISIBLE_BLADE_SILVER },
{ RC_SHADOW_MQ_S_INVISIBLE_BLADE_SILVER, RAND_INF_SHADOW_MQ_S_INVISIBLE_BLADE_SILVER },
{ RC_SHADOW_MQ_INNER_NE_INVISIBLE_BLADE_SILVER, RAND_INF_SHADOW_MQ_INNER_NE_INVISIBLE_BLADE_SILVER },
{ RC_SHADOW_MQ_SE_INVISIBLE_BLADE_SILVER, RAND_INF_SHADOW_MQ_SE_INVISIBLE_BLADE_SILVER },
{ RC_SHADOW_MQ_OUTSIDE_CIRCLE_INVISIBLE_BLADE_SILVER, RAND_INF_SHADOW_MQ_OUTSIDE_CIRCLE_INVISIBLE_BLADE_SILVER },
{ RC_SHADOW_MQ_OUTER_NE_INVISIBLE_BLADE_SILVER, RAND_INF_SHADOW_MQ_OUTER_NE_INVISIBLE_BLADE_SILVER },
{ RC_SHADOW_MQ_E_INVISIBLE_BLADE_SILVER, RAND_INF_SHADOW_MQ_E_INVISIBLE_BLADE_SILVER },
{ RC_SHADOW_MQ_SOT_BLOCK_INVISIBLE_BLADE_SILVER, RAND_INF_SHADOW_MQ_SOT_BLOCK_INVISIBLE_BLADE_SILVER },
{ RC_SHADOW_MQ_PLATFORM_SPIKES_SILVER, RAND_INF_SHADOW_MQ_PLATFORM_SPIKES_SILVER },
{ RC_SHADOW_MQ_W_TARGET_SPIKES_SILVER, RAND_INF_SHADOW_MQ_W_TARGET_SPIKES_SILVER },
{ RC_SHADOW_MQ_W_AIRBORNE_SPIKES_SILVER, RAND_INF_SHADOW_MQ_W_AIRBORNE_SPIKES_SILVER },
{ RC_SHADOW_MQ_N_TARGET_SPIKES_SILVER, RAND_INF_SHADOW_MQ_N_TARGET_SPIKES_SILVER },
{ RC_SHADOW_MQ_CENTRAL_SPIKES_SILVER, RAND_INF_SHADOW_MQ_CENTRAL_SPIKES_SILVER },
{ RC_SHADOW_MQ_CENTRAL_TARGET_SPIKES_SILVER, RAND_INF_SHADOW_MQ_CENTRAL_TARGET_SPIKES_SILVER },
{ RC_SHADOW_MQ_S_TARGET_SPIKES_SILVER, RAND_INF_SHADOW_MQ_S_TARGET_SPIKES_SILVER },
{ RC_SHADOW_MQ_INSIDE_SPIKES_SILVER, RAND_INF_SHADOW_MQ_INSIDE_SPIKES_SILVER },
{ RC_SHADOW_MQ_E_AIRBORNE_SPIKES_SILVER, RAND_INF_SHADOW_MQ_E_AIRBORNE_SPIKES_SILVER },
{ RC_SHADOW_MQ_E_TARGET_SPIKES_SILVER, RAND_INF_SHADOW_MQ_E_TARGET_SPIKES_SILVER },
{ RC_SPIRIT_MQ_STAIRS_LOBBY_SILVER, RAND_INF_SPIRIT_MQ_STAIRS_LOBBY_SILVER },
{ RC_SPIRIT_MQ_E_BOULDER_LOBBY_SILVER, RAND_INF_SPIRIT_MQ_E_BOULDER_LOBBY_SILVER },
{ RC_SPIRIT_MQ_W_BOULDER_LOBBY_SILVER, RAND_INF_SPIRIT_MQ_W_BOULDER_LOBBY_SILVER },
{ RC_SPIRIT_MQ_CORNER_LOBBY_SILVER, RAND_INF_SPIRIT_MQ_CORNER_LOBBY_SILVER },
{ RC_SPIRIT_MQ_JET_LOBBY_SILVER, RAND_INF_SPIRIT_MQ_JET_LOBBY_SILVER },
{ RC_SPIRIT_MQ_LOWEST_WALL_SILVER, RAND_INF_SPIRIT_MQ_LOWEST_WALL_SILVER },
{ RC_SPIRIT_MQ_MID_LOW_WALL_SILVER, RAND_INF_SPIRIT_MQ_MID_LOW_WALL_SILVER },
{ RC_SPIRIT_MQ_MID_HIGH_WALL_SILVER, RAND_INF_SPIRIT_MQ_MID_HIGH_WALL_SILVER },
{ RC_SPIRIT_MQ_HIGHEST_WALL_SILVER, RAND_INF_SPIRIT_MQ_HIGHEST_WALL_SILVER },
{ RC_SPIRIT_MQ_MIDDLE_WALL_SILVER, RAND_INF_SPIRIT_MQ_MIDDLE_WALL_SILVER },
{ RC_GTG_MQ_ICICLES_SLOPE_SILVER, RAND_INF_GTG_MQ_ICICLES_SLOPE_SILVER },
{ RC_GTG_MQ_JUMPDOWN_SLOPE_SILVER, RAND_INF_GTG_MQ_JUMPDOWN_SLOPE_SILVER },
{ RC_GTG_MQ_HIGH_SLOPE_SILVER, RAND_INF_GTG_MQ_HIGH_SLOPE_SILVER },
{ RC_GTG_MQ_FREEZARD_SLOPE_SILVER, RAND_INF_GTG_MQ_FREEZARD_SLOPE_SILVER },
{ RC_GTG_MQ_PIT_SLOPE_SILVER, RAND_INF_GTG_MQ_PIT_SLOPE_SILVER },
{ RC_GTG_MQ_NEAR_SWITCH_LAVA_SILVER, RAND_INF_GTG_MQ_NEAR_SWITCH_LAVA_SILVER },
{ RC_GTG_MQ_FAR_LAVA_SILVER, RAND_INF_GTG_MQ_FAR_LAVA_SILVER },
{ RC_GTG_MQ_MIDDLE_LAVA_SILVER, RAND_INF_GTG_MQ_MIDDLE_LAVA_SILVER },
{ RC_GTG_MQ_NEAR_BARRED_DOOR_LAVA_SILVER, RAND_INF_GTG_MQ_SILVER_LAVA_4 },
{ RC_GTG_MQ_NEAR_MAZE_LEDGE_LAVA_SILVER, RAND_INF_GTG_MQ_NEAR_MAZE_LEDGE_LAVA_SILVER },
{ RC_GTG_MQ_NEAR_LIT_TORCH_LAVA_SILVER, RAND_INF_GTG_MQ_NEAR_LIT_TORCH_LAVA_SILVER },
{ RC_GTG_MQ_BACK_WATER_SILVER, RAND_INF_GTG_MQ_BACK_WATER_SILVER },
{ RC_GTG_MQ_MIDDLE_WATER_SILVER, RAND_INF_GTG_MQ_MIDDLE_WATER_SILVER },
{ RC_GTG_MQ_FRONT_WATER_SILVER, RAND_INF_GTG_MQ_FRONT_WATER_SILVER },
{ RC_GANONS_CASTLE_MQ_UNDER_PILLAR_FIRE_SILVER, RAND_INF_GANONS_CASTLE_MQ_UNDER_PILLAR_FIRE_SILVER },
{ RC_GANONS_CASTLE_MQ_NEAR_TARGET_FIRE_SILVER, RAND_INF_GANONS_CASTLE_MQ_NEAR_TARGET_FIRE_SILVER },
{ RC_GANONS_CASTLE_MQ_ON_PILLAR_FIRE_SILVER, RAND_INF_GANONS_CASTLE_MQ_ON_PILLAR_FIRE_SILVER },
{ RC_GANONS_CASTLE_MQ_LAUNCH_PLATFORM_FIRE_SILVER, RAND_INF_GANONS_CASTLE_MQ_LAUNCH_PLATFORM_FIRE_SILVER },
{ RC_GANONS_CASTLE_MQ_JET_PLATFORM_FIRE_SILVER, RAND_INF_GANONS_CASTLE_MQ_JET_PLATFORM_FIRE_SILVER },
{ RC_GANONS_CASTLE_MQ_IN_HOLE_WATER_SILVER, RAND_INF_GANONS_CASTLE_MQ_IN_HOLE_WATER_SILVER },
{ RC_GANONS_CASTLE_MQ_AIRBORNE_WATER_SILVER, RAND_INF_GANONS_CASTLE_MQ_AIRBORNE_WATER_SILVER },
{ RC_GANONS_CASTLE_MQ_FROZEN_WATER_SILVER, RAND_INF_GANONS_CASTLE_MQ_FROZEN_WATER_SILVER },
{ RC_GANONS_CASTLE_MQ_OVER_PIT_WATER_SILVER, RAND_INF_GANONS_CASTLE_MQ_OVER_PIT_WATER_SILVER },
{ RC_GANONS_CASTLE_MQ_NOOK_WATER_SILVER, RAND_INF_GANONS_CASTLE_MQ_NOOK_WATER_SILVER },
{ RC_GANONS_CASTLE_MQ_BOMB_FLOWER_SHADOW_SILVER, RAND_INF_GANONS_CASTLE_MQ_BOMB_FLOWER_SHADOW_SILVER },
{ RC_GANONS_CASTLE_MQ_NEAR_TORCH_SHADOW_SILVER, RAND_INF_GANONS_CASTLE_MQ_NEAR_TORCH_SHADOW_SILVER },
{ RC_GANONS_CASTLE_MQ_BEAMOS_PLATFORM_SHADOW_SILVER, RAND_INF_GANONS_CASTLE_MQ_BEAMOS_PLATFORM_SHADOW_SILVER },
{ RC_GANONS_CASTLE_MQ_GUILLOTINE_SHADOW_SILVER, RAND_INF_GANONS_CASTLE_MQ_GUILLOTINE_SHADOW_SILVER },
{ RC_GANONS_CASTLE_MQ_MOVING_PLATFORM_SHADOW_SILVER, RAND_INF_GANONS_CASTLE_MQ_MOVING_PLATFORM_SHADOW_SILVER },
};
soh/soh/Enhancements/randomizer/SeedContext.cpp
+11 -2
View File
@@ -14,6 +14,7 @@
#include "../kaleido.h"
#include "soh/Enhancements/randomizer/Traps.h"
#include "soh/Enhancements/randomizer/rng.h"
#include "soh/Enhancements/randomizer/randomizer_check_tracker.h"
#include "soh/Enhancements/randomizer/randomizer.h"
#include <vector>
@@ -209,6 +210,7 @@ void Context::GenerateLocationPool() {
mOptions[RSK_SHUFFLE_WONDER_ITEMS].Is(RO_SHUFFLE_WONDER_ITEMS_OFF)) ||
(location.GetRCType() == RCTYPE_FREESTANDING &&
mOptions[RSK_SHUFFLE_FREESTANDING].Is(RO_SHUFFLE_FREESTANDING_OFF)) ||
(location.GetRCType() == RCTYPE_SILVER && !mOptions[RSK_SHUFFLE_SILVER]) ||
(location.GetRCType() == RCTYPE_BEEHIVE && !mOptions[RSK_SHUFFLE_BEEHIVES])) {
continue;
}
@@ -367,8 +369,8 @@ void Context::SetSpoilerLoaded(const bool spoilerLoaded) {
mSpoilerLoaded = spoilerLoaded;
}
GetItemEntry Context::GetFinalGIEntry(const RandomizerCheck rc, const bool checkObtainability,
const GetItemID ogItemId) {
GetItemEntry Context::GetFinalGIEntry(const RandomizerCheck rc, const bool checkObtainability, const GetItemID ogItemId,
bool spoilAreas) {
const auto itemLoc = GetItemLocation(rc);
if (itemLoc->GetPlacedRandomizerGet() == RG_NONE) {
if (ogItemId != GI_NONE) {
@@ -379,6 +381,9 @@ GetItemEntry Context::GetFinalGIEntry(const RandomizerCheck rc, const bool check
}
if (checkObtainability && OTRGlobals::Instance->gRandomizer->GetItemObtainabilityFromRandomizerGet(
itemLoc->GetPlacedRandomizerGet()) != CAN_OBTAIN) {
if (spoilAreas) {
CheckTracker::SpoilAreaFromCantObtain(itemLoc->GetPlacedRandomizerGet());
}
return ItemTableManager::Instance->RetrieveItemEntry(MOD_NONE, GI_RUPEE_BLUE);
}
GetItemEntry giEntry = itemLoc->GetPlacedItem().GetGIEntry_Copy();
@@ -496,6 +501,10 @@ DungeonInfo* Context::GetDungeon(size_t key) const {
return mDungeons->GetDungeon(static_cast<DungeonKey>(key));
}
DungeonInfo* Context::GetDungeonFromScene(SceneID scene) const {
return mDungeons->GetDungeonFromScene(scene);
}
std::shared_ptr<Logic> Context::GetLogic() {
if (mLogic.get() == nullptr) {
mLogic = std::make_shared<Logic>();
soh/soh/Enhancements/randomizer/SeedContext.h
+3 -1
View File
@@ -89,6 +89,7 @@ class Context {
std::shared_ptr<Dungeons> GetDungeons();
std::shared_ptr<Fishsanity> GetFishsanity();
DungeonInfo* GetDungeon(size_t key) const;
DungeonInfo* GetDungeonFromScene(SceneID key) const;
std::shared_ptr<Logic> GetLogic();
std::shared_ptr<Trials> GetTrials();
std::shared_ptr<Kaleido> GetKaleido();
@@ -119,7 +120,8 @@ class Context {
void GanonsSoulCondition(RandoOptionCheckTrigger condition);
void WinCondition(RandoOptionWincon condition);
GetItemEntry GetFinalGIEntry(RandomizerCheck rc, bool checkObtainability = true, GetItemID ogItemId = GI_NONE);
GetItemEntry GetFinalGIEntry(RandomizerCheck rc, bool checkObtainability = true, GetItemID ogItemId = GI_NONE,
bool spoilAreas = false);
void ParseSpoiler(const char* spoilerFileName);
void ParseHashIconIndexesJson(const nlohmann::json& spoilerFileJson);
void ParseItemLocationsJson(const nlohmann::json& spoilerFileJson);
soh/soh/Enhancements/randomizer/ShuffleSilver.cpp
+462
View File
@@ -0,0 +1,462 @@
#include <soh/OTRGlobals.h>
#include "dungeon.h"
#include "SeedContext.h"
#include "draw.h"
#include "static_data.h"
#include "randomizer.h" // IWYU pragma: keep
#include "ShuffleSilver.h"
extern "C" {
#include "overlays/actors/ovl_En_G_Switch/z_en_g_switch.h"
extern PlayState* gPlayState;
extern SaveContext gSaveContext;
}
extern void EnItem00_DrawRandomizedItem(EnItem00* enItem00, PlayState* play);
bool IsSilverInPool(RandomizerGet rg) {
auto ctx = Rando::Context::GetInstance();
switch (rg) {
case RG_SHADOW_SILVER_BLADES:
case RG_SHADOW_SILVER_PIT:
case RG_SHADOW_SILVER_SPIKES:
case RG_GTG_SILVER_SLOPE:
case RG_GTG_SILVER_LAVA:
case RG_GTG_SILVER_WATER:
case RG_GANONS_CASTLE_SILVER_FIRE:
return true;
case RG_SPIRIT_SILVER_CHILD:
case RG_SPIRIT_SILVER_SUN:
case RG_SPIRIT_SILVER_BOULDERS:
return ctx->GetDungeon(Rando::SPIRIT_TEMPLE)->IsVanilla();
case RG_BOTW_SILVER:
return ctx->GetDungeon(Rando::BOTTOM_OF_THE_WELL)->IsVanilla();
case RG_ICE_CAVERN_SILVER_BLADES:
case RG_ICE_CAVERN_SILVER_BLOCK:
return ctx->GetDungeon(Rando::ICE_CAVERN)->IsVanilla();
case RG_GANONS_CASTLE_SILVER_LIGHT:
case RG_GANONS_CASTLE_SILVER_FOREST:
case RG_GANONS_CASTLE_SILVER_SPIRIT:
return ctx->GetDungeon(Rando::GANONS_CASTLE)->IsVanilla();
case RG_DODONGOS_CAVERN_MQ_SILVER:
return ctx->GetDungeon(Rando::DODONGOS_CAVERN)->IsMQ();
case RG_SHADOW_MQ_SILVER_INVISIBLE_BLADES:
return ctx->GetDungeon(Rando::SHADOW_TEMPLE)->IsMQ();
case RG_SPIRIT_MQ_SILVER_LOBBY:
case RG_SPIRIT_MQ_SILVER_BIG_WALL:
return ctx->GetDungeon(Rando::SPIRIT_TEMPLE)->IsMQ();
case RG_GANONS_CASTLE_MQ_SILVER_WATER:
case RG_GANONS_CASTLE_MQ_SILVER_SHADOW:
return ctx->GetDungeon(Rando::GANONS_CASTLE)->IsMQ();
default:
assert(false);
return false;
}
}
std::set<RandomizerGet> Rando::StaticData::constantSilvers = { RG_SHADOW_SILVER_BLADES, RG_SHADOW_SILVER_PIT,
RG_SHADOW_SILVER_SPIKES, RG_GTG_SILVER_SLOPE,
RG_GTG_SILVER_LAVA, RG_GTG_SILVER_WATER,
RG_GANONS_CASTLE_SILVER_FIRE };
std::unordered_map<RandomizerGet, RandomizerCheckArea> Rando::StaticData::silverToArea = {
{ RG_DODONGOS_CAVERN_MQ_SILVER, RCAREA_DODONGOS_CAVERN },
{ RG_SPIRIT_SILVER_CHILD, RCAREA_SPIRIT_TEMPLE },
{ RG_SPIRIT_SILVER_SUN, RCAREA_SPIRIT_TEMPLE },
{ RG_SPIRIT_SILVER_BOULDERS, RCAREA_SPIRIT_TEMPLE },
{ RG_SPIRIT_MQ_SILVER_LOBBY, RCAREA_SPIRIT_TEMPLE },
{ RG_SPIRIT_MQ_SILVER_BIG_WALL, RCAREA_SPIRIT_TEMPLE },
{ RG_SHADOW_SILVER_BLADES, RCAREA_SHADOW_TEMPLE },
{ RG_SHADOW_SILVER_PIT, RCAREA_SHADOW_TEMPLE },
{ RG_SHADOW_SILVER_SPIKES, RCAREA_SHADOW_TEMPLE },
{ RG_SHADOW_MQ_SILVER_INVISIBLE_BLADES, RCAREA_SHADOW_TEMPLE },
{ RG_GANONS_CASTLE_SILVER_LIGHT, RCAREA_GANONS_CASTLE },
{ RG_GANONS_CASTLE_SILVER_FOREST, RCAREA_GANONS_CASTLE },
{ RG_GANONS_CASTLE_SILVER_FIRE, RCAREA_GANONS_CASTLE },
{ RG_GANONS_CASTLE_SILVER_SPIRIT, RCAREA_GANONS_CASTLE },
{ RG_GANONS_CASTLE_MQ_SILVER_WATER, RCAREA_GANONS_CASTLE },
{ RG_GANONS_CASTLE_MQ_SILVER_SHADOW, RCAREA_GANONS_CASTLE },
{ RG_ICE_CAVERN_SILVER_BLADES, RCAREA_ICE_CAVERN },
{ RG_ICE_CAVERN_SILVER_BLOCK, RCAREA_ICE_CAVERN },
{ RG_BOTW_SILVER, RCAREA_BOTTOM_OF_THE_WELL },
{ RG_GTG_SILVER_SLOPE, RCAREA_GERUDO_TRAINING_GROUND },
{ RG_GTG_SILVER_LAVA, RCAREA_GERUDO_TRAINING_GROUND },
{ RG_GTG_SILVER_WATER, RCAREA_GERUDO_TRAINING_GROUND }
};
RandomizerGet SilverFromSwitchFlag(s16 switchFlag) {
bool isMQ = Rando::Context::GetInstance()->GetDungeonFromScene((SceneID)gPlayState->sceneNum)->IsMQ();
switch (gPlayState->sceneNum) {
case SCENE_DODONGOS_CAVERN:
return RG_DODONGOS_CAVERN_MQ_SILVER;
case SCENE_SHADOW_TEMPLE:
switch (switchFlag) {
case 1:
return RG_SHADOW_SILVER_BLADES;
case 3:
return RG_SHADOW_MQ_SILVER_INVISIBLE_BLADES;
case 8:
return RG_SHADOW_SILVER_SPIKES;
case 9:
case 17:
return RG_SHADOW_SILVER_PIT;
}
break;
case SCENE_SPIRIT_TEMPLE:
switch (switchFlag) {
case 0:
return RG_SPIRIT_MQ_SILVER_BIG_WALL;
case 2:
return RG_SPIRIT_SILVER_BOULDERS;
case 5:
return RG_SPIRIT_SILVER_CHILD;
case 10:
return RG_SPIRIT_SILVER_SUN;
case 55: // Likely error
return RG_SPIRIT_MQ_SILVER_LOBBY;
}
break;
case SCENE_BOTTOM_OF_THE_WELL:
return RG_BOTW_SILVER;
case SCENE_ICE_CAVERN:
switch (switchFlag) {
case 8:
case 9:
return RG_ICE_CAVERN_SILVER_BLOCK;
case 31:
return RG_ICE_CAVERN_SILVER_BLADES;
}
break;
case SCENE_GERUDO_TRAINING_GROUND:
switch (switchFlag) {
case 12:
return RG_GTG_SILVER_LAVA;
case 27:
return RG_GTG_SILVER_WATER;
case 28:
return RG_GTG_SILVER_SLOPE;
}
break;
case SCENE_INSIDE_GANONS_CASTLE:
switch (switchFlag) {
case 1:
return RG_GANONS_CASTLE_SILVER_FIRE;
case 2:
return RG_GANONS_CASTLE_MQ_SILVER_WATER;
case 9:
return RG_GANONS_CASTLE_SILVER_FIRE;
case 11:
return isMQ ? RG_GANONS_CASTLE_MQ_SILVER_SHADOW : RG_GANONS_CASTLE_SILVER_SPIRIT;
case 14:
return RG_GANONS_CASTLE_SILVER_FOREST;
case 18:
return RG_GANONS_CASTLE_SILVER_LIGHT;
}
break;
default:
break;
}
assert(false); // no matching silver found
return RG_NONE;
}
s8* Randomizer::SilverFieldFromSaveContext(SaveContext* saveContext, RandomizerGet rg) {
switch (rg) {
case RG_SHADOW_SILVER_BLADES:
return &saveContext->ship.quest.data.randomizer.silverShadowBlades;
case RG_SHADOW_SILVER_PIT:
return &saveContext->ship.quest.data.randomizer.silverShadowPit;
case RG_SHADOW_SILVER_SPIKES:
return &saveContext->ship.quest.data.randomizer.silverShadowSpikes;
case RG_SPIRIT_SILVER_CHILD:
return &saveContext->ship.quest.data.randomizer.silverSpiritChild;
case RG_SPIRIT_SILVER_SUN:
return &saveContext->ship.quest.data.randomizer.silverSpiritSun;
case RG_SPIRIT_SILVER_BOULDERS:
return &saveContext->ship.quest.data.randomizer.silverSpiritBoulders;
case RG_BOTW_SILVER:
return &saveContext->ship.quest.data.randomizer.silverBotw;
case RG_ICE_CAVERN_SILVER_BLADES:
return &saveContext->ship.quest.data.randomizer.silverIceCavernBlades;
case RG_ICE_CAVERN_SILVER_BLOCK:
return &saveContext->ship.quest.data.randomizer.silverIceCavernBlock;
case RG_GTG_SILVER_SLOPE:
return &saveContext->ship.quest.data.randomizer.silverGtgSlope;
case RG_GTG_SILVER_LAVA:
return &saveContext->ship.quest.data.randomizer.silverGtgLava;
case RG_GTG_SILVER_WATER:
return &saveContext->ship.quest.data.randomizer.silverGtgWater;
case RG_GANONS_CASTLE_SILVER_LIGHT:
return &saveContext->ship.quest.data.randomizer.silverGanonLight;
case RG_GANONS_CASTLE_SILVER_FOREST:
return &saveContext->ship.quest.data.randomizer.silverGanonForest;
case RG_GANONS_CASTLE_SILVER_FIRE:
return &saveContext->ship.quest.data.randomizer.silverGanonFire;
case RG_GANONS_CASTLE_SILVER_SPIRIT:
return &saveContext->ship.quest.data.randomizer.silverGanonSpirit;
case RG_DODONGOS_CAVERN_MQ_SILVER:
return &saveContext->ship.quest.data.randomizer.silverMqDodongosCavern;
case RG_SHADOW_MQ_SILVER_INVISIBLE_BLADES:
return &saveContext->ship.quest.data.randomizer.silverMqShadowInvisibleBlades;
case RG_SPIRIT_MQ_SILVER_LOBBY:
return &saveContext->ship.quest.data.randomizer.silverMqSpiritLobby;
case RG_SPIRIT_MQ_SILVER_BIG_WALL:
return &saveContext->ship.quest.data.randomizer.silverMqSpiritBigWall;
case RG_GANONS_CASTLE_MQ_SILVER_WATER:
return &saveContext->ship.quest.data.randomizer.silverMqGanonWater;
case RG_GANONS_CASTLE_MQ_SILVER_SHADOW:
return &saveContext->ship.quest.data.randomizer.silverMqGanonShadow;
default:
return nullptr;
}
}
s8 Randomizer::SilverTotal(RandomizerGet rg) {
auto ctx = Rando::Context::GetInstance();
return rg == RG_SHADOW_MQ_SILVER_INVISIBLE_BLADES ||
(rg == RG_SHADOW_SILVER_SPIKES && ctx->GetDungeon(Rando::SHADOW_TEMPLE)->IsMQ())
? 10
: (rg == RG_GTG_SILVER_LAVA && ctx->GetDungeon(Rando::GERUDO_TRAINING_GROUND)->IsMQ()) ? 6
: (rg == RG_GTG_SILVER_WATER && ctx->GetDungeon(Rando::GERUDO_TRAINING_GROUND)->IsMQ()) ? 3
: 5;
}
bool IsSilverCleared(s16 switchFlag) {
RandomizerGet rg = SilverFromSwitchFlag(switchFlag);
return *Randomizer::SilverFieldFromSaveContext(&gSaveContext, rg) >= Randomizer::SilverTotal(rg);
}
bool IsSilverCleared(RandomizerGet rg) {
auto test = *Randomizer::SilverFieldFromSaveContext(&gSaveContext, rg);
auto test2 = Randomizer::SilverTotal(rg);
return *Randomizer::SilverFieldFromSaveContext(&gSaveContext, rg) >= Randomizer::SilverTotal(rg);
}
bool IsSilver(RandomizerGet rg) {
return rg >= RG_SHADOW_SILVER_BLADES && rg <= RG_GANONS_CASTLE_MQ_SILVER_SHADOW;
}
extern "C" void EnGSwitch_RandomizerDraw(Actor* thisx, PlayState* play) {
EnGSwitch* silver = reinterpret_cast<EnGSwitch*>(thisx);
Matrix_Push();
Matrix_Scale(17.5f, 17.5f, 17.5f, MTXMODE_APPLY);
if (silver->type == ENGSWITCH_SILVER_RUPEE) {
if (CVarGetInteger(CVAR_RANDOMIZER_ENHANCEMENT("MysteriousShuffle"), 0)) {
GetItemEntry_Draw(play, GET_ITEM_MYSTERY);
} else {
auto silverIdentity =
OTRGlobals::Instance->gRandomizer->IdentifySilver(gPlayState->sceneNum, silver->actor.world.pos);
auto itemEntry =
Rando::Context::GetInstance()->GetFinalGIEntry(silverIdentity.randomizerCheck, true, GI_NONE);
GetItemEntry_Draw(play, itemEntry);
}
Matrix_Pop();
}
}
void RegisterShuffleSilver() {
bool shouldRegister = IS_RANDO && RAND_GET_OPTION(RSK_SHUFFLE_SILVER);
COND_VB_SHOULD(VB_SILVER_COLLECT, shouldRegister, {
if (*should) {
EnGSwitch* silver = va_arg(args, EnGSwitch*);
auto silverIdentity =
OTRGlobals::Instance->gRandomizer->IdentifySilver(gPlayState->sceneNum, silver->actor.world.pos);
Flags_SetRandomizerInf(silverIdentity.randomizerInf);
Actor_Kill(&silver->actor);
*should = false;
}
});
COND_VB_SHOULD(VB_SILVER_COUNT_CHECK, shouldRegister, {
EnGSwitch* silver = va_arg(args, EnGSwitch*);
*should = false;
if (IsSilverCleared(silver->switchFlag)) {
Flags_SetSwitch(gPlayState, silver->switchFlag);
Actor_Kill(&silver->actor);
}
});
COND_VB_SHOULD(VB_SILVER_DESPAWN, shouldRegister, {
EnGSwitch* silver = va_arg(args, EnGSwitch*);
if (silver->type == ENGSWITCH_SILVER_RUPEE) {
auto silverIdentity =
OTRGlobals::Instance->gRandomizer->IdentifySilver(gPlayState->sceneNum, silver->actor.world.pos);
*should = silverIdentity.randomizerCheck == RC_UNKNOWN_CHECK ||
Flags_GetRandomizerInf(silverIdentity.randomizerInf);
if (!*should) {
*should = false;
silver->actor.draw = EnGSwitch_RandomizerDraw;
}
} else if (silver->type == ENGSWITCH_SILVER_TRACKER && IsSilverCleared(silver->switchFlag)) {
Flags_SetSwitch(gPlayState, silver->switchFlag);
*should = true;
}
});
}
void Rando::StaticData::RegisterSilverLocations() {
static bool registered = false;
if (registered)
return;
registered = true;
// clang-format off
locationTable[RC_SHADOW_N_UNDER_BLADE_SILVER] = Location::Collectable(RC_SHADOW_N_UNDER_BLADE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(3243, -1061), "North Under Blade Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_RC_SHADOW_N_UNDER_BLADE_SILVER));
locationTable[RC_SHADOW_TALL_BLOCK_BLADE_SILVER] = Location::Collectable(RC_SHADOW_TALL_BLOCK_BLADE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(3007, -1222), "Tall Block Blade Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_RC_SHADOW_TALL_BLOCK_BLADE_SILVER));
locationTable[RC_SHADOW_N_NOOK_BLADE_SILVER] = Location::Collectable(RC_SHADOW_N_NOOK_BLADE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(3554, -1432), "North Nook Blade Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_RC_SHADOW_N_NOOK_BLADE_SILVER));
locationTable[RC_SHADOW_W_NOOK_BLADE_SILVER] = Location::Collectable(RC_SHADOW_W_NOOK_BLADE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2869, -948), "West Nook Blade Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_W_NOOK_BLADE_SILVER));
locationTable[RC_SHADOW_S_UNDER_BLADE_SILVER] = Location::Collectable(RC_SHADOW_S_UNDER_BLADE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(3399, -838), "South Under Blade Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_S_UNDER_BLADE_SILVER));
locationTable[RC_SHADOW_N_PIT_SILVER] = Location::Collectable(RC_SHADOW_N_PIT_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2131, 3030), "North Pit Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_N_PIT_SILVER));
locationTable[RC_SHADOW_S_PIT_SILVER] = Location::Collectable(RC_SHADOW_S_PIT_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2115, 3738), "South Pit Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_S_PIT_SILVER));
locationTable[RC_SHADOW_BEAMOS_PIT_SILVER] = Location::Collectable(RC_SHADOW_BEAMOS_PIT_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2110, 3368), "Beamos Pit Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_BEAMOS_PIT_SILVER));
locationTable[RC_SHADOW_E_PIT_SILVER] = Location::Collectable(RC_SHADOW_E_PIT_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2243, 3361), "East Pit Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_E_PIT_SILVER));
locationTable[RC_SHADOW_W_PIT_SILVER] = Location::Collectable(RC_SHADOW_W_PIT_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(1998, 3358), "West Pit Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_W_PIT_SILVER));
locationTable[RC_SHADOW_PLATFORM_SPIKES_SILVER] = Location::Collectable(RC_SHADOW_PLATFORM_SPIKES_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2042, 849), "Platform Spikes Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_PLATFORM_SPIKES_SILVER));
locationTable[RC_SHADOW_E_TARGET_SPIKES_SILVER] = Location::Collectable(RC_SHADOW_E_TARGET_SPIKES_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2940, 1069), "East Target Spikes Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_E_TARGET_SPIKES_SILVER));
locationTable[RC_SHADOW_FLOOR_SPIKES_SILVER] = Location::Collectable(RC_SHADOW_FLOOR_SPIKES_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2478, 1208), "Floor Spikes Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_FLOOR_SPIKES_SILVER));
locationTable[RC_SHADOW_W_TARGET_SPIKES_SILVER] = Location::Collectable(RC_SHADOW_W_TARGET_SPIKES_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2135, 1297), "West Target Spikes Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_W_TARGET_SPIKES_SILVER));
locationTable[RC_SHADOW_AIRBORNE_SPIKES_SILVER] = Location::Collectable(RC_SHADOW_AIRBORNE_SPIKES_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2254, 988), "Airborne Spikes Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_AIRBORNE_SPIKES_SILVER));
locationTable[RC_SPIRIT_W_HIGH_CHILD_SILVER] = Location::Collectable(RC_SPIRIT_W_HIGH_CHILD_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(-766, -1075), "West High Child Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_W_HIGH_CHILD_SILVER));
locationTable[RC_SPIRIT_W_LOW_CHILD_SILVER] = Location::Collectable(RC_SPIRIT_W_LOW_CHILD_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(-672, -1075), "West Low Child Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_W_LOW_CHILD_SILVER));
locationTable[RC_SPIRIT_E_LOW_CHILD_SILVER] = Location::Collectable(RC_SPIRIT_E_LOW_CHILD_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(-511, -1075), "East Low Child Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_E_LOW_CHILD_SILVER));
locationTable[RC_SPIRIT_E_HIGH_CHILD_SILVER] = Location::Collectable(RC_SPIRIT_E_HIGH_CHILD_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(-347, -1075), "East High Child Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_E_HIGH_CHILD_SILVER));
locationTable[RC_SPIRIT_TORCH_CHILD_SILVER] = Location::Collectable(RC_SPIRIT_TORCH_CHILD_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(-335, -1409), "Torch Child Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_TORCH_CHILD_SILVER));
locationTable[RC_SPIRIT_NEAR_LIGHT_SUN_SILVER] = Location::Collectable(RC_SPIRIT_NEAR_LIGHT_SUN_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(-1836, -446), "Near Light Sun Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_NEAR_LIGHT_SUN_SILVER));
locationTable[RC_SPIRIT_AIRBORNE_SUN_SILVER] = Location::Collectable(RC_SPIRIT_AIRBORNE_SUN_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(-1433, -283), "Airborne Sun Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_AIRBORNE_SUN_SILVER));
locationTable[RC_SPIRIT_MID_PLATFORM_SUN_SILVER] = Location::Collectable(RC_SPIRIT_MID_PLATFORM_SUN_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(-1275, -247), "Middle Platform Sun Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_MID_PLATFORM_SUN_SILVER));
locationTable[RC_SPIRIT_NEAR_CHEST_SUN_SILVER] = Location::Collectable(RC_SPIRIT_NEAR_CHEST_SUN_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(-1123, 428), "Near Chest Sun Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_NEAR_CHEST_SUN_SILVER));
locationTable[RC_SPIRIT_NEAR_DOOR_SUN_SILVER] = Location::Collectable(RC_SPIRIT_NEAR_DOOR_SUN_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(-984, -450), "Near Door Sun Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_NEAR_DOOR_SUN_SILVER));
locationTable[RC_SPIRIT_NW_BOULDER_SILVER] = Location::Collectable(RC_SPIRIT_NW_BOULDER_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(1284, -1355), "Northwest Boulder Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_NW_BOULDER_SILVER));
locationTable[RC_SPIRIT_SW_BOULDER_SILVER] = Location::Collectable(RC_SPIRIT_SW_BOULDER_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(1284, -813), "Southwest Boulder Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_SW_BOULDER_SILVER));
locationTable[RC_SPIRIT_SE_BOULDER_SILVER] = Location::Collectable(RC_SPIRIT_SE_BOULDER_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(1856, -944), "Southeast Boulder Super", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_SE_BOULDER_SILVER));
locationTable[RC_SPIRIT_NE_BOULDER_SILVER] = Location::Collectable(RC_SPIRIT_NE_BOULDER_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(1856, -1219), "Notheast Boulder Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_NE_BOULDER_SILVER));
locationTable[RC_SPIRIT_AIRBORNE_BOULDER_SILVER] = Location::Collectable(RC_SPIRIT_AIRBORNE_BOULDER_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(1573, -920), "Airborne Boulder Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_AIRBORNE_BOULDER_SILVER));
locationTable[RC_BOTW_B1_LADDER_SILVER] = Location::Collectable(RC_BOTW_B1_LADDER_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_BOTTOM_OF_THE_WELL, TWO_ACTOR_PARAMS(-796, -150), "B1 Ladder Silver", RHT_BOTW_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTW_B1_LADDER_SILVER));
locationTable[RC_BOTW_B2_LADDER_SILVER] = Location::Collectable(RC_BOTW_B2_LADDER_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_BOTTOM_OF_THE_WELL, TWO_ACTOR_PARAMS(-614, -297), "B2 Ladder Silver", RHT_BOTW_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTW_B2_LADDER_SILVER));
locationTable[RC_BOTW_B3_LADDER_SILVER] = Location::Collectable(RC_BOTW_B3_LADDER_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_BOTTOM_OF_THE_WELL, TWO_ACTOR_PARAMS(-560, -291), "B3 Ladder Silver", RHT_BOTW_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTW_B3_LADDER_SILVER));
locationTable[RC_BOTW_NW_OOZE_SILVER] = Location::Collectable(RC_BOTW_NW_OOZE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_BOTTOM_OF_THE_WELL, TWO_ACTOR_PARAMS(-402, -401), "Northwest Ooze Silver", RHT_BOTW_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTW_NW_OOZE_SILVER));
locationTable[RC_BOTW_SE_OOZE_SILVER] = Location::Collectable(RC_BOTW_SE_OOZE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_BOTTOM_OF_THE_WELL, TWO_ACTOR_PARAMS(-259, -234), "Southeast Ooze Silver", RHT_BOTW_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_BOTW_SE_OOZE_SILVER));
locationTable[RC_ICE_CAVERN_ICICLES_BLADE_SILVER] = Location::Collectable(RC_ICE_CAVERN_ICICLES_BLADE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_ICE_CAVERN, TWO_ACTOR_PARAMS(1, -143), "Icicles Blade Silver", RHT_ICE_CAVERN_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_ICICLES_BLADE_SILVER));
locationTable[RC_ICE_CAVERN_W_INNER_BLADE_SILVER] = Location::Collectable(RC_ICE_CAVERN_W_INNER_BLADE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_ICE_CAVERN, TWO_ACTOR_PARAMS(198, -388), "West Inner Blade Silver", RHT_ICE_CAVERN_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_W_INNER_BLADE_SILVER));
locationTable[RC_ICE_CAVERN_OUTER_BLADE_SILVER] = Location::Collectable(RC_ICE_CAVERN_OUTER_BLADE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_ICE_CAVERN, TWO_ACTOR_PARAMS(278, -637), "Outer Blade Silver", RHT_ICE_CAVERN_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_OUTER_BLADE_SILVER));
locationTable[RC_ICE_CAVERN_E_INNER_BLADE_SILVER] = Location::Collectable(RC_ICE_CAVERN_E_INNER_BLADE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_ICE_CAVERN, TWO_ACTOR_PARAMS(389, -382), "East Inner Blade Silver", RHT_ICE_CAVERN_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_E_INNER_BLADE_SILVER));
locationTable[RC_ICE_CAVERN_AIRBORNE_BLADE_SILVER] = Location::Collectable(RC_ICE_CAVERN_AIRBORNE_BLADE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_ICE_CAVERN, TWO_ACTOR_PARAMS(414, -579), "Airborne Blade Silver", RHT_ICE_CAVERN_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_AIRBORNE_BLADE_SILVER));
locationTable[RC_ICE_CAVERN_NEAR_FIRE_BLOCK_SILVER] = Location::Collectable(RC_ICE_CAVERN_NEAR_FIRE_BLOCK_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_ICE_CAVERN, TWO_ACTOR_PARAMS(-1676, -552), "Near Fire Block Silver", RHT_ICE_CAVERN_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_NEAR_FIRE_BLOCK_SILVER));
locationTable[RC_ICE_CAVERN_LOWER_BLOCK_SILVER] = Location::Collectable(RC_ICE_CAVERN_LOWER_BLOCK_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_ICE_CAVERN, TWO_ACTOR_PARAMS(-1558, -951), "Lower Block Silver", RHT_ICE_CAVERN_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_LOWER_BLOCK_SILVER));
locationTable[RC_ICE_CAVERN_NEAR_BLOCK_SILVER] = Location::Collectable(RC_ICE_CAVERN_NEAR_BLOCK_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_ICE_CAVERN, TWO_ACTOR_PARAMS(-1294, -899), "Near Block Silver", RHT_ICE_CAVERN_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_NEAR_BLOCK_SILVER));
locationTable[RC_ICE_CAVERN_FROZEN_BLOCK_SILVER] = Location::Collectable(RC_ICE_CAVERN_FROZEN_BLOCK_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_ICE_CAVERN, TWO_ACTOR_PARAMS(-1120, -1577), "Frozen Block Silver", RHT_ICE_CAVERN_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_FROZEN_BLOCK_SILVER));
locationTable[RC_ICE_CAVERN_NEAR_GS_BLOCK_SILVER] = Location::Collectable(RC_ICE_CAVERN_NEAR_GS_BLOCK_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_ICE_CAVERN, TWO_ACTOR_PARAMS(-1040, -485), "Near GS Block Silver", RHT_ICE_CAVERN_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_ICE_CAVERN_NEAR_GS_BLOCK_SILVER));
locationTable[RC_GTG_FIRE_WALL_SLOPE_SILVER] = Location::Collectable(RC_GTG_FIRE_WALL_SLOPE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(-1332, -992), "Fire Wall Slope Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_FIRE_WALL_SLOPE_SILVER));
locationTable[RC_GTG_LOWER_BOULDER_SLOPE_SILVER] = Location::Collectable(RC_GTG_LOWER_BOULDER_SLOPE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(-1886, -956), "Lower Boulder Slope Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_LOWER_BOULDER_SLOPE_SILVER));
locationTable[RC_GTG_TARGET_SLOPE_SILVER] = Location::Collectable(RC_GTG_TARGET_SLOPE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(-1579, -999), "Target Slope Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_TARGET_SLOPE_SILVER));
locationTable[RC_GTG_JUMPDOWN_SLOPE_SILVER] = Location::Collectable(RC_GTG_JUMPDOWN_SLOPE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(-1627, -1462), "Jumpdown Slope Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_JUMPDOWN_SLOPE_SILVER));
locationTable[RC_GTG_UPPER_BOULDER_SLOPE_SILVER] = Location::Collectable(RC_GTG_UPPER_BOULDER_SLOPE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(-1887, -2134), "Upper Boulder Slope Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_UPPER_BOULDER_SLOPE_SILVER));
locationTable[RC_GTG_NEAR_SWITCH_LAVA_SILVER] = Location::Collectable(RC_GTG_NEAR_SWITCH_LAVA_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(1320, -1248), "Near Switch Lava Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_NEAR_SWITCH_LAVA_SILVER));
locationTable[RC_GTG_NEAR_BARRED_DOOR_LAVA_SILVER] = Location::Collectable(RC_GTG_NEAR_BARRED_DOOR_LAVA_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(1558, -1370), "Near Barred Door Lava Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_NEAR_BARRED_DOOR_LAVA_SILVER));
locationTable[RC_GTG_FIRE_RING_LAVA_SILVER] = Location::Collectable(RC_GTG_FIRE_RING_LAVA_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(1134, -1841), "Fire Ring Lava Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_FIRE_RING_LAVA_SILVER));
locationTable[RC_GTG_UPPER_LAVA_SILVER] = Location::Collectable(RC_GTG_UPPER_LAVA_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(1437, -2193), "Upper Lava Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_UPPER_LAVA_SILVER));
locationTable[RC_GTG_UNDER_LEDGE_LAVA_SILVER] = Location::Collectable(RC_GTG_UNDER_LEDGE_LAVA_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(1560, -1861), "Under Ledge Lava Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_UNDER_LEDGE_LAVA_SILVER));
locationTable[RC_GTG_MIDDLE_WATER_SILVER] = Location::Collectable(RC_GTG_MIDDLE_WATER_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(2308, -1464), "Middle Water Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_MIDDLE_WATER_SILVER));
locationTable[RC_GTG_ABOVE_TARGET_WATER_SILVER] = Location::Collectable(RC_GTG_ABOVE_TARGET_WATER_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(2497, -1465), "Above Target Water Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_ABOVE_TARGET_WATER_SILVER));
locationTable[RC_GTG_LEFT_WATER_SILVER] = Location::Collectable(RC_GTG_LEFT_WATER_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(2453, -1612), "Left Water Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_LEFT_WATER_SILVER));
locationTable[RC_GTG_UNDER_TARGET_WATER_SILVER] = Location::Collectable(RC_GTG_UNDER_TARGET_WATER_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(2078, -1458), "Under Target Water Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_UNDER_TARGET_WATER_SILVER));
locationTable[RC_GTG_RIGHT_WATER_SILVER] = Location::Collectable(RC_GTG_RIGHT_WATER_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(2160, -1315), "Right Water Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_RIGHT_WATER_SILVER));
locationTable[RC_GANONS_CASTLE_OUTER_RIGHT_LIGHT_SILVER] = Location::Collectable(RC_GANONS_CASTLE_OUTER_RIGHT_LIGHT_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-2509, -1091), "Outer Right Light Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_OUTER_RIGHT_LIGHT_SILVER));
locationTable[RC_GANONS_CASTLE_OUTER_LEFT_LIGHT_SILVER] = Location::Collectable(RC_GANONS_CASTLE_OUTER_LEFT_LIGHT_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-2649, -545), "Outer Left Light Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_OUTER_LEFT_LIGHT_SILVER));
locationTable[RC_GANONS_CASTLE_UPPER_LIGHT_SILVER] = Location::Collectable(RC_GANONS_CASTLE_UPPER_LIGHT_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-2646, -839), "Upper Light Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_UPPER_LIGHT_SILVER));
locationTable[RC_GANONS_CASTLE_INNER_RIGHT_LIGHT_SILVER] = Location::Collectable(RC_GANONS_CASTLE_INNER_RIGHT_LIGHT_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-2680, -893), "Inner Right Light Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_INNER_RIGHT_LIGHT_SILVER));
locationTable[RC_GANONS_CASTLE_INNER_LEFT_LIGHT_SILVER] = Location::Collectable(RC_GANONS_CASTLE_INNER_LEFT_LIGHT_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-2674, -777), "Inner Left Light Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_INNER_LEFT_LIGHT_SILVER));
locationTable[RC_GANONS_CASTLE_LARGE_PLATFORM_FOREST_SILVER] = Location::Collectable(RC_GANONS_CASTLE_LARGE_PLATFORM_FOREST_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(1247, 1787), "Large Platform Forest Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_LARGE_PLATFORM_FOREST_SILVER));
locationTable[RC_GANONS_CASTLE_SOT_BLOCK_FOREST_SILVER] = Location::Collectable(RC_GANONS_CASTLE_SOT_BLOCK_FOREST_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(1361, 1222), "SoT Block Forest Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SOT_BLOCK_FOREST_SILVER));
locationTable[RC_GANONS_CASTLE_SMALL_PLATFORM_FOREST_SILVER] = Location::Collectable(RC_GANONS_CASTLE_SMALL_PLATFORM_FOREST_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(1538, 2225), "Small Platform Forest Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_SMALL_PLATFORM_FOREST_SILVER));
locationTable[RC_GANONS_CASTLE_UNDER_LEDGE_FOREST_SILVER] = Location::Collectable(RC_GANONS_CASTLE_UNDER_LEDGE_FOREST_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(1651, 2021), "Under Ledge Forest Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_UNDER_LEDGE_FOREST_SILVER));
locationTable[RC_GANONS_CASTLE_ON_TARGET_FOREST_SILVER] = Location::Collectable(RC_GANONS_CASTLE_ON_TARGET_FOREST_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(1634, 1550), "On Target Forest Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_ON_TARGET_FOREST_SILVER));
locationTable[RC_GANONS_CASTLE_TORCH_SLUG_FIRE_SILVER] = Location::Collectable(RC_GANONS_CASTLE_TORCH_SLUG_FIRE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-854, -3679), "Torch Slug Fire Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_TORCH_SLUG_FIRE_SILVER));
locationTable[RC_GANONS_CASTLE_FLAME_JETS_FIRE_SILVER] = Location::Collectable(RC_GANONS_CASTLE_FLAME_JETS_FIRE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-1555, -2317), "Flame Jets Fire Temple Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_FLAME_JETS_FIRE_SILVER));
locationTable[RC_GANONS_CASTLE_DISTANT_PLATFORM_FIRE_SILVER] = Location::Collectable(RC_GANONS_CASTLE_DISTANT_PLATFORM_FIRE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-515, -3253), "Distant Platform Fire Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_DISTANT_PLATFORM_FIRE_SILVER));
locationTable[RC_GANONS_CASTLE_CLOSE_PLATFORM_FIRE_SILVER] = Location::Collectable(RC_GANONS_CASTLE_CLOSE_PLATFORM_FIRE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-604, -2592), "Close Platform Fire Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_CLOSE_PLATFORM_FIRE_SILVER));
locationTable[RC_GANONS_GANONS_CASTLE_UNDER_PILLAR_FIRE_SILVER] = Location::Collectable(RC_GANONS_GANONS_CASTLE_UNDER_PILLAR_FIRE_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-1867, -2754), "Under Pillar Fire Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_GANONS_CASTLE_UNDER_PILLAR_FIRE_SILVER));
locationTable[RC_GANONS_CASTLE_AIRBORNE_SPIRIT_SILVER] = Location::Collectable(RC_GANONS_CASTLE_AIRBORNE_SPIRIT_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-829, 591), "Airborne Spirit Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_AIRBORNE_SPIRIT_SILVER));
locationTable[RC_GANONS_CASTLE_NEAR_DOORMAT_SPIRIT_SILVER] = Location::Collectable(RC_GANONS_CASTLE_NEAR_DOORMAT_SPIRIT_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-940, 270), "Near Doormat Spirit Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_NEAR_DOORMAT_SPIRIT_SILVER));
locationTable[RC_GANONS_CASTLE_LOWER_MIDDLE_SPIRIT_SILVER] = Location::Collectable(RC_GANONS_CASTLE_LOWER_MIDDLE_SPIRIT_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-865, 656), "Lower Middle Spirit Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_LOWER_MIDDLE_SPIRIT_SILVER));
locationTable[RC_GANONS_CASTLE_CORNER_SPIRIT_SILVER] = Location::Collectable(RC_GANONS_CASTLE_CORNER_SPIRIT_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-725, 942), "Corner Spirit Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_CORNER_SPIRIT_SILVER));
locationTable[RC_GANONS_CASTLE_NEAR_BARRED_DOOR_SPIRIT_SILVER] = Location::Collectable(RC_GANONS_CASTLE_NEAR_BARRED_DOOR_SPIRIT_SILVER, RCQUEST_VANILLA, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-1142, 639), "Near Barred Door Spirit Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_NEAR_BARRED_DOOR_SPIRIT_SILVER));
locationTable[RC_DODONGOS_CAVERN_MQ_BEAMOS_SILVER] = Location::Collectable(RC_DODONGOS_CAVERN_MQ_BEAMOS_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_DODONGOS_CAVERN, TWO_ACTOR_PARAMS(-2277, -1362), "MQ Beamos Silver", RHT_DODONGOS_CAVERN_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_BEAMOS_SILVER));
locationTable[RC_DODONGOS_CAVERN_MQ_1F_CRATE_SILVER] = Location::Collectable(RC_DODONGOS_CAVERN_MQ_1F_CRATE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_DODONGOS_CAVERN, TWO_ACTOR_PARAMS(-2189, -1834), "MQ 1F Crate Silver", RHT_DODONGOS_CAVERN_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_1F_CRATE_SILVER));
locationTable[RC_DODONGOS_CAVERN_MQ_LOWER_2F_CRATE_SILVER] = Location::Collectable(RC_DODONGOS_CAVERN_MQ_LOWER_2F_CRATE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_DODONGOS_CAVERN, TWO_ACTOR_PARAMS(-2411, -1836), "MQ Lower 2F Crate Silver", RHT_DODONGOS_CAVERN_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_LOWER_2F_CRATE_SILVER));
locationTable[RC_DODONGOS_CAVERN_MQ_VINES_SILVER] = Location::Collectable(RC_DODONGOS_CAVERN_MQ_VINES_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_DODONGOS_CAVERN, TWO_ACTOR_PARAMS(-1907, -1243), "MQ Vines Silver", RHT_DODONGOS_CAVERN_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_VINES_SILVER));
locationTable[RC_DODONGOS_CAVERN_MQ_UPPER_2F_CRATE_SILVER] = Location::Collectable(RC_DODONGOS_CAVERN_MQ_UPPER_2F_CRATE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_DODONGOS_CAVERN, TWO_ACTOR_PARAMS(-1512, -1083), "MQ Upper 2F Crate Silver", RHT_DODONGOS_CAVERN_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_DODONGOS_CAVERN_MQ_UPPER_2F_CRATE_SILVER));
locationTable[RC_SHADOW_MQ_W_NOOK_SILVER] = Location::Collectable(RC_SHADOW_MQ_W_NOOK_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2810, -961 ), "MQ West Nook Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_W_NOOK_SILVER));
locationTable[RC_SHADOW_MQ_TALL_BLOCK_BLADE_SILVER] = Location::Collectable(RC_SHADOW_MQ_TALL_BLOCK_BLADE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(3007, -1222), "MQ Tall Block Blade Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_TALL_BLOCK_BLADE_SILVER));
locationTable[RC_SHADOW_MQ_NE_UNDER_BLADE_SILVER] = Location::Collectable(RC_SHADOW_MQ_NE_UNDER_BLADE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(3243, -1061), "MQ Northwest Under Blade Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_NE_UNDER_BLADE_SILVER));
locationTable[RC_SHADOW_MQ_S_UNDER_BLADE_SILVER] = Location::Collectable(RC_SHADOW_MQ_S_UNDER_BLADE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(3399, -838 ), "MQ South Under Blade Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_S_UNDER_BLADE_SILVER));
locationTable[RC_SHADOW_MQ_N_NOOK_BLADE_SILVER] = Location::Collectable(RC_SHADOW_MQ_N_NOOK_BLADE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(3558, -1490), "MQ North Nook Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_N_NOOK_BLADE_SILVER));
locationTable[RC_SHADOW_MQ_W_PIT_SILVER] = Location::Collectable(RC_SHADOW_MQ_W_PIT_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(1970, 3372), "MQ West Pit Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_W_PIT_SILVER));
locationTable[RC_SHADOW_MQ_HIGH_PIT_SILVER] = Location::Collectable(RC_SHADOW_MQ_HIGH_PIT_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2110, -970), "MQ High Pit Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_HIGH_PIT_SILVER));
locationTable[RC_SHADOW_MQ_HIGHEST_PIT_SILVER] = Location::Collectable(RC_SHADOW_MQ_HIGHEST_PIT_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2110, -1092), "MQ Highest Pit Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_HIGHEST_PIT_SILVER));
locationTable[RC_SHADOW_MQ_N_PIT_SILVER] = Location::Collectable(RC_SHADOW_MQ_N_PIT_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2131, 3030), "MQ North Pit Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_N_PIT_SILVER));
locationTable[RC_SHADOW_MQ_E_PIT_SILVER] = Location::Collectable(RC_SHADOW_MQ_E_PIT_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2250, 3372), "MQ East Pit Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_E_PIT_SILVER));
locationTable[RC_SHADOW_MQ_W_INVISIBLE_BLADE_SILVER] = Location::Collectable(RC_SHADOW_MQ_W_INVISIBLE_BLADE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(5089, 2049), "MQ West Invisible Blade Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_W_INVISIBLE_BLADE_SILVER));
locationTable[RC_SHADOW_MQ_SW_INVISIBLE_BLADE_SILVER] = Location::Collectable(RC_SHADOW_MQ_SW_INVISIBLE_BLADE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(5158, 2315), "MQ Southwest Invisible Blade Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_SW_INVISIBLE_BLADE_SILVER));
locationTable[RC_SHADOW_MQ_NW_INVISIBLE_BLADE_SILVER] = Location::Collectable(RC_SHADOW_MQ_NW_INVISIBLE_BLADE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(5217, 1852), "MQ Northwest Invisible Blade Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_NW_INVISIBLE_BLADE_SILVER));
locationTable[RC_SHADOW_MQ_S_INVISIBLE_BLADE_SILVER] = Location::Collectable(RC_SHADOW_MQ_S_INVISIBLE_BLADE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(5270, 2453), "MQ South Invisible Blade Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_S_INVISIBLE_BLADE_SILVER));
locationTable[RC_SHADOW_MQ_INNER_NE_INVISIBLE_BLADE_SILVER] = Location::Collectable(RC_SHADOW_MQ_INNER_NE_INVISIBLE_BLADE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(5404, 1977), "MQ Inner Northeast Invisible Blade Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_INNER_NE_INVISIBLE_BLADE_SILVER));
locationTable[RC_SHADOW_MQ_SE_INVISIBLE_BLADE_SILVER] = Location::Collectable(RC_SHADOW_MQ_SE_INVISIBLE_BLADE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(5466, 2243), "MQ Southeast Invisible Blade Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_SE_INVISIBLE_BLADE_SILVER));
locationTable[RC_SHADOW_MQ_OUTSIDE_CIRCLE_INVISIBLE_BLADE_SILVER] = Location::Collectable(RC_SHADOW_MQ_OUTSIDE_CIRCLE_INVISIBLE_BLADE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(5489, 2476), "MQ Outside Circle Invisible Blade Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_OUTSIDE_CIRCLE_INVISIBLE_BLADE_SILVER));
locationTable[RC_SHADOW_MQ_OUTER_NE_INVISIBLE_BLADE_SILVER] = Location::Collectable(RC_SHADOW_MQ_OUTER_NE_INVISIBLE_BLADE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(5601, 1898), "MQ Outer Northeast Invisible Blade Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_OUTER_NE_INVISIBLE_BLADE_SILVER));
locationTable[RC_SHADOW_MQ_E_INVISIBLE_BLADE_SILVER] = Location::Collectable(RC_SHADOW_MQ_E_INVISIBLE_BLADE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(5637, 2134), "MQ East Invisible Blade Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_E_INVISIBLE_BLADE_SILVER));
locationTable[RC_SHADOW_MQ_SOT_BLOCK_INVISIBLE_BLADE_SILVER] = Location::Collectable(RC_SHADOW_MQ_SOT_BLOCK_INVISIBLE_BLADE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(5667, 2686), "MQ SoT Block Invisible Blade Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_SOT_BLOCK_INVISIBLE_BLADE_SILVER));
locationTable[RC_SHADOW_MQ_PLATFORM_SPIKES_SILVER] = Location::Collectable(RC_SHADOW_MQ_PLATFORM_SPIKES_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2042, 849), "MQ Platform Spikes Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_PLATFORM_SPIKES_SILVER));
locationTable[RC_SHADOW_MQ_W_TARGET_SPIKES_SILVER] = Location::Collectable(RC_SHADOW_MQ_W_TARGET_SPIKES_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2135, 1297), "MQ West Target Spikes Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_W_TARGET_SPIKES_SILVER));
locationTable[RC_SHADOW_MQ_W_AIRBORNE_SPIKES_SILVER] = Location::Collectable(RC_SHADOW_MQ_W_AIRBORNE_SPIKES_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2254, 988), "MQ West Airborne Spikes Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_W_AIRBORNE_SPIKES_SILVER));
locationTable[RC_SHADOW_MQ_N_TARGET_SPIKES_SILVER] = Location::Collectable(RC_SHADOW_MQ_N_TARGET_SPIKES_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2478, 893), "MQ North Target Spikes Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_N_TARGET_SPIKES_SILVER));
locationTable[RC_SHADOW_MQ_CENTRAL_SPIKES_SILVER] = Location::Collectable(RC_SHADOW_MQ_CENTRAL_SPIKES_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2478, 1208), "MQ Central Spikes Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_CENTRAL_SPIKES_SILVER));
locationTable[RC_SHADOW_MQ_CENTRAL_TARGET_SPIKES_SILVER] = Location::Collectable(RC_SHADOW_MQ_CENTRAL_TARGET_SPIKES_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2478, 1200), "MQ Central Target Spikes Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_CENTRAL_TARGET_SPIKES_SILVER));
locationTable[RC_SHADOW_MQ_S_TARGET_SPIKES_SILVER] = Location::Collectable(RC_SHADOW_MQ_S_TARGET_SPIKES_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2478, 1404), "MQ South Target Spikes Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_S_TARGET_SPIKES_SILVER));
locationTable[RC_SHADOW_MQ_INSIDE_SPIKES_SILVER] = Location::Collectable(RC_SHADOW_MQ_INSIDE_SPIKES_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2705, 1089), "MQ Inside Spikes Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_INSIDE_SPIKES_SILVER));
locationTable[RC_SHADOW_MQ_E_AIRBORNE_SPIKES_SILVER] = Location::Collectable(RC_SHADOW_MQ_E_AIRBORNE_SPIKES_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2730, 876), "MQ East Airborne Spikes Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_E_AIRBORNE_SPIKES_SILVER));
locationTable[RC_SHADOW_MQ_E_TARGET_SPIKES_SILVER] = Location::Collectable(RC_SHADOW_MQ_E_TARGET_SPIKES_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SHADOW_TEMPLE, TWO_ACTOR_PARAMS(2940, 1069), "MQ East Target Spikes Silver", RHT_SHADOW_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SHADOW_MQ_E_TARGET_SPIKES_SILVER));
locationTable[RC_SPIRIT_MQ_STAIRS_LOBBY_SILVER] = Location::Collectable(RC_SPIRIT_MQ_STAIRS_LOBBY_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(1016, -73), "MQ Stairs Lobby Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_MQ_STAIRS_LOBBY_SILVER));
locationTable[RC_SPIRIT_MQ_E_BOULDER_LOBBY_SILVER] = Location::Collectable(RC_SPIRIT_MQ_E_BOULDER_LOBBY_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(160, 268), "MQ East Boulder Lobby Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_MQ_E_BOULDER_LOBBY_SILVER));
locationTable[RC_SPIRIT_MQ_W_BOULDER_LOBBY_SILVER] = Location::Collectable(RC_SPIRIT_MQ_W_BOULDER_LOBBY_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(-160, 270), "MQ West Boulder Lobby Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_MQ_W_BOULDER_LOBBY_SILVER));
locationTable[RC_SPIRIT_MQ_CORNER_LOBBY_SILVER] = Location::Collectable(RC_SPIRIT_MQ_CORNER_LOBBY_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(967, -547), "MQ Corner Lobby Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_MQ_CORNER_LOBBY_SILVER));
locationTable[RC_SPIRIT_MQ_JET_LOBBY_SILVER] = Location::Collectable(RC_SPIRIT_MQ_JET_LOBBY_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(744, 4), "MQ Jet Lobby Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_MQ_JET_LOBBY_SILVER));
locationTable[RC_SPIRIT_MQ_LOWEST_WALL_SILVER] = Location::Collectable(RC_SPIRIT_MQ_LOWEST_WALL_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(723, -75), "MQ Lowest Big Wall Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_MQ_LOWEST_WALL_SILVER));
locationTable[RC_SPIRIT_MQ_MID_LOW_WALL_SILVER] = Location::Collectable(RC_SPIRIT_MQ_MID_LOW_WALL_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(582, -75), "MQ Mid-Low Wall Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_MQ_MID_LOW_WALL_SILVER));
locationTable[RC_SPIRIT_MQ_MID_HIGH_WALL_SILVER] = Location::Collectable(RC_SPIRIT_MQ_MID_HIGH_WALL_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(754, -75), "MQ Mid-High Wall Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_MQ_MID_HIGH_WALL_SILVER));
locationTable[RC_SPIRIT_MQ_HIGHEST_WALL_SILVER] = Location::Collectable(RC_SPIRIT_MQ_HIGHEST_WALL_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(644, -75), "MQ Highest Wall Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_MQ_HIGHEST_WALL_SILVER));
locationTable[RC_SPIRIT_MQ_MIDDLE_WALL_SILVER] = Location::Collectable(RC_SPIRIT_MQ_MIDDLE_WALL_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_SPIRIT_TEMPLE, TWO_ACTOR_PARAMS(681, -75), "MQ Middle Wall Silver", RHT_SPIRIT_TEMPLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_SPIRIT_MQ_MIDDLE_WALL_SILVER));
locationTable[RC_GTG_MQ_ICICLES_SLOPE_SILVER] = Location::Collectable(RC_GTG_MQ_ICICLES_SLOPE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(-1245, -2112), "MQ Icicles Slope Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_MQ_ICICLES_SLOPE_SILVER));
locationTable[RC_GTG_MQ_JUMPDOWN_SLOPE_SILVER] = Location::Collectable(RC_GTG_MQ_JUMPDOWN_SLOPE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(-1542, -1467), "MQ Jumpdown Slope Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_MQ_JUMPDOWN_SLOPE_SILVER));
locationTable[RC_GTG_MQ_HIGH_SLOPE_SILVER] = Location::Collectable(RC_GTG_MQ_HIGH_SLOPE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(-1480, -1000), "MQ High Slope Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_MQ_HIGH_SLOPE_SILVER));
locationTable[RC_GTG_MQ_FREEZARD_SLOPE_SILVER] = Location::Collectable(RC_GTG_MQ_FREEZARD_SLOPE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(-1886, -956), "MQ Freezard Slope Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_MQ_FREEZARD_SLOPE_SILVER));
locationTable[RC_GTG_MQ_PIT_SLOPE_SILVER] = Location::Collectable(RC_GTG_MQ_PIT_SLOPE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(-1261, -923), "MQ Pit Slope Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_MQ_PIT_SLOPE_SILVER));
locationTable[RC_GTG_MQ_NEAR_SWITCH_LAVA_SILVER] = Location::Collectable(RC_GTG_MQ_NEAR_SWITCH_LAVA_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(1560, -1861), "MQ Near Switch Lava Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_MQ_NEAR_SWITCH_LAVA_SILVER));
locationTable[RC_GTG_MQ_FAR_LAVA_SILVER] = Location::Collectable(RC_GTG_MQ_FAR_LAVA_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(1134, -1841), "MQ Far Lava Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_MQ_FAR_LAVA_SILVER));
locationTable[RC_GTG_MQ_MIDDLE_LAVA_SILVER] = Location::Collectable(RC_GTG_MQ_MIDDLE_LAVA_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(1404, -1653), "MQ Middle Lava Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_MQ_MIDDLE_LAVA_SILVER));
locationTable[RC_GTG_MQ_NEAR_BARRED_DOOR_LAVA_SILVER] = Location::Collectable(RC_GTG_MQ_NEAR_BARRED_DOOR_LAVA_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(1560, -1380), "MQ Near Barred Door Lava Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_MQ_SILVER_LAVA_4));
locationTable[RC_GTG_MQ_NEAR_MAZE_LEDGE_LAVA_SILVER] = Location::Collectable(RC_GTG_MQ_NEAR_MAZE_LEDGE_LAVA_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(1083, -1374), "MQ Near Maze Ledge Lava Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_MQ_NEAR_MAZE_LEDGE_LAVA_SILVER));
locationTable[RC_GTG_MQ_NEAR_LIT_TORCH_LAVA_SILVER] = Location::Collectable(RC_GTG_MQ_NEAR_LIT_TORCH_LAVA_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(1317, -1243), "MQ Near Lit Torch Lava Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_MQ_NEAR_LIT_TORCH_LAVA_SILVER));
locationTable[RC_GTG_MQ_BACK_WATER_SILVER] = Location::Collectable(RC_GTG_MQ_BACK_WATER_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(2453, -1612), "MQ Back Water Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_MQ_BACK_WATER_SILVER));
locationTable[RC_GTG_MQ_MIDDLE_WATER_SILVER] = Location::Collectable(RC_GTG_MQ_MIDDLE_WATER_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(2302, -1464), "MQ Middle Water Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_MQ_MIDDLE_WATER_SILVER));
locationTable[RC_GTG_MQ_FRONT_WATER_SILVER] = Location::Collectable(RC_GTG_MQ_FRONT_WATER_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_GERUDO_TRAINING_GROUND, TWO_ACTOR_PARAMS(2160, -1315), "MQ Front Water Silver", RHT_GTG_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GTG_MQ_FRONT_WATER_SILVER));
locationTable[RC_GANONS_CASTLE_MQ_UNDER_PILLAR_FIRE_SILVER] = Location::Collectable(RC_GANONS_CASTLE_MQ_UNDER_PILLAR_FIRE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-970, -3747), "MQ Under Pillar Fire Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_UNDER_PILLAR_FIRE_SILVER));
locationTable[RC_GANONS_CASTLE_MQ_NEAR_TARGET_FIRE_SILVER] = Location::Collectable(RC_GANONS_CASTLE_MQ_NEAR_TARGET_FIRE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-1891, -2753), "MQ Near Target Fire Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_NEAR_TARGET_FIRE_SILVER));
locationTable[RC_GANONS_CASTLE_MQ_ON_PILLAR_FIRE_SILVER] = Location::Collectable(RC_GANONS_CASTLE_MQ_ON_PILLAR_FIRE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-2044, -3354), "MQ On Pillar Fire Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_ON_PILLAR_FIRE_SILVER));
locationTable[RC_GANONS_CASTLE_MQ_LAUNCH_PLATFORM_FIRE_SILVER] = Location::Collectable(RC_GANONS_CASTLE_MQ_LAUNCH_PLATFORM_FIRE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-686, -2945), "MQ Launch Platform Fire Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_LAUNCH_PLATFORM_FIRE_SILVER));
locationTable[RC_GANONS_CASTLE_MQ_JET_PLATFORM_FIRE_SILVER] = Location::Collectable(RC_GANONS_CASTLE_MQ_JET_PLATFORM_FIRE_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(-1655, -2133), "MQ Jet Platform Fire Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_JET_PLATFORM_FIRE_SILVER));
locationTable[RC_GANONS_CASTLE_MQ_IN_HOLE_WATER_SILVER] = Location::Collectable(RC_GANONS_CASTLE_MQ_IN_HOLE_WATER_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(2757, -765), "MQ In Hole Water Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_IN_HOLE_WATER_SILVER));
locationTable[RC_GANONS_CASTLE_MQ_AIRBORNE_WATER_SILVER] = Location::Collectable(RC_GANONS_CASTLE_MQ_AIRBORNE_WATER_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(2912, -971), "MQ Airborne Water Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_AIRBORNE_WATER_SILVER));
locationTable[RC_GANONS_CASTLE_MQ_FROZEN_WATER_SILVER] = Location::Collectable(RC_GANONS_CASTLE_MQ_FROZEN_WATER_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(2905, -1478), "MQ Frozen Water Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_FROZEN_WATER_SILVER));
locationTable[RC_GANONS_CASTLE_MQ_OVER_PIT_WATER_SILVER] = Location::Collectable(RC_GANONS_CASTLE_MQ_OVER_PIT_WATER_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(3253, -649), "MQ Over Pit Water Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_OVER_PIT_WATER_SILVER));
locationTable[RC_GANONS_CASTLE_MQ_NOOK_WATER_SILVER] = Location::Collectable(RC_GANONS_CASTLE_MQ_NOOK_WATER_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(2905, -1263), "MQ Nook Water Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_NOOK_WATER_SILVER));
locationTable[RC_GANONS_CASTLE_MQ_BOMB_FLOWER_SHADOW_SILVER] = Location::Collectable(RC_GANONS_CASTLE_MQ_BOMB_FLOWER_SHADOW_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(1322, -2262), "MQ Bomb Flower Shadow Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_BOMB_FLOWER_SHADOW_SILVER));
locationTable[RC_GANONS_CASTLE_MQ_NEAR_TORCH_SHADOW_SILVER] = Location::Collectable(RC_GANONS_CASTLE_MQ_NEAR_TORCH_SHADOW_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(1279, -3111), "MQ Near Torch Shadow Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_NEAR_TORCH_SHADOW_SILVER));
locationTable[RC_GANONS_CASTLE_MQ_BEAMOS_PLATFORM_SHADOW_SILVER] = Location::Collectable(RC_GANONS_CASTLE_MQ_BEAMOS_PLATFORM_SHADOW_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(1529, -4117), "MQ Beamos Platform Shadow Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_BEAMOS_PLATFORM_SHADOW_SILVER));
locationTable[RC_GANONS_CASTLE_MQ_GUILLOTINE_SHADOW_SILVER] = Location::Collectable(RC_GANONS_CASTLE_MQ_GUILLOTINE_SHADOW_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(1829, -4071), "MQ Guillotine Shadow Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_GUILLOTINE_SHADOW_SILVER));
locationTable[RC_GANONS_CASTLE_MQ_MOVING_PLATFORM_SHADOW_SILVER] = Location::Collectable(RC_GANONS_CASTLE_MQ_MOVING_PLATFORM_SHADOW_SILVER, RCQUEST_MQ, RCTYPE_SILVER, ACTOR_EN_G_SWITCH, SCENE_INSIDE_GANONS_CASTLE, TWO_ACTOR_PARAMS(1100, -2554), "MQ Moving Platform Shadow Trial Silver", RHT_GANONS_CASTLE_SILVER, RG_BLUE_RUPEE, SpoilerCollectionCheck::RandomizerInf(RAND_INF_GANONS_CASTLE_MQ_MOVING_PLATFORM_SHADOW_SILVER));
// clang-format on
}
static RegisterShipInitFunc registerShuffleSilver(RegisterShuffleSilver, { "IS_RANDO" });
static RegisterShipInitFunc registerShuffleSilverLocations(Rando::StaticData::RegisterSilverLocations);
soh/soh/Enhancements/randomizer/ShuffleSilver.h
+12
View File
@@ -0,0 +1,12 @@
#pragma once
#include <stdint.h>
#include "randomizerEnums.h"
#include <stdint.h>
#include <libultraship/libultra.h>
bool IsSilverInPool(RandomizerGet rg);
RandomizerGet SilverFromSwitchFlag(s16 switchFlag);
bool IsSilverCleared(s16 switchFlag);
bool IsSilverCleared(RandomizerGet rg);
bool IsSilver(RandomizerGet rg);
soh/soh/Enhancements/randomizer/Traps.cpp
+90
View File
@@ -1231,6 +1231,94 @@ static void InitTrickNames() {
Text{ "Squid-Hunt Key", "Squid-Hunt Key", "Squid-Hunt Key" },
};
trickNameTable[RG_SHADOW_SILVER_BLADES] = {
// TODO_TRANSLATE
Text{ "Shadow Silver: Bladders" },
};
trickNameTable[RG_SHADOW_SILVER_PIT] = {
// TODO_TRANSLATE
Text{ "Shadow Silver: Bit" },
};
trickNameTable[RG_SHADOW_SILVER_SPIKES] = {
// TODO_TRANSLATE
Text{ "Shadow Silver: Spines" },
};
trickNameTable[RG_SPIRIT_SILVER_CHILD] = {
// TODO_TRANSLATE
Text{ "Spirit Silver: Chill" },
};
trickNameTable[RG_SPIRIT_SILVER_SUN] = {
// TODO_TRANSLATE
Text{ "Spirit Silver: Son" },
};
trickNameTable[RG_SPIRIT_SILVER_BOULDERS] = {
// TODO_TRANSLATE
Text{ "Spirit Silver: Bounders" },
};
trickNameTable[RG_BOTW_SILVER] = {
// TODO_TRANSLATE
Text{ "Bottom of the Well Slipper" },
};
trickNameTable[RG_ICE_CAVERN_SILVER_BLADES] = {
// TODO_TRANSLATE
Text{ "Ice Cavern Silver: Blaze" },
};
trickNameTable[RG_ICE_CAVERN_SILVER_BLOCK] = {
// TODO_TRANSLATE
Text{ "Ice Cavern Silver: Black" },
};
trickNameTable[RG_GTG_SILVER_SLOPE] = {
// TODO_TRANSLATE
Text{ "Training Ground Silver: Snope" },
};
trickNameTable[RG_GTG_SILVER_LAVA] = {
// TODO_TRANSLATE
Text{ "Traning Ground Silver: Love" },
};
trickNameTable[RG_GTG_SILVER_WATER] = {
// TODO_TRANSLATE
Text{ "Training Pound Silver: Water" },
};
trickNameTable[RG_GANONS_CASTLE_SILVER_LIGHT] = {
// TODO_TRANSLATE
Text{ "Ganon's Castle Silver: Lighter" },
};
trickNameTable[RG_GANONS_CASTLE_SILVER_FOREST] = {
// TODO_TRANSLATE
Text{ "Ganon's Castle Silver: Frost" },
};
trickNameTable[RG_GANONS_CASTLE_SILVER_FIRE] = {
// TODO_TRANSLATE
Text{ "Ganon's Castle Silver: Free" },
};
trickNameTable[RG_GANONS_CASTLE_SILVER_SPIRIT] = {
// TODO_TRANSLATE
Text{ "Ganon's Castle Silver: Sprite" },
};
trickNameTable[RG_DODONGOS_CAVERN_MQ_SILVER] = {
// TODO_TRANSLATE
Text{ "Dodongo's Cave Silver" },
};
trickNameTable[RG_SHADOW_MQ_SILVER_INVISIBLE_BLADES] = {
// TODO_TRANSLATE
Text{ "Shadow Silver: Invisible" },
};
trickNameTable[RG_SPIRIT_MQ_SILVER_LOBBY] = {
// TODO_TRANSLATE
Text{ "Spirit Silver: Foyer" },
};
trickNameTable[RG_SPIRIT_MQ_SILVER_BIG_WALL] = {
// TODO_TRANSLATE
Text{ "Spirit Silver: Brick" },
};
trickNameTable[RG_GANONS_CASTLE_MQ_SILVER_WATER] = {
// TODO_TRANSLATE
Text{ "Ganon's Castle Silver: Wheat" },
};
trickNameTable[RG_GANONS_CASTLE_MQ_SILVER_SHADOW] = {
// TODO_TRANSLATE
Text{ "Ganon's Castle Silver: Shabom" },
};
/*
//Names for individual upgrades, in case progressive names are replaced
trickNameTable[GI_HOOKSHOT] = {
@@ -1451,6 +1539,8 @@ RandomizerGet Rando::Traps::GetTrapTrickModel(uint64_t* state) {
trickModel = ShipUtils::RandomElement(Rando::StaticData::overworldKeys, state);
} else if (trickModel == RG_DEATH_MOUNTAIN_CRATER_BEAN_SOUL) {
trickModel = ShipUtils::RandomElement(Rando::StaticData::beanSouls, state);
} else if (trickModel == RG_SHADOW_SILVER_BLADES) {
trickModel = ShipUtils::RandomElement(Rando::StaticData::silverRupees);
}
return trickModel;
soh/soh/Enhancements/randomizer/draw.cpp
+44 -1
View File
@@ -11,11 +11,13 @@ extern "C" {
#include "functions.h"
#include "variables.h"
#include "dungeon.h"
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_gi_key/object_gi_key.h"
#include "objects/object_gi_bosskey/object_gi_bosskey.h"
#include "objects/object_gi_compass/object_gi_compass.h"
#include "objects/object_gi_map/object_gi_map.h"
#include "objects/object_gi_hearts/object_gi_hearts.h"
#include "objects/object_gi_rupy/object_gi_rupy.h"
#include "objects/object_gi_scale/object_gi_scale.h"
#include "objects/object_gi_fire/object_gi_fire.h"
#include "objects/object_toki_objects/object_toki_objects.h"
@@ -28,9 +30,10 @@ extern "C" {
#include "objects/object_mamenoki/object_mamenoki.h"
#include "objects/object_mo/object_mo.h"
#include "objects/object_sst/object_sst.h"
#include "overlays/actors/ovl_Boss_Goma/z_boss_goma.h"
#include "objects/object_tw/object_tw.h"
#include "objects/object_ganon2/object_ganon2.h"
#include "objects/object_mo/object_mo.h"
#include "overlays/actors/ovl_Boss_Goma/z_boss_goma.h"
extern PlayState* gPlayState;
extern SaveContext gSaveContext;
}
@@ -1235,6 +1238,46 @@ extern "C" void Randomizer_DrawOpenChest(PlayState* play, GetItemEntry* getItemE
CLOSE_DISPS(play->state.gfxCtx);
}
extern "C" void Randomizer_DrawSilverRupee(PlayState* play, GetItemEntry* getItemEntry) {
OPEN_DISPS(play->state.gfxCtx);
Gfx_SetupDL_25Opa(play->state.gfxCtx);
Color_RGB8 defaultColor = { 255, 255, 255 };
if (CVarGetInteger("gEnhancements.NewDrops", 0) != 0) {
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
G_MTX_MODELVIEW | G_MTX_LOAD);
Color_RGB8 silverRupeeColor = CVarGetColor24("gCosmetics.Consumable_SilverRupee.Value", defaultColor);
Gfx_SetupDL_25Opa(play->state.gfxCtx);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
G_MTX_MODELVIEW | G_MTX_LOAD);
gDPSetPrimColor(POLY_OPA_DISP++, 0, 0x80, silverRupeeColor.r, silverRupeeColor.g, silverRupeeColor.b, 255);
gDPSetEnvColor(POLY_OPA_DISP++, silverRupeeColor.r / 5, silverRupeeColor.g / 5, silverRupeeColor.b / 5, 255);
gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gGiRupeeInnerDL);
Gfx_SetupDL_25Xlu(play->state.gfxCtx);
gSPMatrix(POLY_XLU_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
G_MTX_MODELVIEW | G_MTX_LOAD);
gDPSetPrimColor(POLY_XLU_DISP++, 0, 0x80, 255, 255, 255, 255);
gDPSetEnvColor(POLY_XLU_DISP++, silverRupeeColor.r * 0.75f, silverRupeeColor.g * 0.75f,
silverRupeeColor.b * 0.75f, 255);
gSPDisplayList(POLY_XLU_DISP++, (Gfx*)gGiRupeeOuterDL);
} else {
Matrix_Scale(0.05f, 0.05f, 0.05f, MTXMODE_APPLY);
gSPMatrix(POLY_OPA_DISP++, Matrix_NewMtx(play->state.gfxCtx, (char*)__FILE__, __LINE__),
G_MTX_NOPUSH | G_MTX_LOAD | G_MTX_MODELVIEW);
if (CVarGetInteger("gCosmetics.Consumable_SilverRupee.Changed", 0)) {
Color_RGB8 rupeeColor = CVarGetColor24("gCosmetics.Consumable_SilverRupee.Value", defaultColor);
gDPSetGrayscaleColor(POLY_OPA_DISP++, rupeeColor.r, rupeeColor.g, rupeeColor.b, 255);
gSPGrayscale(POLY_OPA_DISP++, true);
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL((uintptr_t)gRupeeSilverTex));
gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gRupeeDL);
gSPGrayscale(POLY_OPA_DISP++, false);
} else {
gSPSegment(POLY_OPA_DISP++, 0x08, SEGMENTED_TO_VIRTUAL((uintptr_t)gRupeeSilverTex));
gSPDisplayList(POLY_OPA_DISP++, (Gfx*)gRupeeDL);
}
}
CLOSE_DISPS(play->state.gfxCtx);
}
extern "C" void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getItemEntry) {
OPEN_DISPS(play->state.gfxCtx);
soh/soh/Enhancements/randomizer/draw.h
+1
View File
@@ -27,6 +27,7 @@ void Randomizer_DrawLadder(PlayState* play, GetItemEntry* getItemEntry);
void Randomizer_DrawKneePads(PlayState* play, GetItemEntry* getItemEntry);
void Randomizer_DrawJabberNut(PlayState* play, GetItemEntry* getItemEntry);
void Randomizer_DrawOpenChest(PlayState* play, GetItemEntry* getItemEntry);
void Randomizer_DrawSilverRupee(PlayState* play, GetItemEntry* getItemEntry);
void Randomizer_DrawFishingPoleGI(PlayState* play, GetItemEntry* getItemEntry);
void Randomizer_DrawSkeletonKey(PlayState* play, GetItemEntry* getItemEntry);
void Randomizer_DrawMysteryItem(PlayState* play, GetItemEntry* getItemEntry);
soh/soh/Enhancements/randomizer/hook_handlers.cpp
+7 -10
View File
@@ -86,7 +86,7 @@ bool LocMatchesQuest(Rando::Location loc) {
if (loc.GetQuest() == RCQUEST_BOTH) {
return true;
} else {
auto dungeon = OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene());
auto dungeon = OTRGlobals::Instance->gRandoContext->GetDungeonFromScene(loc.GetScene());
return (dungeon->IsMQ() && loc.GetQuest() == RCQUEST_MQ) ||
(dungeon->IsVanilla() && loc.GetQuest() == RCQUEST_VANILLA);
}
@@ -324,7 +324,7 @@ void RandomizerOnFlagSetHandler(int16_t flagType, int16_t flag) {
void RandomizerOnSceneFlagSetHandler(int16_t sceneNum, int16_t flagType, int16_t flag) {
if (flagType == FLAG_SCENE_SWITCH) {
auto dungeonInfo = Rando::Context::GetInstance()->GetDungeons()->GetDungeonFromScene(sceneNum);
auto dungeonInfo = Rando::Context::GetInstance()->GetDungeonFromScene((SceneID)sceneNum);
bool isVanilla = dungeonInfo == nullptr || dungeonInfo->IsVanilla();
switch (sceneNum) {
@@ -414,7 +414,7 @@ void RandomizerOnPlayerUpdateForRCQueueHandler() {
RandomizerGet vanillaRandomizerGet = Rando::StaticData::GetLocation(rc)->GetVanillaItem();
GetItemID vanillaItem = (GetItemID)Rando::StaticData::RetrieveItem(vanillaRandomizerGet).GetItemID();
GetItemEntry getItemEntry =
Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)vanillaRandomizerGet);
Rando::Context::GetInstance()->GetFinalGIEntry(rc, true, (GetItemID)vanillaRandomizerGet, true);
GetItemCategory getItemCategory = Randomizer_AdjustItemCategory(getItemEntry);
if (loc->HasObtained()) {
@@ -1705,8 +1705,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
}
case VB_OKARINA_TAG_COMPLETE: {
if (gPlayState->sceneNum == SCENE_BOTTOM_OF_THE_WELL) {
auto dungeon =
OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(SCENE_BOTTOM_OF_THE_WELL);
auto dungeon = OTRGlobals::Instance->gRandoContext->GetDungeonFromScene(SCENE_BOTTOM_OF_THE_WELL);
if (dungeon->IsVanilla()) {
EnOkarinaTag* enOkarinaTag = va_arg(args, EnOkarinaTag*);
if (enOkarinaTag->switchFlag >= 0 && Flags_GetSwitch(gPlayState, enOkarinaTag->switchFlag)) {
@@ -1719,8 +1718,7 @@ void RandomizerOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_l
}
case VB_OKARINA_TAG_COMPLETED: {
if (gPlayState->sceneNum == SCENE_BOTTOM_OF_THE_WELL) {
auto dungeon =
OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(SCENE_BOTTOM_OF_THE_WELL);
auto dungeon = OTRGlobals::Instance->gRandoContext->GetDungeonFromScene(SCENE_BOTTOM_OF_THE_WELL);
if (dungeon->IsVanilla()) {
*should = false;
}
@@ -2287,7 +2285,7 @@ void RandomizerOnActorInitHandler(void* actorRef) {
Actor* actor = static_cast<Actor*>(actorRef);
if (actor->id == ACTOR_PLAYER) {
auto dungeonInfo = Rando::Context::GetInstance()->GetDungeons()->GetDungeonFromScene(gPlayState->sceneNum);
auto dungeonInfo = Rando::Context::GetInstance()->GetDungeonFromScene((SceneID)gPlayState->sceneNum);
bool isVanilla = dungeonInfo == nullptr || dungeonInfo->IsVanilla();
switch (gPlayState->sceneNum) {
case SCENE_DEKU_TREE:
@@ -2676,8 +2674,7 @@ void RandomizerOnActorInitHandler(void* actorRef) {
// Turn MQ switch into toggle
if (actor->id == ACTOR_OBJ_SWITCH && gPlayState->sceneNum == SCENE_BOTTOM_OF_THE_WELL &&
(actor->params & 0x3f07) == 0x303) {
auto dungeon =
OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(SCENE_BOTTOM_OF_THE_WELL);
auto dungeon = OTRGlobals::Instance->gRandoContext->GetDungeonFromScene(SCENE_BOTTOM_OF_THE_WELL);
if (dungeon->IsMQ()) {
actor->params |= 0x10;
}
soh/soh/Enhancements/randomizer/item.h
+1
View File
@@ -17,6 +17,7 @@ enum ItemType {
ITEMTYPE_SMALLKEY,
ITEMTYPE_TOKEN,
ITEMTYPE_FORTRESS_SMALLKEY,
ITEMTYPE_SILVER,
ITEMTYPE_EVENT,
ITEMTYPE_DROP,
ITEMTYPE_REFILL,
soh/soh/Enhancements/randomizer/item_list.cpp
+46 -1
View File
@@ -165,7 +165,7 @@ void Rando::StaticData::InitItemTable() {
itemTable[RG_SHADOW_TEMPLE_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
itemTable[RG_BOTTOM_OF_THE_WELL_SMALL_KEY] = Item(RG_BOTTOM_OF_THE_WELL_SMALL_KEY, Text{ "Bottom of the Well Small Key", "Petite Clé du Puits", "Kleiner Schlüssel für den Grund des Brunnens" }, ITEMTYPE_SMALLKEY, 0xB4, true, LOGIC_BOTTOM_OF_THE_WELL_KEYS, RHT_BOTTOM_OF_THE_WELL_SMALL_KEY, RG_BOTTOM_OF_THE_WELL_SMALL_KEY, OBJECT_GI_KEY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"a ", "une ", "einen "}, "%p").CustomIcon(gQuestIconSmallKeyTex, ICON_SIZE_24);
itemTable[RG_BOTTOM_OF_THE_WELL_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
itemTable[RG_GERUDO_TRAINING_GROUND_SMALL_KEY] = Item(RG_GERUDO_TRAINING_GROUND_SMALL_KEY, Text{ "Training Ground Small Key", "Petite Clé du Gymnase Gerudo", "Kleiner Schlüssel für das Gerudo-Trainingsgelände" }, ITEMTYPE_SMALLKEY, 0xB5, true, LOGIC_GERUDO_TRAINING_GROUND_KEYS, RHT_GERUDO_TRAINING_GROUND_SMALL_KEY, RG_GERUDO_TRAINING_GROUND_SMALL_KEY, OBJECT_GI_KEY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"a ", "une ", "einen "}, "%y").CustomIcon(gQuestIconSmallKeyTex, ICON_SIZE_24);
itemTable[RG_GERUDO_TRAINING_GROUND_SMALL_KEY] = Item(RG_GERUDO_TRAINING_GROUND_SMALL_KEY, Text{ "Training Ground Small Key", "Petite Clé du Gymnase Gerudo", "Kleiner Schlüssel für das Gerudo-Trainingsgelände" }, ITEMTYPE_SMALLKEY, 0xB5, true, LOGIC_GERUDO_TRAINING_GROUND_KEYS, RHT_GERUDO_TRAINING_GROUND_SMALL_KEY, RG_GERUDO_TRAINING_GROUND_SMALL_KEY, OBJECT_GI_KEY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"a ", "une ", "einen "}, "%y").CustomIcon(gQuestIconSmallKeyTex, ICON_SIZE_24);
itemTable[RG_GERUDO_TRAINING_GROUND_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
itemTable[RG_GERUDO_FORTRESS_SMALL_KEY] = Item(RG_GERUDO_FORTRESS_SMALL_KEY, Text{ "Gerudo Fortress Small Key", "Petite Clé du Repaire des Voleurs", "Kleiner Schlüssel für die Gerudo-Festung" }, ITEMTYPE_FORTRESS_SMALLKEY, 0xB6, true, LOGIC_GERUDO_FORTRESS_KEYS, RHT_GERUDO_FORTRESS_SMALL_KEY, RG_GERUDO_FORTRESS_SMALL_KEY, OBJECT_GI_KEY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"a ", "une ", "einen "}, "%y").CustomIcon(gQuestIconSmallKeyTex, ICON_SIZE_24);
itemTable[RG_GERUDO_FORTRESS_SMALL_KEY].SetCustomDrawFunc(Randomizer_DrawSmallKey);
@@ -241,6 +241,51 @@ void Rando::StaticData::InitItemTable() {
itemTable[RG_GANONS_CASTLE_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
itemTable[RG_TREASURE_GAME_KEY_RING] = Item(RG_TREASURE_GAME_KEY_RING, Text{ "Chest Game Key Ring", "Trousseau du jeu la Chasse-aux-Trésors", "Schlüsselbund für das Truhenspiel" }, ITEMTYPE_SMALLKEY, 0xDE, true, LOGIC_TREASURE_GAME_KEYS, RHT_TREASURE_GAME_KEY_RING, RG_TREASURE_GAME_KEY_RING, OBJECT_GI_KEY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_SMALL_KEY,MOD_RANDOMIZER, {"the ", "le ", "den "});
itemTable[RG_TREASURE_GAME_KEY_RING].SetCustomDrawFunc(Randomizer_DrawKeyRing);
// Silver Rupees
itemTable[RG_SHADOW_SILVER_BLADES] = Item(RG_SHADOW_SILVER_BLADES, Text{ "Shadow Silver: Blades", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_SHADOW_TEMPLE, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_SHADOW_SILVER_BLADES].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_SHADOW_SILVER_PIT] = Item(RG_SHADOW_SILVER_PIT, Text{ "Shadow Silver: Pit", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_SHADOW_TEMPLE, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_SHADOW_SILVER_PIT].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_SHADOW_SILVER_SPIKES] = Item(RG_SHADOW_SILVER_SPIKES, Text{ "Shadow Silver: Spikes", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_SHADOW_TEMPLE, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_SHADOW_SILVER_SPIKES].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_SPIRIT_SILVER_CHILD] = Item(RG_SPIRIT_SILVER_CHILD, Text{ "Spirit Silver: Child", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_SPIRIT_TEMPLE, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_SPIRIT_SILVER_CHILD].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_SPIRIT_SILVER_SUN] = Item(RG_SPIRIT_SILVER_SUN, Text{ "Spirit Silver: Sun", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_SPIRIT_TEMPLE, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_SPIRIT_SILVER_SUN].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_SPIRIT_SILVER_BOULDERS] = Item(RG_SPIRIT_SILVER_BOULDERS, Text{ "Spirit Silver: Boulders", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_SPIRIT_TEMPLE, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_SPIRIT_SILVER_BOULDERS].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_BOTW_SILVER] = Item(RG_BOTW_SILVER, Text{ "Bottom of the Well Silver", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_BOTW, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_BOTW_SILVER].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_ICE_CAVERN_SILVER_BLADES] = Item(RG_ICE_CAVERN_SILVER_BLADES, Text{ "Ice Cavern Silver: Blades", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_ICE_CAVERN, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_ICE_CAVERN_SILVER_BLADES].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_ICE_CAVERN_SILVER_BLOCK] = Item(RG_ICE_CAVERN_SILVER_BLOCK, Text{ "Ice Cavern Silver: Block", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_ICE_CAVERN, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_ICE_CAVERN_SILVER_BLOCK].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_GTG_SILVER_SLOPE] = Item(RG_GTG_SILVER_SLOPE, Text{ "Training Ground Silver: Slope", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_GTG, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_GTG_SILVER_SLOPE].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_GTG_SILVER_LAVA] = Item(RG_GTG_SILVER_LAVA, Text{ "Training Ground Silver: Lava", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_GTG, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_GTG_SILVER_LAVA].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_GTG_SILVER_WATER] = Item(RG_GTG_SILVER_WATER, Text{ "Training Ground Silver: Water", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_GTG, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_GTG_SILVER_WATER].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_GANONS_CASTLE_SILVER_LIGHT] = Item(RG_GANONS_CASTLE_SILVER_LIGHT, Text{ "Ganon's Castle Silver: Light", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_GANONS_CASTLE, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_GANONS_CASTLE_SILVER_LIGHT].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_GANONS_CASTLE_SILVER_FOREST] = Item(RG_GANONS_CASTLE_SILVER_FOREST, Text{ "Ganon's Castle Silver: Forest", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_GANONS_CASTLE, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_GANONS_CASTLE_SILVER_FOREST].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_GANONS_CASTLE_SILVER_FIRE] = Item(RG_GANONS_CASTLE_SILVER_FIRE, Text{ "Ganon's Castle Silver: Fire", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_GANONS_CASTLE, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_GANONS_CASTLE_SILVER_FIRE].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_GANONS_CASTLE_SILVER_SPIRIT] = Item(RG_GANONS_CASTLE_SILVER_SPIRIT, Text{ "Ganon's Castle Silver: Spirit", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_GANONS_CASTLE, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_GANONS_CASTLE_SILVER_SPIRIT].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_DODONGOS_CAVERN_MQ_SILVER] = Item(RG_DODONGOS_CAVERN_MQ_SILVER, Text{ "Dodongo's Cavern Silver", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_DODONGOS_CAVERN, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_DODONGOS_CAVERN_MQ_SILVER].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_SHADOW_MQ_SILVER_INVISIBLE_BLADES] = Item(RG_SHADOW_MQ_SILVER_INVISIBLE_BLADES, Text{ "Shadow Silver: Invisible Blades", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_SHADOW_TEMPLE, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_SHADOW_MQ_SILVER_INVISIBLE_BLADES].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_SPIRIT_MQ_SILVER_LOBBY] = Item(RG_SPIRIT_MQ_SILVER_LOBBY, Text{ "Spirit Silver: Lobby", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_SPIRIT_TEMPLE, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_SPIRIT_MQ_SILVER_LOBBY].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_SPIRIT_MQ_SILVER_BIG_WALL] = Item(RG_SPIRIT_MQ_SILVER_BIG_WALL, Text{ "Spirit Silver: Big Wall", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_SPIRIT_TEMPLE, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_SPIRIT_MQ_SILVER_BIG_WALL].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_GANONS_CASTLE_MQ_SILVER_WATER] = Item(RG_GANONS_CASTLE_MQ_SILVER_WATER, Text{ "Ganon's Castle Silver: Water", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_GANONS_CASTLE, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_GANONS_CASTLE_MQ_SILVER_WATER].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
itemTable[RG_GANONS_CASTLE_MQ_SILVER_SHADOW] = Item(RG_GANONS_CASTLE_MQ_SILVER_SHADOW, Text{ "Ganon's Castle Silver: Shadow", TODO_TRANSLATE, TODO_TRANSLATE }, ITEMTYPE_SILVER, GI_RUPEE_GOLD, true, LOGIC_NONE, RHT_SILVER_RUPEE_GANONS_CASTLE, RG_NONE, OBJECT_GI_RUPY, GID_KEY_SMALL, TEXT_RANDOMIZER_CUSTOM_ITEM, 0x80, CHEST_ANIM_SHORT, ITEM_CATEGORY_MAJOR, MOD_RANDOMIZER);
itemTable[RG_GANONS_CASTLE_MQ_SILVER_SHADOW].SetCustomDrawFunc(Randomizer_DrawSilverRupee);
// Dungeon Rewards
itemTable[RG_KOKIRI_EMERALD] = Item(RG_KOKIRI_EMERALD, Text{ "Kokiri's Emerald", "Émeraude Kokiri", "Kokiri-Smaragd" }, ITEMTYPE_DUNGEONREWARD, 0xCB, true, LOGIC_KOKIRI_EMERALD, RHT_KOKIRI_EMERALD, ITEM_KOKIRI_EMERALD, OBJECT_GI_JEWEL, GID_KOKIRI_EMERALD, 0x80, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_NONE, {"the ", "l'", "den "}, "%g");
itemTable[RG_GORON_RUBY] = Item(RG_GORON_RUBY, Text{ "Goron's Ruby", "Rubis Goron", "Goronen-Rubin" }, ITEMTYPE_DUNGEONREWARD, 0xCC, true, LOGIC_GORON_RUBY, RHT_GORON_RUBY, ITEM_GORON_RUBY, OBJECT_GI_JEWEL, GID_GORON_RUBY, 0x81, 0x80, CHEST_ANIM_LONG, ITEM_CATEGORY_MAJOR, MOD_NONE, {"the ", "le ", "den "}, "%r");
soh/soh/Enhancements/randomizer/location_access/dungeons/bottom_of_the_well.cpp
+29 -12
View File
@@ -187,16 +187,16 @@ void RegionTable_Init_BottomOfTheWell() {
areaTable[RR_BOTW_B3_OOZE] = Region("Bottom of the Well B3 Ooze", SCENE_BOTTOM_OF_THE_WELL, {}, {
//Locations
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_1, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_2, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_3, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_4, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_5, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_6, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_7, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_8, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_9, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_10, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_1, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_2, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_3, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_4, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_5, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_6, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_7, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_8, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_9, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_10, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_11, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_12, logic->CanBreakPots()),
LOCATION(RC_BOTTOM_OF_THE_WELL_BASEMENT_SUN_FAIRY, logic->CanUse(RG_SUNS_SONG)),
@@ -206,13 +206,17 @@ void RegionTable_Init_BottomOfTheWell() {
LOCATION(RC_BOTW_BOULDER_1, logic->BlastOrSmash()),
LOCATION(RC_BOTW_BOULDER_2, logic->BlastOrSmash()),
LOCATION(RC_BOTW_BOULDER_3, logic->BlastOrSmash() || logic->CanUse(RG_DINS_FIRE) || (logic->CanUse(RG_STICKS) && ctx->GetTrickOption(RT_BOTW_BASEMENT)) ||
(ctx->GetTrickOption(RT_BOULDER_COLLISION) && logic->CanUse(RG_FAIRY_BOW))),
(ctx->GetTrickOption(RT_BOULDER_COLLISION) && logic->CanUse(RG_FAIRY_BOW))),
LOCATION(RC_BOTW_BOULDER_4, logic->BlastOrSmash()),
LOCATION(RC_BOTW_BOULDER_5, logic->BlastOrSmash()),
LOCATION(RC_BOTW_BOULDER_6, logic->BlastOrSmash()),
LOCATION(RC_BOTW_B2_LADDER_SILVER, logic->CanClimbLadder()),
LOCATION(RC_BOTW_B3_LADDER_SILVER, true),
LOCATION(RC_BOTW_NW_OOZE_SILVER, true),
LOCATION(RC_BOTW_SE_OOZE_SILVER, true),
}, {
//Exits
ENTRANCE(RR_BOTW_HIDDEN_POTS, logic->CanClimbHighLadder()),
ENTRANCE(RR_BOTW_LADDER_DOOR, logic->CanClimbHighLadder()),
//It's possible to abuse boulder's limited range of collision detection to detonate the flowers through the boulder with bow, but this is a glitch
//the exact range is just past the furthest away plank in the green goo section
ENTRANCE(RR_BOTW_B3_BOMB_FLOWERS, AnyAgeTime([]{return logic->BlastOrSmash() || logic->CanUse(RG_DINS_FIRE) || (ctx->GetTrickOption(RT_BOTW_BASEMENT) && logic->CanUse(RG_STICKS)) || (ctx->GetTrickOption(RT_BOULDER_COLLISION) && logic->CanUse(RG_FAIRY_BOW));})),
@@ -220,6 +224,19 @@ void RegionTable_Init_BottomOfTheWell() {
ENTRANCE(RR_BOTW_B3_CHEST_AREA, AnyAgeTime([]{return logic->BlastOrSmash();})),
});
areaTable[RR_BOTW_LADDER_DOOR] = Region("Bottom of the Well Ladder Door", SCENE_BOTTOM_OF_THE_WELL, {
// Events
EVENT_ACCESS(LOGIC_BOTW_SILVER, true),
}, {
//Locations
LOCATION(RC_BOTW_B1_LADDER_SILVER, true),
LOCATION(RC_BOTW_B2_LADDER_SILVER, true),
}, {
//Exits
ENTRANCE(RR_BOTW_B3_OOZE, true),
ENTRANCE(RR_BOTW_HIDDEN_POTS, logic->HasItem(RG_BOTW_SILVER)),
});
areaTable[RR_BOTW_B3_BOMB_FLOWERS] = Region("Bottom of the Well B3 Bomb Flowers", SCENE_BOTTOM_OF_THE_WELL, {}, {
//Locations
LOCATION(RC_BOTW_BOULDER_1, logic->HasItem(RG_GORONS_BRACELET)),
soh/soh/Enhancements/randomizer/location_access/dungeons/dodongos_cavern.cpp
+14 -4
View File
@@ -1,6 +1,7 @@
#include "soh/Enhancements/randomizer/location_access.h"
#include "soh/Enhancements/randomizer/entrance.h"
#include "soh/Enhancements/randomizer/dungeon.h"
#include "soh/Enhancements/randomizer/randomizerEnums.h"
using namespace Rando;
@@ -356,6 +357,8 @@ void RegionTable_Init_DodongosCavern() {
LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_4, logic->CanBreakPots()),
LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_LOWER_CRATE_1, logic->CanBreakCrates()),
LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_LOWER_CRATE_2, logic->CanBreakCrates()),
LOCATION(RC_DODONGOS_CAVERN_MQ_BEAMOS_SILVER, true),
LOCATION(RC_DODONGOS_CAVERN_MQ_1F_CRATE_SILVER, logic->CanBreakCrates() || (ctx->GetTrickOption(RT_VISIBLE_COLLISION) && logic->IsChild)),
}, {
//Exits
ENTRANCE(RR_DODONGOS_CAVERN_MQ_LOBBY, true),
@@ -378,26 +381,33 @@ void RegionTable_Init_DodongosCavern() {
areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_UPPER] = Region("Dodongos Cavern MQ Stairs Upper", SCENE_DODONGOS_CAVERN, {
//Events
EVENT_ACCESS(LOGIC_DC_MQ_STAIRS_SILVER_RUPEES, logic->HasItem(RG_CLIMB)),
EVENT_ACCESS(LOGIC_DODONGOS_CAVERN_MQ_SILVER, (logic->CanPassEnemy(RE_BIG_SKULLTULA) || logic->CanUse(RG_HOVER_BOOTS)) &&
logic->HasItem(RG_CLIMB) && (logic->CanBreakCrates() || (ctx->GetTrickOption(RT_VISIBLE_COLLISION) && logic->IsChild))),
}, {
//Locations
//Jump from vines can reach stairs without climb
LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE, logic->CanStunDeku() && logic->HasItem(RG_SPEAK_DEKU) && GetCheckPrice() <= GetWalletCapacity()),
LOCATION(RC_DODONGOS_CAVERN_MQ_DEKU_SCRUB_STAIRCASE, logic->CanStunDeku() && logic->HasItem(RG_SPEAK_DEKU) && GetCheckPrice() <= GetWalletCapacity()),
LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_1, logic->CanBreakCrates()),
LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_2, logic->CanBreakCrates()),
LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_3, logic->CanBreakCrates()),
LOCATION(RC_DODONGOS_CAVERN_MQ_STAIRCASE_UPPER_CRATE_4, logic->CanBreakCrates()),
LOCATION(RC_DODONGOS_CAVERN_MQ_LOWER_2F_CRATE_SILVER, logic->CanBreakCrates() || (ctx->GetTrickOption(RT_VISIBLE_COLLISION) && (logic->IsChild || logic->CanUse(RG_HOOKSHOT)))),
// possible with the hookshot method and longshot, but precise and would be it's own trick
LOCATION(RC_DODONGOS_CAVERN_MQ_UPPER_2F_CRATE_SILVER, logic->CanBreakCrates() || (ctx->GetTrickOption(RT_VISIBLE_COLLISION) && logic->IsChild)),
}, {
//Exits
ENTRANCE(RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER, true),
ENTRANCE(RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_BIG_SKULLTULAS, logic->CanPassEnemy(RE_BIG_SKULLTULA) || logic->CanUse(RG_HOVER_BOOTS)),
});
areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_BIG_SKULLTULAS] = Region("Dodongos Cavern MQ Past Big Skulltulas", SCENE_DODONGOS_CAVERN, {}, {}, {
areaTable[RR_DODONGOS_CAVERN_MQ_STAIRS_PAST_BIG_SKULLTULAS] = Region("Dodongos Cavern MQ Past Big Skulltulas", SCENE_DODONGOS_CAVERN, {}, {
//Locations
LOCATION(RC_DODONGOS_CAVERN_MQ_VINES_SILVER, logic->HasItem(RG_CLIMB)),
}, {
//Exits
ENTRANCE(RR_DODONGOS_CAVERN_MQ_STAIRS_UPPER, logic->CanPassEnemy(RE_BIG_SKULLTULA) || logic->CanUse(RG_HOVER_BOOTS)),
ENTRANCE(RR_DODONGOS_CAVERN_MQ_STAIRS_LOWER, logic->TakeDamage()),
ENTRANCE(RR_DODONGOS_CAVERN_MQ_DODONGO_ROOM, logic->Get(LOGIC_DC_MQ_STAIRS_SILVER_RUPEES)),
ENTRANCE(RR_DODONGOS_CAVERN_MQ_DODONGO_ROOM, logic->HasItem(RG_DODONGOS_CAVERN_MQ_SILVER)),
});
areaTable[RR_DODONGOS_CAVERN_MQ_DODONGO_ROOM] = Region("Dodongos Cavern MQ Dodongo Room", SCENE_DODONGOS_CAVERN, {}, {
soh/soh/Enhancements/randomizer/location_access/dungeons/ganons_castle.cpp
+123 -41
View File
@@ -1,6 +1,7 @@
#include "soh/Enhancements/randomizer/location_access.h"
#include "soh/Enhancements/randomizer/entrance.h"
#include "soh/Enhancements/randomizer/dungeon.h"
#include "soh/Enhancements/randomizer/randomizerEnums.h"
using namespace Rando;
@@ -72,23 +73,36 @@ void RegionTable_Init_GanonsCastle() {
});
areaTable[RR_GANONS_CASTLE_FOREST_TRIAL_BEAMOS_ROOM] = Region("Ganon's Castle Forest Trial Beamos Room", SCENE_INSIDE_GANONS_CASTLE, {
EVENT_ACCESS(LOGIC_FOREST_TRIAL_SILVER_RUPEES, logic->IsAdult || logic->CanUse(RG_HOOKSHOT) || (logic->IsChild && ctx->GetTrickOption(RT_VOIDOUT_COLLECTION))), // child can get these by voiding after switch
}, {}, {
EVENT_ACCESS(LOGIC_GANONS_CASTLE_SILVER_FOREST, logic->IsAdult || logic->CanUse(RG_HOOKSHOT) || (logic->IsChild && ctx->GetTrickOption(RT_VOIDOUT_COLLECTION))), // child can get these by voiding after switch
}, {
//Locations
LOCATION(RC_GANONS_CASTLE_SOT_BLOCK_FOREST_SILVER, true),
//Assumes RR_GANONS_CASTLE_FOREST_TRIAL_BEAMOS_ROOM_END access
LOCATION(RC_GANONS_CASTLE_ON_TARGET_FOREST_SILVER, (bool)ctx->GetTrickOption(RT_VOIDOUT_COLLECTION)),
}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_FOREST_TRIAL_WOLFOS_ROOM, true),
ENTRANCE(RR_GANONS_CASTLE_FOREST_TRIAL_BEAMOS_ROOM_END, true),
ENTRANCE(RR_GANONS_CASTLE_FOREST_TRIAL_WOLFOS_ROOM, true),
ENTRANCE(RR_GANONS_CASTLE_FOREST_TRIAL_BEAMOS_ROOM_MIDDLE, true),
});
areaTable[RR_GANONS_CASTLE_FOREST_TRIAL_BEAMOS_ROOM_END] = Region("Ganon's Castle Forest Trial Beamos Room End", SCENE_INSIDE_GANONS_CASTLE, {}, {}, {
areaTable[RR_GANONS_CASTLE_FOREST_TRIAL_BEAMOS_ROOM_MIDDLE] = Region("Ganon's Castle Forest Trial Beamos Room Middle", SCENE_INSIDE_GANONS_CASTLE, {}, {
//Locations
LOCATION(RC_GANONS_CASTLE_LARGE_PLATFORM_FOREST_SILVER, true),
LOCATION(RC_GANONS_CASTLE_UNDER_LEDGE_FOREST_SILVER, true),
LOCATION(RC_GANONS_CASTLE_ON_TARGET_FOREST_SILVER, logic->IsAdult || logic->CanUse(RG_HOOKSHOT) || (logic->IsChild && ctx->GetTrickOption(RT_VOIDOUT_COLLECTION))),
}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_FOREST_TRIAL_BEAMOS_ROOM, logic->CanUse(RG_LONGSHOT)),
ENTRANCE(RR_GANONS_CASTLE_FOREST_TRIAL_BEAMOS_ROOM_FINAL_DOOR, logic->IsAdult || logic->CanGroundJump() || ctx->GetTrickOption(RT_UNINTUITIVE_JUMPS)),
});
areaTable[RR_GANONS_CASTLE_FOREST_TRIAL_BEAMOS_ROOM_FINAL_DOOR] = Region("Ganon's Castle Forest Trial Beamos Room Final Door", SCENE_INSIDE_GANONS_CASTLE, {}, {}, {
areaTable[RR_GANONS_CASTLE_FOREST_TRIAL_BEAMOS_ROOM_FINAL_DOOR] = Region("Ganon's Castle Forest Trial Beamos Room Final Door", SCENE_INSIDE_GANONS_CASTLE, {}, {
//Locations
LOCATION(RC_GANONS_CASTLE_SMALL_PLATFORM_FOREST_SILVER, true),
}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_FOREST_TRIAL_BEAMOS_ROOM_END, true),
ENTRANCE(RR_GANONS_CASTLE_FOREST_TRIAL_FINAL_ROOM, logic->Get(LOGIC_FOREST_TRIAL_SILVER_RUPEES)),
ENTRANCE(RR_GANONS_CASTLE_FOREST_TRIAL_BEAMOS_ROOM_MIDDLE, true),
ENTRANCE(RR_GANONS_CASTLE_FOREST_TRIAL_FINAL_ROOM, logic->HasItem(RG_GANONS_CASTLE_SILVER_FOREST)),
});
areaTable[RR_GANONS_CASTLE_FOREST_TRIAL_FINAL_ROOM] = Region("Ganon's Castle Forest Trial Final Room", SCENE_INSIDE_GANONS_CASTLE, {
@@ -110,10 +124,15 @@ void RegionTable_Init_GanonsCastle() {
areaTable[RR_GANONS_CASTLE_FIRE_TRIAL_FROM_OPEN] = Region("Ganon's Castle Fire Trial From Open Door", SCENE_INSIDE_GANONS_CASTLE, {
// backwalking hoverboots with backflip reaches silver rupee without needing str3
EVENT_ACCESS(LOGIC_FIRE_TRIAL_SILVER_RUPEES, logic->FireTimer() >= 48 && logic->CanUse(RG_GOLDEN_GAUNTLETS)),
EVENT_ACCESS(LOGIC_GANONS_CASTLE_SILVER_FIRE, logic->FireTimer() >= 48 && logic->CanUse(RG_GOLDEN_GAUNTLETS)),
}, {
//Locations
LOCATION(RC_GANONS_CASTLE_FIRE_TRIAL_HEART, logic->FireTimer() >= 16),
LOCATION(RC_GANONS_CASTLE_FIRE_TRIAL_HEART, logic->FireTimer() >= 16),
LOCATION(RC_GANONS_CASTLE_TORCH_SLUG_FIRE_SILVER, logic->FireTimer() >= 16),
LOCATION(RC_GANONS_CASTLE_FLAME_JETS_FIRE_SILVER, logic->FireTimer() >= 16),
LOCATION(RC_GANONS_CASTLE_DISTANT_PLATFORM_FIRE_SILVER, logic->FireTimer() >= 32 && logic->CanUse(RG_GOLDEN_GAUNTLETS)),
LOCATION(RC_GANONS_CASTLE_CLOSE_PLATFORM_FIRE_SILVER, logic->FireTimer() >= 8),
LOCATION(RC_GANONS_GANONS_CASTLE_UNDER_PILLAR_FIRE_SILVER, logic->FireTimer() >= 24 && logic->CanUse(RG_GOLDEN_GAUNTLETS)),
}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_FIRE_TRIAL_OPEN_DOOR, true),
@@ -122,10 +141,15 @@ void RegionTable_Init_GanonsCastle() {
areaTable[RR_GANONS_CASTLE_FIRE_TRIAL_FROM_BARRED] = Region("Ganon's Castle Fire Trial From Barred Door", SCENE_INSIDE_GANONS_CASTLE, {
// backwalking hoverboots with backflip reaches silver rupee without needing str3
EVENT_ACCESS(LOGIC_FIRE_TRIAL_SILVER_RUPEES, logic->FireTimer() >= 56 && logic->CanUse(RG_GOLDEN_GAUNTLETS)),
EVENT_ACCESS(LOGIC_GANONS_CASTLE_SILVER_FIRE, logic->CanUse(RG_LONGSHOT) && logic->FireTimer() >= 56 && logic->CanUse(RG_GOLDEN_GAUNTLETS)),
}, {
//Locations
LOCATION(RC_GANONS_CASTLE_FIRE_TRIAL_HEART, logic->FireTimer() >= 16),
LOCATION(RC_GANONS_CASTLE_FIRE_TRIAL_HEART, logic->CanUse(RG_LONGSHOT) && logic->FireTimer() >= 16),
LOCATION(RC_GANONS_CASTLE_TORCH_SLUG_FIRE_SILVER, logic->CanUse(RG_LONGSHOT) && logic->FireTimer() >= 8),
LOCATION(RC_GANONS_CASTLE_FLAME_JETS_FIRE_SILVER, logic->CanUse(RG_LONGSHOT) && logic->FireTimer() >= 16),
LOCATION(RC_GANONS_CASTLE_DISTANT_PLATFORM_FIRE_SILVER, logic->CanUse(RG_LONGSHOT) && logic->FireTimer() >= 32 && logic->CanUse(RG_GOLDEN_GAUNTLETS)),
LOCATION(RC_GANONS_CASTLE_CLOSE_PLATFORM_FIRE_SILVER, logic->CanUse(RG_LONGSHOT) && logic->FireTimer() >= 16),
LOCATION(RC_GANONS_GANONS_CASTLE_UNDER_PILLAR_FIRE_SILVER, logic->CanUse(RG_LONGSHOT) && logic->FireTimer() >= 24 && logic->CanUse(RG_GOLDEN_GAUNTLETS)),
}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_FIRE_TRIAL_OPEN_DOOR, logic->CanUse(RG_LONGSHOT) && logic->FireTimer() >= 24),
@@ -134,7 +158,7 @@ void RegionTable_Init_GanonsCastle() {
areaTable[RR_GANONS_CASTLE_FIRE_TRIAL_BARRED_DOOR] = Region("Ganon's Castle Fire Trial Barred Door", SCENE_INSIDE_GANONS_CASTLE, {}, {}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_FIRE_TRIAL_FINAL_ROOM, logic->Get(LOGIC_FIRE_TRIAL_SILVER_RUPEES)),
ENTRANCE(RR_GANONS_CASTLE_FIRE_TRIAL_FINAL_ROOM, logic->HasItem(RG_GANONS_CASTLE_SILVER_FIRE)),
});
areaTable[RR_GANONS_CASTLE_FIRE_TRIAL_FINAL_ROOM] = Region("Ganon's Castle Fire Trial Final Room", SCENE_INSIDE_GANONS_CASTLE, {
@@ -298,14 +322,21 @@ void RegionTable_Init_GanonsCastle() {
ENTRANCE(RR_GANONS_CASTLE_SHADOW_TRIAL_END, true),
});
areaTable[RR_GANONS_CASTLE_SPIRIT_TRIAL_BEAMOS_ROOM] = Region("Ganon's Castle Spirit Trial Beamos Room", SCENE_INSIDE_GANONS_CASTLE, {}, {
areaTable[RR_GANONS_CASTLE_SPIRIT_TRIAL_BEAMOS_ROOM] = Region("Ganon's Castle Spirit Trial Beamos Room", SCENE_INSIDE_GANONS_CASTLE, {
EVENT_ACCESS(LOGIC_GANONS_CASTLE_SILVER_SPIRIT, (ctx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslash() && logic->HasItem(RG_POWER_BRACELET)) || logic->CanUse(RG_HOOKSHOT)),
}, {
//Locations
LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_SUN_FAIRY, logic->CanUse(RG_SUNS_SONG)),
LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_HEART, true),
LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_SUN_FAIRY, logic->CanUse(RG_SUNS_SONG)),
LOCATION(RC_GANONS_CASTLE_SPIRIT_TRIAL_HEART, true),
LOCATION(RC_GANONS_CASTLE_AIRBORNE_SPIRIT_SILVER, (ctx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) && logic->CanJumpslash() && logic->HasItem(RG_POWER_BRACELET)) || logic->CanUse(RG_HOOKSHOT)),
LOCATION(RC_GANONS_CASTLE_NEAR_DOORMAT_SPIRIT_SILVER, true),
LOCATION(RC_GANONS_CASTLE_LOWER_MIDDLE_SPIRIT_SILVER, true),
LOCATION(RC_GANONS_CASTLE_CORNER_SPIRIT_SILVER, true),
LOCATION(RC_GANONS_CASTLE_NEAR_BARRED_DOOR_SPIRIT_SILVER, true),
}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_MAIN, true),
ENTRANCE(RR_GANONS_CASTLE_SPIRIT_TRIAL_BEFORE_SWITCH, ctx->GetTrickOption(RT_GANON_SPIRIT_TRIAL_HOOKSHOT) || logic->CanUse(RG_HOOKSHOT)),
ENTRANCE(RR_GANONS_CASTLE_SPIRIT_TRIAL_BEFORE_SWITCH, logic->HasItem(RG_GANONS_CASTLE_SILVER_SPIRIT)),
});
areaTable[RR_GANONS_CASTLE_SPIRIT_TRIAL_BEFORE_SWITCH] = Region("Ganon's Castle Spirit Trial Before Switch", SCENE_INSIDE_GANONS_CASTLE, {}, {
@@ -364,13 +395,21 @@ void RegionTable_Init_GanonsCastle() {
ENTRANCE(RR_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_ROOM, logic->SmallKeys(SCENE_INSIDE_GANONS_CASTLE, 2)),
});
areaTable[RR_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_ROOM] = Region("Ganon's Castle Light Trial Boulder Room", SCENE_INSIDE_GANONS_CASTLE, {}, {
areaTable[RR_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_ROOM] = Region("Ganon's Castle Light Trial Boulder Room", SCENE_INSIDE_GANONS_CASTLE, {
//Events
EVENT_ACCESS(LOGIC_GANONS_CASTLE_SILVER_LIGHT, logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanGroundJump())),
}, {
//Locations
LOCATION(RC_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1, logic->CanBreakPots()),
LOCATION(RC_GANONS_CASTLE_OUTER_RIGHT_LIGHT_SILVER, true),
LOCATION(RC_GANONS_CASTLE_OUTER_LEFT_LIGHT_SILVER, true),
LOCATION(RC_GANONS_CASTLE_UPPER_LIGHT_SILVER, logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanGroundJump())),
LOCATION(RC_GANONS_CASTLE_INNER_RIGHT_LIGHT_SILVER, true),
LOCATION(RC_GANONS_CASTLE_INNER_LEFT_LIGHT_SILVER, true),
}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_LIGHT_TRIAL_TRIFORCE_ROOM, logic->SmallKeys(SCENE_INSIDE_GANONS_CASTLE, 2)),
ENTRANCE(RR_GANONS_CASTLE_LIGHT_TRIAL_FINAL_ROOM, logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanGroundJump())),
ENTRANCE(RR_GANONS_CASTLE_LIGHT_TRIAL_FINAL_ROOM, logic->HasItem(RG_GANONS_CASTLE_SILVER_LIGHT)),
});
areaTable[RR_GANONS_CASTLE_LIGHT_TRIAL_FINAL_ROOM] = Region("Ganon's Castle Light Trial Final Room", SCENE_INSIDE_GANONS_CASTLE, {
@@ -494,15 +533,22 @@ void RegionTable_Init_GanonsCastle() {
ENTRANCE(RR_GANONS_CASTLE_MQ_FOREST_TRIAL_BEAMOS_ROOM_END, true),
});
areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL_OPEN_DOOR] = Region("Ganon's Castle MQ Fire Trial Open Door", SCENE_INSIDE_GANONS_CASTLE, {}, {}, {
areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL_OPEN_DOOR] = Region("Ganon's Castle MQ Fire Trial Open Door", SCENE_INSIDE_GANONS_CASTLE, {}, {}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_MQ_MAIN, true),
ENTRANCE(RR_GANONS_CASTLE_MQ_MAIN, true),
});
areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL_FROM_OPEN] = Region("Ganon's Castle MQ Fire Trial From Open Door", SCENE_INSIDE_GANONS_CASTLE, {
//Events
EVENT_ACCESS(LOGIC_FIRE_TRIAL_SILVER_RUPEES, logic->FireTimer() >= 72 && logic->CanUse(RG_GOLDEN_GAUNTLETS);),
}, {}, {
EVENT_ACCESS(LOGIC_GANONS_CASTLE_SILVER_FIRE, logic->FireTimer() >= 80 && (logic->CanUse(RG_GOLDEN_GAUNTLETS) || ctx->GetTrickOption(RT_VOIDOUT_COLLECTION));),
}, {
//Locations
LOCATION(RC_GANONS_CASTLE_MQ_UNDER_PILLAR_FIRE_SILVER, logic->FireTimer() >= 24),
LOCATION(RC_GANONS_CASTLE_MQ_NEAR_TARGET_FIRE_SILVER, logic->FireTimer() >= 32),
LOCATION(RC_GANONS_CASTLE_MQ_ON_PILLAR_FIRE_SILVER, (logic->FireTimer() >= 48 && logic->CanUse(RG_GOLDEN_GAUNTLETS)) || (logic->FireTimer() >= 32 && ctx->GetTrickOption(RT_VOIDOUT_COLLECTION))),
LOCATION(RC_GANONS_CASTLE_MQ_LAUNCH_PLATFORM_FIRE_SILVER, logic->FireTimer() >= 16),
LOCATION(RC_GANONS_CASTLE_MQ_JET_PLATFORM_FIRE_SILVER, logic->FireTimer() >= 40),
}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_MQ_FIRE_TRIAL_OPEN_DOOR, true),
ENTRANCE(RR_GANONS_CASTLE_MQ_FIRE_TRIAL_BARRED_DOOR, logic->FireTimer() >= 32 && (logic->CanUse(RG_LONGSHOT) ||
@@ -516,7 +562,7 @@ void RegionTable_Init_GanonsCastle() {
areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL_BARRED_DOOR] = Region("Ganon's Castle MQ Fire Trial Barred Door", SCENE_INSIDE_GANONS_CASTLE, {}, {}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_MQ_FIRE_TRIAL_FINAL_ROOM, logic->Get(LOGIC_FIRE_TRIAL_SILVER_RUPEES)),
ENTRANCE(RR_GANONS_CASTLE_MQ_FIRE_TRIAL_FINAL_ROOM, logic->HasItem(RG_GANONS_CASTLE_SILVER_FIRE)),
});
areaTable[RR_GANONS_CASTLE_MQ_FIRE_TRIAL_FINAL_ROOM] = Region("Ganon's Castle MQ Fire Trial Final Room", SCENE_INSIDE_GANONS_CASTLE, {
@@ -568,23 +614,37 @@ void RegionTable_Init_GanonsCastle() {
areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL_BLOCK_ROOM] = Region("Ganon's Castle MQ Water Trial Block Room", SCENE_INSIDE_GANONS_CASTLE, {
//Events
EVENT_ACCESS(LOGIC_WATER_TRIAL_MQ_SILVER_RUPEES, logic->IsAdult && (logic->HasItem(RG_POWER_BRACELET) || logic->CanMiddairGroundJump()) && logic->BlueFire()),
EVENT_ACCESS(LOGIC_GANONS_CASTLE_MQ_SILVER_WATER, logic->IsAdult && (logic->HasItem(RG_POWER_BRACELET) || logic->CanMiddairGroundJump()) && (logic->BlueFire() || (ctx->GetTrickOption(RT_VISIBLE_COLLISION) && logic->CanJumpslash()))),
EVENT_ACCESS(LOGIC_WATER_TRIAL_MQ_MELTED_FINAL_DOOR_RED_ICE, (ctx->GetOption(RSK_BLUE_FIRE_ARROWS) && logic->CanUse(RG_ICE_ARROWS)) || ((logic->IsAdult || logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_UNINTUITIVE_JUMPS)/* && logic->CanUse(RG_ROLL)*/)) && logic->HasItem(RG_POWER_BRACELET) && logic->CanUse(RG_BOTTLE_WITH_BLUE_FIRE))),
}, {
//Locations
LOCATION(RC_GANONS_CASTLE_MQ_WATER_TRIAL_SILVER_RUPEE_RED_ICE, logic->IsAdult && (logic->HasItem(RG_POWER_BRACELET) || logic->CanMiddairGroundJump()) && logic->BlueFire()),
LOCATION(RC_GANONS_CASTLE_MQ_WATER_TRIAL_SECOND_DOOR_RED_ICE_1, logic->Get(LOGIC_WATER_TRIAL_MQ_MELTED_FINAL_DOOR_RED_ICE) && logic->CanUse(RG_BOOMERANG)),
LOCATION(RC_GANONS_CASTLE_MQ_WATER_TRIAL_SECOND_DOOR_RED_ICE_2, logic->Get(LOGIC_WATER_TRIAL_MQ_MELTED_FINAL_DOOR_RED_ICE) && logic->CanUse(RG_BOOMERANG)),
LOCATION(RC_GANONS_CASTLE_MQ_WATER_TRIAL_SECOND_DOOR_RED_ICE_3, logic->Get(LOGIC_WATER_TRIAL_MQ_MELTED_FINAL_DOOR_RED_ICE) && logic->CanUse(RG_BOOMERANG)),
LOCATION(RC_GANONS_CASTLE_MQ_WATER_TRIAL_SECOND_DOOR_RED_ICE_4, logic->Get(LOGIC_WATER_TRIAL_MQ_MELTED_FINAL_DOOR_RED_ICE) && logic->CanUse(RG_BOOMERANG)),
LOCATION(RC_GANONS_CASTLE_MQ_WATER_TRIAL_SECOND_DOOR_RED_ICE_5, logic->Get(LOGIC_WATER_TRIAL_MQ_MELTED_FINAL_DOOR_RED_ICE) && logic->CanUse(RG_BOOMERANG)),
LOCATION(RC_GANONS_CASTLE_MQ_IN_HOLE_WATER_SILVER, true),
LOCATION(RC_GANONS_CASTLE_MQ_AIRBORNE_WATER_SILVER, logic->IsAdult || logic->CanUse(RG_POWER_BRACELET) || (/*CanUse(RG_ROLL) && */ctx->GetTrickOption(RT_UNINTUITIVE_JUMPS))),
LOCATION(RC_GANONS_CASTLE_MQ_OVER_PIT_WATER_SILVER, true),
LOCATION(RC_GANONS_CASTLE_MQ_NOOK_WATER_SILVER, true),
}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_MQ_WATER_TRIAL_GEYSER_ROOM, logic->SmallKeys(SCENE_INSIDE_GANONS_CASTLE, 3)),
ENTRANCE(RR_GANONS_CASTLE_MQ_WATER_TRIAL_BLOCK_ROOM_END, logic->Get(LOGIC_WATER_TRIAL_MQ_MELTED_FINAL_DOOR_RED_ICE) && (logic->IsAdult || ((logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_UNINTUITIVE_JUMPS)/* && logic->CanUse(RG_ROLL)*/)) && logic->HasItem(RG_POWER_BRACELET)) || logic->CanGroundJump() || ctx->GetTrickOption(RT_SLIDE_JUMP))),
ENTRANCE(RR_GANONS_CASTLE_MQ_WATER_TRIAL_GEYSER_ROOM, logic->SmallKeys(SCENE_INSIDE_GANONS_CASTLE, 3)),
ENTRANCE(RR_GANONS_CASTLE_MQ_WATER_TRIAL_BLOCK_ROOM_HIGH, logic->IsAdult && (logic->HasItem(RG_POWER_BRACELET) || logic->CanMiddairGroundJump())),
ENTRANCE(RR_GANONS_CASTLE_MQ_WATER_TRIAL_BLOCK_ROOM_END, logic->Get(LOGIC_WATER_TRIAL_MQ_MELTED_FINAL_DOOR_RED_ICE) && (logic->IsAdult || ((logic->CanUse(RG_HOVER_BOOTS) || (ctx->GetTrickOption(RT_UNINTUITIVE_JUMPS)/* && logic->CanUse(RG_ROLL)*/)) && logic->HasItem(RG_POWER_BRACELET)) || logic->CanGroundJump() || ctx->GetTrickOption(RT_SLIDE_JUMP))),
});
areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL_BLOCK_ROOM_HIGH] = Region("Ganon's Castle MQ Water Trial Block Room High", SCENE_INSIDE_GANONS_CASTLE, {}, {
//Locations
LOCATION(RC_GANONS_CASTLE_MQ_WATER_TRIAL_SILVER_RUPEE_RED_ICE, logic->BlueFire()),
LOCATION(RC_GANONS_CASTLE_MQ_FROZEN_WATER_SILVER, (logic->BlueFire() || (ctx->GetTrickOption(RT_VISIBLE_COLLISION) && logic->CanJumpslash()))),
}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_MQ_WATER_TRIAL_BLOCK_ROOM, true),
});
areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL_BLOCK_ROOM_END] = Region("Ganon's Castle MQ Water Trial Block Room End", SCENE_INSIDE_GANONS_CASTLE, {
//Events
EVENT_ACCESS(LOGIC_WATER_TRIAL_MQ_MELTED_FINAL_DOOR_RED_ICE, logic->BlueFire()),
}, {
//Locations
@@ -594,8 +654,9 @@ void RegionTable_Init_GanonsCastle() {
LOCATION(RC_GANONS_CASTLE_MQ_WATER_TRIAL_SECOND_DOOR_RED_ICE_4, logic->Get(LOGIC_WATER_TRIAL_MQ_MELTED_FINAL_DOOR_RED_ICE)),
LOCATION(RC_GANONS_CASTLE_MQ_WATER_TRIAL_SECOND_DOOR_RED_ICE_5, logic->Get(LOGIC_WATER_TRIAL_MQ_MELTED_FINAL_DOOR_RED_ICE)),
}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_MQ_WATER_TRIAL_BLOCK_ROOM, logic->Get(LOGIC_WATER_TRIAL_MQ_MELTED_FINAL_DOOR_RED_ICE)),
ENTRANCE(RR_GANONS_CASTLE_MQ_WATER_TRIAL_FINAL_ROOM, logic->Get(LOGIC_WATER_TRIAL_MQ_SILVER_RUPEES)),
ENTRANCE(RR_GANONS_CASTLE_MQ_WATER_TRIAL_FINAL_ROOM, logic->HasItem(RG_GANONS_CASTLE_MQ_SILVER_WATER)),
});
areaTable[RR_GANONS_CASTLE_MQ_WATER_TRIAL_FINAL_ROOM] = Region("Ganon's Castle MQ Water Trial Final Room", SCENE_INSIDE_GANONS_CASTLE, {
@@ -613,6 +674,9 @@ void RegionTable_Init_GanonsCastle() {
areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_STARTING_LEDGE] = Region("Ganon's Castle MQ Shadow Trial Starting Ledge", SCENE_INSIDE_GANONS_CASTLE, {
//Events
EVENT_ACCESS(LOGIC_SHADOW_TRIAL_FIRST_CHEST, logic->CanUse(RG_FAIRY_BOW)),
EVENT_ACCESS(LOGIC_GANONS_CASTLE_MQ_SILVER_SHADOW, (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) &&
(logic->IsAdult && ctx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL) && logic->CanUse(RG_FAIRY_BOW)) &&
(logic->Get(LOGIC_SHADOW_TRIAL_FIRST_CHEST) && logic->CanUse(RG_HOOKSHOT)) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS))),
}, {}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_MQ_MAIN, true),
@@ -634,10 +698,14 @@ void RegionTable_Init_GanonsCastle() {
areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_MOVING_PLATFORM] = Region("Ganon's Castle MQ Shadow Trial Moving Platform", SCENE_INSIDE_GANONS_CASTLE, {
//Events
//A torch run from RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_STARTING_LEDGE is possible but tight, so would be a trick
EVENT_ACCESS(LOGIC_SHADOW_TRIAL_FIRST_CHEST, logic->CanDetonateUprightBombFlower()),
EVENT_ACCESS(LOGIC_SHADOW_TRIAL_FIRST_CHEST, logic->CanDetonateUprightBombFlower()),
EVENT_ACCESS(LOGIC_GANONS_CASTLE_MQ_SILVER_SHADOW, (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) &&
(logic->HasFireSource() || logic->CanUse(RG_HOVER_BOOTS))),
}, {
//Locations
LOCATION(RC_GANONS_CASTLE_MQ_WONDER_SHADOW_TRIAL, (logic->CanDetonateBombFlowers() || (ctx->GetTrickOption(RT_BLUE_FIRE_MUD_WALLS) && logic->CanUse(RG_BOTTLE_WITH_BLUE_FIRE))) && (logic->TakeDamage() || logic->CanUse(RG_NAYRUS_LOVE))),
LOCATION(RC_GANONS_CASTLE_MQ_WONDER_SHADOW_TRIAL, (logic->CanDetonateBombFlowers() || (ctx->GetTrickOption(RT_BLUE_FIRE_MUD_WALLS) && logic->CanUse(RG_BOTTLE_WITH_BLUE_FIRE))) && (logic->TakeDamage() || logic->CanUse(RG_NAYRUS_LOVE))),
LOCATION(RC_GANONS_CASTLE_MQ_BOMB_FLOWER_SHADOW_SILVER, true),
LOCATION(RC_GANONS_CASTLE_MQ_MOVING_PLATFORM_SHADOW_SILVER, true),
}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_CHEST_PLATFORM, logic->IsAdult || logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS)),
@@ -645,29 +713,43 @@ void RegionTable_Init_GanonsCastle() {
});
areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_BEAMOS_TORCH] = Region("Ganon's Castle MQ Shadow Trial Beamos Torch", SCENE_INSIDE_GANONS_CASTLE, {}, {}, {
areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_BEAMOS_TORCH] = Region("Ganon's Castle MQ Shadow Trial Beamos Torch", SCENE_INSIDE_GANONS_CASTLE, {}, {
//Locations
LOCATION(RC_GANONS_CASTLE_MQ_NEAR_TORCH_SHADOW_SILVER, true),
}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_MOVING_PLATFORM, ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)),
//A torch run from RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_STARTING_LEDGE is possible but very tight, so would be a trick
//The bow trick assumes RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_STARTING_LEDGE access, if you can somehow void warp directly here it will need handling properly
//Hovers is possible as child but a bit tight, requires good rolls
ENTRANCE(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_FAR_SIDE, logic->HasFireSource() || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && ctx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL) && logic->CanUse(RG_FAIRY_BOW))),
ENTRANCE(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_BEAMOS_CHEST, logic->HasFireSource() || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && ctx->GetTrickOption(RT_GANON_MQ_SHADOW_TRIAL) && logic->CanUse(RG_FAIRY_BOW))),
});
areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_FAR_SIDE] = Region("Ganon's Castle MQ Shadow Trial Far Side", SCENE_INSIDE_GANONS_CASTLE, {}, {
areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_BEAMOS_CHEST] = Region("Ganon's Castle MQ Shadow Trial Beamos Chest", SCENE_INSIDE_GANONS_CASTLE, {}, {
//Locations
LOCATION(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST, logic->CanHitEyeTargets() && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_EYE_SWITCH_CHEST, logic->CanHitEyeTargets() && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_GANONS_CASTLE_MQ_BEAMOS_PLATFORM_SHADOW_SILVER, ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH) ||
logic->CanUse(RG_HOVER_BOOTS)),
}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_BEAMOS_TORCH, logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(RG_HOVER_BOOTS)),
//Modelling the silver rupees properly will require a way to check temp flags in different regions.
//It may be tempting to use a Here-like command for this but it could cause sphere skipping in playthroughs
//So a system like event access which sets based on TimeAge would be preferable, as the application of these can be tracked and accounted for, unlike Here-like commands
//For Now I am assuming the player has made it all the way from RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_STARTING_LEDGE, which logically means every rupee is available
//with no extra requirements except the lens logic needed to reach the door, which also enables the beamos-platform rupee
ENTRANCE(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_FINAL_ROOM, (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH))),
});
areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_BARRED_DOOR] = Region("Ganon's Castle MQ Shadow Trial Barred Door", SCENE_INSIDE_GANONS_CASTLE, {
//Events
EVENT_ACCESS(LOGIC_GANONS_CASTLE_MQ_SILVER_SHADOW, (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) &&
logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(RG_HOVER_BOOTS)),
}, {
//Locations
LOCATION(RC_GANONS_CASTLE_MQ_GUILLOTINE_SHADOW_SILVER, (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) ||
(ctx->GetTrickOption(RT_VOIDOUT_COLLECTION) && logic->CanUse(RG_HOVER_BOOTS))),
}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_BEAMOS_CHEST, (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH))),
ENTRANCE(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_FINAL_ROOM, logic->HasItem(RG_GANONS_CASTLE_MQ_SILVER_SHADOW)),
});
areaTable[RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_FINAL_ROOM] = Region("Ganon's Castle MQ Shadow Trial Final Room", SCENE_INSIDE_GANONS_CASTLE, {
//Events
EVENT_ACCESS(LOGIC_SHADOW_TRIAL_CLEAR, logic->CanUse(RG_LIGHT_ARROWS)),
@@ -677,7 +759,7 @@ void RegionTable_Init_GanonsCastle() {
LOCATION(RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_2, logic->CanBreakPots()),
}, {
//Exits
ENTRANCE(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_FAR_SIDE, (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH))),
ENTRANCE(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_BARRED_DOOR, (ctx->GetTrickOption(RT_LENS_GANON_MQ) || logic->CanUse(RG_LENS_OF_TRUTH))),
});
areaTable[RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_CHAIRS_ROOM] = Region("Ganon's Castle MQ Spirit Trial Chairs Room", SCENE_INSIDE_GANONS_CASTLE, {}, {}, {
soh/soh/Enhancements/randomizer/location_access/dungeons/gerudo_training_ground.cpp
+88 -32
View File
@@ -38,9 +38,20 @@ void RegionTable_Init_GerudoTrainingGround() {
ENTRANCE(RR_GERUDO_TRAINING_GROUND_BOULDER_ROOM, AnyAgeTime([]{return logic->CanKillEnemy(RE_STALFOS, ED_CLOSE, true, 2, true);})),
});
areaTable[RR_GERUDO_TRAINING_GROUND_BOULDER_ROOM] = Region("Gerudo Training Ground Boulder Room", SCENE_GERUDO_TRAINING_GROUND, {}, {}, {
areaTable[RR_GERUDO_TRAINING_GROUND_BOULDER_ROOM] = Region("Gerudo Training Ground Boulder Room", SCENE_GERUDO_TRAINING_GROUND, {
//Events
EVENT_ACCESS(LOGIC_GTG_SILVER_SLOPE, logic->CanUse(logic->IsAdult ? RG_HOOKSHOT : RG_LONGSHOT) || ctx->GetTrickOption(RT_GTG_WITHOUT_HOOKSHOT)),
}, {
//Locations
LOCATION(RC_GTG_FIRE_WALL_SLOPE_SILVER, true),
LOCATION(RC_GTG_LOWER_BOULDER_SLOPE_SILVER, true),
LOCATION(RC_GTG_TARGET_SLOPE_SILVER, logic->CanUse(logic->IsAdult ? RG_HOOKSHOT : RG_LONGSHOT) || ctx->GetTrickOption(RT_GTG_WITHOUT_HOOKSHOT)),
LOCATION(RC_GTG_JUMPDOWN_SLOPE_SILVER, true),
LOCATION(RC_GTG_UPPER_BOULDER_SLOPE_SILVER, true),
}, {
//Exits
ENTRANCE(RR_GERUDO_TRAINING_GROUND_SAND_ROOM, true),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_ROOM, AnyAgeTime([]{return logic->CanUse(logic->IsAdult ? RG_HOOKSHOT : RG_LONGSHOT) || ctx->GetTrickOption(RT_GTG_WITHOUT_HOOKSHOT);})),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_HEAVY_BLOCK_ROOM, logic->HasItem(RG_GTG_SILVER_SLOPE)),
});
areaTable[RR_GERUDO_TRAINING_GROUND_CENTRAL_MAZE] = Region("Gerudo Training Ground Central Maze", SCENE_GERUDO_TRAINING_GROUND, {}, {
@@ -61,6 +72,7 @@ void RegionTable_Init_GerudoTrainingGround() {
LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_CENTRAL_CHEST, logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_GERUDO_TRAINING_GROUND_MAZE_RIGHT_SIDE_CHEST, logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_GERUDO_TRAINING_GROUND_FREESTANDING_KEY, true),
LOCATION(RC_GTG_UNDER_LEDGE_LAVA_SILVER, true),
}, {
//Exits
ENTRANCE(RR_GERUDO_TRAINING_GROUND_LAVA_ROOM, true),
@@ -148,24 +160,43 @@ void RegionTable_Init_GerudoTrainingGround() {
});
areaTable[RR_GERUDO_TRAINING_GROUND_LAVA_ROOM] = Region("Gerudo Training Ground Lava Room", SCENE_GERUDO_TRAINING_GROUND, {
EVENT_ACCESS(LOGIC_GTG_PLATFORM_SILVER_RUPEES, logic->CanUse(RG_HOOKSHOT) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild)),
}, {}, {
EVENT_ACCESS(LOGIC_GTG_SILVER_LAVA, logic->CanUse(RG_HOOKSHOT) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild)),
}, {
//Locations
LOCATION(RC_GTG_NEAR_SWITCH_LAVA_SILVER, true),
LOCATION(RC_GTG_NEAR_BARRED_DOOR_LAVA_SILVER, true),
LOCATION(RC_GTG_FIRE_RING_LAVA_SILVER, logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild),
LOCATION(RC_GTG_UNDER_LEDGE_LAVA_SILVER, logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild),
}, {
//Exits
ENTRANCE(RR_GERUDO_TRAINING_GROUND_DINALFOS, true),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_CENTRAL_MAZE_RIGHT, logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_LAVA_ROOM_UPPER_LEDGE, logic->CanUse(RG_LONGSHOT) || (logic->CanUse(RG_HOOKSHOT) && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild || (logic->IsAdult && ctx->GetTrickOption(RT_GTG_LAVA_JUMP)) || (ctx->GetTrickOption(RT_DAMAGE_BOOST_SIMPLE) && logic->CanUse(RG_BOMB_BAG) && logic->TakeDamage())))),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_UNDERWATER, logic->Get(LOGIC_GTG_PLATFORM_SILVER_RUPEES)),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_UNDERWATER, logic->HasItem(RG_GTG_SILVER_LAVA)),
});
areaTable[RR_GERUDO_TRAINING_GROUND_LAVA_ROOM_UPPER_LEDGE] = Region("Gerudo Training Ground Lava Room", SCENE_GERUDO_TRAINING_GROUND, {}, {}, {
areaTable[RR_GERUDO_TRAINING_GROUND_LAVA_ROOM_UPPER_LEDGE] = Region("Gerudo Training Ground Lava Room", SCENE_GERUDO_TRAINING_GROUND, {}, {
//Locations
LOCATION(RC_GTG_UPPER_LAVA_SILVER, logic->CanUse(RG_HOOKSHOT)),
LOCATION(RC_GTG_UNDER_LEDGE_LAVA_SILVER, true),
}, {
//Exits
ENTRANCE(RR_GERUDO_TRAINING_GROUND_LAVA_ROOM, logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_SONG_OF_TIME) || logic->IsChild || (logic->IsAdult && ctx->GetTrickOption(RT_GTG_LAVA_JUMP)) || (ctx->GetTrickOption(RT_DAMAGE_BOOST_SIMPLE) && logic->CanUse(RG_BOMB_BAG) && logic->TakeDamage())),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_HAMMER_ROOM, true),
});
areaTable[RR_GERUDO_TRAINING_GROUND_UNDERWATER] = Region("Gerudo Training Ground Underwater", SCENE_GERUDO_TRAINING_GROUND, {}, {
areaTable[RR_GERUDO_TRAINING_GROUND_UNDERWATER] = Region("Gerudo Training Ground Underwater", SCENE_GERUDO_TRAINING_GROUND, {
//Events
EVENT_ACCESS(LOGIC_GTG_SILVER_WATER, logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_IRON_BOOTS) && logic->HasItem(RG_BRONZE_SCALE) && logic->WaterTimer() >= 24),
}, {
//Locations
LOCATION(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_IRON_BOOTS) && logic->HasItem(RG_BRONZE_SCALE) && logic->WaterTimer() >= 24 && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_GERUDO_TRAINING_GROUND_UNDERWATER_SILVER_RUPEE_CHEST, logic->HasItem(RG_GTG_SILVER_WATER) && logic->HasItem(RG_OPEN_CHEST)),
// 3 & 5 can be retrieved with only iron boots by attempting to backflip underwater
LOCATION(RC_GTG_MIDDLE_WATER_SILVER, logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16),
LOCATION(RC_GTG_ABOVE_TARGET_WATER_SILVER, logic->CanUse(RG_SONG_OF_TIME) && ((logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16) || logic->HasItem(RG_GOLDEN_SCALE))),
LOCATION(RC_GTG_LEFT_WATER_SILVER, logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16),
LOCATION(RC_GTG_UNDER_TARGET_WATER_SILVER, logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_IRON_BOOTS) && (logic->HasItem(RG_BRONZE_SCALE) || logic->CanUse(RG_HOOKSHOT)) && logic->WaterTimer() >= 16),
LOCATION(RC_GTG_RIGHT_WATER_SILVER, logic->CanUse(RG_SONG_OF_TIME) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 16),
}, {
//Exits
ENTRANCE(RR_GERUDO_TRAINING_GROUND_LAVA_ROOM, true),
@@ -245,7 +276,10 @@ void RegionTable_Init_GerudoTrainingGround() {
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_BOULDER_ROOM, AnyAgeTime([]{return logic->CanKillEnemy(RE_IRON_KNUCKLE);})),
});
areaTable[RR_GERUDO_TRAINING_GROUND_MQ_BOULDER_ROOM] = Region("Gerudo Training Ground MQ Left Side", SCENE_GERUDO_TRAINING_GROUND, {}, {
areaTable[RR_GERUDO_TRAINING_GROUND_MQ_BOULDER_ROOM] = Region("Gerudo Training Ground MQ Left Side", SCENE_GERUDO_TRAINING_GROUND, {
//Events
EVENT_ACCESS(LOGIC_GTG_SILVER_SLOPE, logic->CanUse(RG_LONGSHOT) || ctx->GetTrickOption(RT_GTG_MQ_WITHOUT_HOOKSHOT) || (ctx->GetTrickOption(RT_GTG_MQ_WITH_HOOKSHOT) && logic->IsAdult && logic->CanJumpslash() && logic->CanUse(RG_HOOKSHOT))),
}, {
//Locations
LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_BOULDER_ROOM_STALAGMITE_1, logic->CanClearStalagmite()),
LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_BOULDER_ROOM_STALAGMITE_2, logic->CanClearStalagmite()),
@@ -260,10 +294,15 @@ void RegionTable_Init_GerudoTrainingGround() {
LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_BOULDER_ROOM_TOP_RIGHT_STALACTITE_1, true),
LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_BOULDER_ROOM_TOP_RIGHT_STALACTITE_2, true),
LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_BOULDER_ROOM_TOP_RIGHT_STALACTITE_3, true),
}, {
LOCATION(RC_GTG_MQ_ICICLES_SLOPE_SILVER, true),
LOCATION(RC_GTG_MQ_JUMPDOWN_SLOPE_SILVER, true),
LOCATION(RC_GTG_MQ_HIGH_SLOPE_SILVER, logic->CanUse(RG_LONGSHOT) || ctx->GetTrickOption(RT_GTG_MQ_WITHOUT_HOOKSHOT) || (ctx->GetTrickOption(RT_GTG_MQ_WITH_HOOKSHOT) && logic->IsAdult && logic->CanJumpslash() && logic->CanUse(RG_HOOKSHOT))),
LOCATION(RC_GTG_MQ_FREEZARD_SLOPE_SILVER, true),
LOCATION(RC_GTG_MQ_PIT_SLOPE_SILVER, true),
}, {
//Exits
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_SAND_ROOM, true),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_STALFOS_ROOM, AnyAgeTime([]{return logic->CanUse(RG_LONGSHOT) || ctx->GetTrickOption(RT_GTG_MQ_WITHOUT_HOOKSHOT) || (ctx->GetTrickOption(RT_GTG_MQ_WITH_HOOKSHOT) && logic->IsAdult && logic->CanJumpslash() && logic->CanUse(RG_HOOKSHOT));})),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_STALFOS_ROOM, logic->HasItem(RG_GTG_SILVER_SLOPE)),
});
areaTable[RR_GERUDO_TRAINING_GROUND_MQ_STALFOS_ROOM] = Region("Gerudo Training Ground MQ Stalfos Room", SCENE_GERUDO_TRAINING_GROUND, {
@@ -344,30 +383,31 @@ void RegionTable_Init_GerudoTrainingGround() {
areaTable[RR_GERUDO_TRAINING_GROUND_MQ_SWITCH_LEDGE] = Region("Gerudo Training Ground MQ Switch Ledge", SCENE_GERUDO_TRAINING_GROUND, {
//Events
EVENT_ACCESS(LOGIC_GTG_MQ_RIGHT_SIDE_SWITCH, logic->CanUse(RG_MEGATON_HAMMER)),
EVENT_ACCESS(LOGIC_GTG_PLATFORM_SILVER_RUPEES, logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_HOVER_BOOTS)),
EVENT_ACCESS(LOGIC_GTG_MQ_RIGHT_SIDE_SWITCH, logic->CanUse(RG_MEGATON_HAMMER)),
EVENT_ACCESS(LOGIC_GTG_SILVER_LAVA, logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_HOVER_BOOTS)),
}, {}, {
//Exits
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_LEDGE_SIDE_PLATFORMS, logic->CanUse(RG_FIRE_ARROWS)),
//the fire bubble here is a jerk if you are aiming for the nearest hook platform, you have to aim to the right hand side with hook to dodge it
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_PLATFORMS_UNLIT_TORCH, logic->CanUse(RG_LONGSHOT) || (logic->Get(LOGIC_GTG_PLATFORM_SILVER_RUPEES) && logic->CanUse(RG_HOOKSHOT)) || ((logic->CanUse(RG_FIRE_ARROWS) && logic->Get(LOGIC_GTG_PLATFORM_SILVER_RUPEES)) && logic->CanUse(RG_HOVER_BOOTS))),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_PLATFORMS_UNLIT_TORCH, logic->CanUse(RG_LONGSHOT) || (logic->HasItem(RG_GTG_SILVER_LAVA) && logic->CanUse(RG_HOOKSHOT)) || (logic->CanUse(RG_FIRE_ARROWS) && logic->HasItem(RG_GTG_SILVER_LAVA) && logic->CanUse(RG_HOVER_BOOTS))),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT, logic->Get(LOGIC_GTG_MQ_RIGHT_SIDE_SWITCH) && logic->CanUse(RG_LONGSHOT)),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_TORCH_SLUG_ROOM, true),
});
//this region exists to place silver rupee items on later, normally it's all on fire and cannot be stood on without access from another area
//This covers the 2 platforms that can be jumped to directly from RR_GERUDO_TRAINING_GROUND_MQ_SWITCH_LEDGE
//the unshuffled rupee collection is handled by the event GTGPlatformSilverRupees
areaTable[RR_GERUDO_TRAINING_GROUND_MQ_LEDGE_SIDE_PLATFORMS] = Region("Gerudo Training Ground MQ Ledge Side Platforms", SCENE_GERUDO_TRAINING_GROUND, {}, {}, {
//This covers the 2 platforms that can be jumped to directly from RR_GERUDO_TRAINING_GROUND_MQ_SWITCH_LEDGE, without flame circles
areaTable[RR_GERUDO_TRAINING_GROUND_MQ_LEDGE_SIDE_PLATFORMS] = Region("Gerudo Training Ground MQ Ledge Side Platforms", SCENE_GERUDO_TRAINING_GROUND, {}, {
LOCATION(RC_GTG_MQ_NEAR_SWITCH_LAVA_SILVER, true),
LOCATION(RC_GTG_MQ_MIDDLE_LAVA_SILVER, true),
}, {
//Exits
//This is merely to extend this region's logic if you have hovers
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_FURTHEST_PLATFORM, logic->CanUse(RG_HOVER_BOOTS)),
});
//this region exists to place silver rupee items on later, normally it's all on fire and cannot be stood on without access from another area
//This covers the platform that needs hover boots or the spawned targets to reach from any starting point other than RR_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT
//the unshuffled rupee collection is handled by the event GTGPlatformSilverRupees
areaTable[RR_GERUDO_TRAINING_GROUND_MQ_FURTHEST_PLATFORM] = Region("Gerudo Training Ground MQ Furthest Platform", SCENE_GERUDO_TRAINING_GROUND, {}, {}, {
//This covers the platform that needs hover boots or the spawned targets to reach from any starting point other than RR_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT, without flame circles
areaTable[RR_GERUDO_TRAINING_GROUND_MQ_FURTHEST_PLATFORM] = Region("Gerudo Training Ground MQ Furthest Platform", SCENE_GERUDO_TRAINING_GROUND, {}, {
LOCATION(RC_GTG_MQ_FAR_LAVA_SILVER, true),
}, {
//Exits
//This is merely to extend this region's logic if you have hovers
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_LEDGE_SIDE_PLATFORMS, logic->CanUse(RG_HOVER_BOOTS)),
@@ -375,10 +415,14 @@ void RegionTable_Init_GerudoTrainingGround() {
areaTable[RR_GERUDO_TRAINING_GROUND_MQ_PLATFORMS_UNLIT_TORCH] = Region("Gerudo Training Ground MQ Platforms Unlit Torch", SCENE_GERUDO_TRAINING_GROUND, {
//Events
EVENT_ACCESS(LOGIC_GTG_PLATFORM_SILVER_RUPEES, logic->HasFireSource() && logic->CanUse(RG_HOVER_BOOTS)),
}, {}, {
EVENT_ACCESS(LOGIC_GTG_SILVER_LAVA, logic->HasFireSource() && logic->CanUse(RG_HOVER_BOOTS)),
}, {
LOCATION(RC_GTG_MQ_NEAR_BARRED_DOOR_LAVA_SILVER, logic->HasFireSource()),
LOCATION(RC_GTG_MQ_NEAR_MAZE_LEDGE_LAVA_SILVER, logic->HasFireSource()),
LOCATION(RC_GTG_MQ_NEAR_LIT_TORCH_LAVA_SILVER, logic->HasFireSource()),
}, {
//Exits
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_UNDERWATER, logic->Get(LOGIC_GTG_PLATFORM_SILVER_RUPEES)),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_UNDERWATER, logic->HasItem(RG_GTG_SILVER_LAVA)),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_LEDGE_SIDE_PLATFORMS, logic->HasFireSource() && logic->CanUse(RG_HOVER_BOOTS)),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_TORCH_SIDE_PLATFORMS, logic->HasFireSource() || logic->CanUse(RG_LONGSHOT) || (ctx->GetTrickOption(RT_HOVER_BOOST_SIMPLE) && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_MEGATON_HAMMER))),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT, logic->Get(LOGIC_GTG_MQ_RIGHT_SIDE_SWITCH) && (logic->CanUse(RG_LONGSHOT) || (logic->CanUse(RG_HOOKSHOT) && logic->HasFireSource()))),
@@ -387,8 +431,13 @@ void RegionTable_Init_GerudoTrainingGround() {
areaTable[RR_GERUDO_TRAINING_GROUND_MQ_TORCH_SIDE_PLATFORMS] = Region("Gerudo Training Ground MQ Torch Side Platforms", SCENE_GERUDO_TRAINING_GROUND, {
//Events
//this torch shot is possible as child but tight and obtuse enough to be a trick
EVENT_ACCESS(LOGIC_GTG_PLATFORM_SILVER_RUPEES, ((logic->CanUse(RG_FAIRY_BOW) && logic->IsAdult) || logic->CanUse(RG_FIRE_ARROWS)) && logic->CanUse(RG_HOVER_BOOTS)),
}, {}, {
EVENT_ACCESS(LOGIC_GTG_SILVER_LAVA, ((logic->CanUse(RG_FAIRY_BOW) && logic->IsAdult) || logic->CanUse(RG_FIRE_ARROWS)) && logic->CanUse(RG_HOVER_BOOTS)),
}, {
//Locations
LOCATION(RC_GTG_MQ_NEAR_BARRED_DOOR_LAVA_SILVER, (logic->CanUse(RG_FAIRY_BOW) && logic->IsAdult) || logic->CanUse(RG_FIRE_ARROWS)),
LOCATION(RC_GTG_MQ_NEAR_MAZE_LEDGE_LAVA_SILVER, (logic->CanUse(RG_FAIRY_BOW) && logic->IsAdult) || logic->CanUse(RG_FIRE_ARROWS)),
LOCATION(RC_GTG_MQ_NEAR_LIT_TORCH_LAVA_SILVER, (logic->CanUse(RG_FAIRY_BOW) && logic->IsAdult) || logic->CanUse(RG_FIRE_ARROWS)),
}, {
//Exits
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_LEDGE_SIDE_PLATFORMS, ((logic->CanUse(RG_FAIRY_BOW) && logic->IsAdult) || logic->CanUse(RG_FIRE_ARROWS)) && (logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && ctx->GetTrickOption(RT_GTG_LAVA_JUMP)) || (ctx->GetTrickOption(RT_DAMAGE_BOOST_SIMPLE) && logic->CanUse(RG_BOMB_BAG) && logic->TakeDamage()))),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_PLATFORMS_UNLIT_TORCH, (logic->CanUse(RG_FAIRY_BOW) && logic->IsAdult) || logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(RG_LONGSHOT) || (ctx->GetTrickOption(RT_HOVER_BOOST_SIMPLE) && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_MEGATON_HAMMER))),
@@ -396,28 +445,35 @@ void RegionTable_Init_GerudoTrainingGround() {
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_DINOLFOS_ROOM, true),
});
areaTable[RR_GERUDO_TRAINING_GROUND_MQ_UNDERWATER] = Region("Gerudo Training Ground MQ Underwater", SCENE_GERUDO_TRAINING_GROUND, {}, {
areaTable[RR_GERUDO_TRAINING_GROUND_MQ_UNDERWATER] = Region("Gerudo Training Ground MQ Underwater", SCENE_GERUDO_TRAINING_GROUND, {
EVENT_ACCESS(LOGIC_GTG_SILVER_WATER, logic->HasFireSource() && logic->HasItem(RG_BRONZE_SCALE) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 24 && logic->TakeDamage()),
}, {
//Locations
//it is possible to snipe the stingers with bow or sling before dropping in, or just get really lucky, and avoid needing to take damage, but that might be trick worthy
LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, (logic->HasFireSource() && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 24 && logic->HasItem(RG_BRONZE_SCALE) && logic->TakeDamage()) && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_UNDERWATER_SILVER_RUPEE_CHEST, logic->HasItem(RG_GTG_SILVER_WATER) && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_GTG_MQ_BACK_WATER_SILVER, logic->HasFireSource() && logic->HasItem(RG_BRONZE_SCALE) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 24 && logic->TakeDamage()),
LOCATION(RC_GTG_MQ_MIDDLE_WATER_SILVER, logic->HasFireSource() && logic->HasItem(RG_BRONZE_SCALE) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 24 && logic->TakeDamage()),
LOCATION(RC_GTG_MQ_FRONT_WATER_SILVER, logic->HasFireSource() && logic->HasItem(RG_BRONZE_SCALE) && logic->CanUse(RG_IRON_BOOTS) && logic->WaterTimer() >= 24 && logic->TakeDamage()),
}, {
//Exits
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_PLATFORMS_UNLIT_TORCH, true),
});
areaTable[RR_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT] = Region("Gerudo Training Ground MQ Maze Right", SCENE_GERUDO_TRAINING_GROUND, {
//Events
EVENT_ACCESS(LOGIC_GTG_PLATFORM_SILVER_RUPEES, logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_HOVER_BOOTS)),
EVENT_ACCESS(LOGIC_GTG_SILVER_LAVA, logic->CanUse(RG_FIRE_ARROWS) && logic->CanUse(RG_HOVER_BOOTS)),
}, {
//Locations
LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_CENTRAL_CHEST, logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_MAZE_RIGHT_SIDE_CHEST, logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_GTG_MQ_NEAR_BARRED_DOOR_LAVA_SILVER, logic->CanUse(RG_FIRE_ARROWS)),
LOCATION(RC_GTG_MQ_NEAR_MAZE_LEDGE_LAVA_SILVER, logic->CanUse(RG_FIRE_ARROWS)),
LOCATION(RC_GTG_MQ_NEAR_LIT_TORCH_LAVA_SILVER, logic->CanUse(RG_FIRE_ARROWS)),
}, {
//Exits
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_LOBBY, true),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_TORCH_SIDE_PLATFORMS, logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(RG_LONGSHOT) || (ctx->GetTrickOption(RT_HOVER_BOOST_SIMPLE) && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_MEGATON_HAMMER))),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_PLATFORMS_UNLIT_TORCH, logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(logic->Get(LOGIC_GTG_PLATFORM_SILVER_RUPEES) ? RG_HOOKSHOT : RG_LONGSHOT) || (ctx->GetTrickOption(RT_HOVER_BOOST_SIMPLE) && logic->Get(LOGIC_GTG_MQ_RIGHT_SIDE_SWITCH) && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_MEGATON_HAMMER))),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_PLATFORMS_UNLIT_TORCH, logic->CanUse(RG_FIRE_ARROWS) || logic->CanUse(logic->HasItem(RG_GTG_SILVER_LAVA) ? RG_HOOKSHOT : RG_LONGSHOT) || (ctx->GetTrickOption(RT_HOVER_BOOST_SIMPLE) && logic->Get(LOGIC_GTG_MQ_RIGHT_SIDE_SWITCH) && logic->CanUse(RG_HOVER_BOOTS) && logic->CanUse(RG_MEGATON_HAMMER))),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_LEDGE_SIDE_PLATFORMS, logic->CanUse(RG_FIRE_ARROWS)),
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_FURTHEST_PLATFORM, logic->CanUse(RG_FIRE_ARROWS)),
});
soh/soh/Enhancements/randomizer/location_access/dungeons/ice_cavern.cpp
+26 -10
View File
@@ -1,6 +1,7 @@
#include "soh/Enhancements/randomizer/location_access.h"
#include "soh/Enhancements/randomizer/entrance.h"
#include "soh/Enhancements/randomizer/dungeon.h"
#include "soh/Enhancements/randomizer/randomizerEnums.h"
using namespace Rando;
@@ -39,7 +40,10 @@ void RegionTable_Init_IceCavern() {
ENTRANCE(RR_ICE_CAVERN_ABOVE_BEGINNING, false),
});
areaTable[RR_ICE_CAVERN_HUB] = Region("Ice Cavern Hub", SCENE_ICE_CAVERN, {}, {
areaTable[RR_ICE_CAVERN_HUB] = Region("Ice Cavern Hub", SCENE_ICE_CAVERN, {
//Events
EVENT_ACCESS(LOGIC_ICE_CAVERN_SILVER_BLADES, (logic->IsAdult /*|| (ctx->GetTrickOption(RT_GROUND_JUMP_HARD) && logic->CanGroundJump())*/) && logic->CanClearStalagmite()),
}, {
//Locations
LOCATION(RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM, logic->HookshotOrBoomerang()),
LOCATION(RC_ICE_CAVERN_HALL_POT_1, logic->CanBreakPots()),
@@ -57,11 +61,16 @@ void RegionTable_Init_IceCavern() {
LOCATION(RC_ICE_CAVERN_SPINNING_BLADE_RIGHT_STALAGMITE, logic->CanClearStalagmite()),
LOCATION(RC_ICE_CAVERN_SPINNING_BLADE_EAST_RED_ICE, logic->BlueFire()),
LOCATION(RC_ICE_CAVERN_SPINNING_BLADE_WEST_RED_ICE, logic->BlueFire()),
LOCATION(RC_ICE_CAVERN_ICICLES_BLADE_SILVER, logic->CanClearStalagmite()),
LOCATION(RC_ICE_CAVERN_W_INNER_BLADE_SILVER, true),
LOCATION(RC_ICE_CAVERN_OUTER_BLADE_SILVER, true),
LOCATION(RC_ICE_CAVERN_E_INNER_BLADE_SILVER, true),
LOCATION(RC_ICE_CAVERN_AIRBORNE_BLADE_SILVER, logic->IsAdult /*|| (ctx->GetTrickOption(RT_GROUND_JUMP_HARD) && logic->CanGroundJump())*/),
}, {
//Exits
ENTRANCE(RR_ICE_CAVERN_BEGINNING, true),
//child can make this with a ground jump for the first step, and a glitchless jump for the second, but it's a separate trick
ENTRANCE(RR_ICE_CAVERN_MAP_ROOM, (logic->IsAdult /*|| logic->CanGroundJump()*/) && logic->CanClearStalagmite()),
ENTRANCE(RR_ICE_CAVERN_MAP_ROOM, (logic->IsAdult /*|| logic->CanGroundJump()*/) && logic->HasItem(RG_ICE_CAVERN_SILVER_BLADES)),
ENTRANCE(RR_ICE_CAVERN_COMPASS_ROOM, AnyAgeTime([]{return logic->BlueFire();})),
ENTRANCE(RR_ICE_CAVERN_BLOCK_ROOM, AnyAgeTime([]{return logic->BlueFire();}) && (logic->CanClearStalagmite() || ctx->GetTrickOption(RT_ICE_STALAGMITE_CLIP))),
});
@@ -144,22 +153,29 @@ void RegionTable_Init_IceCavern() {
LOCATION(RC_ICE_CAVERN_PUSH_BLOCK_HALL_STALACTITE_1, true),
LOCATION(RC_ICE_CAVERN_PUSH_BLOCK_HALL_STALACTITE_2, true),
LOCATION(RC_ICE_CAVERN_PUSH_BLOCK_HALL_STALACTITE_3, true),
LOCATION(RC_ICE_CAVERN_SILVER_RUPEE_RED_ICE, (logic->HasItem(RG_POWER_BRACELET) || (logic->IsAdult && (logic->CanGroundJump() || ctx->GetTrickOption(RT_SLIDE_JUMP)))) && logic->BlueFire()),
LOCATION(RC_ICE_CAVERN_LOWER_BLOCK_SILVER, true),
LOCATION(RC_ICE_CAVERN_NEAR_BLOCK_SILVER, logic->IsAdult || logic->HasItem(RG_POWER_BRACELET) || logic->CanUse(RG_HOVER_BOOTS)),
LOCATION(RC_ICE_CAVERN_NEAR_GS_BLOCK_SILVER, logic->IsAdult || logic->HasItem(RG_POWER_BRACELET) || logic->CanUse(RG_HOVER_BOOTS)),
}, {
//Exits
ENTRANCE(RR_ICE_CAVERN_HUB, logic->CanClearStalagmite() || ctx->GetTrickOption(RT_ICE_STALAGMITE_CLIP)),
ENTRANCE(RR_ICE_CAVERN_BLOCK_ROOM_BLUE_FIRE, logic->HasItem(RG_POWER_BRACELET) || (logic->IsAdult && (logic->CanGroundJump() || ctx->GetTrickOption(RT_SLIDE_JUMP)))),
ENTRANCE(RR_ICE_CAVERN_AFTER_BLOCK_ROOM, (logic->HasItem(RG_POWER_BRACELET) || (logic->IsAdult && (logic->CanGroundJump() || ctx->GetTrickOption(RT_SLIDE_JUMP)))) && AnyAgeTime([]{return logic->BlueFire();})),
ENTRANCE(RR_ICE_CAVERN_HUB, logic->CanClearStalagmite() || ctx->GetTrickOption(RT_ICE_STALAGMITE_CLIP)),
ENTRANCE(RR_ICE_CAVERN_BLOCK_ROOM_NOOKS, logic->HasItem(RG_POWER_BRACELET) || (logic->IsAdult && (logic->CanGroundJump() || ctx->GetTrickOption(RT_SLIDE_JUMP)))),
ENTRANCE(RR_ICE_CAVERN_AFTER_BLOCK_ROOM, (logic->HasItem(RG_POWER_BRACELET) || (logic->IsAdult && (logic->CanGroundJump() || ctx->GetTrickOption(RT_SLIDE_JUMP)))) && logic->HasItem(RG_ICE_CAVERN_SILVER_BLOCK)),
});
areaTable[RR_ICE_CAVERN_BLOCK_ROOM_BLUE_FIRE] = Region("Ice Cavern Block Room Blue Fire", SCENE_ICE_CAVERN, {
areaTable[RR_ICE_CAVERN_BLOCK_ROOM_NOOKS] = Region("Ice Cavern Block Room Nooks", SCENE_ICE_CAVERN, {
//Events
EVENT_ACCESS(LOGIC_BLUE_FIRE_ACCESS, true),
EVENT_ACCESS(LOGIC_ICE_CAVERN_SILVER_BLOCK, (logic->IsAdult || logic->HasItem(RG_POWER_BRACELET) || logic->CanUse(RG_HOVER_BOOTS)) &&
(logic->BlueFire() || (ctx->GetTrickOption(RT_VISIBLE_COLLISION) && logic->CanJumpslash()))),
}, {
//Locations
LOCATION(RC_ICE_CAVERN_SLIDING_BLOCK_RUPEE_1, logic->CanUse(RG_SONG_OF_TIME)),
LOCATION(RC_ICE_CAVERN_SLIDING_BLOCK_RUPEE_2, logic->CanUse(RG_SONG_OF_TIME)),
LOCATION(RC_ICE_CAVERN_SLIDING_BLOCK_RUPEE_3, logic->CanUse(RG_SONG_OF_TIME)),
LOCATION(RC_ICE_CAVERN_SLIDING_BLOCK_RUPEE_1, logic->CanUse(RG_SONG_OF_TIME)),
LOCATION(RC_ICE_CAVERN_SLIDING_BLOCK_RUPEE_2, logic->CanUse(RG_SONG_OF_TIME)),
LOCATION(RC_ICE_CAVERN_SLIDING_BLOCK_RUPEE_3, logic->CanUse(RG_SONG_OF_TIME)),
LOCATION(RC_ICE_CAVERN_SILVER_RUPEE_RED_ICE, logic->BlueFire()),
LOCATION(RC_ICE_CAVERN_NEAR_FIRE_BLOCK_SILVER, true),
LOCATION(RC_ICE_CAVERN_FROZEN_BLOCK_SILVER, logic->BlueFire() || (ctx->GetTrickOption(RT_VISIBLE_COLLISION) && logic->CanJumpslash())),
}, {
//Exits
ENTRANCE(RR_ICE_CAVERN_BLOCK_ROOM, true),
soh/soh/Enhancements/randomizer/location_access/dungeons/shadow_temple.cpp
+220 -51
View File
@@ -1,6 +1,7 @@
#include "soh/Enhancements/randomizer/location_access.h"
#include "soh/Enhancements/randomizer/entrance.h"
#include "soh/Enhancements/randomizer/dungeon.h"
#include "soh/Enhancements/randomizer/randomizerEnums.h"
using namespace Rando;
@@ -103,9 +104,17 @@ void RegionTable_Init_ShadowTemple() {
ENTRANCE(RR_SHADOW_TEMPLE_FIRST_BEAMOS, AnyAgeTime([]{return logic->CanKillEnemy(RE_GIBDO);})),
});
areaTable[RR_SHADOW_TEMPLE_SPINNING_BLADES] = Region("Shadow Temple Spinning Blades", SCENE_SHADOW_TEMPLE, {}, {
areaTable[RR_SHADOW_TEMPLE_SPINNING_BLADES] = Region("Shadow Temple Spinning Blades", SCENE_SHADOW_TEMPLE, {
//Events
EVENT_ACCESS(LOGIC_SHADOW_SILVER_BLADES, (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanGroundJump())) || logic->CanUse(RG_HOOKSHOT)),
}, {
//Locations
LOCATION(RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST, ((logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanGroundJump())) || logic->CanUse(RG_HOOKSHOT)) && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_SHADOW_TEMPLE_EARLY_SILVER_RUPEE_CHEST, logic->HasItem(RG_SHADOW_SILVER_BLADES) && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_SHADOW_N_UNDER_BLADE_SILVER, true),
LOCATION(RC_SHADOW_TALL_BLOCK_BLADE_SILVER, (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanGroundJump())) || logic->CanUse(RG_HOOKSHOT)),
LOCATION(RC_SHADOW_N_NOOK_BLADE_SILVER, true),
LOCATION(RC_SHADOW_W_NOOK_BLADE_SILVER, true),
LOCATION(RC_SHADOW_S_UNDER_BLADE_SILVER, true),
}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_FIRST_BEAMOS, true),
@@ -141,11 +150,21 @@ void RegionTable_Init_ShadowTemple() {
ENTRANCE(RR_SHADOW_TEMPLE_INVISIBLE_SPINNING_BLADES, logic->SmallKeys(SCENE_SHADOW_TEMPLE, 2)),
});
areaTable[RR_SHADOW_TEMPLE_LOWER_HUGE_PIT] = Region("Shadow Temple Lower Huge Pit", SCENE_SHADOW_TEMPLE, {}, {},{
areaTable[RR_SHADOW_TEMPLE_LOWER_HUGE_PIT] = Region("Shadow Temple Lower Huge Pit", SCENE_SHADOW_TEMPLE, {
//Events
EVENT_ACCESS(LOGIC_SHADOW_SILVER_PIT, true),
}, {
//Locations
LOCATION(RC_SHADOW_N_PIT_SILVER, true),
LOCATION(RC_SHADOW_S_PIT_SILVER, true),
LOCATION(RC_SHADOW_BEAMOS_PIT_SILVER, true),
LOCATION(RC_SHADOW_E_PIT_SILVER, true),
LOCATION(RC_SHADOW_W_PIT_SILVER, true),
},{
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_UPPER_HUGE_PIT, logic->IsAdult || logic->CanJumpslash()),
ENTRANCE(RR_SHADOW_TEMPLE_LOWER_HUGE_PIT_DOOR_LEDGE, (ctx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && ctx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)),
ENTRANCE(RR_SHADOW_TEMPLE_STONE_UMBRELLA, true),
ENTRANCE(RR_SHADOW_TEMPLE_STONE_UMBRELLA, logic->HasItem(RG_SHADOW_SILVER_PIT)),
});
// See MQ for comments
@@ -178,8 +197,8 @@ void RegionTable_Init_ShadowTemple() {
areaTable[RR_SHADOW_TEMPLE_LOWER_HUGE_PIT_DOOR_LEDGE] = Region("Shadow Temple Lower Huge Pit Door Ledge", SCENE_SHADOW_TEMPLE, {}, {}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_LOWER_HUGE_PIT, (ctx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && ctx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)),
ENTRANCE(RR_SHADOW_TEMPLE_INVISIBLE_SPIKES, logic->SmallKeys(SCENE_SHADOW_TEMPLE, 2)),
ENTRANCE(RR_SHADOW_TEMPLE_LOWER_HUGE_PIT, (ctx->GetTrickOption(RT_LENS_SHADOW_PLATFORM) && ctx->GetTrickOption(RT_LENS_SHADOW)) || logic->CanUse(RG_LENS_OF_TRUTH)),
ENTRANCE(RR_SHADOW_TEMPLE_FLOOR_SPIKES_S_DOOR, logic->SmallKeys(SCENE_SHADOW_TEMPLE, 2)),
});
areaTable[RR_SHADOW_TEMPLE_INVISIBLE_SPINNING_BLADES] = Region("Shadow Temple Invisible Spinning Blades", SCENE_SHADOW_TEMPLE, {}, {
@@ -195,21 +214,61 @@ void RegionTable_Init_ShadowTemple() {
ENTRANCE(RR_SHADOW_TEMPLE_UPPER_HUGE_PIT_DOOR_LEDGE, true),
});
areaTable[RR_SHADOW_TEMPLE_INVISIBLE_SPIKES] = Region("Shadow Temple Invisible Spikes", SCENE_SHADOW_TEMPLE, {}, {
areaTable[RR_SHADOW_TEMPLE_FLOOR_SPIKES_S_DOOR] = Region("Shadow Temple Floor Spikes South Door", SCENE_SHADOW_TEMPLE, {}, {
//Locations
LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST, logic->CanKillEnemy(RE_REDEAD) && (ctx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH) || logic->TakeDamage() || logic->CanUse(RG_GORON_TUNIC)) && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_SHADOW_W_TARGET_SPIKES_SILVER, logic->CanUse(RG_HOOKSHOT)),
LOCATION(RC_SHADOW_E_TARGET_SPIKES_SILVER, logic->CanUse(RG_LONGSHOT)),
}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_LOWER_HUGE_PIT_DOOR_LEDGE, logic->SmallKeys(SCENE_SHADOW_TEMPLE, 2)),
ENTRANCE(RR_SHADOW_TEMPLE_SKULL_JAR, (ctx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanMiddairGroundJump()))),
ENTRANCE(RR_SHADOW_TEMPLE_INVISIBLE_SPIKES_PLATFORM, (ctx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH)) && ((logic->IsAdult && logic->CanMiddairGroundJump()) ||
logic->CanUse(AnyAgeTime([]{return logic->CanKillEnemy(RE_REDEAD) && (ctx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH) || logic->TakeDamage() || logic->CanUse(RG_GORON_TUNIC));}) ? RG_HOOKSHOT : RG_LONGSHOT))),
ENTRANCE(RR_SHADOW_TEMPLE_FLOOR_SPIKES_ROOM, ctx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_GORON_TUNIC) || logic->TakeDamage()),
});
areaTable[RR_SHADOW_TEMPLE_INVISIBLE_SPIKES_PLATFORM] = Region("Shadow Temple Invisible Spikes Platform", SCENE_SHADOW_TEMPLE, {}, {}, {
//Assumes logic for navigating around spikes is checked on entry
areaTable[RR_SHADOW_TEMPLE_FLOOR_SPIKES_ROOM] = Region("Shadow Temple Floor Spikes Room", SCENE_SHADOW_TEMPLE, {
//Events
EVENT_ACCESS(LOGIC_SHADOW_SILVER_SPIKES, (ctx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOOKSHOT))),
}, {
//Locations
LOCATION(RC_SHADOW_TEMPLE_INVISIBLE_SPIKES_CHEST, logic->CanKillEnemy(RE_REDEAD) && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_SHADOW_E_TARGET_SPIKES_SILVER, logic->CanUse(RG_HOOKSHOT)),
LOCATION(RC_SHADOW_FLOOR_SPIKES_SILVER, true),
LOCATION(RC_SHADOW_W_TARGET_SPIKES_SILVER, logic->CanUse(RG_HOOKSHOT)),
}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_INVISIBLE_SPIKES, true),
ENTRANCE(RR_SHADOW_TEMPLE_UPPER_WIND_TUNNEL, logic->SmallKeys(SCENE_SHADOW_TEMPLE, 3)),
ENTRANCE(RR_SHADOW_TEMPLE_FLOOR_SPIKES_S_DOOR, true),
ENTRANCE(RR_SHADOW_TEMPLE_FLOOR_SPIKES_W_DOOR, true),
ENTRANCE(RR_SHADOW_TEMPLE_SPIKES_CORNER_PLATFORM, (ctx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->IsAdult && logic->CanMiddairGroundJump() || logic->CanUse(RG_HOOKSHOT))),
ENTRANCE(RR_SHADOW_TEMPLE_SPIKES_DOOR_PLATFORM, (ctx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH)) && ((logic->IsAdult && logic->CanMiddairGroundJump()) ||
(logic->CanUse(logic->IsAdult && AnyAgeTime([]{return logic->CanKillEnemy(RE_REDEAD);}) ? RG_HOOKSHOT : RG_LONGSHOT)))),
});
areaTable[RR_SHADOW_TEMPLE_FLOOR_SPIKES_W_DOOR] = Region("Shadow Temple Floor Spikes West Door", SCENE_SHADOW_TEMPLE, {}, {
//Locations
LOCATION(RC_SHADOW_W_TARGET_SPIKES_SILVER, logic->CanUse(RG_HOOKSHOT)),
}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_SKULL_JAR, logic->HasItem(RG_SHADOW_SILVER_SPIKES)),
ENTRANCE(RR_SHADOW_TEMPLE_FLOOR_SPIKES_ROOM, ctx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_GORON_TUNIC) || logic->TakeDamage()),
});
areaTable[RR_SHADOW_TEMPLE_SPIKES_CORNER_PLATFORM] = Region("Shadow Temple Spikes Corner Platform", SCENE_SHADOW_TEMPLE, {}, {
//Locations
LOCATION(RC_SHADOW_PLATFORM_SPIKES_SILVER, true),
LOCATION(RC_SHADOW_AIRBORNE_SPIKES_SILVER, ctx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_GORON_TUNIC) || logic->TakeDamage()),
}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_FLOOR_SPIKES_ROOM, ctx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_GORON_TUNIC) || logic->TakeDamage()),
});
areaTable[RR_SHADOW_TEMPLE_SPIKES_DOOR_PLATFORM] = Region("Shadow Temple Spikes Door Platform", SCENE_SHADOW_TEMPLE, {}, {
//Locations
LOCATION(RC_SHADOW_AIRBORNE_SPIKES_SILVER, true),
}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_FLOOR_SPIKES_ROOM, ctx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_GORON_TUNIC) || logic->TakeDamage()),
ENTRANCE(RR_SHADOW_TEMPLE_SPIKES_CORNER_PLATFORM, logic->CanUse(RG_HOVER_BOOTS)/* && logic->CanUse(RG_ROLL)*/),
ENTRANCE(RR_SHADOW_TEMPLE_UPPER_WIND_TUNNEL, logic->SmallKeys(SCENE_SHADOW_TEMPLE, 3)),
});
areaTable[RR_SHADOW_TEMPLE_SKULL_JAR] = Region("Shadow Temple Skull Jar", SCENE_SHADOW_TEMPLE, {}, {
@@ -218,13 +277,13 @@ void RegionTable_Init_ShadowTemple() {
LOCATION(RC_SHADOW_TEMPLE_GS_SINGLE_GIANT_POT, logic->CanKillEnemy(RE_GOLD_SKULLTULA)),
}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_INVISIBLE_SPIKES, AnyAgeTime([]{return logic->CanKillEnemy(RE_KEESE);})),
ENTRANCE(RR_SHADOW_TEMPLE_FLOOR_SPIKES_W_DOOR, AnyAgeTime([]{return logic->CanKillEnemy(RE_KEESE);})),
});
areaTable[RR_SHADOW_TEMPLE_UPPER_WIND_TUNNEL] = Region("Shadow Temple Upper Wind Tunnel", SCENE_SHADOW_TEMPLE, {}, {}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_INVISIBLE_SPIKES_PLATFORM, logic->SmallKeys(SCENE_SHADOW_TEMPLE, 3)),
ENTRANCE(RR_SHADOW_TEMPLE_LOWER_WIND_TUNNEL, (logic->CanUse(RG_HOVER_BOOTS) && logic->CanPassEnemy(RE_BIG_SKULLTULA)) || logic->CanUse(RG_HOOKSHOT)),
ENTRANCE(RR_SHADOW_TEMPLE_SPIKES_DOOR_PLATFORM, logic->SmallKeys(SCENE_SHADOW_TEMPLE, 3)),
ENTRANCE(RR_SHADOW_TEMPLE_LOWER_WIND_TUNNEL, (logic->CanUse(RG_HOVER_BOOTS) && logic->CanPassEnemy(RE_BIG_SKULLTULA)) || logic->CanUse(RG_HOOKSHOT)),
});
areaTable[RR_SHADOW_TEMPLE_LOWER_WIND_TUNNEL] = Region("Shadow Temple Lower Wind Tunnel", SCENE_SHADOW_TEMPLE, {}, {}, {
@@ -467,12 +526,20 @@ void RegionTable_Init_ShadowTemple() {
ENTRANCE(RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS, AnyAgeTime([]{return logic->CanKillEnemy(RE_GIBDO);})),
});
areaTable[RR_SHADOW_TEMPLE_MQ_B2_SPINNING_BLADE_ROOM] = Region("Shadow Temple MQ B2 Spinning Blade Room", SCENE_SHADOW_TEMPLE, {}, {
areaTable[RR_SHADOW_TEMPLE_MQ_B2_SPINNING_BLADE_ROOM] = Region("Shadow Temple MQ B2 Spinning Blade Room", SCENE_SHADOW_TEMPLE, {
//Events
EVENT_ACCESS(LOGIC_SHADOW_SILVER_BLADES, logic->CanKillEnemy(RE_BIG_SKULLTULA) && (logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanGroundJump())))),
}, {
//Locations
LOCATION(RC_SHADOW_TEMPLE_MQ_MAP_CHEST, logic->CanPassEnemy(RE_BIG_SKULLTULA) && (logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanGroundJump()))) && logic->CanOpenLargeChest()),
LOCATION(RC_SHADOW_TEMPLE_MQ_MAP_CHEST, logic->CanPassEnemy(RE_BIG_SKULLTULA) && logic->HasItem(RG_SHADOW_SILVER_BLADES) && logic->CanOpenLargeChest()),
LOCATION(RC_SHADOW_MQ_W_NOOK_SILVER, logic->CanPassEnemy(RE_BIG_SKULLTULA)),
LOCATION(RC_SHADOW_MQ_TALL_BLOCK_BLADE_SILVER, logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && (logic->CanUse(RG_HOVER_BOOTS) || logic->CanGroundJump()))),
LOCATION(RC_SHADOW_MQ_NE_UNDER_BLADE_SILVER, true),
LOCATION(RC_SHADOW_MQ_S_UNDER_BLADE_SILVER, true),
LOCATION(RC_SHADOW_MQ_N_NOOK_BLADE_SILVER, logic->CanPassEnemy(RE_BIG_SKULLTULA)),
}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS, AnyAgeTime([]{return logic->CanKillEnemy(RE_BIG_SKULLTULA) && (logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanUse(RG_HOVER_BOOTS)));})),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_FIRST_BEAMOS, logic->HasItem(RG_SHADOW_SILVER_BLADES)),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_SHORTCUT_PATH, logic->CanPassEnemy(RE_BIG_SKULLTULA)),
});
@@ -516,26 +583,46 @@ void RegionTable_Init_ShadowTemple() {
ENTRANCE(RR_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_ROOM, true),
});
areaTable[RR_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_ROOM] = Region("Shadow Temple MQ Invisible Blades Room", SCENE_SHADOW_TEMPLE, {}, {
areaTable[RR_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_ROOM] = Region("Shadow Temple MQ Invisible Blades Room", SCENE_SHADOW_TEMPLE, {
//Events
EVENT_ACCESS(LOGIC_SHADOW_MQ_SILVER_INVISIBLE_BLADES, (logic->CanUse(RG_SONG_OF_TIME) || (ctx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && logic->EffectiveHealth() > 1)) &&
(ctx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) || logic->IsChild || logic->CanUse(RG_NAYRUS_LOVE) || logic->CanUse(RG_LENS_OF_TRUTH))),
}, {
//Locations
//RT_SHADOW_MQ_INVISIBLE_BLADES does not work with NL as like-likes will not swallow you, likewise like-likes will not spit you with a fairy revive
//you take half a heart base from a spit out, double check EffectiveHealth when damage logic gets reworked
//Child is too small to get hit by the blades doesn't need the trick or lens for dodging them
LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST, (logic->CanUse(RG_SONG_OF_TIME) || (ctx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && logic->EffectiveHealth() > 1)) &&
(ctx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) || logic->IsChild || logic->CanUse(RG_NAYRUS_LOVE) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, (logic->CanUse(RG_SONG_OF_TIME) || (ctx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && logic->EffectiveHealth() > 1)) &&
((ctx->GetTrickOption(RT_LENS_SHADOW_MQ) && (ctx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) || logic->IsChild || logic->CanUse(RG_NAYRUS_LOVE))) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_VISIBLE_CHEST, logic->HasItem(RG_SHADOW_MQ_SILVER_INVISIBLE_BLADES) && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_INVISIBLE_CHEST, logic->HasItem(RG_SHADOW_MQ_SILVER_INVISIBLE_BLADES) && (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_LEFT_HEART, (logic->CanUse(RG_SONG_OF_TIME) && logic->IsAdult) || (ctx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && logic->EffectiveHealth() > 1) || logic->CanUse(RG_BOOMERANG)),
LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_BLADES_RIGHT_HEART, (logic->CanUse(RG_SONG_OF_TIME) && logic->IsAdult) || (ctx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && logic->EffectiveHealth() > 1) || logic->CanUse(RG_BOOMERANG)),
LOCATION(RC_SHADOW_MQ_W_INVISIBLE_BLADE_SILVER, ctx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) || logic->IsChild || logic->CanUse(RG_NAYRUS_LOVE) || logic->CanUse(RG_LENS_OF_TRUTH)),
LOCATION(RC_SHADOW_MQ_SW_INVISIBLE_BLADE_SILVER, ctx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) || logic->IsChild || logic->CanUse(RG_NAYRUS_LOVE) || logic->CanUse(RG_LENS_OF_TRUTH)),
LOCATION(RC_SHADOW_MQ_NW_INVISIBLE_BLADE_SILVER, ctx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) || logic->IsChild || logic->CanUse(RG_NAYRUS_LOVE) || logic->CanUse(RG_LENS_OF_TRUTH)),
LOCATION(RC_SHADOW_MQ_S_INVISIBLE_BLADE_SILVER, ctx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) || logic->IsChild || logic->CanUse(RG_NAYRUS_LOVE) || logic->CanUse(RG_LENS_OF_TRUTH)),
LOCATION(RC_SHADOW_MQ_INNER_NE_INVISIBLE_BLADE_SILVER, ctx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) || logic->IsChild || logic->CanUse(RG_NAYRUS_LOVE) || logic->CanUse(RG_LENS_OF_TRUTH)),
LOCATION(RC_SHADOW_MQ_SE_INVISIBLE_BLADE_SILVER, ctx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) || logic->IsChild || logic->CanUse(RG_NAYRUS_LOVE) || logic->CanUse(RG_LENS_OF_TRUTH)),
LOCATION(RC_SHADOW_MQ_OUTSIDE_CIRCLE_INVISIBLE_BLADE_SILVER, ctx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) || logic->IsChild || logic->CanUse(RG_NAYRUS_LOVE) || logic->CanUse(RG_LENS_OF_TRUTH)),
LOCATION(RC_SHADOW_MQ_OUTER_NE_INVISIBLE_BLADE_SILVER, ctx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) || logic->IsChild || logic->CanUse(RG_NAYRUS_LOVE) || logic->CanUse(RG_LENS_OF_TRUTH)),
LOCATION(RC_SHADOW_MQ_E_INVISIBLE_BLADE_SILVER, ctx->GetTrickOption(RT_LENS_SHADOW_MQ_INVISIBLE_BLADES) || logic->IsChild || logic->CanUse(RG_NAYRUS_LOVE) || logic->CanUse(RG_LENS_OF_TRUTH)),
LOCATION(RC_SHADOW_MQ_SOT_BLOCK_INVISIBLE_BLADE_SILVER, logic->CanUse(RG_SONG_OF_TIME) || (ctx->GetTrickOption(RT_SHADOW_MQ_INVISIBLE_BLADES) && logic->EffectiveHealth() > 1)),
}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_MQ_UPPER_HUGE_PIT, true),
});
areaTable[RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT] = Region("Shadow Temple MQ Lower Huge Pit", SCENE_SHADOW_TEMPLE, {}, {
areaTable[RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT] = Region("Shadow Temple MQ Lower Huge Pit", SCENE_SHADOW_TEMPLE, {
//Events
EVENT_ACCESS(LOGIC_SHADOW_SILVER_PIT, logic->CanUse(RG_LONGSHOT)),
}, {
//Locations
LOCATION(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST, logic->CanUse(RG_LONGSHOT) && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_SHADOW_TEMPLE_MQ_BEAMOS_SILVER_RUPEES_CHEST, logic->HasItem(RG_SHADOW_SILVER_PIT) && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_SHADOW_TEMPLE_MQ_LOWER_PIT_RECTANGLE_SIGN, logic->CanRead()),
LOCATION(RC_SHADOW_MQ_W_PIT_SILVER, true),
LOCATION(RC_SHADOW_MQ_HIGH_PIT_SILVER, logic->HasItem(RG_LONGSHOT)),
LOCATION(RC_SHADOW_MQ_HIGHEST_PIT_SILVER, logic->HasItem(RG_LONGSHOT)),
LOCATION(RC_SHADOW_MQ_N_PIT_SILVER, true),
LOCATION(RC_SHADOW_MQ_E_PIT_SILVER, true),
}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_MQ_B2_TO_B3_CORRIDOR_B3, logic->CanUse(RG_LONGSHOT)),
@@ -545,8 +632,8 @@ void RegionTable_Init_ShadowTemple() {
});
areaTable[RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT_DOOR_LEDGE] = Region("Shadow Temple MQ Lower Huge Pit Door Ledge", SCENE_SHADOW_TEMPLE, {}, {}, {
ENTRANCE(RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT, logic->CanUse(RG_HOVER_BOOTS) && (ctx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM) || logic->CanUse(RG_LENS_OF_TRUTH)) && ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_ROOM, logic->SmallKeys(SCENE_SHADOW_TEMPLE, 3)),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT, logic->CanUse(RG_HOVER_BOOTS) && (ctx->GetTrickOption(RT_LENS_SHADOW_MQ_PLATFORM) || logic->CanUse(RG_LENS_OF_TRUTH)) && ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_S_DOOR, logic->SmallKeys(SCENE_SHADOW_TEMPLE, 3)),
});
areaTable[RR_SHADOW_TEMPLE_MQ_STONE_UMBRELLA_ROOM] = Region("Shadow Temple MQ Stone Umbrella Room", SCENE_SHADOW_TEMPLE, {}, {
@@ -577,32 +664,114 @@ void RegionTable_Init_ShadowTemple() {
ENTRANCE(RR_SHADOW_TEMPLE_MQ_STONE_UMBRELLA_ROOM, true),
});
//while the spikes here are annoying, they don't really stop you doing anything, so I'll assume either lens trick, lens to see them, or taking damage from them. Not hovers though as a new player won't see the threat without lens to react properly
areaTable[RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_ROOM] = Region("Shadow Temple MQ Floor Spikes Room", SCENE_SHADOW_TEMPLE, {
//Events //lens or trick is always required for hookshot targets. We handle it here to not complicate the RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_UPPER_DOOR logic
EVENT_ACCESS(LOGIC_SHADOW_MQ_FLOOR_SPIKES_RUPEES, (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) &&
//Upper door side high rupee needs (hookshot and redead kill(as either age) for chest and adult) or longshot. hovers can cross from the left side with a backflip but that would be a trick
//East midair rupee needs (hookshot and(hover boots or jumpslash from the upper door platform)) or longshot.
//Combined these are longshot or (IsAdult && hookshot && (CanJumpslash || (Hover Boots && Here(CanKillRedeads))))
(logic->CanUse(RG_LONGSHOT) || (logic->IsAdult && logic->CanUse(RG_HOOKSHOT) && (logic->CanJumpslash() || (logic->CanUse(RG_HOVER_BOOTS) && AnyAgeTime([]{return logic->CanKillEnemy(RE_REDEAD);}))))) &&
//1 rupee is in spikes, needs hovers or damage
(logic->TakeDamage() || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_GORON_TUNIC))),
}, {
//For this room, logic assumes you can either take damage, wear passive spike resistence (Goron tunic or hovers) or see the spikes to navigate across the floor
//As this only matters with 1 heart/OHKO logic, which is already a trick-level setting, using Hook and Longshot to reach rupees without moving is allowed
areaTable[RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_S_DOOR] = Region("Shadow Temple MQ Floor Spikes South Door", SCENE_SHADOW_TEMPLE, {}, {
//Locations
LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST, logic->CanKillEnemy(RE_REDEAD) && (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->TakeDamage() || logic->CanUse(RG_LENS_OF_TRUTH) || logic->CanUse(RG_GORON_TUNIC)) && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_SHADOW_MQ_W_TARGET_SPIKES_SILVER, logic->CanUse(RG_HOOKSHOT)),
LOCATION(RC_SHADOW_MQ_E_TARGET_SPIKES_SILVER, logic->CanUse(RG_LONGSHOT)),
}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT, logic->SmallKeys(SCENE_SHADOW_TEMPLE, 3)),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_STALFOS_ROOM, logic->Get(LOGIC_SHADOW_MQ_FLOOR_SPIKES_RUPEES)),
//We need to assume we can get here with or without the glass platforms
ENTRANCE(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_PLATFORM, ((logic->CanUse(RG_LONGSHOT) || (logic->IsAdult && logic->CanUse(RG_HOOKSHOT) && (logic->Get(LOGIC_SHADOW_MQ_FLOOR_SPIKES_RUPEES) || AnyAgeTime([]{return logic->CanKillEnemy(RE_REDEAD);})))) && (logic->CanJumpslash() || logic->CanUse(RG_HOVER_BOOTS))) ||
((ctx->GetTrickOption(RT_LENS_SHADOW) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->IsAdult && logic->CanMiddairGroundJump()))),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT, logic->SmallKeys(SCENE_SHADOW_TEMPLE, 3)),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_ROOM, ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_GORON_TUNIC) || logic->TakeDamage()),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_SPIKES_GLASS_PLATFORMS, logic->HasItem(RG_SHADOW_SILVER_SPIKES) && (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->CanUse(RG_LONGSHOT)),
});
areaTable[RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_PLATFORM] = Region("Shadow Temple MQ Floor Spikes Platform", SCENE_SHADOW_TEMPLE, {}, {}, {
//Assumes logic for navigating around spikes is checked on entry
areaTable[RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_ROOM] = Region("Shadow Temple MQ Floor Spikes Room", SCENE_SHADOW_TEMPLE, {
//Events //(lens or trick) & (adult & hookshot) or longshot is always required for rupees below hookshot targets and the corner platform.
EVENT_ACCESS(LOGIC_SHADOW_SILVER_SPIKES, (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->CanUse(logic->IsAdult ? RG_LONGSHOT : RG_HOOKSHOT) &&
//We need to get onto the Door Platform to get North target Rupee at minimum,
//This needs either longshot, middair ground jump or hookshot & adult & defeating the redeads (as any age, as they are perm flags)
//hovers can cross from the corner platform with a backflip but that would be a trick.
logic->CanUse(RG_LONGSHOT) || ((AnyAgeTime([]{return logic->CanKillEnemy(RE_REDEAD);}) || logic->CanMiddairGroundJump()) &&
//East midair rupee needs longshot to reach from the floor, or hover boots or jumpslash to reach from the upper door platform.
(logic->CanJumpslash() || logic->CanUse(RG_HOVER_BOOTS))) &&
//1 rupee is in spikes, needs hovers or damage
(logic->TakeDamage() || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_GORON_TUNIC))),
}, {
//Locations
LOCATION(RC_SHADOW_TEMPLE_MQ_INVISIBLE_SPIKES_CHEST, logic->CanKillEnemy(RE_REDEAD) && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_SHADOW_MQ_N_TARGET_SPIKES_SILVER, (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->CanUse(RG_LONGSHOT)),
LOCATION(RC_SHADOW_MQ_CENTRAL_SPIKES_SILVER, true),
LOCATION(RC_SHADOW_MQ_CENTRAL_TARGET_SPIKES_SILVER, logic->CanUse(logic->IsAdult ? RG_HOOKSHOT : RG_LONGSHOT)),
LOCATION(RC_SHADOW_MQ_S_TARGET_SPIKES_SILVER, logic->CanUse(logic->IsAdult ? RG_HOOKSHOT : RG_LONGSHOT)),
LOCATION(RC_SHADOW_MQ_INSIDE_SPIKES_SILVER, logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_GORON_TUNIC) || logic->TakeDamage()),
LOCATION(RC_SHADOW_MQ_E_TARGET_SPIKES_SILVER, logic->CanUse(RG_HOOKSHOT)),
}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_ROOM, true),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_UPPER_WIND_TUNNEL, logic->SmallKeys(SCENE_SHADOW_TEMPLE, 4)),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_S_DOOR, true),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_W_DOOR, true),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_SPIKES_CORNER_PLATFORM, (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && (logic->CanUse(RG_HOOKSHOT) || (logic->IsAdult && logic->CanMiddairGroundJump()))),
//if we have silvers, we can just hookshot (as adult) or longshot onto the platforms...
ENTRANCE(RR_SHADOW_TEMPLE_MQ_SPIKES_GLASS_PLATFORMS, (logic->HasItem(RG_SHADOW_SILVER_SPIKES) && logic->CanUse(logic->IsAdult ? RG_HOOKSHOT : RG_LONGSHOT))),
//otherwise we have to use the hidden target and if we don't have longshot, spawn the chest. even if the glass platforms have spawned, this logic includes the above logic
ENTRANCE(RR_SHADOW_TEMPLE_MQ_SPIKES_DOOR_PLATFORM, (((ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->CanUse(logic->IsAdult && AnyAgeTime([]{return logic->CanKillEnemy(RE_REDEAD);}) ? RG_HOOKSHOT : RG_LONGSHOT)) &&
//regardless, we can't assume the player does not have the silvers, so we need to cross from the glass to the platform with hovers or a jumpslash jump (as adult)
(logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && logic->CanJumpslash()))) ||
//alternativly, a middair groundjump from the invisible spikes takes adult directly there
((ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->IsAdult && logic->CanMiddairGroundJump()))
});
areaTable[RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_W_DOOR] = Region("Shadow Temple MQ Floor Spikes West Door", SCENE_SHADOW_TEMPLE, {}, {
LOCATION(RC_SHADOW_MQ_W_TARGET_SPIKES_SILVER, logic->CanUse(RG_HOOKSHOT)),
LOCATION(RC_SHADOW_MQ_N_TARGET_SPIKES_SILVER, (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->CanUse(RG_LONGSHOT)),
LOCATION(RC_SHADOW_MQ_CENTRAL_TARGET_SPIKES_SILVER, logic->CanUse(RG_LONGSHOT)),
LOCATION(RC_SHADOW_MQ_S_TARGET_SPIKES_SILVER, logic->CanUse(RG_LONGSHOT)),
}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_ROOM, ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_GORON_TUNIC) || logic->TakeDamage()),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_STALFOS_ROOM, logic->HasItem(RG_SHADOW_SILVER_SPIKES)),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_SPIKES_GLASS_PLATFORMS, logic->HasItem(RG_SHADOW_SILVER_SPIKES) && logic->CanUse(RG_LONGSHOT)),
});
areaTable[RR_SHADOW_TEMPLE_MQ_SPIKES_CORNER_PLATFORM] = Region("Shadow Temple MQ Spikes Corner Platform", SCENE_SHADOW_TEMPLE, {}, {
//Locations
// can also get W target silver and get to door platform with hovers backwalk>backflip
LOCATION(RC_SHADOW_MQ_PLATFORM_SPIKES_SILVER, true),
LOCATION(RC_SHADOW_MQ_W_AIRBORNE_SPIKES_SILVER, true),
}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_ROOM, ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_GORON_TUNIC) || logic->TakeDamage()),
});
//Assumes SHADOW_SPIKES_SILVER is checked on entry
areaTable[RR_SHADOW_TEMPLE_MQ_SPIKES_GLASS_PLATFORMS] = Region("Shadow Temple MQ Spikes Glass Platforms", SCENE_SHADOW_TEMPLE, {}, {
//Locations
LOCATION(RC_SHADOW_MQ_W_TARGET_SPIKES_SILVER, logic->CanUse(RG_HOOKSHOT)),
LOCATION(RC_SHADOW_MQ_W_AIRBORNE_SPIKES_SILVER, (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->CanUse(RG_HOOKSHOT)),
LOCATION(RC_SHADOW_MQ_E_AIRBORNE_SPIKES_SILVER, (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->CanUse(RG_HOOKSHOT)),
LOCATION(RC_SHADOW_MQ_CENTRAL_TARGET_SPIKES_SILVER, logic->CanUse(RG_HOOKSHOT)),
LOCATION(RC_SHADOW_MQ_S_TARGET_SPIKES_SILVER, logic->CanUse(RG_HOOKSHOT)),
LOCATION(RC_SHADOW_MQ_N_TARGET_SPIKES_SILVER, (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->CanUse(RG_HOOKSHOT)),
}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_ROOM, ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_GORON_TUNIC) || logic->TakeDamage()),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_SPIKES_DOOR_PLATFORM, logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && logic->CanJumpslash())),
});
areaTable[RR_SHADOW_TEMPLE_MQ_SPIKES_DOOR_PLATFORM] = Region("Shadow Temple MQ Spikes Door Platform", SCENE_SHADOW_TEMPLE, {
//Events //(lens or trick) & (adult & hookshot) or longshot is always required for rupees below hookshot targets and the corner platform.
EVENT_ACCESS(LOGIC_SHADOW_SILVER_SPIKES, (ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH)) && logic->CanUse(logic->IsAdult ? RG_LONGSHOT : RG_HOOKSHOT) &&
//As we start on the upper door platform, we can get north target rupee with just hook, then jump off to get east middair, after which we do not need to get up here again
//East midair rupee needs longshot to reach from the floor, or hover boots or jumpslash to reach from the upper door platform.
(logic->CanUse(RG_LONGSHOT) || logic->CanJumpslash() || logic->CanUse(RG_HOVER_BOOTS)) &&
//1 rupee is in spikes, needs hovers or damage
(logic->TakeDamage() || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_GORON_TUNIC))),
}, {
//Locations
// can also get W_TARGET and E_TARGET with hovers backwalk backflip
LOCATION(RC_SHADOW_MQ_W_TARGET_SPIKES_SILVER, logic->CanUse(RG_LONGSHOT)),
LOCATION(RC_SHADOW_MQ_E_TARGET_SPIKES_SILVER, logic->CanUse(RG_LONGSHOT)),
LOCATION(RC_SHADOW_MQ_W_AIRBORNE_SPIKES_SILVER, true),
LOCATION(RC_SHADOW_MQ_CENTRAL_TARGET_SPIKES_SILVER, logic->CanUse(RG_HOOKSHOT)),
LOCATION(RC_SHADOW_MQ_E_AIRBORNE_SPIKES_SILVER, logic->CanUse(RG_HOVER_BOOTS) || logic->CanJumpslash()),
}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_ROOM, ctx->GetTrickOption(RT_LENS_SHADOW_MQ) || logic->CanUse(RG_LENS_OF_TRUTH) || logic->CanUse(RG_HOVER_BOOTS) || logic->CanUse(RG_GORON_TUNIC) || logic->TakeDamage()),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_SPIKES_CORNER_PLATFORM, logic->CanUse(RG_HOVER_BOOTS)/* && logic->CanUse(RG_ROLL)*/),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_SPIKES_GLASS_PLATFORMS, logic->HasItem(RG_SHADOW_SILVER_SPIKES) && (logic->CanUse(RG_HOOKSHOT) || logic->CanUse(RG_HOVER_BOOTS))),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_UPPER_WIND_TUNNEL, logic->SmallKeys(SCENE_SHADOW_TEMPLE, 4)),
});
areaTable[RR_SHADOW_TEMPLE_MQ_STALFOS_ROOM] = Region("Shadow Temple MQ Stalfos Room", SCENE_SHADOW_TEMPLE, {}, {
@@ -615,8 +784,8 @@ void RegionTable_Init_ShadowTemple() {
areaTable[RR_SHADOW_TEMPLE_MQ_UPPER_WIND_TUNNEL] = Region("Shadow Temple MQ Upper Wind Tunnel", SCENE_SHADOW_TEMPLE, {}, {}, {
//Exits
ENTRANCE(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_ROOM, logic->SmallKeys(SCENE_SHADOW_TEMPLE, 4)),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_LOWER_WIND_TUNNEL, (logic->CanUse(RG_HOVER_BOOTS) && logic->CanPassEnemy(RE_BIG_SKULLTULA)) || logic->CanUse(RG_HOOKSHOT)),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_SPIKES_DOOR_PLATFORM, logic->SmallKeys(SCENE_SHADOW_TEMPLE, 4)),
ENTRANCE(RR_SHADOW_TEMPLE_MQ_LOWER_WIND_TUNNEL, (logic->CanUse(RG_HOVER_BOOTS) && logic->CanPassEnemy(RE_BIG_SKULLTULA)) || logic->CanUse(RG_HOOKSHOT)),
});
areaTable[RR_SHADOW_TEMPLE_MQ_LOWER_WIND_TUNNEL] = Region("Shadow Temple MQ Lower Wind Tunnel", SCENE_SHADOW_TEMPLE, {}, {}, {
soh/soh/Enhancements/randomizer/location_access/dungeons/spirit_temple.cpp
+54 -18
View File
@@ -1,6 +1,7 @@
#include "soh/Enhancements/randomizer/location_access.h"
#include "soh/Enhancements/randomizer/entrance.h"
#include "soh/Enhancements/randomizer/dungeon.h"
#include "soh/Enhancements/randomizer/randomizerEnums.h"
using namespace Rando;
@@ -84,16 +85,21 @@ void RegionTable_Init_SpiritTemple() {
areaTable[RR_SPIRIT_TEMPLE_RUPEE_BRIDGE_NORTH] = Region("Spirit Temple Rupee Bridge North", SCENE_SPIRIT_TEMPLE, {
//Events
EVENT_ACCESS(LOGIC_SPIRIT_SILVER_RUPEE_BRIDGE, logic->HasItem(RG_CLIMB) || logic->CanUse(RG_HOOKSHOT)),
EVENT_ACCESS(LOGIC_SPIRIT_SILVER_RUPEE_BRIDGE_TORCHES, (logic->Get(LOGIC_SPIRIT_SILVER_RUPEE_BRIDGE) && logic->HasFireSourceWithTorch()) || logic->CanUse(RG_DINS_FIRE)),
EVENT_ACCESS(LOGIC_SPIRIT_SILVER_CHILD, logic->HasItem(RG_CLIMB) || logic->CanUse(RG_HOOKSHOT)),
EVENT_ACCESS(LOGIC_SPIRIT_SILVER_RUPEE_BRIDGE_TORCHES, (logic->HasItem(RG_SPIRIT_SILVER_CHILD) && logic->HasFireSourceWithTorch()) || logic->CanUse(RG_DINS_FIRE)),
}, {
//Locations
LOCATION(RC_SPIRIT_TEMPLE_CHILD_EARLY_TORCHES_CHEST, logic->Get(LOGIC_SPIRIT_SILVER_RUPEE_BRIDGE_TORCHES) && logic->HasItem(RG_OPEN_CHEST)),
// possible to collect without lowering fence, should be a trick
LOCATION(RC_SPIRIT_TEMPLE_GS_METAL_FENCE, logic->Get(LOGIC_SPIRIT_SILVER_RUPEE_BRIDGE) && logic->CanKillEnemy(RE_GOLD_SKULLTULA, ED_BOMB_THROW) && logic->HasItem(RG_CLIMB)),
// possible to collect by climbing around token without lowering fence, should be a trick. boomerang can grab through fence
LOCATION(RC_SPIRIT_TEMPLE_GS_METAL_FENCE, logic->HasItem(RG_SPIRIT_SILVER_CHILD) && logic->CanKillEnemy(RE_GOLD_SKULLTULA, ED_BOMB_THROW) && logic->HasItem(RG_CLIMB)),
LOCATION(RC_SPIRIT_W_HIGH_CHILD_SILVER, logic->HasItem(RG_CLIMB) || logic->CanUse(RG_HOOKSHOT)),
LOCATION(RC_SPIRIT_W_LOW_CHILD_SILVER, true),
LOCATION(RC_SPIRIT_E_LOW_CHILD_SILVER, true),
LOCATION(RC_SPIRIT_E_HIGH_CHILD_SILVER, logic->HasItem(RG_CLIMB) || logic->CanUse(RG_HOOKSHOT)),
LOCATION(RC_SPIRIT_TORCH_CHILD_SILVER, true),
}, {
//Exits
ENTRANCE(RR_SPIRIT_TEMPLE_RUPEE_BRIDGE_SOUTH, logic->Get(LOGIC_SPIRIT_SILVER_RUPEE_BRIDGE)),
ENTRANCE(RR_SPIRIT_TEMPLE_RUPEE_BRIDGE_SOUTH, logic->HasItem(RG_SPIRIT_SILVER_CHILD)),
ENTRANCE(RR_SPIRIT_TEMPLE_1F_ANUBIS, true),
});
@@ -106,7 +112,7 @@ void RegionTable_Init_SpiritTemple() {
}, {
//Exits
ENTRANCE(RR_SPIRIT_TEMPLE_CHILD_SIDE_HUB, true),
ENTRANCE(RR_SPIRIT_TEMPLE_RUPEE_BRIDGE_NORTH, logic->Get(LOGIC_SPIRIT_SILVER_RUPEE_BRIDGE)),
ENTRANCE(RR_SPIRIT_TEMPLE_RUPEE_BRIDGE_NORTH, logic->HasItem(RG_SPIRIT_SILVER_CHILD)),
});
areaTable[RR_SPIRIT_TEMPLE_CHILD_BOXES] = Region("Spirit Temple Child Boxes", SCENE_SPIRIT_TEMPLE, {}, {
@@ -163,8 +169,11 @@ void RegionTable_Init_SpiritTemple() {
//Jumpslash is possible as child, but pretty tight. Jumpslash as late as you can
//A damage boost off the boulder is also possible, but you need to land on the middle of the boulder
//to get enough distance to reach the rupee
EVENT_ACCESS(LOGIC_SPIRIT_BOUNDERS_SILVERS, logic->CanUse(RG_HOVER_BOOTS) || logic->CanJumpslash() || logic->CanUse(RG_LONGSHOT)/* || CanBunnyHop()*/),
}, {}, {
EVENT_ACCESS(LOGIC_SPIRIT_SILVER_BOULDERS, logic->CanUse(RG_HOVER_BOOTS) || logic->CanJumpslash() || logic->CanUse(RG_LONGSHOT)/* || CanBunnyHop()*/),
}, {
//Locations
LOCATION(RC_SPIRIT_AIRBORNE_BOULDER_SILVER, logic->CanUse(RG_HOVER_BOOTS) || logic->CanJumpslash() || logic->CanUse(RG_LONGSHOT)/* || CanBunnyHop()*/),
}, {
//Exits
ENTRANCE(RR_SPIRIT_TEMPLE_ADULT_SIDE_HUB, true),
ENTRANCE(RR_SPIRIT_TEMPLE_BOULDERS, true),
@@ -173,10 +182,14 @@ void RegionTable_Init_SpiritTemple() {
areaTable[RR_SPIRIT_TEMPLE_BOULDERS] = Region("Spirit Temple Boulders", SCENE_SPIRIT_TEMPLE, {}, {
//Locations
LOCATION(RC_SPIRIT_TEMPLE_GS_BOULDER_ROOM, logic->CanUse(RG_SONG_OF_TIME) && logic->CanKillEnemy(RE_GOLD_SKULLTULA)),
LOCATION(RC_SPIRIT_NW_BOULDER_SILVER, true),
LOCATION(RC_SPIRIT_SW_BOULDER_SILVER, true),
LOCATION(RC_SPIRIT_SE_BOULDER_SILVER, true),
LOCATION(RC_SPIRIT_NE_BOULDER_SILVER, true),
}, {
//Exits
ENTRANCE(RR_SPIRIT_TEMPLE_ABOVE_BOULDERS, logic->IsAdult || logic->HasItem(RG_CLIMB) || logic->CanUse(RG_HOOKSHOT) || logic->CanGroundJump()),
ENTRANCE(RR_SPIRIT_TEMPLE_PAST_BOULDERS, logic->Get(LOGIC_SPIRIT_BOUNDERS_SILVERS)),
ENTRANCE(RR_SPIRIT_TEMPLE_PAST_BOULDERS, logic->HasItem(RG_SPIRIT_SILVER_BOULDERS)),
});
areaTable[RR_SPIRIT_TEMPLE_PAST_BOULDERS] = Region("Spirit Temple Past Boulders", SCENE_SPIRIT_TEMPLE, {}, {
@@ -289,7 +302,13 @@ void RegionTable_Init_SpiritTemple() {
ENTRANCE(RR_SPIRIT_TEMPLE_SUN_BLOCK_ROOM, true),
});
areaTable[RR_SPIRIT_TEMPLE_SUN_BLOCK_ROOM] = Region("Spirit Temple Sun Block Room", SCENE_SPIRIT_TEMPLE, {}, {}, {
areaTable[RR_SPIRIT_TEMPLE_SUN_BLOCK_ROOM] = Region("Spirit Temple Sun Block Room", SCENE_SPIRIT_TEMPLE, {}, {
//Locations
LOCATION(RC_SPIRIT_NEAR_LIGHT_SUN_SILVER, true),
LOCATION(RC_SPIRIT_AIRBORNE_SUN_SILVER, true),
LOCATION(RC_SPIRIT_MID_PLATFORM_SUN_SILVER, true),
LOCATION(RC_SPIRIT_NEAR_DOOR_SUN_SILVER, true),
}, {
//Exits
ENTRANCE(RR_SPIRIT_TEMPLE_EMPTY_STAIRS, logic->HasItem(RG_POWER_BRACELET) || logic->SunlightArrows()),
//The blocks can be used to get onto this ledge itemless
@@ -300,14 +319,15 @@ void RegionTable_Init_SpiritTemple() {
areaTable[RR_SPIRIT_TEMPLE_SUN_BLOCK_CHEST_LEDGE] = Region("Spirit Temple Sun Block Chest Ledge", SCENE_SPIRIT_TEMPLE, {
//Events
//Assumes RR_SPIRIT_TEMPLE_SUN_BLOCK_ROOM access
EVENT_ACCESS(LOGIC_SPIRIT_SUN_BLOCK_TORCH, SpiritShared(RR_SPIRIT_TEMPLE_SUN_BLOCK_CHEST_LEDGE, []{return true;}, true)),
EVENT_ACCESS(LOGIC_SPIRIT_SILVER_SUN, SpiritShared(RR_SPIRIT_TEMPLE_SUN_BLOCK_CHEST_LEDGE, []{return true;}, true)),
}, {
//Locations
//Spawning the chest to get here is accounted for in movement logic, so we only need to confirm it can be spawned here
LOCATION(RC_SPIRIT_TEMPLE_SUN_BLOCK_ROOM_CHEST, SpiritShared(RR_SPIRIT_TEMPLE_SUN_BLOCK_CHEST_LEDGE,
[]{return logic->HasFireSource() ||
(logic->Get(LOGIC_SPIRIT_SUN_BLOCK_TORCH) &&
(logic->HasItem(RG_SPIRIT_SILVER_SUN) &&
(logic->CanUse(RG_STICKS) || (ctx->GetTrickOption(RT_SPIRIT_SUN_CHEST) && logic->CanUse(RG_FAIRY_BOW))));}) && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_SPIRIT_NEAR_CHEST_SUN_SILVER, SpiritShared(RR_SPIRIT_TEMPLE_SUN_BLOCK_CHEST_LEDGE, []{return true;}, true)),
}, {
//Exits
ENTRANCE(RR_SPIRIT_TEMPLE_SUN_BLOCK_ROOM, true),
@@ -564,7 +584,7 @@ void RegionTable_Init_SpiritTemple() {
LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_LEFT_CHEST, logic->HasItem(RG_OPEN_CHEST) &&
((AnyAgeTime([]{return logic->BlastOrSmash();}) && logic->CanHitEyeTargets()) || (ctx->GetTrickOption(RT_BOULDER_COLLISION) && logic->IsChild ? logic->CanHitEyeTargets() : logic->CanUse(RG_FAIRY_SLINGSHOT)))),
LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_BACK_RIGHT_CHEST, logic->CanHitSwitch(ED_BOOMERANG) && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST, logic->Get(LOGIC_SPIRIT_1F_SILVER_RUPEES) && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_FRONT_RIGHT_CHEST, logic->HasItem(RG_SPIRIT_MQ_SILVER_LOBBY) && logic->HasItem(RG_OPEN_CHEST)),
LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_1, logic->CanBreakPots()),
LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_2, logic->CanBreakPots()),
LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_3, logic->CanBreakPots()),
@@ -575,6 +595,8 @@ void RegionTable_Init_SpiritTemple() {
LOCATION(RC_SPIRIT_TEMPLE_MQ_ENTRANCE_CEILING_BOULDER, logic->CanUse(RG_BOMBCHU_5)),
LOCATION(RC_SPIRIT_TEMPLE_LEFT_SNAKE_STATUE, logic->CanRead()),
LOCATION(RC_SPIRIT_TEMPLE_RIGHT_SNAKE_STATUE, logic->CanRead()),
LOCATION(RC_SPIRIT_MQ_E_BOULDER_LOBBY_SILVER, logic->BlastOrSmash()),
LOCATION(RC_SPIRIT_MQ_W_BOULDER_LOBBY_SILVER, logic->BlastOrSmash()),
}, {
//Exits
ENTRANCE(RR_SPIRIT_TEMPLE_ENTRYWAY, true),
@@ -927,12 +949,15 @@ void RegionTable_Init_SpiritTemple() {
areaTable[RR_SPIRIT_TEMPLE_MQ_BEHIND_GEYSER] = Region("Spirit Temple MQ Behind Geyser", SCENE_SPIRIT_TEMPLE, {
//Events
//Assumes RR_SPIRIT_TEMPLE_MQ_FOYER access
EVENT_ACCESS(LOGIC_SPIRIT_1F_SILVER_RUPEES, logic->CanUse(RG_MEGATON_HAMMER)),
EVENT_ACCESS(LOGIC_SPIRIT_MQ_SILVER_LOBBY, logic->CanUse(RG_MEGATON_HAMMER)),
}, {
//Locations
LOCATION(RC_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_1, logic->CanBreakPots()),
LOCATION(RC_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_2, logic->CanBreakPots()),
LOCATION(RC_SPIRIT_TEMPLE_MQ_EARLY_ADULT_BOULDER, logic->BlastOrSmash()),
LOCATION(RC_SPIRIT_MQ_STAIRS_LOBBY_SILVER, true),
LOCATION(RC_SPIRIT_MQ_CORNER_LOBBY_SILVER, true),
LOCATION(RC_SPIRIT_MQ_JET_LOBBY_SILVER, logic->CanUse(RG_MEGATON_HAMMER)),
}, {
//Exits
ENTRANCE(RR_SPIRIT_TEMPLE_MQ_FOYER, logic->CanUse(RG_MEGATON_HAMMER) || (ctx->GetTrickOption(RT_HOVER_BOOST_SIMPLE) && logic->CanUse(RG_HOVER_BOOTS) && logic->CanStandingShield() && (logic->CanUseSword() || logic->CanUse(RG_STICKS)))),
@@ -1052,6 +1077,11 @@ void RegionTable_Init_SpiritTemple() {
//Locations
LOCATION(RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_1, logic->CanBreakPots()),
LOCATION(RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_2, logic->CanBreakPots()),
LOCATION(RC_SPIRIT_MQ_LOWEST_WALL_SILVER, logic->CanUse(RG_HOOKSHOT) || logic->HasItem(RG_CLIMB)),
LOCATION(RC_SPIRIT_MQ_MID_LOW_WALL_SILVER, logic->CanUse(RG_HOOKSHOT) || logic->HasItem(RG_CLIMB)),
LOCATION(RC_SPIRIT_MQ_MID_HIGH_WALL_SILVER, logic->CanUse(RG_HOOKSHOT) || logic->HasItem(RG_CLIMB)),
LOCATION(RC_SPIRIT_MQ_HIGHEST_WALL_SILVER, logic->CanUse(RG_LONGSHOT) || (logic->HasItem(RG_CLIMB) && (logic->CanKillEnemy(RE_KEESE) || logic->CanUse(RG_SKULL_MASK)))),
LOCATION(RC_SPIRIT_MQ_MIDDLE_WALL_SILVER, logic->CanUse(RG_LONGSHOT) || (logic->HasItem(RG_CLIMB) && (logic->CanKillEnemy(RE_KEESE) || logic->CanUse(RG_SKULL_MASK)))),
}, {
//Exits
ENTRANCE(RR_SPIRIT_TEMPLE_MQ_BEAMOS_PITS, true),
@@ -1061,12 +1091,18 @@ void RegionTable_Init_SpiritTemple() {
areaTable[RR_SPIRIT_TEMPLE_MQ_BIG_WALL_UPPER] = Region("Spirit Temple MQ Big Wall Upper", SCENE_SPIRIT_TEMPLE, {
//Events
//Getting some of these with just climbing downwards is theoretically possible but definitely a trick
EVENT_ACCESS(LOGIC_SPIRIT_MQ_BIG_WALL_SILVERS, (logic->CanKillEnemy(RE_KEESE) || logic->CanUse(RG_SKULL_MASK)) && (logic->HasItem(RG_CLIMB) || logic->CanUse(RG_LONGSHOT))),
}, {}, {
//You can easilly get any 1 silver dropping down, but getting them all only going down is likely impossible
EVENT_ACCESS(LOGIC_SPIRIT_MQ_SILVER_BIG_WALL, (logic->CanKillEnemy(RE_KEESE) || logic->CanUse(RG_SKULL_MASK)) && (logic->HasItem(RG_CLIMB) || logic->CanUse(RG_LONGSHOT))),
}, {
LOCATION(RC_SPIRIT_MQ_LOWEST_WALL_SILVER, true),
LOCATION(RC_SPIRIT_MQ_MID_LOW_WALL_SILVER, true),
LOCATION(RC_SPIRIT_MQ_MID_HIGH_WALL_SILVER, true),
LOCATION(RC_SPIRIT_MQ_HIGHEST_WALL_SILVER, true),
LOCATION(RC_SPIRIT_MQ_MIDDLE_WALL_SILVER, true),
}, {
//Exits
ENTRANCE(RR_SPIRIT_TEMPLE_MQ_BIG_WALL_BASE, true),
ENTRANCE(RR_SPIRIT_TEMPLE_MQ_4F_CENTRAL, logic->Get(LOGIC_SPIRIT_MQ_BIG_WALL_SILVERS)),
ENTRANCE(RR_SPIRIT_TEMPLE_MQ_4F_CENTRAL, logic->HasItem(RG_SPIRIT_MQ_SILVER_BIG_WALL)),
});
areaTable[RR_SPIRIT_TEMPLE_MQ_4F_CENTRAL] = Region("Spirit Temple MQ 4F Central", SCENE_SPIRIT_TEMPLE, {}, {
soh/soh/Enhancements/randomizer/location_access/overworld/gerudo_valley.cpp
+1 -1
View File
@@ -59,7 +59,7 @@ void RegionTable_Init_GerudoValley() {
}, {
//Exits
ENTRANCE(RR_GV_UPPER_STREAM_WATER, true),
ENTRANCE(RR_GV_WATERFALL_ALCOVE, (logic->CanUse(RG_LONGSHOT) && (logic->CanUse(RG_CLIMB) || ctx->GetTrickOption(RT_HOOKSHOT_LADDERS))) || CanPlantBean(RR_GV_UPPER_STREAM, RG_GERUDO_VALLEY_BEAN_SOUL)),
ENTRANCE(RR_GV_WATERFALL_ALCOVE, (logic->CanUse(RG_LONGSHOT) && (logic->HasItem(RG_CLIMB) || ctx->GetTrickOption(RT_HOOKSHOT_LADDERS))) || CanPlantBean(RR_GV_UPPER_STREAM, RG_GERUDO_VALLEY_BEAN_SOUL)),
});
areaTable[RR_GV_UPPER_STREAM_WATER] = Region("GV Upper Stream Water", SCENE_GERUDO_VALLEY, {}, {}, {
soh/soh/Enhancements/randomizer/logic.cpp
+55 -2
View File
@@ -4,6 +4,7 @@
#include <vector>
#include "soh/OTRGlobals.h"
#include "randomizer.h"
#include "dungeon.h"
#include "SeedContext.h"
#include "macros.h"
@@ -272,6 +273,39 @@ bool Logic::HasItem(RandomizerGet itemName) {
return CurrentUpgrade(UPG_SCALE) >= 1;
case RG_GOLDEN_SCALE:
return CurrentUpgrade(UPG_SCALE) >= 2;
// Silver Rupees
case RG_SHADOW_SILVER_BLADES:
case RG_SHADOW_SILVER_PIT:
case RG_SHADOW_SILVER_SPIKES:
case RG_SPIRIT_SILVER_CHILD:
case RG_SPIRIT_SILVER_SUN:
case RG_SPIRIT_SILVER_BOULDERS:
case RG_BOTW_SILVER:
case RG_ICE_CAVERN_SILVER_BLADES:
case RG_ICE_CAVERN_SILVER_BLOCK:
case RG_GTG_SILVER_SLOPE:
case RG_GTG_SILVER_LAVA:
case RG_GTG_SILVER_WATER:
case RG_GANONS_CASTLE_SILVER_LIGHT:
case RG_GANONS_CASTLE_SILVER_FOREST:
case RG_GANONS_CASTLE_SILVER_FIRE:
case RG_GANONS_CASTLE_SILVER_SPIRIT:
case RG_DODONGOS_CAVERN_MQ_SILVER:
case RG_SHADOW_MQ_SILVER_INVISIBLE_BLADES:
case RG_SPIRIT_MQ_SILVER_LOBBY:
case RG_SPIRIT_MQ_SILVER_BIG_WALL:
case RG_GANONS_CASTLE_MQ_SILVER_WATER:
case RG_GANONS_CASTLE_MQ_SILVER_SHADOW: {
if (!ctx->GetOption(RSK_SHUFFLE_SILVER)) {
return Get((LogicVal)(LOGIC_SHADOW_SILVER_BLADES + (itemName - RG_SHADOW_SILVER_BLADES)));
} else if (ctx->GetOption(RSK_SHUFFLE_SILVER).Is(RO_SHUFFLE_SILVER_STARTWITH)) {
return true;
} else {
s8 field = *Randomizer::SilverFieldFromSaveContext(mSaveContext, itemName);
return field >= Randomizer::SilverTotal(itemName);
}
}
// Trade Items
case RG_POCKET_EGG:
return CheckRandoInf(RAND_INF_ADULT_TRADES_HAS_POCKET_EGG) ||
CheckRandoInf(RAND_INF_ADULT_TRADES_HAS_POCKET_CUCCO);
@@ -2429,6 +2463,25 @@ void Logic::ApplyItemEffect(Item& item, bool state) {
case ITEMTYPE_BOSSKEY:
SetDungeonItem(DUNGEON_KEY_BOSS, RandoGetToDungeonScene.find(item.GetRandomizerGet())->second, state);
break;
case ITEMTYPE_SILVER: {
auto randoGet = item.GetRandomizerGet();
s8* field = Randomizer::SilverFieldFromSaveContext(mSaveContext, randoGet);
bool isWallet = ctx->GetOption(RSK_SHUFFLE_SILVER).Is(RO_SHUFFLE_SILVER_WALLET);
if (!state) {
if (isWallet) {
*field = 0;
} else {
*field -= 1;
}
} else {
if (isWallet) {
*field = 10;
} else {
*field += 1;
}
}
break;
}
case ITEMTYPE_FORTRESS_SMALLKEY:
case ITEMTYPE_SMALLKEY: {
auto randoGet = item.GetRandomizerGet();
@@ -2629,7 +2682,7 @@ void Logic::InitSaveContext() {
mSaveContext->horseData.angle = -0x6AD9;
mSaveContext->magicLevel = 0;
mSaveContext->infTable[29] = 1;
mSaveContext->sceneFlags[5].swch = 0x40000000;
mSaveContext->sceneFlags[SCENE_WATER_TEMPLE].swch = 0x40000000;
// SoH specific
mSaveContext->ship.backupFW = mSaveContext->fw;
@@ -2645,7 +2698,7 @@ void Logic::InitSaveContext() {
void Logic::NewSaveContext() {
if (mSaveContext != nullptr && mSaveContext != &gSaveContext) {
free(mSaveContext);
delete mSaveContext;
}
mSaveContext = new SaveContext();
InitSaveContext();
soh/soh/Enhancements/randomizer/option_descriptions.cpp
+11
View File
@@ -547,6 +547,17 @@ void Settings::CreateOptionDescriptions() {
"Overworld - Only freestanding rupees & hearts that are outside of dungeons.\n"
"\n"
"All Items - Shuffle all freestanding rupees & hearts.";
mOptionDescriptions[RSK_SHUFFLE_SILVER] =
"Silver rupees will be shuffled.\n"
"Items will be added to pool which completes the silver rupee puzzles,\n"
"while silver rupee locations will be random items.\n"
"Off - silver rupees won't be shuffled."
"\n"
"On - silver rupees will be individually spread out."
"\n"
"Wallet - silver rupees are shuffled as wallets, a single check to set flag for collecting them."
"\n"
"Start With - Silver rupees are still replaced with items, but all silver rupee flags start set.";
mOptionDescriptions[RSK_SHUFFLE_FOUNTAIN_FAIRIES] =
"Shuffle fairies in fountain locations. "
"This includes the sets of fairies found in Ganon's Castle and the Desert Oasis.";
soh/soh/Enhancements/randomizer/randomizer.cpp
+83
View File
@@ -658,6 +658,33 @@ ItemObtainability Randomizer::GetItemObtainabilityFromRandomizerGet(RandomizerGe
case RG_LIGHT_MEDALLION:
return !CHECK_QUEST_ITEM(QUEST_MEDALLION_LIGHT) ? CAN_OBTAIN : CANT_OBTAIN_ALREADY_HAVE;
// silver rupees
case RG_SHADOW_SILVER_BLADES:
case RG_SHADOW_SILVER_PIT:
case RG_SHADOW_SILVER_SPIKES:
case RG_SPIRIT_SILVER_CHILD:
case RG_SPIRIT_SILVER_SUN:
case RG_SPIRIT_SILVER_BOULDERS:
case RG_BOTW_SILVER:
case RG_ICE_CAVERN_SILVER_BLADES:
case RG_ICE_CAVERN_SILVER_BLOCK:
case RG_GTG_SILVER_SLOPE:
case RG_GTG_SILVER_LAVA:
case RG_GTG_SILVER_WATER:
case RG_GANONS_CASTLE_SILVER_LIGHT:
case RG_GANONS_CASTLE_SILVER_FOREST:
case RG_GANONS_CASTLE_SILVER_FIRE:
case RG_GANONS_CASTLE_SILVER_SPIRIT:
case RG_DODONGOS_CAVERN_MQ_SILVER:
case RG_SHADOW_MQ_SILVER_INVISIBLE_BLADES:
case RG_SPIRIT_MQ_SILVER_LOBBY:
case RG_SPIRIT_MQ_SILVER_BIG_WALL:
case RG_GANONS_CASTLE_MQ_SILVER_WATER:
case RG_GANONS_CASTLE_MQ_SILVER_SHADOW:
return *Randomizer::SilverFieldFromSaveContext(&gSaveContext, randoGet) < Randomizer::SilverTotal(randoGet)
? CAN_OBTAIN
: CANT_OBTAIN_ALREADY_HAVE;
case RG_RECOVERY_HEART:
case RG_GREEN_RUPEE:
case RG_GREG_RUPEE:
@@ -863,6 +890,27 @@ ShopItemIdentity Randomizer::IdentifyShopItem(s32 sceneNum, u8 slotIndex) {
return shopItemIdentity;
}
CheckIdentity Randomizer::IdentifySilver(s32 sceneNum, Vec3f pos) {
struct CheckIdentity silverIdentity;
silverIdentity.randomizerInf = RAND_INF_MAX;
silverIdentity.randomizerCheck = RC_UNKNOWN_CHECK;
s32 actorParams = TWO_ACTOR_PARAMS((s16)pos.x, (s16)pos.z);
if (sceneNum == SCENE_SHADOW_TEMPLE && actorParams == TWO_ACTOR_PARAMS(2110, 3372)) {
actorParams = TWO_ACTOR_PARAMS((s16)pos.x, (s16)pos.y);
}
Rando::Location* location = GetCheckObjectFromActor(ACTOR_EN_G_SWITCH, sceneNum, actorParams);
if (location->GetRandomizerCheck() != RC_UNKNOWN_CHECK) {
silverIdentity.randomizerInf = rcToRandomizerInf[location->GetRandomizerCheck()];
silverIdentity.randomizerCheck = location->GetRandomizerCheck();
}
return silverIdentity;
}
u8 Randomizer::GetRandoSettingValue(RandomizerSettingKey randoSettingKey) {
return Rando::Context::GetInstance()->GetOption(randoSettingKey).Get();
}
@@ -1416,6 +1464,41 @@ extern "C" u16 Randomizer_Item_Give(PlayState* play, GetItemEntry giEntry) {
INV_CONTENT(ITEM_NAYRUS_LOVE) = ITEM_ROCS_FEATHER;
}
break;
case RG_SHADOW_SILVER_BLADES:
case RG_SHADOW_SILVER_PIT:
case RG_SHADOW_SILVER_SPIKES:
case RG_SPIRIT_SILVER_CHILD:
case RG_SPIRIT_SILVER_SUN:
case RG_SPIRIT_SILVER_BOULDERS:
case RG_BOTW_SILVER:
case RG_ICE_CAVERN_SILVER_BLADES:
case RG_ICE_CAVERN_SILVER_BLOCK:
case RG_GTG_SILVER_SLOPE:
case RG_GTG_SILVER_LAVA:
case RG_GTG_SILVER_WATER:
case RG_GANONS_CASTLE_SILVER_LIGHT:
case RG_GANONS_CASTLE_SILVER_FOREST:
case RG_GANONS_CASTLE_SILVER_FIRE:
case RG_GANONS_CASTLE_SILVER_SPIRIT:
case RG_DODONGOS_CAVERN_MQ_SILVER:
case RG_SHADOW_MQ_SILVER_INVISIBLE_BLADES:
case RG_SPIRIT_MQ_SILVER_LOBBY:
case RG_SPIRIT_MQ_SILVER_BIG_WALL:
case RG_GANONS_CASTLE_MQ_SILVER_WATER:
case RG_GANONS_CASTLE_MQ_SILVER_SHADOW: {
s8* field = Randomizer::SilverFieldFromSaveContext(&gSaveContext, item);
if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_SILVER) ==
RO_SHUFFLE_SILVER_WALLET) {
*field = 10;
// this spoils MQ in theory, but will not update trackers because it's subtle and there's too many edge
// cases where this does not apply
Rupees_ChangeBy(Randomizer::SilverTotal(item) * 5);
} else {
*field += 1;
Rupees_ChangeBy(5);
}
break;
}
default:
LUSLOG_WARN("Randomizer_Item_Give didn't have behaviour specified for getItemId=%d", item);
assert(false);
soh/soh/Enhancements/randomizer/randomizer.h
+3
View File
@@ -40,12 +40,15 @@ class Randomizer {
~Randomizer();
bool SpoilerFileExists(const char* spoilerFileName);
bool IsTrialRequired(s32 trialFlag);
static s8 SilverTotal(RandomizerGet rg);
static s8* SilverFieldFromSaveContext(SaveContext* saveContext, RandomizerGet rg);
u8 GetRandoSettingValue(RandomizerSettingKey randoSettingKey);
u8 GetTriforcePiecesRequired();
RandomizerCheck GetCheckFromRandomizerInf(RandomizerInf randomizerInf);
RandomizerInf GetRandomizerInfFromCheck(RandomizerCheck rc);
Rando::Location* GetCheckObjectFromActor(s16 actorId, s16 sceneNum, s32 actorParams);
ShopItemIdentity IdentifyShopItem(s32 sceneNum, u8 slotIndex);
CheckIdentity IdentifySilver(s32 sceneNum, Vec3f pos);
GetItemEntry GetItemFromKnownCheck(RandomizerCheck randomizerCheck, GetItemID ogItemId,
bool checkObtainability = true);
GetItemEntry GetItemFromActor(s16 actorId, s16 sceneNum, s16 actorParams, GetItemID ogItemId,
soh/soh/Enhancements/randomizer/randomizerEnums.h
+1
View File
@@ -1,3 +1,4 @@
#pragma once
// Default expansion: real enums
#if !defined(RANDO_ENUM_BEGIN) && !defined(RANDO_ENUM_ITEM) && !defined(RANDO_ENUM_END)
soh/soh/Enhancements/randomizer/randomizerEnums/LogicVal.h
+22 -9
View File
@@ -177,6 +177,28 @@ RANDO_ENUM_ITEM(LOGIC_OCARINA_C_UP_BUTTON)
RANDO_ENUM_ITEM(LOGIC_OCARINA_C_DOWN_BUTTON)
RANDO_ENUM_ITEM(LOGIC_OCARINA_C_LEFT_BUTTON)
RANDO_ENUM_ITEM(LOGIC_OCARINA_C_RIGHT_BUTTON)
RANDO_ENUM_ITEM(LOGIC_SHADOW_SILVER_BLADES)
RANDO_ENUM_ITEM(LOGIC_SHADOW_SILVER_PIT)
RANDO_ENUM_ITEM(LOGIC_SHADOW_SILVER_SPIKES)
RANDO_ENUM_ITEM(LOGIC_SPIRIT_SILVER_CHILD)
RANDO_ENUM_ITEM(LOGIC_SPIRIT_SILVER_SUN)
RANDO_ENUM_ITEM(LOGIC_SPIRIT_SILVER_BOULDERS)
RANDO_ENUM_ITEM(LOGIC_BOTW_SILVER)
RANDO_ENUM_ITEM(LOGIC_ICE_CAVERN_SILVER_BLADES)
RANDO_ENUM_ITEM(LOGIC_ICE_CAVERN_SILVER_BLOCK)
RANDO_ENUM_ITEM(LOGIC_GTG_SILVER_SLOPE)
RANDO_ENUM_ITEM(LOGIC_GTG_SILVER_LAVA)
RANDO_ENUM_ITEM(LOGIC_GTG_SILVER_WATER)
RANDO_ENUM_ITEM(LOGIC_GANONS_CASTLE_SILVER_LIGHT)
RANDO_ENUM_ITEM(LOGIC_GANONS_CASTLE_SILVER_FOREST)
RANDO_ENUM_ITEM(LOGIC_GANONS_CASTLE_SILVER_FIRE)
RANDO_ENUM_ITEM(LOGIC_GANONS_CASTLE_SILVER_SPIRIT)
RANDO_ENUM_ITEM(LOGIC_DODONGOS_CAVERN_MQ_SILVER)
RANDO_ENUM_ITEM(LOGIC_SHADOW_MQ_SILVER_INVISIBLE_BLADES)
RANDO_ENUM_ITEM(LOGIC_SPIRIT_MQ_SILVER_LOBBY)
RANDO_ENUM_ITEM(LOGIC_SPIRIT_MQ_SILVER_BIG_WALL)
RANDO_ENUM_ITEM(LOGIC_GANONS_CASTLE_MQ_SILVER_WATER)
RANDO_ENUM_ITEM(LOGIC_GANONS_CASTLE_MQ_SILVER_SHADOW)
RANDO_ENUM_ITEM(LOGIC_ROCS_FEATHER)
RANDO_ENUM_ITEM(LOGIC_CAN_BORROW_MASKS)
RANDO_ENUM_ITEM(LOGIC_BORROW_SKULL_MASK)
@@ -233,7 +255,6 @@ RANDO_ENUM_ITEM(LOGIC_DC_LIFT_PLATFORM)
RANDO_ENUM_ITEM(LOGIC_DC_KILLED_LOWER_LIZALFOS)
RANDO_ENUM_ITEM(LOGIC_DC_MQ_CLEAR_UPPER_LOBBY_ROCKS)
RANDO_ENUM_ITEM(LOGIC_DC_MQ_CLEAR_BIG_BLOCK_WEB)
RANDO_ENUM_ITEM(LOGIC_DC_MQ_STAIRS_SILVER_RUPEES)
RANDO_ENUM_ITEM(LOGIC_DC_MQ_BEHIND_FIRE_SWITCH)
RANDO_ENUM_ITEM(LOGIC_JABU_RUTO_IN_1F)
RANDO_ENUM_ITEM(LOGIC_JABU_WEST_TENTACLE)
@@ -281,12 +302,9 @@ RANDO_ENUM_ITEM(LOGIC_WATER_MQ_B1_SWITCH)
RANDO_ENUM_ITEM(LOGIC_WATER_MQ_B1_OPENED_PILLAR)
RANDO_ENUM_ITEM(LOGIC_WATER_MQ_PILLAR_SOT_BLOCK)
RANDO_ENUM_ITEM(LOGIC_WATER_MQ_SIDE_TOWER_TARGETS)
RANDO_ENUM_ITEM(LOGIC_SPIRIT_1F_SILVER_RUPEES)
RANDO_ENUM_ITEM(LOGIC_SPIRIT_CHILD_SWITCH_BRIDGE)
RANDO_ENUM_ITEM(LOGIC_SPIRIT_SILVER_RUPEE_BRIDGE)
RANDO_ENUM_ITEM(LOGIC_SPIRIT_SILVER_RUPEE_BRIDGE_TORCHES)
RANDO_ENUM_ITEM(LOGIC_SPIRIT_SUN_BLOCK_TORCH)
RANDO_ENUM_ITEM(LOGIC_SPIRIT_BOUNDERS_SILVERS)
RANDO_ENUM_ITEM(LOGIC_SPIRIT_STATUE_SOUTH_DOOR)
RANDO_ENUM_ITEM(LOGIC_SPIRIT_NABOORU_KIDNAPPED)
RANDO_ENUM_ITEM(LOGIC_SPIRIT_PLATFORM_LOWERED)
@@ -300,7 +318,6 @@ RANDO_ENUM_ITEM(LOGIC_SPIRIT_MQ_TIME_TRAVEL_CHEST)
RANDO_ENUM_ITEM(LOGIC_SPIRIT_MQ_STATUE_ROOM_TORCHES)
RANDO_ENUM_ITEM(LOGIC_SPIRIT_MQ_3SUNS_ENEMIES)
RANDO_ENUM_ITEM(LOGIC_SPIRIT_MQ_SYMPHONY_ROOM_DOOR)
RANDO_ENUM_ITEM(LOGIC_SPIRIT_MQ_BIG_WALL_SILVERS)
RANDO_ENUM_ITEM(LOGIC_REVERSE_SPIRIT_CHILD)
RANDO_ENUM_ITEM(LOGIC_REVERSE_SPIRIT_ADULT)
RANDO_ENUM_ITEM(LOGIC_FORWARDS_SPIRIT_CHILD)
@@ -325,15 +342,11 @@ RANDO_ENUM_ITEM(LOGIC_BOTW_MQ_OPENED_WEST_ROOM)
RANDO_ENUM_ITEM(LOGIC_BOTW_MQ_OPENED_MIDDLE_HOLE)
RANDO_ENUM_ITEM(LOGIC_GTG_MQ_MAZE_SWITCH)
RANDO_ENUM_ITEM(LOGIC_GTG_MQ_RIGHT_SIDE_SWITCH)
RANDO_ENUM_ITEM(LOGIC_GTG_PLATFORM_SILVER_RUPEES)
RANDO_ENUM_ITEM(LOGIC_GTG_UNLOCKED_DOOR_BEHIND_HEAVY_BLOCK)
RANDO_ENUM_ITEM(LOGIC_GTG_PUSHED_HEAVY_BLOCK)
RANDO_ENUM_ITEM(LOGIC_GTG_CLEARED_EYE_STATUE)
RANDO_ENUM_ITEM(LOGIC_FOREST_TRIAL_SILVER_RUPEES)
RANDO_ENUM_ITEM(LOGIC_FOREST_TRIAL_MQ_SPAWN_BEAMOS_CHEST)
RANDO_ENUM_ITEM(LOGIC_FIRE_TRIAL_SILVER_RUPEES)
RANDO_ENUM_ITEM(LOGIC_WATER_TRIAL_RUSTED_SWITCH)
RANDO_ENUM_ITEM(LOGIC_WATER_TRIAL_MQ_SILVER_RUPEES)
RANDO_ENUM_ITEM(LOGIC_WATER_TRIAL_MQ_MELTED_FINAL_DOOR_RED_ICE)
RANDO_ENUM_ITEM(LOGIC_SHADOW_TRIAL_FIRST_CHEST)
RANDO_ENUM_ITEM(LOGIC_SHADOW_TRIAL_LOWER_SWITCH)
soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerCheck.h
+157
View File
@@ -2504,6 +2504,163 @@ RANDO_ENUM_ITEM(RC_GERUDO_TRAINING_GROUND_MQ_WONDER_EYE_STATUE)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_MQ_WONDER_SHADOW_TRIAL)
// End Wonder Items
// Start Silver Rupees
RANDO_ENUM_ITEM(RC_SHADOW_N_UNDER_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_TALL_BLOCK_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_N_NOOK_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_W_NOOK_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_S_UNDER_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_N_PIT_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_S_PIT_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_BEAMOS_PIT_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_E_PIT_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_W_PIT_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_PLATFORM_SPIKES_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_E_TARGET_SPIKES_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_FLOOR_SPIKES_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_W_TARGET_SPIKES_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_AIRBORNE_SPIKES_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_W_HIGH_CHILD_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_W_LOW_CHILD_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_E_LOW_CHILD_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_E_HIGH_CHILD_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_TORCH_CHILD_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_NEAR_LIGHT_SUN_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_AIRBORNE_SUN_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_MID_PLATFORM_SUN_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_NEAR_CHEST_SUN_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_NEAR_DOOR_SUN_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_NW_BOULDER_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_SW_BOULDER_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_SE_BOULDER_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_NE_BOULDER_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_AIRBORNE_BOULDER_SILVER)
RANDO_ENUM_ITEM(RC_BOTW_B1_LADDER_SILVER)
RANDO_ENUM_ITEM(RC_BOTW_B2_LADDER_SILVER)
RANDO_ENUM_ITEM(RC_BOTW_B3_LADDER_SILVER)
RANDO_ENUM_ITEM(RC_BOTW_NW_OOZE_SILVER)
RANDO_ENUM_ITEM(RC_BOTW_SE_OOZE_SILVER)
RANDO_ENUM_ITEM(RC_ICE_CAVERN_ICICLES_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_ICE_CAVERN_W_INNER_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_ICE_CAVERN_OUTER_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_ICE_CAVERN_E_INNER_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_ICE_CAVERN_AIRBORNE_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_ICE_CAVERN_NEAR_FIRE_BLOCK_SILVER)
RANDO_ENUM_ITEM(RC_ICE_CAVERN_LOWER_BLOCK_SILVER)
RANDO_ENUM_ITEM(RC_ICE_CAVERN_NEAR_BLOCK_SILVER)
RANDO_ENUM_ITEM(RC_ICE_CAVERN_FROZEN_BLOCK_SILVER)
RANDO_ENUM_ITEM(RC_ICE_CAVERN_NEAR_GS_BLOCK_SILVER)
RANDO_ENUM_ITEM(RC_GTG_FIRE_WALL_SLOPE_SILVER)
RANDO_ENUM_ITEM(RC_GTG_LOWER_BOULDER_SLOPE_SILVER)
RANDO_ENUM_ITEM(RC_GTG_TARGET_SLOPE_SILVER)
RANDO_ENUM_ITEM(RC_GTG_JUMPDOWN_SLOPE_SILVER)
RANDO_ENUM_ITEM(RC_GTG_UPPER_BOULDER_SLOPE_SILVER)
RANDO_ENUM_ITEM(RC_GTG_NEAR_SWITCH_LAVA_SILVER)
RANDO_ENUM_ITEM(RC_GTG_NEAR_BARRED_DOOR_LAVA_SILVER)
RANDO_ENUM_ITEM(RC_GTG_FIRE_RING_LAVA_SILVER)
RANDO_ENUM_ITEM(RC_GTG_UPPER_LAVA_SILVER)
RANDO_ENUM_ITEM(RC_GTG_UNDER_LEDGE_LAVA_SILVER)
RANDO_ENUM_ITEM(RC_GTG_MIDDLE_WATER_SILVER)
RANDO_ENUM_ITEM(RC_GTG_ABOVE_TARGET_WATER_SILVER)
RANDO_ENUM_ITEM(RC_GTG_LEFT_WATER_SILVER)
RANDO_ENUM_ITEM(RC_GTG_UNDER_TARGET_WATER_SILVER)
RANDO_ENUM_ITEM(RC_GTG_RIGHT_WATER_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_OUTER_RIGHT_LIGHT_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_OUTER_LEFT_LIGHT_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_UPPER_LIGHT_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_INNER_RIGHT_LIGHT_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_INNER_LEFT_LIGHT_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_LARGE_PLATFORM_FOREST_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_SOT_BLOCK_FOREST_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_SMALL_PLATFORM_FOREST_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_UNDER_LEDGE_FOREST_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_ON_TARGET_FOREST_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_TORCH_SLUG_FIRE_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_FLAME_JETS_FIRE_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_DISTANT_PLATFORM_FIRE_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_CLOSE_PLATFORM_FIRE_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_GANONS_CASTLE_UNDER_PILLAR_FIRE_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_AIRBORNE_SPIRIT_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_NEAR_DOORMAT_SPIRIT_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_LOWER_MIDDLE_SPIRIT_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_CORNER_SPIRIT_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_NEAR_BARRED_DOOR_SPIRIT_SILVER)
RANDO_ENUM_ITEM(RC_DODONGOS_CAVERN_MQ_BEAMOS_SILVER)
RANDO_ENUM_ITEM(RC_DODONGOS_CAVERN_MQ_1F_CRATE_SILVER)
RANDO_ENUM_ITEM(RC_DODONGOS_CAVERN_MQ_LOWER_2F_CRATE_SILVER)
RANDO_ENUM_ITEM(RC_DODONGOS_CAVERN_MQ_VINES_SILVER)
RANDO_ENUM_ITEM(RC_DODONGOS_CAVERN_MQ_UPPER_2F_CRATE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_W_NOOK_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_TALL_BLOCK_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_NE_UNDER_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_S_UNDER_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_N_NOOK_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_W_PIT_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_HIGH_PIT_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_HIGHEST_PIT_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_N_PIT_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_E_PIT_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_W_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_SW_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_NW_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_S_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_INNER_NE_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_SE_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_OUTSIDE_CIRCLE_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_OUTER_NE_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_E_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_SOT_BLOCK_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_PLATFORM_SPIKES_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_W_TARGET_SPIKES_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_W_AIRBORNE_SPIKES_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_N_TARGET_SPIKES_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_CENTRAL_SPIKES_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_CENTRAL_TARGET_SPIKES_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_S_TARGET_SPIKES_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_INSIDE_SPIKES_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_E_AIRBORNE_SPIKES_SILVER)
RANDO_ENUM_ITEM(RC_SHADOW_MQ_E_TARGET_SPIKES_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_MQ_STAIRS_LOBBY_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_MQ_E_BOULDER_LOBBY_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_MQ_W_BOULDER_LOBBY_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_MQ_CORNER_LOBBY_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_MQ_JET_LOBBY_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_MQ_LOWEST_WALL_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_MQ_MID_LOW_WALL_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_MQ_MID_HIGH_WALL_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_MQ_HIGHEST_WALL_SILVER)
RANDO_ENUM_ITEM(RC_SPIRIT_MQ_MIDDLE_WALL_SILVER)
RANDO_ENUM_ITEM(RC_GTG_MQ_ICICLES_SLOPE_SILVER)
RANDO_ENUM_ITEM(RC_GTG_MQ_JUMPDOWN_SLOPE_SILVER)
RANDO_ENUM_ITEM(RC_GTG_MQ_HIGH_SLOPE_SILVER)
RANDO_ENUM_ITEM(RC_GTG_MQ_FREEZARD_SLOPE_SILVER)
RANDO_ENUM_ITEM(RC_GTG_MQ_PIT_SLOPE_SILVER)
RANDO_ENUM_ITEM(RC_GTG_MQ_NEAR_SWITCH_LAVA_SILVER)
RANDO_ENUM_ITEM(RC_GTG_MQ_FAR_LAVA_SILVER)
RANDO_ENUM_ITEM(RC_GTG_MQ_MIDDLE_LAVA_SILVER)
RANDO_ENUM_ITEM(RC_GTG_MQ_NEAR_BARRED_DOOR_LAVA_SILVER)
RANDO_ENUM_ITEM(RC_GTG_MQ_NEAR_MAZE_LEDGE_LAVA_SILVER)
RANDO_ENUM_ITEM(RC_GTG_MQ_NEAR_LIT_TORCH_LAVA_SILVER)
RANDO_ENUM_ITEM(RC_GTG_MQ_BACK_WATER_SILVER)
RANDO_ENUM_ITEM(RC_GTG_MQ_MIDDLE_WATER_SILVER)
RANDO_ENUM_ITEM(RC_GTG_MQ_FRONT_WATER_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_MQ_UNDER_PILLAR_FIRE_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_MQ_NEAR_TARGET_FIRE_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_MQ_ON_PILLAR_FIRE_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_MQ_LAUNCH_PLATFORM_FIRE_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_MQ_JET_PLATFORM_FIRE_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_MQ_IN_HOLE_WATER_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_MQ_AIRBORNE_WATER_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_MQ_FROZEN_WATER_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_MQ_OVER_PIT_WATER_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_MQ_NOOK_WATER_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_MQ_BOMB_FLOWER_SHADOW_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_MQ_NEAR_TORCH_SHADOW_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_MQ_BEAMOS_PLATFORM_SHADOW_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_MQ_GUILLOTINE_SHADOW_SILVER)
RANDO_ENUM_ITEM(RC_GANONS_CASTLE_MQ_MOVING_PLATFORM_SHADOW_SILVER)
// End Silver Rupees
RANDO_ENUM_ITEM(RC_SFM_FAIRY_GROTTO_FAIRY_1)
RANDO_ENUM_ITEM(RC_SFM_FAIRY_GROTTO_FAIRY_2)
RANDO_ENUM_ITEM(RC_SFM_FAIRY_GROTTO_FAIRY_3)
soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerGet.h
+22
View File
@@ -136,6 +136,28 @@ RANDO_ENUM_ITEM(RG_GERUDO_TRAINING_GROUND_KEY_RING)
RANDO_ENUM_ITEM(RG_GERUDO_FORTRESS_KEY_RING)
RANDO_ENUM_ITEM(RG_GANONS_CASTLE_KEY_RING)
RANDO_ENUM_ITEM(RG_TREASURE_GAME_KEY_RING)
RANDO_ENUM_ITEM(RG_SHADOW_SILVER_BLADES)
RANDO_ENUM_ITEM(RG_SHADOW_SILVER_PIT)
RANDO_ENUM_ITEM(RG_SHADOW_SILVER_SPIKES)
RANDO_ENUM_ITEM(RG_SPIRIT_SILVER_CHILD)
RANDO_ENUM_ITEM(RG_SPIRIT_SILVER_SUN)
RANDO_ENUM_ITEM(RG_SPIRIT_SILVER_BOULDERS)
RANDO_ENUM_ITEM(RG_BOTW_SILVER)
RANDO_ENUM_ITEM(RG_ICE_CAVERN_SILVER_BLADES)
RANDO_ENUM_ITEM(RG_ICE_CAVERN_SILVER_BLOCK)
RANDO_ENUM_ITEM(RG_GTG_SILVER_SLOPE)
RANDO_ENUM_ITEM(RG_GTG_SILVER_LAVA)
RANDO_ENUM_ITEM(RG_GTG_SILVER_WATER)
RANDO_ENUM_ITEM(RG_GANONS_CASTLE_SILVER_LIGHT)
RANDO_ENUM_ITEM(RG_GANONS_CASTLE_SILVER_FOREST)
RANDO_ENUM_ITEM(RG_GANONS_CASTLE_SILVER_FIRE)
RANDO_ENUM_ITEM(RG_GANONS_CASTLE_SILVER_SPIRIT)
RANDO_ENUM_ITEM(RG_DODONGOS_CAVERN_MQ_SILVER)
RANDO_ENUM_ITEM(RG_SHADOW_MQ_SILVER_INVISIBLE_BLADES)
RANDO_ENUM_ITEM(RG_SPIRIT_MQ_SILVER_LOBBY)
RANDO_ENUM_ITEM(RG_SPIRIT_MQ_SILVER_BIG_WALL)
RANDO_ENUM_ITEM(RG_GANONS_CASTLE_MQ_SILVER_WATER)
RANDO_ENUM_ITEM(RG_GANONS_CASTLE_MQ_SILVER_SHADOW)
RANDO_ENUM_ITEM(RG_KOKIRI_EMERALD)
RANDO_ENUM_ITEM(RG_GORON_RUBY)
RANDO_ENUM_ITEM(RG_ZORA_SAPPHIRE)
soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerHintTextKey.h
+15
View File
@@ -1079,6 +1079,13 @@ RANDO_ENUM_ITEM(RHT_SPEAK)
RANDO_ENUM_ITEM(RHT_OPEN_CHEST)
RANDO_ENUM_ITEM(RHT_FISHING_POLE)
RANDO_ENUM_ITEM(RHT_SKELETON_KEY)
RANDO_ENUM_ITEM(RHT_SILVER_RUPEE_DODONGOS_CAVERN)
RANDO_ENUM_ITEM(RHT_SILVER_RUPEE_SHADOW_TEMPLE)
RANDO_ENUM_ITEM(RHT_SILVER_RUPEE_SPIRIT_TEMPLE)
RANDO_ENUM_ITEM(RHT_SILVER_RUPEE_BOTW)
RANDO_ENUM_ITEM(RHT_SILVER_RUPEE_ICE_CAVERN)
RANDO_ENUM_ITEM(RHT_SILVER_RUPEE_GTG)
RANDO_ENUM_ITEM(RHT_SILVER_RUPEE_GANONS_CASTLE)
RANDO_ENUM_ITEM(RHT_EPONA)
RANDO_ENUM_ITEM(RHT_OVERWORLD_KEY)
RANDO_ENUM_ITEM(RHT_HINT_MYSTERIOUS)
@@ -1458,6 +1465,14 @@ RANDO_ENUM_ITEM(RHT_ICE_CAVERN_HEART)
RANDO_ENUM_ITEM(RHT_ICE_CAVERN_RUPEE)
RANDO_ENUM_ITEM(RHT_GERUDO_TRAINING_GROUNDS_HEART)
RANDO_ENUM_ITEM(RHT_GANONS_CASTLE_HEART)
// Silver Shuffle
RANDO_ENUM_ITEM(RHT_DODONGOS_CAVERN_SILVER)
RANDO_ENUM_ITEM(RHT_SHADOW_TEMPLE_SILVER)
RANDO_ENUM_ITEM(RHT_SPIRIT_TEMPLE_SILVER)
RANDO_ENUM_ITEM(RHT_BOTW_SILVER)
RANDO_ENUM_ITEM(RHT_ICE_CAVERN_SILVER)
RANDO_ENUM_ITEM(RHT_GTG_SILVER)
RANDO_ENUM_ITEM(RHT_GANONS_CASTLE_SILVER)
// Fairy Shuffle
RANDO_ENUM_ITEM(RHT_SFM_FAIRY_GROTTO_FAIRY)
RANDO_ENUM_ITEM(RHT_ZR_FAIRY_GROTTO_FAIRY)
soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerInf.h
+157
View File
@@ -1978,6 +1978,163 @@ RANDO_ENUM_ITEM(RAND_INF_GERUDO_TRAINING_GROUND_MQ_WONDER_EYE_STATUE)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_MQ_WONDER_SHADOW_TRIAL)
// End Wonder Items
// Start Silver Rupees
RANDO_ENUM_ITEM(RAND_INF_RC_SHADOW_N_UNDER_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_RC_SHADOW_TALL_BLOCK_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_RC_SHADOW_N_NOOK_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_W_NOOK_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_S_UNDER_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_N_PIT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_S_PIT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_BEAMOS_PIT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_E_PIT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_W_PIT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_PLATFORM_SPIKES_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_E_TARGET_SPIKES_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_FLOOR_SPIKES_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_W_TARGET_SPIKES_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_AIRBORNE_SPIKES_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_W_HIGH_CHILD_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_W_LOW_CHILD_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_E_LOW_CHILD_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_E_HIGH_CHILD_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_TORCH_CHILD_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_NEAR_LIGHT_SUN_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_AIRBORNE_SUN_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_MID_PLATFORM_SUN_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_NEAR_CHEST_SUN_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_NEAR_DOOR_SUN_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_NW_BOULDER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_SW_BOULDER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_SE_BOULDER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_NE_BOULDER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_AIRBORNE_BOULDER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_BOTW_B1_LADDER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_BOTW_B2_LADDER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_BOTW_B3_LADDER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_BOTW_NW_OOZE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_BOTW_SE_OOZE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_ICE_CAVERN_ICICLES_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_ICE_CAVERN_W_INNER_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_ICE_CAVERN_OUTER_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_ICE_CAVERN_E_INNER_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_ICE_CAVERN_AIRBORNE_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_ICE_CAVERN_NEAR_FIRE_BLOCK_SILVER)
RANDO_ENUM_ITEM(RAND_INF_ICE_CAVERN_LOWER_BLOCK_SILVER)
RANDO_ENUM_ITEM(RAND_INF_ICE_CAVERN_NEAR_BLOCK_SILVER)
RANDO_ENUM_ITEM(RAND_INF_ICE_CAVERN_FROZEN_BLOCK_SILVER)
RANDO_ENUM_ITEM(RAND_INF_ICE_CAVERN_NEAR_GS_BLOCK_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_FIRE_WALL_SLOPE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_LOWER_BOULDER_SLOPE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_TARGET_SLOPE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_JUMPDOWN_SLOPE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_UPPER_BOULDER_SLOPE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_NEAR_SWITCH_LAVA_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_NEAR_BARRED_DOOR_LAVA_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_FIRE_RING_LAVA_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_UPPER_LAVA_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_UNDER_LEDGE_LAVA_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_MIDDLE_WATER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_ABOVE_TARGET_WATER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_LEFT_WATER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_UNDER_TARGET_WATER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_RIGHT_WATER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_OUTER_RIGHT_LIGHT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_OUTER_LEFT_LIGHT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_UPPER_LIGHT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_INNER_RIGHT_LIGHT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_INNER_LEFT_LIGHT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_LARGE_PLATFORM_FOREST_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_SOT_BLOCK_FOREST_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_SMALL_PLATFORM_FOREST_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_UNDER_LEDGE_FOREST_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_ON_TARGET_FOREST_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_TORCH_SLUG_FIRE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_FLAME_JETS_FIRE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_DISTANT_PLATFORM_FIRE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_CLOSE_PLATFORM_FIRE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_GANONS_CASTLE_UNDER_PILLAR_FIRE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_AIRBORNE_SPIRIT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_NEAR_DOORMAT_SPIRIT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_LOWER_MIDDLE_SPIRIT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_CORNER_SPIRIT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_NEAR_BARRED_DOOR_SPIRIT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_DODONGOS_CAVERN_MQ_BEAMOS_SILVER)
RANDO_ENUM_ITEM(RAND_INF_DODONGOS_CAVERN_MQ_1F_CRATE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_DODONGOS_CAVERN_MQ_LOWER_2F_CRATE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_DODONGOS_CAVERN_MQ_VINES_SILVER)
RANDO_ENUM_ITEM(RAND_INF_DODONGOS_CAVERN_MQ_UPPER_2F_CRATE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_W_NOOK_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_TALL_BLOCK_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_NE_UNDER_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_S_UNDER_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_N_NOOK_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_W_PIT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_HIGH_PIT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_HIGHEST_PIT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_N_PIT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_E_PIT_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_W_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_SW_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_NW_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_S_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_INNER_NE_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_SE_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_OUTSIDE_CIRCLE_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_OUTER_NE_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_E_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_SOT_BLOCK_INVISIBLE_BLADE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_PLATFORM_SPIKES_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_W_TARGET_SPIKES_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_W_AIRBORNE_SPIKES_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_N_TARGET_SPIKES_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_CENTRAL_SPIKES_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_CENTRAL_TARGET_SPIKES_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_S_TARGET_SPIKES_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_INSIDE_SPIKES_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_E_AIRBORNE_SPIKES_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SHADOW_MQ_E_TARGET_SPIKES_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_MQ_STAIRS_LOBBY_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_MQ_E_BOULDER_LOBBY_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_MQ_W_BOULDER_LOBBY_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_MQ_CORNER_LOBBY_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_MQ_JET_LOBBY_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_MQ_LOWEST_WALL_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_MQ_MID_LOW_WALL_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_MQ_MID_HIGH_WALL_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_MQ_HIGHEST_WALL_SILVER)
RANDO_ENUM_ITEM(RAND_INF_SPIRIT_MQ_MIDDLE_WALL_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_MQ_ICICLES_SLOPE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_MQ_JUMPDOWN_SLOPE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_MQ_HIGH_SLOPE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_MQ_FREEZARD_SLOPE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_MQ_PIT_SLOPE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_MQ_NEAR_SWITCH_LAVA_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_MQ_FAR_LAVA_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_MQ_MIDDLE_LAVA_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_MQ_SILVER_LAVA_4)
RANDO_ENUM_ITEM(RAND_INF_GTG_MQ_NEAR_MAZE_LEDGE_LAVA_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_MQ_NEAR_LIT_TORCH_LAVA_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_MQ_BACK_WATER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_MQ_MIDDLE_WATER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GTG_MQ_FRONT_WATER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_MQ_UNDER_PILLAR_FIRE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_MQ_NEAR_TARGET_FIRE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_MQ_ON_PILLAR_FIRE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_MQ_LAUNCH_PLATFORM_FIRE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_MQ_JET_PLATFORM_FIRE_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_MQ_IN_HOLE_WATER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_MQ_AIRBORNE_WATER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_MQ_FROZEN_WATER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_MQ_OVER_PIT_WATER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_MQ_NOOK_WATER_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_MQ_BOMB_FLOWER_SHADOW_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_MQ_NEAR_TORCH_SHADOW_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_MQ_BEAMOS_PLATFORM_SHADOW_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_MQ_GUILLOTINE_SHADOW_SILVER)
RANDO_ENUM_ITEM(RAND_INF_GANONS_CASTLE_MQ_MOVING_PLATFORM_SHADOW_SILVER)
// End Silver Rupees
RANDO_ENUM_ITEM(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_1)
RANDO_ENUM_ITEM(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_2)
RANDO_ENUM_ITEM(RAND_INF_SFM_FAIRY_GROTTO_FAIRY_3)
soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerMiscEnums.h
+1
View File
@@ -127,6 +127,7 @@ RANDO_ENUM_ITEM(RCTYPE_OCARINA) // Ocarina locations
RANDO_ENUM_ITEM(RCTYPE_BEEHIVE) // Beehives
RANDO_ENUM_ITEM(RCTYPE_FISH) // Fishes
RANDO_ENUM_ITEM(RCTYPE_FREESTANDING) // Freestanding rupees and hearts
RANDO_ENUM_ITEM(RCTYPE_SILVER) // Silver rupees
RANDO_ENUM_ITEM(RCTYPE_FOUNTAIN_FAIRY) // Fairies in Fountains
RANDO_ENUM_ITEM(RCTYPE_STONE_FAIRY) // Fairies from Gossip Stones
RANDO_ENUM_ITEM(RCTYPE_BEAN_FAIRY) // Fairies from Beans
soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerOptions.h
+8
View File
@@ -423,6 +423,14 @@ RANDO_ENUM_ITEM(RO_SHUFFLE_WONDER_ITEMS_OVERWORLD)
RANDO_ENUM_ITEM(RO_SHUFFLE_WONDER_ITEMS_ALL)
RANDO_ENUM_END(RandoOptionWonderItems)
// Shuffle Silver settings (off, on, wallet, start with)
RANDO_ENUM_BEGIN(RandoOptionSilver)
RANDO_ENUM_ITEM(RO_SHUFFLE_SILVER_OFF)
RANDO_ENUM_ITEM(RO_SHUFFLE_SILVER_ON)
RANDO_ENUM_ITEM(RO_SHUFFLE_SILVER_WALLET)
RANDO_ENUM_ITEM(RO_SHUFFLE_SILVER_STARTWITH)
RANDO_ENUM_END(RandoOptionSilver)
// Shuffle Pots settings (off, dungeons, overworld, all)
RANDO_ENUM_BEGIN(RandoOptionShufflePots)
RANDO_ENUM_ITEM(RO_SHUFFLE_POTS_OFF)
soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerRegion.h
+16 -6
View File
@@ -842,8 +842,11 @@ RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_LOWER_HUGE_PIT_DOOR_LEDGE)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_STONE_UMBRELLA)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_STONE_UMBRELLA_UPPER)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_INVISIBLE_SPINNING_BLADES)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_INVISIBLE_SPIKES)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_INVISIBLE_SPIKES_PLATFORM)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_FLOOR_SPIKES_S_DOOR)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_FLOOR_SPIKES_W_DOOR)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_FLOOR_SPIKES_ROOM)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_SPIKES_CORNER_PLATFORM)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_SPIKES_DOOR_PLATFORM)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_SKULL_JAR)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_UPPER_WIND_TUNNEL)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_LOWER_WIND_TUNNEL)
@@ -883,8 +886,12 @@ RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_MQ_LOWER_HUGE_PIT_DOOR_LEDGE)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_MQ_STONE_UMBRELLA_ROOM)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_MQ_UPPER_STONE_UMBRELLA)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_S_DOOR)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_W_DOOR)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_ROOM)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_MQ_FLOOR_SPIKES_PLATFORM)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_MQ_SPIKES_CORNER_PLATFORM)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_MQ_SPIKES_GLASS_PLATFORMS)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_MQ_SPIKES_DOOR_PLATFORM)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_MQ_STALFOS_ROOM)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_MQ_UPPER_WIND_TUNNEL)
RANDO_ENUM_ITEM(RR_SHADOW_TEMPLE_MQ_LOWER_WIND_TUNNEL)
@@ -923,6 +930,7 @@ RANDO_ENUM_ITEM(RR_BOTW_B3_OOZE)
RANDO_ENUM_ITEM(RR_BOTW_B3_BOMB_FLOWERS)
RANDO_ENUM_ITEM(RR_BOTW_B3_BLOCKED_GRASS)
RANDO_ENUM_ITEM(RR_BOTW_B3_CHEST_AREA)
RANDO_ENUM_ITEM(RR_BOTW_LADDER_DOOR)
RANDO_ENUM_ITEM(RR_BOTW_B3_PLATFORM)
RANDO_ENUM_ITEM(RR_BOTW_MQ_PERIMETER)
@@ -946,7 +954,7 @@ RANDO_ENUM_ITEM(RR_ICE_CAVERN_HUB)
RANDO_ENUM_ITEM(RR_ICE_CAVERN_MAP_ROOM)
RANDO_ENUM_ITEM(RR_ICE_CAVERN_COMPASS_ROOM)
RANDO_ENUM_ITEM(RR_ICE_CAVERN_BLOCK_ROOM)
RANDO_ENUM_ITEM(RR_ICE_CAVERN_BLOCK_ROOM_BLUE_FIRE)
RANDO_ENUM_ITEM(RR_ICE_CAVERN_BLOCK_ROOM_NOOKS)
RANDO_ENUM_ITEM(RR_ICE_CAVERN_AFTER_BLOCK_ROOM)
RANDO_ENUM_ITEM(RR_ICE_CAVERN_BEFORE_FINAL_ROOM)
RANDO_ENUM_ITEM(RR_ICE_CAVERN_FINAL_ROOM)
@@ -1009,7 +1017,7 @@ RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MAIN)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_DEKU_SCRUBS)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_FOREST_TRIAL_WOLFOS_ROOM)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_FOREST_TRIAL_BEAMOS_ROOM)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_FOREST_TRIAL_BEAMOS_ROOM_END)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_FOREST_TRIAL_BEAMOS_ROOM_MIDDLE)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_FOREST_TRIAL_BEAMOS_ROOM_FINAL_DOOR)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_FOREST_TRIAL_FINAL_ROOM)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_FIRE_TRIAL_OPEN_DOOR)
@@ -1054,13 +1062,15 @@ RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_FIRE_TRIAL_TARGET_DOOR)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_FIRE_TRIAL_FINAL_ROOM)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_WATER_TRIAL_GEYSER_ROOM)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_WATER_TRIAL_BLOCK_ROOM)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_WATER_TRIAL_BLOCK_ROOM_HIGH)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_WATER_TRIAL_BLOCK_ROOM_END)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_WATER_TRIAL_FINAL_ROOM)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_STARTING_LEDGE)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_CHEST_PLATFORM)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_MOVING_PLATFORM)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_BEAMOS_TORCH)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_FAR_SIDE)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_BEAMOS_CHEST)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_BARRED_DOOR)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_SHADOW_TRIAL_FINAL_ROOM)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_CHAIRS_ROOM)
RANDO_ENUM_ITEM(RR_GANONS_CASTLE_MQ_SPIRIT_TRIAL_BEFORE_SWITCH)
soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerSettingKey.h
+1
View File
@@ -294,6 +294,7 @@ RANDO_ENUM_ITEM(RSK_SHUFFLE_DEKU_STICK_BAG)
RANDO_ENUM_ITEM(RSK_SHUFFLE_DEKU_NUT_BAG)
RANDO_ENUM_ITEM(RSK_SHUFFLE_FREESTANDING)
RANDO_ENUM_ITEM(RSK_SHUFFLE_WONDER_ITEMS)
RANDO_ENUM_ITEM(RSK_SHUFFLE_SILVER)
RANDO_ENUM_ITEM(RSK_SHUFFLE_FOUNTAIN_FAIRIES)
RANDO_ENUM_ITEM(RSK_SHUFFLE_STONE_FAIRIES)
RANDO_ENUM_ITEM(RSK_SHUFFLE_BEAN_FAIRIES)
soh/soh/Enhancements/randomizer/randomizer_check_objects.cpp
+2
View File
@@ -179,6 +179,8 @@ void RandomizerCheckObjects::UpdateImGuiVisibility() {
((CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleFreestanding"), RO_SHUFFLE_FREESTANDING_OFF) ==
RO_SHUFFLE_FREESTANDING_DUNGEONS) &&
RandomizerCheckObjects::AreaIsDungeon(location.GetArea()))) &&
(location.GetRCType() != RCTYPE_SILVER ||
CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleSilver"), RO_GENERIC_NO)) &&
(location.GetRCType() != RCTYPE_BEEHIVE ||
CVarGetInteger(CVAR_RANDOMIZER_SETTING("ShuffleBeehives"), RO_GENERIC_NO)) &&
(location.GetRCType() != RCTYPE_COW ||
soh/soh/Enhancements/randomizer/randomizer_check_objects.h
+1 -1
View File
@@ -1,6 +1,6 @@
#pragma once
#include "randomizerTypes.h"
#include "randomizerEnums.h"
#include "z64scene.h"
#include <string>
#include <vector>
soh/soh/Enhancements/randomizer/randomizer_check_tracker.cpp
+188 -6
View File
@@ -2,6 +2,8 @@
#include "randomizer_entrance_tracker.h"
#include "randomizer_item_tracker.h"
#include "randomizerTypes.h"
#include "soh/Enhancements/randomizer/randomizerEnums.h"
#include "soh/Enhancements/randomizer/static_data.h"
#include "soh/OTRGlobals.h"
#include "soh/SaveManager.h"
#include "soh/ResourceManagerHelpers.h"
@@ -67,6 +69,7 @@ bool showBeehives;
bool showCows;
bool showOverworldFreestanding;
bool showDungeonFreestanding;
bool showSilver;
bool showAdultTrade;
bool showKokiriSword;
bool showMasterSword;
@@ -358,6 +361,9 @@ std::map<RandomizerGet, RandomizerCheckArea> MapRGtoRandomizerCheckArea = {
{ RG_ICE_CAVERN_MAP, RCAREA_ICE_CAVERN }
};
// In the case that we get an excess key or silver rupee, it spoils the MQ status
// because it is not turned into a blue rupee as excess.
// For keyrings, we can count the keys on the viewmodel
void SpoilAreaFromCheck(RandomizerCheck rc) {
Rando::Location* loc = Rando::StaticData::GetLocation(rc);
Rando::ItemLocation* itemLoc = Rando::Context::GetInstance()->GetItemLocation(rc);
@@ -367,11 +373,177 @@ void SpoilAreaFromCheck(RandomizerCheck rc) {
SetAreaSpoiled(area);
}
}
if (itemLoc->GetPlacedItem().GetItemType() == ItemType::ITEMTYPE_SILVER) {
if (!Rando::StaticData::constantSilvers.contains(itemLoc->GetPlacedRandomizerGet()) &&
!IsAreaSpoiled(Rando::StaticData::silverToArea[itemLoc->GetPlacedRandomizerGet()])) {
SetAreaSpoiled(Rando::StaticData::silverToArea[itemLoc->GetPlacedRandomizerGet()]);
} else if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_SILVER) ==
RO_SHUFFLE_SILVER_ON) {
switch (itemLoc->GetPlacedRandomizerGet()) {
case RG_SHADOW_SILVER_SPIKES:
if (*Randomizer::SilverFieldFromSaveContext(&gSaveContext, itemLoc->GetPlacedRandomizerGet()) >=
6) {
SetAreaSpoiled(RCAREA_SHADOW_TEMPLE);
}
break;
case RG_GTG_SILVER_LAVA:
if (*Randomizer::SilverFieldFromSaveContext(&gSaveContext, itemLoc->GetPlacedRandomizerGet()) >=
6) {
SetAreaSpoiled(RCAREA_GERUDO_TRAINING_GROUND);
}
break;
case RG_GTG_SILVER_WATER:
if (*Randomizer::SilverFieldFromSaveContext(&gSaveContext, itemLoc->GetPlacedRandomizerGet()) >=
4) {
SetAreaSpoiled(RCAREA_GERUDO_TRAINING_GROUND);
}
break;
default:
break;
}
}
} else if (itemLoc->GetPlacedItem().GetItemType() == ItemType::ITEMTYPE_SMALLKEY) {
switch (itemLoc->GetPlacedRandomizerGet()) {
case RG_FOREST_TEMPLE_SMALL_KEY:
if (OTRGlobals::Instance->gRandoContext->GetDungeon(Rando::FOREST_TEMPLE)
->GetTotalSmallKeys(&gSaveContext) >= 6) {
SetAreaSpoiled(RCAREA_FOREST_TEMPLE);
}
break;
case RG_FIRE_TEMPLE_SMALL_KEY:
if (OTRGlobals::Instance->gRandoContext->GetDungeon(Rando::FIRE_TEMPLE)
->GetTotalSmallKeys(&gSaveContext) >= 6) {
SetAreaSpoiled(RCAREA_FIRE_TEMPLE);
}
break;
case RG_WATER_TEMPLE_SMALL_KEY:
if (OTRGlobals::Instance->gRandoContext->GetDungeon(Rando::WATER_TEMPLE)
->GetTotalSmallKeys(&gSaveContext) >= 3) {
SetAreaSpoiled(RCAREA_WATER_TEMPLE);
}
break;
case RG_SPIRIT_TEMPLE_SMALL_KEY:
if (OTRGlobals::Instance->gRandoContext->GetDungeon(Rando::SPIRIT_TEMPLE)
->GetTotalSmallKeys(&gSaveContext) >= 6) {
SetAreaSpoiled(RCAREA_SPIRIT_TEMPLE);
}
break;
case RG_SHADOW_TEMPLE_SMALL_KEY:
if (OTRGlobals::Instance->gRandoContext->GetDungeon(Rando::SHADOW_TEMPLE)
->GetTotalSmallKeys(&gSaveContext) >= 6) {
SetAreaSpoiled(RCAREA_SHADOW_TEMPLE);
}
break;
case RG_BOTTOM_OF_THE_WELL_SMALL_KEY:
if (OTRGlobals::Instance->gRandoContext->GetDungeon(Rando::BOTTOM_OF_THE_WELL)
->GetTotalSmallKeys(&gSaveContext) >= 3) {
SetAreaSpoiled(RCAREA_BOTTOM_OF_THE_WELL);
}
break;
case RG_GERUDO_TRAINING_GROUND_SMALL_KEY:
if (OTRGlobals::Instance->gRandoContext->GetDungeon(Rando::GERUDO_TRAINING_GROUND)
->GetTotalSmallKeys(&gSaveContext) >= 4) {
SetAreaSpoiled(RCAREA_GERUDO_TRAINING_GROUND);
}
break;
case RG_FOREST_TEMPLE_KEY_RING:
SetAreaSpoiled(RCAREA_FOREST_TEMPLE);
break;
case RG_FIRE_TEMPLE_KEY_RING:
SetAreaSpoiled(RCAREA_FIRE_TEMPLE);
break;
case RG_WATER_TEMPLE_KEY_RING:
SetAreaSpoiled(RCAREA_WATER_TEMPLE);
break;
case RG_SPIRIT_TEMPLE_KEY_RING:
SetAreaSpoiled(RCAREA_SPIRIT_TEMPLE);
break;
case RG_SHADOW_TEMPLE_KEY_RING:
SetAreaSpoiled(RCAREA_SHADOW_TEMPLE);
break;
case RG_BOTTOM_OF_THE_WELL_KEY_RING:
SetAreaSpoiled(RCAREA_BOTTOM_OF_THE_WELL);
break;
case RG_GERUDO_TRAINING_GROUND_KEY_RING:
SetAreaSpoiled(RCAREA_GERUDO_TRAINING_GROUND);
break;
default:
break;
}
}
if (!IsAreaSpoiled(loc->GetArea())) {
SetAreaSpoiled(loc->GetArea());
}
}
void SpoilAreaFromCantObtain(RandomizerGet rg) {
// only spoil if it wouldn't transform anyway, in case someone manages to glitch this value
switch (rg) {
case RG_FOREST_TEMPLE_SMALL_KEY:
if (OTRGlobals::Instance->gRandoContext->GetDungeon(Rando::FOREST_TEMPLE)
->GetTotalSmallKeys(&gSaveContext) < 6) {
SetAreaSpoiled(RCAREA_FOREST_TEMPLE);
}
break;
case RG_FIRE_TEMPLE_SMALL_KEY:
if (OTRGlobals::Instance->gRandoContext->GetDungeon(Rando::FIRE_TEMPLE)->GetTotalSmallKeys(&gSaveContext) <
8) {
SetAreaSpoiled(RCAREA_FIRE_TEMPLE);
}
break;
case RG_WATER_TEMPLE_SMALL_KEY:
if (OTRGlobals::Instance->gRandoContext->GetDungeon(Rando::WATER_TEMPLE)->GetTotalSmallKeys(&gSaveContext) <
6) {
SetAreaSpoiled(RCAREA_WATER_TEMPLE);
}
break;
case RG_SPIRIT_TEMPLE_SMALL_KEY:
if (OTRGlobals::Instance->gRandoContext->GetDungeon(Rando::SPIRIT_TEMPLE)
->GetTotalSmallKeys(&gSaveContext) < 7) {
SetAreaSpoiled(RCAREA_SPIRIT_TEMPLE);
}
break;
case RG_SHADOW_TEMPLE_SMALL_KEY:
if (OTRGlobals::Instance->gRandoContext->GetDungeon(Rando::SHADOW_TEMPLE)
->GetTotalSmallKeys(&gSaveContext) < 6) {
SetAreaSpoiled(RCAREA_SHADOW_TEMPLE);
}
break;
case RG_BOTTOM_OF_THE_WELL_SMALL_KEY:
if (OTRGlobals::Instance->gRandoContext->GetDungeon(Rando::BOTTOM_OF_THE_WELL)
->GetTotalSmallKeys(&gSaveContext) < 3) {
SetAreaSpoiled(RCAREA_BOTTOM_OF_THE_WELL);
}
break;
case RG_GERUDO_TRAINING_GROUND_SMALL_KEY:
if (OTRGlobals::Instance->gRandoContext->GetDungeon(Rando::GERUDO_TRAINING_GROUND)
->GetTotalSmallKeys(&gSaveContext) < 9) {
SetAreaSpoiled(RCAREA_GERUDO_TRAINING_GROUND);
}
break;
case RG_SHADOW_SILVER_SPIKES:
if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_SILVER) == RO_SHUFFLE_SILVER_ON &&
*Randomizer::SilverFieldFromSaveContext(&gSaveContext, rg) < 10) {
SetAreaSpoiled(RCAREA_SHADOW_TEMPLE);
}
break;
case RG_GTG_SILVER_LAVA:
if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_SILVER) == RO_SHUFFLE_SILVER_ON &&
*Randomizer::SilverFieldFromSaveContext(&gSaveContext, rg) < 6) {
SetAreaSpoiled(RCAREA_GERUDO_TRAINING_GROUND);
}
break;
case RG_GTG_SILVER_WATER:
if (OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_SILVER) == RO_SHUFFLE_SILVER_ON &&
*Randomizer::SilverFieldFromSaveContext(&gSaveContext, rg) < 5) {
SetAreaSpoiled(RCAREA_GERUDO_TRAINING_GROUND);
}
break;
default:
return;
}
}
void RecalculateAllAreaTotals() {
for (auto& [rcArea, checks] : checksByArea) {
if (rcArea == RCAREA_INVALID) {
@@ -629,6 +801,7 @@ void CheckTrackerLoadGame(int32_t fileNum) {
}
for (int i = RCAREA_KOKIRI_FOREST; i < RCAREA_INVALID; i++) {
if (!IsAreaSpoiled(static_cast<RandomizerCheckArea>(i)) &&
(RandomizerCheckObjects::AreaIsOverworld(static_cast<RandomizerCheckArea>(i)) || !IS_RANDO ||
OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) == RO_MQ_DUNGEONS_NONE ||
(OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_MQ_DUNGEON_RANDOM) ==
@@ -905,11 +1078,10 @@ void CheckTrackerFlagSet(int16_t flagType, int32_t flag) {
for (auto& loc : Rando::StaticData::GetLocationTable()) {
if ((!IS_RANDO && ((loc.GetQuest() == RCQUEST_MQ && !IS_MASTER_QUEST) ||
(loc.GetQuest() == RCQUEST_VANILLA && IS_MASTER_QUEST))) ||
(IS_RANDO &&
!(OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene()) == nullptr) &&
((OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene())->IsMQ() &&
(IS_RANDO && !(OTRGlobals::Instance->gRandoContext->GetDungeonFromScene(loc.GetScene()) == nullptr) &&
((OTRGlobals::Instance->gRandoContext->GetDungeonFromScene(loc.GetScene())->IsMQ() &&
loc.GetQuest() == RCQUEST_VANILLA) ||
OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(loc.GetScene())->IsVanilla() &&
OTRGlobals::Instance->gRandoContext->GetDungeonFromScene(loc.GetScene())->IsVanilla() &&
loc.GetQuest() == RCQUEST_MQ))) {
continue;
}
@@ -1044,9 +1216,17 @@ bool IsAreaSpoiled(RandomizerCheckArea rcArea) {
return areasSpoiled & (1 << rcArea);
}
// we don't care how many silvers for this check, only that all possible silver items are known
bool AreAllSilversSpoiled() {
return IsAreaSpoiled(RCAREA_DODONGOS_CAVERN) && IsAreaSpoiled(RCAREA_BOTTOM_OF_THE_WELL) &&
IsAreaSpoiled(RCAREA_GANONS_CASTLE) && IsAreaSpoiled(RCAREA_SHADOW_TEMPLE) &&
IsAreaSpoiled(RCAREA_SPIRIT_TEMPLE) && IsAreaSpoiled(RCAREA_ICE_CAVERN);
}
void SetAreaSpoiled(RandomizerCheckArea rcArea) {
areasSpoiled |= (1 << rcArea);
SaveManager::Instance->SaveSection(gSaveContext.fileNum, sectionId, true);
RefreshItemTrackerMainWindow();
}
void InternalRecalculateAvailableChecks(RandomizerRegion startingRegion, RandoAgeTime startingAgeTime);
@@ -1325,8 +1505,7 @@ void CheckTrackerWindow::DrawElement() {
areaTotalsTooltipSS << "Checked / Total";
if (showVOrMQ && RandomizerCheckObjects::AreaIsDungeon(rcArea)) {
if (OTRGlobals::Instance->gRandoContext->GetDungeons()
->GetDungeonFromScene(DungeonSceneLookupByArea(rcArea))
if (OTRGlobals::Instance->gRandoContext->GetDungeonFromScene(DungeonSceneLookupByArea(rcArea))
->IsMQ()) {
areaTotalsSS << " - MQ";
} else {
@@ -1701,6 +1880,8 @@ void LoadSettings() {
showDungeonFreestanding = false;
break;
}
showSilver = OTRGlobals::Instance->gRandomizer->GetRandoSettingValue(RSK_SHUFFLE_SILVER);
} else { // Vanilla
showOverworldFreestanding = false;
showDungeonFreestanding = true;
@@ -1796,6 +1977,7 @@ bool IsCheckShuffled(RandomizerCheck rc) {
(loc->GetRCType() != RCTYPE_FREESTANDING ||
(showOverworldFreestanding && RandomizerCheckObjects::AreaIsOverworld(loc->GetArea())) ||
(showDungeonFreestanding && RandomizerCheckObjects::AreaIsDungeon(loc->GetArea()))) &&
(loc->GetRCType() != RCTYPE_SILVER || showSilver) &&
(loc->GetRCType() != RCTYPE_ADULT_TRADE || showAdultTrade ||
rc == RC_KAK_ANJU_AS_ADULT || // adult trade checks that are always shuffled
rc == RC_DMT_TRADE_CLAIM_CHECK // even when shuffle adult trade is off
soh/soh/Enhancements/randomizer/randomizer_check_tracker.h
+2
View File
@@ -59,6 +59,8 @@ void UpdateAllOrdering();
void UpdateAllAreas();
void RecalculateAllAreaTotals();
void SpoilAreaFromCheck(RandomizerCheck rc);
void SpoilAreaFromCantObtain(RandomizerGet rg);
void RecalculateAvailableChecks(RandomizerRegion startingRegion = RR_ROOT, RandoAgeTime startingAgeTime = RAT_NONE);
void LoadFromPreset(const nlohmann::json& info);
bool AreAllSilversSpoiled();
} // namespace CheckTracker
soh/soh/Enhancements/randomizer/randomizer_entrance_tracker.h
+1 -1
View File
@@ -9,7 +9,7 @@
#include <libultraship/color.h>
#include <libultraship/libultra.h>
#include <ship/window/gui/GuiWindow.h>
#include "randomizerTypes.h"
#include "randomizerEnums.h"
typedef enum {
// ENTRANCE_GROUP_NO_GROUP,
soh/soh/Enhancements/randomizer/randomizer_item_tracker.cpp
+818 -835
View File
File diff suppressed because it is too large Load Diff
soh/soh/Enhancements/randomizer/randomizer_item_tracker.h
+52 -21
View File
@@ -1,15 +1,29 @@
#pragma once
#include "ship/window/gui/GuiWindow.h"
#include <nlohmann/json_fwd.hpp>
#include <string>
#include <vector>
#include <stdint.h>
#include <array>
void DrawItemAmmo(int itemId);
void RefreshItemTrackerMainWindow();
typedef enum ItemKind {
ITEM_KIND_ITEM,
ITEM_KIND_QUEST,
ITEM_KIND_RG,
ITEM_KIND_SPECIAL,
ITEM_KIND_DUMMY,
} ItemKind;
typedef struct ItemTrackerItem {
uint32_t id;
std::string name;
std::string nameFaded;
ItemKind kind;
std::string displayName;
std::string iconName;
std::string fadedIconName;
uint32_t data;
void (*drawFunc)(ItemTrackerItem);
} ItemTrackerItem;
@@ -18,27 +32,44 @@ bool HasSong(ItemTrackerItem);
bool HasQuestItem(ItemTrackerItem);
bool HasEquipment(ItemTrackerItem);
#define ITEM_TRACKER_ITEM(id, data, drawFunc) \
{ id, #id, #id "_Faded", data, drawFunc }
#define ITEM_TRACKER_ITEM(id, displayName, data, drawFunc) \
{ id, ITEM_KIND_ITEM, displayName, #id, #id "_Faded", data, drawFunc }
#define ITEM_TRACKER_ITEM_CUSTOM(id, displayName, iconName, data, drawFunc) \
{ id, ITEM_KIND_ITEM, displayName, #iconName, #iconName "_Faded", data, drawFunc }
#define ITEM_TRACKER_ITEM_CUSTOM(id, name, nameFaded, data, drawFunc) \
{ id, #name, #nameFaded "_Faded", data, drawFunc }
#define ITEM_TRACKER_QUEST(id, displayName, data, drawFunc) \
{ id, ITEM_KIND_QUEST, displayName, #id, #id "_Faded", data, drawFunc }
#define ITEM_TRACKER_QUEST_CUSTOM(id, displayName, iconName, data, drawFunc) \
{ id, ITEM_KIND_QUEST, displayName, #iconName, #iconName "_Faded", data, drawFunc }
static std::vector<const char*> itemTrackerWindowIDs = { "Item Tracker",
"Inventory Items Tracker",
"Equipment Items Tracker",
"Misc Items Tracker",
"Dungeon Rewards Tracker",
"Songs Tracker",
"Dungeon Items Tracker",
"Greg Tracker",
"Triforce Piece Tracker",
"Boss Soul Tracker",
"Ocarina Button Tracker",
"Overworld Key Tracker",
"Fishing Pole Tracker",
"Personal Notes",
"Total Checks" };
#define ITEM_TRACKER_RG(id, displayName, data, drawFunc) \
{ id, ITEM_KIND_RG, displayName, #id, #id "_Faded", data, drawFunc }
#define ITEM_TRACKER_RG_CUSTOM(id, displayName, iconName, data, drawFunc) \
{ id, ITEM_KIND_RG, displayName, #iconName, #iconName "_Faded", data, drawFunc }
#define IM_COL_WHITE IM_COL32(255, 255, 255, 255)
#define IM_COL_RED IM_COL32(255, 0, 0, 255)
#define IM_COL_GREEN IM_COL32(0, 255, 0, 255)
#define IM_COL_GRAY IM_COL32(155, 155, 155, 255)
#define IM_COL_PURPLE IM_COL32(180, 90, 200, 255)
#define IM_COL_LIGHT_YELLOW IM_COL32(255, 255, 130, 255)
static std::array<const char*, 16> itemTrackerWindowIDs = { "Item Tracker",
"Inventory Items Tracker",
"Equipment Items Tracker",
"Misc Items Tracker",
"Dungeon Rewards Tracker",
"Songs Tracker",
"Dungeon Items Tracker",
"Greg Tracker",
"Triforce Piece Tracker",
"Boss Soul Tracker",
"Ocarina Button Tracker",
"Overworld Key Tracker",
"Silver Rupee Tracker",
"Fishing Pole Tracker",
"Personal Notes",
"Total Checks" };
void ItemTracker_LoadFromPreset(const nlohmann::json& trackerInfo);
typedef struct ItemTrackerDungeon {
soh/soh/Enhancements/randomizer/savefile.cpp
+6
View File
@@ -408,6 +408,12 @@ void SetStartingItems() {
}
}
if (Randomizer_GetSettingValue(RSK_SHUFFLE_SILVER) == RO_SHUFFLE_SILVER_STARTWITH) {
for (int rg = (int)RG_SHADOW_SILVER_BLADES; rg <= (int)RG_GANONS_CASTLE_MQ_SILVER_SHADOW; rg++) {
*Randomizer::SilverFieldFromSaveContext(&gSaveContext, (RandomizerGet)rg) = 10;
}
}
if (Randomizer_GetSettingValue(RSK_BOSS_KEYSANITY) == RO_DUNGEON_ITEM_LOC_STARTWITH) {
gSaveContext.inventory.dungeonItems[SCENE_FOREST_TEMPLE] |= 1; // Forest
gSaveContext.inventory.dungeonItems[SCENE_FIRE_TEMPLE] |= 1; // Fire
soh/soh/Enhancements/randomizer/settings.cpp
+3
View File
@@ -1071,6 +1071,7 @@ void Settings::CreateOptions() {
});
OPT_U8(RSK_SHUFFLE_FREESTANDING, "Shuffle Freestanding Items", {"Off", "Dungeons", "Overworld", "All Items"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleFreestanding"), mOptionDescriptions[RSK_SHUFFLE_FREESTANDING], WIDGET_CVAR_COMBOBOX, RO_SHUFFLE_FREESTANDING_OFF);
OPT_U8(RSK_SHUFFLE_WONDER_ITEMS, "Shuffle Wonder Items", {"Off", "Dungeons", "Overworld", "All Items"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleWonderItems"), mOptionDescriptions[RSK_SHUFFLE_WONDER_ITEMS], WIDGET_CVAR_COMBOBOX, RO_SHUFFLE_WONDER_ITEMS_OFF);
OPT_U8(RSK_SHUFFLE_SILVER, "Shuffle Silver Rupees", {"Off", "On", "Wallet", "Start With"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("ShuffleSilver"), mOptionDescriptions[RSK_SHUFFLE_SILVER], WIDGET_CVAR_COMBOBOX, RO_SHUFFLE_SILVER_OFF);
OPT_U8(RSK_FISHSANITY, "Fishsanity", {"Off", "Shuffle only Hyrule Loach", "Shuffle Fishing Pond", "Shuffle Overworld Fish", "Shuffle Both"}, OptionCategory::Setting, CVAR_RANDOMIZER_SETTING("Fishsanity"), mOptionDescriptions[RSK_FISHSANITY], WIDGET_CVAR_COMBOBOX, RO_FISHSANITY_OFF);
OPT_CALLBACK(RSK_FISHSANITY, {
// Hide fishing pond settings if we aren't shuffling the fishing pond
@@ -2030,6 +2031,7 @@ void Settings::CreateOptions() {
&mOptions[RSK_FISHSANITY_AGE_SPLIT],
&mOptions[RSK_SHUFFLE_FREESTANDING],
&mOptions[RSK_SHUFFLE_WONDER_ITEMS],
&mOptions[RSK_SHUFFLE_SILVER],
&mOptions[RSK_SHUFFLE_BEEHIVES],
&mOptions[RSK_SHUFFLE_COWS],
&mOptions[RSK_SHUFFLE_POTS],
@@ -2309,6 +2311,7 @@ void Settings::CreateOptions() {
&mOptions[RSK_SHUFFLE_DEKU_NUT_BAG],
&mOptions[RSK_SHUFFLE_FREESTANDING],
&mOptions[RSK_SHUFFLE_WONDER_ITEMS],
&mOptions[RSK_SHUFFLE_SILVER],
&mOptions[RSK_SHUFFLE_FOUNTAIN_FAIRIES],
&mOptions[RSK_SHUFFLE_STONE_FAIRIES],
&mOptions[RSK_SHUFFLE_BEAN_FAIRIES],
soh/soh/Enhancements/randomizer/static_data.cpp
+25
View File
@@ -537,4 +537,29 @@ std::vector<RandomizerGet> StaticData::overworldKeys = {
RG_HYLIA_LAB_KEY,
RG_FISHING_HOLE_KEY,
};
std::vector<RandomizerGet> StaticData::silverRupees = {
RG_SHADOW_SILVER_BLADES,
RG_SHADOW_SILVER_PIT,
RG_SHADOW_SILVER_SPIKES,
RG_SPIRIT_SILVER_CHILD,
RG_SPIRIT_SILVER_SUN,
RG_SPIRIT_SILVER_BOULDERS,
RG_BOTW_SILVER,
RG_ICE_CAVERN_SILVER_BLADES,
RG_ICE_CAVERN_SILVER_BLOCK,
RG_GTG_SILVER_SLOPE,
RG_GTG_SILVER_LAVA,
RG_GTG_SILVER_WATER,
RG_GANONS_CASTLE_SILVER_LIGHT,
RG_GANONS_CASTLE_SILVER_FOREST,
RG_GANONS_CASTLE_SILVER_FIRE,
RG_GANONS_CASTLE_SILVER_SPIRIT,
RG_DODONGOS_CAVERN_MQ_SILVER,
RG_SHADOW_MQ_SILVER_INVISIBLE_BLADES,
RG_SPIRIT_MQ_SILVER_LOBBY,
RG_SPIRIT_MQ_SILVER_BIG_WALL,
RG_GANONS_CASTLE_MQ_SILVER_WATER,
RG_GANONS_CASTLE_MQ_SILVER_SHADOW,
};
} // namespace Rando
soh/soh/Enhancements/randomizer/static_data.h
+4
View File
@@ -62,6 +62,7 @@ class StaticData {
static void RegisterFairyLocations();
static void RegisterPotLocations();
static void RegisterFreestandingLocations();
static void RegisterSilverLocations();
static void RegisterGrassLocations();
static void RegisterCrateLocations();
static void RegisterRockLocations();
@@ -91,11 +92,14 @@ class StaticData {
static std::unordered_map<RandomizerHint, StaticHintInfo> staticHintInfoMap;
static std::unordered_map<u32, RandomizerHint> stoneParamsToHint;
static std::unordered_map<u32, RandomizerHint> grottoChestParamsToHint;
static std::unordered_map<RandomizerGet, RandomizerCheckArea> silverToArea;
static std::set<RandomizerGet> constantSilvers;
static std::unordered_map<std::string, RandomizerTrick> trickToEnum;
static std::array<HintText, RHT_MAX> hintTextTable;
static std::vector<RandomizerGet> normalBottles;
static std::vector<RandomizerGet> beanSouls;
static std::vector<RandomizerGet> overworldKeys;
static std::vector<RandomizerGet> silverRupees;
static std::map<RandomizerGet, uint32_t> RandoGetToRandInf;
static std::unordered_map<SceneID, std::set<RandomizerGet>> itemRestrictions;
static std::set<RandomizerGet> restrictFW;
soh/soh/OTRGlobals.h
+2 -1
View File
@@ -1,3 +1,4 @@
// vim: ft=cpp
#pragma once
#define BTN_CUSTOM_MODIFIER1 0x0040
@@ -143,4 +144,4 @@ extern "C" {
uint64_t GetUnixTimestamp();
#ifdef __cplusplus
};
#endif
#endif
soh/soh/ResourceManagerHelpers.cpp
+1 -1
View File
@@ -175,7 +175,7 @@ u32 IsSceneMasterQuest(s16 sceneNum) {
}
if (IS_RANDO) {
auto dungeon = OTRGlobals::Instance->gRandoContext->GetDungeons()->GetDungeonFromScene(sceneNum);
auto dungeon = OTRGlobals::Instance->gRandoContext->GetDungeonFromScene((SceneID)sceneNum);
if (dungeon != nullptr && dungeon->IsMQ()) {
return true;
}
soh/soh/SaveManager.cpp
+56
View File
@@ -229,6 +229,34 @@ void SaveManager::LoadRandomizer() {
SaveManager::Instance->LoadData("triforcePiecesCollected",
gSaveContext.ship.quest.data.randomizer.triforcePiecesCollected);
SaveManager::Instance->LoadData("bombchuUpgradeLevel", gSaveContext.ship.quest.data.randomizer.bombchuUpgradeLevel);
SaveManager::Instance->LoadData("silverShadowBlades", gSaveContext.ship.quest.data.randomizer.silverShadowBlades);
SaveManager::Instance->LoadData("silverShadowPit", gSaveContext.ship.quest.data.randomizer.silverShadowPit);
SaveManager::Instance->LoadData("silverShadowSpikes", gSaveContext.ship.quest.data.randomizer.silverShadowSpikes);
SaveManager::Instance->LoadData("silverSpiritChild", gSaveContext.ship.quest.data.randomizer.silverSpiritChild);
SaveManager::Instance->LoadData("silverSpiritSun", gSaveContext.ship.quest.data.randomizer.silverSpiritSun);
SaveManager::Instance->LoadData("silverSpiritBoulders",
gSaveContext.ship.quest.data.randomizer.silverSpiritBoulders);
SaveManager::Instance->LoadData("silverBotw", gSaveContext.ship.quest.data.randomizer.silverBotw);
SaveManager::Instance->LoadData("silverIceCavernBlades",
gSaveContext.ship.quest.data.randomizer.silverIceCavernBlades);
SaveManager::Instance->LoadData("silverIceCavernBlock",
gSaveContext.ship.quest.data.randomizer.silverIceCavernBlock);
SaveManager::Instance->LoadData("silverGtgSlope", gSaveContext.ship.quest.data.randomizer.silverGtgSlope);
SaveManager::Instance->LoadData("silverGtgLava", gSaveContext.ship.quest.data.randomizer.silverGtgLava);
SaveManager::Instance->LoadData("silverGtgWater", gSaveContext.ship.quest.data.randomizer.silverGtgWater);
SaveManager::Instance->LoadData("silverGanonLight", gSaveContext.ship.quest.data.randomizer.silverGanonLight);
SaveManager::Instance->LoadData("silverGanonForest", gSaveContext.ship.quest.data.randomizer.silverGanonForest);
SaveManager::Instance->LoadData("silverGanonFire", gSaveContext.ship.quest.data.randomizer.silverGanonFire);
SaveManager::Instance->LoadData("silverGanonSpirit", gSaveContext.ship.quest.data.randomizer.silverGanonSpirit);
SaveManager::Instance->LoadData("silverMqDodongosCavern",
gSaveContext.ship.quest.data.randomizer.silverMqDodongosCavern);
SaveManager::Instance->LoadData("silverMqShadowInvisibleBlades",
gSaveContext.ship.quest.data.randomizer.silverMqShadowInvisibleBlades);
SaveManager::Instance->LoadData("silverMqSpiritLobby", gSaveContext.ship.quest.data.randomizer.silverMqSpiritLobby);
SaveManager::Instance->LoadData("silverMqSpiritBigWall",
gSaveContext.ship.quest.data.randomizer.silverMqSpiritBigWall);
SaveManager::Instance->LoadData("silverMqGanonWater", gSaveContext.ship.quest.data.randomizer.silverMqGanonWater);
SaveManager::Instance->LoadData("silverMqGanonShadow", gSaveContext.ship.quest.data.randomizer.silverMqGanonShadow);
SaveManager::Instance->LoadData("pendingIceTrapCount", gSaveContext.ship.pendingIceTrapCount);
@@ -383,6 +411,34 @@ void SaveManager::SaveRandomizer(SaveContext* saveContext, int sectionID, bool f
SaveManager::Instance->SaveData("triforcePiecesCollected",
saveContext->ship.quest.data.randomizer.triforcePiecesCollected);
SaveManager::Instance->SaveData("bombchuUpgradeLevel", saveContext->ship.quest.data.randomizer.bombchuUpgradeLevel);
SaveManager::Instance->SaveData("silverShadowBlades", gSaveContext.ship.quest.data.randomizer.silverShadowBlades);
SaveManager::Instance->SaveData("silverShadowPit", gSaveContext.ship.quest.data.randomizer.silverShadowPit);
SaveManager::Instance->SaveData("silverShadowSpikes", gSaveContext.ship.quest.data.randomizer.silverShadowSpikes);
SaveManager::Instance->SaveData("silverSpiritChild", gSaveContext.ship.quest.data.randomizer.silverSpiritChild);
SaveManager::Instance->SaveData("silverSpiritSun", gSaveContext.ship.quest.data.randomizer.silverSpiritSun);
SaveManager::Instance->SaveData("silverSpiritBoulders",
gSaveContext.ship.quest.data.randomizer.silverSpiritBoulders);
SaveManager::Instance->SaveData("silverBotw", gSaveContext.ship.quest.data.randomizer.silverBotw);
SaveManager::Instance->SaveData("silverIceCavernBlades",
gSaveContext.ship.quest.data.randomizer.silverIceCavernBlades);
SaveManager::Instance->SaveData("silverIceCavernBlock",
gSaveContext.ship.quest.data.randomizer.silverIceCavernBlock);
SaveManager::Instance->SaveData("silverGtgSlope", gSaveContext.ship.quest.data.randomizer.silverGtgSlope);
SaveManager::Instance->SaveData("silverGtgLava", gSaveContext.ship.quest.data.randomizer.silverGtgLava);
SaveManager::Instance->SaveData("silverGtgWater", gSaveContext.ship.quest.data.randomizer.silverGtgWater);
SaveManager::Instance->SaveData("silverGanonLight", gSaveContext.ship.quest.data.randomizer.silverGanonLight);
SaveManager::Instance->SaveData("silverGanonForest", gSaveContext.ship.quest.data.randomizer.silverGanonForest);
SaveManager::Instance->SaveData("silverGanonFire", gSaveContext.ship.quest.data.randomizer.silverGanonFire);
SaveManager::Instance->SaveData("silverGanonSpirit", gSaveContext.ship.quest.data.randomizer.silverGanonSpirit);
SaveManager::Instance->SaveData("silverMqDodongosCavern",
gSaveContext.ship.quest.data.randomizer.silverMqDodongosCavern);
SaveManager::Instance->SaveData("silverMqShadowInvisibleBlades",
gSaveContext.ship.quest.data.randomizer.silverMqShadowInvisibleBlades);
SaveManager::Instance->SaveData("silverMqSpiritLobby", gSaveContext.ship.quest.data.randomizer.silverMqSpiritLobby);
SaveManager::Instance->SaveData("silverMqSpiritBigWall",
gSaveContext.ship.quest.data.randomizer.silverMqSpiritBigWall);
SaveManager::Instance->SaveData("silverMqGanonWater", gSaveContext.ship.quest.data.randomizer.silverMqGanonWater);
SaveManager::Instance->SaveData("silverMqGanonShadow", gSaveContext.ship.quest.data.randomizer.silverMqGanonShadow);
SaveManager::Instance->SaveData("pendingIceTrapCount", saveContext->ship.pendingIceTrapCount);
soh/soh/SohGui/ImGuiUtils.cpp
+8
View File
@@ -252,6 +252,14 @@ void RegisterImGuiItemIcons() {
->LoadGuiTexture(entry.second.nameFaded, entry.second.texturePath, "", ImVec4(1, 1, 1, 0.3f));
}
ImVec4 silver = ImVec4(0.7f, 0.7f, 0.7f, 1.0f);
ImVec4 silverFaded = silver;
silverFaded.w = 0.3f;
std::dynamic_pointer_cast<Fast::Fast3dGui>(Ship::Context::GetRawInstance()->GetWindow()->GetGui())
->LoadGuiTexture("ITEM_RUPEE_SILVER", gRupeeCounterIconTex, "", silver);
std::dynamic_pointer_cast<Fast::Fast3dGui>(Ship::Context::GetRawInstance()->GetWindow()->GetGui())
->LoadGuiTexture("ITEM_RUPEE_SILVER_Faded", gRupeeCounterIconTex, "", silverFaded);
for (const auto& entry : questMapping) {
std::dynamic_pointer_cast<Fast::Fast3dGui>(Ship::Context::GetRawInstance()->GetWindow()->GetGui())
->LoadGuiTexture(entry.second.name, entry.second.texturePath, "", ImVec4(1, 1, 1, 1));
soh/src/overlays/actors/ovl_En_G_Switch/z_en_g_switch.c
+26 -23
View File
@@ -12,6 +12,7 @@
#include "objects/gameplay_keep/gameplay_keep.h"
#include "objects/object_tsubo/object_tsubo.h"
#include "objects/object_gi_rupy/object_gi_rupy.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#include "soh/frame_interpolation.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
@@ -101,7 +102,7 @@ void EnGSwitch_Init(Actor* thisx, PlayState* play) {
// "maximum number of checks"
osSyncPrintf(VT_FGCOL(PURPLE) "☆☆☆☆☆ 最大チェック数 ☆☆☆☆☆ %d\n" VT_RST, this->silverCount);
osSyncPrintf("\n\n");
if (Flags_GetSwitch(play, this->switchFlag)) {
if (GameInteractor_Should(VB_SILVER_DESPAWN, Flags_GetSwitch(play, this->switchFlag), this)) {
// This is a reference to Hokuto no Ken
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag);
Actor_Kill(&this->actor);
@@ -119,7 +120,7 @@ void EnGSwitch_Init(Actor* thisx, PlayState* play) {
Collider_SetCylinder(play, &this->collider, &this->actor, &sCylinderInit);
this->actor.draw = EnGSwitch_DrawRupee;
this->actor.shape.yOffset = 700.0f;
if (Flags_GetSwitch(play, this->switchFlag)) {
if (GameInteractor_Should(VB_SILVER_DESPAWN, Flags_GetSwitch(play, this->switchFlag), this)) {
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ Ｙｏｕ ａｒｅ Ｓｈｏｃｋ！ ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag);
Actor_Kill(&this->actor);
} else {
@@ -211,28 +212,30 @@ void EnGSwitch_WaitForObject(EnGSwitch* this, PlayState* play) {
void EnGSwitch_SilverRupeeTracker(EnGSwitch* this, PlayState* play) {
static s8 majorScale[] = { 0, 2, 4, 5, 7, 9, 11, 13, 15, 17 };
if (this->noteIndex < sCollectedCount) {
if (sCollectedCount < (CVarGetInteger(CVAR_ENHANCEMENT("SilverRupeeJingleExtend"), 0) ? 10 : 5)) {
// "sound?"
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 音？ ☆☆☆☆☆ %d\n" VT_RST, this->noteIndex);
Audio_PlaySoundTransposed(&gSfxDefaultPos, NA_SE_EV_FIVE_COUNT_LUPY, majorScale[this->noteIndex]);
this->noteIndex = sCollectedCount;
if (GameInteractor_Should(VB_SILVER_COUNT_CHECK, true, this)) {
if (this->noteIndex < sCollectedCount) {
if (sCollectedCount < (CVarGetInteger(CVAR_ENHANCEMENT("SilverRupeeJingleExtend"), 0) ? 10 : 5)) {
// "sound?"
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 音？ ☆☆☆☆☆ %d\n" VT_RST, this->noteIndex);
Audio_PlaySoundTransposed(&gSfxDefaultPos, NA_SE_EV_FIVE_COUNT_LUPY, majorScale[this->noteIndex]);
this->noteIndex = sCollectedCount;
}
}
}
if (sCollectedCount >= this->silverCount) {
// "It is now the end of the century."
// This another reference to Hokuto no Ken.
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 時はまさに世紀末〜 ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag);
// "Last!"
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ らすとぉ！ ☆☆☆☆☆ \n" VT_RST);
if ((play->sceneNum == SCENE_GERUDO_TRAINING_GROUND) && (this->actor.room == 2)) {
Flags_SetTempClear(play, this->actor.room);
} else {
Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
Flags_SetSwitch(play, this->switchFlag);
if (sCollectedCount >= this->silverCount) {
// "It is now the end of the century."
// This another reference to Hokuto no Ken.
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ 時はまさに世紀末〜 ☆☆☆☆☆ %d\n" VT_RST, this->switchFlag);
// "Last!"
osSyncPrintf(VT_FGCOL(GREEN) "☆☆☆☆☆ らすとぉ！ ☆☆☆☆☆ \n" VT_RST);
if ((play->sceneNum == SCENE_GERUDO_TRAINING_GROUND) && (this->actor.room == 2)) {
Flags_SetTempClear(play, this->actor.room);
} else {
Sfx_PlaySfxCentered(NA_SE_SY_CORRECT_CHIME);
Flags_SetSwitch(play, this->switchFlag);
}
Sfx_PlaySfxCentered(NA_SE_SY_GET_RUPY);
Actor_Kill(&this->actor);
}
Sfx_PlaySfxCentered(NA_SE_SY_GET_RUPY);
Actor_Kill(&this->actor);
}
}
@@ -240,7 +243,7 @@ void EnGSwitch_SilverRupeeIdle(EnGSwitch* this, PlayState* play) {
Player* player = GET_PLAYER(play);
this->actor.shape.rot.y += 0x800;
if (this->actor.xyzDistToPlayerSq < 900.0f) {
if (GameInteractor_Should(VB_SILVER_COLLECT, this->actor.xyzDistToPlayerSq < 900.0f, this)) {
Rupees_ChangeBy(5);
sCollectedCount++;
Sfx_PlaySfxCentered(NA_SE_SY_GET_RUPY);