From 459aadf000cc296d16ba8847c6576fa8d8fbc0e1 Mon Sep 17 00:00:00 2001
From: MysterD <myster@d>
Date: Sat, 29 Jan 2022 01:15:45 -0800
Subject: [PATCH] Fixed bubble behavior for character movesets and made Luigi's
 vertical swimming fast

---
 mods/character-movesets.lua | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/mods/character-movesets.lua b/mods/character-movesets.lua
index d35a861a3..f33cf7c82 100644
--- a/mods/character-movesets.lua
+++ b/mods/character-movesets.lua
@@ -31,6 +31,9 @@ function luigi_before_phys_step(m)
     -- faster swimming
     if (m.action & ACT_FLAG_SWIMMING) ~= 0 then
         hScale = hScale * 1.5
+        if m.action ~= ACT_WATER_PLUNGE then
+            vScale = vScale * 1.5
+        end
     end
 
     -- slower holding item
@@ -313,6 +316,10 @@ gEventTable[CT_WALUIGI] = {
 ----------
 
 function mario_before_phys_step(m)
+    if m.action == ACT_BUBBLED then
+        return
+    end
+
     if gEventTable[m.character.type] == nil then
         return
     end
@@ -320,6 +327,10 @@ function mario_before_phys_step(m)
 end
 
 function mario_on_set_action(m)
+    if m.action == ACT_BUBBLED then
+        return
+    end
+
     if gEventTable[m.character.type] == nil then
         return
     end
@@ -327,6 +338,10 @@ function mario_on_set_action(m)
 end
 
 function mario_update(m)
+    if m.action == ACT_BUBBLED then
+        return
+    end
+
     if gEventTable[m.character.type] == nil then
         return
     end