mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Add Lost Colony Fuel Canister states
This commit is contained in:
parent
df023246a5
commit
f6ce183cee
6 changed files with 137 additions and 0 deletions
|
|
@ -4860,6 +4860,10 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
|
||||||
// MT_BSZSLAMP
|
// MT_BSZSLAMP
|
||||||
"S_BSWL",
|
"S_BSWL",
|
||||||
"S_BSWC",
|
"S_BSWC",
|
||||||
|
|
||||||
|
"S_BETA_PARTICLE_WHEEL",
|
||||||
|
"S_BETA_PARTICLE_ICON",
|
||||||
|
"S_BETA_PARTICLE_EXPLOSION",
|
||||||
};
|
};
|
||||||
|
|
||||||
// RegEx to generate this from info.h: ^\tMT_([^,]+), --> \t"MT_\1",
|
// RegEx to generate this from info.h: ^\tMT_([^,]+), --> \t"MT_\1",
|
||||||
|
|
@ -6099,6 +6103,11 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t
|
||||||
"MT_BSZLAMP_L",
|
"MT_BSZLAMP_L",
|
||||||
"MT_BSZSLAMP",
|
"MT_BSZSLAMP",
|
||||||
"MT_BSZSLCHA",
|
"MT_BSZSLCHA",
|
||||||
|
|
||||||
|
"MT_BETA_EMITTER",
|
||||||
|
"MT_BETA_PARTICLE_PHYSICAL",
|
||||||
|
"MT_BETA_PARTICLE_VISUAL",
|
||||||
|
"MT_BETA_PARTICLE_EXPLOSION",
|
||||||
};
|
};
|
||||||
|
|
||||||
const char *const MOBJFLAG_LIST[] = {
|
const char *const MOBJFLAG_LIST[] = {
|
||||||
|
|
|
||||||
110
src/info.c
110
src/info.c
|
|
@ -999,6 +999,8 @@ char sprnames[NUMSPRITES + 1][5] =
|
||||||
"BSWL",
|
"BSWL",
|
||||||
"BSWC",
|
"BSWC",
|
||||||
|
|
||||||
|
"LCLA",
|
||||||
|
|
||||||
// First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later
|
// First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later
|
||||||
"VIEW",
|
"VIEW",
|
||||||
};
|
};
|
||||||
|
|
@ -5719,6 +5721,10 @@ state_t states[NUMSTATES] =
|
||||||
// MT_BSZSLAMP
|
// MT_BSZSLAMP
|
||||||
{SPR_BSWL, 0|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_BSWL
|
{SPR_BSWL, 0|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_BSWL
|
||||||
{SPR_BSWC, 0|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_BSWC
|
{SPR_BSWC, 0|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_BSWC
|
||||||
|
|
||||||
|
{SPR_LCLA, 0|FF_FULLBRIGHT|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_BETA_PARTICLE_WHEEL
|
||||||
|
{SPR_LCLA, 1|FF_FULLBRIGHT|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_BETA_PARTICLE_ICON
|
||||||
|
{SPR_LCLA, 2|FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_BETA_PARTICLE_EXPLOSION
|
||||||
};
|
};
|
||||||
|
|
||||||
mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
|
|
@ -32529,6 +32535,110 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
0, // flags
|
0, // flags
|
||||||
S_NULL // raisestate
|
S_NULL // raisestate
|
||||||
},
|
},
|
||||||
|
{ // MT_BETA_EMITTER
|
||||||
|
2699, // doomednum
|
||||||
|
S_INVISIBLE, // spawnstate
|
||||||
|
1, // 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
|
||||||
|
0, // radius
|
||||||
|
0, // height
|
||||||
|
0, // dispoffset
|
||||||
|
0, // mass
|
||||||
|
0, // damage
|
||||||
|
sfx_None, // activesound
|
||||||
|
MF_NOGRAVITY|MF_NOBLOCKMAP|MF_NOSECTOR|MF_SCENERY, // flags
|
||||||
|
S_NULL // raisestate
|
||||||
|
},
|
||||||
|
{ // MT_BETA_PARTICLE_PHYSICAL
|
||||||
|
-1, // doomednum
|
||||||
|
S_INVISIBLE, // spawnstate
|
||||||
|
1, // 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
|
||||||
|
24*FRACUNIT, // radius
|
||||||
|
128*FRACUNIT, // height
|
||||||
|
0, // dispoffset
|
||||||
|
0, // mass
|
||||||
|
0, // damage
|
||||||
|
sfx_None, // activesound
|
||||||
|
MF_SPECIAL|MF_NOGRAVITY, // flags
|
||||||
|
S_NULL // raisestate
|
||||||
|
},
|
||||||
|
{ // MT_BETA_PARTICLE_VISUAL
|
||||||
|
-1, // doomednum
|
||||||
|
S_NULL, // spawnstate
|
||||||
|
1, // 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
|
||||||
|
0, // radius
|
||||||
|
0, // height
|
||||||
|
0, // dispoffset
|
||||||
|
0, // mass
|
||||||
|
0, // damage
|
||||||
|
sfx_None, // activesound
|
||||||
|
MF_NOCLIPTHING|MF_NOCLIPHEIGHT|MF_NOCLIP|MF_SCENERY|MF_NOGRAVITY, // flags
|
||||||
|
S_NULL // raisestate
|
||||||
|
},
|
||||||
|
{ // MT_BETA_PARTICLE_EXPLOSION
|
||||||
|
-1, // doomednum
|
||||||
|
S_BETA_PARTICLE_EXPLOSION, // 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
|
||||||
|
40*FRACUNIT, // radius
|
||||||
|
80*FRACUNIT, // height
|
||||||
|
0, // display offset
|
||||||
|
100, // mass
|
||||||
|
1, // damage
|
||||||
|
sfx_None, // activesound
|
||||||
|
MF_NOCLIPHEIGHT|MF_NOGRAVITY|MF_SCENERY|MF_DONTENCOREMAP|MF_NOHITLAGFORME|MF_SPECIAL|MF_DONTPUNT, // flags
|
||||||
|
S_NULL // raisestate
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
11
src/info.h
11
src/info.h
|
|
@ -1553,6 +1553,8 @@ typedef enum sprite
|
||||||
SPR_BSWL,
|
SPR_BSWL,
|
||||||
SPR_BSWC,
|
SPR_BSWC,
|
||||||
|
|
||||||
|
SPR_LCLA,
|
||||||
|
|
||||||
// First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later
|
// First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later
|
||||||
SPR_VIEW,
|
SPR_VIEW,
|
||||||
|
|
||||||
|
|
@ -6144,6 +6146,10 @@ typedef enum state
|
||||||
S_BSWL,
|
S_BSWL,
|
||||||
S_BSWC,
|
S_BSWC,
|
||||||
|
|
||||||
|
S_BETA_PARTICLE_WHEEL,
|
||||||
|
S_BETA_PARTICLE_ICON,
|
||||||
|
S_BETA_PARTICLE_EXPLOSION,
|
||||||
|
|
||||||
S_FIRSTFREESLOT,
|
S_FIRSTFREESLOT,
|
||||||
S_LASTFREESLOT = S_FIRSTFREESLOT + NUMSTATEFREESLOTS - 1,
|
S_LASTFREESLOT = S_FIRSTFREESLOT + NUMSTATEFREESLOTS - 1,
|
||||||
NUMSTATES
|
NUMSTATES
|
||||||
|
|
@ -7403,6 +7409,11 @@ typedef enum mobj_type
|
||||||
MT_BSZSLAMP,
|
MT_BSZSLAMP,
|
||||||
MT_BSZSLCHA,
|
MT_BSZSLCHA,
|
||||||
|
|
||||||
|
MT_BETA_EMITTER,
|
||||||
|
MT_BETA_PARTICLE_PHYSICAL,
|
||||||
|
MT_BETA_PARTICLE_VISUAL,
|
||||||
|
MT_BETA_PARTICLE_EXPLOSION,
|
||||||
|
|
||||||
MT_FIRSTFREESLOT,
|
MT_FIRSTFREESLOT,
|
||||||
MT_LASTFREESLOT = MT_FIRSTFREESLOT + NUMMOBJFREESLOTS - 1,
|
MT_LASTFREESLOT = MT_FIRSTFREESLOT + NUMMOBJFREESLOTS - 1,
|
||||||
NUMMOBJTYPES
|
NUMMOBJTYPES
|
||||||
|
|
|
||||||
|
|
@ -11031,6 +11031,8 @@ fixed_t P_GetMobjDefaultScale(mobj_t *mobj)
|
||||||
return 2*FRACUNIT;
|
return 2*FRACUNIT;
|
||||||
case MT_SPEAR:
|
case MT_SPEAR:
|
||||||
return 2*FRACUNIT;
|
return 2*FRACUNIT;
|
||||||
|
case MT_BETA_EMITTER:
|
||||||
|
return 4*FRACUNIT;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1251,6 +1251,8 @@ sfxinfo_t S_sfx[NUMSFX] =
|
||||||
|
|
||||||
{"ivobal", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Ivo Ball
|
{"ivobal", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, ""}, // Ivo Ball
|
||||||
|
|
||||||
|
{"lcfuel", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Fuel Capsule explodes"},
|
||||||
|
|
||||||
// Damage sounds
|
// Damage sounds
|
||||||
{"dmga1", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Damaged"},
|
{"dmga1", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Damaged"},
|
||||||
{"dmga2", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Damaged"},
|
{"dmga2", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Damaged"},
|
||||||
|
|
|
||||||
|
|
@ -1323,6 +1323,9 @@ typedef enum
|
||||||
// Ivo Ball
|
// Ivo Ball
|
||||||
sfx_ivobal,
|
sfx_ivobal,
|
||||||
|
|
||||||
|
// Fuel Capsule
|
||||||
|
sfx_lcfuel,
|
||||||
|
|
||||||
// Damage sounds
|
// Damage sounds
|
||||||
sfx_dmga1,
|
sfx_dmga1,
|
||||||
sfx_dmga2,
|
sfx_dmga2,
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue