mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2026-04-28 04:51:40 +00:00
Prevent low damage/low knockback kicks altogether
This commit is contained in:
parent
55d9deafe9
commit
d7fcaacdbe
1 changed files with 2 additions and 0 deletions
|
|
@ -1439,6 +1439,8 @@ u32 interact_player_pvp(struct MarioState* attacker, struct MarioState* victim)
|
||||||
|
|
||||||
// see if it was an attack
|
// see if it was an attack
|
||||||
u32 interaction = determine_interaction(attacker, cVictim->marioObj);
|
u32 interaction = determine_interaction(attacker, cVictim->marioObj);
|
||||||
|
// Specfically override jump kicks to prevent low damage and low knockback kicks
|
||||||
|
if (interaction == INT_HIT_FROM_BELOW && attacker->action == ACT_JUMP_KICK) { interaction = INT_KICK; }
|
||||||
if (!(interaction & INT_ANY_ATTACK) || (interaction & INT_HIT_FROM_ABOVE) || !passes_pvp_interaction_checks(attacker, cVictim)) {
|
if (!(interaction & INT_ANY_ATTACK) || (interaction & INT_HIT_FROM_ABOVE) || !passes_pvp_interaction_checks(attacker, cVictim)) {
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue