diff --git a/src/dehacked.c b/src/dehacked.c index 534cabb0b..a5dc1c4c1 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -5662,7 +5662,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_ARROW", "S_ARROWBONK", - // Trapgoyle Demon fire + // Glaregoyle Demon fire "S_DEMONFIRE", // GFZ flowers @@ -6030,29 +6030,29 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_WALLVINE_LONG", "S_WALLVINE_SHORT", - // Trapgoyles - "S_TRAPGOYLE", - "S_TRAPGOYLE_CHECK", - "S_TRAPGOYLE_FIRE1", - "S_TRAPGOYLE_FIRE2", - "S_TRAPGOYLE_FIRE3", - "S_TRAPGOYLEUP", - "S_TRAPGOYLEUP_CHECK", - "S_TRAPGOYLEUP_FIRE1", - "S_TRAPGOYLEUP_FIRE2", - "S_TRAPGOYLEUP_FIRE3", - "S_TRAPGOYLEDOWN", - "S_TRAPGOYLEDOWN_CHECK", - "S_TRAPGOYLEDOWN_FIRE1", - "S_TRAPGOYLEDOWN_FIRE2", - "S_TRAPGOYLEDOWN_FIRE3", - "S_TRAPGOYLELONG", - "S_TRAPGOYLELONG_CHECK", - "S_TRAPGOYLELONG_FIRE1", - "S_TRAPGOYLELONG_FIRE2", - "S_TRAPGOYLELONG_FIRE3", - "S_TRAPGOYLELONG_FIRE4", - "S_TRAPGOYLELONG_FIRE5", + // Glaregoyles + "S_GLAREGOYLE", + "S_GLAREGOYLE_CHECK", + "S_GLAREGOYLE_FIRE1", + "S_GLAREGOYLE_FIRE2", + "S_GLAREGOYLE_FIRE3", + "S_GLAREGOYLEUP", + "S_GLAREGOYLEUP_CHECK", + "S_GLAREGOYLEUP_FIRE1", + "S_GLAREGOYLEUP_FIRE2", + "S_GLAREGOYLEUP_FIRE3", + "S_GLAREGOYLEDOWN", + "S_GLAREGOYLEDOWN_CHECK", + "S_GLAREGOYLEDOWN_FIRE1", + "S_GLAREGOYLEDOWN_FIRE2", + "S_GLAREGOYLEDOWN_FIRE3", + "S_GLAREGOYLELONG", + "S_GLAREGOYLELONG_CHECK", + "S_GLAREGOYLELONG_FIRE1", + "S_GLAREGOYLELONG_FIRE2", + "S_GLAREGOYLELONG_FIRE3", + "S_GLAREGOYLELONG_FIRE4", + "S_GLAREGOYLELONG_FIRE5", // ATZ's Red Crystal/Target "S_TARGET_IDLE", @@ -7650,7 +7650,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s "MT_CANNONBALL", // Cannonball "MT_CANNONBALLDECOR", // Decorative/still cannonball "MT_ARROW", // Arrow - "MT_DEMONFIRE", // Trapgoyle fire + "MT_DEMONFIRE", // Glaregoyle fire // Greenflower Scenery "MT_GFZFLOWER1", @@ -7813,10 +7813,10 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s // Egg Rock Scenery // Azure Temple Scenery - "MT_TRAPGOYLE", - "MT_TRAPGOYLEUP", - "MT_TRAPGOYLEDOWN", - "MT_TRAPGOYLELONG", + "MT_GLAREGOYLE", + "MT_GLAREGOYLEUP", + "MT_GLAREGOYLEDOWN", + "MT_GLAREGOYLELONG", "MT_TARGET", "MT_GREENFLAME", diff --git a/src/info.c b/src/info.c index daa2029a6..9659c9712 100644 --- a/src/info.c +++ b/src/info.c @@ -2579,32 +2579,32 @@ state_t states[NUMSTATES] = {SPR_WVIN, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_WALLVINE_LONG {SPR_WVIN, 1|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_WALLVINE_SHORT - // Trapgoyles - {SPR_BGAR, 0, 67, {NULL}, 0, 0, S_TRAPGOYLE_CHECK}, // S_TRAPGOYLE - {SPR_BGAR, 0, 3, {NULL}, 0, 0, S_TRAPGOYLE_FIRE1}, // S_TRAPGOYLE_CHECK - {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLE_FIRE2}, // S_TRAPGOYLE_FIRE1 - {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLE_FIRE3}, // S_TRAPGOYLE_FIRE2 - {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLE}, // S_TRAPGOYLE_FIRE3 + // Glaregoyles + {SPR_BGAR, FF_ANIMATE|1, 52, {NULL}, 1, 0, S_GLAREGOYLE_WARNING}, // S_GLAREGOYLE + {SPR_BGAR, 2, 6, {NULL}, 1, 2, S_GLAREGOYLE_FIRE}, // S_GLAREGOYLE_WARNING + {SPR_BGAR, 1, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_GLAREGOYLE_LOOP}, // S_GLAREGOYLE_FIRE + {SPR_BGAR, 1, 0, {A_Repeat}, 3, S_GLAREGOYLE_FIRE, S_GLAREGOYLE_COOLDOWN}, // S_GLAREGOYLE_LOOP + {SPR_BGAR, FF_ANIMATE|1, 12, {NULL}, 1, 6, S_GLAREGOYLE}, // S_GLAREGOYLE_COOLDOWN - {SPR_BGAR, 0, 67, {NULL}, 0, 0, S_TRAPGOYLEUP_CHECK}, // S_TRAPGOYLEUP - {SPR_BGAR, 0, 3, {NULL}, 0, 0, S_TRAPGOYLEUP_FIRE1}, // S_TRAPGOYLEUP_CHECK - {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_TRAPGOYLEUP_FIRE2}, // S_TRAPGOYLEUP_FIRE1 - {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_TRAPGOYLEUP_FIRE3}, // S_TRAPGOYLEUP_FIRE2 - {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_TRAPGOYLEUP}, // S_TRAPGOYLEUP_FIRE3 + {SPR_BGAR, 0, 67, {NULL}, 0, 0, S_GLAREGOYLEUP_CHECK}, // S_GLAREGOYLEUP + {SPR_BGAR, 0, 3, {NULL}, 0, 0, S_GLAREGOYLEUP_FIRE1}, // S_GLAREGOYLEUP_CHECK + {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_GLAREGOYLEUP_FIRE2}, // S_GLAREGOYLEUP_FIRE1 + {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_GLAREGOYLEUP_FIRE3}, // S_GLAREGOYLEUP_FIRE2 + {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+45, S_GLAREGOYLEUP}, // S_GLAREGOYLEUP_FIRE3 - {SPR_BGAR, 0, 67, {NULL}, 0, 0, S_TRAPGOYLEDOWN_CHECK}, // S_TRAPGOYLEDOWN - {SPR_BGAR, 0, 3, {NULL}, 0, 0, S_TRAPGOYLEDOWN_FIRE1}, // S_TRAPGOYLEDOWN_CHECK - {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_TRAPGOYLEDOWN_FIRE2}, // S_TRAPGOYLEDOWN_FIRE1 - {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_TRAPGOYLEDOWN_FIRE3}, // S_TRAPGOYLEDOWN_FIRE2 - {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_TRAPGOYLEDOWN}, // S_TRAPGOYLEDOWN_FIRE3 + {SPR_BGAR, 0, 67, {NULL}, 0, 0, S_GLAREGOYLEDOWN_CHECK}, // S_GLAREGOYLEDOWN + {SPR_BGAR, 0, 3, {NULL}, 0, 0, S_GLAREGOYLEDOWN_FIRE1}, // S_GLAREGOYLEDOWN_CHECK + {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_GLAREGOYLEDOWN_FIRE2}, // S_GLAREGOYLEDOWN_FIRE1 + {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_GLAREGOYLEDOWN_FIRE3}, // S_GLAREGOYLEDOWN_FIRE2 + {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16)+315, S_GLAREGOYLEDOWN}, // S_GLAREGOYLEDOWN_FIRE3 - {SPR_BGAR, 0, 135, {NULL}, 0, 0, S_TRAPGOYLELONG_CHECK}, // S_TRAPGOYLELONG - {SPR_BGAR, 0, 3, {NULL}, 0, 0, S_TRAPGOYLELONG_FIRE1}, // S_TRAPGOYLELONG_CHECK - {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE2}, // S_TRAPGOYLELONG_FIRE1 - {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE3}, // S_TRAPGOYLELONG_FIRE2 - {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE4}, // S_TRAPGOYLELONG_FIRE3 - {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG_FIRE5}, // S_TRAPGOYLELONG_FIRE4 - {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_TRAPGOYLELONG}, // S_TRAPGOYLELONG_FIRE5 + {SPR_BGAR, 0, 135, {NULL}, 0, 0, S_GLAREGOYLELONG_CHECK}, // S_GLAREGOYLELONG + {SPR_BGAR, 0, 3, {NULL}, 0, 0, S_GLAREGOYLELONG_FIRE1}, // S_GLAREGOYLELONG_CHECK + {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_GLAREGOYLELONG_FIRE2}, // S_GLAREGOYLELONG_FIRE1 + {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_GLAREGOYLELONG_FIRE3}, // S_GLAREGOYLELONG_FIRE2 + {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_GLAREGOYLELONG_FIRE4}, // S_GLAREGOYLELONG_FIRE3 + {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_GLAREGOYLELONG_FIRE5}, // S_GLAREGOYLELONG_FIRE4 + {SPR_BGAR, 0, 1, {A_TrapShot}, (16<<16)+MT_DEMONFIRE, (30<<16), S_GLAREGOYLELONG}, // S_GLAREGOYLELONG_FIRE5 // Target/Red Crystal {SPR_RCRY, 0, -1, {NULL}, 0, 0, S_TARGET_IDLE}, // S_TARGET_IDLE @@ -13581,9 +13581,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_TRAPGOYLE + { // MT_GLAREGOYLE 1500, // doomednum - S_TRAPGOYLE, // spawnstate + S_GLAREGOYLE, // spawnstate 1000, // spawnhealth S_NULL, // seestate sfx_None, // seesound @@ -13608,9 +13608,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_TRAPGOYLEUP + { // MT_GLAREGOYLEUP 1501, // doomednum - S_TRAPGOYLEUP, // spawnstate + S_GLAREGOYLEUP, // spawnstate 1000, // spawnhealth S_NULL, // seestate sfx_None, // seesound @@ -13635,9 +13635,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_TRAPGOYLEDOWN + { // MT_GLAREGOYLEDOWN 1502, // doomednum - S_TRAPGOYLEDOWN,// spawnstate + S_GLAREGOYLEDOWN,// spawnstate 1000, // spawnhealth S_NULL, // seestate sfx_None, // seesound @@ -13662,9 +13662,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, - { // MT_TRAPGOYLELONG + { // MT_GLAREGOYLELONG 1503, // doomednum - S_TRAPGOYLELONG,// spawnstate + S_GLAREGOYLELONG,// spawnstate 1000, // spawnhealth S_NULL, // seestate sfx_None, // seesound diff --git a/src/info.h b/src/info.h index 20b471811..092b92241 100644 --- a/src/info.h +++ b/src/info.h @@ -2335,7 +2335,7 @@ typedef enum state S_ARROW, S_ARROWBONK, - // Trapgoyle Demon fire + // Glaregoyle Demon fire S_DEMONFIRE, // GFZ flowers @@ -2703,29 +2703,29 @@ typedef enum state S_WALLVINE_LONG, S_WALLVINE_SHORT, - // Trapgoyles - S_TRAPGOYLE, - S_TRAPGOYLE_CHECK, - S_TRAPGOYLE_FIRE1, - S_TRAPGOYLE_FIRE2, - S_TRAPGOYLE_FIRE3, - S_TRAPGOYLEUP, - S_TRAPGOYLEUP_CHECK, - S_TRAPGOYLEUP_FIRE1, - S_TRAPGOYLEUP_FIRE2, - S_TRAPGOYLEUP_FIRE3, - S_TRAPGOYLEDOWN, - S_TRAPGOYLEDOWN_CHECK, - S_TRAPGOYLEDOWN_FIRE1, - S_TRAPGOYLEDOWN_FIRE2, - S_TRAPGOYLEDOWN_FIRE3, - S_TRAPGOYLELONG, - S_TRAPGOYLELONG_CHECK, - S_TRAPGOYLELONG_FIRE1, - S_TRAPGOYLELONG_FIRE2, - S_TRAPGOYLELONG_FIRE3, - S_TRAPGOYLELONG_FIRE4, - S_TRAPGOYLELONG_FIRE5, + // Glaregoyles + S_GLAREGOYLE, + S_GLAREGOYLE_WARNING, + S_GLAREGOYLE_FIRE, + S_GLAREGOYLE_LOOP, + S_GLAREGOYLE_COOLDOWN, + S_GLAREGOYLEUP, + S_GLAREGOYLEUP_CHECK, + S_GLAREGOYLEUP_FIRE1, + S_GLAREGOYLEUP_FIRE2, + S_GLAREGOYLEUP_FIRE3, + S_GLAREGOYLEDOWN, + S_GLAREGOYLEDOWN_CHECK, + S_GLAREGOYLEDOWN_FIRE1, + S_GLAREGOYLEDOWN_FIRE2, + S_GLAREGOYLEDOWN_FIRE3, + S_GLAREGOYLELONG, + S_GLAREGOYLELONG_CHECK, + S_GLAREGOYLELONG_FIRE1, + S_GLAREGOYLELONG_FIRE2, + S_GLAREGOYLELONG_FIRE3, + S_GLAREGOYLELONG_FIRE4, + S_GLAREGOYLELONG_FIRE5, // ATZ's Red Crystal/Target S_TARGET_IDLE, @@ -4346,7 +4346,7 @@ typedef enum mobj_type MT_CANNONBALL, // Cannonball MT_CANNONBALLDECOR, // Decorative/still cannonball MT_ARROW, // Arrow - MT_DEMONFIRE, // Trapgoyle fire + MT_DEMONFIRE, // Glaregoyle fire // Greenflower Scenery MT_GFZFLOWER1, @@ -4509,10 +4509,10 @@ typedef enum mobj_type // Egg Rock Scenery // Azure Temple Scenery - MT_TRAPGOYLE, - MT_TRAPGOYLEUP, - MT_TRAPGOYLEDOWN, - MT_TRAPGOYLELONG, + MT_GLAREGOYLE, + MT_GLAREGOYLEUP, + MT_GLAREGOYLEDOWN, + MT_GLAREGOYLELONG, MT_TARGET, // AKA Red Crystal MT_GREENFLAME, diff --git a/src/p_mobj.c b/src/p_mobj.c index 93a77bcda..73141deae 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -12441,10 +12441,10 @@ ML_EFFECT5 : Don't stop thinking when too far away if (mthing->extrainfo) mobj->extravalue1 = mthing->extrainfo; break; - case MT_TRAPGOYLE: - case MT_TRAPGOYLEUP: - case MT_TRAPGOYLEDOWN: - case MT_TRAPGOYLELONG: + case MT_GLAREGOYLE: + case MT_GLAREGOYLEUP: + case MT_GLAREGOYLEDOWN: + case MT_GLAREGOYLELONG: if (mthing->angle >= 360) mobj->tics += 7*(mthing->angle / 360) + 1; // starting delay break;