mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-27 04:21:47 +00:00
Add Power-Up Aura states
MT_POWERUP_AURA SPR_RBOW S_POWERUP_AURA
This commit is contained in:
parent
47a5a0b6dc
commit
d747f31225
3 changed files with 39 additions and 0 deletions
|
|
@ -4586,6 +4586,8 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
|
||||||
"S_GACHABOM_RETURNING",
|
"S_GACHABOM_RETURNING",
|
||||||
|
|
||||||
"S_SUPER_FLICKY",
|
"S_SUPER_FLICKY",
|
||||||
|
|
||||||
|
"S_POWERUP_AURA",
|
||||||
};
|
};
|
||||||
|
|
||||||
// RegEx to generate this from info.h: ^\tMT_([^,]+), --> \t"MT_\1",
|
// RegEx to generate this from info.h: ^\tMT_([^,]+), --> \t"MT_\1",
|
||||||
|
|
@ -5717,6 +5719,8 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t
|
||||||
|
|
||||||
"MT_SUPER_FLICKY",
|
"MT_SUPER_FLICKY",
|
||||||
"MT_SUPER_FLICKY_CONTROLLER",
|
"MT_SUPER_FLICKY_CONTROLLER",
|
||||||
|
|
||||||
|
"MT_POWERUP_AURA",
|
||||||
};
|
};
|
||||||
|
|
||||||
const char *const MOBJFLAG_LIST[] = {
|
const char *const MOBJFLAG_LIST[] = {
|
||||||
|
|
|
||||||
30
src/info.c
30
src/info.c
|
|
@ -652,6 +652,7 @@ char sprnames[NUMSPRITES + 1][5] =
|
||||||
"ITMI",
|
"ITMI",
|
||||||
"ITMN",
|
"ITMN",
|
||||||
"PWRB",
|
"PWRB",
|
||||||
|
"RBOW", // power-up aura
|
||||||
"WANT",
|
"WANT",
|
||||||
|
|
||||||
"PBOM", // player bomb
|
"PBOM", // player bomb
|
||||||
|
|
@ -5256,6 +5257,8 @@ state_t states[NUMSTATES] =
|
||||||
{SPR_GBOM, FF_INVERT, -1, {A_SetScale}, FRACUNIT/2, 1, S_NULL}, // S_GACHABOM_RETURNING
|
{SPR_GBOM, FF_INVERT, -1, {A_SetScale}, FRACUNIT/2, 1, S_NULL}, // S_GACHABOM_RETURNING
|
||||||
|
|
||||||
{SPR_3DFR, 1|FF_ANIMATE, -1, {NULL}, 2, 5, S_NULL}, // S_SUPER_FLICKY
|
{SPR_3DFR, 1|FF_ANIMATE, -1, {NULL}, 2, 5, S_NULL}, // S_SUPER_FLICKY
|
||||||
|
|
||||||
|
{SPR_RBOW, FF_PAPERSPRITE|FF_ADD|FF_FULLBRIGHT|FF_ANIMATE, -1, {NULL}, 14, 2, S_NULL}, // S_POWERUP_AURA
|
||||||
};
|
};
|
||||||
|
|
||||||
mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
|
|
@ -29896,6 +29899,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
MF_NOSECTOR|MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_SCENERY, // flags
|
MF_NOSECTOR|MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_SCENERY, // flags
|
||||||
S_NULL // raisestate
|
S_NULL // raisestate
|
||||||
},
|
},
|
||||||
|
|
||||||
|
{ // MT_POWERUP_AURA
|
||||||
|
-1, // doomednum
|
||||||
|
S_POWERUP_AURA, // spawnstate
|
||||||
|
1000, // spawnhealth
|
||||||
|
S_NULL, // seestate
|
||||||
|
sfx_None, // seesound
|
||||||
|
0, // 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
|
||||||
|
106*FRACUNIT, // height
|
||||||
|
0, // display offset
|
||||||
|
0, // mass
|
||||||
|
0, // damage
|
||||||
|
sfx_None, // activesound
|
||||||
|
MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_SCENERY, // flags
|
||||||
|
S_NULL // raisestate
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
skincolor_t skincolors[MAXSKINCOLORS] = {
|
skincolor_t skincolors[MAXSKINCOLORS] = {
|
||||||
|
|
|
||||||
|
|
@ -1203,6 +1203,7 @@ typedef enum sprite
|
||||||
SPR_ITMI,
|
SPR_ITMI,
|
||||||
SPR_ITMN,
|
SPR_ITMN,
|
||||||
SPR_PWRB,
|
SPR_PWRB,
|
||||||
|
SPR_RBOW, // power-up aura
|
||||||
SPR_WANT,
|
SPR_WANT,
|
||||||
|
|
||||||
SPR_PBOM, // player bomb
|
SPR_PBOM, // player bomb
|
||||||
|
|
@ -5687,6 +5688,8 @@ typedef enum state
|
||||||
|
|
||||||
S_SUPER_FLICKY,
|
S_SUPER_FLICKY,
|
||||||
|
|
||||||
|
S_POWERUP_AURA,
|
||||||
|
|
||||||
S_FIRSTFREESLOT,
|
S_FIRSTFREESLOT,
|
||||||
S_LASTFREESLOT = S_FIRSTFREESLOT + NUMSTATEFREESLOTS - 1,
|
S_LASTFREESLOT = S_FIRSTFREESLOT + NUMSTATEFREESLOTS - 1,
|
||||||
NUMSTATES
|
NUMSTATES
|
||||||
|
|
@ -6837,6 +6840,8 @@ typedef enum mobj_type
|
||||||
MT_SUPER_FLICKY,
|
MT_SUPER_FLICKY,
|
||||||
MT_SUPER_FLICKY_CONTROLLER,
|
MT_SUPER_FLICKY_CONTROLLER,
|
||||||
|
|
||||||
|
MT_POWERUP_AURA,
|
||||||
|
|
||||||
MT_FIRSTFREESLOT,
|
MT_FIRSTFREESLOT,
|
||||||
MT_LASTFREESLOT = MT_FIRSTFREESLOT + NUMMOBJFREESLOTS - 1,
|
MT_LASTFREESLOT = MT_FIRSTFREESLOT + NUMMOBJFREESLOTS - 1,
|
||||||
NUMMOBJTYPES
|
NUMMOBJTYPES
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue