stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2024-11-17 02:01:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

Hardcoded A_Boss5ExtraRepeat

Browse source
This commit is contained in:
Monster Iestyn 2019-05-02 21:21:15 +01:00
parent fb17c1ac5a
commit 953a0c2967
3 changed files with 41 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/dehacked.c
View file

@ -2226,6 +2226,7 @@ static actionpointer_t actionpointers[] =
{{A_CryingToMomma}, "A_CRYINGTOMOMMA"},
{{A_CheckFlags2}, "A_CHECKFLAGS2"},
{{A_DoNPCPain}, "A_DONPCPAIN"},
{{A_Boss5ExtraRepeat}, "A_BOSS5EXTRAREPEAT"},
{{A_Boss5CheckOnGround}, "A_BOSS5CHECKONGROUND"},
{{NULL}, "NONE"},

1
src/info.h
View file

@ -240,6 +240,7 @@ void A_ParentTriesToSleep();
void A_CryingToMomma();
void A_CheckFlags2();
void A_DoNPCPain();
void A_Boss5ExtraRepeat();
void A_Boss5CheckOnGround();
// ratio of states to sprites to mobj types is roughly 6 : 1 : 1

39
src/p_enemy.c
View file

@ -11912,6 +11912,45 @@ void A_DoNPCPain(mobj_t *actor)
P_InstaThrust(actor, actor->angle, -hspeed);
}
// Function: A_Boss5PinchRepeat
//
// Description: Simple way to prepare A_Repeat.
//
// var1 = maximum value to setextravalue2 to (normally)
// var2 = pinch annoyance
//
void A_Boss5ExtraRepeat(mobj_t *actor)
{
INT32 locvar1 = var1;
INT32 locvar2 = var2;
INT32 calc;
INT32 locspawn;
INT32 lochealth;
#ifdef HAVE_BLUA
if (LUA_CallAction("A_Boss5ExtraRepeat", actor))
return;
#endif
if (actor->extravalue2 > 0 && !(actor->flags2 & MF2_FRET))
return;
locspawn = actor->info->spawnhealth - actor->info->damage;
lochealth = actor->health - actor->info->damage;
if (locspawn <= 0 || lochealth <= 0)
calc = locvar1;
else
calc = (locvar1*(locspawn - lochealth))/locspawn;
if (calc > 2)
actor->extravalue2 = 1 + calc/2 + P_RandomKey(calc/2);
else
actor->extravalue2 = 1 + calc;
if (lochealth <= 0)
actor->extravalue2 += locvar2;
}
// Function: A_Boss5CheckOnGround
//
// Description: Ground checker.