Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lower knockback for anything stronger than a kick

This commit is contained in:
MysterD 2020-09-08 14:57:50 -07:00
parent 93d69a0373
commit f0f5b5f10a
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/game/interaction.c
View File

@ -638,7 +638,12 @@ u32 determine_knockback_action(struct MarioState *m, UNUSED s32 arg) {
// set knockback very high when dealing with player attacks // set knockback very high when dealing with player attacks
if (m->interactObj != NULL && (m->interactObj->oInteractType & INTERACT_PLAYER) && terrainIndex != 2) { if (m->interactObj != NULL && (m->interactObj->oInteractType & INTERACT_PLAYER) && terrainIndex != 2) {
f32 mag = m->interactObj->oDamageOrCoinValue * (f32)gServerSettings.playerKnockbackStrength * sign; f32 scaler = m->interactObj->oDamageOrCoinValue;
if (scaler > 2) {
// hack: set knockback to lower values for anything above the kick (which is a damage of 2)
scaler = 1;
}
f32 mag = scaler * (f32)gServerSettings.playerKnockbackStrength * sign;
m->forwardVel = mag; m->forwardVel = mag;
if (sign > 0 && terrainIndex == 1) { mag *= -1.0f; } if (sign > 0 && terrainIndex == 1) { mag *= -1.0f; }
m->vel[0] = mag * sins(angleToObject); m->vel[0] = mag * sins(angleToObject);