mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2025-10-30 08:01:01 +00:00
Arena - make knockback animations twice as fast
This commit is contained in:
parent
0e1cda1b91
commit
0d2d6eff04
1 changed files with 29 additions and 0 deletions
|
|
@ -28,6 +28,14 @@ for i = 0, (MAX_PLAYERS - 1) do
|
||||||
s.rank = 0
|
s.rank = 0
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local sKnockbackActions = {
|
||||||
|
ACT_SOFT_FORWARD_GROUND_KB, ACT_FORWARD_GROUND_KB, ACT_HARD_FORWARD_GROUND_KB,
|
||||||
|
ACT_FORWARD_AIR_KB, ACT_FORWARD_AIR_KB, ACT_HARD_FORWARD_AIR_KB,
|
||||||
|
ACT_FORWARD_WATER_KB, ACT_FORWARD_WATER_KB, ACT_FORWARD_WATER_KB,
|
||||||
|
ACT_SOFT_BACKWARD_GROUND_KB, ACT_BACKWARD_GROUND_KB, ACT_HARD_BACKWARD_GROUND_KB,
|
||||||
|
ACT_BACKWARD_AIR_KB, ACT_BACKWARD_AIR_KB, ACT_HARD_BACKWARD_AIR_KB,
|
||||||
|
ACT_BACKWARD_WATER_KB, ACT_BACKWARD_WATER_KB, ACT_BACKWARD_WATER_KB
|
||||||
|
}
|
||||||
------------
|
------------
|
||||||
-- hammer --
|
-- hammer --
|
||||||
------------
|
------------
|
||||||
|
|
@ -361,6 +369,27 @@ function mario_update(m)
|
||||||
local s = gPlayerSyncTable[m.playerIndex]
|
local s = gPlayerSyncTable[m.playerIndex]
|
||||||
local np = gNetworkPlayers[m.playerIndex]
|
local np = gNetworkPlayers[m.playerIndex]
|
||||||
|
|
||||||
|
-- increase knockback animations
|
||||||
|
local animInfo = nil
|
||||||
|
if m.marioObj ~= nil then
|
||||||
|
animInfo = m.marioObj.header.gfx.animInfo
|
||||||
|
end
|
||||||
|
for i, value in ipairs(sKnockbackActions) do
|
||||||
|
if m.action == value then
|
||||||
|
local frame = animInfo.animFrame
|
||||||
|
local loopEnd = frame
|
||||||
|
if animInfo.curAnim ~= nil then
|
||||||
|
loopEnd = animInfo.curAnim.loopEnd
|
||||||
|
end
|
||||||
|
|
||||||
|
if frame < loopEnd - 2 then
|
||||||
|
frame = frame + 1
|
||||||
|
end
|
||||||
|
|
||||||
|
animInfo.animFrame = frame
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
-- clear invincibilities
|
-- clear invincibilities
|
||||||
m.invincTimer = 0
|
m.invincTimer = 0
|
||||||
if m.knockbackTimer > 5 then
|
if m.knockbackTimer > 5 then
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue