From 61b8461a5911bd4c201949bb27893e5d75c69349 Mon Sep 17 00:00:00 2001 From: Sunk <69110309+Sunketchupm@users.noreply.github.com> Date: Tue, 8 Oct 2024 18:17:36 -0400 Subject: [PATCH] Add temporary invincibility to rollouts This is a test to see how different pvp feels with this change. Suggestion by sausrelics. --- src/game/interaction.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/game/interaction.c b/src/game/interaction.c index dd344ee01..b8b963b49 100644 --- a/src/game/interaction.c +++ b/src/game/interaction.c @@ -1474,6 +1474,9 @@ u32 interact_player_pvp(struct MarioState* attacker, struct MarioState* victim) // not moving down yet? if (attacker->actionState == 0) { return FALSE; } victim->bounceSquishTimer = max(victim->bounceSquishTimer, 20); + } else if ((attacker->action == ACT_FORWARD_ROLLOUT || attacker->action == ACT_BACKWARD_ROLLOUT) && + attacker->actionState == 1) { + return FALSE; } if (victim->playerIndex == 0) {