From d534010fb22b3de617c26b5b7dd23e933885d3e0 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+Agent-11@users.noreply.github.com> Date: Tue, 11 Apr 2023 18:41:41 -0400 Subject: [PATCH] Flying triple jump off players if wing cap (#344) --- src/game/interaction.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/game/interaction.c b/src/game/interaction.c index 1e90acc3..f7c9b4c1 100644 --- a/src/game/interaction.c +++ b/src/game/interaction.c @@ -1309,7 +1309,7 @@ static u8 resolve_player_collision(struct MarioState* m, struct MarioState* m2) velY = fmax(fmin(55.0f, 15.0f + fabs(m->vel[1])), 35.0f); } else if (m->action == ACT_DOUBLE_JUMP) { mario_stop_riding_and_holding(m); - set_mario_action(m, (m->specialTripleJump && m->playerIndex == 0) ? ACT_SPECIAL_TRIPLE_JUMP : ACT_TRIPLE_JUMP, 0); + set_mario_action(m, (m->specialTripleJump && m->playerIndex == 0) ? ACT_SPECIAL_TRIPLE_JUMP : m->flags & MARIO_WING_CAP ? ACT_FLYING_TRIPLE_JUMP : ACT_TRIPLE_JUMP, 0); velY = fmax(fmin(60.0f, 20.0f + fabs(m->vel[1])), 40.0f); } else { mario_stop_riding_and_holding(m);