New sparkles

This commit is contained in:
TehRealSalt 2018-09-22 19:55:26 -04:00
parent ad8d674e5e
commit bb1aaf9d54
4 changed files with 50 additions and 11 deletions

View File

@ -6205,6 +6205,19 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_RANDOMITEMPOP4", "S_RANDOMITEMPOP4",
//} //}
// Signpost sparkles
"S_SIGNSPARK1",
"S_SIGNSPARK2",
"S_SIGNSPARK3",
"S_SIGNSPARK4",
"S_SIGNSPARK5",
"S_SIGNSPARK6",
"S_SIGNSPARK7",
"S_SIGNSPARK8",
"S_SIGNSPARK9",
"S_SIGNSPARK10",
"S_SIGNSPARK11",
// Drift Sparks // Drift Sparks
"S_DRIFTSPARK_A1", "S_DRIFTSPARK_A1",
"S_DRIFTSPARK_A2", "S_DRIFTSPARK_A2",
@ -7206,7 +7219,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_BLUEDIAG", "MT_BLUEDIAG",
"MT_RANDOMITEM", "MT_RANDOMITEM",
"MT_RANDOMITEMPOP", "MT_RANDOMITEMPOP",
"MT_RINGSPARKLE", "MT_SIGNSPARKLE",
"MT_FASTLINE", "MT_FASTLINE",
"MT_FASTDUST", "MT_FASTDUST",

View File

