lifning/SRB2
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Small DSZ coral tweaks.

Browse source
This commit is contained in:
sphere 2019-09-20 00:51:44 +02:00
parent c81452211d
commit 4c7a7a7e0b
3 changed files with 86 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/dehacked.c
View file

@ -5578,14 +5578,12 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_DRIPC1", "S_DRIPC1",
"S_DRIPC2", "S_DRIPC2",
// Coral 1 // Coral
"S_CORAL1", "S_CORAL1",
// Coral 2
"S_CORAL2", "S_CORAL2",
// Coral 3
"S_CORAL3", "S_CORAL3",
"S_CORAL4",
"S_CORAL5",
// Blue Crystal // Blue Crystal
"S_BLUECRYSTAL1", "S_BLUECRYSTAL1",
@ -7464,9 +7462,11 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_SEAWEED", // DSZ Seaweed "MT_SEAWEED", // DSZ Seaweed
"MT_WATERDRIP", // Dripping Water source "MT_WATERDRIP", // Dripping Water source
"MT_WATERDROP", // Water drop from dripping water "MT_WATERDROP", // Water drop from dripping water
"MT_CORAL1", // Coral 1 "MT_CORAL1", // Coral
"MT_CORAL2", // Coral 2 "MT_CORAL2",
"MT_CORAL3", // Coral 3 "MT_CORAL3",
"MT_CORAL4",
"MT_CORAL5",
"MT_BLUECRYSTAL", // Blue Crystal "MT_BLUECRYSTAL", // Blue Crystal
"MT_KELP", // Kelp "MT_KELP", // Kelp
"MT_ANIMALGAETOP", // Animated algae top "MT_ANIMALGAETOP", // Animated algae top

86
src/info.c
View file

