Add a blue variant of the pole banner & change some doomednums.
This commit is contained in:
parent
ee937c4df0
commit
79cf8eb08d
|
@ -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",
|
||||||
|
@ -7515,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
|
||||||
|
|
69
src/info.c
69
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_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
|
||||||
|
@ -11019,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
|
||||||
|
@ -11046,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
|
||||||
|
@ -11263,7 +11318,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
},
|
},
|
||||||
|
|
||||||
{ // MT_WAVINGFLAG1
|
{ // MT_WAVINGFLAG1
|
||||||
1118, // doomednum
|
1128, // doomednum
|
||||||
S_WAVINGFLAG, // spawnstate
|
S_WAVINGFLAG, // spawnstate
|
||||||
1000, // spawnhealth
|
1000, // spawnhealth
|
||||||
S_NULL, // seestate
|
S_NULL, // seestate
|
||||||
|
@ -11290,7 +11345,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
},
|
},
|
||||||
|
|
||||||
{ // MT_WAVINGFLAG2
|
{ // MT_WAVINGFLAG2
|
||||||
1128, // doomednum
|
1129, // doomednum
|
||||||
S_WAVINGFLAG, // spawnstate
|
S_WAVINGFLAG, // spawnstate
|
||||||
1000, // spawnhealth
|
1000, // spawnhealth
|
||||||
S_NULL, // seestate
|
S_NULL, // seestate
|
||||||
|
|
|
@ -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,
|
||||||
|
@ -4296,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
|
||||||
|
|
|
@ -11737,13 +11737,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:
|
||||||
|
|
Loading…
Reference in a new issue