Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjusted bouncing on players

This commit is contained in:
MysterD 2022-01-27 23:59:18 -08:00
parent e157dca8bd
commit 1e3acefff1
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/game/interaction.c
View File

@ -1258,6 +1258,14 @@ static u8 resolve_player_collision(struct MarioState* m, struct MarioState* m2)
if (m2->action == ACT_CROUCHING) {
set_mario_action(m, ACT_TWIRLING, 0);
velY = fmax(fmin(100.0f, 30.0f + fabs(m->vel[1])), 80.0f);
} else if (m->action == ACT_JUMP) {
set_mario_action(m, ACT_DOUBLE_JUMP, 0);
velY = fmax(fmin(55.0f, 15.0f + fabs(m->vel[1])), 30.0f);
} else if (m->action == ACT_DOUBLE_JUMP) {
set_mario_action(m, ACT_TRIPLE_JUMP, 0);
velY = fmax(fmin(60.0f, 20.0f + fabs(m->vel[1])), 30.0f);
} else {
set_mario_action(m, ACT_JUMP, 0);
}
bounce_off_object(m, m2->marioObj, velY);
queue_rumble_data_mario(m, 5, 80);