stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-29 20:50:58 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'wavingflag' into 'master'

Browse source 
New CEZ scenery

See merge request STJr/SRB2Internal!257
This commit is contained in:
Monster Iestyn 2019-07-28 15:44:00 -04:00
commit 18e2c2461f
4 changed files with 157 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/dehacked.c
View file

@ -5699,7 +5699,8 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_CEZFLOWER", "S_CEZFLOWER",
"S_CEZPOLE", "S_CEZPOLE",
"S_CEZBANNER", "S_CEZBANNER1",
"S_CEZBANNER2",
"S_PINETREE", "S_PINETREE",
"S_CEZBUSH1", "S_CEZBUSH1",
"S_CEZBUSH2", "S_CEZBUSH2",
@ -5708,7 +5709,8 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_FLAMEHOLDER", "S_FLAMEHOLDER",
"S_FIRETORCH", "S_FIRETORCH",
"S_WAVINGFLAG", "S_WAVINGFLAG",
"S_WAVINGFLAGSEG", "S_WAVINGFLAGSEG1",
"S_WAVINGFLAGSEG2",
"S_CRAWLASTATUE", "S_CRAWLASTATUE",
"S_FACESTABBERSTATUE", "S_FACESTABBERSTATUE",
"S_SUSPICIOUSFACESTABBERSTATUE_WAIT", "S_SUSPICIOUSFACESTABBERSTATUE_WAIT",
@ -7514,8 +7516,10 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_SMALLFIREBAR", // Small Firebar "MT_SMALLFIREBAR", // Small Firebar
"MT_BIGFIREBAR", // Big Firebar "MT_BIGFIREBAR", // Big Firebar
"MT_CEZFLOWER", // Flower "MT_CEZFLOWER", // Flower
"MT_CEZPOLE", // Pole "MT_CEZPOLE1", // Pole (with red banner)
"MT_CEZBANNER", // Banner "MT_CEZPOLE2", // Pole (with blue banner)
"MT_CEZBANNER1", // Banner (red)
"MT_CEZBANNER2", // Banner (blue)
"MT_PINETREE", // Pine Tree "MT_PINETREE", // Pine Tree
"MT_CEZBUSH1", // Bush 1 "MT_CEZBUSH1", // Bush 1
"MT_CEZBUSH2", // Bush 2 "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_CANDLEPRICKET", // Candle pricket
"MT_FLAMEHOLDER", // Flame holder "MT_FLAMEHOLDER", // Flame holder
"MT_FIRETORCH", // Fire torch "MT_FIRETORCH", // Fire torch
"MT_WAVINGFLAG", // Waving flag "MT_WAVINGFLAG1", // Waving flag (red)
"MT_WAVINGFLAGSEG", // Waving flag segment "MT_WAVINGFLAG2", // Waving flag (blue)
"MT_WAVINGFLAGSEG1", // Waving flag segment (red)
"MT_WAVINGFLAGSEG2", // Waving flag segment (blue)
"MT_CRAWLASTATUE", // Crawla statue "MT_CRAWLASTATUE", // Crawla statue
"MT_FACESTABBERSTATUE", // Facestabber statue "MT_FACESTABBERSTATUE", // Facestabber statue
"MT_SUSPICIOUSFACESTABBERSTATUE", // :eggthinking: "MT_SUSPICIOUSFACESTABBERSTATUE", // :eggthinking:

138
src/info.c
View file

