mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Add MT_POGOSPRING, orange spring
This commit is contained in:
parent
fc970336f7
commit
e360270b13
4 changed files with 51 additions and 0 deletions
|
|
@ -2541,6 +2541,12 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
|
||||||
"S_GREYSPRING3",
|
"S_GREYSPRING3",
|
||||||
"S_GREYSPRING4",
|
"S_GREYSPRING4",
|
||||||
|
|
||||||
|
// Orange Spring (Pogo)
|
||||||
|
"S_POGOSPRING1",
|
||||||
|
"S_POGOSPRING2",
|
||||||
|
"S_POGOSPRING3",
|
||||||
|
"S_POGOSPRING4",
|
||||||
|
|
||||||
// Yellow Diagonal Spring
|
// Yellow Diagonal Spring
|
||||||
"S_YDIAG1",
|
"S_YDIAG1",
|
||||||
"S_YDIAG2",
|
"S_YDIAG2",
|
||||||
|
|
@ -4631,6 +4637,7 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t
|
||||||
"MT_REDSPRING",
|
"MT_REDSPRING",
|
||||||
"MT_BLUESPRING",
|
"MT_BLUESPRING",
|
||||||
"MT_GREYSPRING",
|
"MT_GREYSPRING",
|
||||||
|
"MT_POGOSPRING",
|
||||||
"MT_YELLOWDIAG", // Yellow Diagonal Spring
|
"MT_YELLOWDIAG", // Yellow Diagonal Spring
|
||||||
"MT_REDDIAG", // Red Diagonal Spring
|
"MT_REDDIAG", // Red Diagonal Spring
|
||||||
"MT_BLUEDIAG", // Blue Diagonal Spring
|
"MT_BLUEDIAG", // Blue Diagonal Spring
|
||||||
|
|
|
||||||
33
src/info.c
33
src/info.c
|
|
@ -3072,6 +3072,12 @@ state_t states[NUMSTATES] =
|
||||||
{SPR_SPVG, 0, 1, {NULL}, 0, 0, S_GREYSPRING4}, // S_GREYSPRING3
|
{SPR_SPVG, 0, 1, {NULL}, 0, 0, S_GREYSPRING4}, // S_GREYSPRING3
|
||||||
{SPR_SPVG, 2, 4, {NULL}, 0, 0, S_GREYSPRING1}, // S_GREYSPRING4
|
{SPR_SPVG, 2, 4, {NULL}, 0, 0, S_GREYSPRING1}, // S_GREYSPRING4
|
||||||
|
|
||||||
|
// Orange Spring (Pogo)
|
||||||
|
{SPR_SPVB, 0, -1, {NULL}, 0, 0, S_NULL}, // S_POGOSPRING1
|
||||||
|
{SPR_SPVB, 1, 1, {A_Pain}, 0, 0, S_POGOSPRING3}, // S_POGOSPRING2
|
||||||
|
{SPR_SPVB, 0, 1, {NULL}, 0, 0, S_POGOSPRING4}, // S_POGOSPRING3
|
||||||
|
{SPR_SPVB, 2, 4, {NULL}, 0, 0, S_POGOSPRING1}, // S_POGOSPRING4
|
||||||
|
|
||||||
// Yellow Diagonal Spring
|
// Yellow Diagonal Spring
|
||||||
{SPR_SPDY, 0, -1, {NULL}, 0, 0, S_NULL}, // S_YDIAG1
|
{SPR_SPDY, 0, -1, {NULL}, 0, 0, S_NULL}, // S_YDIAG1
|
||||||
{SPR_SPDY, 1, 1, {A_Pain}, 0, 0, S_YDIAG3}, // S_YDIAG2
|
{SPR_SPDY, 1, 1, {A_Pain}, 0, 0, S_YDIAG3}, // S_YDIAG2
|
||||||
|
|
@ -8236,6 +8242,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
S_GREYSPRING2 // raisestate
|
S_GREYSPRING2 // raisestate
|
||||||
},
|
},
|
||||||
|
|
||||||
|
{ // MT_POGOSPRING
|
||||||
|
-1, // doomednum
|
||||||
|
S_POGOSPRING1, // spawnstate
|
||||||
|
1000, // spawnhealth
|
||||||
|
S_POGOSPRING2, // seestate
|
||||||
|
sfx_None, // seesound
|
||||||
|
8, // reactiontime
|
||||||
|
sfx_None, // attacksound
|
||||||
|
S_NULL, // painstate
|
||||||
|
SKINCOLOR_SUNSLAM, // painchance
|
||||||
|
sfx_s3kb1, // painsound
|
||||||
|
S_NULL, // meleestate
|
||||||
|
S_NULL, // missilestate
|
||||||
|
S_NULL, // deathstate
|
||||||
|
S_NULL, // xdeathstate
|
||||||
|
sfx_None, // deathsound
|
||||||
|
0, // speed
|
||||||
|
48*FRACUNIT, // radius
|
||||||
|
32*FRACUNIT, // height
|
||||||
|
0, // display offset
|
||||||
|
32*FRACUNIT, // mass
|
||||||
|
0, // damage
|
||||||
|
sfx_None, // activesound
|
||||||
|
MF_SOLID|MF_SPRING|MF_NOGRAVITY|MF_DONTENCOREMAP, // flags
|
||||||
|
S_POGOSPRING2 // raisestate
|
||||||
|
},
|
||||||
|
|
||||||
{ // MT_YELLOWDIAG
|
{ // MT_YELLOWDIAG
|
||||||
554, // doomednum
|
554, // doomednum
|
||||||
S_YDIAG1, // spawnstate
|
S_YDIAG1, // spawnstate
|
||||||
|
|
|
||||||
|
|
@ -3529,6 +3529,12 @@ typedef enum state
|
||||||
S_GREYSPRING3,
|
S_GREYSPRING3,
|
||||||
S_GREYSPRING4,
|
S_GREYSPRING4,
|
||||||
|
|
||||||
|
// Orange Spring (Pogo)
|
||||||
|
S_POGOSPRING1,
|
||||||
|
S_POGOSPRING2,
|
||||||
|
S_POGOSPRING3,
|
||||||
|
S_POGOSPRING4,
|
||||||
|
|
||||||
// Yellow Diagonal Spring
|
// Yellow Diagonal Spring
|
||||||
S_YDIAG1,
|
S_YDIAG1,
|
||||||
S_YDIAG2,
|
S_YDIAG2,
|
||||||
|
|
@ -5656,6 +5662,7 @@ typedef enum mobj_type
|
||||||
MT_REDSPRING,
|
MT_REDSPRING,
|
||||||
MT_BLUESPRING,
|
MT_BLUESPRING,
|
||||||
MT_GREYSPRING,
|
MT_GREYSPRING,
|
||||||
|
MT_POGOSPRING,
|
||||||
MT_YELLOWDIAG, // Yellow Diagonal Spring
|
MT_YELLOWDIAG, // Yellow Diagonal Spring
|
||||||
MT_REDDIAG, // Red Diagonal Spring
|
MT_REDDIAG, // Red Diagonal Spring
|
||||||
MT_BLUEDIAG, // Blue Diagonal Spring
|
MT_BLUEDIAG, // Blue Diagonal Spring
|
||||||
|
|
|
||||||
|
|
@ -10013,6 +10013,10 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
|
||||||
mobj->color = BALLOONCOLORS[P_RandomKey(sizeof(BALLOONCOLORS))];
|
mobj->color = BALLOONCOLORS[P_RandomKey(sizeof(BALLOONCOLORS))];
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
case MT_POGOSPRING:
|
||||||
|
mobj->color = SKINCOLOR_SUNSLAM;
|
||||||
|
mobj->colorized = true;
|
||||||
|
break;
|
||||||
case MT_KART_LEFTOVER:
|
case MT_KART_LEFTOVER:
|
||||||
mobj->color = SKINCOLOR_RED;
|
mobj->color = SKINCOLOR_RED;
|
||||||
break;
|
break;
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue