Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made players invulnerable to PVP when ground pounding

This commit is contained in:
MysterD 2023-04-02 22:11:04 -07:00
parent fda3c54c8b
commit 304cf9e8eb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/game/interaction.c
View File

@ -1348,11 +1348,12 @@ u8 passes_pvp_interaction_checks(struct MarioState* attacker, struct MarioState*
|| attacker->action == ACT_WALL_KICK_AIR || attacker->action == ACT_WATER_JUMP
|| attacker->action == ACT_STEEP_JUMP || attacker->action == ACT_HOLD_JUMP);
u8 isVictimIntangible = (victim->action & ACT_FLAG_INTANGIBLE);
u8 isVictimGroundPounding = (victim->action == ACT_GROUND_POUND) && (victim->actionState != 0);
if (victim->knockbackTimer > 0) {
return false;
}
return (!isInvulnerable && !isIgnoredAttack && !isAttackerInvulnerable && !isVictimIntangible);
return (!isInvulnerable && !isIgnoredAttack && !isAttackerInvulnerable && !isVictimIntangible && !isVictimGroundPounding);
}
u32 interact_player(struct MarioState* m, UNUSED u32 interactType, struct Object* o) {