mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-12-18 14:22:17 -05:00
Code Issues Projects Releases Wiki Activity

Prepare default pot contents, fix/add dungeons

Browse Source
This commit is contained in:
aMannus 2024-01-05 20:55:24 +01:00
parent 350d521c82
commit a61594d796
2 changed files with 462 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
soh/soh/Enhancements/randomizer/3drando/item_pool.cpp
View File

@ -754,27 +754,27 @@ void GenerateItemPool() {
// Shuffle Pots
if (ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_OFF)) {
for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cPot)) {
ctx->PlaceItemInLocation(loc, RG_GREEN_RUPEE, false, true);
ctx->PlaceItemInLocation(loc, Rando::StaticData::GetLocation(loc)->GetVanillaItem(), false, true);
}
} else if (ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_DUNGEONS)) {
for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cPot)) {
if (Rando::StaticData::GetLocation(loc)->IsOverworld()) {
ctx->PlaceItemInLocation(loc, RG_GREEN_RUPEE, false, true);
ctx->PlaceItemInLocation(loc, Rando::StaticData::GetLocation(loc)->GetVanillaItem(), false, true);
} else {
AddItemToMainPool(RG_GREEN_RUPEE);
AddItemToMainPool(Rando::StaticData::GetLocation(loc)->GetVanillaItem());
}
}
} else if (ctx->GetOption(RSK_SHUFFLE_POTS).Is(RO_SHUFFLE_POTS_OVERWORLD)) {
for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cPot)) {
if (Rando::StaticData::GetLocation(loc)->IsDungeon()) {
ctx->PlaceItemInLocation(loc, RG_GREEN_RUPEE, false, true);
ctx->PlaceItemInLocation(loc, Rando::StaticData::GetLocation(loc)->GetVanillaItem(), false, true);
} else {
AddItemToMainPool(RG_GREEN_RUPEE);
AddItemToMainPool(Rando::StaticData::GetLocation(loc)->GetVanillaItem());
}
}
} else {
for (RandomizerCheck loc : ctx->GetLocations(ctx->allLocations, Category::cPot)) {
AddItemToMainPool(RG_GREEN_RUPEE);
AddItemToMainPool(Rando::StaticData::GetLocation(loc)->GetVanillaItem());
}
}

456
soh/soh/Enhancements/randomizer/dungeon.cpp
View File

