nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor water (#5916)

Browse Source 
Co-authored-by: Pepper0ni
This commit is contained in:
Philip Dubé
2026-01-02 23:58:32 +00:00
committed by GitHub
parent 7d6c6f032e
commit 657b78a016
5 changed files with 1072 additions and 412 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1188
soh/soh/Enhancements/randomizer/location_access/dungeons/water_temple.cpp
View File

File diff suppressed because it is too large Load Diff

138
soh/soh/Enhancements/randomizer/logic.cpp
View File

@@ -797,8 +797,19 @@ bool Logic::CanKillEnemy(RandomizerEnemy enemy, EnemyDistance distance, bool wal
case RE_GANON:
return HasBossSoul(RG_GANON_SOUL) && CanUse(RG_MASTER_SWORD);
case RE_DARK_LINK:
// RANDOTODO Dark link is buggy right now, retest when he is not
return CanJumpslash() || CanUse(RG_FAIRY_BOW);
// RANDOTODO make a function to track our ammo vs his HP when ammo capacity is taken into account in logic
// all swords can at least trade blows with dark link, and even with 1 damage a slash it works out
return CanUseSword() ||
// Boomerang is a relaible, infinite ammo stun, so it enables any way to get enough damage with the
// ammo we have Max HP dark link has 40 HP, bows and bombs do 2 so 20 ammo, stick jumpslash does 4 so
// 10 sticks
(CanUse(RG_BOOMERANG) &&
(CanUse(RG_FAIRY_BOW) || CanUse(RG_STICKS) || CanUse(RG_MEGATON_HAMMER) || HasExplosives())) ||
// By using deku nuts against the wall, you can stun him roughly half the time, which makes 4 damage
// attacks reliable on base nuts
(CanUse(RG_NUTS) && (CanUse(RG_STICKS) || CanUse(RG_MEGATON_HAMMER)));
// Dins does 2 damage, but is reliable, so would need 20 casts for max HP dark link. normal magic gives 4
// casts, double 8, and then potions can add more
case RE_ANUBIS:
// there's a restoration that allows beating them with mirror shield + some way to trigger their attack
return HasFireSource();
@@ -1011,41 +1022,74 @@ bool Logic::CanDetonateUprightBombFlower() {
(EffectiveHealth() != 1 || CanUse(RG_NAYRUS_LOVE)));
}
bool Logic::MQWaterLevel(RandoWaterLevel level) {
// For ease of reading, I will call the triforce emblem that sets the water to WL_LOW the "Low Emblem", the one that
// sets it to WL_MID the "Mid Emblem", and the one that sets it to WL_HIGH the "High Emblem"
bool Logic::Water3FCentralToHighEmblem() {
return (IsAdult && (CanUse(RG_HOVER_BOOTS) ||
(ctx->GetTrickOption(RT_DAMAGE_BOOST_SIMPLE) && CanUse(RG_BOMB_BAG) && TakeDamage()))) ||
(ctx->GetTrickOption(RT_GROUND_JUMP_HARD) && CanGroundJump() && CanUse(RG_HOVER_BOOTS)) ||
(Get(LOGIC_WATER_SCARECROW) && CanUse(RG_HOOKSHOT));
}
bool Logic::WaterRisingTargetTo3FCentral() {
return CanUse(RG_LONGSHOT) ||
(ctx->GetTrickOption(RT_HOVER_BOOST_SIMPLE) && ctx->GetTrickOption(RT_DAMAGE_BOOST_SIMPLE) &&
HasExplosives() && CanUse(RG_HOVER_BOOTS));
}
/* Water level has 7 events that govern it's logic.
* LOGIC_WATER_LOW, LOGIC_WATER_MIDDLE say that the player for sure can set the water to this level
* the COULD varients of these 2, as well as LOGIC_WATER_HIGH instead check for if using those emblems would be possible
* if the player had a specific water level and ZL
* - LOGIC_WATER_COULD_LOW checks if the water level could be set low with water agnostic access
* - LOGIC_WATER_COULD_MIDDLE checks if the water level could be set mid if it was set to low
* - LOGIC_WATER_HIGH checks if the water level could be set high with water agnostic access,
* HIGH is the default, so we don't need to check if we can really set it, only that we could reset it if it was
* changed out of logic
*
* Extending from these 3, LOGIC_WATER_COULD_LOW_FROM_HIGH and LOGIC_WATER_COULD_HIGH_FROM_MID tell us if we can move
* from 1 level to the next, without us first having to confirm we can always do the preceeding level first. These allow
* us to check for conditions where we can complete a water level loop and reach any level from any level before we know
* for sure we have real access. MIDDLE_EMBLEM always requires low water, so FROM_LOW is implied in
* LOGIC_WATER_COULD_MIDDLE.
*
* These exist because we can deduce we have access from knowing we always have access to a water level, and can then
* change it as needed
*/
bool Logic::WaterLevel(RandoWaterLevel level) {
switch (level) {
// While you have to go through WL_LOW to get to Mid, the requirements for WL_LOW are stricter than WL_MID
// because you can always go up to WL_MID and then could need to go back to WL_HIGH to reach the Low Emblem
// again Thanks to this caveat you need to be able to reach and play ZL to both the High and Low Emblems to have
// WL_LOW in logic. Alternativly a way to reach WL_LOW from WL_MID could exist, but all glitchless methods need
// you to do a Low-locked action
case WL_LOW:
return (Get(LOGIC_WATER_HIGH) && Get(LOGIC_WATER_LOW_FROM_HIGH)) ||
(Get(LOGIC_WATER_LOW_FROM_MID) && Get(LOGIC_WATER_LOW_FROM_HIGH));
return Get(LOGIC_WATER_LOW) ||
// if we could get LOW from HIGH and HIGH from MID, then we can move to LOW from any water level
(Get(LOGIC_WATER_COULD_LOW_FROM_HIGH) &&
(Get(LOGIC_WATER_COULD_HIGH_FROM_MID) || Get(LOGIC_WATER_HIGH)) && CanUse(RG_ZELDAS_LULLABY));
case WL_LOW_OR_MID:
return (Get(LOGIC_WATER_HIGH) && Get(LOGIC_WATER_LOW_FROM_HIGH)) ||
(Get(LOGIC_WATER_LOW_FROM_HIGH) && Get(LOGIC_WATER_MIDDLE)) ||
(Get(LOGIC_WATER_LOW_FROM_MID) && Get(LOGIC_WATER_LOW_FROM_HIGH));
// If we can set it to High out of logic we can just repeat what we did to lower the water in the first place as
// High is the default. Because of this you only need to be able to use the Low and Mid Emblems, WL_LOW could be
// skipped if it was ever possible to play ZL underwater.
return Get(LOGIC_WATER_LOW) || Get(LOGIC_WATER_MIDDLE) ||
// The water level is either at HIGH, in which case we can set it to LOW, LOW, or MID, so we only
// have to check COULD_LOW and ZL
((Get(LOGIC_WATER_COULD_LOW_FROM_HIGH) || Get(LOGIC_WATER_LOW)) && CanUse(RG_ZELDAS_LULLABY));
case WL_MID:
return Get(LOGIC_WATER_LOW_FROM_HIGH) && Get(LOGIC_WATER_MIDDLE);
// Despite being the initial state of water temple, WL_HIGH has the extra requirement of making sure that, if we
// were to lower the water out of logic, we could put it back to WL_HIGH However because it is the default
// state, we do not need to check if we can actually change the water level, only to make sure we can return to
// WL_HIGH if we found the means to play ZL out of logic. There are 2 methods to lock yourself out after playing
// ZL already: Not being able to reach the High Emblem and being unable to replay ZL. (I will be ignoring
// other-age-access shenanigains) The former check would simply be a check to see if we can reach High Emblem,
// but we assume the water is WL_MID (as if we can set it to WL_LOW, we can set it to WL_MID, as Mid Emblem has
// no requirements) The latter check can be assumed for now but will want a revisit once OI tricks are added.
return Get(LOGIC_WATER_MIDDLE) ||
// LOGIC_WATER_COULD_MIDDLE is LOGIC_WATER_COULD_MIDDLE_FROM_LOW in practice, due to WL_LOW being a
// hard requirement for WL_MID
(Get(LOGIC_WATER_LOW) && Get(LOGIC_WATER_COULD_MIDDLE)) ||
// If we have COULD_MIDDLE, we know we could move to LOW from HIGH,
// we're either already MID, on LOW can set MID, or on HIGH so you can set LOW and thus MID.
((Get(LOGIC_WATER_COULD_LOW_FROM_HIGH) || Get(LOGIC_WATER_COULD_LOW)) &&
Get(LOGIC_WATER_COULD_MIDDLE) && CanUse(RG_ZELDAS_LULLABY));
case WL_HIGH:
return Get(LOGIC_WATER_REACHED_HIGH_EMBLEM);
// If we don't have ZL, we're stuck on high anyway, so we only need to check for if we can reset it to high
return Get(LOGIC_WATER_HIGH) ||
// If water is MID and we COULD_HIGH_FROM_MID, then if water is MID we can set it HIGH
// so we only need to check if we could make it MID from LOW
(Get(LOGIC_WATER_COULD_HIGH_FROM_MID) && Get(LOGIC_WATER_COULD_MIDDLE));
case WL_HIGH_OR_MID:
return Get(LOGIC_WATER_REACHED_HIGH_EMBLEM) || (Get(LOGIC_WATER_LOW_FROM_HIGH) && Get(LOGIC_WATER_MIDDLE));
// If we don't have ZL, we're stuck on high anyway, so we only need to check for if we can reset it to high
return Get(LOGIC_WATER_MIDDLE) || Get(LOGIC_WATER_HIGH) ||
// The water level is either at LOW, in which case COULD_MIDDLE can set it to MID, MID, or HIGH, so
// we only have to check COULD_MIDDLE if we don't have ZL, then we are at high, so we can skip that
// too
(Get(LOGIC_WATER_COULD_MIDDLE));
}
SPDLOG_ERROR("MQWaterLevel reached `return false;`. Missing case for a Water Level");
SPDLOG_ERROR("WaterLevel reached `return false;`. Missing case for a Water Level");
assert(false);
return false;
}
@@ -1171,8 +1215,38 @@ bool Logic::BlueFire() {
return CanUse(RG_BOTTLE_WITH_BLUE_FIRE) || (ctx->GetOption(RSK_BLUE_FIRE_ARROWS) && CanUse(RG_ICE_ARROWS));
}
bool Logic::CanBreakPots() {
return true;
bool Logic::CanBreakPots(EnemyDistance distance, bool wallOrFloor, bool inWater) {
bool hit = false;
switch (distance) {
case ED_CLOSE:
hit = true; // str0
[[fallthrough]];
case ED_SHORT_JUMPSLASH:
hit = hit || CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MEGATON_HAMMER);
[[fallthrough]];
case ED_MASTER_SWORD_JUMPSLASH:
hit = hit || CanUse(RG_MASTER_SWORD);
[[fallthrough]];
case ED_LONG_JUMPSLASH:
hit = hit || CanUse(RG_BIGGORON_SWORD) || CanUse(RG_STICKS);
[[fallthrough]];
case ED_BOMB_THROW:
hit = hit || (!inWater && CanUse(RG_BOMB_BAG));
[[fallthrough]];
case ED_BOOMERANG:
hit = hit || CanUse(RG_BOOMERANG);
[[fallthrough]];
case ED_HOOKSHOT:
hit = hit || CanUse(RG_HOOKSHOT);
[[fallthrough]];
case ED_LONGSHOT:
hit = hit || CanUse(RG_LONGSHOT);
[[fallthrough]];
case ED_FAR:
hit = hit || CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_FAIRY_BOW);
break;
}
return hit || (wallOrFloor && CanUse(RG_BOMBCHU_5));
}
bool Logic::CanBreakCrates() {

6
soh/soh/Enhancements/randomizer/logic.h
View File

@@ -60,7 +60,9 @@ class Logic {
bool CanHitEyeTargets();
bool CanDetonateBombFlowers();
bool CanDetonateUprightBombFlower();
bool MQWaterLevel(RandoWaterLevel level);
bool Water3FCentralToHighEmblem();
bool WaterRisingTargetTo3FCentral();
bool WaterLevel(RandoWaterLevel level);
uint8_t BottleCount();
uint8_t OcarinaButtons();
bool HasBottle();
@@ -97,7 +99,7 @@ class Logic {
bool CanGetNightTimeGS();
bool CanBreakUpperBeehives();
bool CanBreakLowerBeehives();
bool CanBreakPots();
bool CanBreakPots(EnemyDistance distance = ED_CLOSE, bool wallOrFloor = true, bool inWater = false);
bool CanBreakCrates();
bool CanBreakSmallCrates();
bool CanBonkTrees();

142
soh/soh/Enhancements/randomizer/randomizerTypes.h
View File

@@ -294,17 +294,21 @@ typedef enum {
LOGIC_FIRE_MQ_OPENED_FIRE_MAZE_DOOR,
LOGIC_FIRE_MQ_HIT_SCARECROW_ROOM_PLATFORM,
LOGIC_FIRE_MQ_HIGH_TORCH_LIT,
LOGIC_WATER_LOW_FROM_HIGH,
LOGIC_WATER_LOW_FROM_MID,
LOGIC_WATER_LOW,
LOGIC_WATER_MIDDLE,
LOGIC_WATER_HIGH,
LOGIC_WATER_COULD_LOW,
LOGIC_WATER_COULD_LOW_FROM_HIGH,
LOGIC_WATER_COULD_MIDDLE,
LOGIC_WATER_REACHED_HIGH_EMBLEM,
LOGIC_WATER_COULD_HIGH_FROM_MID,
LOGIC_WATER_PUSHED_1F_BLOCK,
LOGIC_WATER_SCARECROW,
LOGIC_WATER_MQ_STALFOS_PIT,
LOGIC_WATER_MQ_DRAGON_TORCHES,
LOGIC_WATER_MQ_B1_SWITCH,
LOGIC_WATER_MQ_B1_OPENED_PILLAR,
LOGIC_WATER_MQ_PILLAR_SOT_BLOCK,
LOGIC_WATER_MQ_SIDE_TOWER_TARGETS,
LOGIC_SPIRIT_1F_SILVER_RUPEES,
LOGIC_SPIRIT_MQ_CRAWL_BOULDER,
LOGIC_SPIRIT_MQ_MAP_ROOM_ENEMIES,
@@ -1034,60 +1038,104 @@ typedef enum {
RR_FIRE_TEMPLE_BOSS_ENTRYWAY,
RR_FIRE_TEMPLE_BOSS_ROOM,
RR_WATER_TEMPLE_LOBBY,
RR_WATER_TEMPLE_EAST_LOWER,
RR_WATER_TEMPLE_MAP_ROOM,
RR_WATER_TEMPLE_ENTRANCE_LEDGE,
RR_WATER_TEMPLE_MAIN,
RR_WATER_TEMPLE_3F_CENTRAL_A,
RR_WATER_TEMPLE_3F_CENTRAL_H,
RR_WATER_TEMPLE_3F_CENTRAL_LM,
RR_WATER_TEMPLE_2F_CENTRAL_H,
RR_WATER_TEMPLE_2F_CENTRAL_LM,
RR_WATER_TEMPLE_SIDE_TOWER_1F,
RR_WATER_TEMPLE_SIDE_TOWER_2F,
RR_WATER_TEMPLE_CRACKED_WALL,
RR_WATER_TEMPLE_LOW_EMBLEM,
RR_WATER_TEMPLE_4_SPIKES_ROOM,
RR_WATER_TEMPLE_TORCH_ROOM,
RR_WATER_TEMPLE_NORTH_LOWER,
RR_WATER_TEMPLE_BOULDERS_LOWER,
RR_WATER_TEMPLE_SPIKE_MOAT,
RR_WATER_TEMPLE_BEHIND_SPIKE_MOAT,
RR_WATER_TEMPLE_BOULDERS_SOUTH,
RR_WATER_TEMPLE_BOULDERS_NORTH,
RR_WATER_TEMPLE_BLOCK_ROOM_TARGET,
RR_WATER_TEMPLE_BLOCK_ROOM,
RR_WATER_TEMPLE_JETS_ROOM,
RR_WATER_TEMPLE_BOULDERS_UPPER,
RR_WATER_TEMPLE_BLOCK_ROOM_STAIRS,
RR_WATER_TEMPLE_3_JETS_SWITCH,
RR_WATER_TEMPLE_3_JETS_NO_SWITCH,
RR_WATER_TEMPLE_BOULDER_CANAL,
RR_WATER_TEMPLE_CANAL_ALCOVE,
RR_WATER_TEMPLE_BEHIND_CANAL,
RR_WATER_TEMPLE_BOSS_KEY_ROOM,
RR_WATER_TEMPLE_SOUTH_LOWER,
RR_WATER_TEMPLE_WEST_LOWER,
RR_WATER_TEMPLE_NEAR_CAGE_STEPS,
RR_WATER_TEMPLE_NEAR_CAGE,
RR_WATER_TEMPLE_GS_CAGE,
RR_WATER_TEMPLE_BLOCK_U_BEND,
RR_WATER_TEMPLE_1_JET_PIT,
RR_WATER_TEMPLE_DRAGON_ROOM,
RR_WATER_TEMPLE_CENTRAL_PILLAR_LOWER,
RR_WATER_TEMPLE_CENTRAL_PILLAR_UPPER,
RR_WATER_TEMPLE_CENTRAL_PILLAR_BASEMENT,
RR_WATER_TEMPLE_EAST_MIDDLE,
RR_WATER_TEMPLE_WEST_MIDDLE,
RR_WATER_TEMPLE_HIGH_WATER,
RR_WATER_TEMPLE_BLOCK_CORRIDOR,
RR_WATER_TEMPLE_FALLING_PLATFORM_ROOM,
RR_WATER_TEMPLE_DRAGON_PILLARS_ROOM,
RR_WATER_TEMPLE_PILLAR_1F,
RR_WATER_TEMPLE_PILLAR_2F,
RR_WATER_TEMPLE_PILLAR_H,
RR_WATER_TEMPLE_PILLAR_B1,
RR_WATER_TEMPLE_JET_CHEST_ROOM,
RR_WATER_TEMPLE_OUTSIDE_JET_LIFT_2F,
RR_WATER_TEMPLE_JET_LIFT_2F,
RR_WATER_TEMPLE_JET_LIFT_3F,
RR_WATER_TEMPLE_HIGH_EMBLEM,
RR_WATER_TEMPLE_BLOCK_LOOP,
RR_WATER_TEMPLE_BLOCK_LOOP_3F_A,
RR_WATER_TEMPLE_BLOCK_LOOP_3F_H,
RR_WATER_TEMPLE_BLOCK_LOOP_3F_LM,
RR_WATER_TEMPLE_BLOCK_LOOP_BACK,
RR_WATER_TEMPLE_OUTSIDE_WATERFALL,
RR_WATER_TEMPLE_WATERFALL,
RR_WATER_TEMPLE_WATERFALL_TOP,
RR_WATER_TEMPLE_TOGGLE_SWITCH,
RR_WATER_TEMPLE_LIKE_LIKE_SPIKES,
RR_WATER_TEMPLE_DARK_LINK_ROOM,
RR_WATER_TEMPLE_LONGSHOT_ROOM,
RR_WATER_TEMPLE_SOT_PIT_ROOM,
RR_WATER_TEMPLE_RIVER,
RR_WATER_TEMPLE_PRE_BOSS_ROOM,
RR_WATER_TEMPLE_RIVER_POTS,
RR_WATER_TEMPLE_ABOVE_DRAGON,
RR_WATER_TEMPLE_RISING_TARGET_LEDGE,
RR_WATER_TEMPLE_TRAPPED_SLOPE,
RR_WATER_TEMPLE_MQ_3F_SOUTH_LEDGE,
RR_WATER_TEMPLE_MQ_ENTRANCE_LEDGE,
RR_WATER_TEMPLE_MQ_MAIN,
RR_WATER_TEMPLE_MQ_3F_CENTRAL,
RR_WATER_TEMPLE_MQ_2F_CENTRAL,
RR_WATER_TEMPLE_MQ_2F_CENTRAL_HIGH,
RR_WATER_TEMPLE_MQ_3F_CENTRAL_A,
RR_WATER_TEMPLE_MQ_3F_CENTRAL_H,
RR_WATER_TEMPLE_MQ_3F_CENTRAL_LM,
RR_WATER_TEMPLE_MQ_2F_CENTRAL_A,
RR_WATER_TEMPLE_MQ_2F_CENTRAL_H,
RR_WATER_TEMPLE_MQ_2F_CENTRAL_LM,
RR_WATER_TEMPLE_MQ_HIGH_EMBLEM,
RR_WATER_TEMPLE_MQ_3F_NORTH_LEDGE,
RR_WATER_TEMPLE_MQ_RISING_TARGET_LEDGE,
RR_WATER_TEMPLE_MQ_BOSS_DOOR_RAMP,
RR_WATER_TEMPLE_MQ_BOSS_DOOR,
RR_WATER_TEMPLE_MQ_EAST_TOWER,
RR_WATER_TEMPLE_MQ_EAST_TOWER_1F_ROOM,
RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_1F,
RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_2F,
RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_HIGH,
RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_B1,
RR_WATER_TEMPLE_MQ_CENTRAL_PILLAR_B1_FINAL,
RR_WATER_TEMPLE_MQ_BEHIND_BLUE_SWITCH_2F,
RR_WATER_TEMPLE_MQ_BEHIND_BLUE_SWITCH_3F,
RR_WATER_TEMPLE_MQ_SIDE_TOWER_1F,
RR_WATER_TEMPLE_MQ_SIDE_TOWER_2F,
RR_WATER_TEMPLE_MQ_LOW_EMBLEM,
RR_WATER_TEMPLE_MQ_3_STALFOS_ROOM,
RR_WATER_TEMPLE_MQ_TOWER_TARGET_ROOM,
RR_WATER_TEMPLE_MQ_PILLAR_1F,
RR_WATER_TEMPLE_MQ_PILLAR_2F,
RR_WATER_TEMPLE_MQ_PILLAR_H,
RR_WATER_TEMPLE_MQ_PILLAR_B1,
RR_WATER_TEMPLE_MQ_PILLAR_B1_FINAL,
RR_WATER_TEMPLE_MQ_OUTSIDE_HIDDEN_SWITCH_2F,
RR_WATER_TEMPLE_MQ_HIDDEN_SWITCH_2F,
RR_WATER_TEMPLE_MQ_HIDDEN_SWITCH_3F,
RR_WATER_TEMPLE_MQ_STORAGE_ROOM,
RR_WATER_TEMPLE_MQ_LIZALFOS_HALLWAY,
RR_WATER_TEMPLE_MQ_LIZALFOS_LOOP_A,
RR_WATER_TEMPLE_MQ_LIZALFOS_LOOP_LM,
RR_WATER_TEMPLE_MQ_LIZALFOS_CAGE,
RR_WATER_TEMPLE_MQ_3F_EAST_LEDGE,
RR_WATER_TEMPLE_MQ_OUTSIDE_WATERFALL,
RR_WATER_TEMPLE_MQ_WATERFALL,
RR_WATER_TEMPLE_MQ_WATERFALL_TOP,
RR_WATER_TEMPLE_MQ_STALFOS_PIT,
RR_WATER_TEMPLE_MQ_STALFOS_PIT_LOWER,
RR_WATER_TEMPLE_MQ_STALFOS_PIT_POTS,
RR_WATER_TEMPLE_MQ_STALFOS_PIT_UPPER,
RR_WATER_TEMPLE_MQ_AFTER_DARK_LINK,
RR_WATER_TEMPLE_MQ_DARK_LINK_ROOM,
RR_WATER_TEMPLE_MQ_GATED_PIT,
RR_WATER_TEMPLE_MQ_RIVER_SKULL,
RR_WATER_TEMPLE_MQ_RIVER_POTS,
RR_WATER_TEMPLE_MQ_DRAGON_ROOM_DOOR,
@@ -1098,12 +1146,18 @@ typedef enum {
RR_WATER_TEMPLE_MQ_BOSS_KEY_ROOM_CHEST,
RR_WATER_TEMPLE_MQ_B1_GATE_SWITCH,
RR_WATER_TEMPLE_MQ_TRIANGLE_TORCH_ROOM,
RR_WATER_TEMPLE_MQ_TRIANGLE_TORCH_TOP_STEP,
RR_WATER_TEMPLE_MQ_TRIANGLE_TORCH_CAGE,
RR_WATER_TEMPLE_MQ_CRATES_WHIRLPOOLS_ROOM,
RR_WATER_TEMPLE_MQ_SINGLE_STALFOS_ROOM,
RR_WATER_TEMPLE_MQ_4_TORCH_ROOM,
RR_WATER_TEMPLE_MQ_SPIKE_MOAT,
RR_WATER_TEMPLE_MQ_BEHIND_SPIKE_MOAT,
RR_WATER_TEMPLE_MQ_CRATE_VORTEX_ROOM,
RR_WATER_TEMPLE_MQ_SCARECROW_CANAL,
RR_WATER_TEMPLE_MQ_CANAL_ALCOVE,
RR_WATER_TEMPLE_MQ_BEHIND_CANAL,
RR_WATER_TEMPLE_MQ_FREESTANDING_ROOM,
RR_WATER_TEMPLE_MQ_3_JETS_ROOM,
RR_WATER_TEMPLE_MQ_DODONGO_ROOM,
RR_WATER_TEMPLE_MQ_CRATES_WHIRLPOOLS_CAGE,
RR_WATER_TEMPLE_MQ_CRATE_VORTEX_CAGE,
RR_WATER_TEMPLE_BOSS_ENTRYWAY,
RR_WATER_TEMPLE_BOSS_ROOM,
@@ -4107,8 +4161,8 @@ typedef enum {
RT_WATER_ADULT_DRAGON,
RT_WATER_CHILD_DRAGON,
RT_WATER_MQ_CENTRAL_PILLAR,
RT_WATER_MQ_LOCKED_GS,
RT_WATER_IRON_BOOTS_LEDGE_GRAB,
RT_WATER_INVISIBLE_HOOKSHOT_TARGET,
RT_WATER_MORPHA_WITHOUT_HOOKSHOT,
RT_LENS_SHADOW,
RT_LENS_SHADOW_PLATFORM,

10
soh/soh/Enhancements/randomizer/settings.cpp
View File

@@ -1930,17 +1930,17 @@ void Settings::CreateOptions() {
"can expect most or all of its hitbox is actually on the other side that wall. This can make slanted "
"torches very finicky to light when using arrows. The torches in the central pillar of MQ Water Temple "
"are a particularly egregious example. Logic normally expects Din's Fire and Song of Time.");
OPT_TRICK(
RT_WATER_MQ_LOCKED_GS, RCQUEST_MQ, RA_WATER_TEMPLE, { Tricks::Tag::NOVICE },
"Water Temple MQ North Basement GS without Small Key",
"There is an invisible Hookshot target that can be used to get over the gate that blocks you from going to "
"this Skulltula early, skipping a small key as well as needing Hovers or Scarecrow to reach the locked door.");
OPT_TRICK(
RT_WATER_IRON_BOOTS_LEDGE_GRAB, RCQUEST_BOTH, RA_WATER_TEMPLE, { Tricks::Tag::NOVICE, Tricks::Tag::GLITCH },
"Water Temple Ledge Grab While Surfacing with Iron Boots",
"Diving in front of ledge tapping B to swim up faster, then equipping iron boots while surfacing allows you to "
"ledge grab to the higher ground. This can be used to reach ledge to boss door and vanilla compass chest, or "
"MQ storage room");
OPT_TRICK(RT_WATER_INVISIBLE_HOOKSHOT_TARGET, RCQUEST_BOTH, RA_WATER_TEMPLE, { Tricks::Tag::NOVICE },
"Water Temple Invisible Hookshot Target",
"Invisible hookshot geometry can be used in MQ to get over the gate that blocks you from going to this "
"Skulltula early, skipping a small key as well as needing Hovers or Scarecrow to reach the locked door.\n"
"In vanilla this can be used to get past without bronze scale.");
OPT_TRICK(RT_WATER_MORPHA_WITHOUT_HOOKSHOT, RCQUEST_BOTH, RA_WATER_TEMPLE, { Tricks::Tag::EXTREME },
"Water Temple Morpha without Hookshot", "It is possible to slash at Morpha without hookshot.");
OPT_TRICK(RT_LENS_SHADOW, RCQUEST_VANILLA, RA_SHADOW_TEMPLE, { Tricks::Tag::NOVICE },