Prevent low damage/low knockback kicks altogether

This commit is contained in:
Sunk 2024-10-08 19:09:12 -04:00
parent 55d9deafe9
commit d7fcaacdbe

View file

@ -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;
} }