mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-10-18 19:22:41 +00:00
Lower knockback for anything stronger than a kick
This commit is contained in:
parent
26726121a5
commit
a2fe4f80a7
1 changed files with 6 additions and 1 deletions
|
@ -638,7 +638,12 @@ u32 determine_knockback_action(struct MarioState *m, UNUSED s32 arg) {
|
|||
|
||||
// set knockback very high when dealing with player attacks
|
||||
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;
|
||||
if (sign > 0 && terrainIndex == 1) { mag *= -1.0f; }
|
||||
m->vel[0] = mag * sins(angleToObject);
|
||||
|
|
Loading…
Reference in a new issue