- Added DECORATE conversions for Hexen's Cleric Mace, Firedemon and fog by
Karate Chris. - Added several type checks to the weapon slot code. - Changed: Players no longer respawn in instant death sectors with the 'Respawn where died' flag on. SVN r1101 (trunk)
This commit is contained in:
Christoph Oelckers
parent
bb0759f575
commit
fddf69e950
14 changed files with 1053 additions and 1152 deletions
|
|
@ -27,303 +27,6 @@ void A_FiredChase (AActor *);
|
|||
void A_FiredAttack (AActor *);
|
||||
void A_FiredSplotch (AActor *);
|
||||
|
||||
// FireDemon ----------------------------------------------------------------
|
||||
|
||||
class AFireDemon : public AActor
|
||||
{
|
||||
DECLARE_ACTOR (AFireDemon, AActor)
|
||||
};
|
||||
|
||||
FState AFireDemon::States[] =
|
||||
{
|
||||
#define S_FIRED_SPAWN1 0
|
||||
S_BRIGHT (FDMN, 'X', 5, NULL , &States[S_FIRED_SPAWN1+1]),
|
||||
|
||||
#define S_FIRED_LOOK1 (S_FIRED_SPAWN1+1)
|
||||
S_BRIGHT (FDMN, 'E', 10, A_Look , &States[S_FIRED_LOOK1+1]),
|
||||
S_BRIGHT (FDMN, 'F', 10, A_Look , &States[S_FIRED_LOOK1+2]),
|
||||
S_BRIGHT (FDMN, 'G', 10, A_Look , &States[S_FIRED_LOOK1+0]),
|
||||
|
||||
S_BRIGHT (FDMN, 'E', 8, NULL , &States[S_FIRED_LOOK1+4]),
|
||||
S_BRIGHT (FDMN, 'F', 6, NULL , &States[S_FIRED_LOOK1+5]),
|
||||
S_BRIGHT (FDMN, 'G', 5, NULL , &States[S_FIRED_LOOK1+6]),
|
||||
S_BRIGHT (FDMN, 'F', 8, NULL , &States[S_FIRED_LOOK1+7]),
|
||||
S_BRIGHT (FDMN, 'E', 6, NULL , &States[S_FIRED_LOOK1+8]),
|
||||
S_BRIGHT (FDMN, 'F', 7, A_FiredRocks , &States[S_FIRED_LOOK1+9]),
|
||||
S_BRIGHT (FDMN, 'H', 5, NULL , &States[S_FIRED_LOOK1+10]),
|
||||
S_BRIGHT (FDMN, 'I', 5, NULL , &States[S_FIRED_LOOK1+11]),
|
||||
S_BRIGHT (FDMN, 'J', 5, A_UnSetInvulnerable , &States[S_FIRED_LOOK1+12]),
|
||||
|
||||
#define S_FIRED_WALK1 (S_FIRED_LOOK1+12)
|
||||
S_BRIGHT (FDMN, 'A', 5, A_FiredChase , &States[S_FIRED_WALK1+1]),
|
||||
S_BRIGHT (FDMN, 'B', 5, A_FiredChase , &States[S_FIRED_WALK1+2]),
|
||||
S_BRIGHT (FDMN, 'C', 5, A_FiredChase , &States[S_FIRED_WALK1+0]),
|
||||
|
||||
#define S_FIRED_PAIN1 (S_FIRED_WALK1+3)
|
||||
S_BRIGHT (FDMN, 'D', 6, A_Pain , &States[S_FIRED_WALK1]),
|
||||
|
||||
#define S_FIRED_ATTACK1 (S_FIRED_PAIN1+1)
|
||||
S_BRIGHT (FDMN, 'K', 3, A_FaceTarget , &States[S_FIRED_ATTACK1+1]),
|
||||
S_BRIGHT (FDMN, 'K', 5, A_FiredAttack , &States[S_FIRED_ATTACK1+2]),
|
||||
S_BRIGHT (FDMN, 'K', 5, A_FiredAttack , &States[S_FIRED_ATTACK1+3]),
|
||||
S_BRIGHT (FDMN, 'K', 5, A_FiredAttack , &States[S_FIRED_WALK1]),
|
||||
|
||||
#define S_FIRED_DEATH1 (S_FIRED_ATTACK1+4)
|
||||
S_BRIGHT (FDMN, 'D', 4, A_FaceTarget , &States[S_FIRED_DEATH1+1]),
|
||||
S_BRIGHT (FDMN, 'L', 4, A_Scream , &States[S_FIRED_DEATH1+2]),
|
||||
S_BRIGHT (FDMN, 'L', 4, A_NoBlocking , &States[S_FIRED_DEATH1+3]),
|
||||
S_BRIGHT (FDMN, 'L', 200, NULL , NULL),
|
||||
|
||||
#define S_FIRED_XDEATH1 (S_FIRED_DEATH1+4)
|
||||
S_NORMAL (FDMN, 'M', 5, A_FaceTarget , &States[S_FIRED_XDEATH1+1]),
|
||||
S_NORMAL (FDMN, 'N', 5, A_NoBlocking , &States[S_FIRED_XDEATH1+2]),
|
||||
S_NORMAL (FDMN, 'O', 5, A_FiredSplotch , NULL),
|
||||
|
||||
#define S_FIRED_ICE1 (S_FIRED_XDEATH1+3)
|
||||
S_NORMAL (FDMN, 'R', 5, A_FreezeDeath , &States[S_FIRED_ICE1+1]),
|
||||
S_NORMAL (FDMN, 'R', 1, A_FreezeDeathChunks , &States[S_FIRED_ICE1+1])
|
||||
};
|
||||
|
||||
IMPLEMENT_ACTOR (AFireDemon, Hexen, 10060, 5)
|
||||
PROP_SpawnHealth (80)
|
||||
PROP_ReactionTime (8)
|
||||
PROP_PainChance (1)
|
||||
PROP_SpeedFixed (13)
|
||||
PROP_RadiusFixed (20)
|
||||
PROP_HeightFixed (68)
|
||||
PROP_Mass (75)
|
||||
PROP_Damage (1)
|
||||
PROP_Flags (MF_SOLID|MF_SHOOTABLE|MF_COUNTKILL|MF_DROPOFF|MF_NOGRAVITY|MF_FLOAT)
|
||||
PROP_Flags2 (MF2_FLOORCLIP|MF2_PASSMOBJ|MF2_PUSHWALL|MF2_INVULNERABLE|MF2_MCROSS|MF2_TELESTOMP)
|
||||
|
||||
PROP_SpawnState (S_FIRED_SPAWN1)
|
||||
PROP_SeeState (S_FIRED_LOOK1+3)
|
||||
PROP_PainState (S_FIRED_PAIN1)
|
||||
PROP_MissileState (S_FIRED_ATTACK1)
|
||||
PROP_CrashState (S_FIRED_XDEATH1)
|
||||
PROP_DeathState (S_FIRED_DEATH1)
|
||||
PROP_XDeathState (S_FIRED_XDEATH1)
|
||||
PROP_IDeathState (S_FIRED_ICE1)
|
||||
|
||||
PROP_SeeSound ("FireDemonSpawn")
|
||||
PROP_PainSound ("FireDemonPain")
|
||||
PROP_DeathSound ("FireDemonDeath")
|
||||
PROP_ActiveSound ("FireDemonActive")
|
||||
PROP_Obituary("$OB_FIREDEMON")
|
||||
END_DEFAULTS
|
||||
|
||||
// AFireDemonSplotch1 -------------------------------------------------------
|
||||
|
||||
class AFireDemonSplotch1 : public AActor
|
||||
{
|
||||
DECLARE_ACTOR (AFireDemonSplotch1, AActor)
|
||||
};
|
||||
|
||||
FState AFireDemonSplotch1::States[] =
|
||||
{
|
||||
S_NORMAL (FDMN, 'P', 3, NULL , &States[1]),
|
||||
S_NORMAL (FDMN, 'P', 6, A_QueueCorpse , &States[2]),
|
||||
S_NORMAL (FDMN, 'Y', -1, NULL , NULL)
|
||||
};
|
||||
|
||||
IMPLEMENT_ACTOR (AFireDemonSplotch1, Hexen, -1, 0)
|
||||
PROP_SpawnHealth (1000)
|
||||
PROP_ReactionTime (8)
|
||||
PROP_PainChance (0)
|
||||
PROP_SpeedFixed (0)
|
||||
PROP_RadiusFixed (3)
|
||||
PROP_HeightFixed (16)
|
||||
PROP_Mass (100)
|
||||
PROP_Damage (0)
|
||||
PROP_Flags (MF_DROPOFF|MF_CORPSE)
|
||||
PROP_Flags2 (MF2_NOTELEPORT|MF2_FLOORCLIP)
|
||||
|
||||
PROP_SpawnState (0)
|
||||
END_DEFAULTS
|
||||
|
||||
// AFireDemonSplotch2 -------------------------------------------------------
|
||||
|
||||
class AFireDemonSplotch2 : public AFireDemonSplotch1
|
||||
{
|
||||
DECLARE_ACTOR (AFireDemonSplotch2, AFireDemonSplotch1)
|
||||
};
|
||||
|
||||
FState AFireDemonSplotch2::States[] =
|
||||
{
|
||||
S_NORMAL (FDMN, 'Q', 3, NULL , &States[1]),
|
||||
S_NORMAL (FDMN, 'Q', 6, A_QueueCorpse , &States[2]),
|
||||
S_NORMAL (FDMN, 'Z', -1, NULL , NULL)
|
||||
};
|
||||
|
||||
IMPLEMENT_ACTOR (AFireDemonSplotch2, Hexen, -1, 0)
|
||||
PROP_SpawnState (0)
|
||||
END_DEFAULTS
|
||||
|
||||
// AFireDemonRock1 ------------------------------------------------------------
|
||||
|
||||
class AFireDemonRock1 : public AActor
|
||||
{
|
||||
DECLARE_ACTOR (AFireDemonRock1, AActor)
|
||||
};
|
||||
|
||||
FState AFireDemonRock1::States[] =
|
||||
{
|
||||
#define S_FIRED_RDROP1 0
|
||||
S_NORMAL (FDMN, 'S', 4, NULL , &States[S_FIRED_RDROP1]),
|
||||
|
||||
#define S_FIRED_RDEAD1 (S_FIRED_RDROP1+1)
|
||||
S_NORMAL (FDMN, 'S', 5, A_SmBounce , &States[S_FIRED_RDEAD1+1]),
|
||||
S_NORMAL (FDMN, 'S', 200, NULL , NULL)
|
||||
};
|
||||
|
||||
IMPLEMENT_ACTOR (AFireDemonRock1, Hexen, -1, 0)
|
||||
PROP_SpawnHealth (1000)
|
||||
PROP_ReactionTime (8)
|
||||
PROP_PainChance (0)
|
||||
PROP_SpeedFixed (0)
|
||||
PROP_RadiusFixed (3)
|
||||
PROP_HeightFixed (5)
|
||||
PROP_Mass (16)
|
||||
PROP_Damage (0)
|
||||
PROP_Flags (MF_NOBLOCKMAP|MF_DROPOFF|MF_MISSILE)
|
||||
PROP_Flags2 (MF2_NOTELEPORT)
|
||||
|
||||
PROP_SpawnState (S_FIRED_RDROP1)
|
||||
PROP_DeathState (S_FIRED_RDEAD1)
|
||||
PROP_XDeathState (S_FIRED_RDEAD1+1)
|
||||
END_DEFAULTS
|
||||
|
||||
// AFireDemonRock2 ------------------------------------------------------------
|
||||
|
||||
class AFireDemonRock2 : public AFireDemonRock1
|
||||
{
|
||||
DECLARE_ACTOR (AFireDemonRock2, AActor)
|
||||
};
|
||||
|
||||
FState AFireDemonRock2::States[] =
|
||||
{
|
||||
#define S_FIRED_RDROP2 0
|
||||
S_NORMAL (FDMN, 'T', 4, NULL , &States[S_FIRED_RDROP2]),
|
||||
|
||||
#define S_FIRED_RDEAD2 (S_FIRED_RDROP2+1)
|
||||
S_NORMAL (FDMN, 'T', 5, A_SmBounce , &States[S_FIRED_RDEAD2+1]),
|
||||
S_NORMAL (FDMN, 'T', 200, NULL , NULL)
|
||||
};
|
||||
|
||||
IMPLEMENT_ACTOR (AFireDemonRock2, Hexen, -1, 0)
|
||||
PROP_SpawnState (S_FIRED_RDROP2)
|
||||
PROP_DeathState (S_FIRED_RDEAD2)
|
||||
PROP_XDeathState (S_FIRED_RDEAD2+1)
|
||||
END_DEFAULTS
|
||||
|
||||
// AFireDemonRock3 ------------------------------------------------------------
|
||||
|
||||
class AFireDemonRock3 : public AFireDemonRock1
|
||||
{
|
||||
DECLARE_ACTOR (AFireDemonRock3, AFireDemonRock1)
|
||||
};
|
||||
|
||||
FState AFireDemonRock3::States[] =
|
||||
{
|
||||
#define S_FIRED_RDROP3 0
|
||||
S_NORMAL (FDMN, 'U', 4, NULL , &States[S_FIRED_RDROP3]),
|
||||
|
||||
#define S_FIRED_RDEAD3 (S_FIRED_RDROP3+1)
|
||||
S_NORMAL (FDMN, 'U', 5, A_SmBounce , &States[S_FIRED_RDEAD3+1]),
|
||||
S_NORMAL (FDMN, 'U', 200, NULL , NULL)
|
||||
};
|
||||
|
||||
IMPLEMENT_ACTOR (AFireDemonRock3, Hexen, -1, 0)
|
||||
PROP_SpawnState (S_FIRED_RDROP3)
|
||||
PROP_DeathState (S_FIRED_RDEAD3)
|
||||
PROP_XDeathState (S_FIRED_RDEAD3+1)
|
||||
END_DEFAULTS
|
||||
|
||||
// AFireDemonRock4 ------------------------------------------------------------
|
||||
|
||||
class AFireDemonRock4 : public AFireDemonRock1
|
||||
{
|
||||
DECLARE_ACTOR (AFireDemonRock4, AFireDemonRock1)
|
||||
};
|
||||
|
||||
FState AFireDemonRock4::States[] =
|
||||
{
|
||||
#define S_FIRED_RDROP4 0
|
||||
S_NORMAL (FDMN, 'V', 4, NULL , &States[S_FIRED_RDROP4]),
|
||||
|
||||
#define S_FIRED_RDEAD4 (S_FIRED_RDROP4+1)
|
||||
S_NORMAL (FDMN, 'V', 5, A_SmBounce , &States[S_FIRED_RDEAD4+1]),
|
||||
S_NORMAL (FDMN, 'V', 200, NULL , NULL)
|
||||
};
|
||||
|
||||
IMPLEMENT_ACTOR (AFireDemonRock4, Hexen, -1, 0)
|
||||
PROP_SpawnState (S_FIRED_RDROP4)
|
||||
PROP_DeathState (S_FIRED_RDEAD4)
|
||||
PROP_XDeathState (S_FIRED_RDEAD4+1)
|
||||
END_DEFAULTS
|
||||
|
||||
// AFireDemonRock5 ------------------------------------------------------------
|
||||
|
||||
class AFireDemonRock5 : public AFireDemonRock1
|
||||
{
|
||||
DECLARE_ACTOR (AFireDemonRock5, AActor)
|
||||
};
|
||||
|
||||
FState AFireDemonRock5::States[] =
|
||||
{
|
||||
#define S_FIRED_RDROP5 0
|
||||
S_NORMAL (FDMN, 'W', 4, NULL , &States[S_FIRED_RDROP5]),
|
||||
|
||||
#define S_FIRED_RDEAD5 (S_FIRED_RDROP5+1)
|
||||
S_NORMAL (FDMN, 'W', 5, A_SmBounce , &States[S_FIRED_RDEAD5+1]),
|
||||
S_NORMAL (FDMN, 'W', 200, NULL , NULL)
|
||||
};
|
||||
|
||||
IMPLEMENT_ACTOR (AFireDemonRock5, Hexen, -1, 0)
|
||||
PROP_SpawnState (S_FIRED_RDROP5)
|
||||
PROP_DeathState (S_FIRED_RDEAD5)
|
||||
PROP_XDeathState (S_FIRED_RDEAD5+1)
|
||||
END_DEFAULTS
|
||||
|
||||
// AFireDemonMissile -----------------------------------------------------------
|
||||
|
||||
class AFireDemonMissile : public AActor
|
||||
{
|
||||
DECLARE_ACTOR (AFireDemonMissile, AActor)
|
||||
};
|
||||
|
||||
FState AFireDemonMissile::States[] =
|
||||
{
|
||||
#define S_FIRED_FX6_1 0
|
||||
S_BRIGHT (FDMB, 'A', 5, NULL , &States[S_FIRED_FX6_1]),
|
||||
|
||||
#define S_FIRED_FX6_2 (S_FIRED_FX6_1+1)
|
||||
S_BRIGHT (FDMB, 'B', 5, NULL , &States[S_FIRED_FX6_2+1]),
|
||||
S_BRIGHT (FDMB, 'C', 5, NULL , &States[S_FIRED_FX6_2+2]),
|
||||
S_BRIGHT (FDMB, 'D', 5, NULL , &States[S_FIRED_FX6_2+3]),
|
||||
S_BRIGHT (FDMB, 'E', 5, NULL , NULL)
|
||||
};
|
||||
|
||||
IMPLEMENT_ACTOR (AFireDemonMissile, Hexen, -1, 0)
|
||||
PROP_SpawnHealth (1000)
|
||||
PROP_ReactionTime (8)
|
||||
PROP_PainChance (0)
|
||||
PROP_SpeedFixed (10)
|
||||
PROP_RadiusFixed (10)
|
||||
PROP_HeightFixed (6)
|
||||
PROP_Mass (15)
|
||||
PROP_Damage (1)
|
||||
PROP_DamageType (NAME_Fire)
|
||||
PROP_Flags (MF_NOBLOCKMAP|MF_NOGRAVITY|MF_DROPOFF|MF_MISSILE)
|
||||
PROP_Flags2 (MF2_NOTELEPORT|MF2_IMPACT|MF2_PCROSS|MF2_FLOORCLIP)
|
||||
PROP_RenderStyle (STYLE_Add)
|
||||
|
||||
PROP_SpawnState (S_FIRED_FX6_1)
|
||||
PROP_DeathState (S_FIRED_FX6_2)
|
||||
|
||||
PROP_DeathSound ("FireDemonMissileHit")
|
||||
END_DEFAULTS
|
||||
|
||||
//============================================================================
|
||||
//
|
||||
// A_FiredRocks
|
||||
|
|
@ -354,20 +57,20 @@ void A_FiredSpawnRock (AActor *actor)
|
|||
switch (pr_firedemonrock() % 5)
|
||||
{
|
||||
case 0:
|
||||
rtype = RUNTIME_CLASS (AFireDemonRock1);
|
||||
rtype = PClass::FindClass ("FireDemonRock1");
|
||||
break;
|
||||
case 1:
|
||||
rtype = RUNTIME_CLASS (AFireDemonRock2);
|
||||
rtype = PClass::FindClass ("FireDemonRock2");
|
||||
break;
|
||||
case 2:
|
||||
rtype = RUNTIME_CLASS (AFireDemonRock3);
|
||||
rtype = PClass::FindClass ("FireDemonRock3");
|
||||
break;
|
||||
case 3:
|
||||
rtype = RUNTIME_CLASS (AFireDemonRock4);
|
||||
rtype = PClass::FindClass ("FireDemonRock4");
|
||||
break;
|
||||
case 4:
|
||||
default:
|
||||
rtype = RUNTIME_CLASS (AFireDemonRock5);
|
||||
rtype = PClass::FindClass ("FireDemonRock5");
|
||||
break;
|
||||
}
|
||||
|
||||
|
|
@ -414,7 +117,7 @@ void A_FiredAttack (AActor *actor)
|
|||
{
|
||||
if (actor->target == NULL)
|
||||
return;
|
||||
AActor *mo = P_SpawnMissile (actor, actor->target, RUNTIME_CLASS(AFireDemonMissile));
|
||||
AActor *mo = P_SpawnMissile (actor, actor->target, PClass::FindClass ("FireDemonMissile"));
|
||||
if (mo) S_Sound (actor, CHAN_BODY, "FireDemonAttack", 1, ATTN_NORM);
|
||||
}
|
||||
|
||||
|
|
@ -520,14 +223,14 @@ void A_FiredSplotch (AActor *actor)
|
|||
{
|
||||
AActor *mo;
|
||||
|
||||
mo = Spawn<AFireDemonSplotch1> (actor->x, actor->y, actor->z, ALLOW_REPLACE);
|
||||
mo = Spawn ("FireDemonSplotch1", actor->x, actor->y, actor->z, ALLOW_REPLACE);
|
||||
if (mo)
|
||||
{
|
||||
mo->momx = (pr_firedemonsplotch() - 128) << 11;
|
||||
mo->momy = (pr_firedemonsplotch() - 128) << 11;
|
||||
mo->momz = (pr_firedemonsplotch() << 10) + FRACUNIT*3;
|
||||
}
|
||||
mo = Spawn<AFireDemonSplotch2> (actor->x, actor->y, actor->z, ALLOW_REPLACE);
|
||||
mo = Spawn ("FireDemonSplotch2", actor->x, actor->y, actor->z, ALLOW_REPLACE);
|
||||
if (mo)
|
||||
{
|
||||
mo->momx = (pr_firedemonsplotch() - 128) << 11;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue