thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Improvements to non-pvp player interactions (#712)
Some checks are pending
Build coop / build-ubuntu (push) Waiting to run
Details
Build coop / build-windows (push) Waiting to run
Details
Build coop / build-macos-arm (push) Waiting to run
Details
Build coop / build-macos-intel (push) Waiting to run
Details

Browse source 
* Add more bounce interactions

* Prevent out of bounds pushing
This commit is contained in:
Sunk 2025-03-20 19:06:10 -04:00 • committed by GitHub
parent 64ef23ba6a
commit 5ba01cc232
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/game/interaction.c
View file

@ -1311,6 +1311,11 @@ static u8 resolve_player_collision(struct MarioState* m, struct MarioState* m2)
mario_stop_riding_and_holding(m); mario_stop_riding_and_holding(m);
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); 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); velY = fmax(fmin(60.0f, 20.0f + fabs(m->vel[1])), 40.0f);
} else if (m->action == ACT_LONG_JUMP) {
velY = fmax(fmin(40.0f, 5.0f + fabs(m->vel[1])), 30.0f);
} else if (m->action == ACT_HOLD_JUMP || m->action == ACT_HOLD_FREEFALL) {
set_mario_action(m, ACT_HOLD_JUMP, 0);
velY = fmax(fmin(40.0f, 15.0f + fabs(m->vel[1])), 25.0f);
} else { } else {
mario_stop_riding_and_holding(m); mario_stop_riding_and_holding(m);
set_mario_action(m, ACT_JUMP, 0); set_mario_action(m, ACT_JUMP, 0);
@ -1322,10 +1327,12 @@ static u8 resolve_player_collision(struct MarioState* m, struct MarioState* m2)
return TRUE; return TRUE;
} }
//! If this function pushes Mario out of bounds, it will trigger Mario's f32 posX = m->pos[0] + (radius - marioDist) / radius * marioRelX;
// oob failsafe f32 posZ = m->pos[2] + (radius - marioDist) / radius * marioRelZ;
m->pos[0] += (radius - marioDist) / radius * marioRelX; // Prevent a push into out of bounds
m->pos[2] += (radius - marioDist) / radius * marioRelZ; if (find_floor_height(posX, m->pos[1], posZ) == gLevelValues.floorLowerLimit) { return FALSE; }
m->pos[0] = posX;
m->pos[2] = posZ;
m->marioBodyState->torsoPos[0] += (radius - marioDist) / radius * marioRelX; m->marioBodyState->torsoPos[0] += (radius - marioDist) / radius * marioRelX;
m->marioBodyState->torsoPos[2] += (radius - marioDist) / radius * marioRelZ; m->marioBodyState->torsoPos[2] += (radius - marioDist) / radius * marioRelZ;
return FALSE; return FALSE;