diff --git a/src/dehacked.c b/src/dehacked.c
index 31c17f18811fcbcd78e8f5d46c43aa3d4a25ae07..01e2b0bde61c5ea17d4a5665a94fe948e05a9a43 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -5699,7 +5699,8 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_CEZFLOWER",
"S_CEZPOLE",
- "S_CEZBANNER",
+ "S_CEZBANNER1",
+ "S_CEZBANNER2",
"S_PINETREE",
"S_CEZBUSH1",
"S_CEZBUSH2",
@@ -5708,7 +5709,8 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_FLAMEHOLDER",
"S_FIRETORCH",
"S_WAVINGFLAG",
- "S_WAVINGFLAGSEG",
+ "S_WAVINGFLAGSEG1",
+ "S_WAVINGFLAGSEG2",
"S_CRAWLASTATUE",
"S_FACESTABBERSTATUE",
"S_SUSPICIOUSFACESTABBERSTATUE_WAIT",
@@ -7514,8 +7516,10 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_SMALLFIREBAR", // Small Firebar
"MT_BIGFIREBAR", // Big Firebar
"MT_CEZFLOWER", // Flower
- "MT_CEZPOLE", // Pole
- "MT_CEZBANNER", // Banner
+ "MT_CEZPOLE1", // Pole (with red banner)
+ "MT_CEZPOLE2", // Pole (with blue banner)
+ "MT_CEZBANNER1", // Banner (red)
+ "MT_CEZBANNER2", // Banner (blue)
"MT_PINETREE", // Pine Tree
"MT_CEZBUSH1", // Bush 1
"MT_CEZBUSH2", // Bush 2
@@ -7523,8 +7527,10 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_CANDLEPRICKET", // Candle pricket
"MT_FLAMEHOLDER", // Flame holder
"MT_FIRETORCH", // Fire torch
- "MT_WAVINGFLAG", // Waving flag
- "MT_WAVINGFLAGSEG", // Waving flag segment
+ "MT_WAVINGFLAG1", // Waving flag (red)
+ "MT_WAVINGFLAG2", // Waving flag (blue)
+ "MT_WAVINGFLAGSEG1", // Waving flag segment (red)
+ "MT_WAVINGFLAGSEG2", // Waving flag segment (blue)
"MT_CRAWLASTATUE", // Crawla statue
"MT_FACESTABBERSTATUE", // Facestabber statue
"MT_SUSPICIOUSFACESTABBERSTATUE", // :eggthinking:
diff --git a/src/info.c b/src/info.c
index 7606f27a1c08b4453d4c087d930ef998b9ad5782..a4446d65712972ef1cae87c3ee8a0a39f865f6a9 100644
--- a/src/info.c
+++ b/src/info.c
@@ -2322,9 +2322,10 @@ state_t states[NUMSTATES] =
{SPR_BFBR, FF_FULLBRIGHT|15, 1, {NULL}, 0, 0, S_BIGFIREBAR1}, // S_BIGFIREBAR16
{SPR_FWR4, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CEZFLOWER
- {SPR_BANR, 1, -1, {NULL}, 0, 0, S_NULL}, // S_CEZPOLE
+ {SPR_BANR, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CEZPOLE
- {SPR_BANR, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_CEZBANNER
+ {SPR_BANR, FF_PAPERSPRITE|1, -1, {NULL}, 0, 0, S_NULL}, // S_CEZBANNER1
+ {SPR_BANR, FF_PAPERSPRITE|2, -1, {NULL}, 0, 0, S_NULL}, // S_CEZBANNER2
{SPR_PINE, 0, -1, {NULL}, 0, 0, S_NULL}, // S_PINETREE
{SPR_CEZB, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CEZBUSH1
@@ -2338,7 +2339,8 @@ state_t states[NUMSTATES] =
{SPR_CTRC, FF_FULLBRIGHT|FF_ANIMATE, 8*3, {A_FlameParticle}, 3, 3, S_FIRETORCH}, // S_FIRETORCH
{SPR_CFLG, 0, -1, {NULL}, 0, 0, S_NULL}, // S_WAVINGFLAG
- {SPR_CFLG, FF_PAPERSPRITE|1, -1, {NULL}, 0, 0, S_NULL}, // S_WAVINGFLAGSEG
+ {SPR_CFLG, FF_PAPERSPRITE|1, -1, {NULL}, 0, 0, S_NULL}, // S_WAVINGFLAGSEG1
+ {SPR_CFLG, FF_PAPERSPRITE|2, -1, {NULL}, 0, 0, S_NULL}, // S_WAVINGFLAGSEG2
{SPR_CSTA, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CRAWLASTATUE
@@ -11018,7 +11020,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_CEZPOLE
+ { // MT_CEZPOLE1
1117, // doomednum
S_CEZPOLE, // spawnstate
1000, // spawnhealth
@@ -11045,9 +11047,63 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_CEZBANNER
+ { // MT_CEZPOLE2
+ 1118, // doomednum
+ S_CEZPOLE, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 40*FRACUNIT, // radius
+ 224*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_CEZBANNER1
-1, // doomednum
- S_CEZBANNER, // spawnstate
+ S_CEZBANNER1, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 40*FRACUNIT, // radius
+ 224*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_CEZBANNER2
+ -1, // doomednum
+ S_CEZBANNER2, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -11261,8 +11317,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_WAVINGFLAG
- 1118, // doomednum
+ { // MT_WAVINGFLAG1
+ 1128, // doomednum
S_WAVINGFLAG, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
@@ -11278,8 +11334,35 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
- 4*FRACUNIT, // radius
- 104*FRACUNIT, // height
+ 8*FRACUNIT, // radius
+ 208*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_SOLID, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_WAVINGFLAG2
+ 1129, // doomednum
+ S_WAVINGFLAG, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 8*FRACUNIT, // radius
+ 208*FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
@@ -11288,9 +11371,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_WAVINGFLAGSEG
+ { // MT_WAVINGFLAGSEG1
-1, // doomednum
- S_WAVINGFLAGSEG, // spawnstate
+ S_WAVINGFLAGSEG1, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -11305,7 +11388,34 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
- 4*FRACUNIT, // radius
+ 8*FRACUNIT, // radius
+ 1, // height -- this is not a typo
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_WAVINGFLAGSEG2
+ -1, // doomednum
+ S_WAVINGFLAGSEG2, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 8*FRACUNIT, // radius
1, // height -- this is not a typo
0, // display offset
100, // mass
diff --git a/src/info.h b/src/info.h
index 44f08a4e951dc2f767c50b6d2502b10258d77940..a9a0321ec0a41df08f9c9e622496f8f6692fcf7d 100644
--- a/src/info.h
+++ b/src/info.h
@@ -2458,7 +2458,8 @@ typedef enum state
S_CEZFLOWER,
S_CEZPOLE,
- S_CEZBANNER,
+ S_CEZBANNER1,
+ S_CEZBANNER2,
S_PINETREE,
S_CEZBUSH1,
S_CEZBUSH2,
@@ -2467,7 +2468,8 @@ typedef enum state
S_FLAMEHOLDER,
S_FIRETORCH,
S_WAVINGFLAG,
- S_WAVINGFLAGSEG,
+ S_WAVINGFLAGSEG1,
+ S_WAVINGFLAGSEG2,
S_CRAWLASTATUE,
S_FACESTABBERSTATUE,
S_SUSPICIOUSFACESTABBERSTATUE_WAIT,
@@ -4295,8 +4297,10 @@ typedef enum mobj_type
MT_SMALLFIREBAR, // Small Firebar
MT_BIGFIREBAR, // Big Firebar
MT_CEZFLOWER, // Flower
- MT_CEZPOLE, // Pole
- MT_CEZBANNER, // Banner
+ MT_CEZPOLE1, // Pole (with red banner)
+ MT_CEZPOLE2, // Pole (with blue banner)
+ MT_CEZBANNER1, // Banner (red)
+ MT_CEZBANNER2, // Banner (blue)
MT_PINETREE, // Pine Tree
MT_CEZBUSH1, // Bush 1
MT_CEZBUSH2, // Bush 2
@@ -4304,8 +4308,10 @@ typedef enum mobj_type
MT_CANDLEPRICKET, // Candle pricket
MT_FLAMEHOLDER, // Flame holder
MT_FIRETORCH, // Fire torch
- MT_WAVINGFLAG, // Waving flag
- MT_WAVINGFLAGSEG, // Waving flag segment
+ MT_WAVINGFLAG1, // Waving flag (red)
+ MT_WAVINGFLAG2, // Waving flag (blue)
+ MT_WAVINGFLAGSEG1, // Waving flag segment (red)
+ MT_WAVINGFLAGSEG2, // Waving flag segment (blue)
MT_CRAWLASTATUE, // Crawla statue
MT_FACESTABBERSTATUE, // Facestabber statue
MT_SUSPICIOUSFACESTABBERSTATUE, // :eggthinking:
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 9a6e0f2bb23bd4bd5f548306440fc48299e2a3d8..1cb7f742d44173e7679a32f7b99bc319069b8e58 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -4674,7 +4674,7 @@ static void P_Boss4PinchSpikeballs(mobj_t *mobj, angle_t angle, fixed_t dz)
}
dz /= 9;
-
+
while ((base = base->tracer)) // there are 10 per spoke, remember that
{
dx = (originx + P_ReturnThrustX(mobj, angle, (9*132)<<FRACBITS) - mobj->x)/9;
@@ -8072,7 +8072,8 @@ void P_MobjThinker(mobj_t *mobj)
mobj->tracer->z += mobj->height;
}
break;
- case MT_WAVINGFLAG:
+ case MT_WAVINGFLAG1:
+ case MT_WAVINGFLAG2:
{
fixed_t base = (leveltime<<(FRACBITS+1));
mobj_t *seg = mobj->tracer, *prev = mobj;
@@ -9675,15 +9676,14 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
case MT_BIGMINE:
mobj->extravalue1 = FixedHypot(mobj->x, mobj->y)>>FRACBITS;
break;
- case MT_WAVINGFLAG:
+ case MT_WAVINGFLAG1:
+ case MT_WAVINGFLAG2:
{
mobj_t *prev = mobj, *cur;
UINT8 i;
- mobj->destscale <<= 2;
- P_SetScale(mobj, mobj->destscale);
for (i = 0; i <= 16; i++) // probably should be < but staying authentic to the Lua version
{
- cur = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_WAVINGFLAGSEG);
+ cur = P_SpawnMobjFromMobj(mobj, 0, 0, 0, ((mobj->type == MT_WAVINGFLAG1) ? MT_WAVINGFLAGSEG1 : MT_WAVINGFLAGSEG2));;
P_SetTarget(&prev->tracer, cur);
cur->extravalue1 = i;
prev = cur;
@@ -11754,13 +11754,14 @@ ML_EFFECT5 : Don't stop thinking when too far away
P_SpawnMobjFromMobj(mobj, -1*FRACUNIT, 0, 0, MT_THZTREEBRANCH)->angle = mobjangle + ANGLE_270;
}
break;
- case MT_CEZPOLE:
+ case MT_CEZPOLE1:
+ case MT_CEZPOLE2:
{ // Spawn the banner
angle_t mobjangle = FixedAngle(mthing->angle<<FRACBITS);
P_SpawnMobjFromMobj(mobj,
P_ReturnThrustX(mobj, mobjangle, 4<<FRACBITS),
P_ReturnThrustY(mobj, mobjangle, 4<<FRACBITS),
- 0, MT_CEZBANNER)->angle = mobjangle + ANGLE_90;
+ 0, ((mobj->type == MT_CEZPOLE1) ? MT_CEZBANNER1 : MT_CEZBANNER2))->angle = mobjangle + ANGLE_90;
}
break;
case MT_HHZTREE_TOP: