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 1 Cow in Trick "Ocarina Items Glitch Cow"

Browse source
This commit is contained in:
TheLynk 2025-05-25 00:47:19 +02:00
commit 1733c433cf
5 changed files with 11 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -110,7 +110,7 @@ void RegionTable_Init_KokiriForest() {
areaTable[RR_KF_LINKS_HOUSE] = Region("KF Link's House", "KF Link's House", {}, NO_DAY_NIGHT_CYCLE, {}, { areaTable[RR_KF_LINKS_HOUSE] = Region("KF Link's House", "KF Link's House", {}, NO_DAY_NIGHT_CYCLE, {}, {
//Locations //Locations
LOCATION(RC_KF_LINKS_HOUSE_COW, logic->IsAdult && logic->CanUse(RG_EPONAS_SONG) && logic->LinksCow), LOCATION(RC_KF_LINKS_HOUSE_COW, logic->IsAdult && logic->LinksCow && logic->CanUse(RG_EPONAS_SONG) || (ctx->GetTrickOption(RT_OCARINA_ITEMS_GLITCH_COW) && logic->OcarinaItemsGlitchEponasSong())),
LOCATION(RC_KF_LINKS_HOUSE_POT, logic->CanBreakPots()), LOCATION(RC_KF_LINKS_HOUSE_POT, logic->CanBreakPots()),
}, { }, {
//Exits //Exits

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

@ -1055,6 +1055,11 @@ bool Logic::OcarinaItemsGlitchZeldasLullaby() {
HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON); HasItem(RG_OCARINA_C_RIGHT_BUTTON) && HasItem(RG_OCARINA_C_UP_BUTTON);
} }
bool Logic::OcarinaItemsGlitchEponasSong() {
return OcarinaItemsGlitch() && HasItem(RG_EPONAS_SONG) && 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);
} }

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

@ -205,6 +205,7 @@ class Logic {
bool HasBottle(); bool HasBottle();
bool OcarinaItemsGlitch(); bool OcarinaItemsGlitch();
bool OcarinaItemsGlitchZeldasLullaby(); bool OcarinaItemsGlitchZeldasLullaby();
bool OcarinaItemsGlitchEponasSong();
bool CanUseSword(); bool CanUseSword();
bool CanJumpslashExceptHammer(); bool CanJumpslashExceptHammer();
bool CanJumpslash(); bool CanJumpslash();

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

@ -3492,6 +3492,7 @@ typedef enum {
RT_BOMBCHU_BEEHIVES, RT_BOMBCHU_BEEHIVES,
RT_BLUE_FIRE_MUD_WALLS, RT_BLUE_FIRE_MUD_WALLS,
RT_OCARINA_ITEMS_GLITCH_GREAT_FAIRY, RT_OCARINA_ITEMS_GLITCH_GREAT_FAIRY,
RT_OCARINA_ITEMS_GLITCH_COW,
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

@ -404,6 +404,9 @@ void Settings::CreateOptions() {
OPT_TRICK(RT_OCARINA_ITEMS_GLITCH_GREAT_FAIRY, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::NOVICE }, OPT_TRICK(RT_OCARINA_ITEMS_GLITCH_GREAT_FAIRY, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::NOVICE },
"Ocarina Items Glitch for Great Fairy", "Ocarina Items Glitch for Great Fairy",
"Access the rewards of the Great Fairy with Ocarina Items Glitch."); "Access the rewards of the Great Fairy with Ocarina Items Glitch.");
OPT_TRICK(RT_OCARINA_ITEMS_GLITCH_COW, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::NOVICE },
"Ocarina Items Glitch for Cow",
"Access the rewards of Cow 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.");