Fix cooldown behavior for crystal and light switches, water gate (#6461)

soh/soh/Enhancements/TimeSavers/SkipTimerDelay.cpp

@@ -1,42 +0,0 @@
-#include "soh/Enhancements/game-interactor/GameInteractor.h"
-#include "soh/ShipInit.hpp"
-
-extern "C" {
-#include "src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h"
-#include "src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h"
-#include "src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h"
-extern PlayState* gPlayState;
-}
-
-#define SKIP_MISC_INTERACTIONS_NAME CVAR_ENHANCEMENT("TimeSavers.SkipMiscInteractions")
-#define SKIP_MISC_INTERACTIONS_VALUE CVarGetInteger(SKIP_MISC_INTERACTIONS_NAME, IS_RANDO)
-
-static void RegisterSkipTimerDelay() {
-    // Skip Water Temple gate delay
-    COND_ID_HOOK(OnActorUpdate, ACTOR_BG_SPOT06_OBJECTS, SKIP_MISC_INTERACTIONS_VALUE, [](void* actor) {
-        auto spot06 = static_cast<BgSpot06Objects*>(actor);
-        if (spot06->dyna.actor.params == 0) {
-            spot06->timer = 0;
-        }
-    });
-
-    // Skip Spirit Sun on Floor activation delay
-    COND_ID_HOOK(OnActorUpdate, ACTOR_BG_JYA_BOMBCHUIWA, SKIP_MISC_INTERACTIONS_VALUE, [](void* actor) {
-        auto jya = static_cast<BgJyaBombchuiwa*>(actor);
-        if (!(jya->drawFlags & 4) && jya->timer > 0 && jya->timer < 9) {
-            jya->timer = 9;
-        }
-    });
-
-    // Skip Spirit Sun on Floor & Sun on Block activation delay
-    COND_ID_HOOK(OnActorUpdate, ACTOR_OBJ_LIGHTSWITCH, SKIP_MISC_INTERACTIONS_VALUE, [](void* actor) {
-        if (gPlayState->sceneNum == SCENE_SPIRIT_TEMPLE &&
-            (gPlayState->roomCtx.curRoom.num == 4 || gPlayState->roomCtx.curRoom.num == 8)) {
-            auto sun = static_cast<ObjLightswitch*>(actor);
-            sun->toggleDelay = 0;
-        }
-    });
-}
-
-static RegisterShipInitFunc initFunc_SkipTimerDelay(RegisterSkipTimerDelay,
-                                                    { SKIP_MISC_INTERACTIONS_NAME, "IS_RANDO" });

soh/soh/Enhancements/TimeSavers/SkipWaterGateDelay.cpp

@@ -0,0 +1,18 @@
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
+#include "soh/ShipInit.hpp"
+
+extern "C" {
+#include "src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h"
+extern SaveContext gSaveContext;
+}
+
+static void RegisterSpot06GateSkip() {
+    COND_VB_SHOULD(VB_BG_SPOT06_OBJECTS_GATE_SKIP,
+                   CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint"), IS_RANDO), {
+                       BgSpot06Objects* actor = va_arg(args, BgSpot06Objects*);
+                       actor->timer = 0;
+                       *should = false;
+                   });
+}
+
+static RegisterShipInitFunc initFunc(RegisterSpot06GateSkip, { CVAR_ENHANCEMENT("TimeSavers.SkipCutscene.OnePoint") });

soh/soh/Enhancements/game-interactor/vanilla-behavior/GIVanillaBehavior.h

