From 7136a06dbaf13093c32cf025cc58830b2835a9ac Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Wed, 21 Jun 2023 19:08:39 -0700
Subject: [PATCH] Prevent bubble popping on dying players, prevent collision on
 recently unbubbled

---
 src/game/interaction.c             |  4 +++
 src/game/mario_actions_automatic.c | 39 +++++++++++++++++++++++++++---
 2 files changed, 39 insertions(+), 4 deletions(-)

diff --git a/src/game/interaction.c b/src/game/interaction.c
index 65c35b58..45fd807e 100644
--- a/src/game/interaction.c
+++ b/src/game/interaction.c
@@ -1306,6 +1306,10 @@ u32 interact_cannon_base(struct MarioState *m, UNUSED u32 interactType, struct O
 
 static u8 resolve_player_collision(struct MarioState* m, struct MarioState* m2) {
     if (!m || !m2) { return FALSE; }
+    if (!m->marioObj || !m2->marioObj) { return FALSE; }
+    if (m->invincTimer > 0 || m2->invincTimer > 0) { return FALSE; }
+    if (m->action == ACT_DEATH_EXIT_LAND || m2->action == ACT_DEATH_EXIT_LAND) { return FALSE; }
+
     // move player outside of other player
     f32 extentY = m->marioObj->hitboxHeight;
     f32 radius = m->marioObj->hitboxRadius * 2.0f;
diff --git a/src/game/mario_actions_automatic.c b/src/game/mario_actions_automatic.c
index b7f1683a..87df09dc 100644
--- a/src/game/mario_actions_automatic.c
+++ b/src/game/mario_actions_automatic.c
@@ -968,12 +968,42 @@ static void bubbled_offset_visual(struct MarioState* m) {
     m->marioObj->header.gfx.pos[1] -= upOffset;
 }
 
+static struct MarioState* nearest_antibubble_mario_state_to_object(struct Object *obj) {
+    if (!obj) { return NULL; }
+    struct MarioState* nearest = NULL;
+    f32 nearestDist = 0;
+    for (s32 i = 0; i < MAX_PLAYERS; i++) {
+        struct MarioState* m = &gMarioStates[i];
+        if (!m->marioObj) { continue; }
+        if (m->marioObj == obj) { continue; }
+        if (!m->visibleToEnemies) { continue; }
+        if (!is_player_active(m)) { continue; }
+
+        switch (m->action) {
+            case ACT_WATER_DEATH:
+            case ACT_STANDING_DEATH:
+            case ACT_QUICKSAND_DEATH:
+            case ACT_DEATH_ON_STOMACH:
+            case ACT_DEATH_ON_BACK:
+                continue;
+        }
+
+        float dist = dist_between_objects(obj, m->marioObj);
+        if (nearest == NULL || dist < nearestDist) {
+            nearest = m;
+            nearestDist = dist;
+        }
+    }
+
+    return nearest;
+}
+
 s32 act_bubbled(struct MarioState* m) {
     if (!m) { return 0; }
     if (m->playerIndex == 0 && m->area->camera->mode == CAMERA_MODE_WATER_SURFACE) {
         set_camera_mode(m->area->camera, CAMERA_MODE_FREE_ROAM, 1);
     }
-    struct MarioState* targetMarioState = nearest_mario_state_to_object(m->marioObj);
+    struct MarioState* targetMarioState = nearest_antibubble_mario_state_to_object(m->marioObj);
     if (targetMarioState == NULL) {
         targetMarioState = &gMarioStates[0];
     }
@@ -1021,9 +1051,9 @@ s32 act_bubbled(struct MarioState* m) {
     f32 oldYaw   = m->faceAngle[1];
     m->faceAngle[0] = 0;
     m->faceAngle[1] = m->intendedYaw;
-    m->forwardVel = m->intendedMag * 1.5f;
-    if (m->input & INPUT_A_DOWN) { m->vel[1] += 5.0f; }
-    if (m->input & INPUT_Z_DOWN) { m->vel[1] -= 5.0f; }
+    m->forwardVel = m->intendedMag * 1.6f;
+    if (m->input & INPUT_A_DOWN) { m->vel[1] += 5.5f; }
+    if (m->input & INPUT_Z_DOWN) { m->vel[1] -= 5.5f; }
 
     // set and smooth velocity
     Vec3f oldVel = { m->vel[0], m->vel[1], m->vel[2] };
@@ -1087,6 +1117,7 @@ s32 act_bubbled(struct MarioState* m) {
         mario_set_forward_vel(m, 0.0f);
         m->vel[1] = 0.0f;
         m->marioObj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE;
+        m->invincTimer = 30 * 3;
         if (m->playerIndex == 0) {
             soft_reset_camera(m->area->camera);
         }