Mid-air Corkscrew Conk stuff (#14)
* Mid-air Conk changes. Added a visual when the Corkscrew Conk is executed mid-air and slightly nerfed it when executed in mid-air. * Added a visual to mid-air conk and nerfed it.
This commit is contained in:
parent
b99c5f939f
commit
5acc823f2a
|
@ -600,6 +600,7 @@ function act_wario_air_dash(m)
|
||||||
|
|
||||||
-- corkscrew conk
|
-- corkscrew conk
|
||||||
if (m.input & INPUT_A_PRESSED) ~= 0 then
|
if (m.input & INPUT_A_PRESSED) ~= 0 then
|
||||||
|
m.particleFlags = m.particleFlags | PARTICLE_MIST_CIRCLE
|
||||||
set_jumping_action(m, ACT_CORKSCREW_CONK, 0)
|
set_jumping_action(m, ACT_CORKSCREW_CONK, 0)
|
||||||
play_character_sound(m, CHAR_SOUND_YAHOO)
|
play_character_sound(m, CHAR_SOUND_YAHOO)
|
||||||
end
|
end
|
||||||
|
@ -826,7 +827,12 @@ function wario_on_set_action(m)
|
||||||
if m.action == ACT_CORKSCREW_CONK then
|
if m.action == ACT_CORKSCREW_CONK then
|
||||||
mario_set_forward_vel(m, 60)
|
mario_set_forward_vel(m, 60)
|
||||||
m.vel.x = 0
|
m.vel.x = 0
|
||||||
m.vel.y = 70.0
|
-- nerf the conk when executed in the air
|
||||||
|
if (m.prevAction == ACT_WARIO_DASH) then
|
||||||
|
m.vel.y = 70.0
|
||||||
|
elseif (m.prevAction == ACT_WARIO_AIR_DASH) then
|
||||||
|
m.vel.y = 60.0
|
||||||
|
end
|
||||||
m.vel.z = 0
|
m.vel.z = 0
|
||||||
elseif m.action == ACT_SLIDE_KICK then
|
elseif m.action == ACT_SLIDE_KICK then
|
||||||
mario_set_forward_vel(m, 70)
|
mario_set_forward_vel(m, 70)
|
||||||
|
|
Loading…
Reference in New Issue