mirror/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright synced 2026-09-09 20:41:12 -04:00
Code Issues Packages Projects Releases Wiki Activity

water temple: quadruple water level change when skipping cutscene (#7162)

Browse Source 
prevents falling into water while it descends, reaching 2f cracked wall without tricks
This commit is contained in:
Philip Dubé
2026-09-08 13:38:30 +00:00
committed by GitHub
parent b4c41c9bf4
commit a5f5903955
3 changed files with 32 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
soh/soh/Enhancements/TimeSavers/FasterWaterTempleLevelChange.cpp
+20
View File
@@ -0,0 +1,20 @@
#include <libultraship/bridge/consolevariablebridge.h>
#include "soh/Enhancements/game-interactor/GameInteractor.h"
#include "soh/ShipInit.hpp"
#include "soh/cvar_prefixes.h"
extern "C" {
#include "z64save.h"
extern SaveContext gSaveContext;
}
static void RegisterFasterWaterTempleLevelChange() {
COND_VB_SHOULD(VB_MODIFY_WATER_TEMPLE_WATER_LEVEL_SPEED,
IS_RANDO || CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), 0), {
f32* speed = va_arg(args, f32*);
*speed = 20.0f;
});
}
static RegisterShipInitFunc initFunc(RegisterFasterWaterTempleLevelChange,
{ CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), "IS_RANDO" });
soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h
+8
View File
@@ -1784,6 +1784,14 @@ typedef enum {
// - `s32` (note append position)
VB_MODIFY_LOST_WOODS_OCARINA_GAME_NOTE_SPEED,
// #### `result`
// ```c
// true
// ```
// #### `args`
// - `f32*` speed
VB_MODIFY_WATER_TEMPLE_WATER_LEVEL_SPEED,
// #### `result`
// ```c
// this->interactInfo.talkState == NPC_TALK_STATE_ACTION
soh/src/overlays/actors/ovl_Bg_Mizu_Water/z_bg_mizu_water.c
+4 -1
View File
@@ -6,6 +6,7 @@
#include "z_bg_mizu_water.h"
#include "objects/object_mizu_objects/object_mizu_objects.h"
#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)
@@ -233,7 +234,9 @@ void BgMizuWater_ChangeWaterLevel(BgMizuWater* this, PlayState* play) {
Flags_UnsetSwitch(play, prevSwitchFlag);
}
if (Math_StepToF(&this->actor.world.pos.y, this->targetY, 5.0f)) {
f32 speed = 5.0f;
GameInteractor_Should(VB_MODIFY_WATER_TEMPLE_WATER_LEVEL_SPEED, true, &speed);
if (Math_StepToF(&this->actor.world.pos.y, this->targetY, speed)) {
play->roomCtx.unk_74[0] = 0;
this->actionFunc = BgMizuWater_WaitForAction;
Message_CloseTextbox(play);