@@ -203,6 +203,14 @@ typedef enum {
     // - None
     VB_BG_BREAKWALL_BREAK,
 
+    // #### `result`
+    // ```c
+    // this->timer > 0 && this->timer <= 100
+    // ```
+    // #### `args`
+    // - `*BgSpot06Objects`
+    VB_BG_SPOT06_OBJECTS_GATE_SKIP,
+
     // #### `result`
     // ```c
     // gSaveContext.bgsFlag

soh/soh/Enhancements/timesaver_hook_handlers.cpp

@@ -24,11 +24,14 @@ extern "C" {
 #include "src/overlays/actors/ovl_En_Jj/z_en_jj.h"
 #include "src/overlays/actors/ovl_En_Daiku/z_en_daiku.h"
 #include "src/overlays/actors/ovl_Bg_Spot02_Objects/z_bg_spot02_objects.h"
+#include "src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.h"
 #include "src/overlays/actors/ovl_Bg_Spot03_Taki/z_bg_spot03_taki.h"
 #include "src/overlays/actors/ovl_Bg_Hidan_Kousi/z_bg_hidan_kousi.h"
 #include "src/overlays/actors/ovl_Bg_Dy_Yoseizo/z_bg_dy_yoseizo.h"
 #include "src/overlays/actors/ovl_En_Dnt_Demo/z_en_dnt_demo.h"
 #include "src/overlays/actors/ovl_En_Po_Sisters/z_en_po_sisters.h"
+#include "src/overlays/actors/ovl_Obj_Lightswitch/z_obj_lightswitch.h"
+#include "src/overlays/actors/ovl_Bg_Jya_Bombchuiwa/z_bg_jya_bombchuiwa.h"
 #include <overlays/actors/ovl_Boss_Ganondrof/z_boss_ganondrof.h>
 #include <overlays/actors/ovl_En_Ik/z_en_ik.h>
 #include <objects/object_gnd/object_gnd.h>
@@ -328,6 +331,15 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
                         RateLimitedSuccessChime();
                         break;
                     }
+                    case ACTOR_BG_JYA_BOMBCHUIWA: {
+                        BgJyaBombchuiwa* bombchuiwa = (BgJyaBombchuiwa*)actor;
+                        if (!(bombchuiwa->drawFlags & 4) && bombchuiwa->timer >= 0 && bombchuiwa->timer < 9) {
+                            bombchuiwa->timer = 9;
+                        }
+                        *should = false;
+                        RateLimitedSuccessChime();
+                        break;
+                    }
                     case ACTOR_EN_GO2: {
                         EnGo2* biggoron = (EnGo2*)actor;
                         biggoron->isAwake = true;
@@ -376,8 +388,14 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, va_li
                         RateLimitedSuccessChime();
                         break;
                     }
+                    case ACTOR_OBJ_LIGHTSWITCH: {
+                        ObjLightswitch* lightswitch = (ObjLightswitch*)actor;
+                        lightswitch->toggleDelay = 0;
+                        *should = false;
+                        RateLimitedSuccessChime();
+                        break;
+                    }
                     case ACTOR_BG_ICE_SHUTTER:
-                    case ACTOR_OBJ_LIGHTSWITCH:
                     case ACTOR_OBJ_SYOKUDAI:
                     case ACTOR_OBJ_TIMEBLOCK:
                     case ACTOR_EN_PO_SISTERS:

soh/src/overlays/actors/ovl_Bg_Spot06_Objects/z_bg_spot06_objects.c

@@ -7,6 +7,7 @@
 #include "z_bg_spot06_objects.h"
 #include "objects/object_spot06_objects/object_spot06_objects.h"
 #include "soh/Enhancements/custom-message/CustomMessageTypes.h"
+#include "soh/Enhancements/game-interactor/GameInteractor_Hooks.h"
 
 #define FLAGS ACTOR_FLAG_HOOKSHOT_PULLS_ACTOR
 
@@ -266,7 +267,7 @@ void BgSpot06Objects_GateWaitForSwitch(BgSpot06Objects* this, PlayState* play) {
  * This is where the gate waits a few frames before rising after the switch is set.
  */
 void BgSpot06Objects_GateWaitToOpen(BgSpot06Objects* this, PlayState* play) {
-    if (this->timer != 0) {
+    if (GameInteractor_Should(VB_BG_SPOT06_OBJECTS_GATE_SKIP, this->timer != 0, this)) {
         this->timer--;
     }
 

soh/src/overlays/actors/ovl_Obj_Switch/z_obj_switch.c

@@ -256,9 +256,8 @@ void ObjSwitch_SetOn(ObjSwitch* this, PlayState* play) {
             } else {
                 OnePointCutscene_AttentionSetSfx(play, &this->dyna.actor, NA_SE_SY_TRE_BOX_APPEAR);
             }
+            this->cooldownOn = true;
         }
-
-        this->cooldownOn = true;
     }
 }
 
@@ -271,8 +270,8 @@ void ObjSwitch_SetOff(ObjSwitch* this, PlayState* play) {
         if ((this->dyna.actor.params >> 4 & 7) == 1) {
             if (GameInteractor_Should(VB_PLAY_ONEPOINT_ACTOR_CS, true, this)) {
                 OnePointCutscene_AttentionSetSfx(play, &this->dyna.actor, NA_SE_SY_TRE_BOX_APPEAR);
+                this->cooldownOn = true;
             }
-            this->cooldownOn = true;
         }
     }
 }