vivlim/Kart-Public
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Chaotix big ring replacement

Browse source 
(Sev *actually* did this, not Sal! She's very proud :p)
This commit is contained in:
SeventhSentinel 2018-06-28 19:07:12 -04:00
parent a50a67b273
commit 94cb3821f6
4 changed files with 53 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/dehacked.c
View file

@ -6505,12 +6505,19 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
// D00Dkart - Diddy Kong Racing Balloon // D00Dkart - Diddy Kong Racing Balloon
"S_DOOD_BALLOON", "S_DOOD_BALLOON",
// D00Dkart - Big Ring // Chaotix Big Ring
"S_DOOD_RING1", "S_BIGRING01",
"S_DOOD_RING2", "S_BIGRING02",
"S_DOOD_RING3", "S_BIGRING03",
"S_DOOD_RING4", "S_BIGRING04",
"S_DOOD_RING5", "S_BIGRING05",
"S_BIGRING06",
"S_BIGRING07",
"S_BIGRING08",
"S_BIGRING09",
"S_BIGRING10",
"S_BIGRING11",
"S_BIGRING12",
// SNES Objects // SNES Objects
"S_SNES_DONUTBUSH1", "S_SNES_DONUTBUSH1",
@ -7186,7 +7193,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_DOOD_FLOWER4", "MT_DOOD_FLOWER4",
"MT_DOOD_BOX", "MT_DOOD_BOX",
"MT_DOOD_BALLOON", "MT_DOOD_BALLOON",
"MT_DOOD_RING", "MT_BIGRING",
"MT_SNES_DONUTBUSH1", "MT_SNES_DONUTBUSH1",
"MT_SNES_DONUTBUSH2", "MT_SNES_DONUTBUSH2",

32
src/info.c
View file

@ -58,8 +58,8 @@ char sprnames[NUMSPRITES + 1][5] =
"SPRG","BSPR","RNDM","RPOP","KFRE","KINV","KINF","DRIF","DUST","FITM", "SPRG","BSPR","RNDM","RPOP","KFRE","KINV","KINF","DRIF","DUST","FITM",
"BANA","GSHE","JAWZ","SSMN","KRBM","BHOG","BLIG","LIGH","SINK","SITR", "BANA","GSHE","JAWZ","SSMN","KRBM","BHOG","BLIG","LIGH","SINK","SITR",
"KBLN","DEZL","POKE","AUDI","DECO","DOOD","SNES","GBAS","SPRS","BUZB", "KBLN","DEZL","POKE","AUDI","DECO","DOOD","SNES","GBAS","SPRS","BUZB",
"CHOM","SACO","CRAB","SHAD","BUMP","FLEN","CLAS","PSHW","ARRO","ITEM", "CHOM","SACO","CRAB","SHAD","BRNG","BUMP","FLEN","CLAS","PSHW","ARRO",
"ITMI","ITMN","PBOM","VIEW" "ITEM","ITMI","ITMN","PBOM","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)
@ -2835,11 +2835,19 @@ state_t states[NUMSTATES] =
{SPR_DOOD, 11, -1, {NULL}, 0, 0, S_NULL}, // S_DOOD_BALLOON {SPR_DOOD, 11, -1, {NULL}, 0, 0, S_NULL}, // S_DOOD_BALLOON
{SPR_DOOD, 12, 4, {NULL}, 0, 0, S_DOOD_RING2}, // S_DOOD_RING1 {SPR_BRNG, 0, 2, {NULL}, 0, 0, S_BIGRING02}, // S_BIGRING01
{SPR_DOOD, 13, 4, {NULL}, 0, 0, S_DOOD_RING3}, // S_DOOD_RING2 {SPR_BRNG, 1, 2, {NULL}, 0, 0, S_BIGRING03}, // S_BIGRING02
{SPR_DOOD, 14, 4, {NULL}, 0, 0, S_DOOD_RING4}, // S_DOOD_RING3 {SPR_BRNG, 2, 2, {NULL}, 0, 0, S_BIGRING04}, // S_BIGRING03
{SPR_DOOD, 15, 4, {NULL}, 0, 0, S_DOOD_RING5}, // S_DOOD_RING4 {SPR_BRNG, 3, 2, {NULL}, 0, 0, S_BIGRING05}, // S_BIGRING04
{SPR_DOOD, 16, 4, {NULL}, 0, 0, S_DOOD_RING1}, // S_DOOD_RING5 {SPR_BRNG, 4, 2, {NULL}, 0, 0, S_BIGRING06}, // S_BIGRING05
{SPR_BRNG, 5, 2, {NULL}, 0, 0, S_BIGRING07}, // S_BIGRING06
{SPR_BRNG, 6, 2, {NULL}, 0, 0, S_BIGRING08}, // S_BIGRING05
{SPR_BRNG, 7, 2, {NULL}, 0, 0, S_BIGRING09}, // S_BIGRING05
{SPR_BRNG, 8, 2, {NULL}, 0, 0, S_BIGRING10}, // S_BIGRING05
{SPR_BRNG, 9, 2, {NULL}, 0, 0, S_BIGRING11}, // S_BIGRING10
{SPR_BRNG, 10, 2, {NULL}, 0, 0, S_BIGRING12}, // S_BIGRING11
{SPR_BRNG, 11, 2, {NULL}, 0, 0, S_BIGRING01}, // S_BIGRING12
{SPR_SNES, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SNES_DONUTBUSH1 {SPR_SNES, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SNES_DONUTBUSH1
{SPR_SNES, 1, -1, {NULL}, 0, 0, S_NULL}, // S_SNES_DONUTBUSH2 {SPR_SNES, 1, -1, {NULL}, 0, 0, S_NULL}, // S_SNES_DONUTBUSH2
@ -15877,9 +15885,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate S_NULL // raisestate
}, },
{ // MT_DOOD_RING { // MT_BIGRING
2808, // doomednum 2808, // doomednum
S_DOOD_RING1, // spawnstate S_BIGRING01, // spawnstate
1000, // spawnhealth 1000, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
sfx_None, // seesound sfx_None, // seesound
@ -15894,13 +15902,13 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_None, // deathsound sfx_None, // deathsound
0, // speed 0, // speed
1048576, // radius 26*FRACUNIT, // radius
2097152, // height 62*FRACUNIT, // height
0, // display offset 0, // display offset
100, // mass 100, // mass
0, // damage 0, // damage
sfx_None, // activesound sfx_None, // activesound
33554944, // flags MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY|MF_RUNSPAWNFUNC, // flags
S_NULL // raisestate S_NULL // raisestate
}, },

