From 3ebb9c2c496a45d13b8470afff7774ed1f745b65 Mon Sep 17 00:00:00 2001 From: Steel Titanium Date: Thu, 12 Sep 2019 21:36:13 -0400 Subject: [PATCH] More harmful cactus --- src/dehacked.c | 4 ++++ src/info.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++ src/info.h | 4 ++++ 3 files changed, 64 insertions(+) diff --git a/src/dehacked.c b/src/dehacked.c index 37995cc9f..7b0a07a2f 100644 --- a/src/dehacked.c +++ b/src/dehacked.c @@ -5737,6 +5737,8 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit "S_CACTI7", "S_CACTI8", "S_CACTI9", + "S_CACTI10", + "S_CACTI11", // Warning signs sprites "S_ARIDSIGN_CAUTION", @@ -7519,6 +7521,8 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s "MT_CACTI7", "MT_CACTI8", "MT_CACTI9", + "MT_CACTI10", + "MT_CACTI11", "MT_ARIDSIGN_CAUTION", "MT_ARIDSIGN_CACTI", "MT_ARIDSIGN_SHARPTURN", diff --git a/src/info.c b/src/info.c index 5baf28943..23bee18a2 100644 --- a/src/info.c +++ b/src/info.c @@ -2321,6 +2321,8 @@ state_t states[NUMSTATES] = {SPR_CACT, 6, -1, {NULL}, 0, 0, S_NULL}, // S_CACTI7 {SPR_CACT, 7, -1, {NULL}, 0, 0, S_NULL}, // S_CACTI8 {SPR_CACT, 8, -1, {NULL}, 0, 0, S_NULL}, // S_CACTI9 + {SPR_CACT, 9, -1, {NULL}, 0, 0, S_NULL}, // S_CACTI10 + {SPR_CACT, 10, -1, {NULL}, 0, 0, S_NULL}, // S_CACTI11 // Warning Signs {SPR_WWSG, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_ARIDSIGN_CAUTION @@ -12294,6 +12296,60 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] = S_NULL // raisestate }, + { // MT_CACTI10 + 1230, // doomednum + S_CACTI10, // 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 + 16*FRACUNIT, // radius + 64*FRACUNIT, // height + 0, // display offset + 100, // mass + 0, // damage + sfx_None, // activesound + MF_SOLID|MF_SCENERY|MF_PAIN, // flags + S_NULL // raisestate + }, + + { // MT_CACTI11 + 1231, // doomednum + S_CACTI11, // 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 + 16*FRACUNIT, // radius + 32*FRACUNIT, // height + 0, // display offset + 100, // mass + 0, // damage + sfx_None, // activesound + MF_SOLID|MF_SCENERY|MF_PAIN, // flags + S_NULL // raisestate + }, + { // MT_FLAMEJET 1300, // doomednum S_FLAMEJETSTND, // spawnstate diff --git a/src/info.h b/src/info.h index a9d4bdde0..f4fd63c81 100644 --- a/src/info.h +++ b/src/info.h @@ -2442,6 +2442,8 @@ typedef enum state S_CACTI7, S_CACTI8, S_CACTI9, + S_CACTI10, + S_CACTI11, // Warning signs sprites S_ARIDSIGN_CAUTION, @@ -4246,6 +4248,8 @@ typedef enum mobj_type MT_CACTI7, // Harmful Cactus 3 MT_CACTI8, // Harmful Cactus 4 MT_CACTI9, // Harmful Cactus 5 + MT_CACTI10, // Harmful Cactus 6 + MT_CACTI11, // Harmful Cactus 7 MT_ARIDSIGN_CAUTION, // Caution Sign MT_ARIDSIGN_CACTI, // Cacti Sign MT_ARIDSIGN_SHARPTURN, // Sharp Turn Sign