github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-22 06:13:45 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add Ocarina Item Glitch Great Fairy HC (1/6)

Browse source
This commit is contained in:
TheLynk 2025-05-24 05:08:18 +02:00
commit e90e0b5b2a
5 changed files with 19 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
soh/soh/Enhancements/randomizer/location_access/overworld/castle_grounds.cpp
View file

@ -50,7 +50,7 @@ void RegionTable_Init_CastleGrounds() {
areaTable[RR_HC_GREAT_FAIRY_FOUNTAIN] = Region("HC Great Fairy Fountain", "HC Great Fairy Fountain", {}, NO_DAY_NIGHT_CYCLE, {}, { areaTable[RR_HC_GREAT_FAIRY_FOUNTAIN] = Region("HC Great Fairy Fountain", "HC Great Fairy Fountain", {}, NO_DAY_NIGHT_CYCLE, {}, {
//Locations //Locations
LOCATION(RC_HC_GREAT_FAIRY_REWARD, logic->CanUse(RG_ZELDAS_LULLABY)), LOCATION(RC_HC_GREAT_FAIRY_REWARD, (logic->CanUse(RG_ZELDAS_LULLABY) || (ctx->GetTrickOption(RT_OCARINA_ITEMS_GLITCH_GREAT_FAIRY) && logic->OcarinaItemGlitchZeldasLullaby()))),
}, { }, {
//Exits //Exits
Entrance(RR_CASTLE_GROUNDS, []{return true;}), Entrance(RR_CASTLE_GROUNDS, []{return true;}),

12
soh/soh/Enhancements/randomizer/logic.cpp
View file

@ -1043,6 +1043,18 @@ bool Logic::HasBottle() {
return BottleCount() >= 1; return BottleCount() >= 1;
} }
bool Logic::OcarinaItemGlitch() {
return ((CanUse(RG_BOTTLE_WITH_BUGS) || CanUse(RG_BOTTLE_WITH_FISH)) &&
(CanUseSword() || CanUse(RG_STICKS) || CanUse(RG_NUTS) || CanUse(RG_BOMB_BAG) || CanUse(RG_FAIRY_BOW) ||
CanUse(RG_FAIRY_SLINGSHOT) || CanUse(RG_BOMBCHU_BAG) || CanUse(RG_HOOKSHOT) || CanUse(RG_LONGSHOT) ||
CanUse(RG_BOOMERANG) || CanUse(RG_MEGATON_HAMMER)));
}
bool Logic::OcarinaItemGlitchZeldasLullaby() {
return OcarinaItemGlitch() && HasItem(RG_ZELDAS_LULLABY) && HasItem(RG_OCARINA_C_LEFT_BUTTON) &&
HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON);
}
bool Logic::CanUseSword() { bool Logic::CanUseSword() {
return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD); return CanUse(RG_KOKIRI_SWORD) || CanUse(RG_MASTER_SWORD) || CanUse(RG_BIGGORON_SWORD);
} }

2
soh/soh/Enhancements/randomizer/logic.h
View file

@ -203,6 +203,8 @@ class Logic {
uint8_t BottleCount(); uint8_t BottleCount();
uint8_t OcarinaButtons(); uint8_t OcarinaButtons();
bool HasBottle(); bool HasBottle();
bool OcarinaItemGlitch();
bool OcarinaItemGlitchZeldasLullaby();
bool CanUseSword(); bool CanUseSword();
bool CanJumpslashExceptHammer(); bool CanJumpslashExceptHammer();
bool CanJumpslash(); bool CanJumpslash();

1
soh/soh/Enhancements/randomizer/randomizerTypes.h
View file

@ -3491,6 +3491,7 @@ typedef enum {
RT_HOVER_BOOST_SIMPLE, RT_HOVER_BOOST_SIMPLE,
RT_BOMBCHU_BEEHIVES, RT_BOMBCHU_BEEHIVES,
RT_BLUE_FIRE_MUD_WALLS, RT_BLUE_FIRE_MUD_WALLS,
RT_OCARINA_ITEMS_GLITCH_GREAT_FAIRY,
RT_KF_ADULT_GS, // -- location tricks RT_KF_ADULT_GS, // -- location tricks
RT_LW_BRIDGE, RT_LW_BRIDGE,
RT_LW_MIDO_BACKFLIP, RT_LW_MIDO_BACKFLIP,

3
soh/soh/Enhancements/randomizer/settings.cpp
View file

@ -401,6 +401,9 @@ void Settings::CreateOptions() {
"Allows exploding beehives with Bombchus."); "Allows exploding beehives with Bombchus.");
OPT_TRICK(RT_BLUE_FIRE_MUD_WALLS, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::NOVICE }, "Break Mud Walls with Blue Fire", OPT_TRICK(RT_BLUE_FIRE_MUD_WALLS, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::NOVICE }, "Break Mud Walls with Blue Fire",
"Use Blue Fire to break mud walls."); "Use Blue Fire to break mud walls.");
OPT_TRICK(RT_OCARINA_ITEMS_GLITCH_GREAT_FAIRY, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::NOVICE },
"Ocarina Items Glitch for Great Fairy",
"Access the rewards of the Great Fairy with Ocarina Items Glitch.");
OPT_TRICK(RT_KF_ADULT_GS, RCQUEST_BOTH, RA_KOKIRI_FOREST, { Tricks::Tag::NOVICE }, OPT_TRICK(RT_KF_ADULT_GS, RCQUEST_BOTH, RA_KOKIRI_FOREST, { Tricks::Tag::NOVICE },
"Adult Kokiri Forest GS with Hover Boots", "Adult Kokiri Forest GS with Hover Boots",
"Can be obtained without Hookshot by using the Hover Boots off of one of the roots."); "Can be obtained without Hookshot by using the Hover Boots off of one of the roots.");