@ -55,12 +55,12 @@ char sprnames[NUMSPRITES + 1][5] =
"GWLR","SRBA","SRBB","SRBC","SRBD","SRBE","SRBF","SRBG","SRBH","SRBI", "GWLR","SRBA","SRBB","SRBC","SRBD","SRBE","SRBF","SRBG","SRBH","SRBI",
"SRBJ","SRBK","SRBL","SRBM","SRBN","SRBO", "SRBJ","SRBK","SRBL","SRBM","SRBN","SRBO",
//SRB2kart Sprites //SRB2kart Sprites
"SPRG","BSPR","RNDM","RPOP","FAST","DSHR","BOST","BOSM","KFRE","KINV", "SPRG","BSPR","RNDM","RPOP","SGNS","FAST","DSHR","BOST","BOSM","KFRE",
"KINF","WIPD","DRIF","DUST","FITM","BANA","ORBN","JAWZ","SSMN","KRBM", "KINV","KINF","WIPD","DRIF","DUST","FITM","BANA","ORBN","JAWZ","SSMN",
"BHOG","BHBM","BLIG","LIGH","THNS","SINK","SITR","KBLN","DEZL","POKE", "KRBM","BHOG","BHBM","BLIG","LIGH","THNS","SINK","SITR","KBLN","DEZL",
"AUDI","DECO","DOOD","SNES","GBAS","SPRS","BUZB","CHOM","SACO","CRAB", "POKE","AUDI","DECO","DOOD","SNES","GBAS","SPRS","BUZB","CHOM","SACO",
"SHAD","BRNG","BUMP","FLEN","CLAS","PSHW","ISTA","ISTB","ARRO","ITEM", "CRAB","SHAD","BRNG","BUMP","FLEN","CLAS","PSHW","ISTA","ISTB","ARRO",
"ITMO","ITMI","ITMN","WANT","PBOM","RETI","VIEW" "ITEM","ITMO","ITMI","ITMN","WANT","PBOM","RETI","VIEW"
}; };
// Doesn't work with g++, needs actionf_p1 (don't modify this comment) // Doesn't work with g++, needs actionf_p1 (don't modify this comment)
@ -2535,6 +2535,18 @@ state_t states[NUMSTATES] =
{SPR_RPOP, FF_FULLBRIGHT|2, 5, {NULL}, 0, 0, S_RANDOMITEMPOP4}, // S_RANDOMITEMPOP3 {SPR_RPOP, FF_FULLBRIGHT|2, 5, {NULL}, 0, 0, S_RANDOMITEMPOP4}, // S_RANDOMITEMPOP3
{SPR_RPOP, FF_FULLBRIGHT|3, 5, {NULL}, 0, 0, S_NULL}, // S_RANDOMITEMPOP4 {SPR_RPOP, FF_FULLBRIGHT|3, 5, {NULL}, 0, 0, S_NULL}, // S_RANDOMITEMPOP4
{SPR_SGNS, FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_SIGNSPARK2}, // S_SIGNSPARK1
{SPR_SGNS, FF_FULLBRIGHT|1, 1, {NULL}, 0, 0, S_SIGNSPARK3}, // S_SIGNSPARK2
{SPR_SGNS, FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_SIGNSPARK4}, // S_SIGNSPARK3
{SPR_SGNS, FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_SIGNSPARK5}, // S_SIGNSPARK4
{SPR_SGNS, FF_FULLBRIGHT|4, 1, {NULL}, 0, 0, S_SIGNSPARK6}, // S_SIGNSPARK5
{SPR_SGNS, FF_FULLBRIGHT|5, 1, {NULL}, 0, 0, S_SIGNSPARK7}, // S_SIGNSPARK6
{SPR_SGNS, FF_FULLBRIGHT|6, 1, {NULL}, 0, 0, S_SIGNSPARK8}, // S_SIGNSPARK7
{SPR_SGNS, FF_FULLBRIGHT|7, 1, {NULL}, 0, 0, S_SIGNSPARK9}, // S_SIGNSPARK8
{SPR_SGNS, FF_FULLBRIGHT|8, 1, {NULL}, 0, 0, S_SIGNSPARK10}, // S_SIGNSPARK9
{SPR_SGNS, FF_FULLBRIGHT|3, 1, {NULL}, 0, 0, S_SIGNSPARK11}, // S_SIGNSPARK10
{SPR_SGNS, FF_FULLBRIGHT|2, 1, {NULL}, 0, 0, S_NULL}, // S_SIGNSPARK11
{SPR_DRIF, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_DRIFTSPARK_A2}, // S_DRIFTSPARK_A1 {SPR_DRIF, FF_FULLBRIGHT|2, 2, {NULL}, 0, 0, S_DRIFTSPARK_A2}, // S_DRIFTSPARK_A1
{SPR_DRIF, FF_FULLBRIGHT|FF_TRANS20|1, 1, {NULL}, 0, 0, S_DRIFTSPARK_A3}, // S_DRIFTSPARK_A2 {SPR_DRIF, FF_FULLBRIGHT|FF_TRANS20|1, 1, {NULL}, 0, 0, S_DRIFTSPARK_A3}, // S_DRIFTSPARK_A2
{SPR_DRIF, FF_FULLBRIGHT|FF_TRANS50, 1, {NULL}, 0, 0, S_NULL}, // S_DRIFTSPARK_A3 {SPR_DRIF, FF_FULLBRIGHT|FF_TRANS50, 1, {NULL}, 0, 0, S_NULL}, // S_DRIFTSPARK_A3
@ -14385,9 +14397,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_RINGSPARKLE { // MT_SIGNSPARKLE
-1, // doomednum -1, // doomednum
S_SPRK1, // spawnstate S_SIGNSPARK1, // spawnstate
1, // spawnhealth 1, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
sfx_None, // seesound sfx_None, // seesound

View File

@ -582,6 +582,7 @@ typedef enum sprite
SPR_RNDM, // Random Item Box SPR_RNDM, // Random Item Box
SPR_RPOP, // Random Item Box Pop SPR_RPOP, // Random Item Box Pop
SPR_SGNS, // Signpost sparkle
SPR_FAST, // Speed boost trail SPR_FAST, // Speed boost trail
SPR_DSHR, // Speed boost dust release SPR_DSHR, // Speed boost dust release
SPR_BOST, // Sneaker booster flame SPR_BOST, // Sneaker booster flame
@ -3050,6 +3051,19 @@ typedef enum state
S_RANDOMITEMPOP4, S_RANDOMITEMPOP4,
//} //}
// Signpost sparkles
S_SIGNSPARK1,
S_SIGNSPARK2,
S_SIGNSPARK3,
S_SIGNSPARK4,
S_SIGNSPARK5,
S_SIGNSPARK6,
S_SIGNSPARK7,
S_SIGNSPARK8,
S_SIGNSPARK9,
S_SIGNSPARK10,
S_SIGNSPARK11,
// Drift Sparks // Drift Sparks
S_DRIFTSPARK_A1, S_DRIFTSPARK_A1,
S_DRIFTSPARK_A2, S_DRIFTSPARK_A2,
@ -4068,7 +4082,7 @@ typedef enum mobj_type
MT_BLUEDIAG, MT_BLUEDIAG,
MT_RANDOMITEM, MT_RANDOMITEM,
MT_RANDOMITEMPOP, MT_RANDOMITEMPOP,
MT_RINGSPARKLE, MT_SIGNSPARKLE,
MT_FASTLINE, MT_FASTLINE,
MT_FASTDUST, MT_FASTDUST,

View File

@ -8306,7 +8306,7 @@ void P_MobjThinker(mobj_t *mobj)
P_SpawnMobj(mobj->x + (P_RandomRange(-48,48)<<FRACBITS), P_SpawnMobj(mobj->x + (P_RandomRange(-48,48)<<FRACBITS),
mobj->y + (P_RandomRange(-48,48)<<FRACBITS), mobj->y + (P_RandomRange(-48,48)<<FRACBITS),
mobj->z + (24<<FRACBITS) + (P_RandomRange(-8,8)<<FRACBITS), mobj->z + (24<<FRACBITS) + (P_RandomRange(-8,8)<<FRACBITS),
MT_RINGSPARKLE); MT_SIGNSPARKLE);
mobj->flags &= ~MF_NOGRAVITY; mobj->flags &= ~MF_NOGRAVITY;
if (abs(mobj->z - mobj->movefactor) <= 512<<FRACBITS && !mobj->cvmem) if (abs(mobj->z - mobj->movefactor) <= 512<<FRACBITS && !mobj->cvmem)
{ {