From 1d666b41db475d99c0b8f26a1f1da3a7412db407 Mon Sep 17 00:00:00 2001 From: Sunk <69110309+Sunketchupm@users.noreply.github.com> Date: Sat, 12 Oct 2024 19:09:03 -0400 Subject: [PATCH] Decrease dive and punch knockback --- src/game/interaction.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/game/interaction.c b/src/game/interaction.c index 9a643e3ba..77a9a9787 100644 --- a/src/game/interaction.c +++ b/src/game/interaction.c @@ -674,8 +674,8 @@ u32 determine_knockback_action(struct MarioState *m, UNUSED s32 arg) { if (m2->marioObj != m->interactObj) { continue; } // Redundent check in case the kicking flag somehow gets missed if (m2->action == ACT_JUMP_KICK || m2->flags & MARIO_KICKING) { scaler = 1.85f; } - else if (m2->action == ACT_DIVE) { scaler = 1 + fabs(m2->forwardVel * 0.01f); } - else if ((m2->flags & MARIO_PUNCHING)) { scaler = 0.2f; hasBeenPunched = TRUE; } + else if (m2->action == ACT_DIVE) { scaler = 1 + fabs(m2->forwardVel * 0.005f); } + else if ((m2->flags & MARIO_PUNCHING)) { scaler = 0.18f; hasBeenPunched = TRUE; } if (m2->flags & MARIO_METAL_CAP) { scaler *= 1.25f; } break; }