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

Add steven.'s character moveset changes

This commit is contained in:
MysterD 2022-03-05 00:32:58 -08:00
parent 283fbc85a9
commit 4f9c30fd46
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mods/character-movesets.lua
View File

@ -50,6 +50,12 @@ function act_spin_pound(m)
set_mario_animation(m, MARIO_ANIM_TWIRL) set_mario_animation(m, MARIO_ANIM_TWIRL)
m.particleFlags = m.particleFlags | PARTICLE_DUST
if (m.controller.buttonDown & Z_TRIG) == 0 then
set_mario_action(m, ACT_TWIRLING, 5)
end
local stepResult = perform_air_step(m, 0) local stepResult = perform_air_step(m, 0)
if stepResult == AIR_STEP_LANDED then if stepResult == AIR_STEP_LANDED then
if should_get_stuck_in_ground(m) ~= 0 then if should_get_stuck_in_ground(m) ~= 0 then
@ -85,6 +91,7 @@ function act_spin_pound(m)
if e.rotAngle > 0x10000 then e.rotAngle = e.rotAngle - 0x10000 end if e.rotAngle > 0x10000 then e.rotAngle = e.rotAngle - 0x10000 end
if e.rotAngle < -0x10000 then e.rotAngle = e.rotAngle + 0x10000 end if e.rotAngle < -0x10000 then e.rotAngle = e.rotAngle + 0x10000 end
m.marioObj.header.gfx.angle.y = m.marioObj.header.gfx.angle.y + e.rotAngle * spinDirFactor m.marioObj.header.gfx.angle.y = m.marioObj.header.gfx.angle.y + e.rotAngle * spinDirFactor
m.marioBodyState.handState = MARIO_HAND_OPEN
m.actionTimer = m.actionTimer + 1 m.actionTimer = m.actionTimer + 1
@ -236,7 +243,7 @@ function luigi_update(m)
end end
-- twirl pound -- twirl pound
if m.action == ACT_TWIRLING and (m.input & INPUT_Z_PRESSED) ~= 0 then if m.action == ACT_TWIRLING and (m.controller.buttonDown & Z_TRIG) ~= 0 then
set_mario_action(m, ACT_SPIN_POUND, 0) set_mario_action(m, ACT_SPIN_POUND, 0)
end end
@ -786,7 +793,7 @@ function wario_before_phys_step(m)
if (m.action & ACT_HOLD_WATER_JUMP) then if (m.action & ACT_HOLD_WATER_JUMP) then
return return
end end
-- faster holding item -- faster holding item
if m.heldObj ~= nil then if m.heldObj ~= nil then
m.vel.y = m.vel.y - 1 m.vel.y = m.vel.y - 1