- exported all females.

This commit is contained in:
Christoph Oelckers 2022-12-14 00:11:35 +01:00
parent 810977f19f
commit 240b24d771
7 changed files with 145 additions and 42 deletions

View file

@ -206,14 +206,6 @@ void initactorflags_r()
setflag(SFLAG3_BLOODY, { RTILE_BLOODPOOL });
setflag(SFLAG3_BROWNBLOOD, { RTILE_FECES });
setflag(SFLAG2_TRIGGERRESPAWN, {
RTILE_FEM10,
RTILE_PODFEM1,
RTILE_NAKED1,
RTILE_STATUE,
RTILE_TOUGHGAL
});
setflag(SFLAG2_NOFLOORPAL, {
RTILE_RESPAWNMARKERRED,
RTILE_RESPAWNMARKERYELLOW,

View file

@ -137,10 +137,6 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
if (!badguy(act) || commonEnemySetup(act, actj))
CallInitialize(act);
break;
case FOF:
act->spr.scale = DVector2(0, 0);
ChangeActorStat(act, STAT_MISC);
break;
case DTILE_BLOOD:
act->spr.scale = DVector2(0.25, 0.25);
act->spr.pos.Z -= 26;
@ -154,28 +150,6 @@ DDukeActor* spawninit_d(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
ChangeActorStat(act, STAT_MISC);
break;
case DTILE_FEM1:
case DTILE_FEM2:
case DTILE_FEM3:
case DTILE_FEM4:
case DTILE_FEM5:
case DTILE_FEM6:
case DTILE_FEM7:
case DTILE_FEM8:
case DTILE_FEM9:
case DTILE_FEM10:
case DTILE_PODFEM1:
case DTILE_NAKED1:
case DTILE_TOUGHGAL:
if (act->spr.picnum == DTILE_PODFEM1) act->spr.extra <<= 1;
[[fallthrough]];
case DTILE_BLOODYPOLE:
act->spr.cstat |= CSTAT_SPRITE_BLOCK_ALL;
act->clipdist = 8;
ChangeActorStat(act, STAT_ZOMBIEACTOR);
break;
case DTILE_DUKELYINGDEAD:
if (actj && actj->isPlayer())
{

View file

@ -90,14 +90,6 @@ DDukeActor* spawninit_r(DDukeActor* actj, DDukeActor* act, TArray<DDukeActor*>*
act->spr.cstat |= CSTAT_SPRITE_BLOCK_ALL;
ChangeActorStat(act, 0);
break;
case RTILE_FEM10:
case RTILE_NAKED1:
case RTILE_STATUE:
case RTILE_TOUGHGAL:
act->spr.cstat |= CSTAT_SPRITE_BLOCK_ALL;
act->clipdist = 8;
ChangeActorStat(act, STAT_ZOMBIEACTOR);
break;
case RTILE_DUKELYINGDEAD:
if (actj && actj->isPlayer())
{

View file

@ -251,6 +251,22 @@ spawnclasses
661 = DukeWaterBubble
2329 = DukeSmallSmoke
1250 = DukeSteam
1312 = DukeFemale1
1317 = DukeFemale2
1321 = DukeFemale3
1325 = DukeFemale4
1323 = DukeFemale5
1334 = DukeFemale6
1395 = DukeFemale7
1336 = DukeFemale8
3450 = DukeFemale9
4864 = DukeFemale10
4866 = DukeToughGal
603 = DukeNaked
1294 = DukePodFemale
1324 = DukeBloodyPole
2000 = DukePigCop
2001 = DukePigCopStayPut

View file

@ -119,6 +119,7 @@ version "4.10"
#include "zscript/games/duke/actors/boss3.zs"
#include "zscript/games/duke/actors/boss4.zs"
#include "zscript/games/duke/actors/boss5.zs"
#include "zscript/games/duke/actors/females.zs"
#include "zscript/games/duke/actors/flamethrowerflame.zs"
#include "zscript/games/duke/actors/firefly.zs"

View file

@ -193,3 +193,4 @@ class RedneckGeometryEffect : DukeActor
class RedneckKeyinfoSetter : DukeActor
{
}

View file

@ -0,0 +1,127 @@
class DukeFemale1 : DukeActor
{
default
{
pic "FEM1";
}
override void Initialize()
{
self.cstat |= CSTAT_SPRITE_BLOCK_ALL;
self.clipdist = 8;
self.ChangeStat(STAT_ZOMBIEACTOR);
}
}
class DukeFemale2 : DukeFemale1
{
default
{
pic "FEM2";
}
}
class DukeFemale3 : DukeFemale1
{
default
{
pic "FEM3";
}
}
class DukeFemale4 : DukeFemale1
{
default
{
pic "FEM4";
}
}
class DukeFemale5 : DukeFemale1
{
default
{
pic "FEM5";
}
}
class DukeFemale6 : DukeFemale1
{
default
{
pic "FEM6";
}
}
class DukeFemale7 : DukeFemale1
{
default
{
pic "FEM7";
}
}
class DukeFemale8 : DukeFemale1
{
default
{
pic "FEM8";
}
}
class DukeFemale9 : DukeFemale1
{
default
{
pic "FEM9";
}
}
class DukeFemale10 : DukeFemale1
{
default
{
pic "FEM10";
}
}
class DukeNaked : DukeFemale1
{
default
{
pic "NAKED1";
}
}
class DukeToughGal : DukeFemale1
{
default
{
pic "TOUGHGAL";
}
}
class DukeBloodyPole : DukeFemale1
{
default
{
pic "BLOODYPOLE";
}
}
class DukePodFemale : DukeFemale1
{
default
{
pic "PODFEM1";
}
override void Initialize()
{
Super.Initialize();
self.extra <<= 1;
}
}