From f2efa5a5d01988b47c56019a38f936aa4a8675a5 Mon Sep 17 00:00:00 2001
From: Amy54Desu <69287652+Amy54Desu@users.noreply.github.com>
Date: Fri, 4 Mar 2022 23:08:57 -0500
Subject: [PATCH] Spin Pound dive removal and Wario bug fix. (#11)

* Update character-movesets.lua

This new version removes the dive for Luigi's Spin Pound and fixes the momentum glitch with Wario

* Spin Pound Dive removal and Wario bug fix

The Spin Pound Dive was easily removed by just removing the code that puts you into a dive when B is pressed. The Wario bug was also fixed by simply making it so if Wario is in the Water Jump Hold action the faster air speed from holding an item doesn't apply to him.
---
 mods/character-movesets.lua | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/mods/character-movesets.lua b/mods/character-movesets.lua
index c99010d2..88b7265f 100644
--- a/mods/character-movesets.lua
+++ b/mods/character-movesets.lua
@@ -50,12 +50,6 @@ function act_spin_pound(m)
 
     set_mario_animation(m, MARIO_ANIM_TWIRL)
 
-    if (m.input & INPUT_B_PRESSED) ~= 0 then
-        mario_set_forward_vel(m, 10.0)
-        m.vel.y = 35
-        set_mario_action(m, ACT_DIVE, 0)
-    end
-
     local stepResult = perform_air_step(m, 0)
     if stepResult == AIR_STEP_LANDED then
         if should_get_stuck_in_ground(m) ~= 0 then
@@ -788,6 +782,11 @@ function wario_before_phys_step(m)
         end
     end
 
+    -- fixes the momentum bug
+    if (m.action & ACT_HOLD_WATER_JUMP) then
+        return
+    end
+    
     -- faster holding item
     if m.heldObj ~= nil then
         m.vel.y = m.vel.y - 1