@ -212,9 +212,7 @@ char sprnames[NUMSPRITES + 1][5] =
"GARG", // Deep Sea Gargoyle "GARG", // Deep Sea Gargoyle
"SEWE", // Deep Sea Seaweed "SEWE", // Deep Sea Seaweed
"DRIP", // Dripping water "DRIP", // Dripping water
"CRL1", // Coral 1 "CORL", // Coral
"CRL2", // Coral 2
"CRL3", // Coral 3
"BCRY", // Blue Crystal "BCRY", // Blue Crystal
"KELP", // Kelp "KELP", // Kelp
"ALGA", // Animated algae top "ALGA", // Animated algae top
@ -248,7 +246,7 @@ char sprnames[NUMSPRITES + 1][5] =
// Arid Canyon Scenery // Arid Canyon Scenery
"BTBL", // Big tumbleweed "BTBL", // Big tumbleweed
"STBL", // Small tumbleweed "STBL", // Small tumbleweed
"CACT", // Cacti sprites "CACT", // Cacti
"WWSG", // Caution Sign "WWSG", // Caution Sign
"WWS2", // Cacti Sign "WWS2", // Cacti Sign
"WWS3", // Sharp Turn Sign "WWS3", // Sharp Turn Sign
@ -2166,14 +2164,12 @@ state_t states[NUMSTATES] =
{SPR_DRIP, FF_TRANS30|4, 1, {NULL}, 0, 0, S_DRIPC2}, // S_DRIPC1 {SPR_DRIP, FF_TRANS30|4, 1, {NULL}, 0, 0, S_DRIPC2}, // S_DRIPC1
{SPR_DRIP, FF_TRANS30|5, 1, {NULL}, 0, 0, S_NULL}, // S_DRIPC2 {SPR_DRIP, FF_TRANS30|5, 1, {NULL}, 0, 0, S_NULL}, // S_DRIPC2
// Coral 1 // Coral
{SPR_CRL1, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CORAL1 {SPR_CORL, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CORAL1
{SPR_CORL, 1, -1, {NULL}, 0, 0, S_NULL}, // S_CORAL2
// Coral 2 {SPR_CORL, 2, -1, {NULL}, 0, 0, S_NULL}, // S_CORAL3
{SPR_CRL2, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CORAL2 {SPR_CORL, 3, -1, {NULL}, 0, 0, S_NULL}, // S_CORAL4
{SPR_CORL, 4, -1, {NULL}, 0, 0, S_NULL}, // S_CORAL5
// Coral 3
{SPR_CRL3, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CORAL3
// Blue Crystal // Blue Crystal
{SPR_BCRY, FF_TRANS30, -1, {NULL}, 0, 0, S_NULL}, // S_BLUECRYSTAL1 {SPR_BCRY, FF_TRANS30, -1, {NULL}, 0, 0, S_NULL}, // S_BLUECRYSTAL1
@ -10093,8 +10089,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_None, // deathsound sfx_None, // deathsound
0, // speed 0, // speed
8*FRACUNIT, // radius 29*FRACUNIT, // radius
16*FRACUNIT, // height 40*FRACUNIT, // height
0, // display offset 0, // display offset
4, // mass 4, // mass
0, // damage 0, // damage
@ -10120,8 +10116,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_None, // deathsound sfx_None, // deathsound
0, // speed 0, // speed
8*FRACUNIT, // radius 30*FRACUNIT, // radius
16*FRACUNIT, // height 53*FRACUNIT, // height
0, // display offset 0, // display offset
4, // mass 4, // mass
0, // damage 0, // damage
@ -10147,8 +10143,62 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_None, // deathsound sfx_None, // deathsound
0, // speed 0, // speed
8*FRACUNIT, // radius 28*FRACUNIT, // radius
16*FRACUNIT, // height 41*FRACUNIT, // height
0, // display offset
4, // mass
0, // damage
sfx_None, // activesound
MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
S_NULL // raisestate
},
{ // MT_CORAL4
1014, // doomednum
S_CORAL4, // 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
56*FRACUNIT, // radius
112*FRACUNIT, // height
0, // display offset
4, // mass
0, // damage
sfx_None, // activesound
MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
S_NULL // raisestate
},
{ // MT_CORAL5
1015, // doomednum
S_CORAL5, // 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
56*FRACUNIT, // radius
112*FRACUNIT, // height
0, // display offset 0, // display offset
4, // mass 4, // mass
0, // damage 0, // damage

22
src/info.h
View file

@ -458,9 +458,7 @@ typedef enum sprite
SPR_GARG, // Deep Sea Gargoyle SPR_GARG, // Deep Sea Gargoyle
SPR_SEWE, // Deep Sea Seaweed SPR_SEWE, // Deep Sea Seaweed
SPR_DRIP, // Dripping water SPR_DRIP, // Dripping water
SPR_CRL1, // Coral 1 SPR_CORL, // Coral
SPR_CRL2, // Coral 2
SPR_CRL3, // Coral 3
SPR_BCRY, // Blue Crystal SPR_BCRY, // Blue Crystal
SPR_KELP, // Kelp SPR_KELP, // Kelp
SPR_ALGA, // Animated algae top SPR_ALGA, // Animated algae top
@ -494,7 +492,7 @@ typedef enum sprite
// Arid Canyon Scenery // Arid Canyon Scenery
SPR_BTBL, // Big tumbleweed SPR_BTBL, // Big tumbleweed
SPR_STBL, // Small tumbleweed SPR_STBL, // Small tumbleweed
SPR_CACT, // Cacti sprites SPR_CACT, // Cacti
SPR_WWSG, // Caution Sign SPR_WWSG, // Caution Sign
SPR_WWS2, // Cacti Sign SPR_WWS2, // Cacti Sign
SPR_WWS3, // Sharp Turn Sign SPR_WWS3, // Sharp Turn Sign
@ -2291,14 +2289,12 @@ typedef enum state
S_DRIPC1, S_DRIPC1,
S_DRIPC2, S_DRIPC2,
// Coral 1 // Coral
S_CORAL1, S_CORAL1,
// Coral 2
S_CORAL2, S_CORAL2,
// Coral 3
S_CORAL3, S_CORAL3,
S_CORAL4,
S_CORAL5,
// Blue Crystal // Blue Crystal
S_BLUECRYSTAL1, S_BLUECRYSTAL1,
@ -4199,9 +4195,11 @@ typedef enum mobj_type
MT_SEAWEED, // DSZ Seaweed MT_SEAWEED, // DSZ Seaweed
MT_WATERDRIP, // Dripping Water source MT_WATERDRIP, // Dripping Water source
MT_WATERDROP, // Water drop from dripping water MT_WATERDROP, // Water drop from dripping water
MT_CORAL1, // Coral 1 MT_CORAL1, // Coral
MT_CORAL2, // Coral 2 MT_CORAL2,
MT_CORAL3, // Coral 3 MT_CORAL3,
MT_CORAL4,
MT_CORAL5,
MT_BLUECRYSTAL, // Blue Crystal MT_BLUECRYSTAL, // Blue Crystal
MT_KELP, // Kelp MT_KELP, // Kelp
MT_ANIMALGAETOP, // Animated algae top MT_ANIMALGAETOP, // Animated algae top