diff --git a/src/dehacked.c b/src/dehacked.c index 20e078af7..067cea460 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -4709,9 +4709,10 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_BUSHTREE", "S_BUSHREDTREE", - // THZ Plant - "S_THZFLOWERA", - "S_THZFLOWERB", + // THZ flowers + "S_THZFLOWERA", // THZ1 Steam flower + "S_THZFLOWERB", // THZ1 Spin flower (red) + "S_THZFLOWERC", // THZ1 Spin flower (yellow) // THZ Alarm "S_ALARM1", @@ -6169,6 +6170,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s // Techno Hill Scenery "MT_THZFLOWER1", "MT_THZFLOWER2", + "MT_THZFLOWER3", "MT_ALARM", // Deep Sea Scenery diff --git a/src/info.c b/src/info.c index c609f34f2..c2eccd421 100644 --- a/src/info.c +++ b/src/info.c @@ -190,8 +190,9 @@ char sprnames[NUMSPRITES + 1][5] = "TRE5", // Bush tree // Techno Hill Scenery - "THZP", // Techno Hill Zone Plant - "FWR5", // Another one + "THZP", // THZ1 Steam Flower + "FWR5", // THZ1 Spin flower (red) + "FWR6", // THZ1 Spin flower (yellow) "ALRM", // THZ2 Alarm // Deep Sea Scenery @@ -1892,7 +1893,7 @@ state_t states[NUMSTATES] = {SPR_CFIR, FF_FULLBRIGHT|4, 2, {NULL}, 0, 0, S_DEMONFIRE6}, // S_DEMONFIRE5 {SPR_CFIR, FF_FULLBRIGHT|5, 2, {NULL}, 0, 0, S_DEMONFIRE1}, // S_DEMONFIRE6 - // GFZ Flower + // GFZ flowers {SPR_FWR1, FF_ANIMATE, -1, {NULL}, 7, 3, S_NULL}, // S_GFZFLOWERA {SPR_FWR2, FF_ANIMATE, -1, {NULL}, 19, 3, S_NULL}, // S_GFZFLOWERB {SPR_FWR3, FF_ANIMATE, -1, {NULL}, 11, 4, S_NULL}, // S_GFZFLOWERC @@ -1912,8 +1913,10 @@ state_t states[NUMSTATES] = {SPR_TRE5, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BUSHTREE {SPR_TRE5, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BUSHREDTREE + // THZ flowers {SPR_THZP, FF_ANIMATE, -1, {NULL}, 7, 4, S_NULL}, // S_THZFLOWERA {SPR_FWR5, FF_ANIMATE, -1, {NULL}, 19, 2, S_NULL}, // S_THZFLOWERB + {SPR_FWR6, FF_ANIMATE, -1, {NULL}, 19, 2, S_NULL}, // S_THZFLOWERC // THZ Alarm {SPR_ALRM, FF_FULLBRIGHT, 35, {A_Scream}, 0, 0, S_ALARM1}, // S_ALARM1 @@ -8630,8 +8633,35 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL, // xdeathstate sfx_None, // deathsound 8, // speed - 8*FRACUNIT, // radius - 32*FRACUNIT, // height + 16*FRACUNIT, // radius + 64*FRACUNIT, // height + 0, // display offset + 16, // mass + 0, // damage + sfx_None, // activesound + MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags + S_NULL // raisestate + }, + + { // MT_THZFLOWER3 + 903, // doomednum + S_THZFLOWERC, // 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 + 8, // speed + 16*FRACUNIT, // radius + 64*FRACUNIT, // height 0, // display offset 16, // mass 0, // damage diff --git a/src/info.h b/src/info.h index 65c1c72c1..92786e376 100644 --- a/src/info.h +++ b/src/info.h @@ -390,8 +390,9 @@ typedef enum sprite SPR_TRE5, // Bush tree // Techno Hill Scenery - SPR_THZP, // THZ1 Flower - SPR_FWR5, // Another flower + SPR_THZP, // THZ1 Steam Flower + SPR_FWR5, // THZ1 Spin flower (red) + SPR_FWR6, // THZ1 Spin flower (yellow) SPR_ALRM, // THZ2 Alarm // Deep Sea Scenery @@ -2020,9 +2021,10 @@ typedef enum state S_BUSHTREE, S_BUSHREDTREE, - // THZ Plant - S_THZFLOWERA, - S_THZFLOWERB, + // THZ flowers + S_THZFLOWERA, // THZ1 Steam flower + S_THZFLOWERB, // THZ1 Spin flower (red) + S_THZFLOWERC, // THZ1 Spin flower (yellow) // THZ Alarm S_ALARM1, @@ -3500,6 +3502,7 @@ typedef enum mobj_type // Techno Hill Scenery MT_THZFLOWER1, MT_THZFLOWER2, + MT_THZFLOWER3, MT_ALARM, // Deep Sea Scenery