- two new flags for the hitscan attack.

This commit is contained in:
Christoph Oelckers 2022-12-23 08:11:57 +01:00
parent 0643ab22c0
commit 041d5214a4
8 changed files with 11 additions and 4 deletions

View file

@ -143,6 +143,7 @@ static FFlagDef DukeActorFlagDefs[] =
DEFINE_FLAG(SFLAG2, BREAKMIRRORS, DDukeActor, flags2),
DEFINE_FLAG(SFLAG2, CAMERA, DDukeActor, flags2),
DEFINE_FLAG(SFLAG2, DONTANIMATE, DDukeActor, flags2),
DEFINE_FLAG(SFLAG2, ALTHITSCANDIRECTION, DDukeActor, flags2),
DEFINE_FLAG(SFLAG2, GREENBLOOD, DDukeActor, flags2),
DEFINE_FLAG(SFLAG2, ALWAYSROTATE1, DDukeActor, flags2),
DEFINE_FLAG(SFLAG2, DIENOW, DDukeActor, flags2),
@ -173,6 +174,7 @@ static FFlagDef DukeActorFlagDefs[] =
DEFINE_FLAG(SFLAG3, BIGHEALTH, DDukeActor, flags3),
DEFINE_FLAG(SFLAG3, NOGRAVITY, DDukeActor, flags3),
DEFINE_FLAG(SFLAG3, SIMPLEINIT, DDukeActor, flags3),
DEFINE_FLAG(SFLAG3, NOHITSCANHIT, DDukeActor, flags1),
};

View file

@ -369,11 +369,11 @@ enum sflags2_t
SFLAG2_BREAKMIRRORS = 0x00000080,
SFLAG2_CAMERA = 0x00000100,
SFLAG2_DONTANIMATE = 0x00000200,
//SFLAG2_INTERPOLATEANGLE = 0x00000400,
SFLAG2_ALTHITSCANDIRECTION = 0x00000400,
SFLAG2_GREENBLOOD = 0x00000800,
SFLAG2_ALWAYSROTATE1 = 0x00001000,
SFLAG2_DIENOW = 0x00002000,
SFLAG2_TRANSFERPALTOJIBS = 0x00004000,
SFLAG2_TRANSFERPALTOJIBS = 0x00004000,
SFLAG2_NORADIUSPUSH = 0x00008000,
SFLAG2_FREEZEDAMAGE = 0x00010000,
SFLAG2_REFLECTIVE = 0x00020000,
@ -407,7 +407,7 @@ enum sflags3_t
SFLAG3_BIGHEALTH = 0x00000020,
SFLAG3_NOGRAVITY = 0x00000040, // disables makeitfall.
SFLAG3_SIMPLEINIT = 0x00000080, // Internal: skip default init stuff in DukeActor::Initialize.
SFLAG3_NOHITSCANHIT = 0x00000100, // just pretend the hit never happened. RR's tornado uses it.
};
using EDukeFlags3 = TFlags<sflags3_t, uint32_t>;

View file

@ -7,6 +7,7 @@ class DukeBoss1 : DukeActor
+KILLCOUNT;
+NODAMAGEPUSH;
+BOSS;
+ALTHITSCANDIRECTION;
}
override void Initialize()

View file

@ -3,7 +3,7 @@ class DukeBoss2 : DukeBoss1
default
{
pic "BOSS2";
-ALTHITSCANDIRECTION;
+NONSMOKYROCKET; // If this wasn't needed for a CON defined actor it could be handled better
}

View file

@ -3,6 +3,7 @@ class DukeBoss3 : DukeBoss1
default
{
pic "BOSS3";
-ALTHITSCANDIRECTION;
}
override void PlayFTASound()

View file

@ -3,6 +3,7 @@ class DukeBoss4 : DukeBoss1
default
{
pic "BOSS4";
-ALTHITSCANDIRECTION;
}
override void PlayFTASound()

View file

@ -3,6 +3,7 @@ class DukeBoss5 : DukeBoss1
default
{
pic "BOSS5";
-ALTHITSCANDIRECTION;
}
}

View file

@ -383,6 +383,7 @@ class RedneckTornado : DukeActor
{
pic "TORNADO";
+INTERNAL_BADGUY;
+NOHITSCANHIT;
}
override void Initialize()
{