stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-18 07:22:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

* Remove Commander-specific hack, incorporate into A_CrawlaCommanderThink.

Browse source 
* Make my changes to its thinker slightly more consistent.
This commit is contained in:
toasterbabe 2018-05-03 14:04:29 +01:00
parent 94c7d9bc52
commit 8f71e93cee
2 changed files with 36 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/p_enemy.c
View file

@ -4994,6 +4994,7 @@ void A_CrawlaCommanderThink(mobj_t *actor)
fixed_t thefloor;
INT32 locvar1 = var1;
INT32 locvar2 = var2;
boolean hovermode = (actor->health > 1 || actor->fuse);
#ifdef HAVE_BLUA
if (LUA_CallAction("A_CrawlaCommanderThink", actor))
return;
@ -5005,6 +5006,17 @@ void A_CrawlaCommanderThink(mobj_t *actor)
else
thefloor = actor->floorz;
if (!actor->fuse && actor->flags2 & MF2_FRET)
{
if (actor->info->painsound)
S_StartSound(actor, actor->info->painsound);
actor->fuse = TICRATE/2;
actor->momz = 0;
P_InstaThrust(actor, actor->angle-ANGLE_180, FixedMul(5*FRACUNIT, actor->scale));
}
if (actor->reactiontime > 0)
actor->reactiontime--;
@ -5015,7 +5027,7 @@ void A_CrawlaCommanderThink(mobj_t *actor)
}
// Hover mode
if (actor->health > 1 || actor->fuse)
if (hovermode)
{
if (actor->z < thefloor + FixedMul(16*FRACUNIT, actor->scale))
actor->momz += FixedMul(FRACUNIT, actor->scale);
@ -5025,7 +5037,7 @@ void A_CrawlaCommanderThink(mobj_t *actor)
actor->momz += FixedMul(16, actor->scale);
}
if (!actor->target || !(actor->target->flags & MF_SHOOTABLE))
if (!actor->target)
{
// look for a new target
if (P_LookForPlayers(actor, true, false, 0))
@ -5038,9 +5050,9 @@ void A_CrawlaCommanderThink(mobj_t *actor)
dist = P_AproxDistance(actor->x - actor->target->x, actor->y - actor->target->y);
if (actor->target->player)
if (actor->target->player && (!hovermode || actor->reactiontime <= 2*TICRATE))
{
if (dist < FixedMul(64<<(FRACBITS+(actor->health == 1 ? 0 : 1)), actor->scale)
if (dist < FixedMul(64<<(FRACBITS+(hovermode ? 1 : 0)), actor->scale)
&& ((actor->target->player->pflags & PF_JUMPED) || (actor->target->player->pflags & PF_SPINNING)))
{
// Auugh! She's trying to kill you! Strafe! STRAAAAFFEEE!!
@ -5069,36 +5081,49 @@ void A_CrawlaCommanderThink(mobj_t *actor)
actor->angle += (P_RandomByte()<<10);
actor->angle -= (P_RandomByte()<<10);
if (actor->health > 1)
if (hovermode)
{
fixed_t mom;
P_Thrust(actor, actor->angle, 2*actor->scale);
mom = P_AproxDistance(actor->momx, actor->momy);
if (mom > 20*actor->scale)
{
mom += 20*actor->scale;
mom >>= 1;
P_InstaThrust(actor, R_PointToAngle2(0, 0, actor->momx, actor->momy), mom);
}
}
}
else if (!actor->reactiontime)
{
if (actor->health > 1) // Hover Mode
if (hovermode && !(actor->flags2 & MF2_FRET)) // Hover Mode
{
if (dist < FixedMul(512*FRACUNIT, actor->scale))
{
actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x, actor->target->y);
P_InstaThrust(actor, actor->angle, FixedMul(30*FRACUNIT, actor->scale));
P_InstaThrust(actor, actor->angle, FixedMul(40*FRACUNIT, actor->scale));
actor->threshold = 1;
if (actor->info->attacksound)
S_StartSound(actor, actor->info->attacksound);
}
}
actor->reactiontime = 2*TICRATE + P_RandomByte()/2;
actor->reactiontime = 3*TICRATE + (P_RandomByte()>>2);
}
if (actor->health == 1)
P_Thrust(actor, actor->angle, 1);
// Pogo Mode
if (!actor->fuse && actor->health == 1 && actor->z <= actor->floorz)
if (!hovermode && actor->z <= actor->floorz)
{
if (actor->info->activesound)
S_StartSound(actor, actor->info->activesound);
if (dist < FixedMul(256*FRACUNIT, actor->scale))
{
actor->momz = FixedMul(locvar2, actor->scale);
actor->angle = R_PointToAngle2(actor->x, actor->y, actor->target->x, actor->target->y);
P_InstaThrust(actor, actor->angle, FixedMul(locvar2/8, actor->scale));
S_StartSound(actor, actor->info->activesound);
// pogo on player
}
else

12
src/p_inter.c
View file

@ -3281,18 +3281,6 @@ boolean P_DamageMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, INT32 da
else
switch (target->type)
{
case MT_CRAWLACOMMANDER:
if (target->info->painsound)
S_StartSound(target, target->info->painsound);
target->fuse = TICRATE/2;
target->momz = 0;
P_InstaThrust(target, target->angle-ANGLE_180, FixedMul(5*FRACUNIT, target->scale));
P_SetMobjState(target, target->info->painstate);
break;
case MT_EGGMOBILE2: // egg slimer
if (target->health < target->info->damage) // in pinch phase
{