Add green flame sprites, state, and object

This commit is contained in:
lachwright 2019-10-21 16:22:20 +08:00
parent d6411b9549
commit 3a3122e255
4 changed files with 43 additions and 2 deletions

View file

@ -5971,6 +5971,9 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_TARGET_RESPAWN", "S_TARGET_RESPAWN",
"S_TARGET_ALLDONE", "S_TARGET_ALLDONE",
// ATZ's green flame
"S_GREENFLAME",
// Stalagmites // Stalagmites
"S_STG0", "S_STG0",
"S_STG1", "S_STG1",
@ -7707,6 +7710,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_TRAPGOYLEDOWN", "MT_TRAPGOYLEDOWN",
"MT_TRAPGOYLELONG", "MT_TRAPGOYLELONG",
"MT_TARGET", "MT_TARGET",
"MT_GREENFLAME",
// Stalagmites // Stalagmites
"MT_STALAGMITE0", "MT_STALAGMITE0",

View file

@ -199,7 +199,7 @@ light_t *t_lspr[NUMSPRITES] =
&lspr[NOLIGHT], // SPR_EGGO &lspr[NOLIGHT], // SPR_EGGO
&lspr[NOLIGHT], // SPR_SEBH &lspr[NOLIGHT], // SPR_SEBH
&lspr[NOLIGHT], // SPR_FAKE &lspr[NOLIGHT], // SPR_FAKE
&lspr[NOLIGHT], // SPR_SHCK &lspr[LBLUESHINE_L],// SPR_SHCK
// Boss 4 (Castle Eggman) // Boss 4 (Castle Eggman)
&lspr[NOLIGHT], // SPR_EGGP &lspr[NOLIGHT], // SPR_EGGP
@ -408,6 +408,7 @@ light_t *t_lspr[NUMSPRITES] =
// Azure Temple Scenery // Azure Temple Scenery
&lspr[NOLIGHT], // SPR_BGAR &lspr[NOLIGHT], // SPR_BGAR
&lspr[NOLIGHT], // SPR_RCRY &lspr[NOLIGHT], // SPR_RCRY
&lspr[GREENBALL_L], // SPR_CFLM
// Botanic Serenity Scenery // Botanic Serenity Scenery
&lspr[NOLIGHT], // SPR_BSZ1 &lspr[NOLIGHT], // SPR_BSZ1

View file

@ -298,10 +298,11 @@ char sprnames[NUMSPRITES + 1][5] =
"HHPL", // Dr Seuss Trees "HHPL", // Dr Seuss Trees
"SHRM", // Mushroom "SHRM", // Mushroom
"HHZM", // Misc "HHZM", // Misc
// Azure Temple Scenery // Azure Temple Scenery
"BGAR", // ATZ Gargoyles "BGAR", // ATZ Gargoyles
"RCRY", // ATZ Red Crystal (Target) "RCRY", // ATZ Red Crystal (Target)
"CFLM", // Green torch flame
// Botanic Serenity Scenery // Botanic Serenity Scenery
"BSZ1", // Tall flowers "BSZ1", // Tall flowers
@ -2582,6 +2583,9 @@ state_t states[NUMSTATES] =
{SPR_RCRY, 1, 0, {A_SpawnObjectRelative}, 0, MT_TARGET, S_NULL}, // S_TARGET_RESPAWN {SPR_RCRY, 1, 0, {A_SpawnObjectRelative}, 0, MT_TARGET, S_NULL}, // S_TARGET_RESPAWN
{SPR_RCRY, FF_FULLBRIGHT|1, -1, {A_SetObjectFlags}, MF_PUSHABLE, 1, S_TARGET_ALLDONE}, // S_TARGET_ALLDONE {SPR_RCRY, FF_FULLBRIGHT|1, -1, {A_SetObjectFlags}, MF_PUSHABLE, 1, S_TARGET_ALLDONE}, // S_TARGET_ALLDONE
// Green flame
{SPR_CFLM, FF_FULLBRIGHT|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 3, S_GREENFLAME}, // S_GREENFLAME
// Stalagmites // Stalagmites
{SPR_STLG, 0, -1, {NULL}, 0, 0, S_NULL}, // S_STG0 {SPR_STLG, 0, -1, {NULL}, 0, 0, S_NULL}, // S_STG0
{SPR_STLG, 1, -1, {NULL}, 0, 0, S_NULL}, // S_STG1 {SPR_STLG, 1, -1, {NULL}, 0, 0, S_NULL}, // S_STG1
@ -13482,6 +13486,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_GREENFLAME
1505, // doomednum
S_GREENFLAME, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
8, // reactiontime
sfx_None, // attacksound
S_NULL, // painstate
MT_NULL, // painchance
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
S_NULL, // deathstate
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
8*FRACUNIT, // radius
32*FRACUNIT, // height
0, // display offset
0, // mass
0, // damage
sfx_None, // activesound
MF_NOGRAVITY|MF_PAIN, // flags
S_NULL // raisestate
},
{ // MT_STALAGMITE0 { // MT_STALAGMITE0
1900, // doomednum 1900, // doomednum
S_STG0, // spawnstate S_STG0, // spawnstate

View file

@ -558,6 +558,7 @@ typedef enum sprite
// Azure Temple Scenery // Azure Temple Scenery
SPR_BGAR, // ATZ Gargoyles SPR_BGAR, // ATZ Gargoyles
SPR_RCRY, // ATZ Red Crystal (Target) SPR_RCRY, // ATZ Red Crystal (Target)
SPR_CFLM, // Green torch flame
// Botanic Serenity Scenery // Botanic Serenity Scenery
SPR_BSZ1, // Tall flowers SPR_BSZ1, // Tall flowers
@ -2698,6 +2699,9 @@ typedef enum state
S_TARGET_RESPAWN, S_TARGET_RESPAWN,
S_TARGET_ALLDONE, S_TARGET_ALLDONE,
// ATZ's green flame
S_GREENFLAME,
// Stalagmites // Stalagmites
S_STG0, S_STG0,
S_STG1, S_STG1,
@ -4456,6 +4460,7 @@ typedef enum mobj_type
MT_TRAPGOYLEDOWN, MT_TRAPGOYLEDOWN,
MT_TRAPGOYLELONG, MT_TRAPGOYLELONG,
MT_TARGET, // AKA Red Crystal MT_TARGET, // AKA Red Crystal
MT_GREENFLAME,
// Stalagmites // Stalagmites
MT_STALAGMITE0, MT_STALAGMITE0,