cheat - always fly on triple jump

Author: billsix

src/game/mario.c

@@ -789,9 +789,12 @@ static u32 set_mario_action_airborne(struct MarioState *m, u32 action, u32 actio
             m->forwardVel *= 0.8f;
             break;
 
-        case ACT_FLYING_TRIPLE_JUMP:
-            set_mario_y_vel_based_on_fspeed(m, 82.0f, 0.0f);
+        case ACT_FLYING_TRIPLE_JUMP: {
+            f32 launchVelocity = 82.0f;
+            CALL_EVENT(FlyingTripleJumpLaunch, m, &launchVelocity);
+            set_mario_y_vel_based_on_fspeed(m, launchVelocity, 0.0f);
             break;
+        }
 
         case ACT_WATER_JUMP:
         case ACT_HOLD_WATER_JUMP:

src/game/mario_actions_airborne.c

@@ -14,6 +14,7 @@
 #include "save_file.h"
 #include "rumble_init.h"
 #include "seq_ids.h"
+#include "port/hooks/list/PlayerEvent.h"
 
 void play_flip_sounds(struct MarioState *m, s16 frame1, s16 frame2, s16 frame3) {
     s32 animFrame = m->marioObj->header.gfx.animInfo.animFrame;
@@ -1708,7 +1709,9 @@ s32 act_flying(struct MarioState *m) {
         return set_mario_action(m, ACT_GROUND_POUND, 1);
     }
 
-    if (!(m->flags & MARIO_WING_CAP)) {
+    bool canFly = (m->flags & MARIO_WING_CAP) != 0;
+    CALL_EVENT(FlyingActionUpdate, m, &canFly);
+    if (!canFly) {
         if (m->area->camera->mode == CAMERA_MODE_BEHIND_MARIO) {
             set_camera_mode(m->area->camera, m->area->camera->defMode, 1);
         }

src/game/mario_actions_moving.c

@@ -13,6 +13,7 @@
 #include "behavior_data.h"
 #include "rumble_init.h"
 #include "seq_ids.h"
+#include "port/hooks/list/PlayerEvent.h"
 
 struct LandingAction {
     s16 numFrames;
@@ -146,7 +147,10 @@ void slide_bonk(struct MarioState *m, u32 fastAction, u32 slowAction) {
 }
 
 s32 set_triple_jump_action(struct MarioState *m, UNUSED u32 action, UNUSED u32 actionArg) {
-    if (m->flags & MARIO_WING_CAP) {
+    bool useFlyingVariant = (m->flags & MARIO_WING_CAP) != 0;
+    CALL_EVENT(SetTripleJumpAction, m, &useFlyingVariant);
+
+    if (useFlyingVariant) {
         return set_mario_action(m, ACT_FLYING_TRIPLE_JUMP, 0);
     } else if (m->forwardVel > 20.0f) {
         return set_mario_action(m, ACT_TRIPLE_JUMP, 0);

src/port/hooks/list/PlayerEvent.h

@@ -43,6 +43,21 @@ DEFINE_EVENT(PlayerExecuteAction,
     u32 arg;
 );
 
+DEFINE_EVENT(SetTripleJumpAction,
+    struct MarioState* m;
+    bool* useFlyingVariant;
+);
+
+DEFINE_EVENT(FlyingActionUpdate,
+    struct MarioState* m;
+    bool* canFly;
+);
+
+DEFINE_EVENT(FlyingTripleJumpLaunch,
+    struct MarioState* m;
+    f32* launchVelocity;
+);
+
 DEFINE_EVENT(ItemCollected,
     int16_t type;
     struct MarioState* marioState;

src/port/mods/PortEnhancements.cpp

@@ -84,6 +84,28 @@ void PortEnhancements_Init() {
         }
     });
 
+    REGISTER_LISTENER(SetTripleJumpAction, EVENT_PRIORITY_NORMAL, [](IEvent* event) {
+        if (CVarGetInteger("gCheats.AlwaysFlyTripleJump", 0) == 0) {
+            return;
+        }
+        SetTripleJumpAction* ev = (SetTripleJumpAction*)event;
+        *ev->useFlyingVariant = true;
+    });
+    REGISTER_LISTENER(FlyingActionUpdate, EVENT_PRIORITY_NORMAL, [](IEvent* event) {
+        if (CVarGetInteger("gCheats.AlwaysFlyTripleJump", 0) == 0) {
+            return;
+        }
+        FlyingActionUpdate* ev = (FlyingActionUpdate*)event;
+        *ev->canFly = true;
+    });
+    REGISTER_LISTENER(FlyingTripleJumpLaunch, EVENT_PRIORITY_NORMAL, [](IEvent* event) {
+        if (CVarGetInteger("gCheats.FlyingTripleJumpHighLaunch", 0) == 0) {
+            return;
+        }
+        FlyingTripleJumpLaunch* ev = (FlyingTripleJumpLaunch*)event;
+        *ev->launchVelocity = 246.0f;
+    });
+
     auto OnDistanceFunc = [](IEvent* event) {
         if (CVarGetInteger("gEnhancements.DisableDrawDistance", 0) == 0) {
             return;
@@ -117,6 +139,9 @@ void PortEnhancements_Register() {
     REGISTER_EVENT(PlayerStartedDialog);
     REGISTER_EVENT(PlayerDeath);
     REGISTER_EVENT(PlayerExecuteAction);
+    REGISTER_EVENT(SetTripleJumpAction);
+    REGISTER_EVENT(FlyingActionUpdate);
+    REGISTER_EVENT(FlyingTripleJumpLaunch);
 
     // Register Rando Events
     REGISTER_EVENT(ItemCollected);

src/port/ui/GhostshipMenuEnhancements.cpp

@@ -177,6 +177,14 @@ void GhostshipMenu::AddMenuEnhancements() {
         .CVar(CVAR_CHEAT("PlayInDemo"))
         .RaceDisable(false)
         .Options(CheckboxOptions().Tooltip("Allows normal gameplay when a demo is playing."));
+    AddWidget(path, "Always Fly on Triple Jump", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("AlwaysFlyTripleJump"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip("Triple jumping always starts flying, as if you always have the Wing Cap."));
+    AddWidget(path, "Triple Jump High Launch", WIDGET_CVAR_CHECKBOX)
+        .CVar(CVAR_CHEAT("FlyingTripleJumpHighLaunch"))
+        .RaceDisable(false)
+        .Options(CheckboxOptions().Tooltip("Flying triple jump launches 3x higher than normal."));
 }
 
 } // namespace GhostshipGui