Hardcoded Brambles.lua from CEZRes.pk3, changed thing type to 1125
This commit is contained in:
parent
87e37e21df
commit
f8c4c6dbc4
|
@ -4922,6 +4922,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
|
||||||
"S_SUSPICIOUSFACESTABBERSTATUE_WAIT",
|
"S_SUSPICIOUSFACESTABBERSTATUE_WAIT",
|
||||||
"S_SUSPICIOUSFACESTABBERSTATUE_BURST1",
|
"S_SUSPICIOUSFACESTABBERSTATUE_BURST1",
|
||||||
"S_SUSPICIOUSFACESTABBERSTATUE_BURST2",
|
"S_SUSPICIOUSFACESTABBERSTATUE_BURST2",
|
||||||
|
"S_BRAMBLES",
|
||||||
|
|
||||||
// Big Tumbleweed
|
// Big Tumbleweed
|
||||||
"S_BIGTUMBLEWEED",
|
"S_BIGTUMBLEWEED",
|
||||||
|
@ -6578,6 +6579,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
|
||||||
"MT_CRAWLASTATUE", // Crawla statue
|
"MT_CRAWLASTATUE", // Crawla statue
|
||||||
"MT_FACESTABBERSTATUE", // Facestabber statue
|
"MT_FACESTABBERSTATUE", // Facestabber statue
|
||||||
"MT_SUSPICIOUSFACESTABBERSTATUE", // :eggthinking:
|
"MT_SUSPICIOUSFACESTABBERSTATUE", // :eggthinking:
|
||||||
|
"MT_BRAMBLES", // Brambles
|
||||||
|
|
||||||
// Arid Canyon Scenery
|
// Arid Canyon Scenery
|
||||||
"MT_BIGTUMBLEWEED",
|
"MT_BIGTUMBLEWEED",
|
||||||
|
|
30
src/info.c
30
src/info.c
|
@ -232,6 +232,7 @@ char sprnames[NUMSPRITES + 1][5] =
|
||||||
"CFLG", // Waving flag/segment
|
"CFLG", // Waving flag/segment
|
||||||
"CSTA", // Crawla statue
|
"CSTA", // Crawla statue
|
||||||
"CBBS", // Facestabber statue
|
"CBBS", // Facestabber statue
|
||||||
|
"CABR", // Brambles
|
||||||
|
|
||||||
// Arid Canyon Scenery
|
// Arid Canyon Scenery
|
||||||
"BTBL", // Big tumbleweed
|
"BTBL", // Big tumbleweed
|
||||||
|
@ -2158,6 +2159,8 @@ state_t states[NUMSTATES] =
|
||||||
{SPR_CBBS, FF_ANIMATE, 23, {NULL}, 6, 1, S_SUSPICIOUSFACESTABBERSTATUE_BURST2}, // S_SUSPICIOUSFACESTABBERSTATUE_BURST1
|
{SPR_CBBS, FF_ANIMATE, 23, {NULL}, 6, 1, S_SUSPICIOUSFACESTABBERSTATUE_BURST2}, // S_SUSPICIOUSFACESTABBERSTATUE_BURST1
|
||||||
{SPR_NULL, 0, 40, {A_StatueBurst}, MT_FACESTABBER, S_FACESTABBER_CHARGE2, S_NULL}, // S_SUSPICIOUSFACESTABBERSTATUE_BURST2
|
{SPR_NULL, 0, 40, {A_StatueBurst}, MT_FACESTABBER, S_FACESTABBER_CHARGE2, S_NULL}, // S_SUSPICIOUSFACESTABBERSTATUE_BURST2
|
||||||
|
|
||||||
|
{SPR_CABR, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BRAMBLES
|
||||||
|
|
||||||
// Big Tumbleweed
|
// Big Tumbleweed
|
||||||
{SPR_BTBL, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BIGTUMBLEWEED
|
{SPR_BTBL, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BIGTUMBLEWEED
|
||||||
{SPR_BTBL, 0, 5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL2}, // S_BIGTUMBLEWEED_ROLL1
|
{SPR_BTBL, 0, 5, {NULL}, 0, 0, S_BIGTUMBLEWEED_ROLL2}, // S_BIGTUMBLEWEED_ROLL1
|
||||||
|
@ -10685,6 +10688,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
MT_ROCKCRUMBLE3 // raisestate
|
MT_ROCKCRUMBLE3 // raisestate
|
||||||
},
|
},
|
||||||
|
|
||||||
|
{ // MT_BRAMBLES
|
||||||
|
1125, // doomednum
|
||||||
|
S_BRAMBLES, // 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
|
||||||
|
48*FRACUNIT, // radius
|
||||||
|
32*FRACUNIT, // height
|
||||||
|
0, // display offset
|
||||||
|
100, // mass
|
||||||
|
0, // damage
|
||||||
|
sfx_None, // activesound
|
||||||
|
MF_SCENERY|MF_NOBLOCKMAP, // flags
|
||||||
|
S_NULL // raisestate
|
||||||
|
},
|
||||||
|
|
||||||
{ // MT_BIGTUMBLEWEED
|
{ // MT_BIGTUMBLEWEED
|
||||||
1200, // doomednum
|
1200, // doomednum
|
||||||
S_BIGTUMBLEWEED,// spawnstate
|
S_BIGTUMBLEWEED,// spawnstate
|
||||||
|
|
|
@ -450,6 +450,7 @@ typedef enum sprite
|
||||||
SPR_CFLG, // Waving flag/segment
|
SPR_CFLG, // Waving flag/segment
|
||||||
SPR_CSTA, // Crawla statue
|
SPR_CSTA, // Crawla statue
|
||||||
SPR_CBBS, // Facestabber statue
|
SPR_CBBS, // Facestabber statue
|
||||||
|
SPR_CABR, // Brambles
|
||||||
|
|
||||||
// Arid Canyon Scenery
|
// Arid Canyon Scenery
|
||||||
SPR_BTBL, // Big tumbleweed
|
SPR_BTBL, // Big tumbleweed
|
||||||
|
@ -2275,6 +2276,7 @@ typedef enum state
|
||||||
S_SUSPICIOUSFACESTABBERSTATUE_WAIT,
|
S_SUSPICIOUSFACESTABBERSTATUE_WAIT,
|
||||||
S_SUSPICIOUSFACESTABBERSTATUE_BURST1,
|
S_SUSPICIOUSFACESTABBERSTATUE_BURST1,
|
||||||
S_SUSPICIOUSFACESTABBERSTATUE_BURST2,
|
S_SUSPICIOUSFACESTABBERSTATUE_BURST2,
|
||||||
|
S_BRAMBLES,
|
||||||
|
|
||||||
// Big Tumbleweed
|
// Big Tumbleweed
|
||||||
S_BIGTUMBLEWEED,
|
S_BIGTUMBLEWEED,
|
||||||
|
@ -3951,6 +3953,7 @@ typedef enum mobj_type
|
||||||
MT_CRAWLASTATUE, // Crawla statue
|
MT_CRAWLASTATUE, // Crawla statue
|
||||||
MT_FACESTABBERSTATUE, // Facestabber statue
|
MT_FACESTABBERSTATUE, // Facestabber statue
|
||||||
MT_SUSPICIOUSFACESTABBERSTATUE, // :eggthinking:
|
MT_SUSPICIOUSFACESTABBERSTATUE, // :eggthinking:
|
||||||
|
MT_BRAMBLES, // Brambles
|
||||||
|
|
||||||
// Arid Canyon Scenery
|
// Arid Canyon Scenery
|
||||||
MT_BIGTUMBLEWEED,
|
MT_BIGTUMBLEWEED,
|
||||||
|
|
Loading…
Reference in a new issue