diff --git a/src/dehacked.c b/src/dehacked.c index 4b4922aaf..e1862ef85 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -6030,7 +6030,6 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_WALLVINE_LONG", "S_WALLVINE_SHORT", - // Glaregoyles // Glaregoyles "S_GLAREGOYLE", "S_GLAREGOYLE_CHARGE", @@ -6071,6 +6070,9 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit // ATZ's green flame "S_GREENFLAME", + // ATZ Blue Gargoyle + "S_BLUEGARGOYLE", + // Stalagmites "S_STG0", "S_STG1", @@ -7826,6 +7828,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s "MT_GLAREGOYLELONG", "MT_TARGET", "MT_GREENFLAME", + "MT_BLUEGARGOYLE", // Stalagmites "MT_STALAGMITE0", diff --git a/src/info.c b/src/info.c index 2b1dc6135..fa4b556a6 100644 --- a/src/info.c +++ b/src/info.c @@ -2622,6 +2622,9 @@ state_t states[NUMSTATES] = // Green flame {SPR_CFLM, FF_FULLBRIGHT|FF_ANIMATE|FF_RANDOMANIM, -1, {NULL}, 7, 3, S_GREENFLAME}, // S_GREENFLAME + // ATZ Blue Gargoyle + {SPR_BGAR, 3, -1, {NULL}, 0, 0, S_NULL}, // S_BLUEGARGOYLE + // Stalagmites {SPR_STLG, 0, -1, {NULL}, 0, 0, S_NULL}, // S_STG0 {SPR_STLG, 1, -1, {NULL}, 0, 0, S_NULL}, // S_STG1 @@ -13749,6 +13752,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, + { // MT_BLUEGARGOYLE + 1506, // doomednum + S_BLUEGARGOYLE, // 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 + 21*FRACUNIT, // speed + 16*FRACUNIT, // radius + 40*FRACUNIT, // height + 0, // display offset + 100, // mass + 1, // damage + sfx_statu2, // activesound + MF_SLIDEME|MF_SOLID|MF_PUSHABLE, // flags + S_NULL // raisestate + }, + { // MT_STALAGMITE0 1900, // doomednum S_STG0, // spawnstate diff --git a/src/info.h b/src/info.h index 612ce0b36..8d407deb8 100644 --- a/src/info.h +++ b/src/info.h @@ -2743,6 +2743,9 @@ typedef enum state // ATZ's green flame S_GREENFLAME, + // ATZ Blue Gargoyle + S_BLUEGARGOYLE, + // Stalagmites S_STG0, S_STG1, @@ -4521,6 +4524,7 @@ typedef enum mobj_type MT_GLAREGOYLELONG, MT_TARGET, // AKA Red Crystal MT_GREENFLAME, + MT_BLUEGARGOYLE, // Stalagmites MT_STALAGMITE0,