mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-01-07 07:22:54 +00:00
Super Flicky: fix super state getting stuck when range check
This commit is contained in:
parent
dd6c37cac0
commit
370ba1b3e0
1 changed files with 15 additions and 9 deletions
|
|
@ -314,6 +314,12 @@ struct Flicky : mobj_t
|
|||
}
|
||||
else
|
||||
{
|
||||
if (stunned())
|
||||
{
|
||||
unnerf();
|
||||
mode(Mode::kHunting);
|
||||
}
|
||||
|
||||
if (chasing() != next_target())
|
||||
{
|
||||
chasing(next_target());
|
||||
|
|
@ -321,15 +327,6 @@ struct Flicky : mobj_t
|
|||
|
||||
S_StartSound(this, sfx_fhurt2);
|
||||
}
|
||||
|
||||
if (stunned())
|
||||
{
|
||||
light_up(true);
|
||||
flags = info->flags;
|
||||
mode(Mode::kHunting);
|
||||
|
||||
S_StartSound(this, sfx_s3k9f);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -484,6 +481,7 @@ struct Flicky : mobj_t
|
|||
{
|
||||
if (AngleDelta(th, R_PointToAngle2(x + momx, y + momy, pos.x, pos.y)) > ANG1)
|
||||
{
|
||||
unnerf();
|
||||
mode(Mode::kReserved);
|
||||
controller()->collect();
|
||||
}
|
||||
|
|
@ -576,6 +574,14 @@ struct Flicky : mobj_t
|
|||
flags &= ~(MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT);
|
||||
}
|
||||
|
||||
void unnerf()
|
||||
{
|
||||
light_up(true);
|
||||
flags = info->flags;
|
||||
|
||||
S_StartSound(this, sfx_s3k9f);
|
||||
}
|
||||
|
||||
void whip()
|
||||
{
|
||||
reflect();
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue