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

Fix RT_GROUND_JUMP_HARD description (#6391)

Browse Source
This commit is contained in:
Philip Dubé
2026-03-22 19:56:22 +00:00
committed by GitHub
parent 1949033f93
commit 692ef416ee
2 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
soh/soh/Enhancements/ExtraModes/EnemyRandomizer.cpp
View File

@@ -164,7 +164,7 @@ static int enemiesToRandomize[] = {
bool IsEnemyAllowedToSpawn(int16_t sceneNum, int8_t roomNum, EnemyEntry enemy) {
uint32_t isMQ = ResourceMgr_IsSceneMasterQuest(sceneNum);
// Freezard - Child Link can only kill this with jump slash Deku Sticks or other equipment like bombs.
// Freezard - Child Link can only kill this with Deku Stick jumpslash or other equipment like bombs.
// Beamos - Needs bombs.
// Anubis - Needs fire.
// Shell Blade & Spike - Child Link can't kill these with sword or Deku Stick.

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

@@ -1498,9 +1498,8 @@ void Settings::CreateOptions() {
"GrdJmp", "Enables requiring ground jumps.");
OPT_TRICK(RT_GROUND_JUMP_HARD, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::INTERMEDIATE, Tricks::Tag::GLITCH },
"Hard Ground Jumps", "HGrdJmp",
"Enables ground jumps which require some precision outside of setting up jump:\n- While using Hover "
"Boots in Forest Temple Courtyard to reach upper ledge\n- While using Hover Boots in Shadow Temple "
"invisible spike room to reach door\n- Jumping past second step in Ice Cavern");
"Enables ground jumps which require some precision outside of setting up jump,\n"
"such as needing extra height with jumpslash or jumping while running with hover boots.");
OPT_TRICK(RT_SLIDE_JUMP, RCQUEST_BOTH, RA_NONE, { Tricks::Tag::NOVICE }, "Sliding Jumps", "SldJmp",
"Running forward while sliding sideways on ice can be used to jump on platforms.");
OPT_TRICK(RT_KF_ADULT_GS, RCQUEST_BOTH, RA_KOKIRI_FOREST, { Tricks::Tag::NOVICE },
@@ -1528,12 +1527,12 @@ void Settings::CreateOptions() {
"Big Poe without Epona", "PoeDiff",
"Big Poes have a chance of appearing without Epona, you can shoot them quickly with only bow.");
OPT_TRICK(RT_KAK_TOWER_GS, RCQUEST_BOTH, RA_KAKARIKO_VILLAGE, { Tricks::Tag::INTERMEDIATE },
"Kakariko Tower GS with Jump Slash", "KakGSJS",
"Kakariko Tower GS with Jumpslash", "KakGSJS",
"Climb the tower as high as you can without touching the Gold Skulltula, then let go and jumpslash "
"immediately. By jump-slashing from as low on the ladder as possible to still hit the Skulltula, this "
"trick can be done without taking fall damage.");
OPT_TRICK(RT_KAK_CHILD_WINDMILL_POH, RCQUEST_BOTH, RA_KAKARIKO_VILLAGE, { Tricks::Tag::EXTREME },
"Windmill PoH as Child with Precise Jump Slash", "WndCJS",
"Windmill PoH as Child with Precise Jumpslash", "WndCJS",
"Can jump up to the spinning platform from below as child with a precise jumpslash timed with the "
"platforms rotation.");
OPT_TRICK(
@@ -1577,7 +1576,7 @@ void Settings::CreateOptions() {
"After killing the Skulltula, the token can be collected without needing to destroy the rock by jumping "
"down onto it from the bean plant, midflight, with precise timing and positioning.");
OPT_TRICK(RT_DMT_JS_LOWER_GS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, { Tricks::Tag::INTERMEDIATE },
"Death Mountain Trail Lower Red Rock GS with Jump Slash", "DMTGSJS",
"Death Mountain Trail Lower Red Rock GS with Jumpslash", "DMTGSJS",
"After killing the Skulltula, the token can be collected without needing to destroy the rock by jump "
"slashing from a precise angle.");
OPT_TRICK(RT_DMT_CLIMB_HOVERS, RCQUEST_BOTH, RA_DEATH_MOUNTAIN_TRAIL, { Tricks::Tag::ADVANCED },
@@ -1658,7 +1657,7 @@ void Settings::CreateOptions() {
"allowing you to ledge grab the edge of the hole and get past the breakable wall (hammer can't break the "
"wall itself).");
OPT_TRICK(RT_LH_LAB_WALL_GS, RCQUEST_BOTH, RA_LAKE_HYLIA, { Tricks::Tag::NOVICE },
"Lake Hylia Lab Wall GS with Jump Slash", "LHGSJS",
"Lake Hylia Lab Wall GS with Jumpslash", "LHGSJS",
"The jumpslash to actually collect the token is somewhat precise.");
OPT_TRICK(RT_LH_LAB_DIVING, RCQUEST_BOTH, RA_LAKE_HYLIA, { Tricks::Tag::NOVICE },
"Lake Hylia Lab Dive without Gold Scale", "LabHS",
@@ -1721,8 +1720,7 @@ void Settings::CreateOptions() {
"Somewhat precise. If you kill enough Leevers you can get enough of a break to take some time to aim "
"more carefully.");
OPT_TRICK(RT_DEKU_BASEMENT_GS, RCQUEST_VANILLA, RA_DEKU_TREE, { Tricks::Tag::NOVICE },
"Deku Tree Basement Vines GS with Jump Slash", "DTGSJS",
"Can be defeated by doing a precise jump slash.");
"Deku Tree Basement Vines GS with Jumpslash", "DTGSJS", "Can be defeated by doing a precise jumpslash.");
OPT_TRICK(RT_DEKU_B1_SKIP, RCQUEST_BOTH, RA_DEKU_TREE, { Tricks::Tag::INTERMEDIATE },
"Deku Tree Basement without Slingshot", "B1Skip",
"A precise jump can be used to skip needing to use the Slingshot to go around B1 of the Deku Tree. If "
@@ -1877,7 +1875,7 @@ void Settings::CreateOptions() {
"can summon Pierre, allowing you to access the falling ceiling room early. In Master Quest, this allows "
"you to obtain the GS on the door frame as adult without Hookshot or Song of Time.");
OPT_TRICK(RT_FOREST_OUTSIDE_BACKDOOR, RCQUEST_BOTH, RA_FOREST_TEMPLE, { Tricks::Tag::ADVANCED },
"Forest Temple Outside Backdoor with Jump Slash", "FTBlkJS",
"Forest Temple Outside Backdoor with Jumpslash", "FTBlkJS",
"A jumpslash recoil can be used to reach the ledge in the block puzzle room that leads to the west "
"courtyard. This skips a potential Hover Boots requirement in Vanilla, and it can sometimes apply in MQ "
"as well. This trick can be performed as both ages.");
@@ -1895,7 +1893,7 @@ void Settings::CreateOptions() {
// Child with hovers cannot do this from the lower floor, and must go to the upper floor which needs goron bracelet.
// Adult can do this with hammer and KSword, But child cannot.
OPT_TRICK(RT_FOREST_MQ_JS_HALLWAY_SWITCH, RCQUEST_MQ, RA_FOREST_TEMPLE, { Tricks::Tag::NOVICE },
"Forest Temple MQ Twisted Hallway Switch with Jump Slash", "FTTwstJS",
"Forest Temple MQ Twisted Hallway Switch with Jumpslash", "FTTwstJS",
"The switch to twist the hallway can be hit with a jumpslash through the glass block. To get in front "
"of the switch, either use the Hover Boots or hit the shortcut switch at the top of the room and jump "
"from the glass blocks that spawn. Sticks can be used as child, but the Kokiri Sword is too short to "
@@ -1908,7 +1906,7 @@ void Settings::CreateOptions() {
"Forest Temple MQ Twisted Hallway Switch with Boomerang", "FTTwstRng",
"The Boomerang can return to Link through walls, allowing child to hit the hallway switch. This can be "
"used to allow adult to pass through later, or in conjunction with \"Forest Temple Outside Backdoor with "
"Jump Slash\".");
"Jumpslash\".");
OPT_TRICK(RT_FOREST_MQ_CHILD_DOORFRAME, RCQUEST_MQ, RA_FOREST_TEMPLE, { Tricks::Tag::NOVICE },
"Forest Temple MQ Doorframe GS as Child without Boomerang", "FTDoorC",
"If Adult burns the courtyard webbing with Fire Arrows (which is a permanent flag in Ship Rando) "