22
src/info.h
View file

@ -616,6 +616,7 @@ typedef enum sprite
SPR_SACO, // Sapphire Coast Fauna SPR_SACO, // Sapphire Coast Fauna
SPR_CRAB, // Crystal Abyss mobs SPR_CRAB, // Crystal Abyss mobs
SPR_SHAD, // TD shadows SPR_SHAD, // TD shadows
SPR_BRNG, // Chaotix Big Ring
SPR_BUMP, // Player/shell bump SPR_BUMP, // Player/shell bump
SPR_FLEN, // Shell hit graphics stuff SPR_FLEN, // Shell hit graphics stuff
@ -3360,12 +3361,19 @@ typedef enum state
// D00Dkart - Diddy Kong Racing Balloon // D00Dkart - Diddy Kong Racing Balloon
S_DOOD_BALLOON, S_DOOD_BALLOON,
// D00Dkart - Big Ring // Chaotix Big Ring
S_DOOD_RING1, S_BIGRING01,
S_DOOD_RING2, S_BIGRING02,
S_DOOD_RING3, S_BIGRING03,
S_DOOD_RING4, S_BIGRING04,
S_DOOD_RING5, S_BIGRING05,
S_BIGRING06,
S_BIGRING07,
S_BIGRING08,
S_BIGRING09,
S_BIGRING10,
S_BIGRING11,
S_BIGRING12,
// SNES Objects // SNES Objects
S_SNES_DONUTBUSH1, S_SNES_DONUTBUSH1,
@ -4057,7 +4065,7 @@ typedef enum mobj_type
MT_DOOD_FLOWER4, MT_DOOD_FLOWER4,
MT_DOOD_BOX, MT_DOOD_BOX,
MT_DOOD_BALLOON, MT_DOOD_BALLOON,
MT_DOOD_RING, MT_BIGRING,
MT_SNES_DONUTBUSH1, MT_SNES_DONUTBUSH1,
MT_SNES_DONUTBUSH2, MT_SNES_DONUTBUSH2,

4
src/p_mobj.c
View file

@ -8964,6 +8964,10 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
} }
} }
break; break;
case MT_BIGRING:
mobj->destscale = 3*FRACUNIT;
P_SetScale(mobj, 3*FRACUNIT);
break;
default: default:
break; break;
} }