Changes to bubbles for new DSZ + bubble sprites (needs new patch.dta).
This commit is contained in:
parent
da1db42b14
commit
50a44d96b1
|
@ -4753,6 +4753,8 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
|
||||||
// Bubble Source
|
// Bubble Source
|
||||||
"S_BUBBLES1",
|
"S_BUBBLES1",
|
||||||
"S_BUBBLES2",
|
"S_BUBBLES2",
|
||||||
|
"S_BUBBLES3",
|
||||||
|
"S_BUBBLES4",
|
||||||
|
|
||||||
// Level End Sign
|
// Level End Sign
|
||||||
"S_SIGN1",
|
"S_SIGN1",
|
||||||
|
@ -5608,10 +5610,9 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
|
||||||
|
|
||||||
// Bubbles
|
// Bubbles
|
||||||
"S_SMALLBUBBLE",
|
"S_SMALLBUBBLE",
|
||||||
"S_SMALLBUBBLE1",
|
|
||||||
"S_MEDIUMBUBBLE",
|
"S_MEDIUMBUBBLE",
|
||||||
"S_MEDIUMBUBBLE1",
|
"S_LARGEBUBBLE1",
|
||||||
"S_LARGEBUBBLE",
|
"S_LARGEBUBBLE2",
|
||||||
"S_EXTRALARGEBUBBLE", // breathable
|
"S_EXTRALARGEBUBBLE", // breathable
|
||||||
|
|
||||||
"S_POP1", // Extra Large bubble goes POP!
|
"S_POP1", // Extra Large bubble goes POP!
|
||||||
|
|
|
@ -237,7 +237,7 @@ light_t *t_lspr[NUMSPRITES] =
|
||||||
|
|
||||||
// Interactive Objects
|
// Interactive Objects
|
||||||
&lspr[NOLIGHT], // SPR_FANS
|
&lspr[NOLIGHT], // SPR_FANS
|
||||||
&lspr[NOLIGHT], // SPR_BUBL
|
&lspr[NOLIGHT], // SPR_BBLS
|
||||||
&lspr[NOLIGHT], // SPR_SIGN
|
&lspr[NOLIGHT], // SPR_SIGN
|
||||||
&lspr[NOLIGHT], // SPR_STEM
|
&lspr[NOLIGHT], // SPR_STEM
|
||||||
&lspr[NOLIGHT], // SPR_SPIK
|
&lspr[NOLIGHT], // SPR_SPIK
|
||||||
|
@ -382,11 +382,7 @@ light_t *t_lspr[NUMSPRITES] =
|
||||||
&lspr[NOLIGHT], // SPR_SPLH
|
&lspr[NOLIGHT], // SPR_SPLH
|
||||||
&lspr[NOLIGHT], // SPR_SPLA
|
&lspr[NOLIGHT], // SPR_SPLA
|
||||||
&lspr[NOLIGHT], // SPR_SMOK
|
&lspr[NOLIGHT], // SPR_SMOK
|
||||||
&lspr[NOLIGHT], // SPR_BUBP
|
&lspr[NOLIGHT], // SPR_BUBL
|
||||||
&lspr[NOLIGHT], // SPR_BUBO
|
|
||||||
&lspr[NOLIGHT], // SPR_BUBN
|
|
||||||
&lspr[NOLIGHT], // SPR_BUBM
|
|
||||||
&lspr[NOLIGHT], // SPR_POPP
|
|
||||||
&lspr[SUPERSPARK_L], // SPR_WZAP
|
&lspr[SUPERSPARK_L], // SPR_WZAP
|
||||||
&lspr[SUPERSPARK_L], // SPR_TFOG
|
&lspr[SUPERSPARK_L], // SPR_TFOG
|
||||||
&lspr[NIGHTSLIGHT_L], // SPR_SEED // Sonic CD flower seed
|
&lspr[NIGHTSLIGHT_L], // SPR_SEED // Sonic CD flower seed
|
||||||
|
|
47
src/info.c
47
src/info.c
|
@ -33,7 +33,7 @@ char sprnames[NUMSPRITES + 1][5] =
|
||||||
"BBUZ","JETF","EGGM","EGGN","TNKA","TNKB","SPNK","GOOP","EGGO","PRPL",
|
"BBUZ","JETF","EGGM","EGGN","TNKA","TNKB","SPNK","GOOP","EGGO","PRPL",
|
||||||
"FAKE","EGGP","EFIR","EGGQ","EGGR","BRAK","BGOO","BMSL","EGGT","RCKT",
|
"FAKE","EGGP","EFIR","EGGQ","EGGR","BRAK","BGOO","BMSL","EGGT","RCKT",
|
||||||
"ELEC","TARG","NPLM","MNPL","METL","MSCF","MSCB","RING","TRNG","EMMY",
|
"ELEC","TARG","NPLM","MNPL","METL","MSCF","MSCB","RING","TRNG","EMMY",
|
||||||
"TOKE","RFLG","BFLG","NWNG","EMBM","CEMG","EMER","FANS","BUBL","SIGN",
|
"TOKE","RFLG","BFLG","NWNG","EMBM","CEMG","EMER","FANS","BBLS","SIGN",
|
||||||
"STEM","SPIK","SFLM","USPK","STPT","BMNE","SRBX","RRBX","BRBX","SHTV",
|
"STEM","SPIK","SFLM","USPK","STPT","BMNE","SRBX","RRBX","BRBX","SHTV",
|
||||||
"PINV","YLTV","BLTV","BKTV","WHTV","GRTV","ELTV","EGGB","MIXU","RECY",
|
"PINV","YLTV","BLTV","BKTV","WHTV","GRTV","ELTV","EGGB","MIXU","RECY",
|
||||||
"QUES","GBTV","PRUP","PTTV","MTEX","MISL","TORP","ENRG","MINE","JBUL",
|
"QUES","GBTV","PRUP","PTTV","MTEX","MISL","TORP","ENRG","MINE","JBUL",
|
||||||
|
@ -44,16 +44,16 @@ char sprnames[NUMSPRITES + 1][5] =
|
||||||
"BSZ7","BSZ8","STLG","DBAL","RCRY","ARMA","ARMF","ARMB","WIND","MAGN",
|
"BSZ7","BSZ8","STLG","DBAL","RCRY","ARMA","ARMF","ARMB","WIND","MAGN",
|
||||||
"ELEM","FORC","PITY","IVSP","SSPK","GOAL","BIRD","BUNY","MOUS","CHIC",
|
"ELEM","FORC","PITY","IVSP","SSPK","GOAL","BIRD","BUNY","MOUS","CHIC",
|
||||||
"COWZ","RBRD","SPRY","SPRR","SPRB","YSPR","RSPR","SSWY","SSWR","SSWB",
|
"COWZ","RBRD","SPRY","SPRR","SPRB","YSPR","RSPR","SSWY","SSWR","SSWB",
|
||||||
"RAIN","SNO1","SPLH","SPLA","SMOK","BUBP","BUBO","BUBN","BUBM","POPP",
|
"RAIN","SNO1","SPLH","SPLA","SMOK","BUBL","WZAP","TFOG","SEED","PRTL",
|
||||||
"WZAP","TFOG","SEED","PRTL","SCOR","DRWN","TTAG","GFLG","RRNG","RNGB",
|
"SCOR","DRWN","TTAG","GFLG","RRNG","RNGB","RNGR","RNGI","RNGA","RNGE",
|
||||||
"RNGR","RNGI","RNGA","RNGE","RNGS","RNGG","PIKB","PIKR","PIKA","PIKE",
|
"RNGS","RNGG","PIKB","PIKR","PIKA","PIKE","PIKS","PIKG","TAUT","TGRE",
|
||||||
"PIKS","PIKG","TAUT","TGRE","TSCR","COIN","CPRK","GOOM","BGOM","FFWR",
|
"TSCR","COIN","CPRK","GOOM","BGOM","FFWR","FBLL","SHLL","PUMA","HAMM",
|
||||||
"FBLL","SHLL","PUMA","HAMM","KOOP","BFLM","MAXE","MUS1","MUS2","TOAD",
|
"KOOP","BFLM","MAXE","MUS1","MUS2","TOAD","NDRN","NSPK","NBMP","HOOP",
|
||||||
"NDRN","NSPK","NBMP","HOOP","NSCR","NPRU","CAPS","SPRK","BOM1","BOM2",
|
"NSCR","NPRU","CAPS","SPRK","BOM1","BOM2","BOM3","BOM4","ROIA","ROIB",
|
||||||
"BOM3","BOM4","ROIA","ROIB","ROIC","ROID","ROIE","ROIF","ROIG","ROIH",
|
"ROIC","ROID","ROIE","ROIF","ROIG","ROIH","ROII","ROIJ","ROIK","ROIL",
|
||||||
"ROII","ROIJ","ROIK","ROIL","ROIM","ROIN","ROIO","ROIP","BBAL","GWLG",
|
"ROIM","ROIN","ROIO","ROIP","BBAL","GWLG","GWLR","SRBA","SRBB","SRBC",
|
||||||
"GWLR","SRBA","SRBB","SRBC","SRBD","SRBE","SRBF","SRBG","SRBH","SRBI",
|
"SRBD","SRBE","SRBF","SRBG","SRBH","SRBI","SRBJ","SRBK","SRBL","SRBM",
|
||||||
"SRBJ","SRBK","SRBL","SRBM","SRBN","SRBO",
|
"SRBN","SRBO",
|
||||||
};
|
};
|
||||||
|
|
||||||
char spr2names[NUMPLAYERSPRITES][5] =
|
char spr2names[NUMPLAYERSPRITES][5] =
|
||||||
|
@ -1144,8 +1144,10 @@ state_t states[NUMSTATES] =
|
||||||
{SPR_FANS, 4, 1, {A_FanBubbleSpawn}, 512, 0, S_FAN}, // S_FAN5
|
{SPR_FANS, 4, 1, {A_FanBubbleSpawn}, 512, 0, S_FAN}, // S_FAN5
|
||||||
|
|
||||||
// Bubble Source
|
// Bubble Source
|
||||||
{SPR_BUBL, 0, 8, {A_BubbleSpawn}, 2048, 0, S_BUBBLES2}, // S_BUBBLES1
|
{SPR_BBLS, 0, 8, {A_BubbleSpawn}, 2048, 0, S_BUBBLES2}, // S_BUBBLES1
|
||||||
{SPR_BUBL, 1, 8, {A_BubbleCheck}, 0, 0, S_BUBBLES1}, // S_BUBBLES2
|
{SPR_BBLS, 1, 8, {A_BubbleCheck}, 0, 0, S_BUBBLES3}, // S_BUBBLES2
|
||||||
|
{SPR_BBLS, 2, 8, {A_BubbleSpawn}, 2048, 0, S_BUBBLES4}, // S_BUBBLES3
|
||||||
|
{SPR_BBLS, 3, 8, {A_BubbleCheck}, 0, 0, S_BUBBLES1}, // S_BUBBLES4
|
||||||
|
|
||||||
// Level End Sign
|
// Level End Sign
|
||||||
{SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN2}, // S_SIGN1
|
{SPR_SIGN, 0, 1, {NULL}, 0, 0, S_SIGN2}, // S_SIGN1
|
||||||
|
@ -2012,17 +2014,16 @@ state_t states[NUMSTATES] =
|
||||||
{SPR_SMOK, FF_TRANS50|4, 8, {NULL}, 0, 0, S_NULL}, // S_SMOKE5
|
{SPR_SMOK, FF_TRANS50|4, 8, {NULL}, 0, 0, S_NULL}, // S_SMOKE5
|
||||||
|
|
||||||
// Bubbles
|
// Bubbles
|
||||||
{SPR_BUBP, FF_TRANS50, 1, {A_BubbleRise}, 0, 1024, S_SMALLBUBBLE1}, // S_SMALLBUBBLE
|
{SPR_BUBL, FF_TRANS50, 1, {A_BubbleRise}, 0, 1024, S_SMALLBUBBLE}, // S_SMALLBUBBLE
|
||||||
{SPR_BUBP, FF_TRANS50, 1, {A_BubbleRise}, 0, 1024, S_SMALLBUBBLE}, // S_SMALLBUBBLE1
|
{SPR_BUBL, FF_TRANS50|1, 1, {A_BubbleRise}, 0, 1024, S_MEDIUMBUBBLE}, // S_MEDIUMBUBBLE
|
||||||
{SPR_BUBO, FF_TRANS50, 1, {A_BubbleRise}, 0, 1024, S_MEDIUMBUBBLE1}, // S_MEDIUMBUBBLE
|
|
||||||
{SPR_BUBO, FF_TRANS50, 1, {A_BubbleRise}, 0, 1024, S_MEDIUMBUBBLE}, // S_MEDIUMBUBBLE1
|
|
||||||
|
|
||||||
// Extra Large Bubble (breathable)
|
// Extra Large Bubble (breathable)
|
||||||
{SPR_BUBN, FF_TRANS50|FF_FULLBRIGHT, 16, {A_BubbleRise}, 0, 1024, S_EXTRALARGEBUBBLE}, // S_LARGEBUBBLE
|
{SPR_BUBL, FF_TRANS50|FF_FULLBRIGHT|2, 8, {A_BubbleRise}, 0, 1024, S_LARGEBUBBLE2}, // S_LARGEBUBBLE1
|
||||||
{SPR_BUBM, FF_TRANS50|FF_FULLBRIGHT, 16, {A_BubbleRise}, 0, 1024, S_EXTRALARGEBUBBLE}, // S_EXTRALARGEBUBBLE
|
{SPR_BUBL, FF_TRANS50|FF_FULLBRIGHT|3, 8, {A_BubbleRise}, 0, 1024, S_EXTRALARGEBUBBLE}, // S_LARGEBUBBLE2
|
||||||
|
{SPR_BUBL, FF_TRANS50|FF_FULLBRIGHT|4, 16, {A_BubbleRise}, 0, 1024, S_EXTRALARGEBUBBLE}, // S_EXTRALARGEBUBBLE
|
||||||
|
|
||||||
// Extra Large Bubble goes POP!
|
// Extra Large Bubble goes POP!
|
||||||
{SPR_POPP, 0, 16, {NULL}, 0, 0, S_NULL}, // S_POP1
|
{SPR_BUBL, 5, 16, {NULL}, 0, 0, S_NULL}, // S_POP1
|
||||||
|
|
||||||
{SPR_WZAP, FF_TRANS10|FF_ANIMATE|FF_MIDDLESTARTCHANCE, 4, {NULL}, 3, 2, S_NULL}, // S_WATERZAP
|
{SPR_WZAP, FF_TRANS10|FF_ANIMATE|FF_MIDDLESTARTCHANCE, 4, {NULL}, 3, 2, S_NULL}, // S_WATERZAP
|
||||||
|
|
||||||
|
@ -10486,7 +10487,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
|
|
||||||
{ // MT_EXTRALARGEBUBBLE
|
{ // MT_EXTRALARGEBUBBLE
|
||||||
-1, // doomednum
|
-1, // doomednum
|
||||||
S_LARGEBUBBLE, // spawnstate
|
S_LARGEBUBBLE1, // spawnstate
|
||||||
1000, // spawnhealth
|
1000, // spawnhealth
|
||||||
S_NULL, // seestate
|
S_NULL, // seestate
|
||||||
sfx_None, // seesound
|
sfx_None, // seesound
|
||||||
|
@ -10501,8 +10502,8 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
S_NULL, // xdeathstate
|
S_NULL, // xdeathstate
|
||||||
sfx_gasp, // deathsound
|
sfx_gasp, // deathsound
|
||||||
8, // speed
|
8, // speed
|
||||||
8*FRACUNIT, // radius
|
23*FRACUNIT, // radius
|
||||||
12*FRACUNIT, // height
|
43*FRACUNIT, // height
|
||||||
0, // display offset
|
0, // display offset
|
||||||
16, // mass
|
16, // mass
|
||||||
0, // damage
|
0, // damage
|
||||||
|
|
15
src/info.h
15
src/info.h
|
@ -314,7 +314,7 @@ typedef enum sprite
|
||||||
|
|
||||||
// Interactive Objects
|
// Interactive Objects
|
||||||
SPR_FANS,
|
SPR_FANS,
|
||||||
SPR_BUBL, // water bubble source
|
SPR_BBLS, // water bubble source
|
||||||
SPR_SIGN, // Level end sign
|
SPR_SIGN, // Level end sign
|
||||||
SPR_STEM, // Steam riser
|
SPR_STEM, // Steam riser
|
||||||
SPR_SPIK, // Spike Ball
|
SPR_SPIK, // Spike Ball
|
||||||
|
@ -458,11 +458,7 @@ typedef enum sprite
|
||||||
SPR_SPLH, // Water Splish
|
SPR_SPLH, // Water Splish
|
||||||
SPR_SPLA, // Water Splash
|
SPR_SPLA, // Water Splash
|
||||||
SPR_SMOK,
|
SPR_SMOK,
|
||||||
SPR_BUBP, // Small bubble
|
SPR_BUBL, // Bubble
|
||||||
SPR_BUBO, // Medium bubble
|
|
||||||
SPR_BUBN, // Large bubble
|
|
||||||
SPR_BUBM, // Extra Large (would you like fries with that?) bubble
|
|
||||||
SPR_POPP, // Extra Large bubble goes POP!
|
|
||||||
SPR_WZAP,
|
SPR_WZAP,
|
||||||
SPR_TFOG, // Teleport Fog
|
SPR_TFOG, // Teleport Fog
|
||||||
SPR_SEED, // Sonic CD flower seed
|
SPR_SEED, // Sonic CD flower seed
|
||||||
|
@ -1660,6 +1656,8 @@ typedef enum state
|
||||||
// Bubble Source
|
// Bubble Source
|
||||||
S_BUBBLES1,
|
S_BUBBLES1,
|
||||||
S_BUBBLES2,
|
S_BUBBLES2,
|
||||||
|
S_BUBBLES3,
|
||||||
|
S_BUBBLES4,
|
||||||
|
|
||||||
// Level End Sign
|
// Level End Sign
|
||||||
S_SIGN1,
|
S_SIGN1,
|
||||||
|
@ -2515,10 +2513,9 @@ typedef enum state
|
||||||
|
|
||||||
// Bubbles
|
// Bubbles
|
||||||
S_SMALLBUBBLE,
|
S_SMALLBUBBLE,
|
||||||
S_SMALLBUBBLE1,
|
|
||||||
S_MEDIUMBUBBLE,
|
S_MEDIUMBUBBLE,
|
||||||
S_MEDIUMBUBBLE1,
|
S_LARGEBUBBLE1,
|
||||||
S_LARGEBUBBLE,
|
S_LARGEBUBBLE2,
|
||||||
S_EXTRALARGEBUBBLE, // breathable
|
S_EXTRALARGEBUBBLE, // breathable
|
||||||
|
|
||||||
S_POP1, // Extra Large bubble goes POP!
|
S_POP1, // Extra Large bubble goes POP!
|
||||||
|
|
Loading…
Reference in a new issue