ihateninjas/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-04-23 08:14:31 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Add trick for jump to GTG eye statue (#6467)

Browse source
This commit is contained in:
A Green Spoon 2026-04-07 23:55:07 +09:00 committed by GitHub
parent 262958a2eb
commit 67191665df
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
soh/assets/custom/lang/en_US.json
View file

@ -981,6 +981,10 @@
"name": "Gerudo Training Grounds Itemless Lava Room Jump", "name": "Gerudo Training Grounds Itemless Lava Room Jump",
"description": "A precise rolling jump can be used to jump between all but the furthest platforms in the lava room." "description": "A precise rolling jump can be used to jump between all but the furthest platforms in the lava room."
}, },
"gtg_statue_jump": {
"name": "Gerudo Training Grounds Statue Room Jump",
"description": "A precise rolling jump or a jump and jumpslash can be used to jump from the upper ledge to one of the pillars in the eye statue room."
},
"lens_gtg_mq": { "lens_gtg_mq": {
"name": "Gerudo Training Ground MQ without Lens of Truth", "name": "Gerudo Training Ground MQ without Lens of Truth",
"description": "Removes the requirements for the Lens of Truth in Gerudo Training Ground MQ." "description": "Removes the requirements for the Lens of Truth in Gerudo Training Ground MQ."

4
soh/soh/Enhancements/randomizer/location_access/dungeons/gerudo_training_ground.cpp
View file

@ -109,7 +109,7 @@ void RegionTable_Init_GerudoTrainingGround() {
areaTable[RR_GERUDO_TRAINING_GROUND_EYE_STATUE_UPPER] = Region("Gerudo Training Ground Eye Statue Upper", SCENE_GERUDO_TRAINING_GROUND, {}, { areaTable[RR_GERUDO_TRAINING_GROUND_EYE_STATUE_UPPER] = Region("Gerudo Training Ground Eye Statue Upper", SCENE_GERUDO_TRAINING_GROUND, {}, {
//Locations //Locations
LOCATION(RC_GERUDO_TRAINING_GROUND_WONDER_EYE_STATUE_ROOM, logic->CanUse(RG_HOVER_BOOTS)), //RANDOTODO: add trick for jump+jumpslash and jump only to pillar LOCATION(RC_GERUDO_TRAINING_GROUND_WONDER_EYE_STATUE_ROOM, logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && ctx->GetTrickOption(RT_GTG_STATUE_JUMP))), // Shuffle roll: Jumpslash doesn't require roll, jump only does
}, { }, {
//Exits //Exits
ENTRANCE(RR_GERUDO_TRAINING_GROUND_EYE_STATUE_LOWER, true), ENTRANCE(RR_GERUDO_TRAINING_GROUND_EYE_STATUE_LOWER, true),
@ -282,7 +282,7 @@ void RegionTable_Init_GerudoTrainingGround() {
areaTable[RR_GERUDO_TRAINING_GROUND_MQ_STATUE_ROOM_LEDGE] = Region("Gerudo Training Ground MQ Statue Room Ledge", SCENE_GERUDO_TRAINING_GROUND, {}, { areaTable[RR_GERUDO_TRAINING_GROUND_MQ_STATUE_ROOM_LEDGE] = Region("Gerudo Training Ground MQ Statue Room Ledge", SCENE_GERUDO_TRAINING_GROUND, {}, {
//Locations //Locations
LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_WONDER_EYE_STATUE, logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_HOVER_BOOTS)), LOCATION(RC_GERUDO_TRAINING_GROUND_MQ_WONDER_EYE_STATUE, logic->CanUse(RG_LONGSHOT) || logic->CanUse(RG_HOVER_BOOTS) || (logic->IsAdult && ctx->GetTrickOption(RT_GTG_STATUE_JUMP))), // Shuffle roll: Jumpslash doesn't require roll, jump only does
}, { }, {
//Exits //Exits
ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_STALFOS_ROOM, true), ENTRANCE(RR_GERUDO_TRAINING_GROUND_MQ_STALFOS_ROOM, true),

1
soh/soh/Enhancements/randomizer/randomizerEnums/RandomizerTrick.h
View file

@ -202,6 +202,7 @@ RANDO_ENUM_ITEM(RT_LENS_GTG)
RANDO_ENUM_ITEM(RT_GTG_WITHOUT_HOOKSHOT) RANDO_ENUM_ITEM(RT_GTG_WITHOUT_HOOKSHOT)
RANDO_ENUM_ITEM(RT_GTG_FAKE_WALL) RANDO_ENUM_ITEM(RT_GTG_FAKE_WALL)
RANDO_ENUM_ITEM(RT_GTG_LAVA_JUMP) RANDO_ENUM_ITEM(RT_GTG_LAVA_JUMP)
RANDO_ENUM_ITEM(RT_GTG_STATUE_JUMP)
RANDO_ENUM_ITEM(RT_LENS_GTG_MQ) RANDO_ENUM_ITEM(RT_LENS_GTG_MQ)
RANDO_ENUM_ITEM(RT_GTG_MQ_WITH_HOOKSHOT) RANDO_ENUM_ITEM(RT_GTG_MQ_WITH_HOOKSHOT)
RANDO_ENUM_ITEM(RT_GTG_MQ_WITHOUT_HOOKSHOT) RANDO_ENUM_ITEM(RT_GTG_MQ_WITHOUT_HOOKSHOT)

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

@ -1671,6 +1671,7 @@ void Settings::CreateOptions() {
"GTGNoHS"); "GTGNoHS");
OPT_TRICK(RT_GTG_FAKE_WALL, RCQUEST_BOTH, RA_GERUDO_TRAINING_GROUND, { Tricks::Tag::NOVICE }, "GTGWallHB"); OPT_TRICK(RT_GTG_FAKE_WALL, RCQUEST_BOTH, RA_GERUDO_TRAINING_GROUND, { Tricks::Tag::NOVICE }, "GTGWallHB");
OPT_TRICK(RT_GTG_LAVA_JUMP, RCQUEST_BOTH, RA_GERUDO_TRAINING_GROUND, { Tricks::Tag::INTERMEDIATE }, "GTGLavaJmp"); OPT_TRICK(RT_GTG_LAVA_JUMP, RCQUEST_BOTH, RA_GERUDO_TRAINING_GROUND, { Tricks::Tag::INTERMEDIATE }, "GTGLavaJmp");
OPT_TRICK(RT_GTG_STATUE_JUMP, RCQUEST_BOTH, RA_GERUDO_TRAINING_GROUND, { Tricks::Tag::INTERMEDIATE }, "GTGStJmp");
OPT_TRICK(RT_LENS_GTG_MQ, RCQUEST_MQ, RA_GERUDO_TRAINING_GROUND, { Tricks::Tag::NOVICE }, "GTGMQLoT"); OPT_TRICK(RT_LENS_GTG_MQ, RCQUEST_MQ, RA_GERUDO_TRAINING_GROUND, { Tricks::Tag::NOVICE }, "GTGMQLoT");
OPT_TRICK(RT_GTG_MQ_WITH_HOOKSHOT, RCQUEST_MQ, RA_GERUDO_TRAINING_GROUND, { Tricks::Tag::NOVICE }, "GTGMQHS"); OPT_TRICK(RT_GTG_MQ_WITH_HOOKSHOT, RCQUEST_MQ, RA_GERUDO_TRAINING_GROUND, { Tricks::Tag::NOVICE }, "GTGMQHS");
OPT_TRICK(RT_GTG_MQ_WITHOUT_HOOKSHOT, RCQUEST_MQ, RA_GERUDO_TRAINING_GROUND, { Tricks::Tag::INTERMEDIATE }, OPT_TRICK(RT_GTG_MQ_WITHOUT_HOOKSHOT, RCQUEST_MQ, RA_GERUDO_TRAINING_GROUND, { Tricks::Tag::INTERMEDIATE },