stjr/Kart-Public
0
0
Fork 0
mirror of https://git.do.srb2.org/KartKrew/Kart-Public.git synced 2024-11-15 09:11:59 +00:00
Code Issues Projects Releases Packages Wiki Activity

SOC_PALM (untested)

Browse source
This commit is contained in:
toaster 2018-10-22 23:28:38 +01:00
parent 43bb6749fe
commit 2426d4e348
3 changed files with 184 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/dehacked.c
View file

@ -6771,6 +6771,14 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_KLIT11",
"S_KLIT12",
// Various plants
"S_PALMTREE",
"S_SHRUB",
"S_TALLBUSH",
"S_AZURECITYTREE",
"S_DKRBALLOON", // Diddy Kong Racing
// Marble Zone
"S_FLAMEPARTICLE",
"S_MARBLETORCH",
@ -7444,6 +7452,14 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_KARMAHITBOX",
"MT_KARMAWHEEL",
// Various plants
"MT_PALMTREE",
"MT_SHRUB",
"MT_TALLBUSH",
"MT_AZURECITYTREE",
"MT_DKRBALLOON", // Diddy Kong Racing
// Marble Zone
"MT_FLAMEPARTICLE",
"MT_MARBLETORCH",

146
src/info.c
View file

@ -61,7 +61,8 @@ char sprnames[NUMSPRITES + 1][5] =
"DEZL","POKE","AUDI","DECO","DOOD","SNES","GBAS","SPRS","BUZB","CHOM",
"SACO","CRAB","SHAD","BRNG","BUMP","FLEN","CLAS","PSHW","ISTA","ISTB",
"ARRO","ITEM","ITMO","ITMI","ITMN","WANT","PBOM","RETI","AIDU","KSPK",
"LZI1","LZI2","KLIT","MARB","FUFO","RUST","BLON","VIEW"
"LZI1","LZI2","KLIT","PALM","SHRB","TWEE","BALN","MARB","FUFO","RUST",
"BLON","VIEW"
};
// Doesn't work with g++, needs actionf_p1 (don't modify this comment)
@ -3066,6 +3067,14 @@ state_t states[NUMSTATES] =
{SPR_KLIT, FF_FULLBRIGHT|FF_PAPERSPRITE|5, 2, {A_LightningFollowPlayer}, 0, 0, S_KLIT12}, // S_KLIT11
{SPR_NULL, FF_FULLBRIGHT|FF_PAPERSPRITE, 2, {A_LightningFollowPlayer}, 0, 0, S_KLIT1}, // S_KLIT12
// Various plants
{SPR_PALM, 0, -1, {NULL}, 0, 0, S_NULL}, // S_PALMTREE
{SPR_SHRB, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SHRUB
{SPR_BUS2, 1, -1, {NULL}, 0, 0, S_NULL}, // S_TALLBUSH
{SPR_TWEE, 0, -1, {NULL}, 0, 0, S_NULL}, // S_AZURECITYTREE
{SPR_BALN, 0, -1, {NULL}, 0, 0, S_NULL}, // S_DKRBALLOON
// Marble Zone
{SPR_MARB, FF_FULLBRIGHT|FF_ANIMATE|5, TICRATE, {NULL}, 3, 3, S_NULL}, // S_FLAMEPARTICLE
{SPR_MARB, FF_FULLBRIGHT|FF_ANIMATE, 8*3, {A_FlameParticle}, 3, 3, S_MARBLETORCH}, // S_MARBLETORCH
@ -17231,6 +17240,141 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
{ // MT_PALMTREE,
1482, // doomednum
S_PALMTREE, // 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
189*FRACUNIT, // height
0, // display offset
0, // mass
0, // damage
sfx_None, // activesound
MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
S_NULL // raisestate
},
{ // MT_SHRUB,
4022, // doomednum
S_SHRUB, // 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
91*FRACUNIT, // radius
166*FRACUNIT, // height
0, // display offset
0, // mass
0, // damage
sfx_None, // activesound
MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
S_NULL // raisestate
},
{ // MT_TALLBUSH,
1485, // doomednum
S_TALLBUSH, // 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
91*FRACUNIT, // radius
166*FRACUNIT, // height
0, // display offset
0, // mass
0, // damage
sfx_None, // activesound
MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
S_NULL // raisestate
},
{ // MT_AZURECITYTREE,
1486, // doomednum
S_AZURECITYTREE,// 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
91*FRACUNIT, // radius
166*FRACUNIT, // height
0, // display offset
0, // mass
0, // damage
sfx_None, // activesound
MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
S_NULL // raisestate
},
{ // MT_DKRBALLOON,
2807, // doomednum
S_DKRBALLOON, // 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
91*FRACUNIT, // radius
166*FRACUNIT, // height
0, // display offset
0, // mass
0, // damage
sfx_None, // activesound
MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY|MF_NOGRAVITY, // flags
S_NULL // raisestate
},
{ // MT_FLAMEPARTICLE
-1, // doomednum
S_FLAMEPARTICLE,// spawnstate

23
src/info.h
View file

@ -654,6 +654,13 @@ typedef enum sprite
SPR_LZI2, // ditto
SPR_KLIT, // You have a twisted mind. But this actually is for the diagonal lightning.
// Various plants
SPR_PALM,
SPR_SHRB,
SPR_TWEE,
SPR_BALN, // Diddy Kong Racing
SPR_MARB, // Marble Zone sprites
SPR_FUFO, // CD Special Stage UFO (don't ask me why it begins with an F)
@ -3621,6 +3628,14 @@ typedef enum state
S_KLIT11,
S_KLIT12,
// Various plants
S_PALMTREE,
S_SHRUB,
S_TALLBUSH,
S_AZURECITYTREE,
S_DKRBALLOON, // Diddy Kong Racing
// Marble Zone
S_FLAMEPARTICLE,
S_MARBLETORCH,
@ -4311,6 +4326,14 @@ typedef enum mobj_type
MT_KARMAHITBOX,
MT_KARMAWHEEL,
// Various plants
MT_PALMTREE,
MT_SHRUB,
MT_TALLBUSH,
MT_AZURECITYTREE,
MT_DKRBALLOON, // Diddy Kong Racing
// Marble Zone
MT_FLAMEPARTICLE,
MT_MARBLETORCH,