@ -2322,9 +2322,10 @@ state_t states[NUMSTATES] =
{SPR_BFBR, FF_FULLBRIGHT|15, 1, {NULL}, 0, 0, S_BIGFIREBAR1}, // S_BIGFIREBAR16 {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_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_PINE, 0, -1, {NULL}, 0, 0, S_NULL}, // S_PINETREE
{SPR_CEZB, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CEZBUSH1 {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_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, 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 {SPR_CSTA, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CRAWLASTATUE
@ -11018,7 +11020,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_CEZPOLE { // MT_CEZPOLE1
1117, // doomednum 1117, // doomednum
S_CEZPOLE, // spawnstate S_CEZPOLE, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
@ -11045,9 +11047,63 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate 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 -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 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
sfx_None, // seesound sfx_None, // seesound
@ -11261,8 +11317,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_WAVINGFLAG { // MT_WAVINGFLAG1
1118, // doomednum 1128, // doomednum
S_WAVINGFLAG, // spawnstate S_WAVINGFLAG, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
@ -11278,8 +11334,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_None, // deathsound sfx_None, // deathsound
0, // speed 0, // speed
4*FRACUNIT, // radius 8*FRACUNIT, // radius
104*FRACUNIT, // height 208*FRACUNIT, // height
0, // display offset 0, // display offset
100, // mass 100, // mass
0, // damage 0, // damage
@ -11288,9 +11344,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_WAVINGFLAGSEG { // MT_WAVINGFLAG2
-1, // doomednum 1129, // doomednum
S_WAVINGFLAGSEG, // spawnstate S_WAVINGFLAG, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
sfx_None, // seesound sfx_None, // seesound
@ -11305,7 +11361,61 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_None, // deathsound sfx_None, // deathsound
0, // speed 0, // speed
4*FRACUNIT, // radius 8*FRACUNIT, // radius
208*FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
sfx_None, // activesound
MF_SOLID, // flags
S_NULL // raisestate
},
{ // MT_WAVINGFLAGSEG1
-1, // doomednum
S_WAVINGFLAGSEG1, // 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
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 1, // height -- this is not a typo
0, // display offset 0, // display offset
100, // mass 100, // mass

18
src/info.h
View file

@ -2458,7 +2458,8 @@ typedef enum state
S_CEZFLOWER, S_CEZFLOWER,
S_CEZPOLE, S_CEZPOLE,
S_CEZBANNER, S_CEZBANNER1,
S_CEZBANNER2,
S_PINETREE, S_PINETREE,
S_CEZBUSH1, S_CEZBUSH1,
S_CEZBUSH2, S_CEZBUSH2,
@ -2467,7 +2468,8 @@ typedef enum state
S_FLAMEHOLDER, S_FLAMEHOLDER,
S_FIRETORCH, S_FIRETORCH,
S_WAVINGFLAG, S_WAVINGFLAG,
S_WAVINGFLAGSEG, S_WAVINGFLAGSEG1,
S_WAVINGFLAGSEG2,
S_CRAWLASTATUE, S_CRAWLASTATUE,
S_FACESTABBERSTATUE, S_FACESTABBERSTATUE,
S_SUSPICIOUSFACESTABBERSTATUE_WAIT, S_SUSPICIOUSFACESTABBERSTATUE_WAIT,
@ -4295,8 +4297,10 @@ typedef enum mobj_type
MT_SMALLFIREBAR, // Small Firebar MT_SMALLFIREBAR, // Small Firebar
MT_BIGFIREBAR, // Big Firebar MT_BIGFIREBAR, // Big Firebar
MT_CEZFLOWER, // Flower MT_CEZFLOWER, // Flower
MT_CEZPOLE, // Pole MT_CEZPOLE1, // Pole (with red banner)
MT_CEZBANNER, // Banner MT_CEZPOLE2, // Pole (with blue banner)
MT_CEZBANNER1, // Banner (red)
MT_CEZBANNER2, // Banner (blue)
MT_PINETREE, // Pine Tree MT_PINETREE, // Pine Tree
MT_CEZBUSH1, // Bush 1 MT_CEZBUSH1, // Bush 1
MT_CEZBUSH2, // Bush 2 MT_CEZBUSH2, // Bush 2
@ -4304,8 +4308,10 @@ typedef enum mobj_type
MT_CANDLEPRICKET, // Candle pricket MT_CANDLEPRICKET, // Candle pricket
MT_FLAMEHOLDER, // Flame holder MT_FLAMEHOLDER, // Flame holder
MT_FIRETORCH, // Fire torch MT_FIRETORCH, // Fire torch
MT_WAVINGFLAG, // Waving flag MT_WAVINGFLAG1, // Waving flag (red)
MT_WAVINGFLAGSEG, // Waving flag segment MT_WAVINGFLAG2, // Waving flag (blue)
MT_WAVINGFLAGSEG1, // Waving flag segment (red)
MT_WAVINGFLAGSEG2, // Waving flag segment (blue)
MT_CRAWLASTATUE, // Crawla statue MT_CRAWLASTATUE, // Crawla statue
MT_FACESTABBERSTATUE, // Facestabber statue MT_FACESTABBERSTATUE, // Facestabber statue
MT_SUSPICIOUSFACESTABBERSTATUE, // :eggthinking: MT_SUSPICIOUSFACESTABBERSTATUE, // :eggthinking:

17
src/p_mobj.c
View file

@ -4674,7 +4674,7 @@ static void P_Boss4PinchSpikeballs(mobj_t *mobj, angle_t angle, fixed_t dz)
} }
dz /= 9; dz /= 9;
while ((base = base->tracer)) // there are 10 per spoke, remember that while ((base = base->tracer)) // there are 10 per spoke, remember that
{ {
dx = (originx + P_ReturnThrustX(mobj, angle, (9*132)<<FRACBITS) - mobj->x)/9; 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; mobj->tracer->z += mobj->height;
} }
break; break;
case MT_WAVINGFLAG: case MT_WAVINGFLAG1:
case MT_WAVINGFLAG2:
{ {
fixed_t base = (leveltime<<(FRACBITS+1)); fixed_t base = (leveltime<<(FRACBITS+1));
mobj_t *seg = mobj->tracer, *prev = mobj; 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: case MT_BIGMINE:
mobj->extravalue1 = FixedHypot(mobj->x, mobj->y)>>FRACBITS; mobj->extravalue1 = FixedHypot(mobj->x, mobj->y)>>FRACBITS;
break; break;
case MT_WAVINGFLAG: case MT_WAVINGFLAG1:
case MT_WAVINGFLAG2:
{ {
mobj_t *prev = mobj, *cur; mobj_t *prev = mobj, *cur;
UINT8 i; 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 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); P_SetTarget(&prev->tracer, cur);
cur->extravalue1 = i; cur->extravalue1 = i;
prev = cur; 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; P_SpawnMobjFromMobj(mobj, -1*FRACUNIT, 0, 0, MT_THZTREEBRANCH)->angle = mobjangle + ANGLE_270;
} }
break; break;
case MT_CEZPOLE: case MT_CEZPOLE1:
case MT_CEZPOLE2:
{ // Spawn the banner { // Spawn the banner
angle_t mobjangle = FixedAngle(mthing->angle<<FRACBITS); angle_t mobjangle = FixedAngle(mthing->angle<<FRACBITS);
P_SpawnMobjFromMobj(mobj, P_SpawnMobjFromMobj(mobj,
P_ReturnThrustX(mobj, mobjangle, 4<<FRACBITS), P_ReturnThrustX(mobj, mobjangle, 4<<FRACBITS),
P_ReturnThrustY(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; break;
case MT_HHZTREE_TOP: case MT_HHZTREE_TOP: