mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-12-11 18:42:46 +00:00
SOC_XMAS (untested). Well, mostly. At least, all elements with sprites provided - there are two bushes that, weirdly enough, do not have their graphics provided in gfx.kart but ARE soc'd, and I feel like there's no point hardcoding that stuff..?
Also, I'm being cheeky and doing this in the middle of a lecture. :shitsfree:
This commit is contained in:
parent
c98d00a8f6
commit
5a11bdc580
3 changed files with 136 additions and 2 deletions
|
|
@ -5268,6 +5268,10 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
|
||||||
"S_XMASPOLE",
|
"S_XMASPOLE",
|
||||||
"S_CANDYCANE",
|
"S_CANDYCANE",
|
||||||
"S_SNOWMAN",
|
"S_SNOWMAN",
|
||||||
|
"S_SNOWMANHAT",
|
||||||
|
"S_LAMPPOST1",
|
||||||
|
"S_LAMPPOST2",
|
||||||
|
"S_HANGSTAR",
|
||||||
|
|
||||||
// Botanic Serenity's loads of scenery states
|
// Botanic Serenity's loads of scenery states
|
||||||
"S_BSZTALLFLOWER_RED",
|
"S_BSZTALLFLOWER_RED",
|
||||||
|
|
@ -7085,6 +7089,10 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
|
||||||
"MT_XMASPOLE",
|
"MT_XMASPOLE",
|
||||||
"MT_CANDYCANE",
|
"MT_CANDYCANE",
|
||||||
"MT_SNOWMAN",
|
"MT_SNOWMAN",
|
||||||
|
"MT_SNOWMANHAT",
|
||||||
|
"MT_LAMPPOST1",
|
||||||
|
"MT_LAMPPOST2",
|
||||||
|
"MT_HANGSTAR",
|
||||||
|
|
||||||
// Botanic Serenity
|
// Botanic Serenity
|
||||||
"MT_BSZTALLFLOWER_RED",
|
"MT_BSZTALLFLOWER_RED",
|
||||||
|
|
|
||||||
118
src/info.c
118
src/info.c
|
|
@ -62,7 +62,9 @@ char sprnames[NUMSPRITES + 1][5] =
|
||||||
"SACO","CRAB","SHAD","BRNG","BUMP","FLEN","CLAS","PSHW","ISTA","ISTB",
|
"SACO","CRAB","SHAD","BRNG","BUMP","FLEN","CLAS","PSHW","ISTA","ISTB",
|
||||||
"ARRO","ITEM","ITMO","ITMI","ITMN","WANT","PBOM","RETI","AIDU","KSPK",
|
"ARRO","ITEM","ITMO","ITMI","ITMN","WANT","PBOM","RETI","AIDU","KSPK",
|
||||||
"LZI1","LZI2","KLIT","PALM","SHRB","TWEE","BALN","MARB","FUFO","RUST",
|
"LZI1","LZI2","KLIT","PALM","SHRB","TWEE","BALN","MARB","FUFO","RUST",
|
||||||
"BLON","VIEW"
|
"BLON",
|
||||||
|
"XMS4","XMS5",
|
||||||
|
"VIEW"
|
||||||
};
|
};
|
||||||
|
|
||||||
// Doesn't work with g++, needs actionf_p1 (don't modify this comment)
|
// Doesn't work with g++, needs actionf_p1 (don't modify this comment)
|
||||||
|
|
@ -1535,6 +1537,10 @@ state_t states[NUMSTATES] =
|
||||||
{SPR_XMS1, 0, -1, {NULL}, 0, 0, S_NULL}, // S_XMASPOLE
|
{SPR_XMS1, 0, -1, {NULL}, 0, 0, S_NULL}, // S_XMASPOLE
|
||||||
{SPR_XMS2, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CANDYCANE
|
{SPR_XMS2, 0, -1, {NULL}, 0, 0, S_NULL}, // S_CANDYCANE
|
||||||
{SPR_XMS3, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SNOWMAN
|
{SPR_XMS3, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SNOWMAN
|
||||||
|
{SPR_XMS3, 1, -1, {NULL}, 0, 0, S_NULL}, // S_SNOWMANHAT
|
||||||
|
{SPR_XMS4, 0, -1, {NULL}, 0, 0, S_NULL}, // S_LAMPPOST1
|
||||||
|
{SPR_XMS4, 1, -1, {NULL}, 0, 0, S_NULL}, // S_LAMPPOST2
|
||||||
|
{SPR_XMS5, 0, -1, {NULL}, 0, 0, S_NULL}, // S_HANGSTAR
|
||||||
|
|
||||||
// Loads of Botanic Serenity bullshit
|
// Loads of Botanic Serenity bullshit
|
||||||
{SPR_BSZ1, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BSZTALLFLOWER_RED
|
{SPR_BSZ1, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BSZTALLFLOWER_RED
|
||||||
|
|
@ -9086,7 +9092,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
sfx_None, // deathsound
|
sfx_None, // deathsound
|
||||||
25*FRACUNIT, // speed
|
25*FRACUNIT, // speed
|
||||||
16*FRACUNIT, // radius
|
16*FRACUNIT, // radius
|
||||||
40*FRACUNIT, // height
|
64*FRACUNIT, // height
|
||||||
0, // display offset
|
0, // display offset
|
||||||
100, // mass
|
100, // mass
|
||||||
1, // damage
|
1, // damage
|
||||||
|
|
@ -9095,6 +9101,114 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
S_NULL // raisestate
|
S_NULL // raisestate
|
||||||
},
|
},
|
||||||
|
|
||||||
|
{ // MT_SNOWMANHAT
|
||||||
|
1853, // doomednum
|
||||||
|
S_SNOWMANHAT, // 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
|
||||||
|
25*FRACUNIT, // speed
|
||||||
|
16*FRACUNIT, // radius
|
||||||
|
80*FRACUNIT, // height
|
||||||
|
0, // display offset
|
||||||
|
100, // mass
|
||||||
|
1, // damage
|
||||||
|
sfx_None, // activesound
|
||||||
|
MF_SLIDEME|MF_SOLID|MF_PUSHABLE, // flags
|
||||||
|
S_NULL // raisestate
|
||||||
|
},
|
||||||
|
|
||||||
|
{ // MT_LAMPPOST1
|
||||||
|
1854, // doomednum
|
||||||
|
S_LAMPPOST1, // 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
|
||||||
|
8*FRACUNIT, // radius
|
||||||
|
120*FRACUNIT, // height
|
||||||
|
0, // display offset
|
||||||
|
100, // mass
|
||||||
|
1, // damage
|
||||||
|
sfx_None, // activesound
|
||||||
|
MF_SOLID|MF_SCENERY, // flags
|
||||||
|
S_NULL // raisestate
|
||||||
|
},
|
||||||
|
|
||||||
|
{ // MT_LAMPPOST2
|
||||||
|
1855, // doomednum
|
||||||
|
S_LAMPPOST2, // 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
|
||||||
|
8*FRACUNIT, // radius
|
||||||
|
120*FRACUNIT, // height
|
||||||
|
0, // display offset
|
||||||
|
100, // mass
|
||||||
|
1, // damage
|
||||||
|
sfx_None, // activesound
|
||||||
|
MF_SOLID|MF_SCENERY, // flags
|
||||||
|
S_NULL // raisestate
|
||||||
|
},
|
||||||
|
|
||||||
|
{ // MT_HANGSTAR
|
||||||
|
1856, // doomednum
|
||||||
|
S_HANGSTAR, // 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
|
||||||
|
FRACUNIT, // radius
|
||||||
|
80*FRACUNIT, // height
|
||||||
|
0, // display offset
|
||||||
|
100, // mass
|
||||||
|
1, // damage
|
||||||
|
sfx_None, // activesound
|
||||||
|
MF_NOBLOCKMAP|MF_NOCLIP|MF_SPAWNCEILING|MF_NOGRAVITY|MF_SCENERY, // flags
|
||||||
|
S_NULL // raisestate
|
||||||
|
},
|
||||||
|
|
||||||
// No, I did not do all of this by hand.
|
// No, I did not do all of this by hand.
|
||||||
// I made a script to make all of these for me.
|
// I made a script to make all of these for me.
|
||||||
// Ha HA. ~Inuyasha
|
// Ha HA. ~Inuyasha
|
||||||
|
|
|
||||||
12
src/info.h
12
src/info.h
|
|
@ -668,6 +668,10 @@ typedef enum sprite
|
||||||
|
|
||||||
SPR_BLON, // D2 Balloon Panic
|
SPR_BLON, // D2 Balloon Panic
|
||||||
|
|
||||||
|
// Xmas-specific sprites that don't fit aboxe
|
||||||
|
SPR_XMS4,
|
||||||
|
SPR_XMS5,
|
||||||
|
|
||||||
SPR_VIEW, // First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw!
|
SPR_VIEW, // First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw!
|
||||||
|
|
||||||
SPR_FIRSTFREESLOT,
|
SPR_FIRSTFREESLOT,
|
||||||
|
|
@ -2125,6 +2129,10 @@ typedef enum state
|
||||||
S_XMASPOLE,
|
S_XMASPOLE,
|
||||||
S_CANDYCANE,
|
S_CANDYCANE,
|
||||||
S_SNOWMAN,
|
S_SNOWMAN,
|
||||||
|
S_SNOWMANHAT,
|
||||||
|
S_LAMPPOST1,
|
||||||
|
S_LAMPPOST2,
|
||||||
|
S_HANGSTAR,
|
||||||
|
|
||||||
// Botanic Serenity's loads of scenery states
|
// Botanic Serenity's loads of scenery states
|
||||||
S_BSZTALLFLOWER_RED,
|
S_BSZTALLFLOWER_RED,
|
||||||
|
|
@ -3959,6 +3967,10 @@ typedef enum mobj_type
|
||||||
MT_XMASPOLE,
|
MT_XMASPOLE,
|
||||||
MT_CANDYCANE,
|
MT_CANDYCANE,
|
||||||
MT_SNOWMAN,
|
MT_SNOWMAN,
|
||||||
|
MT_SNOWMANHAT,
|
||||||
|
MT_LAMPPOST1,
|
||||||
|
MT_LAMPPOST2,
|
||||||
|
MT_HANGSTAR,
|
||||||
|
|
||||||
// Botanic Serenity scenery
|
// Botanic Serenity scenery
|
||||||
MT_BSZTALLFLOWER_RED,
|
MT_BSZTALLFLOWER_RED,
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue