mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-10-30 08:01:28 +00:00
Restore Sapphire Coast decorative objects
Removed in !1811, putting back because used in Lake Margorite and a handful of other stages as generic decoration
This commit is contained in:
toaster
parent
61db3426a3
commit
65d553a5f9
3 changed files with 262 additions and 0 deletions
|
|
@ -2162,6 +2162,14 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
|
|||
"S_FLAYM2",
|
||||
"S_FLAYM3",
|
||||
"S_FLAYM4",
|
||||
"S_PALMTREE2",
|
||||
"S_PURPLEFLOWER1",
|
||||
"S_PURPLEFLOWER2",
|
||||
"S_YELLOWFLOWER1",
|
||||
"S_YELLOWFLOWER2",
|
||||
"S_PLANT2",
|
||||
"S_PLANT3",
|
||||
"S_PLANT4",
|
||||
|
||||
// Chaotix Big Ring
|
||||
"S_BIGRING01",
|
||||
|
|
@ -3588,6 +3596,15 @@ const char *const MOBJTYPE_LIST[] = { // array length left dynamic for sanity t
|
|||
|
||||
"MT_FLAYM",
|
||||
|
||||
"MT_PALMTREE2",
|
||||
"MT_PURPLEFLOWER1",
|
||||
"MT_PURPLEFLOWER2",
|
||||
"MT_YELLOWFLOWER1",
|
||||
"MT_YELLOWFLOWER2",
|
||||
"MT_PLANT2",
|
||||
"MT_PLANT3",
|
||||
"MT_PLANT4",
|
||||
|
||||
"MT_BIGRING",
|
||||
|
||||
"MT_ARKARROW", // Ark Arrows
|
||||
|
|
|
|||
227
src/info.c
227
src/info.c
|
|
@ -416,6 +416,7 @@ char sprnames[NUMSPRITES + 1][5] =
|
|||
// Additional Kart Objects
|
||||
"AUDI", // Audience members
|
||||
"BUZB", // Sapphire Coast Buzz Mk3
|
||||
"SACO", // Sapphire Coast Fauna
|
||||
"BRNG", // Chaotix Big Ring
|
||||
|
||||
// Ark Arrows
|
||||
|
|
@ -2649,6 +2650,15 @@ state_t states[NUMSTATES] =
|
|||
{SPR_FLAM, FF_FULLBRIGHT|FF_ADD|2, 3, {NULL}, 0, 0, S_FLAYM4}, // S_FLAYM3,
|
||||
{SPR_FLAM, FF_FULLBRIGHT|FF_ADD|3, 3, {NULL}, 0, 0, S_FLAYM1}, // S_FLAYM4,
|
||||
|
||||
{SPR_SACO, 0, -1, {NULL}, 0, 0, S_NULL}, // S_PALMTREE2
|
||||
{SPR_SACO, 1, -1, {NULL}, 0, 0, S_NULL}, // S_PURPLEFLOWER1
|
||||
{SPR_SACO, 2, -1, {NULL}, 0, 0, S_NULL}, // S_PURPLEFLOWER2
|
||||
{SPR_SACO, 3, -1, {NULL}, 0, 0, S_NULL}, // S_YELLOWFLOWER1
|
||||
{SPR_SACO, 4, -1, {NULL}, 0, 0, S_NULL}, // S_YELLOWFLOWER2
|
||||
{SPR_SACO, 5, -1, {NULL}, 0, 0, S_NULL}, // S_PLANT2
|
||||
{SPR_SACO, 6, -1, {NULL}, 0, 0, S_NULL}, // S_PLANT3
|
||||
{SPR_SACO, 7, -1, {NULL}, 0, 0, S_NULL}, // S_PLANT4
|
||||
|
||||
{SPR_BRNG, 0, 2, {NULL}, 0, 0, S_BIGRING02}, // S_BIGRING01
|
||||
{SPR_BRNG, 1, 2, {NULL}, 0, 0, S_BIGRING03}, // S_BIGRING02
|
||||
{SPR_BRNG, 2, 2, {NULL}, 0, 0, S_BIGRING04}, // S_BIGRING03
|
||||
|
|
@ -16143,6 +16153,223 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
|||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
|
||||
{ // MT_PALMTREE2
|
||||
2016, // doomednum
|
||||
S_PALMTREE2, // 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
|
||||
16*FRACUNIT, // radius
|
||||
96*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SCENERY|MF_NOCLIPTHING, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_PURPLEFLOWER1
|
||||
3000, // doomednum
|
||||
S_PURPLEFLOWER1, // 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
|
||||
16*FRACUNIT, // radius
|
||||
40*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SCENERY|MF_NOCLIPTHING|MF_NOGRAVITY, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_PURPLEFLOWER2
|
||||
3001, // doomednum
|
||||
S_PURPLEFLOWER2, // 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
|
||||
16*FRACUNIT, // radius
|
||||
40*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SCENERY|MF_NOCLIPTHING|MF_NOGRAVITY, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_YELLOWFLOWER1
|
||||
3002, // doomednum
|
||||
S_YELLOWFLOWER1, // 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
|
||||
16*FRACUNIT, // radius
|
||||
40*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SCENERY|MF_NOCLIPTHING|MF_NOGRAVITY, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_YELLOWFLOWER2
|
||||
3003, // doomednum
|
||||
S_YELLOWFLOWER2, // 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
|
||||
16*FRACUNIT, // radius
|
||||
40*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SCENERY|MF_NOCLIPTHING|MF_NOGRAVITY, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_PLANT2
|
||||
4022, // doomednum
|
||||
S_PLANT2, // 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
|
||||
16*FRACUNIT, // radius
|
||||
40*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SCENERY|MF_NOCLIPTHING|MF_NOGRAVITY, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_PLANT3
|
||||
4024, // doomednum
|
||||
S_PLANT3, // 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
|
||||
16*FRACUNIT, // radius
|
||||
40*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SCENERY|MF_NOCLIPTHING, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_PLANT4
|
||||
4025, // doomednum
|
||||
S_PLANT4, // 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
|
||||
16*FRACUNIT, // radius
|
||||
40*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SCENERY|MF_NOCLIPTHING, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_BIGRING
|
||||
2808, // doomednum
|
||||
S_BIGRING01, // spawnstate
|
||||
|
|
|
|||
18
src/info.h
18
src/info.h
|
|
@ -955,6 +955,7 @@ typedef enum sprite
|
|||
// Additional Kart Objects
|
||||
SPR_AUDI, // Audience members
|
||||
SPR_BUZB, // Buzz Bomber
|
||||
SPR_SACO, // Sapphire Coast Fauna
|
||||
SPR_BRNG, // Chaotix Big Ring
|
||||
|
||||
// Ark Arrows
|
||||
|
|
@ -3154,6 +3155,14 @@ typedef enum state
|
|||
S_FLAYM2,
|
||||
S_FLAYM3,
|
||||
S_FLAYM4,
|
||||
S_PALMTREE2,
|
||||
S_PURPLEFLOWER1,
|
||||
S_PURPLEFLOWER2,
|
||||
S_YELLOWFLOWER1,
|
||||
S_YELLOWFLOWER2,
|
||||
S_PLANT2,
|
||||
S_PLANT3,
|
||||
S_PLANT4,
|
||||
|
||||
// Chaotix Big Ring
|
||||
S_BIGRING01,
|
||||
|
|
@ -4607,6 +4616,15 @@ typedef enum mobj_type
|
|||
|
||||
MT_FLAYM,
|
||||
|
||||
MT_PALMTREE2,
|
||||
MT_PURPLEFLOWER1,
|
||||
MT_PURPLEFLOWER2,
|
||||
MT_YELLOWFLOWER1,
|
||||
MT_YELLOWFLOWER2,
|
||||
MT_PLANT2,
|
||||
MT_PLANT3,
|
||||
MT_PLANT4,
|
||||
|
||||
MT_BIGRING,
|
||||
|
||||
MT_ARKARROW, // Ark Arrows
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue