Fix low damage jump kicks (#844)
Some checks are pending
Build coop / build-linux (push) Waiting to run
Build coop / build-steamos (push) Waiting to run
Build coop / build-windows-opengl (push) Waiting to run
Build coop / build-windows-directx (push) Waiting to run
Build coop / build-macos-arm (push) Waiting to run
Build coop / build-macos-intel (push) Waiting to run

This commit is contained in:
Sunk 2025-06-09 06:05:16 -04:00 committed by GitHub
parent 27b7c3d823
commit 235533b1a5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -1507,7 +1507,7 @@ u32 interact_player_pvp(struct MarioState* attacker, struct MarioState* victim)
// see if it was an attack
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 (attacker->action == ACT_JUMP_KICK) { interaction = INT_KICK; }
// Allow rollouts to attack
else if (PLAYER_IN_ROLLOUT_FLIP(attacker)) { interaction = INT_HIT_FROM_BELOW; }
if (!(interaction & INT_ANY_ATTACK) || (interaction & INT_HIT_FROM_ABOVE) || !passes_pvp_interaction_checks(attacker, cVictim)) {