mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Add Frozen Production Frost Thrower states
Change from Lua: Ice Dust hitbox is twice as wide
This commit is contained in:
James R
parent
ea697d2048
commit
e6d375d127
5 changed files with 293 additions and 0 deletions
|
|
@ -4795,6 +4795,39 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
|
|||
"S_GPZ_TREETHING_B",
|
||||
"S_GPZ_TREETHING_M",
|
||||
"S_GPZ_TREETHING_S",
|
||||
|
||||
// MT_GGZFREEZETHRUSTER
|
||||
"S_GGZFREEZETHRUSTER",
|
||||
|
||||
// MT_GGZICEDUST
|
||||
"S_GGZICEDUST1",
|
||||
"S_GGZICEDUST2",
|
||||
"S_GGZICEDUST3",
|
||||
"S_GGZICEDUST4",
|
||||
"S_GGZICEDUST5",
|
||||
"S_GGZICEDUST6",
|
||||
"S_GGZICEDUST7",
|
||||
"S_GGZICEDUST8",
|
||||
"S_GGZICEDUST9",
|
||||
"S_GGZICEDUST10",
|
||||
"S_GGZICEDUST11",
|
||||
"S_GGZPARTICLE11",
|
||||
"S_GGZPARTICLE12",
|
||||
"S_GGZPARTICLE13",
|
||||
"S_GGZPARTICLE14",
|
||||
"S_GGZPARTICLE15",
|
||||
"S_GGZPARTICLE16",
|
||||
"S_GGZPARTICLE17",
|
||||
"S_GGZPARTICLE18",
|
||||
"S_GGZPARTICLE21",
|
||||
"S_GGZPARTICLE22",
|
||||
"S_GGZPARTICLE23",
|
||||
"S_GGZPARTICLE24",
|
||||
|
||||
"S_GGZICECUBE",
|
||||
|
||||
// MT_THRUSTERPART
|
||||
"S_THRUSTERPART",
|
||||
};
|
||||
|
||||
// RegEx to generate this from info.h: ^\tMT_([^,]+), --> \t"MT_\1",
|
||||
|
|
@ -6010,6 +6043,13 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t
|
|||
"MT_GPZ_TREETHING_B",
|
||||
"MT_GPZ_TREETHING_M",
|
||||
"MT_GPZ_TREETHING_S",
|
||||
|
||||
"MT_GGZFREEZETHRUSTER",
|
||||
"MT_GGZICEDUST",
|
||||
"MT_GGZICECUBE",
|
||||
"MT_GGZICESHATTER",
|
||||
"MT_SIDEWAYSFREEZETHRUSTER",
|
||||
"MT_THRUSTERPART",
|
||||
};
|
||||
|
||||
const char *const MOBJFLAG_LIST[] = {
|
||||
|
|
|
|||
199
src/info.c
199
src/info.c
|
|
@ -977,6 +977,15 @@ char sprnames[NUMSPRITES + 1][5] =
|
|||
"GPTM",
|
||||
"GPTS",
|
||||
|
||||
"GGZ1",
|
||||
"GGZ2",
|
||||
"GGZ3",
|
||||
"GGZ6",
|
||||
"GGZ7",
|
||||
"GGZ8",
|
||||
"FBTN",
|
||||
"SFTR",
|
||||
|
||||
// First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later
|
||||
"VIEW",
|
||||
};
|
||||
|
|
@ -5632,6 +5641,39 @@ state_t states[NUMSTATES] =
|
|||
{SPR_GPTB, 0, -1, {A_SetScale}, 4*FRACUNIT, 0, S_NULL}, // S_GPZ_TREETHING_B,
|
||||
{SPR_GPTM, 0, -1, {A_SetScale}, 4*FRACUNIT, 0, S_NULL}, // S_GPZ_TREETHING_M,
|
||||
{SPR_GPTS, 0, -1, {A_SetScale}, 4*FRACUNIT, 0, S_NULL}, // S_GPZ_TREETHING_S,
|
||||
|
||||
// MT_GGZFREEZETHRUSTER
|
||||
{SPR_GGZ6, 0, -1, {NULL}, 0, 0, S_GGZFREEZETHRUSTER}, // S_GGZFREEZETHRUSTER
|
||||
|
||||
// MT_GGZICEDUST
|
||||
{SPR_GGZ7, 0|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZICEDUST2}, // S_GGZICEDUST1
|
||||
{SPR_GGZ7, 1|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZICEDUST3}, // S_GGZICEDUST2
|
||||
{SPR_GGZ7, 2|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZICEDUST4}, // S_GGZICEDUST3
|
||||
{SPR_GGZ7, 3|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZICEDUST5}, // S_GGZICEDUST4
|
||||
{SPR_GGZ7, 4|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZICEDUST6}, // S_GGZICEDUST5
|
||||
{SPR_GGZ7, 5|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZICEDUST7}, // S_GGZICEDUST6
|
||||
{SPR_GGZ7, 6|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZICEDUST8}, // S_GGZICEDUST7
|
||||
{SPR_GGZ7, 7|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZICEDUST9}, // S_GGZICEDUST8
|
||||
{SPR_GGZ7, 8|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZICEDUST10}, // S_GGZICEDUST9
|
||||
{SPR_GGZ7, 9|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZICEDUST11}, // S_GGZICEDUST10
|
||||
{SPR_GGZ7, 10|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_NULL}, // S_GGZICEDUST11
|
||||
{SPR_GGZ1, 0|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZPARTICLE12}, // S_GGZPARTICLE11
|
||||
{SPR_GGZ1, 1|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZPARTICLE13}, // S_GGZPARTICLE12
|
||||
{SPR_GGZ1, 2|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZPARTICLE14}, // S_GGZPARTICLE13
|
||||
{SPR_GGZ1, 3|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZPARTICLE15}, // S_GGZPARTICLE14
|
||||
{SPR_GGZ1, 4|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZPARTICLE16}, // S_GGZPARTICLE15
|
||||
{SPR_GGZ1, 5|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZPARTICLE17}, // S_GGZPARTICLE16
|
||||
{SPR_GGZ1, 6|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZPARTICLE18}, // S_GGZPARTICLE17
|
||||
{SPR_GGZ1, 7|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZPARTICLE11}, // S_GGZPARTICLE18
|
||||
{SPR_GGZ2, 0|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZPARTICLE22}, // S_GGZPARTICLE21
|
||||
{SPR_GGZ2, 1|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZPARTICLE23}, // S_GGZPARTICLE22
|
||||
{SPR_GGZ2, 2|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZPARTICLE24}, // S_GGZPARTICLE23
|
||||
{SPR_GGZ2, 3|FF_FULLBRIGHT, 1, {NULL}, 0, 0, S_GGZPARTICLE21}, // S_GGZPARTICLE24
|
||||
|
||||
{SPR_GGZ8, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_GGZICECUBE
|
||||
|
||||
// MT_THRUSTERPART
|
||||
{SPR_SFTR, 0|FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_THRUSTERPART}, // S_THRUSTERPART
|
||||
};
|
||||
|
||||
mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||
|
|
@ -31919,6 +31961,163 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
|||
MF_NOGRAVITY|MF_RUNSPAWNFUNC, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_GGZFREEZETHRUSTER
|
||||
691, // doomednum
|
||||
S_GGZFREEZETHRUSTER, // 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
|
||||
32*FRACUNIT, // radius
|
||||
48*FRACUNIT, // height
|
||||
0, // dispoffset
|
||||
0, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_NOCLIPTHING|MF_NOGRAVITY, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
{ // MT_GGZICEDUST
|
||||
-1, // doomednum
|
||||
S_GGZICEDUST1, // spawnstate
|
||||
2, // 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
|
||||
32*FRACUNIT, // radius
|
||||
16*FRACUNIT, // height
|
||||
0, // dispoffset
|
||||
0, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SPECIAL|MF_NOSQUISH|MF_NOGRAVITY, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
{ // MT_GGZICECUBE
|
||||
-1, // doomednum
|
||||
S_GGZICECUBE, // 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
|
||||
16*FRACUNIT, // height
|
||||
0, // dispoffset
|
||||
0, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPTHING|MF_NOCLIPHEIGHT|MF_SCENERY|MF_NOSQUISH, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
{ // MT_GGZICESHATTER
|
||||
-1, // doomednum
|
||||
S_INVISIBLE, // 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
|
||||
32*FRACUNIT, // radius
|
||||
64*FRACUNIT, // height
|
||||
0, // dispoffset
|
||||
0, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_NOCLIPHEIGHT|MF_NOSQUISH, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
{ // MT_SIDEWAYSFREEZETHRUSTER
|
||||
693, // 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
|
||||
16*FRACUNIT, // radius
|
||||
32*FRACUNIT, // height
|
||||
0, // dispoffset
|
||||
0, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_NOGRAVITY, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
{ // MT_THRUSTERPART
|
||||
-1, // doomednum
|
||||
S_THRUSTERPART, // 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
|
||||
16*FRACUNIT, // radius
|
||||
32*FRACUNIT, // height
|
||||
0, // dispoffset
|
||||
0, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_SCENERY|MF_NOCLIPTHING, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
};
|
||||
|
||||
|
||||
|
|
|
|||
49
src/info.h
49
src/info.h
|
|
@ -1531,6 +1531,15 @@ typedef enum sprite
|
|||
SPR_GPTM,
|
||||
SPR_GPTS,
|
||||
|
||||
SPR_GGZ1,
|
||||
SPR_GGZ2,
|
||||
SPR_GGZ3,
|
||||
SPR_GGZ6,
|
||||
SPR_GGZ7,
|
||||
SPR_GGZ8,
|
||||
SPR_FBTN,
|
||||
SPR_SFTR,
|
||||
|
||||
// First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later
|
||||
SPR_VIEW,
|
||||
|
||||
|
|
@ -6057,6 +6066,39 @@ typedef enum state
|
|||
S_GPZ_TREETHING_M,
|
||||
S_GPZ_TREETHING_S,
|
||||
|
||||
// MT_GGZFREEZETHRUSTER
|
||||
S_GGZFREEZETHRUSTER,
|
||||
|
||||
// MT_GGZICEDUST
|
||||
S_GGZICEDUST1,
|
||||
S_GGZICEDUST2,
|
||||
S_GGZICEDUST3,
|
||||
S_GGZICEDUST4,
|
||||
S_GGZICEDUST5,
|
||||
S_GGZICEDUST6,
|
||||
S_GGZICEDUST7,
|
||||
S_GGZICEDUST8,
|
||||
S_GGZICEDUST9,
|
||||
S_GGZICEDUST10,
|
||||
S_GGZICEDUST11,
|
||||
S_GGZPARTICLE11,
|
||||
S_GGZPARTICLE12,
|
||||
S_GGZPARTICLE13,
|
||||
S_GGZPARTICLE14,
|
||||
S_GGZPARTICLE15,
|
||||
S_GGZPARTICLE16,
|
||||
S_GGZPARTICLE17,
|
||||
S_GGZPARTICLE18,
|
||||
S_GGZPARTICLE21,
|
||||
S_GGZPARTICLE22,
|
||||
S_GGZPARTICLE23,
|
||||
S_GGZPARTICLE24,
|
||||
|
||||
S_GGZICECUBE,
|
||||
|
||||
// MT_THRUSTERPART
|
||||
S_THRUSTERPART,
|
||||
|
||||
S_FIRSTFREESLOT,
|
||||
S_LASTFREESLOT = S_FIRSTFREESLOT + NUMSTATEFREESLOTS - 1,
|
||||
NUMSTATES
|
||||
|
|
@ -7292,6 +7334,13 @@ typedef enum mobj_type
|
|||
MT_GPZ_TREETHING_M,
|
||||
MT_GPZ_TREETHING_S,
|
||||
|
||||
MT_GGZFREEZETHRUSTER,
|
||||
MT_GGZICEDUST,
|
||||
MT_GGZICECUBE,
|
||||
MT_GGZICESHATTER,
|
||||
MT_SIDEWAYSFREEZETHRUSTER,
|
||||
MT_THRUSTERPART,
|
||||
|
||||
MT_FIRSTFREESLOT,
|
||||
MT_LASTFREESLOT = MT_FIRSTFREESLOT + NUMMOBJFREESLOTS - 1,
|
||||
NUMMOBJTYPES
|
||||
|
|
|
|||
|
|
@ -1247,6 +1247,8 @@ sfxinfo_t S_sfx[NUMSFX] =
|
|||
{"befan1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Whisking"}, // Blend Eye whisk startup
|
||||
{"befan2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Whisking"}, // Blend Eye whisk
|
||||
|
||||
{"glgz1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ice Cube shatters"},
|
||||
|
||||
// Damage sounds
|
||||
{"dmga1", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Damaged"},
|
||||
{"dmga2", false, 255, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Damaged"},
|
||||
|
|
|
|||
|
|
@ -1317,6 +1317,9 @@ typedef enum
|
|||
sfx_befan1,
|
||||
sfx_befan2,
|
||||
|
||||
// Ice Cube
|
||||
sfx_glgz1,
|
||||
|
||||
// Damage sounds
|
||||
sfx_dmga1,
|
||||
sfx_dmga2,
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue