mirror of
https://github.com/ZDoom/Raze.git
synced 2024-11-14 16:40:52 +00:00
- exported the egg, also marking it non-killcount.
This commit is contained in:
parent
b4dcf8ddcf
commit
551e0af58d
8 changed files with 30 additions and 39 deletions
|
@ -172,6 +172,5 @@ int TILE_CLOUDYSKIES;
|
|||
int TILE_MIRRORBROKE;
|
||||
int TILE_LOADSCREEN;
|
||||
int TILE_CROSSHAIR;
|
||||
int TILE_EGG;
|
||||
|
||||
END_DUKE_NS
|
||||
|
|
|
@ -290,7 +290,6 @@ void initactorflags_d()
|
|||
TILE_MIRRORBROKE = DTILE_MIRRORBROKE;
|
||||
TILE_LOADSCREEN = DTILE_LOADSCREEN;
|
||||
TILE_CROSSHAIR = DTILE_CROSSHAIR;
|
||||
TILE_EGG = DTILE_EGG;
|
||||
|
||||
}
|
||||
|
||||
|
|
|
@ -50,7 +50,6 @@ void initactorflags_r()
|
|||
setflag(SFLAG_INTERNAL_BADGUY | SFLAG_KILLCOUNT, {
|
||||
RTILE_BOULDER,
|
||||
RTILE_BOULDER1,
|
||||
RTILE_EGG,
|
||||
RTILE_RAT,
|
||||
RTILE_TORNADO,
|
||||
RTILE_BILLYCOCK,
|
||||
|
@ -69,7 +68,6 @@ void initactorflags_r()
|
|||
RTILE_MINIONSTAYPUT,
|
||||
RTILE_COOT,
|
||||
RTILE_COOTSTAYPUT,
|
||||
RTILE_SHARK,
|
||||
RTILE_VIXEN });
|
||||
|
||||
if (isRRRA()) setflag(SFLAG_INTERNAL_BADGUY | SFLAG_KILLCOUNT, {
|
||||
|
@ -182,7 +180,7 @@ void initactorflags_r()
|
|||
setflag(SFLAG_NOFLOORFIRE, { RTILE_TREE1, RTILE_TREE2 });
|
||||
setflag(SFLAG_HITRADIUS_FLAG1, { RTILE_BOX, RTILE_TREE1, RTILE_TREE2, RTILE_TIRE });
|
||||
setflag(SFLAG_HITRADIUS_FLAG2, { RTILE_QUEBALL, RTILE_STRIPEBALL, RTILE_BOWLINGPIN, RTILE_DUKELYINGDEAD });
|
||||
setflag(SFLAG_CHECKSLEEP, { RTILE_RUBBERCAN, RTILE_EXPLODINGBARREL, RTILE_WOODENHORSE, RTILE_HORSEONSIDE, RTILE_CANWITHSOMETHING, RTILE_FIREBARREL, RTILE_NUKEBARREL, RTILE_NUKEBARRELDENTED, RTILE_NUKEBARRELLEAKED, RTILE_EGG });
|
||||
setflag(SFLAG_CHECKSLEEP, { RTILE_RUBBERCAN, RTILE_EXPLODINGBARREL, RTILE_WOODENHORSE, RTILE_HORSEONSIDE, RTILE_CANWITHSOMETHING, RTILE_FIREBARREL, RTILE_NUKEBARREL, RTILE_NUKEBARRELDENTED, RTILE_NUKEBARRELLEAKED });
|
||||
setflag(SFLAG_NOTELEPORT, { RTILE_TRANSPORTERSTAR, RTILE_TRANSPORTERBEAM, RTILE_BULLETHOLE, RTILE_WATERSPLASH2, RTILE_BURNING, RTILE_FIRE, RTILE_MUD });
|
||||
setflag(SFLAG_SE24_NOCARRY, { RTILE_BULLETHOLE, RTILE_BOLT1, RTILE_BOLT2, RTILE_BOLT3, RTILE_BOLT4, RTILE_CRANE, RTILE_CRANE1, RTILE_CRANE2, RTILE_BARBROKE });
|
||||
setflag(SFLAG_SE24_REMOVE, { RTILE_BLOODPOOL, RTILE_PUKE, RTILE_FOOTPRINTS, RTILE_FOOTPRINTS2, RTILE_FOOTPRINTS3 });
|
||||
|
@ -278,7 +276,6 @@ void initactorflags_r()
|
|||
TILE_MIRRORBROKE = RTILE_MIRRORBROKE;
|
||||
TILE_LOADSCREEN = RTILE_LOADSCREEN;
|
||||
TILE_CROSSHAIR = RTILE_CROSSHAIR;
|
||||
TILE_EGG = RTILE_EGG;
|
||||
|
||||
gs.firstdebris = RTILE_SCRAP6;
|
||||
gs.gutsscale = 0.125;
|
||||
|
|
|
@ -13,7 +13,6 @@ extern int TILE_CLOUDYSKIES;
|
|||
extern int TILE_MIRRORBROKE;
|
||||
extern int TILE_LOADSCREEN;
|
||||
extern int TILE_CROSSHAIR;
|
||||
extern int TILE_EGG;
|
||||
|
||||
|
||||
|
||||
|
|
|
@ -216,23 +216,8 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
|
|||
makeitfall(act);
|
||||
if (actj) act->SetOwner(actj);
|
||||
else act->SetOwner(act);
|
||||
[[fallthrough]];
|
||||
|
||||
case DTILE_EGG:
|
||||
if (ud.monsters_off == 1 && act->spr.picnum == DTILE_EGG)
|
||||
{
|
||||
act->spr.scale = DVector2(0, 0);
|
||||
ChangeActorStat(act, STAT_MISC);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (act->spr.picnum == DTILE_EGG)
|
||||
{
|
||||
act->clipdist = 6;
|
||||
}
|
||||
act->spr.cstat = CSTAT_SPRITE_BLOCK_ALL | randomXFlip();
|
||||
ChangeActorStat(act, STAT_ZOMBIEACTOR);
|
||||
}
|
||||
act->spr.cstat = CSTAT_SPRITE_BLOCK_ALL | randomXFlip();
|
||||
ChangeActorStat(act, STAT_ZOMBIEACTOR);
|
||||
break;
|
||||
}
|
||||
return act;
|
||||
|
|
|
@ -547,21 +547,8 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
|
|||
makeitfall(act);
|
||||
if (actj) act->SetOwner(actj);
|
||||
else act->SetOwner(act);
|
||||
[[fallthrough]];
|
||||
|
||||
case RTILE_EGG:
|
||||
if (ud.monsters_off == 1 && act->spr.picnum == RTILE_EGG)
|
||||
{
|
||||
act->spr.scale = DVector2(0, 0);
|
||||
ChangeActorStat(act, STAT_MISC);
|
||||
}
|
||||
else
|
||||
{
|
||||
if (act->spr.picnum == RTILE_EGG)
|
||||
act->clipdist = 6;
|
||||
act->spr.cstat = CSTAT_SPRITE_BLOCK_ALL | randomXFlip();
|
||||
ChangeActorStat(act, STAT_ZOMBIEACTOR);
|
||||
}
|
||||
act->spr.cstat = CSTAT_SPRITE_BLOCK_ALL | randomXFlip();
|
||||
ChangeActorStat(act, STAT_ZOMBIEACTOR);
|
||||
break;
|
||||
case RTILE_RRTILE63:
|
||||
act->spr.cstat |= CSTAT_SPRITE_INVISIBLE;
|
||||
|
|
|
@ -336,4 +336,5 @@ spawnclasses
|
|||
2420 = DukeTurret
|
||||
2360 = DukeRotateGun
|
||||
|
||||
675 = DukeEgg
|
||||
}
|
||||
|
|
|
@ -410,3 +410,27 @@ class DukeGreenSlime : DukeActor
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
class DukeEgg : DukeActor
|
||||
{
|
||||
default
|
||||
{
|
||||
pic "EGG";
|
||||
}
|
||||
|
||||
override void Initialize()
|
||||
{
|
||||
if (ud.monsters_off == 1)
|
||||
{
|
||||
self.scale = (0, 0);
|
||||
self.ChangeStat(STAT_MISC);
|
||||
}
|
||||
else
|
||||
{
|
||||
self.clipdist = 6;
|
||||
self.cstat = CSTAT_SPRITE_BLOCK_ALL | randomXFlip();
|
||||
self.ChangeStat(STAT_ZOMBIEACTOR);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue