mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2024-11-01 08:05:07 -04:00
Code Issues Projects Releases Wiki Activity

Add jabu box skip door and frog hint exceptions to cutscene skipping (#4300)

Browse Source 
* Add jaby box skip door one point to glitchAiding and frog hint exception to NoForcedDialouge

* address review
This commit is contained in:
Pepper0ni 2024-08-23 15:20:11 +01:00 committed by GitHub
parent b6554a8409
commit 15395defa4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
soh/soh/Enhancements/timesaver_hook_handlers.cpp
View File

@ -237,6 +237,12 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
break; break;
} }
case ACTOR_BG_BDAN_SWITCH: { case ACTOR_BG_BDAN_SWITCH: {
// The switch in jabu that you are intended to press with a box to reach barrinade
// can be skipped by either a frame perfect roll open or with OI
// The One Point for that switch is used in common setups for the former and is required for the latter to work
if (actor->params == 14848 && gPlayState->sceneNum == SCENE_JABU_JABU && !CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.GlitchAiding"), 0)){
break;
}
BgBdanSwitch* switchActor = static_cast<BgBdanSwitch*>(opt); BgBdanSwitch* switchActor = static_cast<BgBdanSwitch*>(opt);
switchActor->unk_1D8 = 0; switchActor->unk_1D8 = 0;
switchActor->unk_1DA = 0; switchActor->unk_1DA = 0;
@ -297,7 +303,9 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
} }
break; break;
case VB_WONDER_TALK: { case VB_WONDER_TALK: {
if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.NoForcedDialog"), IS_RANDO)) { //We want to show the frog hint if it is on, regardless of cutscene settings
if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.NoForcedDialog"), IS_RANDO) &&
!(gPlayState->sceneNum == SCENE_ZORAS_RIVER && IS_RANDO && RAND_GET_OPTION(RSK_FROGS_HINT))) {
*should = false; *should = false;
} }
break; break;