From bf2941d57b9101661f6c2ffda02a0f036107122a Mon Sep 17 00:00:00 2001 From: Sunk <69110309+Sunketchupm@users.noreply.github.com> Date: Tue, 8 Oct 2024 20:21:31 -0400 Subject: [PATCH] Slightly nerf kick knockback Suggestion by emily --- 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 4bcf31df0..cbe71c775 100644 --- a/src/game/interaction.c +++ b/src/game/interaction.c @@ -673,7 +673,7 @@ u32 determine_knockback_action(struct MarioState *m, UNUSED s32 arg) { if (m2->marioObj == NULL) { continue; } 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 = 2.0f; } + if (m2->action == ACT_JUMP_KICK || m2->flags & MARIO_KICKING) { scaler = 1.75f; } else if (m2->action == ACT_DIVE) { scaler = 1 + fabs(m2->forwardVel * 0.01f); } else if ((m2->flags & MARIO_PUNCHING)) { scaler = 0.2f; hasBeenPunched = TRUE; } if (m2->flags & MARIO_METAL_CAP) { scaler *= 1.25f; }