Add Gacha Bom sprites

This commit is contained in:
James R 2023-02-20 20:52:11 -08:00
parent cee6e26a1e
commit 3774346642
3 changed files with 12 additions and 2 deletions

View file

@ -4557,6 +4557,8 @@ const char *const STATE_LIST[] = { // array length left dynamic for sanity testi
"S_SPECIAL_UFO_OVERLAY", "S_SPECIAL_UFO_OVERLAY",
"S_SPECIAL_UFO_ARM", "S_SPECIAL_UFO_ARM",
"S_SPECIAL_UFO_STEM", "S_SPECIAL_UFO_STEM",
"S_GACHABOM",
}; };
// RegEx to generate this from info.h: ^\tMT_([^,]+), --> \t"MT_\1", // RegEx to generate this from info.h: ^\tMT_([^,]+), --> \t"MT_\1",

View file

@ -795,6 +795,8 @@ char sprnames[NUMSPRITES + 1][5] =
"UQMK", "UQMK",
"GBOM",
// First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later // First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later
"VIEW", "VIEW",
}; };
@ -5180,6 +5182,8 @@ state_t states[NUMSTATES] =
{SPR_UFOB, 1|FF_FULLBRIGHT|FF_ANIMATE, -1, {NULL}, 1, 1, S_NULL}, // S_SPECIAL_UFO_OVERLAY {SPR_UFOB, 1|FF_FULLBRIGHT|FF_ANIMATE, -1, {NULL}, 1, 1, S_NULL}, // S_SPECIAL_UFO_OVERLAY
{SPR_UFOA, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_SPECIAL_UFO_ARM {SPR_UFOA, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_SPECIAL_UFO_ARM
{SPR_UFOS, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SPECIAL_UFO_STEM {SPR_UFOS, 0, -1, {NULL}, 0, 0, S_NULL}, // S_SPECIAL_UFO_STEM
{SPR_GBOM, FF_ANIMATE, -1, {NULL}, 3, 1, S_NULL}, // S_GACHABOM
}; };
mobjinfo_t mobjinfo[NUMMOBJTYPES] = mobjinfo_t mobjinfo[NUMMOBJTYPES] =
@ -24364,7 +24368,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
{ // MT_GACHABOM { // MT_GACHABOM
-1, // doomednum -1, // doomednum
S_ORBINAUT1, // spawnstate S_GACHABOM, // spawnstate
7, // spawnhealth 7, // spawnhealth
S_NULL, // seestate S_NULL, // seestate
sfx_tossed, // seesound sfx_tossed, // seesound
@ -24375,7 +24379,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound sfx_None, // painsound
S_NULL, // meleestate S_NULL, // meleestate
S_NULL, // missilestate S_NULL, // missilestate
S_ORBINAUT_DEAD,// deathstate S_GACHABOM, // deathstate
S_NULL, // xdeathstate S_NULL, // xdeathstate
sfx_s3k5d, // deathsound sfx_s3k5d, // deathsound
64*FRACUNIT, // speed 64*FRACUNIT, // speed

View file

@ -1346,6 +1346,8 @@ typedef enum sprite
SPR_UQMK, SPR_UQMK,
SPR_GBOM,
// First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later // First person view sprites; this is a sprite so that it can be replaced by a specialized MD2 draw later
SPR_VIEW, SPR_VIEW,
@ -5607,6 +5609,8 @@ typedef enum state
S_SPECIAL_UFO_ARM, S_SPECIAL_UFO_ARM,
S_SPECIAL_UFO_STEM, S_SPECIAL_UFO_STEM,
S_GACHABOM,
S_FIRSTFREESLOT, S_FIRSTFREESLOT,
S_LASTFREESLOT = S_FIRSTFREESLOT + NUMSTATEFREESLOTS - 1, S_LASTFREESLOT = S_FIRSTFREESLOT + NUMSTATEFREESLOTS - 1,
NUMSTATES NUMSTATES