@ -205,6 +205,36 @@ Dungeons::Dungeons() {
RC_DODONGOS_CAVERN_GS_ALCOVE_ABOVE_STAIRS,
RC_DODONGOS_CAVERN_GS_BACK_ROOM,
RC_DODONGOS_CAVERN_GS_SIDE_ROOM_NEAR_LOWER_LIZALFOS,
// Vanilla Pots
RC_DODONGOS_CAVERN_LIZALFOS_POT_1,
RC_DODONGOS_CAVERN_LIZALFOS_POT_2,
RC_DODONGOS_CAVERN_LIZALFOS_POT_3,
RC_DODONGOS_CAVERN_LIZALFOS_POT_4,
RC_DODONGOS_CAVERN_SIDE_ROOM_POT_1,
RC_DODONGOS_CAVERN_SIDE_ROOM_POT_2,
RC_DODONGOS_CAVERN_SIDE_ROOM_POT_3,
RC_DODONGOS_CAVERN_SIDE_ROOM_POT_4,
RC_DODONGOS_CAVERN_SIDE_ROOM_POT_5,
RC_DODONGOS_CAVERN_SIDE_ROOM_POT_6,
RC_DODONGOS_CAVERN_TORCH_ROOM_POT_1,
RC_DODONGOS_CAVERN_TORCH_ROOM_POT_2,
RC_DODONGOS_CAVERN_TORCH_ROOM_POT_3,
RC_DODONGOS_CAVERN_TORCH_ROOM_POT_4,
RC_DODONGOS_CAVERN_STAIRCASE_POT_1,
RC_DODONGOS_CAVERN_STAIRCASE_POT_2,
RC_DODONGOS_CAVERN_STAIRCASE_POT_3,
RC_DODONGOS_CAVERN_STAIRCASE_POT_4,
RC_DODONGOS_CAVERN_SINGLE_EYE_POT_1,
RC_DODONGOS_CAVERN_SINGLE_EYE_POT_2,
RC_DODONGOS_CAVERN_BLADE_POT_1,
RC_DODONGOS_CAVERN_BLADE_POT_2,
RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_1,
RC_DODONGOS_CAVERN_DOUBLE_EYE_POT_2,
RC_DODONGOS_CAVERN_BACK_ROOM_POT_1,
RC_DODONGOS_CAVERN_BACK_ROOM_POT_2,
RC_DODONGOS_CAVERN_BACK_ROOM_POT_3,
RC_DODONGOS_CAVERN_BACK_ROOM_POT_4,
},
{
// MQ Locations
@ -223,6 +253,38 @@ Dungeons::Dungeons() {
RC_DODONGOS_CAVERN_MQ_GS_LIZALFOS_ROOM,
RC_DODONGOS_CAVERN_MQ_GS_LARVAE_ROOM,
RC_DODONGOS_CAVERN_MQ_GS_BACK_AREA,
// MQ Pots
RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_1,
RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_2,
RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_3,
RC_DODONGOS_CAVERN_MQ_RIGHT_SIDE_POT_4,
RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_1,
RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_2,
RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_3,
RC_DODONGOS_CAVERN_MQ_UPPER_LIZALFOS_POT_4,
RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_1,
RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_2,
RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_3,
RC_DODONGOS_CAVERN_MQ_POE_ROOM_POT_4,
RC_DODONGOS_CAVERN_MQ_BLOCK_ROOM_POT_1,
RC_DODONGOS_CAVERN_MQ_BLOCK_ROOM_POT_2,
RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_1,
RC_DODONGOS_CAVERN_MQ_TWO_FLAMES_POT_2,
RC_DODONGOS_CAVERN_MQ_SILVER_BLOCK_POT_1,
RC_DODONGOS_CAVERN_MQ_SILVER_BLOCK_POT_2,
RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_1,
RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_2,
RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_3,
RC_DODONGOS_CAVERN_MQ_STAIRCASE_POT_4,
RC_DODONGOS_CAVERN_MQ_ARMOS_POT_1,
RC_DODONGOS_CAVERN_MQ_ARMOS_POT_2,
RC_DODONGOS_CAVERN_MQ_ARMOS_POT_3,
RC_DODONGOS_CAVERN_MQ_ARMOS_POT_4,
RC_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_1,
RC_DODONGOS_CAVERN_MQ_BEFORE_BOSS_POT_2,
RC_DODONGOS_CAVERN_MQ_BACKROOM_POT_1,
RC_DODONGOS_CAVERN_MQ_BACKROOM_POT_2,
},
{},
{
@ -243,6 +305,25 @@ Dungeons::Dungeons() {
RC_JABU_JABUS_BELLY_GS_LOBBY_BASEMENT_UPPER,
RC_JABU_JABUS_BELLY_GS_NEAR_BOSS,
RC_JABU_JABUS_BELLY_GS_WATER_SWITCH_ROOM,
// Vanilla Pots
RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_1,
RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_2,
RC_JABU_JABUS_BELLY_ABOVE_BIG_OCTO_POT_3,
RC_JABU_JABUS_BELLY_BARINADE_POT_1,
RC_JABU_JABUS_BELLY_BARINADE_POT_2,
RC_JABU_JABUS_BELLY_BARINADE_POT_3,
RC_JABU_JABUS_BELLY_BARINADE_POT_4,
RC_JABU_JABUS_BELLY_BARINADE_POT_5,
RC_JABU_JABUS_BELLY_BARINADE_POT_6,
RC_JABU_JABUS_BELLY_BASEMENT_POT_1,
RC_JABU_JABUS_BELLY_BASEMENT_POT_2,
RC_JABU_JABUS_BELLY_BASEMENT_POT_3,
RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_1,
RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_2,
RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_3,
RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_4,
RC_JABU_JABUS_BELLY_TWO_OCTOROK_POT_5,
},
{
// MQ Locations
@ -262,6 +343,23 @@ Dungeons::Dungeons() {
RC_JABU_JABUS_BELLY_MQ_GS_INVISIBLE_ENEMIES_ROOM,
RC_JABU_JABUS_BELLY_MQ_GS_BOOMERANG_CHEST_ROOM,
RC_JABU_JABUS_BELLY_MQ_GS_NEAR_BOSS,
// MQ Pots
RC_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_1,
RC_JABU_JABUS_BELLY_MQ_ENTRANCE_POT_2,
RC_JABU_JABUS_BELLY_MQ_GEYSER_POT_1,
RC_JABU_JABUS_BELLY_MQ_GEYSER_POT_2,
RC_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_1,
RC_JABU_JABUS_BELLY_MQ_TIME_BLOCK_POT_2,
RC_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_1,
RC_JABU_JABUS_BELLY_MQ_LIKE_LIKES_POT_2,
RC_JABU_JABUS_BELLY_MQ_BEFORE_BOSS_POT_1,
RC_JABU_JABUS_BELLY_MQ_BARINADE_POT_1,
RC_JABU_JABUS_BELLY_MQ_BARINADE_POT_2,
RC_JABU_JABUS_BELLY_MQ_BARINADE_POT_3,
RC_JABU_JABUS_BELLY_MQ_BARINADE_POT_4,
RC_JABU_JABUS_BELLY_MQ_BARINADE_POT_5,
RC_JABU_JABUS_BELLY_MQ_BARINADE_POT_6,
},
{},
{
@ -292,6 +390,27 @@ Dungeons::Dungeons() {
RC_FOREST_TEMPLE_GS_LEVEL_ISLAND_COURTYARD,
RC_FOREST_TEMPLE_GS_LOBBY,
RC_FOREST_TEMPLE_GS_BASEMENT,
// Vanilla Pots
RC_FOREST_TEMPLE_LOBBY_POT_1,
RC_FOREST_TEMPLE_LOBBY_POT_2,
RC_FOREST_TEMPLE_LOBBY_POT_3,
RC_FOREST_TEMPLE_LOBBY_POT_4,
RC_FOREST_TEMPLE_LOBBY_POT_5,
RC_FOREST_TEMPLE_LOBBY_POT_6,
RC_FOREST_TEMPLE_LOWER_STALFOS_POT_1,
RC_FOREST_TEMPLE_LOWER_STALFOS_POT_2,
RC_FOREST_TEMPLE_GREEN_POE_POT_1,
RC_FOREST_TEMPLE_GREEN_POE_POT_2,
RC_FOREST_TEMPLE_UPPER_STALFOS_POT_1,
RC_FOREST_TEMPLE_UPPER_STALFOS_POT_2,
RC_FOREST_TEMPLE_UPPER_STALFOS_POT_3,
RC_FOREST_TEMPLE_UPPER_STALFOS_POT_4,
RC_FOREST_TEMPLE_BLUE_POE_POT_1,
RC_FOREST_TEMPLE_BLUE_POE_POT_2,
RC_FOREST_TEMPLE_BLUE_POE_POT_3,
RC_FOREST_TEMPLE_FROZEN_EYE_POT_1,
RC_FOREST_TEMPLE_FROZEN_EYE_POT_2,
},
{
// MQ Locations
@ -312,6 +431,29 @@ Dungeons::Dungeons() {
RC_FOREST_TEMPLE_MQ_GS_RAISED_ISLAND_COURTYARD,
RC_FOREST_TEMPLE_MQ_GS_LEVEL_ISLAND_COURTYARD,
RC_FOREST_TEMPLE_MQ_GS_WELL,
// MQ Pots
RC_FOREST_TEMPLE_MQ_LOBBY_POT_1,
RC_FOREST_TEMPLE_MQ_LOBBY_POT_2,
RC_FOREST_TEMPLE_MQ_LOBBY_POT_3,
RC_FOREST_TEMPLE_MQ_LOBBY_POT_4,
RC_FOREST_TEMPLE_MQ_LOBBY_POT_5,
RC_FOREST_TEMPLE_MQ_LOBBY_POT_6,
RC_FOREST_TEMPLE_MQ_LOWER_STALFOS_POT_1,
RC_FOREST_TEMPLE_MQ_LOWER_STALFOS_POT_2,
RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_1,
RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_2,
RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_3,
RC_FOREST_TEMPLE_MQ_UPPER_STALFOS_POT_4,
RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_1,
RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_2,
RC_FOREST_TEMPLE_MQ_BLUE_POE_POT_3,
RC_FOREST_TEMPLE_MQ_GREEN_POE_POT_1,
RC_FOREST_TEMPLE_MQ_GREEN_POE_POT_2,
RC_FOREST_TEMPLE_MQ_BASEMENT_POT_1,
RC_FOREST_TEMPLE_MQ_BASEMENT_POT_2,
RC_FOREST_TEMPLE_MQ_BASEMENT_POT_3,
RC_FOREST_TEMPLE_MQ_BASEMENT_POT_4,
},
{},
{
@ -343,6 +485,23 @@ Dungeons::Dungeons() {
RC_FIRE_TEMPLE_GS_BOULDER_MAZE,
RC_FIRE_TEMPLE_GS_SCARECROW_TOP,
RC_FIRE_TEMPLE_GS_SCARECROW_CLIMB,
// Vanilla Pots
RC_FIRE_TEMPLE_NEAR_BOSS_POT_1,
RC_FIRE_TEMPLE_NEAR_BOSS_POT_2,
RC_FIRE_TEMPLE_NEAR_BOSS_POT_3,
RC_FIRE_TEMPLE_NEAR_BOSS_POT_4,
RC_FIRE_TEMPLE_BIG_LAVA_POT_1,
RC_FIRE_TEMPLE_BIG_LAVA_POT_2,
RC_FIRE_TEMPLE_BIG_LAVA_POT_3,
RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_1,
RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_2,
RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_3,
RC_FIRE_TEMPLE_FLAME_MAZE_LEFT_POT_4,
RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_1,
RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_2,
RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_3,
RC_FIRE_TEMPLE_FLAME_MAZE_RIGHT_POT_4,
},
{
// MQ Locations
@ -363,6 +522,36 @@ Dungeons::Dungeons() {
RC_FIRE_TEMPLE_MQ_GS_BIG_LAVA_ROOM_OPEN_DOOR,
RC_FIRE_TEMPLE_MQ_GS_FIRE_WALL_MAZE_SIDE_ROOM,
RC_FIRE_TEMPLE_MQ_GS_SKULL_ON_FIRE,
// MQ Pots
RC_FIRE_TEMPLE_MQ_ENTRANCE_POT_1,
RC_FIRE_TEMPLE_MQ_ENTRANCE_POT_2,
RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_1,
RC_FIRE_TEMPLE_MQ_OUTSIDE_BOSS_POT_2,
RC_FIRE_TEMPLE_MQ_LAVA_POT_1,
RC_FIRE_TEMPLE_MQ_LAVA_POT_2,
RC_FIRE_TEMPLE_MQ_LAVA_POT_3,
RC_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_1,
RC_FIRE_TEMPLE_MQ_LAVA_TORCH_POT_2,
RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_1,
RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_2,
RC_FIRE_TEMPLE_MQ_ABOVE_LAVA_POT_3,
RC_FIRE_TEMPLE_MQ_FLAME_WALL_POT_1,
RC_FIRE_TEMPLE_MQ_FLAME_WALL_POT_2,
RC_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_1,
RC_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_2,
RC_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_3,
RC_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_4,
RC_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_5,
RC_FIRE_TEMPLE_MQ_FIRE_MAZE_POT_6,
RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_1,
RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_2,
RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_3,
RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_4,
RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_5,
RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_6,
RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_7,
RC_FIRE_TEMPLE_MQ_BEFORE_MINI_BOSS_POT_8,
},
{},
{
@ -390,6 +579,29 @@ Dungeons::Dungeons() {
RC_WATER_TEMPLE_GS_CENTRAL_PILLAR,
RC_WATER_TEMPLE_GS_NEAR_BOSS_KEY_CHEST,
RC_WATER_TEMPLE_GS_RIVER,
// Vanilla Pots
RC_WATER_TEMPLE_MAIN_LEVEL_2_POT_1,
RC_WATER_TEMPLE_MAIN_LEVEL_2_POT_2,
RC_WATER_TEMPLE_MAIN_LEVEL_1_POT_1,
RC_WATER_TEMPLE_MAIN_LEVEL_1_POT_2,
RC_WATER_TEMPLE_TORCH_POT_1,
RC_WATER_TEMPLE_TORCH_POT_2,
RC_WATER_TEMPLE_NEAR_COMPASS_POT_1,
RC_WATER_TEMPLE_NEAR_COMPASS_POT_2,
RC_WATER_TEMPLE_NEAR_COMPASS_POT_3,
RC_WATER_TEMPLE_CENTRAL_BOW_POT_1,
RC_WATER_TEMPLE_CENTRAL_BOW_POT_2,
RC_WATER_TEMPLE_BEHIND_GATE_POT_1,
RC_WATER_TEMPLE_BEHIND_GATE_POT_2,
RC_WATER_TEMPLE_BEHIND_GATE_POT_3,
RC_WATER_TEMPLE_BEHIND_GATE_POT_4,
RC_WATER_TEMPLE_BASEMENT_POT_1,
RC_WATER_TEMPLE_BASEMENT_POT_2,
RC_WATER_TEMPLE_RIVER_POT_1,
RC_WATER_TEMPLE_RIVER_POT_2,
RC_WATER_TEMPLE_LIKE_LIKE_POT_1,
RC_WATER_TEMPLE_LIKE_LIKE_POT_2,
},
{
// MQ Locations
@ -404,6 +616,39 @@ Dungeons::Dungeons() {
RC_WATER_TEMPLE_MQ_GS_LIZALFOS_HALLWAY,
RC_WATER_TEMPLE_MQ_GS_RIVER,
RC_WATER_TEMPLE_MQ_GS_TRIPLE_WALL_TORCH,
// MQ Pots
RC_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_1,
RC_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_2,
RC_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_3,
RC_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_4,
RC_WATER_TEMPLE_MQ_CENTRAL_GATE_POT_5,
RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_1,
RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_2,
RC_WATER_TEMPLE_MQ_STORAGE_ROOM_A_POT_3,
RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_1,
RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_2,
RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_3,
RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_4,
RC_WATER_TEMPLE_MQ_BEFORE_DARK_LINK_POT_5,
RC_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_1,
RC_WATER_TEMPLE_MQ_AFTER_DARK_LINK_POT_2,
RC_WATER_TEMPLE_MQ_RIVER_POT_1,
RC_WATER_TEMPLE_MQ_RIVER_POT_2,
RC_WATER_TEMPLE_MQ_MINI_DODONGO_POT_1,
RC_WATER_TEMPLE_MQ_MINI_DODONGO_POT_2,
RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_1,
RC_WATER_TEMPLE_MQ_STORAGE_ROOM_B_POT_2,
RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_1,
RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_2,
RC_WATER_TEMPLE_MQ_GS_STORAGE_ROOM_POT_3,
RC_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_1,
RC_WATER_TEMPLE_MQ_LOWER_TORCHES_POT_2,
RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_1,
RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_2,
RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_3,
RC_WATER_TEMPLE_MQ_LOWEST_GS_POT_4,
RC_WATER_TEMPLE_MQ_BOSS_KEY_POT,
},
{},
{
@ -438,6 +683,24 @@ Dungeons::Dungeons() {
RC_SPIRIT_TEMPLE_GS_LOBBY,
RC_SPIRIT_TEMPLE_GS_SUN_ON_FLOOR_ROOM,
RC_SPIRIT_TEMPLE_GS_METAL_FENCE,
// Vanilla Pots
RC_SPIRIT_TEMPLE_LOBBY_POT_1,
RC_SPIRIT_TEMPLE_LOBBY_POT_2,
RC_SPIRIT_TEMPLE_ANUBIS_POT_1,
RC_SPIRIT_TEMPLE_ANUBIS_POT_2,
RC_SPIRIT_TEMPLE_ANUBIS_POT_3,
RC_SPIRIT_TEMPLE_ANUBIS_POT_4,
RC_SPIRIT_TEMPLE_CHILD_CLIMB_POT_1,
RC_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_1,
RC_SPIRIT_TEMPLE_AFTER_SUN_BLOCK_POT_2,
RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_1,
RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_2,
RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_3,
RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_4,
RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_5,
RC_SPIRIT_TEMPLE_CENTRAL_CHAMBER_POT_6,
RC_SPIRIT_TEMPLE_BEAMOS_HALL_POT_1,
},
{
// MQ Locations
@ -466,6 +729,37 @@ Dungeons::Dungeons() {
RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_WEST,
RC_SPIRIT_TEMPLE_MQ_GS_NINE_THRONES_ROOM_NORTH,
RC_SPIRIT_TEMPLE_MQ_GS_SUN_BLOCK_ROOM,
// MQ Pots
RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_1,
RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_2,
RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_3,
RC_SPIRIT_TEMPLE_MQ_ENTRANCE_POT_4,
RC_SPIRIT_TEMPLE_MQ_CHILD_SLUGMA_POT,
RC_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_1,
RC_SPIRIT_TEMPLE_MQ_CHILD_GIBDO_POT_2,
RC_SPIRIT_TEMPLE_MQ_CHILD_LIKE_LIKE_POT,
RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_1,
RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_2,
RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_3,
RC_SPIRIT_TEMPLE_MQ_CHILD_STALFOS_POT_4,
RC_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_1,
RC_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_2,
RC_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_3,
RC_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_4,
RC_SPIRIT_TEMPLE_MQ_CENTRAL_CHAMBER_POT_5,
RC_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_1,
RC_SPIRIT_TEMPLE_MQ_SUN_BLOCKS_POT_2,
RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_1,
RC_SPIRIT_TEMPLE_MQ_LONG_CLIMB_POT_2,
RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_1,
RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_2,
RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_3,
RC_SPIRIT_TEMPLE_MQ_BIG_MIRROR_POT_4,
RC_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_1,
RC_SPIRIT_TEMPLE_MQ_BEFORE_MIRROR_POT_2,
RC_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_1,
RC_SPIRIT_TEMPLE_MQ_EARLY_ADULT_POT_2,
},
{
// Shared Locations
@ -504,6 +798,29 @@ Dungeons::Dungeons() {
RC_SHADOW_TEMPLE_GS_TRIPLE_GIANT_POT,
RC_SHADOW_TEMPLE_GS_LIKE_LIKE_ROOM,
RC_SHADOW_TEMPLE_GS_NEAR_SHIP,
// Vanilla Pots
RC_SHADOW_TEMPLE_NEAR_DEAD_HAND_POT_1,
RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_1,
RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_2,
RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_3,
RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_4,
RC_SHADOW_TEMPLE_WHISPERING_WALLS_POT_5,
RC_SHADOW_TEMPLE_MAP_CHEST_POT_1,
RC_SHADOW_TEMPLE_MAP_CHEST_POT_2,
RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_1,
RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_2,
RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_3,
RC_SHADOW_TEMPLE_FALLING_SPIKES_POT_4,
RC_SHADOW_TEMPLE_AFTER_WIND_POT_1,
RC_SHADOW_TEMPLE_AFTER_WIND_POT_2,
RC_SHADOW_TEMPLE_SPIKE_WALLS_POT_1,
RC_SHADOW_TEMPLE_FLOORMASTER_POT_1,
RC_SHADOW_TEMPLE_FLOORMASTER_POT_2,
RC_SHADOW_TEMPLE_AFTER_BOAT_POT_1,
RC_SHADOW_TEMPLE_AFTER_BOAT_POT_2,
RC_SHADOW_TEMPLE_AFTER_BOAT_POT_3,
RC_SHADOW_TEMPLE_AFTER_BOAT_POT_4,
},
{
// MQ Locations
@ -532,6 +849,25 @@ Dungeons::Dungeons() {
RC_SHADOW_TEMPLE_MQ_GS_AFTER_WIND,
RC_SHADOW_TEMPLE_MQ_GS_AFTER_SHIP,
RC_SHADOW_TEMPLE_MQ_GS_NEAR_BOSS,
// MQ Pots
RC_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_1,
RC_SHADOW_TEMPLE_MQ_WHISPERING_WALLS_POT_2,
RC_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_1,
RC_SHADOW_TEMPLE_MQ_ENTRANCE_REDEAD_POT_2,
RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_1,
RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_2,
RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_3,
RC_SHADOW_TEMPLE_MQ_FALLING_SPIKES_POT_4,
RC_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_1,
RC_SHADOW_TEMPLE_MQ_BEFORE_BOAT_POT_2,
RC_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_1,
RC_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_2,
RC_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_3,
RC_SHADOW_TEMPLE_MQ_AFTER_BOAT_POT_4,
RC_SHADOW_TEMPLE_MQ_SPIKE_BARICADE_POT,
RC_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_1,
RC_SHADOW_TEMPLE_MQ_DEAD_HAND_POT_2,
},
{},
{
@ -561,6 +897,27 @@ Dungeons::Dungeons() {
RC_BOTTOM_OF_THE_WELL_GS_LIKE_LIKE_CAGE,
RC_BOTTOM_OF_THE_WELL_GS_EAST_INNER_ROOM,
RC_BOTTOM_OF_THE_WELL_GS_WEST_INNER_ROOM,
// Vanilla Pots
RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_1,
RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_2,
RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_3,
RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_4,
RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_5,
RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_6,
RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_7,
RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_8,
RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_9,
RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_10,
RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_11,
RC_BOTTOM_OF_THE_WELL_BASEMENT_POT_12,
RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_1,
RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_2,
RC_BOTTOM_OF_THE_WELL_LEFT_SIDE_POT_3,
RC_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_1,
RC_BOTTOM_OF_THE_WELL_NEAR_ENTRANCE_POT_2,
RC_BOTTOM_OF_THE_WELL_FIRE_KEESE_POT_1,
RC_BOTTOM_OF_THE_WELL_UNDERWATER_POT,
},
{
// MQ Locations
@ -572,6 +929,15 @@ Dungeons::Dungeons() {
RC_BOTTOM_OF_THE_WELL_MQ_GS_BASEMENT,
RC_BOTTOM_OF_THE_WELL_MQ_GS_COFFIN_ROOM,
RC_BOTTOM_OF_THE_WELL_MQ_GS_WEST_INNER_ROOM,
// MQ Pots
RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_1,
RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_2,
RC_BOTTOM_OF_THE_WELL_MQ_INNER_LOBBY_POT_3,
RC_BOTTOM_OF_THE_WELL_MQ_OUTER_LOBBY_POT,
RC_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_1,
RC_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_2,
RC_BOTTOM_OF_THE_WELL_MQ_SOUTH_KEY_POT_3,
},
{}, {});
dungeonList[ICE_CAVERN] = DungeonInfo("Ice Cavern", RHT_ICE_CAVERN, RG_ICE_CAVERN_MAP, RG_ICE_CAVERN_COMPASS,
@ -585,6 +951,16 @@ Dungeons::Dungeons() {
RC_ICE_CAVERN_GS_PUSH_BLOCK_ROOM,
RC_ICE_CAVERN_GS_SPINNING_SCYTHE_ROOM,
RC_ICE_CAVERN_GS_HEART_PIECE_ROOM,
// Vanilla Pots
RC_ICE_CAVERN_HALL_POT_1,
RC_ICE_CAVERN_HALL_POT_2,
RC_ICE_CAVERN_SPINNING_BLADE_POT_1,
RC_ICE_CAVERN_SPINNING_BLADE_POT_2,
RC_ICE_CAVERN_SPINNING_BLADE_POT_3,
RC_ICE_CAVERN_NEAR_END_POT_1,
RC_ICE_CAVERN_NEAR_END_POT_2,
RC_ICE_CAVERN_FROZEN_POT_1,
},
{
// MQ Locations
@ -595,6 +971,19 @@ Dungeons::Dungeons() {
RC_ICE_CAVERN_MQ_GS_SCARECROW,
RC_ICE_CAVERN_MQ_GS_ICE_BLOCK,
RC_ICE_CAVERN_MQ_GS_RED_ICE,
// MQ Pots
RC_ICE_CAVERN_MQ_ENTRANCE_POT,
RC_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_1,
RC_ICE_CAVERN_MQ_FIRST_CRYSTAL_POT_2,
RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_1,
RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_2,
RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_3,
RC_ICE_CAVERN_MQ_EARLY_WOLFOS_POT_4,
RC_ICE_CAVERN_MQ_PUSH_BLOCK_POT_1,
RC_ICE_CAVERN_MQ_PUSH_BLOCK_POT_2,
RC_ICE_CAVERN_MQ_COMPASS_POT_1,
RC_ICE_CAVERN_MQ_COMPASS_POT_2,
},
{
// Shared Locations
@ -674,6 +1063,41 @@ Dungeons::Dungeons() {
RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_LEFT,
RC_GANONS_CASTLE_DEKU_SCRUB_CENTER_RIGHT,
RC_GANONS_CASTLE_DEKU_SCRUB_RIGHT,
// Vanilla Pots
RC_GANONS_CASTLE_FOREST_TRIAL_POT_1,
RC_GANONS_CASTLE_FOREST_TRIAL_POT_2,
RC_GANONS_CASTLE_FIRE_TRIAL_POT_1,
RC_GANONS_CASTLE_FIRE_TRIAL_POT_2,
RC_GANONS_CASTLE_WATER_TRIAL_POT_1,
RC_GANONS_CASTLE_WATER_TRIAL_POT_2,
RC_GANONS_CASTLE_SHADOW_TRIAL_POT_1,
RC_GANONS_CASTLE_SHADOW_TRIAL_POT_2,
RC_GANONS_CASTLE_SHADOW_TRIAL_POT_3,
RC_GANONS_CASTLE_SHADOW_TRIAL_POT_4,
RC_GANONS_CASTLE_SPIRIT_TRIAL_POT_1,
RC_GANONS_CASTLE_SPIRIT_TRIAL_POT_2,
RC_GANONS_CASTLE_LIGHT_TRIAL_BOULDER_POT_1,
RC_GANONS_CASTLE_LIGHT_TRIAL_POT_1,
RC_GANONS_CASTLE_LIGHT_TRIAL_POT_2,
RC_GANONS_CASTLE_GANONS_TOWER_POT_1,
RC_GANONS_CASTLE_GANONS_TOWER_POT_2,
RC_GANONS_CASTLE_GANONS_TOWER_POT_3,
RC_GANONS_CASTLE_GANONS_TOWER_POT_4,
RC_GANONS_CASTLE_GANONS_TOWER_POT_5,
RC_GANONS_CASTLE_GANONS_TOWER_POT_6,
RC_GANONS_CASTLE_GANONS_TOWER_POT_7,
RC_GANONS_CASTLE_GANONS_TOWER_POT_8,
RC_GANONS_CASTLE_GANONS_TOWER_POT_9,
RC_GANONS_CASTLE_GANONS_TOWER_POT_10,
RC_GANONS_CASTLE_GANONS_TOWER_POT_11,
RC_GANONS_CASTLE_GANONS_TOWER_POT_12,
RC_GANONS_CASTLE_GANONS_TOWER_POT_13,
RC_GANONS_CASTLE_GANONS_TOWER_POT_14,
RC_GANONS_CASTLE_GANONS_TOWER_POT_15,
RC_GANONS_CASTLE_GANONS_TOWER_POT_16,
RC_GANONS_CASTLE_GANONS_TOWER_POT_17,
RC_GANONS_CASTLE_GANONS_TOWER_POT_18,
},
{
// MQ Locations
@ -695,6 +1119,38 @@ Dungeons::Dungeons() {
RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER,
RC_GANONS_CASTLE_MQ_DEKU_SCRUB_CENTER_RIGHT,
RC_GANONS_CASTLE_MQ_DEKU_SCRUB_LEFT,
// MQ Pots
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_1,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_2,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_3,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_4,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_5,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_6,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_7,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_8,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_9,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_10,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_11,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_12,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_13,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_14,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_15,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_16,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_17,
RC_GANONS_CASTLE_MQ_GANONS_TOWER_POT_18,
RC_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_1,
RC_GANONS_CASTLE_MQ_FOREST_TRIAL_POT_2,
RC_GANONS_CASTLE_MQ_WATER_TRIAL_POT_1,
RC_GANONS_CASTLE_MQ_WATER_TRIAL_POT_2,
RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_1,
RC_GANONS_CASTLE_MQ_SHADOW_TRIAL_POT_2,
RC_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_1,
RC_GANONS_CASTLE_MQ_FIRE_TRIAL_POT_2,
RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_1,
RC_GANONS_CASTLE_MQ_LIGHT_TRIAL_POT_2,
RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_1,
RC_GANONS_CASTLE_MQ_SPIRIT_TRIAL_POT_2,
},
{
// Shared Locations