thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-04-28 04:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Potential fix for more common tripping

Browse source 
"Trip" here refers to 1 damage kicks
This commit is contained in:
Sunk 2024-10-08 18:12:34 -04:00
parent c1783bef1a
commit 459cb1544f
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/game/interaction.c
View file

@ -672,7 +672,8 @@ u32 determine_knockback_action(struct MarioState *m, UNUSED s32 arg) {
if (!is_player_active(m2)) { continue; }
if (m2->marioObj == NULL) { continue; }
if (m2->marioObj != m->interactObj) { continue; }
if (m2->flags & MARIO_KICKING) { scaler = 2.0f; }
// Redundent check in case the kicking flag somehow gets missed
if (m2->action == ACT_JUMP_KICK || m2->flags & MARIO_KICKING) { scaler = 2.0f; }
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; }