diff --git a/src/d_netcmd.h b/src/d_netcmd.h
index d8fae72f798ff874e17d630628f3e269a37fe7a3..08fc8b831a507bb0d4662fc9d61e4141820322a6 100644
--- a/src/d_netcmd.h
+++ b/src/d_netcmd.h
@@ -101,7 +101,6 @@ extern consvar_t cv_recycler;
extern consvar_t cv_itemfinder;
extern consvar_t cv_inttime, cv_advancemap, cv_playersforexit;
-extern consvar_t cv_soniccd;
extern consvar_t cv_match_scoring;
extern consvar_t cv_overtime;
extern consvar_t cv_startinglives;
diff --git a/src/dehacked.c b/src/dehacked.c
index f45b05b04026e139af9c3b315aa05249f22cdd98..6d52f95cbd5e5b05dfcef5e4ece890d3edef320b 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -371,7 +371,9 @@ static void clear_levels(void)
// (no need to set num to 0, we're freeing the entire header shortly)
Z_Free(mapheaderinfo[i]->customopts);
+ P_DeleteFlickies(i);
P_DeleteGrades(i);
+
Z_Free(mapheaderinfo[i]);
mapheaderinfo[i] = NULL;
}
@@ -990,6 +992,34 @@ static const struct {
{NULL, 0}
};
+static const struct {
+ const char *name;
+ const mobjtype_t type;
+} FLICKYTYPES[] = {
+ {"BLUEBIRD", MT_FLICKY_01},
+ {"RABBIT", MT_FLICKY_02},
+ {"CHICKEN", MT_FLICKY_03},
+ {"SEAL", MT_FLICKY_04},
+ {"PIG", MT_FLICKY_05},
+ {"CHIPMUNK", MT_FLICKY_06},
+ {"PENGUIN", MT_FLICKY_07},
+ {"FISH", MT_FLICKY_08},
+ {"RAM", MT_FLICKY_09},
+ {"PUFFIN", MT_FLICKY_10},
+ {"COW", MT_FLICKY_11},
+ {"RAT", MT_FLICKY_12},
+ {"BEAR", MT_FLICKY_13},
+ {"DOVE", MT_FLICKY_14},
+ {"CAT", MT_FLICKY_15},
+ {"CANARY", MT_FLICKY_16},
+ {"a", 0}, // End of normal flickies - a lower case character so will never fastcmp valid with uppercase tmp
+ //{"FLICKER", MT_FLICKER},
+ {"SEED", MT_SEED},
+ {NULL, 0}
+};
+
+#define MAXFLICKIES 64
+
static void readlevelheader(MYFILE *f, INT32 num)
{
char *s = Z_Malloc(MAXLINELEN, PU_STATIC, NULL);
@@ -1088,8 +1118,82 @@ static void readlevelheader(MYFILE *f, INT32 num)
// Now go to uppercase
strupr(word2);
+ // List of flickies that are be freed in this map
+ if (fastcmp(word, "FLICKYLIST") || fastcmp(word, "ANIMALLIST"))
+ {
+ if (fastcmp(word2, "NONE"))
+ P_DeleteFlickies(num-1);
+ else if (fastcmp(word2, "DEMO"))
+ P_SetDemoFlickies(num-1);
+ else if (fastcmp(word2, "ALL"))
+ {
+ mobjtype_t tmpflickies[MAXFLICKIES];
+
+ for (mapheaderinfo[num-1]->numFlickies = 0;
+ ((mapheaderinfo[num-1]->numFlickies < MAXFLICKIES) && FLICKYTYPES[mapheaderinfo[num-1]->numFlickies].type);
+ mapheaderinfo[num-1]->numFlickies++)
+ tmpflickies[mapheaderinfo[num-1]->numFlickies] = FLICKYTYPES[mapheaderinfo[num-1]->numFlickies].type;
+
+ if (mapheaderinfo[num-1]->numFlickies) // just in case...
+ {
+ size_t newsize = sizeof(mobjtype_t) * mapheaderinfo[num-1]->numFlickies;
+ mapheaderinfo[num-1]->flickies = Z_Realloc(mapheaderinfo[num-1]->flickies, newsize, PU_STATIC, NULL);
+ M_Memcpy(mapheaderinfo[num-1]->flickies, tmpflickies, newsize);
+ }
+ }
+ else
+ {
+ mobjtype_t tmpflickies[MAXFLICKIES];
+ mapheaderinfo[num-1]->numFlickies = 0;
+ tmp = strtok(word2,",");
+ // get up to the first MAXFLICKIES flickies
+ do {
+ if (mapheaderinfo[num-1]->numFlickies == MAXFLICKIES) // never going to get above that number
+ {
+ deh_warning("Level header %d: too many flickies\n", num);
+ break;
+ }
+
+ if (fastncmp(tmp, "MT_", 3)) // support for specified mobjtypes...
+ {
+ i = get_mobjtype(tmp);
+ if (!i)
+ {
+ //deh_warning("Level header %d: unknown flicky mobj type %s\n", num, tmp); -- no need for this line as get_mobjtype complains too
+ continue;
+ }
+ tmpflickies[mapheaderinfo[num-1]->numFlickies] = i;
+ }
+ else // ...or a quick, limited selection of default flickies!
+ {
+ for (i = 0; FLICKYTYPES[i].name; i++)
+ if (fastcmp(tmp, FLICKYTYPES[i].name))
+ break;
+
+ if (!FLICKYTYPES[i].name)
+ {
+ deh_warning("Level header %d: unknown flicky selection %s\n", num, tmp);
+ continue;
+ }
+ tmpflickies[mapheaderinfo[num-1]->numFlickies] = FLICKYTYPES[i].type;
+ }
+ mapheaderinfo[num-1]->numFlickies++;
+ } while ((tmp = strtok(NULL,",")) != NULL);
+
+ if (mapheaderinfo[num-1]->numFlickies)
+ {
+ size_t newsize = sizeof(mobjtype_t) * mapheaderinfo[num-1]->numFlickies;
+ mapheaderinfo[num-1]->flickies = Z_Realloc(mapheaderinfo[num-1]->flickies, newsize, PU_STATIC, NULL);
+ // now we add them to the list!
+ M_Memcpy(mapheaderinfo[num-1]->flickies, tmpflickies, newsize);
+ }
+ else
+ deh_warning("Level header %d: no valid flicky types found\n", num);
+ }
+ }
+
// NiGHTS grades
- if (fastncmp(word, "GRADES", 6))
+ else if (fastncmp(word, "GRADES", 6))
{
UINT8 mare = (UINT8)atoi(word + 6);
@@ -1322,6 +1426,8 @@ static void readlevelheader(MYFILE *f, INT32 num)
Z_Free(s);
}
+#undef MAXFLICKIES
+
static void readcutscenescene(MYFILE *f, INT32 num, INT32 scenenum)
{
char *s = Z_Calloc(MAXLINELEN, PU_STATIC, NULL);
@@ -1845,6 +1951,16 @@ static actionpointer_t actionpointers[] =
{{A_BrakLobShot}, "A_BRAKLOBSHOT"},
{{A_NapalmScatter}, "A_NAPALMSCATTER"},
{{A_SpawnFreshCopy}, "A_SPAWNFRESHCOPY"},
+ {{A_FlickySpawn}, "A_FLICKYSPAWN"},
+ {{A_FlickyAim}, "A_FLICKYAIM"},
+ {{A_FlickyFly}, "A_FLICKYFLY"},
+ {{A_FlickySoar}, "A_FLICKYSOAR"},
+ {{A_FlickyCoast}, "A_FLICKYCOAST"},
+ {{A_FlickyHop}, "A_FLICKYHOP"},
+ {{A_FlickyFlounder}, "A_FLICKYFLOUNDER"},
+ {{A_FlickyCheck}, "A_FLICKYCHECK"},
+ {{A_FlickyHeightCheck}, "A_FLICKYHEIGHTCHECK"},
+ {{A_FlickyFlutter}, "A_FLICKYFLUTTER"},
{{NULL}, "NONE"},
@@ -3381,11 +3497,11 @@ static void DEH_LoadDehackedFile(MYFILE *f, UINT16 wad)
{
if (i == 0 && word2[0] != '0') // If word2 isn't a number
i = get_mobjtype(word2); // find a thing by name
- if (i < NUMMOBJTYPES && i >= 0)
+ if (i < NUMMOBJTYPES && i > 0)
readthing(f, i);
else
{
- deh_warning("Thing %d out of range (0 - %d)", i, NUMMOBJTYPES-1);
+ deh_warning("Thing %d out of range (1 - %d)", i, NUMMOBJTYPES-1);
ignorelines(f);
}
DEH_WriteUndoline(word, word2, UNDO_HEADER);
@@ -5520,43 +5636,133 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_SSPK4",
"S_SSPK5",
- // Freed Birdie
- "S_BIRD1",
- "S_BIRD2",
- "S_BIRD3",
-
- // Freed Bunny
- "S_BUNNY1",
- "S_BUNNY2",
- "S_BUNNY3",
- "S_BUNNY4",
- "S_BUNNY5",
- "S_BUNNY6",
- "S_BUNNY7",
- "S_BUNNY8",
- "S_BUNNY9",
- "S_BUNNY10",
-
- // Freed Mouse
- "S_MOUSE1",
- "S_MOUSE2",
-
- // Freed Chicken
- "S_CHICKEN1",
- "S_CHICKENHOP",
- "S_CHICKENFLY1",
- "S_CHICKENFLY2",
-
- // Freed Cow
- "S_COW1",
- "S_COW2",
- "S_COW3",
- "S_COW4",
-
- // Red Birdie in Bubble
- "S_RBIRD1",
- "S_RBIRD2",
- "S_RBIRD3",
+ // Flicky-sized bubble
+ "S_FLICKY_BUBBLE",
+
+ // Bluebird
+ "S_FLICKY_01_OUT",
+ "S_FLICKY_01_FLAP1",
+ "S_FLICKY_01_FLAP2",
+ "S_FLICKY_01_FLAP3",
+
+ // Rabbit
+ "S_FLICKY_02_OUT",
+ "S_FLICKY_02_AIM",
+ "S_FLICKY_02_HOP",
+ "S_FLICKY_02_UP",
+ "S_FLICKY_02_DOWN",
+
+ // Chicken
+ "S_FLICKY_03_OUT",
+ "S_FLICKY_03_AIM",
+ "S_FLICKY_03_HOP",
+ "S_FLICKY_03_UP",
+ "S_FLICKY_03_FLAP1",
+ "S_FLICKY_03_FLAP2",
+
+ // Seal
+ "S_FLICKY_04_OUT",
+ "S_FLICKY_04_AIM",
+ "S_FLICKY_04_HOP",
+ "S_FLICKY_04_UP",
+ "S_FLICKY_04_DOWN",
+ "S_FLICKY_04_SWIM1",
+ "S_FLICKY_04_SWIM2",
+ "S_FLICKY_04_SWIM3",
+ "S_FLICKY_04_SWIM4",
+
+ // Pig
+ "S_FLICKY_05_OUT",
+ "S_FLICKY_05_AIM",
+ "S_FLICKY_05_HOP",
+ "S_FLICKY_05_UP",
+ "S_FLICKY_05_DOWN",
+
+ // Chipmunk
+ "S_FLICKY_06_OUT",
+ "S_FLICKY_06_AIM",
+ "S_FLICKY_06_HOP",
+ "S_FLICKY_06_UP",
+ "S_FLICKY_06_DOWN",
+
+ // Penguin
+ "S_FLICKY_07_OUT",
+ "S_FLICKY_07_AIML",
+ "S_FLICKY_07_HOPL",
+ "S_FLICKY_07_UPL",
+ "S_FLICKY_07_DOWNL",
+ "S_FLICKY_07_AIMR",
+ "S_FLICKY_07_HOPR",
+ "S_FLICKY_07_UPR",
+ "S_FLICKY_07_DOWNR",
+ "S_FLICKY_07_SWIM1",
+ "S_FLICKY_07_SWIM2",
+ "S_FLICKY_07_SWIM3",
+
+ // Fish
+ "S_FLICKY_08_OUT",
+ "S_FLICKY_08_AIM",
+ "S_FLICKY_08_HOP",
+ "S_FLICKY_08_FLAP1",
+ "S_FLICKY_08_FLAP2",
+ "S_FLICKY_08_FLAP3",
+ "S_FLICKY_08_FLAP4",
+ "S_FLICKY_08_SWIM1",
+ "S_FLICKY_08_SWIM2",
+ "S_FLICKY_08_SWIM3",
+ "S_FLICKY_08_SWIM4",
+
+ // Ram
+ "S_FLICKY_09_OUT",
+ "S_FLICKY_09_AIM",
+ "S_FLICKY_09_HOP",
+ "S_FLICKY_09_UP",
+ "S_FLICKY_09_DOWN",
+
+ // Puffin
+ "S_FLICKY_10_OUT",
+ "S_FLICKY_10_FLAP1",
+ "S_FLICKY_10_FLAP2",
+
+ // Cow
+ "S_FLICKY_11_OUT",
+ "S_FLICKY_11_AIM",
+ "S_FLICKY_11_RUN1",
+ "S_FLICKY_11_RUN2",
+ "S_FLICKY_11_RUN3",
+
+ // Rat
+ "S_FLICKY_12_OUT",
+ "S_FLICKY_12_AIM",
+ "S_FLICKY_12_RUN1",
+ "S_FLICKY_12_RUN2",
+ "S_FLICKY_12_RUN3",
+
+ // Bear
+ "S_FLICKY_13_OUT",
+ "S_FLICKY_13_AIM",
+ "S_FLICKY_13_HOP",
+ "S_FLICKY_13_UP",
+ "S_FLICKY_13_DOWN",
+
+ // Dove
+ "S_FLICKY_14_OUT",
+ "S_FLICKY_14_FLAP1",
+ "S_FLICKY_14_FLAP2",
+ "S_FLICKY_14_FLAP3",
+
+ // Cat
+ "S_FLICKY_15_OUT",
+ "S_FLICKY_15_AIM",
+ "S_FLICKY_15_HOP",
+ "S_FLICKY_15_UP",
+ "S_FLICKY_15_DOWN",
+
+ // Canary
+ "S_FLICKY_16_OUT",
+ "S_FLICKY_16_FLAP1",
+ "S_FLICKY_16_FLAP2",
+ "S_FLICKY_16_FLAP3",
"S_YELLOWSPRING",
"S_YELLOWSPRING2",
@@ -6056,6 +6262,7 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_NIGHTOPIANHELPER6",
"S_NIGHTOPIANHELPER7",
"S_NIGHTOPIANHELPER8",
+ "S_NIGHTOPIANHELPER9",
"S_CRUMBLE1",
"S_CRUMBLE2",
@@ -6079,10 +6286,10 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_SPRK16",
// Robot Explosion
+ "S_XPLD_FLICKY",
"S_XPLD1",
"S_XPLD2",
- "S_XPLD3",
- "S_XPLD4",
+ "S_XPLD_EGGTRAP",
// Underwater Explosion
"S_WPLD1",
@@ -6490,13 +6697,23 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_IVSP", // Invincibility sparkles
"MT_SUPERSPARK", // Super Sonic Spark
- // Freed Animals
- "MT_BIRD", // Birdie freed!
- "MT_BUNNY", // Bunny freed!
- "MT_MOUSE", // Mouse
- "MT_CHICKEN", // Chicken
- "MT_COW", // Cow
- "MT_REDBIRD", // Red Birdie in Bubble
+ // Flickies
+ "MT_FLICKY_01", // Bluebird
+ "MT_FLICKY_02", // Rabbit
+ "MT_FLICKY_03", // Chicken
+ "MT_FLICKY_04", // Seal
+ "MT_FLICKY_05", // Pig
+ "MT_FLICKY_06", // Chipmunk
+ "MT_FLICKY_07", // Penguin
+ "MT_FLICKY_08", // Fish
+ "MT_FLICKY_09", // Ram
+ "MT_FLICKY_10", // Puffin
+ "MT_FLICKY_11", // Cow
+ "MT_FLICKY_12", // Rat
+ "MT_FLICKY_13", // Bear
+ "MT_FLICKY_14", // Dove
+ "MT_FLICKY_15", // Cat
+ "MT_FLICKY_16", // Canary
// Environmental Effects
"MT_RAIN", // Rain
@@ -7506,7 +7723,7 @@ static mobjtype_t get_mobjtype(const char *word)
if (fastcmp(word, MOBJTYPE_LIST[i]+3))
return i;
deh_warning("Couldn't find mobjtype named 'MT_%s'",word);
- return MT_BLUECRAWLA;
+ return MT_NULL;
}
static statenum_t get_state(const char *word)
diff --git a/src/doomstat.h b/src/doomstat.h
index 8072a15528f56a23727da9a6d7b32bcf86db4166..f1b7d2169516c2020ecd20fdd0b12cae7a356234 100644
--- a/src/doomstat.h
+++ b/src/doomstat.h
@@ -241,6 +241,10 @@ typedef struct
UINT8 levelflags; ///< LF_flags: merged eight booleans into one UINT8 for space, see below
UINT8 menuflags; ///< LF2_flags: options that affect record attack / nights mode menus
+ // Freed animals stuff.
+ UINT8 numFlickies; ///< Internal. For freed flicky support.
+ mobjtype_t *flickies; ///< List of freeable flickies in this level. Allocated dynamically for space reasons. Be careful.
+
// NiGHTS stuff.
UINT8 numGradedMares; ///< Internal. For grade support.
nightsgrades_t *grades; ///< NiGHTS grades. Allocated dynamically for space reasons. Be careful.
diff --git a/src/g_game.c b/src/g_game.c
index c5488e0b7d17476b3ad8f24c6c3e86089745c529..5e04af496327329e2f54c00cec4912beb5535b35 100644
--- a/src/g_game.c
+++ b/src/g_game.c
@@ -4728,7 +4728,7 @@ void G_BeginRecording(void)
// Don't do it.
WRITEFIXED(demo_p, player->jumpfactor);
- // Save netvar data (SONICCD, etc)
+ // Save netvar data
CV_SaveNetVars(&demo_p);
memset(&oldcmd,0,sizeof(oldcmd));
diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c
index 0bf3275c9f0dd7b401634ed0a47bccd3f47c476b..35a07c5270150b42fdd093fa20dec2edd40ea030 100644
--- a/src/hardware/hw_light.c
+++ b/src/hardware/hw_light.c
@@ -370,13 +370,24 @@ light_t *t_lspr[NUMSPRITES] =
&lspr[NOLIGHT], // SPR_GOAL
- // Freed Animals
- &lspr[NOLIGHT], // SPR_BIRD
- &lspr[NOLIGHT], // SPR_BUNY
- &lspr[NOLIGHT], // SPR_MOUS
- &lspr[NOLIGHT], // SPR_CHIC
- &lspr[NOLIGHT], // SPR_COWZ
- &lspr[NOLIGHT], // SPR_RBRD
+ // Flickies
+ &lspr[NOLIGHT], // SPR_FBUB
+ &lspr[NOLIGHT], // SPR_FL01
+ &lspr[NOLIGHT], // SPR_FL02
+ &lspr[NOLIGHT], // SPR_FL03
+ &lspr[NOLIGHT], // SPR_FL04
+ &lspr[NOLIGHT], // SPR_FL05
+ &lspr[NOLIGHT], // SPR_FL06
+ &lspr[NOLIGHT], // SPR_FL07
+ &lspr[NOLIGHT], // SPR_FL08
+ &lspr[NOLIGHT], // SPR_FL09
+ &lspr[NOLIGHT], // SPR_FL10
+ &lspr[NOLIGHT], // SPR_FL11
+ &lspr[NOLIGHT], // SPR_FL12
+ &lspr[NOLIGHT], // SPR_FL13
+ &lspr[NOLIGHT], // SPR_FL14
+ &lspr[NOLIGHT], // SPR_FL15
+ &lspr[NOLIGHT], // SPR_FL16
// Springs
&lspr[NOLIGHT], // SPR_SPRY
diff --git a/src/info.c b/src/info.c
index ad4aec13683bac2341cfc281bce4df0ca52742f0..613320503ef82b44c926ac7b91588b4dca9d0d21 100644
--- a/src/info.c
+++ b/src/info.c
@@ -254,13 +254,24 @@ char sprnames[NUMSPRITES + 1][5] =
"GOAL", // Special Stage goal (here because lol NiGHTS)
- // Freed Animals
- "BIRD", // Birdie freed!
- "BUNY", // Bunny freed!
- "MOUS", // Mouse
- "CHIC", // Chicken
- "COWZ", // Cow
- "RBRD", // Red Birdie in Bubble
+ // Flickies
+ "FBUB", // Flicky-sized bubble
+ "FL01", // Bluebird
+ "FL02", // Rabbit
+ "FL03", // Chicken
+ "FL04", // Seal
+ "FL05", // Pig
+ "FL06", // Chipmunk
+ "FL07", // Penguin
+ "FL08", // Fish
+ "FL09", // Ram
+ "FL10", // Puffin
+ "FL11", // Cow
+ "FL12", // Rat
+ "FL13", // Bear
+ "FL14", // Dove
+ "FL15", // Cat
+ "FL16", // Canary
// Springs
"SPRY", // yellow spring
@@ -2235,43 +2246,133 @@ state_t states[NUMSTATES] =
{SPR_SSPK, 1, 2, {NULL}, 0, 0, S_SSPK5}, // S_SSPK4
{SPR_SSPK, 0, 2, {NULL}, 0, 0, S_NULL}, // S_SSPK5
- // Freed Birdie
- {SPR_BIRD, 0, 4, {NULL}, 0, 0, S_BIRD2}, // S_BIRD1
- {SPR_BIRD, 0, 4, {A_Chase}, 0, 0, S_BIRD3}, // S_BIRD2
- {SPR_BIRD, 1, 4, {A_Chase}, 0, 0, S_BIRD2}, // S_BIRD3
-
- // Freed Bunny
- {SPR_BUNY, 0, 4, {NULL}, 0, 0, S_BUNNY2}, // S_BUNNY1
- {SPR_BUNY, 0, 64, {NULL}, 0, 0, S_BUNNY3}, // S_BUNNY2
- {SPR_BUNY, 1, 2, {A_BunnyHop}, 6, 3, S_BUNNY4}, // S_BUNNY3
- {SPR_BUNY, 1, 2, {A_Chase}, 0, 0, S_BUNNY5}, // S_BUNNY4
- {SPR_BUNY, 1, 2, {A_Chase}, 0, 0, S_BUNNY6}, // S_BUNNY5
- {SPR_BUNY, 1, 2, {A_Chase}, 0, 0, S_BUNNY7}, // S_BUNNY6
- {SPR_BUNY, 1, 2, {A_Chase}, 0, 0, S_BUNNY8}, // S_BUNNY7
- {SPR_BUNY, 1, 2, {A_Chase}, 0, 0, S_BUNNY9}, // S_BUNNY8
- {SPR_BUNY, 1, 2, {A_Chase}, 0, 0, S_BUNNY10}, // S_BUNNY9
- {SPR_BUNY, 1, 2, {A_Chase}, 0, 0, S_BUNNY2}, // S_BUNNY10
-
- // Freed Mouse
- {SPR_MOUS, 0, 2, {A_MouseThink}, 0, 0, S_MOUSE2}, // S_MOUSE1
- {SPR_MOUS, 1, 2, {A_MouseThink}, 0, 0, S_MOUSE1}, // S_MOUSE2
-
- // Freed Chicken
- {SPR_CHIC, 0, 7, {A_Chase}, 3, 0, S_CHICKENHOP}, // S_CHICKEN1
- {SPR_CHIC, 0, 1, {A_BunnyHop}, 4, 2, S_CHICKENFLY1}, // S_CHICKENHOP
- {SPR_CHIC, 1, 2, {A_ChickenCheck}, 0, 0, S_CHICKENFLY2}, // S_CHICKENFLY1
- {SPR_CHIC, 2, 2, {NULL}, 0, 0, S_CHICKENFLY1}, // S_CHICKENFLY2
-
- // Freed Cow
- {SPR_COWZ, 0, 4, {A_Chase}, 3, 0, S_COW2}, // S_COW1
- {SPR_COWZ, 1, 4, {A_Chase}, 3, 0, S_COW3}, // S_COW2
- {SPR_COWZ, 2, 4, {A_Chase}, 3, 0, S_COW4}, // S_COW3
- {SPR_COWZ, 3, 4, {A_Chase}, 3, 0, S_COW1}, // S_COW4
-
- // Freed Birdie
- {SPR_RBRD, 0, 4, {NULL}, 0, 0, S_RBIRD2}, // S_RBIRD1
- {SPR_RBRD, 0, 4, {A_Chase}, 0, 0, S_RBIRD3}, // S_RBIRD2
- {SPR_RBRD, 1, 4, {A_Chase}, 0, 0, S_RBIRD2}, // S_RBIRD3
+ // Flicky-sized bubble
+ {SPR_FBUB, 0, -1, {NULL}, 0, 0, S_NULL}, // S_FLICKY_BUBBLE
+
+ // Bluebird
+ {SPR_FL01, 0, 2, {A_FlickyCheck}, S_FLICKY_01_FLAP1, S_FLICKY_01_FLAP1, S_FLICKY_01_OUT}, // S_FLICKY_01_OUT
+ {SPR_FL01, 1, 3, {A_FlickyFly}, 4*FRACUNIT, 16*FRACUNIT, S_FLICKY_01_FLAP2}, // S_FLICKY_01_FLAP1
+ {SPR_FL01, 2, 3, {A_FlickyFly}, 4*FRACUNIT, 16*FRACUNIT, S_FLICKY_01_FLAP3}, // S_FLICKY_01_FLAP2
+ {SPR_FL01, 3, 3, {A_FlickyFly}, 4*FRACUNIT, 16*FRACUNIT, S_FLICKY_01_FLAP1}, // S_FLICKY_01_FLAP3
+
+ // Rabbit
+ {SPR_FL02, 0, 2, {A_FlickyCheck}, S_FLICKY_02_AIM, 0, S_FLICKY_02_OUT}, // S_FLICKY_02_OUT
+ {SPR_FL02, 1, 1, {A_FlickyAim}, ANG30, 32*FRACUNIT, S_FLICKY_02_HOP}, // S_FLICKY_02_AIM
+ {SPR_FL02, 1, 1, {A_FlickyHop}, 6*FRACUNIT, 4*FRACUNIT, S_FLICKY_02_UP}, // S_FLICKY_02_HOP
+ {SPR_FL02, 2, 2, {A_FlickyCheck}, S_FLICKY_02_AIM, S_FLICKY_02_DOWN, S_FLICKY_02_UP}, // S_FLICKY_02_UP
+ {SPR_FL02, 3, 2, {A_FlickyCheck}, S_FLICKY_02_AIM, 0, S_FLICKY_02_DOWN}, // S_FLICKY_02_DOWN
+
+ // Chicken
+ {SPR_FL03, 0, 2, {A_FlickyCheck}, S_FLICKY_03_AIM, S_FLICKY_03_FLAP1, S_FLICKY_03_OUT}, // S_FLICKY_03_OUT
+ {SPR_FL03, 1, 1, {A_FlickyAim}, ANGLE_45, 32*FRACUNIT, S_FLICKY_03_HOP}, // S_FLICKY_03_AIM
+ {SPR_FL03, 1, 1, {A_FlickyHop}, 7*FRACUNIT, 2*FRACUNIT, S_FLICKY_03_UP}, // S_FLICKY_03_HOP
+ {SPR_FL03, 2, 2, {A_FlickyFlutter}, S_FLICKY_03_HOP, S_FLICKY_03_FLAP1, S_FLICKY_03_UP}, // S_FLICKY_03_UP
+ {SPR_FL03, 3, 2, {A_FlickyFlutter}, S_FLICKY_03_HOP, 0, S_FLICKY_03_FLAP2}, // S_FLICKY_03_FLAP1
+ {SPR_FL03, 4, 2, {A_FlickyFlutter}, S_FLICKY_03_HOP, 0, S_FLICKY_03_FLAP1}, // S_FLICKY_03_FLAP2
+
+ // Seal
+ {SPR_FL04, 0, 2, {A_FlickyCheck}, S_FLICKY_04_AIM, 0, S_FLICKY_04_OUT}, // S_FLICKY_04_OUT
+ {SPR_FL04, 1, 1, {A_FlickyAim}, ANG30, 32*FRACUNIT, S_FLICKY_04_HOP}, // S_FLICKY_04_AIM
+ {SPR_FL04, 1, 1, {A_FlickyHop}, 3*FRACUNIT, 2*FRACUNIT, S_FLICKY_04_UP}, // S_FLICKY_04_HOP
+ {SPR_FL04, 2, 4, {A_FlickyCheck}, S_FLICKY_04_AIM, S_FLICKY_04_DOWN, S_FLICKY_04_UP}, // S_FLICKY_04_UP
+ {SPR_FL04, 3, 4, {A_FlickyCheck}, S_FLICKY_04_AIM, 0, S_FLICKY_04_DOWN}, // S_FLICKY_04_DOWN
+ {SPR_FL04, 3, 4, {A_FlickyFly}, 2*FRACUNIT, 48*FRACUNIT, S_FLICKY_04_SWIM2}, // S_FLICKY_04_SWIM1
+ {SPR_FL04, 4, 4, {A_FlickyCoast}, FRACUNIT, S_FLICKY_04_SWIM1, S_FLICKY_04_SWIM3}, // S_FLICKY_04_SWIM2
+ {SPR_FL04, 3, 4, {A_FlickyCoast}, FRACUNIT, S_FLICKY_04_SWIM1, S_FLICKY_04_SWIM4}, // S_FLICKY_04_SWIM3
+ {SPR_FL04, 5, 4, {A_FlickyCoast}, FRACUNIT, S_FLICKY_04_SWIM1, S_FLICKY_04_SWIM1}, // S_FLICKY_04_SWIM4
+
+ // Pig
+ {SPR_FL05, 0, 2, {A_FlickyCheck}, S_FLICKY_05_AIM, 0, S_FLICKY_05_OUT}, // S_FLICKY_05_OUT
+ {SPR_FL05, 1, 1, {A_FlickyAim}, ANG20, 32*FRACUNIT, S_FLICKY_05_HOP}, // S_FLICKY_05_AIM
+ {SPR_FL05, 1, 1, {A_FlickyHop}, 4*FRACUNIT, 3*FRACUNIT, S_FLICKY_05_UP}, // S_FLICKY_05_HOP
+ {SPR_FL05, 2, 2, {A_FlickyCheck}, S_FLICKY_05_AIM, S_FLICKY_05_DOWN, S_FLICKY_05_UP}, // S_FLICKY_05_UP
+ {SPR_FL05, 3, 2, {A_FlickyCheck}, S_FLICKY_05_AIM, 0, S_FLICKY_05_DOWN}, // S_FLICKY_05_DOWN
+
+ // Chipmunk
+ {SPR_FL06, 0, 2, {A_FlickyCheck}, S_FLICKY_06_AIM, 0, S_FLICKY_06_OUT}, // S_FLICKY_06_OUT
+ {SPR_FL06, 1, 1, {A_FlickyAim}, ANGLE_90, 32*FRACUNIT, S_FLICKY_06_HOP}, // S_FLICKY_06_AIM
+ {SPR_FL06, 1, 1, {A_FlickyHop}, 5*FRACUNIT, 6*FRACUNIT, S_FLICKY_06_UP}, // S_FLICKY_06_HOP
+ {SPR_FL06, 2, 2, {A_FlickyCheck}, S_FLICKY_06_AIM, S_FLICKY_06_DOWN, S_FLICKY_06_UP}, // S_FLICKY_06_UP
+ {SPR_FL06, 3, 2, {A_FlickyCheck}, S_FLICKY_06_AIM, 0, S_FLICKY_06_DOWN}, // S_FLICKY_06_DOWN
+
+ // Penguin
+ {SPR_FL07, 0, 2, {A_FlickyCheck}, S_FLICKY_07_AIML, 0, S_FLICKY_07_OUT}, // S_FLICKY_07_OUT
+ {SPR_FL07, 1, 1, {A_FlickyAim}, ANG30, 32*FRACUNIT, S_FLICKY_07_HOPL}, // S_FLICKY_07_AIML
+ {SPR_FL07, 1, 1, {A_FlickyHop}, 4*FRACUNIT, 2*FRACUNIT, S_FLICKY_07_UPL}, // S_FLICKY_07_HOPL
+ {SPR_FL07, 2, 4, {A_FlickyCheck}, S_FLICKY_07_AIMR, S_FLICKY_07_DOWNL, S_FLICKY_07_UPL}, // S_FLICKY_07_UPL
+ {SPR_FL07, 1, 4, {A_FlickyCheck}, S_FLICKY_07_AIMR, 0, S_FLICKY_07_DOWNL}, // S_FLICKY_07_DOWNL
+ {SPR_FL07, 1, 1, {A_FlickyAim}, ANG30, 32*FRACUNIT, S_FLICKY_07_HOPR}, // S_FLICKY_07_AIMR
+ {SPR_FL07, 1, 1, {A_FlickyHop}, 4*FRACUNIT, 2*FRACUNIT, S_FLICKY_07_UPR}, // S_FLICKY_07_HOPR
+ {SPR_FL07, 3, 4, {A_FlickyCheck}, S_FLICKY_07_AIML, S_FLICKY_07_DOWNR, S_FLICKY_07_UPR}, // S_FLICKY_07_UPR
+ {SPR_FL07, 1, 4, {A_FlickyCheck}, S_FLICKY_07_AIML, 0, S_FLICKY_07_DOWNR}, // S_FLICKY_07_DOWNR
+ {SPR_FL07, 4, 4, {A_FlickyFly}, 3*FRACUNIT, 72*FRACUNIT, S_FLICKY_07_SWIM2}, // S_FLICKY_07_SWIM1
+ {SPR_FL07, 5, 4, {A_FlickyCoast}, FRACUNIT, S_FLICKY_07_SWIM1, S_FLICKY_07_SWIM3}, // S_FLICKY_07_SWIM2
+ {SPR_FL07, 6, 4, {A_FlickyCoast}, 2*FRACUNIT, S_FLICKY_07_SWIM1, S_FLICKY_07_SWIM3}, // S_FLICKY_07_SWIM3
+
+ // Fish
+ {SPR_FL08, 0, 2, {A_FlickyCheck}, S_FLICKY_08_AIM, 0, S_FLICKY_08_OUT}, // S_FLICKY_08_OUT
+ {SPR_FL08, 2, 1, {A_FlickyAim}, ANG30, 32*FRACUNIT, S_FLICKY_08_HOP}, // S_FLICKY_08_AIM
+ {SPR_FL08, 2, 1, {A_FlickyFlounder}, 2*FRACUNIT, 1*FRACUNIT, S_FLICKY_08_FLAP1}, // S_FLICKY_08_HOP
+ {SPR_FL08, 0, 4, {A_FlickyCheck}, S_FLICKY_08_AIM, 0, S_FLICKY_08_FLAP2}, // S_FLICKY_08_FLAP1
+ {SPR_FL08, 1, 4, {A_FlickyCheck}, S_FLICKY_08_AIM, 0, S_FLICKY_08_FLAP3}, // S_FLICKY_08_FLAP2
+ {SPR_FL08, 0, 4, {A_FlickyCheck}, S_FLICKY_08_AIM, 0, S_FLICKY_08_FLAP4}, // S_FLICKY_08_FLAP3
+ {SPR_FL08, 2, 4, {A_FlickyCheck}, S_FLICKY_08_AIM, 0, S_FLICKY_08_FLAP1}, // S_FLICKY_08_FLAP4
+ {SPR_FL08, 0, 4, {A_FlickyFly}, 3*FRACUNIT, 64*FRACUNIT, S_FLICKY_08_SWIM2}, // S_FLICKY_08_SWIM1
+ {SPR_FL08, 1, 4, {A_FlickyCoast}, FRACUNIT, S_FLICKY_08_SWIM1, S_FLICKY_08_SWIM3}, // S_FLICKY_08_SWIM2
+ {SPR_FL08, 0, 4, {A_FlickyCoast}, FRACUNIT, S_FLICKY_08_SWIM1, S_FLICKY_08_SWIM4}, // S_FLICKY_08_SWIM3
+ {SPR_FL08, 2, 4, {A_FlickyCoast}, FRACUNIT, S_FLICKY_08_SWIM1, S_FLICKY_08_SWIM4}, // S_FLICKY_08_SWIM4
+
+ // Ram
+ {SPR_FL09, 0, 2, {A_FlickyCheck}, S_FLICKY_09_AIM, 0, S_FLICKY_09_OUT}, // S_FLICKY_09_OUT
+ {SPR_FL09, 1, 1, {A_FlickyAim}, ANG30, 32*FRACUNIT, S_FLICKY_09_HOP}, // S_FLICKY_09_AIM
+ {SPR_FL09, 1, 1, {A_FlickyHop}, 7*FRACUNIT, 2*FRACUNIT, S_FLICKY_09_UP}, // S_FLICKY_09_HOP
+ {SPR_FL09, 2, 2, {A_FlickyCheck}, S_FLICKY_09_AIM, S_FLICKY_09_DOWN, S_FLICKY_09_UP}, // S_FLICKY_09_UP
+ {SPR_FL09, 3, 2, {A_FlickyCheck}, S_FLICKY_09_AIM, 0, S_FLICKY_09_DOWN}, // S_FLICKY_09_DOWN
+
+ // Puffin
+ {SPR_FL10, 0, 2, {A_FlickyCheck}, S_FLICKY_10_FLAP1, S_FLICKY_10_FLAP1, S_FLICKY_10_OUT}, // S_FLICKY_10_OUT
+ {SPR_FL10, 1, 3, {A_FlickySoar}, 4*FRACUNIT, 16*FRACUNIT, S_FLICKY_10_FLAP2}, // S_FLICKY_10_FLAP1
+ {SPR_FL10, 2, 3, {A_FlickySoar}, 4*FRACUNIT, 16*FRACUNIT, S_FLICKY_10_FLAP1}, // S_FLICKY_10_FLAP2
+
+ // Cow
+ {SPR_FL11, 0, 2, {A_FlickyCheck}, S_FLICKY_11_AIM, 0, S_FLICKY_11_OUT}, // S_FLICKY_11_OUT
+ {SPR_FL11, 1, 1, {A_FlickyAim}, ANGLE_90, 64*FRACUNIT, S_FLICKY_11_RUN1}, // S_FLICKY_11_AIM
+ {SPR_FL11, 1, 3, {A_FlickyHop}, FRACUNIT/2, 2*FRACUNIT, S_FLICKY_11_RUN2}, // S_FLICKY_11_RUN1
+ {SPR_FL11, 2, 4, {A_FlickyHop}, FRACUNIT/2, 2*FRACUNIT, S_FLICKY_11_RUN3}, // S_FLICKY_11_RUN2
+ {SPR_FL11, 3, 4, {A_FlickyHop}, FRACUNIT/2, 2*FRACUNIT, S_FLICKY_11_AIM}, // S_FLICKY_11_RUN3
+
+ // Rat
+ {SPR_FL12, 0, 2, {A_FlickyCheck}, S_FLICKY_12_AIM, 0, S_FLICKY_12_OUT}, // S_FLICKY_12_OUT
+ {SPR_FL12, 1, 1, {A_FlickyAim}, ANGLE_90, 32*FRACUNIT, S_FLICKY_12_RUN1}, // S_FLICKY_12_AIM
+ {SPR_FL12, 1, 2, {A_FlickyHop}, 1, 12*FRACUNIT, S_FLICKY_12_RUN2}, // S_FLICKY_12_RUN1
+ {SPR_FL12, 2, 3, {A_FlickyHop}, 1, 12*FRACUNIT, S_FLICKY_12_RUN3}, // S_FLICKY_12_RUN2
+ {SPR_FL12, 3, 3, {A_FlickyHop}, 1, 12*FRACUNIT, S_FLICKY_12_AIM}, // S_FLICKY_12_RUN3
+
+ // Bear
+ {SPR_FL13, 0, 2, {A_FlickyCheck}, S_FLICKY_13_AIM, 0, S_FLICKY_13_OUT}, // S_FLICKY_13_OUT
+ {SPR_FL13, 1, 1, {A_FlickyAim}, ANG30, 32*FRACUNIT, S_FLICKY_13_HOP}, // S_FLICKY_13_AIM
+ {SPR_FL13, 1, 1, {A_FlickyHop}, 5*FRACUNIT, 3*FRACUNIT, S_FLICKY_13_UP}, // S_FLICKY_13_HOP
+ {SPR_FL13, 2, 2, {A_FlickyCheck}, S_FLICKY_13_AIM, S_FLICKY_13_DOWN, S_FLICKY_13_UP}, // S_FLICKY_13_UP
+ {SPR_FL13, 3, 2, {A_FlickyCheck}, S_FLICKY_13_AIM, 0, S_FLICKY_13_DOWN}, // S_FLICKY_13_DOWN
+
+ // Dove
+ {SPR_FL14, 0, 2, {A_FlickyCheck}, S_FLICKY_14_FLAP1, S_FLICKY_14_FLAP1, S_FLICKY_14_OUT}, // S_FLICKY_14_OUT
+ {SPR_FL14, 1, 3, {A_FlickySoar}, 4*FRACUNIT, 32*FRACUNIT, S_FLICKY_14_FLAP2}, // S_FLICKY_14_FLAP1
+ {SPR_FL14, 2, 3, {A_FlickySoar}, 4*FRACUNIT, 32*FRACUNIT, S_FLICKY_14_FLAP3}, // S_FLICKY_14_FLAP2
+ {SPR_FL14, 3, 3, {A_FlickySoar}, 4*FRACUNIT, 32*FRACUNIT, S_FLICKY_14_FLAP1}, // S_FLICKY_14_FLAP3
+
+ // Cat
+ {SPR_FL15, 0, 2, {A_FlickyCheck}, S_FLICKY_15_AIM, 0, S_FLICKY_15_OUT}, // S_FLICKY_15_OUT
+ {SPR_FL15, 1, 1, {A_FlickyAim}, ANG30, 32*FRACUNIT, S_FLICKY_15_HOP}, // S_FLICKY_15_AIM
+ {SPR_FL15, 1, 1, {A_FlickyFlounder}, 2*FRACUNIT, 6*FRACUNIT, S_FLICKY_15_UP}, // S_FLICKY_15_HOP
+ {SPR_FL15, 2, 2, {A_FlickyCheck}, S_FLICKY_15_AIM, S_FLICKY_15_DOWN, S_FLICKY_15_UP}, // S_FLICKY_15_UP
+ {SPR_FL15, 3, 2, {A_FlickyCheck}, S_FLICKY_15_AIM, 0, S_FLICKY_15_DOWN}, // S_FLICKY_15_DOWN
+
+ // Canary
+ {SPR_FL16, 0, 2, {A_FlickyHeightCheck}, S_FLICKY_16_FLAP1, 0, S_FLICKY_16_OUT}, // S_FLICKY_16_OUT
+ {SPR_FL16, 1, 3, {A_FlickyFly}, 4*FRACUNIT, 8*FRACUNIT, S_FLICKY_16_FLAP2}, // S_FLICKY_16_FLAP1
+ {SPR_FL16, 2, 3, {A_SetObjectFlags}, MF_NOGRAVITY, 1, S_FLICKY_16_FLAP3}, // S_FLICKY_16_FLAP2
+ {SPR_FL16, 3, 3, {A_FlickyHeightCheck}, S_FLICKY_16_FLAP1, 0, S_FLICKY_16_FLAP3}, // S_FLICKY_16_FLAP3
// Yellow Spring
{SPR_SPRY, 0, -1, {NULL}, 0, 0, S_NULL}, // S_YELLOWSPRING
@@ -2421,7 +2522,7 @@ state_t states[NUMSTATES] =
{SPR_TFOG, FF_FULLBRIGHT|FF_TRANS50|13, 2, {NULL}, 0, 0, S_NULL}, // S_FOG14
// Flower Seed
- {SPR_SEED, FF_FULLBRIGHT, -1, {NULL}, 0, 0, S_NULL}, // S_SEED
+ {SPR_SEED, FF_FULLBRIGHT|FF_ANIMATE, -1, {NULL}, 2, 2, S_NULL}, // S_SEED
// Particle sprite
{SPR_PRTL, FF_FULLBRIGHT|FF_TRANS70, 2*TICRATE, {NULL}, 0, 0, S_NULL}, // S_PARTICLE
@@ -2816,14 +2917,15 @@ state_t states[NUMSTATES] =
{SPR_CEMG, FF_FULLBRIGHT|15, 1, {A_OrbitNights}, ANG2*2, 0, S_ORBITEM8}, // S_ORBITEM16
// Flicky helper for NiGHTS
- {SPR_BIRD, 0, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER2}, // S_NIGHTOPIANHELPER1
- {SPR_BIRD, 0, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER3}, // S_NIGHTOPIANHELPER2
- {SPR_BIRD, 0, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER4}, // S_NIGHTOPIANHELPER3
- {SPR_BIRD, 0, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER5}, // S_NIGHTOPIANHELPER4
- {SPR_BIRD, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER6}, // S_NIGHTOPIANHELPER5
- {SPR_BIRD, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER7}, // S_NIGHTOPIANHELPER6
- {SPR_BIRD, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER8}, // S_NIGHTOPIANHELPER7
- {SPR_BIRD, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER1}, // S_NIGHTOPIANHELPER8
+ {SPR_FL01, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER2}, // S_NIGHTOPIANHELPER1
+ {SPR_FL01, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER3}, // S_NIGHTOPIANHELPER2
+ {SPR_FL01, 1, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER4}, // S_NIGHTOPIANHELPER3
+ {SPR_FL01, 2, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER5}, // S_NIGHTOPIANHELPER4
+ {SPR_FL01, 2, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER6}, // S_NIGHTOPIANHELPER5
+ {SPR_FL01, 2, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER7}, // S_NIGHTOPIANHELPER6
+ {SPR_FL01, 3, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER8}, // S_NIGHTOPIANHELPER7
+ {SPR_FL01, 3, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER9}, // S_NIGHTOPIANHELPER8
+ {SPR_FL01, 3, 1, {A_OrbitNights}, ANG2*2, 180 | 0x10000, S_NIGHTOPIANHELPER1}, // S_NIGHTOPIANHELPER9
{SPR_NULL, 0, 35, {NULL}, 0, 0, S_CRUMBLE2}, // S_CRUMBLE1
{SPR_NULL, 0, 105, {A_Scream}, 0, 0, S_NULL}, // S_CRUMBLE2
@@ -2847,10 +2949,11 @@ state_t states[NUMSTATES] =
{SPR_SPRK, FF_TRANS90|3, 1, {NULL}, 0, 0, S_NULL}, // S_SPRK16
// Robot Explosion
- {SPR_BOM1, 0, 1, {A_Scream}, 0, 0, S_XPLD2}, // S_XPLD1
- {SPR_BOM1, 1, 5, {NULL}, 0, 0, S_XPLD3}, // S_XPLD2
- {SPR_BOM1, 2, 5, {NULL}, 0, 0, S_XPLD4}, // S_XPLD3
- {SPR_BOM1, 3, 5, {NULL}, 0, 0, S_NULL}, // S_XPLD4
+ {SPR_BOM1, 0, 0, {A_FlickySpawn}, 0, 0, S_XPLD1}, // S_XPLD_FLICKY
+ {SPR_BOM1, 0, 1, {A_Scream}, 0, 0, S_XPLD2}, // S_XPLD1
+ {SPR_BOM1, FF_ANIMATE|1, 15, {NULL}, 2, 5, S_NULL}, // S_XPLD2
+
+ {SPR_BOM1, FF_ANIMATE, 20, {NULL}, 3, 5, S_INVISIBLE}, // S_XPLD_EGGTRAP
// Underwater Explosion
{SPR_BOM4, 0, 3, {A_Scream}, 0, 0, S_WPLD2}, // S_WPLD1
@@ -3007,7 +3110,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
3, // speed
@@ -3034,7 +3137,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
3, // speed
@@ -3061,7 +3164,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_FISH3, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_FISH4, // xdeathstate
sfx_pop, // deathsound
0, // speed
@@ -3088,7 +3191,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
4*FRACUNIT, // speed
@@ -3115,7 +3218,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
8*FRACUNIT, // speed
@@ -3142,7 +3245,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
6*FRACUNIT, // speed
@@ -3169,7 +3272,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
1*FRACUNIT, // speed
@@ -3196,7 +3299,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_NULL, // meleestate
S_JETGSHOOT1, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
1*FRACUNIT, // speed
@@ -3223,7 +3326,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_dmpain, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
3, // speed
@@ -3250,7 +3353,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_DETON16, // xdeathstate
sfx_pop, // deathsound
1*FRACUNIT, // speed
@@ -3277,7 +3380,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_SKIM3, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
8, // speed
@@ -3331,7 +3434,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_s3k64, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
0, // speed
@@ -3358,7 +3461,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_NULL, // meleestate
S_SHARP_AIM1, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_SHARP_SPIN, // xdeathstate
sfx_pop, // deathsound
2, // speed
@@ -3385,7 +3488,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
8, // speed
@@ -3412,7 +3515,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
FRACUNIT, // speed
@@ -3439,7 +3542,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_NULL, // meleestate
S_VULTURE_ZOOM1,// missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
3, // speed
@@ -3466,7 +3569,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
5*FRACUNIT, // speed
@@ -3520,7 +3623,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_NULL, // meleestate
S_ROBOHOOD_SHOOT, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_ROBOHOOD_JUMP2, // xdeathstate
sfx_pop, // deathsound
0, // speed
@@ -3547,7 +3650,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_FACESTABBER_CHARGE1, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
3, // speed
@@ -3574,7 +3677,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_EGGGUARD_RUN1, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
6, // speed
@@ -3628,7 +3731,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
3, // speed
@@ -3655,7 +3758,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_MINUS_DOWNWARD1,// meleestate
S_MINUS_POPUP, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
12, // speed
@@ -3682,7 +3785,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_spring, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
6, // speed
@@ -3709,7 +3812,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_spring, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
6, // speed
@@ -3736,7 +3839,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
- S_XPLD1, // deathstate
+ S_XPLD_FLICKY, // deathstate
S_NULL, // xdeathstate
sfx_pop, // deathsound
2, // speed
@@ -11038,11 +11141,12 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_BIRD
+ // Bluebird
+ { // MT_FLICKY_01
-1, // doomednum
- S_BIRD1, // spawnstate
+ S_FLICKY_01_OUT, // spawnstate
1000, // spawnhealth
- S_BIRD1, // seestate
+ S_NULL, // seestate
sfx_None, // seesound
8, // reactiontime
sfx_None, // attacksound
@@ -11055,22 +11159,21 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_None, // deathsound
8, // speed
- 16*FRACUNIT, // radius
- 16*FRACUNIT, // height
+ 8*FRACUNIT, // radius
+ 20*FRACUNIT, // height
0, // display offset
16, // mass
0, // damage
sfx_None, // activesound
- MF_NOCLIPTHING|MF_FLOAT|MF_NOGRAVITY, // flags
- S_NULL // raisestate
+ MF_NOCLIPTHING, // flags
+ S_FLICKY_BUBBLE // raisestate
},
- // freed bunny
- { // MT_BUNNY
+ { // MT_FLICKY_02
-1, // doomednum
- S_BUNNY1, // spawnstate
+ S_FLICKY_02_OUT, // spawnstate
1000, // spawnhealth
- S_BUNNY1, // seestate
+ S_NULL, // seestate
sfx_None, // seesound
8, // reactiontime
sfx_None, // attacksound
@@ -11083,50 +11186,77 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_None, // deathsound
8, // speed
- 16*FRACUNIT, // radius
- 16*FRACUNIT, // height
+ 8*FRACUNIT, // radius
+ 20*FRACUNIT, // height
0, // display offset
16, // mass
0, // damage
sfx_None, // activesound
- MF_NOCLIPTHING|MF_FLOAT, // flags
- S_NULL // raisestate
+ MF_NOCLIPTHING, // flags
+ S_FLICKY_BUBBLE // raisestate
},
- { // MT_MOUSE
+ { // MT_FLICKY_03
-1, // doomednum
- S_MOUSE1, // spawnstate
- 1, // spawnhealth
+ S_FLICKY_03_OUT, // spawnstate
+ 1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
- 1, // reactiontime
+ 8, // reactiontime
sfx_None, // attacksound
S_NULL, // painstate
- 200, // painchance
+ 0, // painchance
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
S_NULL, // deathstate
S_NULL, // xdeathstate
sfx_None, // deathsound
- 20*FRACUNIT, // speed
- 4*FRACUNIT, // radius
- 4*FRACUNIT, // height
+ 8, // speed
+ 8*FRACUNIT, // radius
+ 20*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 16, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOCLIPTHING, // flags
+ S_FLICKY_BUBBLE // raisestate
+ },
+
+ { // MT_FLICKY_04
+ -1, // doomednum
+ S_FLICKY_04_OUT, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_FLICKY_04_SWIM1, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 8, // speed
+ 8*FRACUNIT, // radius
+ 20*FRACUNIT, // height
+ 0, // display offset
+ 16, // mass
0, // damage
sfx_None, // activesound
MF_NOCLIPTHING, // flags
S_NULL // raisestate
},
- { // MT_CHICKEN
+ { // MT_FLICKY_05
-1, // doomednum
- S_CHICKEN1, // spawnstate
+ S_FLICKY_05_OUT, // spawnstate
1000, // spawnhealth
- S_CHICKEN1, // seestate
+ S_NULL, // seestate
sfx_None, // seesound
- 0, // reactiontime
+ 8, // reactiontime
sfx_None, // attacksound
S_NULL, // painstate
0, // painchance
@@ -11136,71 +11266,314 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // deathstate
S_NULL, // xdeathstate
sfx_None, // deathsound
- 1, // speed
- 16*FRACUNIT, // radius
- 16*FRACUNIT, // height
+ 8, // speed
+ 8*FRACUNIT, // radius
+ 20*FRACUNIT, // height
0, // display offset
16, // mass
0, // damage
sfx_None, // activesound
- MF_NOCLIPTHING|MF_FLOAT, // flags
- S_NULL // raisestate
+ MF_NOCLIPTHING, // flags
+ S_FLICKY_BUBBLE // raisestate
},
- { // MT_COW
+ { // MT_FLICKY_06
-1, // doomednum
- S_COW1, // spawnstate
- 1, // spawnhealth
+ S_FLICKY_06_OUT, // spawnstate
+ 1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
- 1, // reactiontime
+ 8, // reactiontime
sfx_None, // attacksound
S_NULL, // painstate
- 200, // painchance
+ 0, // painchance
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
S_NULL, // deathstate
S_NULL, // xdeathstate
sfx_None, // deathsound
- 4, // speed
- 4*FRACUNIT, // radius
- 4*FRACUNIT, // height
+ 8, // speed
+ 8*FRACUNIT, // radius
+ 20*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 16, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOCLIPTHING, // flags
+ S_FLICKY_BUBBLE // raisestate
+ },
+
+ { // MT_FLICKY_07
+ -1, // doomednum
+ S_FLICKY_07_OUT, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 0, // painchance
+ sfx_None, // painsound
+ S_FLICKY_07_SWIM1, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 8, // speed
+ 8*FRACUNIT, // radius
+ 20*FRACUNIT, // height
+ 0, // display offset
+ 16, // mass
0, // damage
sfx_None, // activesound
MF_NOCLIPTHING, // flags
S_NULL // raisestate
},
- { // MT_REDBIRD
+ { // MT_FLICKY_08
-1, // doomednum
- S_RBIRD1, // spawnstate
+ S_FLICKY_08_OUT, // spawnstate
1000, // spawnhealth
- S_RBIRD1, // seestate
+ S_NULL, // seestate
sfx_None, // seesound
8, // reactiontime
sfx_None, // attacksound
S_NULL, // painstate
0, // painchance
sfx_None, // painsound
- S_NULL, // meleestate
+ S_FLICKY_08_SWIM1, // meleestate
S_NULL, // missilestate
S_NULL, // deathstate
S_NULL, // xdeathstate
sfx_None, // deathsound
8, // speed
- 16*FRACUNIT, // radius
- 16*FRACUNIT, // height
+ 8*FRACUNIT, // radius
+ 20*FRACUNIT, // height
0, // display offset
16, // mass
0, // damage
sfx_None, // activesound
- MF_NOCLIPTHING|MF_FLOAT|MF_NOGRAVITY, // flags
+ MF_NOCLIPTHING, // flags
S_NULL // raisestate
},
+ { // MT_FLICKY_09
+ -1, // doomednum
+ S_FLICKY_09_OUT, // 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
+ 8, // speed
+ 8*FRACUNIT, // radius
+ 20*FRACUNIT, // height
+ 0, // display offset
+ 16, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOCLIPTHING, // flags
+ S_FLICKY_BUBBLE // raisestate
+ },
+
+ { // MT_FLICKY_10
+ -1, // doomednum
+ S_FLICKY_10_OUT, // 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
+ 8, // speed
+ 8*FRACUNIT, // radius
+ 20*FRACUNIT, // height
+ 0, // display offset
+ 16, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOCLIPTHING, // flags
+ S_FLICKY_BUBBLE // raisestate
+ },
+
+ { // MT_FLICKY_11
+ -1, // doomednum
+ S_FLICKY_11_OUT, // 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
+ 8, // speed
+ 8*FRACUNIT, // radius
+ 20*FRACUNIT, // height
+ 0, // display offset
+ 16, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOCLIPTHING, // flags
+ S_FLICKY_BUBBLE // raisestate
+ },
+
+ { // MT_FLICKY_12
+ -1, // doomednum
+ S_FLICKY_12_OUT, // 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
+ 8, // speed
+ 8*FRACUNIT, // radius
+ 20*FRACUNIT, // height
+ 0, // display offset
+ 16, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOCLIPTHING, // flags
+ S_FLICKY_BUBBLE // raisestate
+ },
+
+ { // MT_FLICKY_13
+ -1, // doomednum
+ S_FLICKY_13_OUT, // 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
+ 8, // speed
+ 8*FRACUNIT, // radius
+ 20*FRACUNIT, // height
+ 0, // display offset
+ 16, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOCLIPTHING, // flags
+ S_FLICKY_BUBBLE // raisestate
+ },
+
+ { // MT_FLICKY_14
+ -1, // doomednum
+ S_FLICKY_14_OUT, // 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
+ 8, // speed
+ 8*FRACUNIT, // radius
+ 20*FRACUNIT, // height
+ 0, // display offset
+ 16, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOCLIPTHING, // flags
+ S_FLICKY_BUBBLE // raisestate
+ },
+
+ { // MT_FLICKY_15
+ -1, // doomednum
+ S_FLICKY_15_OUT, // 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
+ 8, // speed
+ 8*FRACUNIT, // radius
+ 20*FRACUNIT, // height
+ 0, // display offset
+ 16, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOCLIPTHING, // flags
+ S_FLICKY_BUBBLE // raisestate
+ },
+
+ { // MT_FLICKY_16
+ -1, // doomednum
+ S_FLICKY_16_OUT, // 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
+ 8, // speed
+ 8*FRACUNIT, // radius
+ 20*FRACUNIT, // height
+ 0, // display offset
+ 16, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOCLIPTHING, // flags
+ S_FLICKY_BUBBLE // raisestate
+ },
+
{ // MT_RAIN
-1, // doomednum
S_RAIN1, // spawnstate
@@ -11494,7 +11867,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
4, // mass
0, // damage
sfx_None, // activesound
- MF_NOBLOCKMAP|MF_NOGRAVITY|MF_SCENERY, // flags
+ MF_NOBLOCKMAP|MF_SCENERY, // flags
S_NULL // raisestate
},
diff --git a/src/info.h b/src/info.h
index 932180ebf01e8c2b84be979c66b7a38c19c1315a..edd8541d423a0c28437cdb08ecc285943f520c1e 100644
--- a/src/info.h
+++ b/src/info.h
@@ -214,6 +214,16 @@ void A_BrakFireShot();
void A_BrakLobShot();
void A_NapalmScatter();
void A_SpawnFreshCopy();
+void A_FlickySpawn();
+void A_FlickyAim();
+void A_FlickyFly();
+void A_FlickySoar();
+void A_FlickyCoast();
+void A_FlickyHop();
+void A_FlickyFlounder();
+void A_FlickyCheck();
+void A_FlickyHeightCheck();
+void A_FlickyFlutter();
// ratio of states to sprites to mobj types is roughly 6 : 1 : 1
#define NUMMOBJFREESLOTS 256
@@ -449,13 +459,24 @@ typedef enum sprite
SPR_GOAL, // Special Stage goal (here because lol NiGHTS)
- // Freed Animals
- SPR_BIRD, // Birdie freed!
- SPR_BUNY, // Bunny freed!
- SPR_MOUS, // Mouse
- SPR_CHIC, // Chicken
- SPR_COWZ, // Cow
- SPR_RBRD, // Red Birdie in Bubble
+ // Flickies
+ SPR_FBUB, // Flicky-sized bubble
+ SPR_FL01, // Bluebird
+ SPR_FL02, // Rabbit
+ SPR_FL03, // Chicken
+ SPR_FL04, // Seal
+ SPR_FL05, // Pig
+ SPR_FL06, // Chipmunk
+ SPR_FL07, // Penguin
+ SPR_FL08, // Fish
+ SPR_FL09, // Ram
+ SPR_FL10, // Puffin
+ SPR_FL11, // Cow
+ SPR_FL12, // Rat
+ SPR_FL13, // Bear
+ SPR_FL14, // Dove
+ SPR_FL15, // Cat
+ SPR_FL16, // Canary
// Springs
SPR_SPRY, // yellow spring
@@ -2419,43 +2440,133 @@ typedef enum state
S_SSPK4,
S_SSPK5,
- // Freed Birdie
- S_BIRD1,
- S_BIRD2,
- S_BIRD3,
-
- // Freed Bunny
- S_BUNNY1,
- S_BUNNY2,
- S_BUNNY3,
- S_BUNNY4,
- S_BUNNY5,
- S_BUNNY6,
- S_BUNNY7,
- S_BUNNY8,
- S_BUNNY9,
- S_BUNNY10,
-
- // Freed Mouse
- S_MOUSE1,
- S_MOUSE2,
-
- // Freed Chicken
- S_CHICKEN1,
- S_CHICKENHOP,
- S_CHICKENFLY1,
- S_CHICKENFLY2,
-
- // Freed Cow
- S_COW1,
- S_COW2,
- S_COW3,
- S_COW4,
-
- // Red Birdie in Bubble
- S_RBIRD1,
- S_RBIRD2,
- S_RBIRD3,
+ // Flicky-sized bubble
+ S_FLICKY_BUBBLE,
+
+ // Bluebird
+ S_FLICKY_01_OUT,
+ S_FLICKY_01_FLAP1,
+ S_FLICKY_01_FLAP2,
+ S_FLICKY_01_FLAP3,
+
+ // Rabbit
+ S_FLICKY_02_OUT,
+ S_FLICKY_02_AIM,
+ S_FLICKY_02_HOP,
+ S_FLICKY_02_UP,
+ S_FLICKY_02_DOWN,
+
+ // Chicken
+ S_FLICKY_03_OUT,
+ S_FLICKY_03_AIM,
+ S_FLICKY_03_HOP,
+ S_FLICKY_03_UP,
+ S_FLICKY_03_FLAP1,
+ S_FLICKY_03_FLAP2,
+
+ // Seal
+ S_FLICKY_04_OUT,
+ S_FLICKY_04_AIM,
+ S_FLICKY_04_HOP,
+ S_FLICKY_04_UP,
+ S_FLICKY_04_DOWN,
+ S_FLICKY_04_SWIM1,
+ S_FLICKY_04_SWIM2,
+ S_FLICKY_04_SWIM3,
+ S_FLICKY_04_SWIM4,
+
+ // Pig
+ S_FLICKY_05_OUT,
+ S_FLICKY_05_AIM,
+ S_FLICKY_05_HOP,
+ S_FLICKY_05_UP,
+ S_FLICKY_05_DOWN,
+
+ // Chipmunk
+ S_FLICKY_06_OUT,
+ S_FLICKY_06_AIM,
+ S_FLICKY_06_HOP,
+ S_FLICKY_06_UP,
+ S_FLICKY_06_DOWN,
+
+ // Penguin
+ S_FLICKY_07_OUT,
+ S_FLICKY_07_AIML,
+ S_FLICKY_07_HOPL,
+ S_FLICKY_07_UPL,
+ S_FLICKY_07_DOWNL,
+ S_FLICKY_07_AIMR,
+ S_FLICKY_07_HOPR,
+ S_FLICKY_07_UPR,
+ S_FLICKY_07_DOWNR,
+ S_FLICKY_07_SWIM1,
+ S_FLICKY_07_SWIM2,
+ S_FLICKY_07_SWIM3,
+
+ // Fish
+ S_FLICKY_08_OUT,
+ S_FLICKY_08_AIM,
+ S_FLICKY_08_HOP,
+ S_FLICKY_08_FLAP1,
+ S_FLICKY_08_FLAP2,
+ S_FLICKY_08_FLAP3,
+ S_FLICKY_08_FLAP4,
+ S_FLICKY_08_SWIM1,
+ S_FLICKY_08_SWIM2,
+ S_FLICKY_08_SWIM3,
+ S_FLICKY_08_SWIM4,
+
+ // Ram
+ S_FLICKY_09_OUT,
+ S_FLICKY_09_AIM,
+ S_FLICKY_09_HOP,
+ S_FLICKY_09_UP,
+ S_FLICKY_09_DOWN,
+
+ // Puffin
+ S_FLICKY_10_OUT,
+ S_FLICKY_10_FLAP1,
+ S_FLICKY_10_FLAP2,
+
+ // Cow
+ S_FLICKY_11_OUT,
+ S_FLICKY_11_AIM,
+ S_FLICKY_11_RUN1,
+ S_FLICKY_11_RUN2,
+ S_FLICKY_11_RUN3,
+
+ // Rat
+ S_FLICKY_12_OUT,
+ S_FLICKY_12_AIM,
+ S_FLICKY_12_RUN1,
+ S_FLICKY_12_RUN2,
+ S_FLICKY_12_RUN3,
+
+ // Bear
+ S_FLICKY_13_OUT,
+ S_FLICKY_13_AIM,
+ S_FLICKY_13_HOP,
+ S_FLICKY_13_UP,
+ S_FLICKY_13_DOWN,
+
+ // Dove
+ S_FLICKY_14_OUT,
+ S_FLICKY_14_FLAP1,
+ S_FLICKY_14_FLAP2,
+ S_FLICKY_14_FLAP3,
+
+ // Cat
+ S_FLICKY_15_OUT,
+ S_FLICKY_15_AIM,
+ S_FLICKY_15_HOP,
+ S_FLICKY_15_UP,
+ S_FLICKY_15_DOWN,
+
+ // Canary
+ S_FLICKY_16_OUT,
+ S_FLICKY_16_FLAP1,
+ S_FLICKY_16_FLAP2,
+ S_FLICKY_16_FLAP3,
S_YELLOWSPRING,
S_YELLOWSPRING2,
@@ -2955,6 +3066,7 @@ typedef enum state
S_NIGHTOPIANHELPER6,
S_NIGHTOPIANHELPER7,
S_NIGHTOPIANHELPER8,
+ S_NIGHTOPIANHELPER9,
S_CRUMBLE1,
S_CRUMBLE2,
@@ -2978,10 +3090,10 @@ typedef enum state
S_SPRK16,
// Robot Explosion
+ S_XPLD_FLICKY,
S_XPLD1,
S_XPLD2,
- S_XPLD3,
- S_XPLD4,
+ S_XPLD_EGGTRAP,
// Underwater Explosion
S_WPLD1,
@@ -3408,13 +3520,23 @@ typedef enum mobj_type
MT_IVSP, // Invincibility sparkles
MT_SUPERSPARK, // Super Sonic Spark
- // Freed Animals
- MT_BIRD, // Birdie freed!
- MT_BUNNY, // Bunny freed!
- MT_MOUSE, // Mouse
- MT_CHICKEN, // Chicken
- MT_COW, // Cow
- MT_REDBIRD, // Red Birdie in Bubble
+ // Flickies
+ MT_FLICKY_01, // Bluebird
+ MT_FLICKY_02, // Rabbit
+ MT_FLICKY_03, // Chicken
+ MT_FLICKY_04, // Seal
+ MT_FLICKY_05, // Pig
+ MT_FLICKY_06, // Chipmunk
+ MT_FLICKY_07, // Penguin
+ MT_FLICKY_08, // Fish
+ MT_FLICKY_09, // Ram
+ MT_FLICKY_10, // Puffin
+ MT_FLICKY_11, // Cow
+ MT_FLICKY_12, // Rat
+ MT_FLICKY_13, // Bear
+ MT_FLICKY_14, // Dove
+ MT_FLICKY_15, // Cat
+ MT_FLICKY_16, // Canary
// Environmental Effects
MT_RAIN, // Rain
diff --git a/src/p_enemy.c b/src/p_enemy.c
index fab1f26ac4802a33f8c7180ddd1ef5819fd0d9b8..eace8ccc9e0911b7983d6a33e3080d97c6a8aef0 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -242,6 +242,16 @@ void A_BrakFireShot(mobj_t *actor);
void A_BrakLobShot(mobj_t *actor);
void A_NapalmScatter(mobj_t *actor);
void A_SpawnFreshCopy(mobj_t *actor);
+void A_FlickySpawn(mobj_t *actor);
+void A_FlickyAim(mobj_t *actor);
+void A_FlickyFly(mobj_t *actor);
+void A_FlickySoar(mobj_t *actor);
+void A_FlickyCoast(mobj_t *actor);
+void A_FlickyHop(mobj_t *actor);
+void A_FlickyFlounder(mobj_t *actor);
+void A_FlickyCheck(mobj_t *actor);
+void A_FlickyHeightCheck(mobj_t *actor);
+void A_FlickyFlutter(mobj_t *actor);
//
// ENEMY THINKING
@@ -10336,3 +10346,392 @@ void A_SpawnFreshCopy(mobj_t *actor)
if (newObject->info->seesound)
S_StartSound(newObject, newObject->info->seesound);
}
+
+// Internal Flicky spawning function.
+mobj_t *P_InternalFlickySpawn(mobj_t *actor, mobjtype_t flickytype, fixed_t momz, boolean lookforplayers)
+{
+ mobj_t *flicky;
+
+ if (!flickytype)
+ {
+ if (!mapheaderinfo[gamemap-1] || !mapheaderinfo[gamemap-1]->numFlickies) // No mapheader, no shoes, no service.
+ return NULL;
+ else
+ {
+ INT32 prandom = P_RandomKey(mapheaderinfo[gamemap-1]->numFlickies);
+ flickytype = mapheaderinfo[gamemap-1]->flickies[prandom];
+ }
+ }
+
+ flicky = P_SpawnMobjFromMobj(actor, 0, 0, 0, flickytype);
+ flicky->angle = actor->angle;
+
+ if (flickytype == MT_SEED)
+ flicky->z += P_MobjFlip(actor)*(actor->height - flicky->height)/2;
+
+ if (actor->eflags & MFE_UNDERWATER)
+ momz = FixedDiv(momz, FixedSqrt(3*FRACUNIT));
+
+ P_SetObjectMomZ(flicky, momz, false);
+ flicky->movedir = (P_RandomChance(FRACUNIT/2) ? -1 : 1);
+ flicky->fuse = P_RandomRange(595, 700); // originally 300, 350
+ flicky->threshold = 0;
+
+ if (lookforplayers)
+ P_LookForPlayers(flicky, true, false, 0);
+
+ return flicky;
+}
+
+// Function: A_FlickySpawn
+//
+// Description: Flicky spawning function.
+//
+// var1:
+// lower 16 bits: if 0, spawns random flicky based on level header. Else, spawns the designated thing type.
+// upper 16 bits: if 0, no sound is played. Else, A_Scream is called.
+// var2 = upwards thrust for spawned flicky. If zero, default value is provided.
+//
+void A_FlickySpawn(mobj_t *actor)
+{
+ INT32 locvar1 = var1;
+ INT32 locvar2 = var2;
+#ifdef HAVE_BLUA
+ if (LUA_CallAction("A_FlickySpawn", actor))
+ return;
+#endif
+
+ if (locvar1 >> 16) {
+ A_Scream(actor); // A shortcut for the truly lazy.
+ locvar1 &= 65535;
+ }
+
+ P_InternalFlickySpawn(actor, locvar1, ((locvar2) ? locvar2 : 8*FRACUNIT), true);
+}
+
+// Internal Flicky bubbling function.
+void P_InternalFlickyBubble(mobj_t *actor)
+{
+ if (actor->eflags & MFE_UNDERWATER)
+ {
+ mobj_t *overlay;
+
+ if (!((actor->z + 3*actor->height/2) < actor->watertop) || !mobjinfo[actor->type].raisestate || actor->tracer)
+ return;
+
+ overlay = P_SpawnMobj(actor->x, actor->y, actor->z, MT_OVERLAY);
+ P_SetMobjStateNF(overlay, mobjinfo[actor->type].raisestate);
+ P_SetTarget(&actor->tracer, overlay);
+ P_SetTarget(&overlay->target, actor);
+ return;
+ }
+
+ if (!actor->tracer || P_MobjWasRemoved(actor->tracer))
+ return;
+
+ P_RemoveMobj(actor->tracer);
+ P_SetTarget(&actor->tracer, NULL);
+}
+
+// Function: A_FlickyAim
+//
+// Description: Flicky aiming function.
+//
+// var1 = how far around the target (in angle constants) the flicky should look
+// var2 = distance from target to aim for
+//
+void A_FlickyAim(mobj_t *actor)
+{
+ INT32 locvar1 = var1;
+ INT32 locvar2 = var2;
+ boolean flickyhitwall = false;
+
+#ifdef HAVE_BLUA
+ if (LUA_CallAction("A_FlickyAim", actor))
+ return;
+#endif
+
+ if (actor->momx == actor->momy && actor->momy == 0)
+ flickyhitwall = true;
+
+ P_InternalFlickyBubble(actor);
+ P_InstaThrust(actor, 0, 0);
+
+ if (!actor->target)
+ {
+ P_LookForPlayers(actor, true, false, 0);
+ actor->angle = P_RandomKey(36)*ANG10;
+ return;
+ }
+
+ if (actor->fuse > 2*TICRATE)
+ {
+ angle_t posvar;
+ fixed_t chasevar, chasex, chasey;
+
+ if (flickyhitwall)
+ actor->movedir *= -1;
+
+ posvar = ((R_PointToAngle2(actor->target->x, actor->target->y, actor->x, actor->y) + actor->movedir*locvar1) >> ANGLETOFINESHIFT) & FINEMASK;
+ chasevar = FixedSqrt(max(FRACUNIT, P_AproxDistance(actor->target->x - actor->x, actor->target->y - actor->y) - locvar2)) + locvar2;
+
+ chasex = actor->target->x + FixedMul(FINECOSINE(posvar), chasevar);
+ chasey = actor->target->y + FixedMul(FINESINE(posvar), chasevar);
+
+ if (P_AproxDistance(chasex - actor->x, chasey - actor->y))
+ actor->angle = R_PointToAngle2(actor->x, actor->y, chasex, chasey);
+ }
+ else if (flickyhitwall)
+ {
+ actor->angle += ANGLE_180;
+ actor->threshold = 0;
+ }
+}
+
+//Internal Flicky flying function. Also usuable as an underwater swim thrust.
+void P_InternalFlickyFly(mobj_t *actor, fixed_t flyspeed, fixed_t targetdist, fixed_t chasez)
+{
+ angle_t vertangle;
+
+ flyspeed = FixedMul(flyspeed, actor->scale);
+ actor->flags |= MF_NOGRAVITY;
+
+ var1 = ANG30;
+ var2 = 32*FRACUNIT;
+ A_FlickyAim(actor);
+
+ chasez *= 8;
+ if (!actor->target || !(actor->fuse > 2*TICRATE))
+ chasez += ((actor->eflags & MFE_VERTICALFLIP) ? actor->ceilingz - 24*FRACUNIT : actor->floorz + 24*FRACUNIT);
+ else
+ {
+ fixed_t add = actor->target->z + (actor->target->height - actor->height)/2;
+ if (add > (actor->ceilingz - 24*actor->scale - actor->height))
+ add = actor->ceilingz - 24*actor->scale - actor->height;
+ else if (add < (actor->floorz + 24*actor->scale))
+ add = actor->floorz + 24*actor->scale;
+ chasez += add;
+ }
+
+ if (!targetdist)
+ targetdist = 16*FRACUNIT; //Default!
+
+ if (actor->target && abs(chasez - actor->z) > targetdist)
+ targetdist = P_AproxDistance(actor->target->x - actor->x, actor->target->y - actor->y);
+
+ vertangle = (R_PointToAngle2(0, actor->z, targetdist, chasez) >> ANGLETOFINESHIFT) & FINEMASK;
+ P_InstaThrust(actor, actor->angle, FixedMul(FINECOSINE(vertangle), flyspeed));
+ actor->momz = FixedMul(FINESINE(vertangle), flyspeed);
+}
+
+// Function: A_FlickyFly
+//
+// Description: Flicky flying function.
+//
+// var1 = how fast to fly
+// var2 = how far ahead the target should be considered
+//
+void A_FlickyFly(mobj_t *actor)
+{
+ // We're not setting up locvars here - it passes var1 and var2 through to P_InternalFlickyFly instead.
+ //INT32 locvar1 = var1;
+ //INT32 locvar2 = var2;
+#ifdef HAVE_BLUA
+ if (LUA_CallAction("A_FlickyFly", actor))
+ return;
+#endif
+ P_InternalFlickyFly(actor, var1, var2,
+ FINECOSINE((((actor->fuse % 36) * ANG10) >> ANGLETOFINESHIFT) & FINEMASK)
+ );
+}
+
+// Function: A_FlickySoar
+//
+// Description: Flicky soaring function - specific to puffin.
+//
+// var1 = how fast to fly
+// var2 = how far ahead the target should be considered
+//
+void A_FlickySoar(mobj_t *actor)
+{
+ // We're not setting up locvars here - it passes var1 and var2 through to P_InternalFlickyFly instead.
+ //INT32 locvar1 = var1;
+ //INT32 locvar2 = var2;
+#ifdef HAVE_BLUA
+ if (LUA_CallAction("A_FlickySoar", actor))
+ return;
+#endif
+ P_InternalFlickyFly(actor, var1, var2,
+ 2*(FRACUNIT/2 - abs(FINECOSINE((((actor->fuse % 144) * 5*ANG1/2) >> ANGLETOFINESHIFT) & FINEMASK)))
+ );
+
+ if (P_MobjFlip(actor)*actor->momz > 0 && actor->frame == 1 && actor->sprite == SPR_FL10)
+ actor->frame = 3;
+}
+
+//Function: A_FlickyCoast
+//
+// Description: Flicky swim-coasting function.
+//
+// var1 = speed to change state upon reaching
+// var2 = state to change to upon slowing down
+// the spawnstate of the mobj = state to change to when above water
+//
+void A_FlickyCoast(mobj_t *actor)
+{
+ INT32 locvar1 = var1;
+ INT32 locvar2 = var2;
+#ifdef HAVE_BLUA
+ if (LUA_CallAction("A_FlickyCoast", actor))
+ return;
+#endif
+ if (actor->eflags & MFE_UNDERWATER)
+ {
+ actor->momx = (11*actor->momx)/12;
+ actor->momy = (11*actor->momy)/12;
+ actor->momz = (11*actor->momz)/12;
+
+ if (P_AproxDistance(P_AproxDistance(actor->momx, actor->momy), actor->momz) < locvar1)
+ P_SetMobjState(actor, locvar2);
+
+ return;
+ }
+
+ actor->flags &= ~MF_NOGRAVITY;
+ P_SetMobjState(actor, mobjinfo[actor->type].spawnstate);
+}
+
+// Internal Flicky hopping function.
+void P_InternalFlickyHop(mobj_t *actor, fixed_t momz, fixed_t momh, angle_t angle)
+{
+ if (((!(actor->eflags & MFE_VERTICALFLIP) && actor->z <= actor->floorz)
+ || ((actor->eflags & MFE_VERTICALFLIP) && actor->z + actor->height >= actor->ceilingz)))
+ {
+ if (momz)
+ {
+ if (actor->eflags & MFE_UNDERWATER)
+ momz = FixedDiv(momz, FixedSqrt(3*FRACUNIT));
+ P_SetObjectMomZ(actor, momz, false);
+ }
+ P_InstaThrust(actor, angle, FixedMul(momh, actor->scale));
+ }
+}
+
+// Function: A_FlickyHop
+//
+// Description: Flicky hopping function.
+//
+// var1 = vertical thrust
+// var2 = horizontal thrust
+//
+void A_FlickyHop(mobj_t *actor)
+{
+ // We're not setting up locvars here - it passes var1 and var2 through to P_InternalFlickyHop instead.
+ //INT32 locvar1 = var1;
+ //INT32 locvar2 = var2;
+#ifdef HAVE_BLUA
+ if (LUA_CallAction("A_FlickyHop", actor))
+ return;
+#endif
+ P_InternalFlickyHop(actor, var1, var2, actor->angle);
+}
+
+// Function: A_FlickyFlounder
+//
+// Description: Flicky floundering function.
+//
+// var1 = intended vertical thrust
+// var2 = intended horizontal thrust
+//
+void A_FlickyFlounder(mobj_t *actor)
+{
+ INT32 locvar1 = var1;
+ INT32 locvar2 = var2;
+ angle_t hopangle;
+#ifdef HAVE_BLUA
+ if (LUA_CallAction("A_FlickyFlounder", actor))
+ return;
+#endif
+ locvar1 *= (P_RandomKey(2) + 1);
+ locvar2 *= (P_RandomKey(2) + 1);
+ hopangle = (actor->angle + (P_RandomKey(9) - 4)*ANG2);
+ P_InternalFlickyHop(actor, locvar1, locvar2, hopangle);
+}
+
+// Function: A_FlickyCheck
+//
+// Description: Flicky airtime check function.
+//
+// var1 = state to change to upon touching the floor
+// var2 = state to change to upon falling
+// the meleestate of the mobj = state to change to when underwater
+//
+void A_FlickyCheck(mobj_t *actor)
+{
+ INT32 locvar1 = var1;
+ INT32 locvar2 = var2;
+#ifdef HAVE_BLUA
+ if (LUA_CallAction("A_FlickyCheck", actor))
+ return;
+#endif
+ if (locvar2 && P_MobjFlip(actor)*actor->momz < 1)
+ P_SetMobjState(actor, locvar2);
+ else if (locvar1 && ((!(actor->eflags & MFE_VERTICALFLIP) && actor->z <= actor->floorz)
+ || ((actor->eflags & MFE_VERTICALFLIP) && actor->z + actor->height >= actor->ceilingz)))
+ P_SetMobjState(actor, locvar1);
+ else if (mobjinfo[actor->type].meleestate && (actor->eflags & MFE_UNDERWATER))
+ P_SetMobjState(actor, mobjinfo[actor->type].meleestate);
+ P_InternalFlickyBubble(actor);
+}
+
+// Function: A_FlickyHeightCheck
+//
+// Description: Flicky height check function.
+//
+// var1 = state to change to when falling below height relative to target
+// var2 = height relative to target to change state at
+//
+void A_FlickyHeightCheck(mobj_t *actor)
+{
+ INT32 locvar1 = var1;
+ INT32 locvar2 = var2;
+#ifdef HAVE_BLUA
+ if (LUA_CallAction("A_FlickyHeightCheck", actor))
+ return;
+#endif
+ if (locvar1 && actor->target && P_MobjFlip(actor)*actor->momz < 1
+ && ((P_MobjFlip(actor)*((actor->z + actor->height/2) - (actor->target->z + actor->target->height/2)) < locvar2)
+ || (actor->z - actor->height < actor->floorz) || (actor->z + 2*actor->height > actor->ceilingz)))
+ P_SetMobjState(actor, locvar1);
+ P_InternalFlickyBubble(actor);
+}
+
+// Function: A_FlickyFlutter
+//
+// Description: Flicky fluttering function - specific to chicken.
+//
+// var1 = state to change to upon touching the floor
+// var2 = state to change to upon falling
+// the meleestate of the mobj = state to change to when underwater
+//
+void A_FlickyFlutter(mobj_t *actor)
+{
+ // We're not setting up locvars here - it passes var1 and var2 through to A_FlickyCheck instead.
+ //INT32 locvar1 = var1;
+ //INT32 locvar2 = var2;
+#ifdef HAVE_BLUA
+ if (LUA_CallAction("A_FlickyFlutter", actor))
+ return;
+#endif
+ A_FlickyCheck(actor);
+
+ var1 = ANG30;
+ var2 = 32*FRACUNIT;
+ A_FlickyAim(actor);
+
+ P_InstaThrust(actor, actor->angle, 2*actor->scale);
+ if (P_MobjFlip(actor)*actor->momz < -FRACUNIT/2)
+ actor->momz = -P_MobjFlip(actor)*actor->scale/2;
+}
+
+#undef FLICKYHITWALL
diff --git a/src/p_inter.c b/src/p_inter.c
index 974ae1b8f24eadc60f887ba6b0c64b3ce3f9cc43..54badc2992614c4aef63917bbf636fa140057922 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -2043,7 +2043,6 @@ boolean P_CheckRacers(void)
*/
void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damagetype)
{
- mobjtype_t item;
mobj_t *mo;
if (inflictor && (inflictor->type == MT_SHELL || inflictor->type == MT_FIREBALL))
@@ -2259,81 +2258,80 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
if (source && target && target->player && source->player)
P_PlayVictorySound(source); // Killer laughs at you. LAUGHS! BWAHAHAHA!
+#ifdef OLDANIMALSPAWNING
// Drop stuff.
// This determines the kind of object spawned
// during the death frame of a thing.
if (!mariomode // Don't show birds, etc. in Mario Mode Tails 12-23-2001
&& target->flags & MF_ENEMY)
{
- if (cv_soniccd.value)
- item = MT_SEED;
- else
- {
- INT32 prandom;
+ mobjtype_t item;
+ INT32 prandom;
- switch (target->type)
- {
- case MT_REDCRAWLA:
- case MT_GOLDBUZZ:
- case MT_SKIM:
- case MT_UNIDUS:
- item = MT_BUNNY;
- break;
+ switch (target->type)
+ {
+ case MT_REDCRAWLA:
+ case MT_GOLDBUZZ:
+ case MT_SKIM:
+ case MT_UNIDUS:
+ item = MT_FLICKY_02/*MT_BUNNY*/;
+ break;
- case MT_BLUECRAWLA:
- case MT_JETTBOMBER:
- case MT_GFZFISH:
- item = MT_BIRD;
- break;
+ case MT_BLUECRAWLA:
+ case MT_JETTBOMBER:
+ case MT_GFZFISH:
+ item = MT_FLICKY_01/*MT_BIRD*/;
+ break;
- case MT_JETTGUNNER:
- case MT_CRAWLACOMMANDER:
- case MT_REDBUZZ:
- case MT_DETON:
- item = MT_MOUSE;
- break;
+ case MT_JETTGUNNER:
+ case MT_CRAWLACOMMANDER:
+ case MT_REDBUZZ:
+ case MT_DETON:
+ item = MT_FLICKY_12/*MT_MOUSE*/;
+ break;
- case MT_GSNAPPER:
- case MT_EGGGUARD:
- case MT_SPRINGSHELL:
- item = MT_COW;
- break;
+ case MT_GSNAPPER:
+ case MT_EGGGUARD:
+ case MT_SPRINGSHELL:
+ item = MT_FLICKY_11/*MT_COW*/;
+ break;
- case MT_MINUS:
- case MT_VULTURE:
- case MT_POINTY:
- case MT_YELLOWSHELL:
- item = MT_CHICKEN;
- break;
+ case MT_MINUS:
+ case MT_VULTURE:
+ case MT_POINTY:
+ case MT_YELLOWSHELL:
+ item = MT_FLICKY_03/*MT_CHICKEN*/;
+ break;
- case MT_AQUABUZZ:
- item = MT_REDBIRD;
- break;
+ case MT_AQUABUZZ:
+ item = MT_FLICKY_01/*MT_REDBIRD*/;
+ break;
- default:
- if (target->info->doomednum)
- prandom = target->info->doomednum%5; // "Random" animal for new enemies.
- else
- prandom = P_RandomKey(5); // No placable object, just use a random number.
+ default:
+ if (target->info->doomednum)
+ prandom = target->info->doomednum%5; // "Random" animal for new enemies.
+ else
+ prandom = P_RandomKey(5); // No placable object, just use a random number.
- switch(prandom)
- {
- default: item = MT_BUNNY; break;
- case 1: item = MT_BIRD; break;
- case 2: item = MT_MOUSE; break;
- case 3: item = MT_COW; break;
- case 4: item = MT_CHICKEN; break;
- }
- break;
- }
+ switch(prandom)
+ {
+ default: item = MT_FLICKY_02/*MT_BUNNY*/; break;
+ case 1: item = MT_FLICKY_01/*MT_BIRD*/; break;
+ case 2: item = MT_FLICKY_12/*MT_MOUSE*/; break;
+ case 3: item = MT_FLICKY_11/*MT_COW*/; break;
+ case 4: item = MT_FLICKY_03/*MT_CHICKEN*/; break;
+ }
+ break;
}
mo = P_SpawnMobj(target->x, target->y, target->z + (target->height / 2) - FixedMul(mobjinfo[item].height / 2, target->scale), item);
mo->destscale = target->scale;
P_SetScale(mo, mo->destscale);
}
+ else
+#endif
// Other death animation effects
- else switch(target->type)
+ switch(target->type)
{
case MT_BOUNCEPICKUP:
case MT_RAILPICKUP:
diff --git a/src/p_local.h b/src/p_local.h
index df9b20a541319e105adb4aee0ce87adbe1c17e04..9b7c16702121bb514bfbe6cbd89cb09f40956a65 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -295,6 +295,11 @@ boolean P_CheckMissileRange(mobj_t *actor);
void P_NewChaseDir(mobj_t *actor);
boolean P_LookForPlayers(mobj_t *actor, boolean allaround, boolean tracer, fixed_t dist);
+mobj_t *P_InternalFlickySpawn(mobj_t *actor, mobjtype_t flickytype, fixed_t momz, boolean lookforplayers);
+void P_InternalFlickyBubble(mobj_t *actor);
+void P_InternalFlickyFly(mobj_t *actor, fixed_t flyspeed, fixed_t targetdist, fixed_t chasez);
+void P_InternalFlickyHop(mobj_t *actor, fixed_t momz, fixed_t momh, angle_t angle);
+
//
// P_MAP
//
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 09664b77505917da94c381ebb994f5fd5af64f1b..f1dfa94f52a1aaace92c0723b80d6f0732de05ff 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -3482,17 +3482,14 @@ static boolean P_SceneryZMovement(mobj_t *mo)
if ((!(mo->eflags & MFE_VERTICALFLIP) && mo->z <= mo->floorz)
|| (mo->eflags & MFE_VERTICALFLIP && mo->z+mo->height >= mo->ceilingz))
{
- // DO NOT use random numbers here.
- // SonicCD mode is console togglable and
- // affects demos.
- UINT8 rltime = (leveltime & 4);
-
- if (!rltime)
- P_SpawnMobj(mo->x, mo->y, mo->floorz, MT_GFZFLOWER3);
- else if (rltime == 2)
- P_SpawnMobj(mo->x, mo->y, mo->floorz, MT_GFZFLOWER2);
- else
- P_SpawnMobj(mo->x, mo->y, mo->floorz, MT_GFZFLOWER1);
+ mobjtype_t flowertype = ((P_RandomChance(FRACUNIT/2)) ? MT_GFZFLOWER1 : MT_GFZFLOWER3);
+ mobj_t *flower = P_SpawnMobjFromMobj(mo, 0, 0, 0, flowertype);
+ if (flower)
+ {
+ P_SetScale(flower, mo->scale/16);
+ flower->destscale = mo->scale;
+ flower->scalespeed = mo->scale/8;
+ }
P_RemoveMobj(mo);
return false;
@@ -7049,7 +7046,8 @@ void P_MobjThinker(mobj_t *mobj)
}
break;
case MT_SEED:
- mobj->momz = mobj->info->speed;
+ if (P_MobjFlip(mobj)*mobj->momz < mobj->info->speed)
+ mobj->momz = P_MobjFlip(mobj)*mobj->info->speed;
break;
case MT_ROCKCRUMBLE1:
case MT_ROCKCRUMBLE2:
@@ -7198,14 +7196,14 @@ void P_MobjThinker(mobj_t *mobj)
if (mobj->fuse > 0 && mobj->fuse < 2*TICRATE-(TICRATE/7)
&& (mobj->fuse & 3))
{
- INT32 i,j;
+ INT32 i;
fixed_t x,y,z;
fixed_t ns;
mobj_t *mo2;
+ mobj_t *flicky;
- i = P_RandomByte();
z = mobj->subsector->sector->floorheight + ((P_RandomByte()&63)*FRACUNIT);
- for (j = 0; j < 2; j++)
+ for (i = 0; i < 2; i++)
{
const angle_t fa = (P_RandomByte()*FINEANGLES/16) & FINEMASK;
ns = 64 * FRACUNIT;
@@ -7213,25 +7211,22 @@ void P_MobjThinker(mobj_t *mobj)
y = mobj->y + FixedMul(FINECOSINE(fa),ns);
mo2 = P_SpawnMobj(x, y, z, MT_EXPLODE);
+ P_SetMobjStateNF(mo2, S_XPLD_EGGTRAP); // so the flickies don't lose their target if they spawn
ns = 4 * FRACUNIT;
mo2->momx = FixedMul(FINESINE(fa),ns);
mo2->momy = FixedMul(FINECOSINE(fa),ns);
+ mo2->angle = fa << ANGLETOFINESHIFT;
- i = P_RandomByte();
-
- if (i % 5 == 0)
- P_SpawnMobj(x, y, z, MT_CHICKEN);
- else if (i % 4 == 0)
- P_SpawnMobj(x, y, z, MT_COW);
- else if (i % 3 == 0)
- {
- P_SpawnMobj(x, y, z, MT_BIRD);
+ if (P_RandomChance(FRACUNIT/4)) // I filled a spreadsheet trying to get the equivalent chance to the original P_RandomByte hack!
S_StartSound(mo2, mobj->info->deathsound);
- }
- else if ((i & 1) == 0)
- P_SpawnMobj(x, y, z, MT_BUNNY);
- else
- P_SpawnMobj(x, y, z, MT_MOUSE);
+
+ flicky = P_InternalFlickySpawn(mo2, 0, 8*FRACUNIT, false);
+ if (!flicky)
+ break;
+
+ P_SetTarget(&flicky->target, mo2);
+ flicky->momx = mo2->momx;
+ flicky->momy = mo2->momy;
}
mobj->fuse--;
@@ -7292,6 +7287,8 @@ void P_MobjThinker(mobj_t *mobj)
}
break;
case MT_AQUABUZZ:
+ P_MobjCheckWater(mobj); // solely for MFE_UNDERWATER for A_FlickySpawn
+ // no break here on purpose
case MT_BIGAIRMINE:
{
if (mobj->tracer && mobj->tracer->player && mobj->tracer->health > 0
@@ -8402,13 +8399,8 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
// Special condition for the 2nd boss.
mobj->watertop = mobj->info->speed;
break;
- case MT_BIRD:
- case MT_BUNNY:
- case MT_MOUSE:
- case MT_CHICKEN:
- case MT_COW:
- case MT_REDBIRD:
- mobj->fuse = P_RandomRange(300, 350);
+ case MT_FLICKY_08:
+ mobj->color = (P_RandomChance(FRACUNIT/2) ? SKINCOLOR_RED : SKINCOLOR_AQUA);
break;
case MT_REDRING: // Make MT_REDRING red by default
mobj->color = skincolor_redring;
diff --git a/src/p_setup.c b/src/p_setup.c
index ea7f4191fdc3b179c91b363dfd04436fbfaa925a..6bb47f4190fec4b563b54f7c9670b1127d3e6843 100644
--- a/src/p_setup.c
+++ b/src/p_setup.c
@@ -160,6 +160,33 @@ FUNCNORETURN static ATTRNORETURN void CorruptMapError(const char *msg)
I_Error("Invalid or corrupt map.\nLook in log file or text console for technical details.");
}
+/** Sets a header's flickies to be equivalent to the original Freed Animals
+ *
+ * \param i The header to set flickies for
+ */
+void P_SetDemoFlickies(INT16 i)
+{
+ mapheaderinfo[i]->numFlickies = 5;
+ mapheaderinfo[i]->flickies = Z_Realloc(mapheaderinfo[i]->flickies, 5*sizeof(mobjtype_t), PU_STATIC, NULL);
+ mapheaderinfo[i]->flickies[0] = MT_FLICKY_02/*MT_BUNNY*/;
+ mapheaderinfo[i]->flickies[1] = MT_FLICKY_01/*MT_BIRD*/;
+ mapheaderinfo[i]->flickies[2] = MT_FLICKY_12/*MT_MOUSE*/;
+ mapheaderinfo[i]->flickies[3] = MT_FLICKY_11/*MT_COW*/;
+ mapheaderinfo[i]->flickies[4] = MT_FLICKY_03/*MT_CHICKEN*/;
+}
+
+/** Clears a header's flickies
+ *
+ * \param i The header to clear flickies for
+ */
+void P_DeleteFlickies(INT16 i)
+{
+ if (mapheaderinfo[i]->flickies)
+ Z_Free(mapheaderinfo[i]->flickies);
+ mapheaderinfo[i]->flickies = NULL;
+ mapheaderinfo[i]->numFlickies = 0;
+}
+
#define NUMLAPS_DEFAULT 4
/** Clears the data from a single map header.
@@ -223,6 +250,12 @@ static void P_ClearSingleMapHeaderInfo(INT16 i)
mapheaderinfo[num]->levelflags = 0;
DEH_WriteUndoline("MENUFLAGS", va("%d", mapheaderinfo[num]->menuflags), UNDO_NONE);
mapheaderinfo[num]->menuflags = 0;
+ // Flickies. Nope, no delfile support here either
+#if 1 // equivalent to "FlickyList = DEMO"
+ P_SetDemoFlickies(num);
+#else // equivalent to "FlickyList = NONE"
+ P_DeleteFlickies(num);
+#endif
// TODO grades support for delfile (pfft yeah right)
P_DeleteGrades(num);
// an even further impossibility, delfile custom opts support
@@ -241,6 +274,7 @@ void P_AllocMapHeader(INT16 i)
if (!mapheaderinfo[i])
{
mapheaderinfo[i] = Z_Malloc(sizeof(mapheader_t), PU_STATIC, NULL);
+ mapheaderinfo[i]->flickies = NULL;
mapheaderinfo[i]->grades = NULL;
}
P_ClearSingleMapHeaderInfo(i + 1);
diff --git a/src/p_setup.h b/src/p_setup.h
index 3bca11047c7cf43a8fc1dd535de0d23d46ed6d49..95976d2761587504315cdde6a5dfae3b8da727f9 100644
--- a/src/p_setup.h
+++ b/src/p_setup.h
@@ -68,6 +68,9 @@ void P_WriteThings(lumpnum_t lump);
size_t P_PrecacheLevelFlats(void);
void P_AllocMapHeader(INT16 i);
+void P_SetDemoFlickies(INT16 i);
+void P_DeleteFlickies(INT16 i);
+
// Needed for NiGHTS
void P_ReloadRings(void);
void P_DeleteGrades(INT16 i);
diff --git a/src/p_user.c b/src/p_user.c
index df9fbb2c1e8b77fb6eea716fd8286b413c15035b..09fec73c0f3c2075ea6ddf1f74ab4f28422dbac7 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -5640,11 +5640,13 @@ static void P_DoNiGHTSCapsule(player_t *player)
}
else
{
- fixed_t z;
-
- z = player->capsule->z + player->capsule->height/2;
for (i = 0; i < 16; i++)
- P_SpawnMobj(player->capsule->x, player->capsule->y, z, MT_BIRD);
+ {
+ mobj_t *flicky = P_InternalFlickySpawn(player->capsule, 0, ((i%4) + 1)*2*FRACUNIT, true);
+ flicky->z += player->capsule->height/2;
+ flicky->angle = (i*(ANGLE_MAX/16));
+ P_InstaThrust(flicky, flicky->angle, 8*FRACUNIT);
+ }
}
for (i = 0; i < MAXPLAYERS; i++)
if (playeringame[i] && players[i].mare == player->mare)
diff --git a/src/r_main.c b/src/r_main.c
index 3a13fbda0b530f56eca7f71a8e9fe5faf6a774a0..4cff0ff8302c843b97497b1961673d7d171cf328 100644
--- a/src/r_main.c
+++ b/src/r_main.c
@@ -148,7 +148,6 @@ consvar_t cv_flipcam2 = {"flipcam2", "No", CV_SAVE|CV_CALL|CV_NOINIT, CV_YesNo,
consvar_t cv_shadow = {"shadow", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_shadowoffs = {"offsetshadows", "Off", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_skybox = {"skybox", "On", CV_SAVE, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
-consvar_t cv_soniccd = {"soniccd", "Off", CV_NETVAR, CV_OnOff, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_allowmlook = {"allowmlook", "Yes", CV_NETVAR, CV_YesNo, NULL, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_showhud = {"showhud", "Yes", CV_CALL, CV_YesNo, R_SetViewSize, 0, NULL, NULL, 0, 0, NULL};
consvar_t cv_translucenthud = {"translucenthud", "10", CV_SAVE, translucenthud_cons_t, NULL, 0, NULL, NULL, 0, 0, NULL};
@@ -1361,7 +1360,6 @@ void R_RegisterEngineStuff(void)
{
CV_RegisterVar(&cv_gravity);
CV_RegisterVar(&cv_tailspickup);
- CV_RegisterVar(&cv_soniccd);
CV_RegisterVar(&cv_allowmlook);
CV_RegisterVar(&cv_homremoval);
CV_RegisterVar(&cv_flipcam);