mirror of
https://git.do.srb2.org/KartKrew/Kart-Public.git
synced 2024-11-17 02:01:15 +00:00
Added Donut Plains Bushes
This commit is contained in:
parent
ee7ea5f6cb
commit
b59246f413
3 changed files with 97 additions and 6 deletions
|
@ -143,16 +143,16 @@ extern FILE *logstream;
|
||||||
#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
|
#define DEVELOP // Disable this for release builds to remove excessive cheat commands and enable MD5 checking and stuff, all in one go. :3
|
||||||
#ifdef DEVELOP
|
#ifdef DEVELOP
|
||||||
#define VERSION 104 // Game version
|
#define VERSION 104 // Game version
|
||||||
#define SUBVERSION 1 // more precise version number
|
#define SUBVERSION 2 // more precise version number
|
||||||
#define VERSIONSTRING "Development EXE"
|
#define VERSIONSTRING "Development EXE"
|
||||||
#define VERSIONSTRINGW "v1.4.1"
|
#define VERSIONSTRINGW "v1.4.2"
|
||||||
// most interface strings are ignored in development mode.
|
// most interface strings are ignored in development mode.
|
||||||
// we use comprevision and compbranch instead.
|
// we use comprevision and compbranch instead.
|
||||||
#else
|
#else
|
||||||
#define VERSION 104 // Game version
|
#define VERSION 104 // Game version
|
||||||
#define SUBVERSION 1 // more precise version number
|
#define SUBVERSION 2 // more precise version number
|
||||||
#define VERSIONSTRING "DevEXE v1.4.1"
|
#define VERSIONSTRING "DevEXE v1.4.2"
|
||||||
#define VERSIONSTRINGW L"v1.4.1"
|
#define VERSIONSTRINGW L"v1.4.2"
|
||||||
// Hey! If you change this, add 1 to the MODVERSION below!
|
// Hey! If you change this, add 1 to the MODVERSION below!
|
||||||
// Otherwise we can't force updates!
|
// Otherwise we can't force updates!
|
||||||
#endif
|
#endif
|
||||||
|
|
85
src/info.c
85
src/info.c
|
@ -2804,6 +2804,10 @@ state_t states[NUMSTATES] =
|
||||||
{SPR_DOOD, 15, 4, {NULL}, 0, 0, S_DOOD_RING5}, // S_DOOD_RING4
|
{SPR_DOOD, 15, 4, {NULL}, 0, 0, S_DOOD_RING5}, // S_DOOD_RING4
|
||||||
{SPR_DOOD, 16, 4, {NULL}, 0, 0, S_DOOD_RING1}, // S_DOOD_RING5
|
{SPR_DOOD, 16, 4, {NULL}, 0, 0, S_DOOD_RING1}, // S_DOOD_RING5
|
||||||
|
|
||||||
|
{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, 2, -1, {NULL}, 0, 0, S_NULL}, // S_SNES_DONUTBUSH3
|
||||||
|
|
||||||
{SPR_GBAS, 131072, 12, {NULL}, 0, 0, S_GBA_BOO2}, // S_GBA_BOO1
|
{SPR_GBAS, 131072, 12, {NULL}, 0, 0, S_GBA_BOO2}, // S_GBA_BOO1
|
||||||
{SPR_GBAS, 196609, 12, {NULL}, 0, 0, S_GBA_BOO3}, // S_GBA_BOO2
|
{SPR_GBAS, 196609, 12, {NULL}, 0, 0, S_GBA_BOO3}, // S_GBA_BOO2
|
||||||
{SPR_GBAS, 262146, 12, {NULL}, 0, 0, S_GBA_BOO4}, // S_GBA_BOO3
|
{SPR_GBAS, 262146, 12, {NULL}, 0, 0, S_GBA_BOO4}, // S_GBA_BOO3
|
||||||
|
@ -15962,6 +15966,87 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
|
||||||
S_NULL // raisestate
|
S_NULL // raisestate
|
||||||
},
|
},
|
||||||
|
|
||||||
|
{ // MT_SNES_DONUTBUSH1
|
||||||
|
2301, // doomednum
|
||||||
|
S_SNES_DONUTBUSH1, // 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
|
||||||
|
14*FRACUNIT, // radius
|
||||||
|
15*FRACUNIT, // height
|
||||||
|
0, // display offset
|
||||||
|
100, // mass
|
||||||
|
0, // damage
|
||||||
|
sfx_None, // activesound
|
||||||
|
MF_NOGRAVITY|MF_SCENERY, // flags
|
||||||
|
S_NULL // raisestate
|
||||||
|
},
|
||||||
|
|
||||||
|
{ // MT_SNES_DONUTBUSH2
|
||||||
|
2302, // doomednum
|
||||||
|
S_SNES_DONUTBUSH2, // 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
|
||||||
|
13*FRACUNIT, // radius
|
||||||
|
13*FRACUNIT, // height
|
||||||
|
0, // display offset
|
||||||
|
100, // mass
|
||||||
|
0, // damage
|
||||||
|
sfx_None, // activesound
|
||||||
|
MF_NOGRAVITY|MF_SCENERY, // flags
|
||||||
|
S_NULL // raisestate
|
||||||
|
},
|
||||||
|
|
||||||
|
{ // MT_SNES_DONUTBUSH3
|
||||||
|
2303, // doomednum
|
||||||
|
S_SNES_DONUTBUSH3, // 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
|
||||||
|
7*FRACUNIT, // radius
|
||||||
|
7*FRACUNIT, // height
|
||||||
|
0, // display offset
|
||||||
|
100, // mass
|
||||||
|
0, // damage
|
||||||
|
sfx_None, // activesound
|
||||||
|
MF_NOGRAVITY|MF_SCENERY, // flags
|
||||||
|
S_NULL // raisestate
|
||||||
|
},
|
||||||
|
|
||||||
{ // MT_GBA_BOO
|
{ // MT_GBA_BOO
|
||||||
379, // doomednum
|
379, // doomednum
|
||||||
S_GBA_BOO1, // spawnstate
|
S_GBA_BOO1, // spawnstate
|
||||||
|
|
|
@ -3315,7 +3315,9 @@ typedef enum state
|
||||||
S_DOOD_RING5,
|
S_DOOD_RING5,
|
||||||
|
|
||||||
// SNES Objects
|
// SNES Objects
|
||||||
|
S_SNES_DONUTBUSH1,
|
||||||
|
S_SNES_DONUTBUSH2,
|
||||||
|
S_SNES_DONUTBUSH3,
|
||||||
|
|
||||||
// GBA Objects
|
// GBA Objects
|
||||||
S_GBA_BOO1,
|
S_GBA_BOO1,
|
||||||
|
@ -3972,6 +3974,10 @@ typedef enum mobj_type
|
||||||
MT_DOOD_BALLOON,
|
MT_DOOD_BALLOON,
|
||||||
MT_DOOD_RING,
|
MT_DOOD_RING,
|
||||||
|
|
||||||
|
MT_SNES_DONUTBUSH1,
|
||||||
|
MT_SNES_DONUTBUSH2,
|
||||||
|
MT_SNES_DONUTBUSH3,
|
||||||
|
|
||||||
MT_GBA_BOO,
|
MT_GBA_BOO,
|
||||||
|
|
||||||
MT_BUZZBOMBER,
|
MT_BUZZBOMBER,
|
||||||
|
|
Loading…
Reference in a new issue