mirror of
https://git.do.srb2.org/STJr/SRB2.git
synced 2024-11-25 13:51:43 +00:00
All SRB1 objects, states, and sprites removed.
This commit is contained in:
Inuyasha
parent
b61959051e
commit
1ee01063e3
5 changed files with 4 additions and 697 deletions
|
|
@ -6056,70 +6056,6 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
|
|||
"S_ROCKCRUMBLEO",
|
||||
"S_ROCKCRUMBLEP",
|
||||
|
||||
"S_SRB1_CRAWLA1",
|
||||
"S_SRB1_CRAWLA2",
|
||||
"S_SRB1_CRAWLA3",
|
||||
"S_SRB1_CRAWLA4",
|
||||
|
||||
"S_SRB1_BAT1",
|
||||
"S_SRB1_BAT2",
|
||||
"S_SRB1_BAT3",
|
||||
"S_SRB1_BAT4",
|
||||
|
||||
"S_SRB1_ROBOFISH1",
|
||||
"S_SRB1_ROBOFISH2",
|
||||
"S_SRB1_ROBOFISH3",
|
||||
|
||||
"S_SRB1_VOLCANOGUY1",
|
||||
"S_SRB1_VOLCANOGUY2",
|
||||
|
||||
"S_SRB1_HOPPY1",
|
||||
"S_SRB1_HOPPY2",
|
||||
|
||||
"S_SRB1_HOPPYWATER1",
|
||||
"S_SRB1_HOPPYWATER2",
|
||||
|
||||
"S_SRB1_HOPPYSKYLAB1",
|
||||
|
||||
"S_SRB1_MMZFLYING1",
|
||||
"S_SRB1_MMZFLYING2",
|
||||
"S_SRB1_MMZFLYING3",
|
||||
"S_SRB1_MMZFLYING4",
|
||||
"S_SRB1_MMZFLYING5",
|
||||
|
||||
"S_SRB1_UFO1",
|
||||
"S_SRB1_UFO2",
|
||||
|
||||
"S_SRB1_GRAYBOT1",
|
||||
"S_SRB1_GRAYBOT2",
|
||||
"S_SRB1_GRAYBOT3",
|
||||
"S_SRB1_GRAYBOT4",
|
||||
"S_SRB1_GRAYBOT5",
|
||||
"S_SRB1_GRAYBOT6",
|
||||
|
||||
"S_SRB1_ROBOTOPOLIS1",
|
||||
"S_SRB1_ROBOTOPOLIS2",
|
||||
|
||||
"S_SRB1_RBZBUZZ1",
|
||||
"S_SRB1_RBZBUZZ2",
|
||||
|
||||
"S_SRB1_RBZSPIKES1",
|
||||
"S_SRB1_RBZSPIKES2",
|
||||
|
||||
"S_SRB1_METALSONIC1",
|
||||
"S_SRB1_METALSONIC2",
|
||||
"S_SRB1_METALSONIC3",
|
||||
|
||||
"S_SRB1_GOLDBOT1",
|
||||
"S_SRB1_GOLDBOT2",
|
||||
"S_SRB1_GOLDBOT3",
|
||||
"S_SRB1_GOLDBOT4",
|
||||
"S_SRB1_GOLDBOT5",
|
||||
"S_SRB1_GOLDBOT6",
|
||||
|
||||
"S_SRB1_GENREX1",
|
||||
"S_SRB1_GENREX2",
|
||||
|
||||
#ifdef SEENAMES
|
||||
"S_NAMECHECK",
|
||||
#endif
|
||||
|
|
@ -6613,22 +6549,6 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
|
|||
"MT_ROCKCRUMBLE15",
|
||||
"MT_ROCKCRUMBLE16",
|
||||
|
||||
"MT_SRB1_CRAWLA",
|
||||
"MT_SRB1_BAT",
|
||||
"MT_SRB1_ROBOFISH",
|
||||
"MT_SRB1_VOLCANOGUY",
|
||||
"MT_SRB1_HOPPY",
|
||||
"MT_SRB1_HOPPYWATER",
|
||||
"MT_SRB1_HOPPYSKYLAB",
|
||||
"MT_SRB1_MMZFLYING",
|
||||
"MT_SRB1_UFO",
|
||||
"MT_SRB1_GRAYBOT",
|
||||
"MT_SRB1_ROBOTOPOLIS",
|
||||
"MT_SRB1_RBZBUZZ",
|
||||
"MT_SRB1_RBZSPIKES",
|
||||
"MT_SRB1_METALSONIC",
|
||||
"MT_SRB1_GOLDBOT",
|
||||
"MT_SRB1_GENREX",
|
||||
#ifdef SEENAMES
|
||||
"MT_NAMECHECK",
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -480,23 +480,6 @@ light_t *t_lspr[NUMSPRITES] =
|
|||
&lspr[NOLIGHT], // SPR_GWLG
|
||||
&lspr[NOLIGHT], // SPR_GWLR
|
||||
|
||||
// SRB1 Sprites
|
||||
&lspr[NOLIGHT], // SPR_SRBA
|
||||
&lspr[NOLIGHT], // SPR_SRBB
|
||||
&lspr[NOLIGHT], // SPR_SRBC
|
||||
&lspr[NOLIGHT], // SPR_SRBD
|
||||
&lspr[NOLIGHT], // SPR_SRBE
|
||||
&lspr[NOLIGHT], // SPR_SRBF
|
||||
&lspr[NOLIGHT], // SPR_SRBG
|
||||
&lspr[NOLIGHT], // SPR_SRBH
|
||||
&lspr[NOLIGHT], // SPR_SRBI
|
||||
&lspr[NOLIGHT], // SPR_SRBJ
|
||||
&lspr[NOLIGHT], // SPR_SRBK
|
||||
&lspr[NOLIGHT], // SPR_SRBL
|
||||
&lspr[NOLIGHT], // SPR_SRBM
|
||||
&lspr[NOLIGHT], // SPR_SRBN
|
||||
&lspr[NOLIGHT], // SPR_SRBO
|
||||
|
||||
// Free slots
|
||||
&lspr[NOLIGHT],
|
||||
&lspr[NOLIGHT],
|
||||
|
|
|
|||
498
src/info.c
498
src/info.c
|
|
@ -52,8 +52,7 @@ char sprnames[NUMSPRITES + 1][5] =
|
|||
"NSPK","NBMP","HOOP","NSCR","NPRU","CAPS","SUPT","SPRK","BOM1","BOM2",
|
||||
"BOM3","BOM4","ROIA","ROIB","ROIC","ROID","ROIE","ROIF","ROIG","ROIH",
|
||||
"ROII","ROIJ","ROIK","ROIL","ROIM","ROIN","ROIO","ROIP","BBAL","GWLG",
|
||||
"GWLR","SRBA","SRBB","SRBC","SRBD","SRBE","SRBF","SRBG","SRBH","SRBI",
|
||||
"SRBJ","SRBK","SRBL","SRBM","SRBN","SRBO",
|
||||
"GWLR",
|
||||
};
|
||||
|
||||
char spr2names[NUMPLAYERSPRITES][5] =
|
||||
|
|
@ -2462,69 +2461,6 @@ state_t states[NUMSTATES] =
|
|||
{SPR_ROIO, FF_ANIMATE, -1, {NULL}, 4, 2, S_ROCKCRUMBLEO}, // S_ROCKCRUMBLEO
|
||||
{SPR_ROIP, FF_ANIMATE, -1, {NULL}, 4, 2, S_ROCKCRUMBLEP}, // S_ROCKCRUMBLEP
|
||||
|
||||
{SPR_SRBA, 0, 5, {A_Look}, 0, 0, S_SRB1_CRAWLA1}, // S_SRB1_CRAWLA1
|
||||
{SPR_SRBA, 0, 3, {A_Chase}, 0, 0, S_SRB1_CRAWLA3}, // S_SRB1_CRAWLA2
|
||||
{SPR_SRBA, 1, 3, {A_Chase}, 0, 0, S_SRB1_CRAWLA4}, // S_SRB1_CRAWLA3
|
||||
{SPR_SRBA, 2, 3, {A_Chase}, 0, 0, S_SRB1_CRAWLA2}, // S_SRB1_CRAWLA4
|
||||
|
||||
{SPR_SRBB, 0, 2, {A_Look}, 0, 0, S_SRB1_BAT2}, // S_SRB1_BAT1
|
||||
{SPR_SRBB, 1, 2, {A_Look}, 0, 0, S_SRB1_BAT1}, // S_SRB1_BAT2
|
||||
{SPR_SRBB, 0, 2, {A_BuzzFly}, 0, 0, S_SRB1_BAT4}, // S_SRB1_BAT3
|
||||
{SPR_SRBB, 1, 2, {A_BuzzFly}, 0, 0, S_SRB1_BAT3}, // S_SRB1_BAT4
|
||||
|
||||
{SPR_SRBC, 0, 2, {A_Look}, 0, 0, S_SRB1_ROBOFISH1}, // S_SRB1_ROBOFISH1
|
||||
{SPR_SRBC, 1, 2, {A_BuzzFly}, 0, 0, S_SRB1_ROBOFISH3}, // S_SRB1_ROBOFISH2
|
||||
{SPR_SRBC, 0, 2, {A_BuzzFly}, 0, 0, S_SRB1_ROBOFISH2}, // S_SRB1_ROBOFISH3
|
||||
|
||||
{SPR_SRBD, 0, 2, {A_Look}, 0, 0, S_SRB1_VOLCANOGUY1}, // S_SRB1_VOLCANOGUY1
|
||||
{SPR_SRBD, 0, 2, {A_BuzzFly}, 0, 0, S_SRB1_VOLCANOGUY2}, // S_SRB1_VOLCANOGUY2
|
||||
|
||||
{SPR_SRBE, 0, 2, {A_BunnyHop}, 7, 2, S_SRB1_HOPPY2}, // S_SRB1_HOPPY1
|
||||
{SPR_SRBE, 1, 2, {A_BunnyHop}, 7, -2, S_SRB1_HOPPY1}, // S_SRB1_HOPPY2
|
||||
|
||||
{SPR_SRBE, 0, 2, {A_BunnyHop}, 4, 2, S_SRB1_HOPPYWATER2}, // S_SRB1_HOPPYWATER1
|
||||
{SPR_SRBE, 1, 2, {A_BunnyHop}, 4, -2, S_SRB1_HOPPYWATER1}, // S_SRB1_HOPPYWATER2
|
||||
|
||||
{SPR_SRBF, 0, 2, {A_BunnyHop}, 7, 0, S_SRB1_HOPPYSKYLAB1}, // S_SRB1_HOPPYSKYLAB1
|
||||
|
||||
{SPR_SRBG, 0, 16, {A_MoveAbsolute}, 0, 5, S_SRB1_MMZFLYING2}, // S_SRB1_MMZFLYING1
|
||||
{SPR_SRBG, 0, 16, {A_MoveAbsolute}, 180, 5, S_SRB1_MMZFLYING3}, // S_SRB1_MMZFLYING2
|
||||
{SPR_SRBG, 0, 1, {A_MoveAbsolute}, 0, 5, S_SRB1_MMZFLYING4}, // S_SRB1_MMZFLYING3
|
||||
{SPR_SRBG, 0, 7, {A_MoveAbsolute}, 0, 5, S_SRB1_MMZFLYING5}, // S_SRB1_MMZFLYING4
|
||||
{SPR_SRBG, 0, 8, {A_MoveAbsolute}, 180, 5, S_SRB1_MMZFLYING1}, // S_SRB1_MMZFLYING5
|
||||
|
||||
{SPR_SRBH, 0, 16, {A_MoveAbsolute}, 180, 5, S_SRB1_UFO2}, // S_SRB1_UFO1
|
||||
{SPR_SRBH, 0, 16, {A_MoveAbsolute}, 0, 5, S_SRB1_UFO1}, // S_SRB1_UFO2
|
||||
|
||||
{SPR_SRBI, 0, 4, {A_MoveAbsolute}, 0, 7, S_SRB1_GRAYBOT2}, // S_SRB1_GRAYBOT1
|
||||
{SPR_SRBI, 1, 4, {A_MoveAbsolute}, 0, 7, S_SRB1_GRAYBOT3}, // S_SRB1_GRAYBOT2
|
||||
{SPR_SRBI, 0, 4, {A_MoveAbsolute}, 0, 7, S_SRB1_GRAYBOT4}, // S_SRB1_GRAYBOT3
|
||||
{SPR_SRBI, 1, 4, {A_MoveAbsolute}, 180, 7, S_SRB1_GRAYBOT5}, // S_SRB1_GRAYBOT4
|
||||
{SPR_SRBI, 0, 4, {A_MoveAbsolute}, 180, 7, S_SRB1_GRAYBOT6}, // S_SRB1_GRAYBOT5
|
||||
{SPR_SRBI, 1, 4, {A_MoveAbsolute}, 180, 7, S_SRB1_GRAYBOT1}, // S_SRB1_GRAYBOT6
|
||||
|
||||
{SPR_SRBJ, 0, 8, {A_MoveAbsolute}, 0, 5, S_SRB1_ROBOTOPOLIS2}, // S_SRB1_ROBOTOPOLIS1
|
||||
{SPR_SRBJ, 1, 8, {A_MoveAbsolute}, 0, -5, S_SRB1_ROBOTOPOLIS1}, // S_SRB1_ROBOTOPOLIS2
|
||||
|
||||
{SPR_SRBK, 0, 8, {A_MoveAbsolute}, 0, 5, S_SRB1_RBZBUZZ2}, // S_SRB1_RBZBUZZ1
|
||||
{SPR_SRBK, 1, 8, {A_MoveAbsolute}, 0, -5, S_SRB1_RBZBUZZ1}, // S_SRB1_RBZBUZZ2
|
||||
|
||||
{SPR_SRBL, 0, 35, {A_ZThrust}, 4, (1<<16)+1, S_SRB1_RBZSPIKES2}, // S_SRB1_RBZSPIKES1
|
||||
{SPR_SRBL, 0, 35, {A_ZThrust}, -4, (1<<16)+1, S_SRB1_RBZSPIKES1}, // S_SRB1_RBZSPIKES2
|
||||
|
||||
{SPR_SRBM, 0, 4, {NULL}, 0, 0, S_SRB1_METALSONIC2}, // S_SRB1_METALSONIC1
|
||||
{SPR_SRBM, 1, 4, {NULL}, 0, 0, S_SRB1_METALSONIC3}, // S_SRB1_METALSONIC2
|
||||
{SPR_SRBM, 2, 4, {NULL}, 0, 0, S_SRB1_METALSONIC1}, // S_SRB1_METALSONIC3
|
||||
|
||||
{SPR_SRBN, 0, 2, {A_MoveAbsolute}, 0, 7, S_SRB1_GOLDBOT2}, // S_SRB1_GOLDBOT1
|
||||
{SPR_SRBN, 1, 2, {A_MoveAbsolute}, 0, 7, S_SRB1_GOLDBOT3}, // S_SRB1_GOLDBOT2
|
||||
{SPR_SRBN, 0, 2, {A_MoveAbsolute}, 0, 7, S_SRB1_GOLDBOT4}, // S_SRB1_GOLDBOT3
|
||||
{SPR_SRBN, 1, 2, {A_MoveAbsolute}, 180, 7, S_SRB1_GOLDBOT5}, // S_SRB1_GOLDBOT4
|
||||
{SPR_SRBN, 0, 2, {A_MoveAbsolute}, 180, 7, S_SRB1_GOLDBOT6}, // S_SRB1_GOLDBOT5
|
||||
{SPR_SRBN, 1, 2, {A_MoveAbsolute}, 180, 7, S_SRB1_GOLDBOT1}, // S_SRB1_GOLDBOT6
|
||||
|
||||
{SPR_SRBO, 0, 2, {A_Look}, 0, 0, S_SRB1_GENREX1}, // S_SRB1_GENREX1
|
||||
{SPR_SRBO, 0, 2, {A_BuzzFly}, 0, 0, S_SRB1_GENREX2}, // S_SRB1_GENREX2
|
||||
#ifdef SEENAMES
|
||||
{SPR_NULL, 0, 1, {NULL}, 0, 0, S_NULL}, // S_NAMECHECK
|
||||
#endif
|
||||
|
|
@ -13347,438 +13283,6 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
|||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_SRB1_CRAWLA
|
||||
4000, // doomednum
|
||||
S_SRB1_CRAWLA1, // spawnstate
|
||||
1, // spawnhealth
|
||||
S_SRB1_CRAWLA2, // seestate
|
||||
sfx_None, // seesound
|
||||
32, // reactiontime
|
||||
sfx_None, // attacksound
|
||||
S_NULL, // painstate
|
||||
200, // painchance
|
||||
sfx_None, // painsound
|
||||
S_NULL, // meleestate
|
||||
S_NULL, // missilestate
|
||||
S_XPLD1, // deathstate
|
||||
S_NULL, // xdeathstate
|
||||
sfx_pop, // deathsound
|
||||
3, // speed
|
||||
20*FRACUNIT, // radius
|
||||
40*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_SRB1_BAT
|
||||
4001, // doomednum
|
||||
S_SRB1_BAT1, // spawnstate
|
||||
1, // spawnhealth
|
||||
S_SRB1_BAT3, // seestate
|
||||
sfx_None, // seesound
|
||||
2, // reactiontime
|
||||
sfx_None, // attacksound
|
||||
S_NULL, // painstate
|
||||
3072, // painchance
|
||||
sfx_None, // painsound
|
||||
S_NULL, // meleestate
|
||||
S_NULL, // missilestate
|
||||
S_XPLD1, // deathstate
|
||||
S_NULL, // xdeathstate
|
||||
sfx_pop, // deathsound
|
||||
4*FRACUNIT, // speed
|
||||
17*FRACUNIT, // radius
|
||||
40*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY|MF_NOGRAVITY|MF_SLIDEME, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_SRB1_ROBOFISH
|
||||
4002, // doomednum
|
||||
S_SRB1_ROBOFISH1, // spawnstate
|
||||
1, // spawnhealth
|
||||
S_SRB1_ROBOFISH2, // seestate
|
||||
sfx_None, // seesound
|
||||
2, // reactiontime
|
||||
sfx_None, // attacksound
|
||||
S_NULL, // painstate
|
||||
3072, // painchance
|
||||
sfx_None, // painsound
|
||||
S_NULL, // meleestate
|
||||
S_NULL, // missilestate
|
||||
S_XPLD1, // deathstate
|
||||
S_NULL, // xdeathstate
|
||||
sfx_pop, // deathsound
|
||||
4*FRACUNIT, // speed
|
||||
22*FRACUNIT, // radius
|
||||
32*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY|MF_NOGRAVITY|MF_SLIDEME, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_SRB1_VOLCANOGUY
|
||||
4003, // doomednum
|
||||
S_SRB1_VOLCANOGUY1, // spawnstate
|
||||
1, // spawnhealth
|
||||
S_SRB1_VOLCANOGUY2, // seestate
|
||||
sfx_None, // seesound
|
||||
2, // reactiontime
|
||||
sfx_None, // attacksound
|
||||
S_NULL, // painstate
|
||||
3072, // painchance
|
||||
sfx_None, // painsound
|
||||
S_NULL, // meleestate
|
||||
S_NULL, // missilestate
|
||||
S_XPLD1, // deathstate
|
||||
S_NULL, // xdeathstate
|
||||
sfx_pop, // deathsound
|
||||
4*FRACUNIT, // speed
|
||||
20*FRACUNIT, // radius
|
||||
40*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY|MF_NOGRAVITY|MF_SLIDEME, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_SRB1_HOPPY
|
||||
4004, // doomednum
|
||||
S_SRB1_HOPPY1, // spawnstate
|
||||
1, // spawnhealth
|
||||
S_SRB1_HOPPY1, // seestate
|
||||
sfx_None, // seesound
|
||||
2, // reactiontime
|
||||
sfx_None, // attacksound
|
||||
S_NULL, // painstate
|
||||
3072, // painchance
|
||||
sfx_None, // painsound
|
||||
S_NULL, // meleestate
|
||||
S_NULL, // missilestate
|
||||
S_XPLD1, // deathstate
|
||||
S_NULL, // xdeathstate
|
||||
sfx_pop, // deathsound
|
||||
FRACUNIT, // speed
|
||||
20*FRACUNIT, // radius
|
||||
32*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_SRB1_HOPPYWATER
|
||||
4005, // doomednum
|
||||
S_SRB1_HOPPYWATER1, // spawnstate
|
||||
1, // spawnhealth
|
||||
S_SRB1_HOPPYWATER1, // seestate
|
||||
sfx_None, // seesound
|
||||
2, // reactiontime
|
||||
sfx_None, // attacksound
|
||||
S_NULL, // painstate
|
||||
3072, // painchance
|
||||
sfx_None, // painsound
|
||||
S_NULL, // meleestate
|
||||
S_NULL, // missilestate
|
||||
S_XPLD1, // deathstate
|
||||
S_NULL, // xdeathstate
|
||||
sfx_pop, // deathsound
|
||||
FRACUNIT, // speed
|
||||
20*FRACUNIT, // radius
|
||||
32*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_SRB1_HOPPYSKYLAB
|
||||
4006, // doomednum
|
||||
S_SRB1_HOPPYSKYLAB1, // spawnstate
|
||||
1, // spawnhealth
|
||||
S_SRB1_HOPPYSKYLAB1, // seestate
|
||||
sfx_None, // seesound
|
||||
2, // reactiontime
|
||||
sfx_None, // attacksound
|
||||
S_NULL, // painstate
|
||||
3072, // painchance
|
||||
sfx_None, // painsound
|
||||
S_NULL, // meleestate
|
||||
S_NULL, // missilestate
|
||||
S_XPLD1, // deathstate
|
||||
S_NULL, // xdeathstate
|
||||
sfx_pop, // deathsound
|
||||
FRACUNIT, // speed
|
||||
10*FRACUNIT, // radius
|
||||
34*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_SRB1_MMZFLYING
|
||||
4007, // doomednum
|
||||
S_SRB1_MMZFLYING1, // spawnstate
|
||||
1, // spawnhealth
|
||||
S_SRB1_MMZFLYING1, // seestate
|
||||
sfx_None, // seesound
|
||||
32, // reactiontime
|
||||
sfx_None, // attacksound
|
||||
S_NULL, // painstate
|
||||
200, // painchance
|
||||
sfx_None, // painsound
|
||||
S_NULL, // meleestate
|
||||
S_NULL, // missilestate
|
||||
S_XPLD1, // deathstate
|
||||
S_NULL, // xdeathstate
|
||||
sfx_pop, // deathsound
|
||||
FRACUNIT, // speed
|
||||
24*FRACUNIT, // radius
|
||||
32*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY|MF_NOGRAVITY|MF_FLOAT, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_SRB1_UFO
|
||||
4008, // doomednum
|
||||
S_SRB1_UFO1, // spawnstate
|
||||
1, // spawnhealth
|
||||
S_SRB1_UFO1, // seestate
|
||||
sfx_None, // seesound
|
||||
32, // reactiontime
|
||||
sfx_None, // attacksound
|
||||
S_NULL, // painstate
|
||||
200, // painchance
|
||||
sfx_None, // painsound
|
||||
S_NULL, // meleestate
|
||||
S_NULL, // missilestate
|
||||
S_XPLD1, // deathstate
|
||||
S_NULL, // xdeathstate
|
||||
sfx_pop, // deathsound
|
||||
3, // speed
|
||||
24*FRACUNIT, // radius
|
||||
32*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY|MF_NOGRAVITY|MF_FLOAT|MF_SPAWNCEILING, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_SRB1_GRAYBOT
|
||||
4009, // doomednum
|
||||
S_SRB1_GRAYBOT1,// spawnstate
|
||||
1, // spawnhealth
|
||||
S_SRB1_GRAYBOT1,// seestate
|
||||
sfx_None, // seesound
|
||||
32, // reactiontime
|
||||
sfx_None, // attacksound
|
||||
S_NULL, // painstate
|
||||
200, // painchance
|
||||
sfx_None, // painsound
|
||||
S_NULL, // meleestate
|
||||
S_NULL, // missilestate
|
||||
S_XPLD1, // deathstate
|
||||
S_NULL, // xdeathstate
|
||||
sfx_pop, // deathsound
|
||||
3, // speed
|
||||
21*FRACUNIT, // radius
|
||||
69*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY|MF_NOGRAVITY|MF_FLOAT, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_SRB1_ROBOTOPOLIS
|
||||
4010, // doomednum
|
||||
S_SRB1_ROBOTOPOLIS1, // spawnstate
|
||||
1, // spawnhealth
|
||||
S_SRB1_ROBOTOPOLIS1, // seestate
|
||||
sfx_None, // seesound
|
||||
32, // reactiontime
|
||||
sfx_None, // attacksound
|
||||
S_NULL, // painstate
|
||||
200, // painchance
|
||||
sfx_None, // painsound
|
||||
S_NULL, // meleestate
|
||||
S_NULL, // missilestate
|
||||
S_XPLD1, // deathstate
|
||||
S_NULL, // xdeathstate
|
||||
sfx_pop, // deathsound
|
||||
3, // speed
|
||||
36*FRACUNIT, // radius
|
||||
62*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY|MF_NOGRAVITY|MF_FLOAT, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_SRB1_RBZBUZZ
|
||||
4011, // doomednum
|
||||
S_SRB1_RBZBUZZ1,// spawnstate
|
||||
1, // spawnhealth
|
||||
S_SRB1_RBZBUZZ1,// seestate
|
||||
sfx_None, // seesound
|
||||
32, // reactiontime
|
||||
sfx_None, // attacksound
|
||||
S_NULL, // painstate
|
||||
200, // painchance
|
||||
sfx_None, // painsound
|
||||
S_NULL, // meleestate
|
||||
S_NULL, // missilestate
|
||||
S_XPLD1, // deathstate
|
||||
S_NULL, // xdeathstate
|
||||
sfx_pop, // deathsound
|
||||
3, // speed
|
||||
44*FRACUNIT, // radius
|
||||
45*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY|MF_NOGRAVITY|MF_FLOAT, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_SRB1_RBZSPIKES
|
||||
4012, // doomednum
|
||||
S_SRB1_RBZSPIKES1, // spawnstate
|
||||
1, // spawnhealth
|
||||
S_SRB1_RBZSPIKES1, // seestate
|
||||
sfx_None, // seesound
|
||||
32, // reactiontime
|
||||
sfx_None, // attacksound
|
||||
S_NULL, // painstate
|
||||
200, // painchance
|
||||
sfx_None, // painsound
|
||||
S_NULL, // meleestate
|
||||
S_NULL, // missilestate
|
||||
S_XPLD1, // deathstate
|
||||
S_NULL, // xdeathstate
|
||||
sfx_pop, // deathsound
|
||||
3, // speed
|
||||
10*FRACUNIT, // radius
|
||||
53*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SPECIAL|MF_SOLID|MF_ENEMY|MF_NOGRAVITY|MF_FLOAT, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_SRB1_METALSONIC
|
||||
4013, // doomednum
|
||||
S_SRB1_METALSONIC1, // 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
|
||||
21*FRACUNIT, // speed
|
||||
16*FRACUNIT, // radius
|
||||
40*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
1, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SLIDEME|MF_SOLID|MF_PUSHABLE, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_SRB1_GOLDBOT
|
||||
4014, // doomednum
|
||||
S_SRB1_GOLDBOT1,// spawnstate
|
||||
1, // spawnhealth
|
||||
S_SRB1_GOLDBOT1,// seestate
|
||||
sfx_None, // seesound
|
||||
32, // reactiontime
|
||||
sfx_None, // attacksound
|
||||
S_NULL, // painstate
|
||||
200, // painchance
|
||||
sfx_None, // painsound
|
||||
S_NULL, // meleestate
|
||||
S_NULL, // missilestate
|
||||
S_XPLD1, // deathstate
|
||||
S_NULL, // xdeathstate
|
||||
sfx_pop, // deathsound
|
||||
3, // speed
|
||||
21*FRACUNIT, // radius
|
||||
69*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY|MF_NOGRAVITY|MF_FLOAT, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
{ // MT_SRB1_GENREX
|
||||
4015, // doomednum
|
||||
S_SRB1_GENREX1, // spawnstate
|
||||
1, // spawnhealth
|
||||
S_SRB1_GENREX2, // seestate
|
||||
sfx_None, // seesound
|
||||
2, // reactiontime
|
||||
sfx_None, // attacksound
|
||||
S_NULL, // painstate
|
||||
3072, // painchance
|
||||
sfx_None, // painsound
|
||||
S_NULL, // meleestate
|
||||
S_NULL, // missilestate
|
||||
S_XPLD1, // deathstate
|
||||
S_NULL, // xdeathstate
|
||||
sfx_pop, // deathsound
|
||||
4*FRACUNIT, // speed
|
||||
17*FRACUNIT, // radius
|
||||
40*FRACUNIT, // height
|
||||
0, // display offset
|
||||
100, // mass
|
||||
0, // damage
|
||||
sfx_None, // activesound
|
||||
MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY|MF_NOGRAVITY|MF_SLIDEME, // flags
|
||||
S_NULL // raisestate
|
||||
},
|
||||
|
||||
#ifdef SEENAMES
|
||||
{ // MT_NAMECHECK
|
||||
-1, // doomednum
|
||||
|
|
|
|||
97
src/info.h
97
src/info.h
|
|
@ -553,23 +553,6 @@ typedef enum sprite
|
|||
SPR_GWLG,
|
||||
SPR_GWLR,
|
||||
|
||||
// SRB1 Sprites
|
||||
SPR_SRBA,
|
||||
SPR_SRBB,
|
||||
SPR_SRBC,
|
||||
SPR_SRBD,
|
||||
SPR_SRBE,
|
||||
SPR_SRBF,
|
||||
SPR_SRBG,
|
||||
SPR_SRBH,
|
||||
SPR_SRBI,
|
||||
SPR_SRBJ,
|
||||
SPR_SRBK,
|
||||
SPR_SRBL,
|
||||
SPR_SRBM,
|
||||
SPR_SRBN,
|
||||
SPR_SRBO,
|
||||
|
||||
SPR_FIRSTFREESLOT,
|
||||
SPR_LASTFREESLOT = SPR_FIRSTFREESLOT + NUMSPRITEFREESLOTS - 1,
|
||||
NUMSPRITES
|
||||
|
|
@ -2907,70 +2890,6 @@ typedef enum state
|
|||
S_ROCKCRUMBLEO,
|
||||
S_ROCKCRUMBLEP,
|
||||
|
||||
S_SRB1_CRAWLA1,
|
||||
S_SRB1_CRAWLA2,
|
||||
S_SRB1_CRAWLA3,
|
||||
S_SRB1_CRAWLA4,
|
||||
|
||||
S_SRB1_BAT1,
|
||||
S_SRB1_BAT2,
|
||||
S_SRB1_BAT3,
|
||||
S_SRB1_BAT4,
|
||||
|
||||
S_SRB1_ROBOFISH1,
|
||||
S_SRB1_ROBOFISH2,
|
||||
S_SRB1_ROBOFISH3,
|
||||
|
||||
S_SRB1_VOLCANOGUY1,
|
||||
S_SRB1_VOLCANOGUY2,
|
||||
|
||||
S_SRB1_HOPPY1,
|
||||
S_SRB1_HOPPY2,
|
||||
|
||||
S_SRB1_HOPPYWATER1,
|
||||
S_SRB1_HOPPYWATER2,
|
||||
|
||||
S_SRB1_HOPPYSKYLAB1,
|
||||
|
||||
S_SRB1_MMZFLYING1,
|
||||
S_SRB1_MMZFLYING2,
|
||||
S_SRB1_MMZFLYING3,
|
||||
S_SRB1_MMZFLYING4,
|
||||
S_SRB1_MMZFLYING5,
|
||||
|
||||
S_SRB1_UFO1,
|
||||
S_SRB1_UFO2,
|
||||
|
||||
S_SRB1_GRAYBOT1,
|
||||
S_SRB1_GRAYBOT2,
|
||||
S_SRB1_GRAYBOT3,
|
||||
S_SRB1_GRAYBOT4,
|
||||
S_SRB1_GRAYBOT5,
|
||||
S_SRB1_GRAYBOT6,
|
||||
|
||||
S_SRB1_ROBOTOPOLIS1,
|
||||
S_SRB1_ROBOTOPOLIS2,
|
||||
|
||||
S_SRB1_RBZBUZZ1,
|
||||
S_SRB1_RBZBUZZ2,
|
||||
|
||||
S_SRB1_RBZSPIKES1,
|
||||
S_SRB1_RBZSPIKES2,
|
||||
|
||||
S_SRB1_METALSONIC1,
|
||||
S_SRB1_METALSONIC2,
|
||||
S_SRB1_METALSONIC3,
|
||||
|
||||
S_SRB1_GOLDBOT1,
|
||||
S_SRB1_GOLDBOT2,
|
||||
S_SRB1_GOLDBOT3,
|
||||
S_SRB1_GOLDBOT4,
|
||||
S_SRB1_GOLDBOT5,
|
||||
S_SRB1_GOLDBOT6,
|
||||
|
||||
S_SRB1_GENREX1,
|
||||
S_SRB1_GENREX2,
|
||||
|
||||
#ifdef SEENAMES
|
||||
S_NAMECHECK,
|
||||
#endif
|
||||
|
|
@ -3482,22 +3401,6 @@ typedef enum mobj_type
|
|||
MT_ROCKCRUMBLE15,
|
||||
MT_ROCKCRUMBLE16,
|
||||
|
||||
MT_SRB1_CRAWLA,
|
||||
MT_SRB1_BAT,
|
||||
MT_SRB1_ROBOFISH,
|
||||
MT_SRB1_VOLCANOGUY,
|
||||
MT_SRB1_HOPPY,
|
||||
MT_SRB1_HOPPYWATER,
|
||||
MT_SRB1_HOPPYSKYLAB,
|
||||
MT_SRB1_MMZFLYING,
|
||||
MT_SRB1_UFO,
|
||||
MT_SRB1_GRAYBOT,
|
||||
MT_SRB1_ROBOTOPOLIS,
|
||||
MT_SRB1_RBZBUZZ,
|
||||
MT_SRB1_RBZSPIKES,
|
||||
MT_SRB1_METALSONIC,
|
||||
MT_SRB1_GOLDBOT,
|
||||
MT_SRB1_GENREX,
|
||||
#ifdef SEENAMES
|
||||
MT_NAMECHECK,
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -565,7 +565,7 @@ extraemblem_t extraemblems[MAXEXTRAEMBLEMS] =
|
|||
{"Game Complete", "Complete 1P Mode", 10, 'X', SKINCOLOR_BLUE, 0},
|
||||
{"All Emeralds", "Complete 1P Mode with all Emeralds", 11, 'V', SKINCOLOR_GREY, 0},
|
||||
{"Perfect Bonus", "Perfect Bonus on a non-secret stage", 30, 'P', SKINCOLOR_GOLD, 0},
|
||||
{"SRB1 Remake", "Complete SRB1 Remake", 21, 'O', SKINCOLOR_RUST, 0},
|
||||
{"PLACEHOLDER", "PLACEHOLDER", 0, 'O', SKINCOLOR_RUST, 0},
|
||||
{"NiGHTS Mastery", "Show your mastery of NiGHTS!", 22, 'W', SKINCOLOR_TEAL, 0},
|
||||
};
|
||||
|
||||
|
|
@ -586,9 +586,9 @@ unlockable_t unlockables[MAXUNLOCKABLES] =
|
|||
|
||||
/* 08 */ {"BONUS LEVELS", "", 100, 0, SECRET_HEADER, 0, true, true, 0},
|
||||
|
||||
/* 09 */ {"SRB1 Remake", "Collect 20 Emblems", 130, 40, SECRET_WARP, 101, false, false, 0},
|
||||
/* 09 */ {"PLACEHOLDER", "PLACEHOLDER", 0, 0, SECRET_NONE, 0, true, true, 0},
|
||||
/* 10 */ {"Mario Koopa Blast", "Collect 60 Emblems", 110, 42, SECRET_WARP, 30, false, false, 0},
|
||||
/* 11 */ {"SRB1 Level Select", "Complete SRB1 Remake", 140, 21, SECRET_LEVELSELECT, 2, false, true, 0},
|
||||
/* 11 */ {"PLACEHOLDER", "PLACEHOLDER", 0, 0, SECRET_NONE, 0, true, true, 0},
|
||||
|
||||
/* 12 */ {"Spring Hill Zone", "Collect 100 Emblems", 0, 44, SECRET_NONE, 0, false, false, 0},
|
||||
/* 13 */ {"Black Hole", "A Rank in all Special Stages", 0, 50, SECRET_NONE, 0, false, true, 0},
|
||||
|
|
@ -624,9 +624,6 @@ void M_SetupDefaultConditionSets(void)
|
|||
// -- 20: Beat AGZ
|
||||
M_AddRawCondition(20, 1, UC_MAPBEATEN, 40, 0, 0);
|
||||
|
||||
// -- 21: Beat SRB1 Remake
|
||||
M_AddRawCondition(21, 1, UC_MAPBEATEN, 132, 0, 0);
|
||||
|
||||
// -- 22: Beat Black Hole
|
||||
M_AddRawCondition(22, 1, UC_MAPBEATEN, 57, 0, 0);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue