From 5cc1befcad77fbd558eea99851a0b00422a2feef Mon Sep 17 00:00:00 2001
From: toasterbabe <rollerorbital@gmail.com>
Date: Sat, 28 Apr 2018 15:13:44 +0100
Subject: [PATCH] * Haunted Heights! Smashing spikeball, Cacolantern,
Spinbobert and Hangster, along with the Spider and Bat flickies and general
decoration/ambience stuff. * MF_PAIN and MF_MISSILE now support setting
damagetype via their Mass parameter. The two existing conflicts - the fuse
setting for the grenade weapon ring and the Cybrakdemon napalm bomb - had
these moved to other free parameters. * A_ConnectToGround is EXTREMELY useful
for palmtrees and stuff. * Some other, relatively hacky A_ functions. *
(Unrelated) Remove the need for a "Mario block mode" for the token by making
it natively compatible. * Spikes and their time-offsetting via that Lua
script sphere made. Also allow for wallspikes to do it via their angle/360.
---
src/dehacked.c | 210 ++++++-
src/doomdata.h | 3 +
src/hardware/hw_light.c | 18 +
src/info.c | 1226 ++++++++++++++++++++++++++++++++-------
src/info.h | 193 +++++-
src/p_enemy.c | 149 ++++-
src/p_floor.c | 2 +-
src/p_inter.c | 7 +
src/p_local.h | 1 +
src/p_map.c | 21 +-
src/p_mobj.c | 122 +++-
src/p_user.c | 2 +-
src/sounds.c | 18 +-
src/sounds.h | 8 +
14 files changed, 1711 insertions(+), 269 deletions(-)
diff --git a/src/dehacked.c b/src/dehacked.c
index e5bafabad6..e3aee66549 100644
--- a/src/dehacked.c
+++ b/src/dehacked.c
@@ -853,25 +853,27 @@ 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},
+ {"BLUEBIRD", MT_FLICKY_01}, // Flicky (Flicky)
+ {"RABBIT", MT_FLICKY_02}, // Pocky (1)
+ {"CHICKEN", MT_FLICKY_03}, // Cucky (1)
+ {"SEAL", MT_FLICKY_04}, // Rocky (1)
+ {"PIG", MT_FLICKY_05}, // Picky (1)
+ {"CHIPMUNK", MT_FLICKY_06}, // Ricky (1)
+ {"PENGUIN", MT_FLICKY_07}, // Pecky (1)
+ {"FISH", MT_FLICKY_08}, // Nicky (CD)
+ {"RAM", MT_FLICKY_09}, // Flocky (CD)
+ {"PUFFIN", MT_FLICKY_10}, // Wicky (CD)
+ {"COW", MT_FLICKY_11}, // Macky (SRB2)
+ {"RAT", MT_FLICKY_12}, // Micky (2)
+ {"BEAR", MT_FLICKY_13}, // Becky (2)
+ {"DOVE", MT_FLICKY_14}, // Docky (CD)
+ {"CAT", MT_FLICKY_15}, // Nyannyan (Flicky)
+ {"CANARY", MT_FLICKY_16}, // Lucky (CD)
{"a", 0}, // End of normal flickies - a lower case character so will never fastcmp valid with uppercase tmp
- //{"FLICKER", MT_FLICKER},
- {"SEED", MT_SEED},
+ //{"FLICKER", MT_FLICKER}, // Flacky (SRB2)
+ {"SPIDER", MT_SECRETFLICKY_01}, // Sticky (SRB2)
+ {"BAT", MT_SECRETFLICKY_02}, // Backy (SRB2)
+ {"SEED", MT_SEED}, // Seed (CD)
{NULL, 0}
};
@@ -1813,6 +1815,9 @@ static actionpointer_t actionpointers[] =
{{A_LightBeamReset}, "A_LIGHTBEAMRESET"},
{{A_MineExplode}, "A_MINEEXPLODE"},
{{A_MineRange}, "A_MINERANGE"},
+ {{A_ConnectToGround}, "A_CONNECTTOGROUND"},
+ {{A_SpawnParticleRelative},"A_SPAWNPARTICLERELATIVE"},
+ {{A_MultiShotDist}, "A_MULTISHOTDIST"},
{{NULL}, "NONE"},
@@ -4968,6 +4973,51 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_XMASBERRYBUSH",
"S_XMASBUSH",
+ // Halloween Scenery
+ // Pumpkins
+ "S_JACKO1",
+ "S_JACKO1OVERLAY_1",
+ "S_JACKO1OVERLAY_2",
+ "S_JACKO1OVERLAY_3",
+ "S_JACKO1OVERLAY_4",
+ "S_JACKO2",
+ "S_JACKO2OVERLAY_1",
+ "S_JACKO2OVERLAY_2",
+ "S_JACKO2OVERLAY_3",
+ "S_JACKO2OVERLAY_4",
+ "S_JACKO3",
+ "S_JACKO3OVERLAY_1",
+ "S_JACKO3OVERLAY_2",
+ "S_JACKO3OVERLAY_3",
+ "S_JACKO3OVERLAY_4",
+ // Dr Seuss Trees
+ "S_HHZTREE_TOP",
+ "S_HHZTREE_TRUNK",
+ "S_HHZTREE_LEAF",
+ // Mushroom
+ "S_HHZSHROOM_1",
+ "S_HHZSHROOM_2",
+ "S_HHZSHROOM_3",
+ "S_HHZSHROOM_4",
+ "S_HHZSHROOM_5",
+ "S_HHZSHROOM_6",
+ "S_HHZSHROOM_7",
+ "S_HHZSHROOM_8",
+ "S_HHZSHROOM_9",
+ "S_HHZSHROOM_10",
+ "S_HHZSHROOM_11",
+ "S_HHZSHROOM_12",
+ "S_HHZSHROOM_13",
+ "S_HHZSHROOM_14",
+ "S_HHZSHROOM_15",
+ "S_HHZSHROOM_16",
+ // Misc
+ "S_HHZGRASS",
+ "S_HHZTENT1",
+ "S_HHZTENT2",
+ "S_HHZSTALAGMITE_TALL",
+ "S_HHZSTALAGMITE_SHORT",
+
// Botanic Serenity's loads of scenery states
"S_BSZTALLFLOWER_RED",
"S_BSZTALLFLOWER_PURPLE",
@@ -5407,6 +5457,19 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_FLICKY_16_FLAP2",
"S_FLICKY_16_FLAP3",
+ // Spider
+ "S_SECRETFLICKY_01_OUT",
+ "S_SECRETFLICKY_01_AIM",
+ "S_SECRETFLICKY_01_HOP",
+ "S_SECRETFLICKY_01_UP",
+ "S_SECRETFLICKY_01_DOWN",
+
+ // Bat
+ "S_SECRETFLICKY_02_OUT",
+ "S_SECRETFLICKY_02_FLAP1",
+ "S_SECRETFLICKY_02_FLAP2",
+ "S_SECRETFLICKY_02_FLAP3",
+
"S_YELLOWSPRING",
"S_YELLOWSPRING2",
"S_YELLOWSPRING3",
@@ -5903,6 +5966,85 @@ static const char *const STATE_LIST[] = { // array length left dynamic for sanit
"S_NIGHTOPIANHELPER8",
"S_NIGHTOPIANHELPER9",
+ // Secret badniks and hazards, shhhh
+ "S_SMASHSPIKE_FLOAT",
+ "S_SMASHSPIKE_EASE1",
+ "S_SMASHSPIKE_EASE2",
+ "S_SMASHSPIKE_FALL",
+ "S_SMASHSPIKE_STOMP1",
+ "S_SMASHSPIKE_STOMP2",
+ "S_SMASHSPIKE_RISE1",
+ "S_SMASHSPIKE_RISE2",
+
+ "S_HHZDUST1",
+ "S_HHZDUST2",
+ "S_HHZDUST3",
+ "S_HHZDUST4",
+
+ "S_CACO_LOOK",
+ "S_CACO_WAKE1",
+ "S_CACO_WAKE2",
+ "S_CACO_WAKE3",
+ "S_CACO_WAKE4",
+ "S_CACO_ROAR",
+ "S_CACO_CHASE",
+ "S_CACO_CHASE_REPEAT",
+ "S_CACO_RANDOM",
+ "S_CACO_PREPARE_SOUND",
+ "S_CACO_PREPARE1",
+ "S_CACO_PREPARE2",
+ "S_CACO_PREPARE3",
+ "S_CACO_SHOOT_SOUND",
+ "S_CACO_SHOOT1",
+ "S_CACO_SHOOT2",
+ "S_CACO_CLOSE",
+ "S_CACO_DIE_FLAGS",
+ "S_CACO_DIE_GIB1",
+ "S_CACO_DIE_GIB2",
+ "S_CACO_DIE_SCREAM",
+ "S_CACO_DIE_SHATTER",
+ "S_CACO_DIE_FALL",
+ "S_CACOSHARD_RANDOMIZE",
+ "S_CACOSHARD1_1",
+ "S_CACOSHARD1_2",
+ "S_CACOSHARD2_1",
+ "S_CACOSHARD2_2",
+ "S_CACOFIRE1",
+ "S_CACOFIRE2",
+ "S_CACOFIRE3",
+ "S_CACOFIRE_EXPLODE1",
+ "S_CACOFIRE_EXPLODE2",
+ "S_CACOFIRE_EXPLODE3",
+ "S_CACOFIRE_EXPLODE4",
+
+ "S_SPINBOBERT_MOVE_FLIPUP",
+ "S_SPINBOBERT_MOVE_UP",
+ "S_SPINBOBERT_MOVE_FLIPDOWN",
+ "S_SPINBOBERT_MOVE_DOWN",
+ "S_SPINBOBERT_FIRE_MOVE",
+ "S_SPINBOBERT_FIRE_GHOST",
+ "S_SPINBOBERT_FIRE_TRAIL1",
+ "S_SPINBOBERT_FIRE_TRAIL2",
+ "S_SPINBOBERT_FIRE_TRAIL3",
+
+ "S_HANGSTER_LOOK",
+ "S_HANGSTER_SWOOP1",
+ "S_HANGSTER_SWOOP2",
+ "S_HANGSTER_ARC1",
+ "S_HANGSTER_ARC2",
+ "S_HANGSTER_ARC3",
+ "S_HANGSTER_FLY1",
+ "S_HANGSTER_FLY2",
+ "S_HANGSTER_FLY3",
+ "S_HANGSTER_FLY4",
+ "S_HANGSTER_FLYREPEAT",
+ "S_HANGSTER_ARCUP1",
+ "S_HANGSTER_ARCUP2",
+ "S_HANGSTER_ARCUP3",
+ "S_HANGSTER_RETURN1",
+ "S_HANGSTER_RETURN2",
+ "S_HANGSTER_RETURN3",
+
"S_CRUMBLE1",
"S_CRUMBLE2",
@@ -6309,6 +6451,22 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_XMASBERRYBUSH",
"MT_XMASBUSH",
+ // Halloween Scenery
+ // Pumpkins
+ "MT_JACKO1",
+ "MT_JACKO2",
+ "MT_JACKO3",
+ // Dr Seuss Trees
+ "MT_HHZTREE_TOP",
+ "MT_HHZTREE_PART",
+ // Misc
+ "MT_HHZSHROOM",
+ "MT_HHZGRASS",
+ "MT_HHZTENTACLE1",
+ "MT_HHZTENTACLE2",
+ "MT_HHZSTALAGMITE_TALL",
+ "MT_HHZSTALAGMITE_SHORT",
+
// Botanic Serenity
"MT_BSZTALLFLOWER_RED",
"MT_BSZTALLFLOWER_PURPLE",
@@ -6394,6 +6552,9 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_FLICKY_14", // Dove
"MT_FLICKY_15", // Cat
"MT_FLICKY_16", // Canary
+ "MT_SECRETFLICKY_01", // Spider
+ "MT_SECRETFLICKY_02", // Bat
+ "MT_SEED",
// Environmental Effects
"MT_RAIN", // Rain
@@ -6406,7 +6567,6 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_WATERZAP",
"MT_SPINDUST", // Spindash dust
"MT_TFOG",
- "MT_SEED",
"MT_PARTICLE",
"MT_PARTICLEGEN", // For fans, etc.
@@ -6429,6 +6589,7 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_AWATERH", // Ambient Water Sound 8
"MT_RANDOMAMBIENT",
"MT_RANDOMAMBIENT2",
+ "MT_MACHINEAMBIENCE",
"MT_CORK",
@@ -6496,6 +6657,17 @@ static const char *const MOBJTYPE_LIST[] = { // array length left dynamic for s
"MT_EGGCAPSULE",
"MT_NIGHTOPIANHELPER", // the actual helper object that orbits you
+ // Secret badniks and hazards, shhhh
+ "MT_SMASHINGSPIKEBALL",
+ "MT_HHZDUST",
+ "MT_CACOLANTERN",
+ "MT_CACOSHARD",
+ "MT_CACOFIRE",
+ "MT_SPINBOBERT",
+ "MT_SPINBOBERT_FIRE1",
+ "MT_SPINBOBERT_FIRE2",
+ "MT_HANGSTER",
+
// Utility Objects
"MT_TELEPORTMAN",
"MT_ALTVIEWMAN",
diff --git a/src/doomdata.h b/src/doomdata.h
index c0586fd656..5ee39c5a8b 100644
--- a/src/doomdata.h
+++ b/src/doomdata.h
@@ -46,6 +46,9 @@ enum
ML_BLOCKMAP, // LUT, motion clipping, walls/grid element
};
+// Extra flag for objects.
+#define MTF_EXTRA 1
+
// Reverse gravity flag for objects.
#define MTF_OBJECTFLIP 2
diff --git a/src/hardware/hw_light.c b/src/hardware/hw_light.c
index 0496e64237..9397eaec2d 100644
--- a/src/hardware/hw_light.c
+++ b/src/hardware/hw_light.c
@@ -349,6 +349,12 @@ light_t *t_lspr[NUMSPRITES] =
&lspr[NOLIGHT], // SPR_XMS4
&lspr[NOLIGHT], // SPR_XMS5
+ // Halloween Scenery
+ &lspr[RINGLIGHT_L], // SPR_PUMK
+ &lspr[NOLIGHT], // SPR_HHPL
+ &lspr[NOLIGHT], // SPR_SHRM
+ &lspr[NOLIGHT], // SPR_HHZM
+
// Botanic Serenity Scenery
&lspr[NOLIGHT], // SPR_BSZ1
&lspr[NOLIGHT], // SPR_BSZ2
@@ -399,6 +405,8 @@ light_t *t_lspr[NUMSPRITES] =
&lspr[NOLIGHT], // SPR_FL14
&lspr[NOLIGHT], // SPR_FL15
&lspr[NOLIGHT], // SPR_FL16
+ &lspr[NOLIGHT], // SPR_FS01
+ &lspr[NOLIGHT], // SPR_FS02
// Springs
&lspr[NOLIGHT], // SPR_SPRY
@@ -480,6 +488,16 @@ light_t *t_lspr[NUMSPRITES] =
&lspr[NOLIGHT], // SPR_NPRU
&lspr[NOLIGHT], // SPR_CAPS
+ // Secret badniks and hazards, shhhh
+ &lspr[NOLIGHT], // SPR_FMCE",
+ &lspr[NOLIGHT], // SPR_HMCE",
+ &lspr[NOLIGHT], // SPR_CACO",
+ &lspr[BLUEBALL_L], // SPR_BAL2",
+ &lspr[NOLIGHT], // SPR_SBOB",
+ &lspr[BLUEBALL_L], // SPR_SBFL",
+ &lspr[BLUEBALL_L], // SPR_SBSK",
+ &lspr[NOLIGHT], // SPR_BATT",
+
// Debris
&lspr[RINGSPARK_L], // SPR_SPRK
&lspr[NOLIGHT], // SPR_BOM1
diff --git a/src/info.c b/src/info.c
index 1805c555be..cd1705a518 100644
--- a/src/info.c
+++ b/src/info.c
@@ -16,6 +16,7 @@
#include "doomstat.h"
#include "sounds.h"
#include "p_mobj.h"
+#include "p_local.h" // DMG_ constants
#include "m_misc.h"
#include "z_zone.h"
#include "d_player.h"
@@ -242,6 +243,12 @@ char sprnames[NUMSPRITES + 1][5] =
"XMS4", // Lamppost
"XMS5", // Hanging Star
+ // Halloween Scenery
+ "PUMK", // Pumpkins
+ "HHPL", // Dr Seuss Trees
+ "SHRM", // Mushroom
+ "HHZM", // Misc
+
// Botanic Serenity Scenery
"BSZ1", // Tall flowers
"BSZ2", // Medium flowers
@@ -292,6 +299,8 @@ char sprnames[NUMSPRITES + 1][5] =
"FL14", // Dove
"FL15", // Cat
"FL16", // Canary
+ "FS01", // Spider
+ "FS02", // Bat
// Springs
"SPRY", // yellow spring
@@ -373,6 +382,16 @@ char sprnames[NUMSPRITES + 1][5] =
"NPRU", // Nights Powerups
"CAPS", // Capsule thingy for NiGHTS
+ // Secret badniks and hazards, shhhh
+ "FMCE",
+ "HMCE",
+ "CACO",
+ "BAL2",
+ "SBOB",
+ "SBFL",
+ "SBSK",
+ "HBAT",
+
// Debris
"SPRK", // spark
"BOM1", // Robot Explosion
@@ -2183,8 +2202,53 @@ state_t states[NUMSTATES] =
{SPR_XMS4, 1, -1, {NULL}, 0, 0, S_NULL}, // S_LAMPPOST2
{SPR_XMS5, 0, -1, {NULL}, 0, 0, S_NULL}, // S_HANGSTAR
// Xmas GFZ bushes
- {SPR_BUS1, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BERRYBUSH
- {SPR_BUS2, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BUSH
+ {SPR_BUS1, 1, -1, {NULL}, 0, 0, S_NULL}, // S_XMASBERRYBUSH
+ {SPR_BUS2, 1, -1, {NULL}, 0, 0, S_NULL}, // S_XMASBUSH
+
+ // Halloween Scenery
+ // Pumpkins
+ {SPR_PUMK, 0, -1, {NULL}, 0, 0, S_NULL}, // S_JACKO1
+ {SPR_PUMK, 3|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO1OVERLAY_2}, // S_JACKO1OVERLAY_1
+ {SPR_PUMK, 4|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO1OVERLAY_3}, // S_JACKO1OVERLAY_2
+ {SPR_PUMK, 5|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO1OVERLAY_4}, // S_JACKO1OVERLAY_3
+ {SPR_PUMK, 4|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO1OVERLAY_1}, // S_JACKO1OVERLAY_4
+ {SPR_PUMK, 1, -1, {NULL}, 0, 0, S_NULL}, // S_JACKO2
+ {SPR_PUMK, 6|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO2OVERLAY_2}, // S_JACKO2OVERLAY_1
+ {SPR_PUMK, 7|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO2OVERLAY_3}, // S_JACKO2OVERLAY_2
+ {SPR_PUMK, 8|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO2OVERLAY_4}, // S_JACKO2OVERLAY_3
+ {SPR_PUMK, 7|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO2OVERLAY_1}, // S_JACKO2OVERLAY_4
+ {SPR_PUMK, 2, -1, {NULL}, 0, 0, S_NULL}, // S_JACKO3
+ {SPR_PUMK, 9|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO3OVERLAY_2}, // S_JACKO3OVERLAY_1
+ {SPR_PUMK, 10|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO3OVERLAY_3}, // S_JACKO3OVERLAY_2
+ {SPR_PUMK, 11|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO3OVERLAY_4}, // S_JACKO3OVERLAY_3
+ {SPR_PUMK, 10|FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_JACKO3OVERLAY_1}, // S_JACKO3OVERLAY_4
+ // Dr Seuss Trees
+ {SPR_HHPL, 2, -1, {A_ConnectToGround}, MT_HHZTREE_PART, 0, S_NULL}, // S_HHZTREE_TOP,
+ {SPR_HHPL, 1, -1, {NULL}, 0, 0, S_NULL}, // S_HHZTREE_TRUNK,
+ {SPR_HHPL, FF_PAPERSPRITE, -1, {NULL}, 0, 0, S_NULL}, // S_HHZTREE_LEAF,
+ // Mushroom
+ {SPR_SHRM, 4, 3, {NULL}, 0, 0, S_HHZSHROOM_2}, // S_HHZSHROOM_1,
+ {SPR_SHRM, 3, 3, {NULL}, 0, 0, S_HHZSHROOM_3}, // S_HHZSHROOM_2,
+ {SPR_SHRM, 2, 2, {NULL}, 0, 0, S_HHZSHROOM_4}, // S_HHZSHROOM_3,
+ {SPR_SHRM, 1, 1, {NULL}, 0, 0, S_HHZSHROOM_5}, // S_HHZSHROOM_4,
+ {SPR_SHRM, 0, 1, {NULL}, 0, 0, S_HHZSHROOM_6}, // S_HHZSHROOM_5,
+ {SPR_SHRM, 1, 4, {NULL}, 0, 0, S_HHZSHROOM_7}, // S_HHZSHROOM_6,
+ {SPR_SHRM, 2, 2, {NULL}, 0, 0, S_HHZSHROOM_8}, // S_HHZSHROOM_7,
+ {SPR_SHRM, 3, 3, {NULL}, 0, 0, S_HHZSHROOM_9}, // S_HHZSHROOM_8,
+ {SPR_SHRM, 4, 3, {NULL}, 0, 0, S_HHZSHROOM_10}, // S_HHZSHROOM_9,
+ {SPR_SHRM, 3, 3, {NULL}, 0, 0, S_HHZSHROOM_11}, // S_HHZSHROOM_10,
+ {SPR_SHRM, 5, 2, {NULL}, 0, 0, S_HHZSHROOM_12}, // S_HHZSHROOM_11,
+ {SPR_SHRM, 6, 1, {NULL}, 0, 0, S_HHZSHROOM_13}, // S_HHZSHROOM_12,
+ {SPR_SHRM, 7, 1, {NULL}, 0, 0, S_HHZSHROOM_14}, // S_HHZSHROOM_13,
+ {SPR_SHRM, 6, 4, {NULL}, 0, 0, S_HHZSHROOM_15}, // S_HHZSHROOM_14,
+ {SPR_SHRM, 5, 2, {NULL}, 0, 0, S_HHZSHROOM_16}, // S_HHZSHROOM_15,
+ {SPR_SHRM, 3, 3, {NULL}, 0, 0, S_HHZSHROOM_1}, // S_HHZSHROOM_16,
+ // Misc
+ {SPR_HHZM, 0, -1, {NULL}, 0, 0, S_NULL}, // S_HHZGRASS,
+ {SPR_HHZM, 1, -1, {NULL}, 0, 0, S_NULL}, // S_HHZTENT1,
+ {SPR_HHZM, 2, -1, {NULL}, 0, 0, S_NULL}, // S_HHZTENT2,
+ {SPR_HHZM, 4, -1, {NULL}, 0, 0, S_NULL}, // S_HHZSTALAGMITE_TALL,
+ {SPR_HHZM, 5, -1, {NULL}, 0, 0, S_NULL}, // S_HHZSTALAGMITE_SHORT,
// Loads of Botanic Serenity bullshit
{SPR_BSZ1, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BSZTALLFLOWER_RED
@@ -2232,9 +2296,9 @@ state_t states[NUMSTATES] =
{SPR_BSZ8, 0, -1, {NULL}, 0, 0, S_NULL}, // S_BSZSHRUB
{SPR_BSZ8, 1, -1, {NULL}, 0, 0, S_NULL}, // S_BSZCLOVER
{SPR_BSZ8, 2, -1, {NULL}, 0, 0, S_NULL}, // S_BIG_PALMTREE_TRUNK
- {SPR_BSZ8, 3, -1, {NULL}, 0, 0, S_NULL}, // S_BIG_PALMTREE_TOP
+ {SPR_BSZ8, 3, -1, {A_ConnectToGround}, MT_BIG_PALMTREE_TRUNK, 0, S_NULL}, // S_BIG_PALMTREE_TOP
{SPR_BSZ8, 4, -1, {NULL}, 0, 0, S_NULL}, // S_PALMTREE_TRUNK
- {SPR_BSZ8, 5, -1, {NULL}, 0, 0, S_NULL}, // S_PALMTREE_TOP
+ {SPR_BSZ8, 5, -1, {A_ConnectToGround}, MT_PALMTREE_TRUNK, 0, S_NULL}, // S_PALMTREE_TOP
// Disco ball
{SPR_DBAL, FF_FULLBRIGHT, 5, {NULL}, 0, 0, S_DBALL2}, // S_DBALL1
@@ -2604,10 +2668,10 @@ state_t states[NUMSTATES] =
{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, 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
@@ -2629,6 +2693,19 @@ state_t states[NUMSTATES] =
{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
+ // Spider
+ {SPR_FS01, 0, 2, {A_FlickyCheck}, S_SECRETFLICKY_01_AIM, 0, S_SECRETFLICKY_01_OUT}, // S_SECRETFLICKY_01_OUT
+ {SPR_FS01, 1, 1, {A_FlickyAim}, ANG30, 32*FRACUNIT, S_SECRETFLICKY_01_HOP}, // S_SECRETFLICKY_01_AIM
+ {SPR_FS01, 1, 1, {A_FlickyFlounder}, 2*FRACUNIT, 6*FRACUNIT, S_SECRETFLICKY_01_UP}, // S_SECRETFLICKY_01_HOP
+ {SPR_FS01, 2, 2, {A_FlickyCheck}, S_SECRETFLICKY_01_AIM, S_SECRETFLICKY_01_DOWN, S_SECRETFLICKY_01_UP}, // S_SECRETFLICKY_01_UP
+ {SPR_FS01, 3, 2, {A_FlickyCheck}, S_SECRETFLICKY_01_AIM, 0, S_SECRETFLICKY_01_DOWN}, // S_SECRETFLICKY_01_DOWN
+
+ // Bat
+ {SPR_FS02, 0, 2, {A_FlickyHeightCheck}, S_SECRETFLICKY_02_FLAP1, S_SECRETFLICKY_02_FLAP1, S_SECRETFLICKY_02_OUT}, // S_SECRETFLICKY_02_OUT
+ {SPR_FS02, 1, 3, {A_FlickyFly}, 4*FRACUNIT, 16*FRACUNIT, S_SECRETFLICKY_02_FLAP2}, // S_SECRETFLICKY_02_FLAP1
+ {SPR_FS02, 2, 3, {A_FlickyFly}, 4*FRACUNIT, 16*FRACUNIT, S_SECRETFLICKY_02_FLAP3}, // S_SECRETFLICKY_02_FLAP2
+ {SPR_FS02, 3, 3, {A_FlickyFly}, 4*FRACUNIT, 16*FRACUNIT, S_SECRETFLICKY_02_FLAP1}, // S_SECRETFLICKY_02_FLAP3
+
// Yellow Spring
{SPR_SPRY, 0, -1, {NULL}, 0, 0, S_NULL}, // S_YELLOWSPRING
{SPR_SPRY, 4, 4, {A_Pain}, 0, 0, S_YELLOWSPRING3}, // S_YELLOWSPRING2
@@ -3179,7 +3256,87 @@ state_t states[NUMSTATES] =
{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
+ // Secret badniks and hazards, shhhh
+ {SPR_FMCE, 0, 20, {NULL}, 0, 0, S_SMASHSPIKE_EASE1}, // S_SMASHSPIKE_FLOAT
+ {SPR_FMCE, 0, 4, {A_ZThrust}, 4, (1<<16)|1, S_SMASHSPIKE_EASE2}, // S_SMASHSPIKE_EASE1
+ {SPR_FMCE, 0, 4, {A_ZThrust}, 0, (1<<16)|1, S_SMASHSPIKE_FALL}, // S_SMASHSPIKE_EASE1
+ {SPR_FMCE, 0, 2, {A_ZThrust}, -6, (1<<16)|1, S_SMASHSPIKE_FALL}, // S_SMASHSPIKE_FALL
+ {SPR_FMCE, 1, 2, {A_MultiShotDist}, (MT_HHZDUST<<16)|10, -48, S_SMASHSPIKE_STOMP2}, // S_SMASHSPIKE_STOMP1
+ {SPR_FMCE, 2, 14, {NULL}, 0, 0, S_SMASHSPIKE_RISE1}, // S_SMASHSPIKE_STOMP2
+ {SPR_FMCE, 1, 2, {NULL}, 0, 0, S_SMASHSPIKE_RISE2}, // S_SMASHSPIKE_RISE1
+ {SPR_FMCE, 0, 2, {A_ZThrust}, 6, (1<<16)|1, S_SMASHSPIKE_RISE2}, // S_SMASHSPIKE_RISE2
+
+ {SPR_DUST, FF_TRANS40, 4, {NULL}, 0, 0, S_HHZDUST2}, // S_HHZDUST1
+ {SPR_DUST, 1|FF_TRANS50, 5, {NULL}, 0, 0, S_HHZDUST3}, // S_HHZDUST2
+ {SPR_DUST, 2|FF_TRANS60, 3, {NULL}, 0, 0, S_HHZDUST4}, // S_HHZDUST3
+ {SPR_DUST, 3|FF_TRANS70, 2, {NULL}, 0, 0, S_NULL}, // S_HHZDUST4
+
+ {SPR_CACO, 0, 5, {A_Look}, (1100<<16)|1, 0, S_CACO_LOOK}, // S_CACO_LOOK
+ {SPR_CACO, 1, 0, {A_MultiShotDist}, (MT_HHZDUST<<16)|7, -48, S_CACO_WAKE2}, // S_CACO_WAKE1
+ {SPR_CACO, 1, 10, {A_ZThrust}, 4, (1<<16)|1, S_CACO_WAKE3}, // S_CACO_WAKE2
+ {SPR_CACO, 2, 8, {A_ZThrust}, 2, (1<<16)|1, S_CACO_WAKE4}, // S_CACO_WAKE3
+ {SPR_CACO, 2, 4, {A_ZThrust}, 0, (1<<16)|1, S_CACO_ROAR}, // S_CACO_WAKE4
+ {SPR_CACO, 2, 10, {A_PlayActiveSound}, 0, 0, S_CACO_CHASE}, // S_CACO_ROAR
+ {SPR_CACO, 2, 5, {A_JetChase}, 0, 0, S_CACO_CHASE_REPEAT}, // S_CACO_CHASE
+ {SPR_CACO, 2, 0, {A_Repeat}, 5, S_CACO_CHASE, S_CACO_RANDOM}, // S_CACO_CHASE_REPEAT
+ {SPR_CACO, 2, 0, {A_RandomState}, S_CACO_PREPARE_SOUND, S_CACO_CHASE, S_CACO_RANDOM}, // S_CACO_RANDOM
+ {SPR_CACO, 2, 8, {A_PlaySound}, sfx_s3k95, 0, S_CACO_PREPARE1}, // S_CACO_PREPARE_SOUND
+ {SPR_CACO, 3, 8, {NULL}, 0, 0, S_CACO_PREPARE2}, // S_CACO_PREPARE1
+ {SPR_CACO, 4|FF_FULLBRIGHT, 8, {NULL}, 0, 0, S_CACO_PREPARE3}, // S_CACO_PREPARE2
+ {SPR_CACO, 5|FF_FULLBRIGHT, 8, {NULL}, 0, 0, S_CACO_SHOOT_SOUND}, // S_CACO_PREPARE3
+ {SPR_CACO, 4|FF_FULLBRIGHT, 0, {A_PlaySound}, sfx_s3k4e, 1, S_CACO_SHOOT1}, // S_CACO_SHOOT_SOUND
+ {SPR_CACO, 4|FF_FULLBRIGHT, 0, {A_SpawnParticleRelative}, 0, S_CACOFIRE_EXPLODE1, S_CACO_SHOOT2}, // S_CACO_SHOOT1
+ {SPR_CACO, 4|FF_FULLBRIGHT, 6, {A_FireShot}, MT_CACOFIRE, -24, S_CACO_CLOSE}, // S_CACO_SHOOT2
+ {SPR_CACO, 3, 15, {NULL}, 0, 0, S_CACO_CHASE}, // S_CACO_CLOSE
+ {SPR_CACO, 10, 0, {A_SetObjectFlags}, MF_NOBLOCKMAP, 0, S_CACO_DIE_GIB1}, // S_CACO_DIE_FLAGS
+ {SPR_CACO, 10, 0, {A_NapalmScatter}, (7<<16)|MT_CACOSHARD, (30<<16)|20, S_CACO_DIE_GIB2}, // S_CACO_DIE_GIB1
+ {SPR_CACO, 10, 0, {A_NapalmScatter}, (10<<16)|MT_CACOSHARD, (24<<16)|32, S_CACO_DIE_SCREAM}, // S_CACO_DIE_GIB2
+ {SPR_CACO, 10, 0, {A_Scream}, 0, 0, S_CACO_DIE_SHATTER}, // S_CACO_DIE_SCREAM
+ {SPR_CACO, 10, 0, {A_PlaySound}, sfx_pumpkn, 1, S_CACO_DIE_FALL}, // S_CACO_DIE_SHATTER
+ {SPR_CACO, 10, 250, {A_FlickySpawn}, (1<<16), 0, S_NULL}, // S_CACO_DIE_FALL
+
+ {SPR_CACO, 6, 0, {A_RandomState}, S_CACOSHARD1_1, S_CACOSHARD2_1, S_NULL}, // S_CACOSHARD_RANDOMIZE
+ {SPR_CACO, 6, 3, {NULL}, 0, 0, S_CACOSHARD1_2}, // S_CACOSHARD1_1
+ {SPR_CACO, 7, 3, {NULL}, 0, 0, S_CACOSHARD1_1}, // S_CACOSHARD1_2
+ {SPR_CACO, 8, 3, {NULL}, 0, 0, S_CACOSHARD2_2}, // S_CACOSHARD2_1
+ {SPR_CACO, 9, 3, {NULL}, 0, 0, S_CACOSHARD2_1}, // S_CACOSHARD2_2
+ {SPR_BAL2, FF_FULLBRIGHT, 2, {A_GhostMe}, 0, 0, S_CACOFIRE2}, // S_CACOFIRE1
+ {SPR_BAL2, 1|FF_FULLBRIGHT, 2, {A_GhostMe}, 0, 0, S_CACOFIRE3}, // S_CACOFIRE2
+ {SPR_BAL2, FF_FULLBRIGHT, 0, {A_PlayActiveSound}, 0, 0, S_CACOFIRE1}, // S_CACOFIRE3
+ {SPR_BAL2, 2|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_CACOFIRE_EXPLODE2}, // S_CACOFIRE_EXPLODE1
+ {SPR_BAL2, 3|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_CACOFIRE_EXPLODE3}, // S_CACOFIRE_EXPLODE2
+ {SPR_BAL2, 4|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_CACOFIRE_EXPLODE4}, // S_CACOFIRE_EXPLODE3
+ {SPR_BAL2, 5|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL}, // S_CACOFIRE_EXPLODE4
+
+ {SPR_SBOB, 1, 10, {A_ZThrust}, -2, (1<<16)|1, S_SPINBOBERT_MOVE_UP}, // S_SPINBOBERT_MOVE_FLIPUP
+ {SPR_SBOB, 0, 45, {A_ZThrust}, 4, (1<<16)|1, S_SPINBOBERT_MOVE_FLIPDOWN}, // S_SPINBOBERT_MOVE_UP
+ {SPR_SBOB, 1, 10, {A_ZThrust}, 2, (1<<16)|1, S_SPINBOBERT_MOVE_DOWN}, // S_SPINBOBERT_MOVE_FLIPDOWN
+ {SPR_SBOB, 2, 45, {A_ZThrust}, -4, (1<<16)|1, S_SPINBOBERT_MOVE_FLIPUP}, // S_SPINBOBERT_MOVE_DOWN
+ {SPR_SBSK, FF_FULLBRIGHT, 1, {A_RotateSpikeBall}, 0, 0, S_SPINBOBERT_FIRE_GHOST}, // S_SPINBOBERT_FIRE_MOVE
+ {SPR_SBSK, FF_FULLBRIGHT, 0, {A_SpawnParticleRelative}, 0, S_SPINBOBERT_FIRE_TRAIL1, S_SPINBOBERT_FIRE_MOVE}, // S_SPINBOBERT_FIRE_GHOST
+ {SPR_SBFL, 2|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SPINBOBERT_FIRE_TRAIL2}, // S_SPINBOBERT_FIRE_TRAIL1
+ {SPR_SBFL, 1|FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_SPINBOBERT_FIRE_TRAIL3}, // S_SPINBOBERT_FIRE_TRAIL2
+ {SPR_SBFL, FF_FULLBRIGHT, 2, {NULL}, 0, 0, S_NULL}, // S_SPINBOBERT_FIRE_TRAIL3
+
+ {SPR_HBAT, 0, 5, {A_Look}, (900<<16)|1, 0, S_HANGSTER_LOOK}, // S_HANGSTER_LOOK
+ {SPR_HBAT, 1, 0, {A_MultiShotDist}, (MT_HHZDUST<<16)|10, -34, S_HANGSTER_SWOOP2}, // S_HANGSTER_SWOOP1
+ {SPR_HBAT, 1, 2, {A_ZThrust}, -8, (1<<16)|1, S_HANGSTER_SWOOP2}, // S_HANGSTER_SWOOP2
+ {SPR_HBAT, 1, 6, {A_ZThrust}, -5, (1<<16), S_HANGSTER_ARC2}, // S_HANGSTER_ARC1
+ {SPR_HBAT, 1, 5, {A_ZThrust}, -2, (1<<16), S_HANGSTER_ARC3}, // S_HANGSTER_ARC2
+ {SPR_HBAT, 1, 1, {A_ZThrust}, 0, (1<<16), S_HANGSTER_FLY1}, // S_HANGSTER_ARC3
+ {SPR_HBAT, 1, 4, {A_Thrust}, 6, 1, S_HANGSTER_FLY2}, // S_HANGSTER_FLY1
+ {SPR_HBAT, 2, 1, {A_PlaySound}, sfx_s3k52, 1, S_HANGSTER_FLY3}, // S_HANGSTER_FLY2
+ {SPR_HBAT, 3, 4, {A_Thrust}, 6, 1, S_HANGSTER_FLY4}, // S_HANGSTER_FLY3
+ {SPR_HBAT, 2, 1, {A_Thrust}, 6, 1, S_HANGSTER_FLYREPEAT}, // S_HANGSTER_FLY4
+ {SPR_HBAT, 2, 0, {A_Repeat}, 12, S_HANGSTER_FLY1, S_HANGSTER_ARCUP1}, // S_HANGSTER_FLYREPEAT
+ {SPR_HBAT, 1, 5, {A_ZThrust}, 2, (1<<16), S_HANGSTER_ARCUP2}, // S_HANGSTER_ARCUP1
+ {SPR_HBAT, 1, 6, {A_ZThrust}, 5, (1<<16), S_HANGSTER_ARCUP3}, // S_HANGSTER_ARCUP2
+ {SPR_HBAT, 1, 1, {A_ZThrust}, 0, (1<<16), S_HANGSTER_RETURN1}, // S_HANGSTER_ARCUP3
+ {SPR_HBAT, 1, 1, {A_ZThrust}, 8, (1<<16), S_HANGSTER_RETURN2}, // S_HANGSTER_RETURN1
+ {SPR_HBAT, 3, 1, {NULL}, 0, 0, S_HANGSTER_RETURN1}, // S_HANGSTER_RETURN2
+ {SPR_HBAT, 0, 15, {NULL}, 0, 0, S_HANGSTER_LOOK}, // S_HANGSTER_RETURN3
+
+ {SPR_NULL, 0, 35, {NULL}, 0, 0, S_CRUMBLE2}, // S_CRUMBLE1
{SPR_NULL, 0, 105, {A_Scream}, 0, 0, S_NULL}, // S_CRUMBLE2
// Spark
@@ -3643,7 +3800,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
20*FRACUNIT, // radius
32*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
1, // damage
sfx_None, // activesound
MF_ENEMY|MF_SHOOTABLE|MF_NOGRAVITY|MF_MISSILE, // flags
@@ -3886,7 +4043,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
4*FRACUNIT, // radius
8*FRACUNIT, // height
0, // display offset
- 100, // mass
+ DMG_SPIKE, // mass
1, // damage
sfx_None, // activesound
MF_PAIN|MF_NOGRAVITY, // flags
@@ -4156,7 +4313,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
13*FRACUNIT, // radius
26*FRACUNIT, // height
0, // display offset
- 0, // mass
+ DMG_SPIKE, // mass
8*FRACUNIT, // damage
sfx_None, // activesound
MF_PAIN|MF_NOGRAVITY|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOCLIPTHING, // flags
@@ -4453,7 +4610,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
8*FRACUNIT, // radius
14*FRACUNIT, // height
0, // display offset
- 100, // mass
+ DMG_FIRE, // mass
1, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY|MF_FIRE, // flags
@@ -4615,7 +4772,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
4*FRACUNIT, // radius
4*FRACUNIT, // height
0, // display offset
- 4, // mass
+ DMG_WATER, // mass
0, // damage
sfx_None, // activesound
MF_PAIN, // flags
@@ -4777,7 +4934,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
34*FRACUNIT, // radius
68*FRACUNIT, // height
0, // display offset
- 100, // mass
+ DMG_SPIKE, // mass
1, // damage
sfx_mswing, // activesound
MF_PAIN|MF_NOCLIP|MF_NOCLIPHEIGHT|MF_NOGRAVITY, // flags
@@ -4804,7 +4961,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
20*FRACUNIT, // radius
32*FRACUNIT, // height
0, // display offset
- 4, // mass
+ DMG_FIRE, // mass
0, // damage
sfx_None, // activesound
MF_NOGRAVITY|MF_PAIN|MF_FIRE, // flags
@@ -4885,7 +5042,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
11*FRACUNIT, // radius
8*FRACUNIT, // height
100, // display offset
- 100, // mass
+ 0, // mass
0, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
@@ -4912,7 +5069,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
24*FRACUNIT, // radius
24*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
1, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
@@ -4966,7 +5123,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
48*FRACUNIT, // radius
160*FRACUNIT, // height
0, // display offset
- 100, // mass
+ DMG_ELECTRIC, // mass
1, // damage
sfx_beelec, // activesound
MF_PAIN|MF_FIRE|MF_NOGRAVITY|MF_PUSHABLE, // flags
@@ -4993,7 +5150,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
11*FRACUNIT, // radius
8*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
32*FRACUNIT, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
@@ -5020,7 +5177,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
24*FRACUNIT, // radius
24*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
1, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
@@ -5047,7 +5204,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
24*FRACUNIT, // radius
24*FRACUNIT, // height
0, // display offset
- 100, // mass
+ DMG_FIRE, // mass
1, // damage
sfx_None, // activesound
MF_PAIN|MF_FIRE|MF_RUNSPAWNFUNC, // flags
@@ -5117,7 +5274,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
8, // reactiontime
sfx_None, // attacksound
S_NULL, // painstate
- 0, // painchance
+ 20*TICRATE, // painchance
sfx_None, // painsound
S_NULL, // meleestate
S_NULL, // missilestate
@@ -5128,7 +5285,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
24*FRACUNIT, // radius
24*FRACUNIT, // height
0, // display offset
- 20*TICRATE, // mass
+ 0, // mass
48*FRACUNIT, // damage
sfx_s3k5d, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_BOUNCE|MF_GRENADEBOUNCE, // flags
@@ -5155,7 +5312,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
24*FRACUNIT, // radius
24*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
32*FRACUNIT, // damage
sfx_s3k99, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_BOUNCE, // flags
@@ -5182,7 +5339,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
24*FRACUNIT, // radius
24*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
1, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE, // flags
@@ -6176,7 +6333,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
4*FRACUNIT, // radius
8*FRACUNIT, // height
0, // display offset
- 100, // mass
+ DMG_SPIKE, // mass
1, // damage
sfx_None, // activesound
MF_PAIN|MF_NOGRAVITY, // flags
@@ -6230,7 +6387,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
8*FRACUNIT, // radius
14*FRACUNIT, // height
0, // display offset
- 100, // mass
+ DMG_FIRE, // mass
1, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY|MF_FIRE, // flags
@@ -6248,7 +6405,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // painstate
0, // painchance
sfx_s3k64, // painsound
- S_NULL, // meleestate
+ S_SPIKE4, // meleestate
S_NULL, // missilestate
S_SPIKED1, // deathstate
S_SPIKED2, // xdeathstate
@@ -7931,7 +8088,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
11*FRACUNIT, // radius
8*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
20, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
@@ -7958,7 +8115,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
11*FRACUNIT, // radius
8*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
20, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
@@ -7985,7 +8142,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
11*FRACUNIT, // radius
8*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
20, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
@@ -8012,7 +8169,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
11*FRACUNIT, // radius
8*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
20, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
@@ -8039,7 +8196,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
60*FRACUNIT, // radius
120*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
20, // damage
sfx_None, // activesound
MF_PAIN|MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
@@ -8066,7 +8223,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
8*FRACUNIT, // radius
10*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
64*FRACUNIT, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE, // flags
@@ -8093,7 +8250,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
4*FRACUNIT, // radius
8*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
1, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
@@ -8120,7 +8277,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
12*FRACUNIT, // radius
24*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
1, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
@@ -8147,7 +8304,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16*FRACUNIT, // radius
32*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
1, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE, // flags
@@ -8201,7 +8358,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
4*FRACUNIT, // radius
8*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
1, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
@@ -8228,7 +8385,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
8*FRACUNIT, // radius
8*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
1, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
@@ -9200,7 +9357,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
8*FRACUNIT, // radius
32*FRACUNIT, // height
0, // display offset
- 100, // mass
+ DMG_FIRE, // mass
0, // damage
sfx_None, // activesound
MF_NOGRAVITY|MF_PAIN|MF_FIRE, // flags
@@ -9524,9 +9681,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
17*FRACUNIT, // radius
34*FRACUNIT, // height
1, // display offset
- 100, // mass
+ 0, // mass
1, // damage
- sfx_mswing, // activesound
+ sfx_s3kc9s, //sfx_mswing, -- activesound
MF_SCENERY|MF_PAIN|MF_NOGRAVITY, // flags
S_NULL // raisestate
},
@@ -9551,9 +9708,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
34*FRACUNIT, // radius
68*FRACUNIT, // height
1, // display offset
- 100, // mass
+ 0, // mass
1, // damage
- sfx_mswing, // activesound
+ sfx_s3kc9s, //sfx_mswing, -- activesound
MF_SCENERY|MF_PAIN|MF_NOGRAVITY, // flags
S_NULL // raisestate
},
@@ -9632,7 +9789,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
17*FRACUNIT, // radius
34*FRACUNIT, // height
0, // display offset
- 100, // mass
+ DMG_FIRE, // mass
1, // damage
sfx_None, // activesound
MF_SCENERY|MF_PAIN|MF_FIRE|MF_NOGRAVITY, // flags
@@ -9659,7 +9816,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
34*FRACUNIT, // radius
68*FRACUNIT, // height
1, // display offset
- 100, // mass
+ DMG_FIRE, // mass
1, // damage
sfx_None, // activesound
MF_SCENERY|MF_PAIN|MF_FIRE|MF_NOGRAVITY, // flags
@@ -9929,7 +10086,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
8*FRACUNIT, // radius
8*FRACUNIT, // height
0, // display offset
- 100, // mass
+ DMG_FIRE, // mass
0, // damage
sfx_None, // activesound
MF_NOGRAVITY|MF_MISSILE|MF_FIRE, // flags
@@ -10010,7 +10167,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16*FRACUNIT, // radius
24*FRACUNIT, // height
0, // display offset
- 100, // mass
+ DMG_FIRE, // mass
1, // damage
sfx_None, // activesound
MF_NOGRAVITY|MF_MISSILE|MF_FIRE|MF_NOBLOCKMAP|MF_RUNSPAWNFUNC, // flags
@@ -10665,12 +10822,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- // No, I did not do all of this by hand.
- // I made a script to make all of these for me.
- // Ha HA. ~Inuyasha
- { // MT_BSZTALLFLOWER_RED
- 1400, // doomednum
- S_BSZTALLFLOWER_RED, // spawnstate
+ { // MT_JACKO1
+ 3520, // doomednum
+ S_JACKO1, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -10685,19 +10839,19 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
- 16*FRACUNIT, // radius
- 32*FRACUNIT, // height
+ FRACUNIT, // radius
+ FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
sfx_None, // activesound
- MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
- S_NULL // raisestate
+ MF_NOBLOCKMAP|MF_SCENERY, // flags
+ S_JACKO1OVERLAY_1 // raisestate
},
- { // MT_BSZTALLFLOWER_PURPLE
- 1401, // doomednum
- S_BSZTALLFLOWER_PURPLE, // spawnstate
+ { // MT_JACKO2
+ 3521, // doomednum
+ S_JACKO2, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -10712,19 +10866,19 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
- 16*FRACUNIT, // radius
- 32*FRACUNIT, // height
+ FRACUNIT, // radius
+ FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
sfx_None, // activesound
- MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
- S_NULL // raisestate
+ MF_NOBLOCKMAP|MF_SCENERY, // flags
+ S_JACKO2OVERLAY_1 // raisestate
},
- { // MT_BSZTALLFLOWER_BLUE
- 1402, // doomednum
- S_BSZTALLFLOWER_BLUE, // spawnstate
+ { // MT_JACKO3
+ 3522, // doomednum
+ S_JACKO3, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -10739,19 +10893,19 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
- 16*FRACUNIT, // radius
- 32*FRACUNIT, // height
+ FRACUNIT, // radius
+ FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
sfx_None, // activesound
- MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
- S_NULL // raisestate
+ MF_NOBLOCKMAP|MF_SCENERY, // flags
+ S_JACKO3OVERLAY_1 // raisestate
},
- { // MT_BSZTALLFLOWER_CYAN
- 1403, // doomednum
- S_BSZTALLFLOWER_CYAN, // spawnstate
+ { // MT_HHZTREE_TOP
+ 3540, // doomednum
+ S_HHZTREE_TOP, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -10766,21 +10920,21 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
- 16*FRACUNIT, // radius
- 32*FRACUNIT, // height
+ FRACUNIT, // radius
+ 40*FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
sfx_None, // activesound
- MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ MF_NOTHINK|MF_SCENERY|MF_NOBLOCKMAP|MF_NOGRAVITY|MF_RUNSPAWNFUNC, // flags
S_NULL // raisestate
},
- { // MT_BSZTALLFLOWER_YELLOW
- 1404, // doomednum
- S_BSZTALLFLOWER_YELLOW, // spawnstate
+ { // MT_HHZTREE_PART
+ -1, // doomednum
+ S_HHZTREE_TRUNK,// spawnstate
1000, // spawnhealth
- S_NULL, // seestate
+ S_HHZTREE_LEAF, // seestate
sfx_None, // seesound
8, // reactiontime
sfx_None, // attacksound
@@ -10793,19 +10947,19 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
- 16*FRACUNIT, // radius
- 32*FRACUNIT, // height
+ FRACUNIT, // radius
+ 40*FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
sfx_None, // activesound
- MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ MF_NOTHINK|MF_SCENERY|MF_NOBLOCKMAP|MF_NOGRAVITY, // flags
S_NULL // raisestate
},
- { // MT_BSZTALLFLOWER_ORANGE
- 1405, // doomednum
- S_BSZTALLFLOWER_ORANGE, // spawnstate
+ { // MT_HHZSHROOM
+ 3530, // doomednum
+ S_HHZSHROOM_1, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -10820,19 +10974,19 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
- 16*FRACUNIT, // radius
- 32*FRACUNIT, // height
+ FRACUNIT, // radius
+ FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
sfx_None, // activesound
- MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ MF_SCENERY|MF_NOBLOCKMAP, // flags
S_NULL // raisestate
},
- { // MT_BSZFLOWER_RED
- 1410, // doomednum
- S_BSZFLOWER_RED, // spawnstate
+ { // MT_HHZGRASS
+ 3513, // doomednum
+ S_HHZGRASS, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -10847,19 +11001,19 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
- 16*FRACUNIT, // radius
- 32*FRACUNIT, // height
+ FRACUNIT, // radius
+ FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
sfx_None, // activesound
- MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ MF_NOTHINK|MF_SCENERY|MF_NOBLOCKMAP, // flags
S_NULL // raisestate
},
- { // MT_BSZFLOWER_PURPLE
- 1411, // doomednum
- S_BSZFLOWER_PURPLE, // spawnstate
+ { // MT_HHZTENTACLE1
+ 3515, // doomednum
+ S_HHZTENT1, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -10874,19 +11028,19 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
- 16*FRACUNIT, // radius
- 32*FRACUNIT, // height
+ FRACUNIT, // radius
+ FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
sfx_None, // activesound
- MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ MF_NOTHINK|MF_SCENERY|MF_NOBLOCKMAP, // flags
S_NULL // raisestate
},
- { // MT_BSZFLOWER_BLUE
- 1412, // doomednum
- S_BSZFLOWER_BLUE, // spawnstate
+ { // MT_HHZTENTACLE2
+ 3516, // doomednum
+ S_HHZTENT2, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -10901,19 +11055,19 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
- 16*FRACUNIT, // radius
- 32*FRACUNIT, // height
+ FRACUNIT, // radius
+ FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
sfx_None, // activesound
- MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ MF_NOTHINK|MF_SCENERY|MF_NOBLOCKMAP, // flags
S_NULL // raisestate
},
- { // MT_BSZFLOWER_CYAN
- 1413, // doomednum
- S_BSZFLOWER_CYAN, // spawnstate
+ { // MT_HHZSTALAGMITE_TALL
+ 3517, // doomednum
+ S_HHZSTALAGMITE_TALL, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -10928,19 +11082,19 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
- 16*FRACUNIT, // radius
- 32*FRACUNIT, // height
+ FRACUNIT, // radius
+ FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
sfx_None, // activesound
- MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ MF_NOTHINK|MF_SCENERY|MF_NOBLOCKMAP, // flags
S_NULL // raisestate
},
- { // MT_BSZFLOWER_YELLOW
- 1414, // doomednum
- S_BSZFLOWER_YELLOW, // spawnstate
+ { // MT_HHZSTALAGMITE_SHORT
+ 3518, // doomednum
+ S_HHZSTALAGMITE_SHORT, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -10955,19 +11109,22 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL, // xdeathstate
sfx_None, // deathsound
0, // speed
- 16*FRACUNIT, // radius
- 32*FRACUNIT, // height
+ FRACUNIT, // radius
+ FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
sfx_None, // activesound
- MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ MF_NOTHINK|MF_SCENERY|MF_NOBLOCKMAP, // flags
S_NULL // raisestate
},
- { // MT_BSZFLOWER_ORANGE
- 1415, // doomednum
- S_BSZFLOWER_ORANGE, // spawnstate
+ // No, I did not do all of this by hand.
+ // I made a script to make all of these for me.
+ // Ha HA. ~Inuyasha
+ { // MT_BSZTALLFLOWER_RED
+ 1400, // doomednum
+ S_BSZTALLFLOWER_RED, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -10992,9 +11149,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_BSZSHORTFLOWER_RED
- 1420, // doomednum
- S_BSZSHORTFLOWER_RED, // spawnstate
+ { // MT_BSZTALLFLOWER_PURPLE
+ 1401, // doomednum
+ S_BSZTALLFLOWER_PURPLE, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -11019,9 +11176,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_BSZSHORTFLOWER_PURPLE
- 1421, // doomednum
- S_BSZSHORTFLOWER_PURPLE, // spawnstate
+ { // MT_BSZTALLFLOWER_BLUE
+ 1402, // doomednum
+ S_BSZTALLFLOWER_BLUE, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -11046,9 +11203,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_BSZSHORTFLOWER_BLUE
- 1422, // doomednum
- S_BSZSHORTFLOWER_BLUE, // spawnstate
+ { // MT_BSZTALLFLOWER_CYAN
+ 1403, // doomednum
+ S_BSZTALLFLOWER_CYAN, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -11073,9 +11230,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_BSZSHORTFLOWER_CYAN
- 1423, // doomednum
- S_BSZSHORTFLOWER_CYAN, // spawnstate
+ { // MT_BSZTALLFLOWER_YELLOW
+ 1404, // doomednum
+ S_BSZTALLFLOWER_YELLOW, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -11100,9 +11257,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_BSZSHORTFLOWER_YELLOW
- 1424, // doomednum
- S_BSZSHORTFLOWER_YELLOW, // spawnstate
+ { // MT_BSZTALLFLOWER_ORANGE
+ 1405, // doomednum
+ S_BSZTALLFLOWER_ORANGE, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -11127,9 +11284,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_BSZSHORTFLOWER_ORANGE
- 1425, // doomednum
- S_BSZSHORTFLOWER_ORANGE, // spawnstate
+ { // MT_BSZFLOWER_RED
+ 1410, // doomednum
+ S_BSZFLOWER_RED, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -11154,9 +11311,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_BSZTULIP_RED
- 1430, // doomednum
- S_BSZTULIP_RED, // spawnstate
+ { // MT_BSZFLOWER_PURPLE
+ 1411, // doomednum
+ S_BSZFLOWER_PURPLE, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -11181,9 +11338,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_BSZTULIP_PURPLE
- 1431, // doomednum
- S_BSZTULIP_PURPLE, // spawnstate
+ { // MT_BSZFLOWER_BLUE
+ 1412, // doomednum
+ S_BSZFLOWER_BLUE, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -11208,9 +11365,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_BSZTULIP_BLUE
- 1432, // doomednum
- S_BSZTULIP_BLUE, // spawnstate
+ { // MT_BSZFLOWER_CYAN
+ 1413, // doomednum
+ S_BSZFLOWER_CYAN, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -11235,9 +11392,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_BSZTULIP_CYAN
- 1433, // doomednum
- S_BSZTULIP_CYAN, // spawnstate
+ { // MT_BSZFLOWER_YELLOW
+ 1414, // doomednum
+ S_BSZFLOWER_YELLOW, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -11262,9 +11419,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_BSZTULIP_YELLOW
- 1434, // doomednum
- S_BSZTULIP_YELLOW, // spawnstate
+ { // MT_BSZFLOWER_ORANGE
+ 1415, // doomednum
+ S_BSZFLOWER_ORANGE, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -11289,9 +11446,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_BSZTULIP_ORANGE
- 1435, // doomednum
- S_BSZTULIP_ORANGE, // spawnstate
+ { // MT_BSZSHORTFLOWER_RED
+ 1420, // doomednum
+ S_BSZSHORTFLOWER_RED, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -11316,9 +11473,9 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_BSZCLUSTER_RED
- 1440, // doomednum
- S_BSZCLUSTER_RED, // spawnstate
+ { // MT_BSZSHORTFLOWER_PURPLE
+ 1421, // doomednum
+ S_BSZSHORTFLOWER_PURPLE, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -11343,9 +11500,306 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
- { // MT_BSZCLUSTER_PURPLE
- 1441, // doomednum
- S_BSZCLUSTER_PURPLE, // spawnstate
+ { // MT_BSZSHORTFLOWER_BLUE
+ 1422, // doomednum
+ S_BSZSHORTFLOWER_BLUE, // 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
+ 16*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_BSZSHORTFLOWER_CYAN
+ 1423, // doomednum
+ S_BSZSHORTFLOWER_CYAN, // 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
+ 16*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_BSZSHORTFLOWER_YELLOW
+ 1424, // doomednum
+ S_BSZSHORTFLOWER_YELLOW, // 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
+ 16*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_BSZSHORTFLOWER_ORANGE
+ 1425, // doomednum
+ S_BSZSHORTFLOWER_ORANGE, // 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
+ 16*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_BSZTULIP_RED
+ 1430, // doomednum
+ S_BSZTULIP_RED, // 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
+ 16*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_BSZTULIP_PURPLE
+ 1431, // doomednum
+ S_BSZTULIP_PURPLE, // 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
+ 16*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_BSZTULIP_BLUE
+ 1432, // doomednum
+ S_BSZTULIP_BLUE, // 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
+ 16*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_BSZTULIP_CYAN
+ 1433, // doomednum
+ S_BSZTULIP_CYAN, // 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
+ 16*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_BSZTULIP_YELLOW
+ 1434, // doomednum
+ S_BSZTULIP_YELLOW, // 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
+ 16*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_BSZTULIP_ORANGE
+ 1435, // doomednum
+ S_BSZTULIP_ORANGE, // 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
+ 16*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_BSZCLUSTER_RED
+ 1440, // doomednum
+ S_BSZCLUSTER_RED, // 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
+ 16*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_BSZCLUSTER_PURPLE
+ 1441, // doomednum
+ S_BSZCLUSTER_PURPLE, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
sfx_None, // seesound
@@ -11857,7 +12311,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
},
{ // MT_BIG_PALMTREE_TRUNK
- 1472, // doomednum
+ -1, // doomednum
S_BIG_PALMTREE_TRUNK, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
@@ -11874,7 +12328,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // deathsound
0, // speed
16*FRACUNIT, // radius
- 32*FRACUNIT, // height
+ 160*FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
@@ -11901,17 +12355,17 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // deathsound
0, // speed
16*FRACUNIT, // radius
- 32*FRACUNIT, // height
+ 160*FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
sfx_None, // activesound
- MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ MF_RUNSPAWNFUNC|MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
S_NULL // raisestate
},
{ // MT_PALMTREE_TRUNK
- 1474, // doomednum
+ -1, // doomednum
S_PALMTREE_TRUNK, // spawnstate
1000, // spawnhealth
S_NULL, // seestate
@@ -11928,7 +12382,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // deathsound
0, // speed
16*FRACUNIT, // radius
- 32*FRACUNIT, // height
+ 80*FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
@@ -11955,12 +12409,12 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // deathsound
0, // speed
16*FRACUNIT, // radius
- 32*FRACUNIT, // height
+ 80*FRACUNIT, // height
0, // display offset
100, // mass
0, // damage
sfx_None, // activesound
- MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
+ MF_RUNSPAWNFUNC|MF_NOTHINK|MF_NOBLOCKMAP|MF_NOCLIP|MF_SCENERY, // flags
S_NULL // raisestate
},
@@ -12775,6 +13229,87 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_FLICKY_BUBBLE // raisestate
},
+ { // MT_SECRETFLICKY_01
+ -1, // doomednum
+ S_SECRETFLICKY_01_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_SECRETFLICKY_02
+ -1, // doomednum
+ S_SECRETFLICKY_02_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_SEED
+ -1, // doomednum
+ S_SEED, // 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
+ -2*FRACUNIT, // speed
+ 4*FRACUNIT, // radius
+ 4*FRACUNIT, // height
+ 0, // display offset
+ 4, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOBLOCKMAP|MF_SCENERY, // flags
+ S_NULL // raisestate
+ },
+
{ // MT_RAIN
-1, // doomednum
S_RAIN1, // spawnstate
@@ -13036,39 +13571,12 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
sfx_None, // deathsound
0, // speed
16*FRACUNIT, // radius
- 32*FRACUNIT, // height
- 0, // display offset
- 100, // mass
- 1, // damage
- sfx_None, // activesound
- MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIP, // flags
- S_NULL // raisestate
- },
-
- { // MT_SEED
- -1, // doomednum
- S_SEED, // 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
- -2*FRACUNIT, // speed
- 4*FRACUNIT, // radius
- 4*FRACUNIT, // height
+ 32*FRACUNIT, // height
0, // display offset
- 4, // mass
- 0, // damage
+ 100, // mass
+ 1, // damage
sfx_None, // activesound
- MF_NOBLOCKMAP|MF_SCENERY, // flags
+ MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIP, // flags
S_NULL // raisestate
},
@@ -13566,6 +14074,33 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
+ { // MT_MACHINEAMBIENCE
+ 3405, // doomednum
+ S_INVISIBLE, // spawnstate
+ 24, // spawnhealth: repeat speed
+ S_NULL, // seestate
+ sfx_ambmac, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 200, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 1*FRACUNIT, // speed
+ 16*FRACUNIT, // radius
+ 16*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 20, // damage
+ sfx_None, // activesound
+ MF_NOSECTOR|MF_NOBLOCKMAP|MF_NOGRAVITY|MF_AMBIENT, // flags
+ S_NULL // raisestate
+ },
+
{ // MT_CORK
-1, // doomednum
S_CORK, // spawnstate
@@ -13586,7 +14121,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16*FRACUNIT, // radius
16*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
1, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
@@ -13613,7 +14148,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16*FRACUNIT, // radius
24*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
1, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
@@ -13993,7 +14528,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16*FRACUNIT, // radius
24*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
1, // damage
sfx_bnce1, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY|MF_BOUNCE, // flags
@@ -14020,7 +14555,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16*FRACUNIT, // radius
24*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
1, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
@@ -14047,7 +14582,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16*FRACUNIT, // radius
24*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
1, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
@@ -14074,7 +14609,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16*FRACUNIT, // radius
24*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
1, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
@@ -14101,7 +14636,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16*FRACUNIT, // radius
24*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
1, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY, // flags
@@ -14114,7 +14649,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
1000, // spawnhealth
S_NULL, // seestate
sfx_wepfir, // seesound
- 8, // reactiontime
+ 6*TICRATE, // reactiontime (<-- Looking for the Grenade Ring's fuse? It's right here! Again!)
sfx_gbeep, // attacksound
S_NULL, // painstate
192*FRACUNIT, // painchance
@@ -14128,7 +14663,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16*FRACUNIT, // radius
24*FRACUNIT, // height
0, // display offset
- 6*TICRATE, // mass (<-- Looking for the Grenade Ring's fuse? It's right here!)
+ 0, // mass
1, // damage
sfx_s3k5d, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_BOUNCE|MF_GRENADEBOUNCE, // flags
@@ -14290,7 +14825,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
4*FRACUNIT, // radius
8*FRACUNIT, // height
0, // display offset
- 100, // mass
+ DMG_FIRE, // mass
1, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_FIRE|MF_MISSILE, // flags
@@ -14317,7 +14852,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16*FRACUNIT, // radius
20*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
1, // damage
sfx_mario1, // activesound
MF_SPECIAL|MF_SHOOTABLE|MF_BOUNCE, // flags
@@ -14344,7 +14879,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
8*FRACUNIT, // radius
16*FRACUNIT, // height
0, // display offset
- 100, // mass
+ DMG_FIRE, // mass
0, // damage
sfx_None, // activesound
MF_PAIN|MF_FIRE, // flags
@@ -14398,7 +14933,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
4*FRACUNIT, // radius
8*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
0, // damage
sfx_None, // activesound
MF_PAIN, // flags
@@ -14424,7 +14959,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
16*FRACUNIT, // radius
48*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
0, // damage
sfx_None, // activesound
MF_PAIN, // flags
@@ -14451,7 +14986,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
8*FRACUNIT, // radius
8*FRACUNIT, // height
0, // display offset
- 100, // mass
+ DMG_FIRE, // mass
0, // damage
sfx_None, // activesound
MF_NOGRAVITY|MF_MISSILE|MF_FIRE, // flags
@@ -15107,6 +15642,249 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
S_NULL // raisestate
},
+ { // MT_SMASHINGSPIKEBALL
+ 3001, // doomednum
+ S_SMASHSPIKE_FLOAT, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 0, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 255, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 0, // speed
+ 18*FRACUNIT, // radius
+ 28*FRACUNIT, // height
+ 0, // display offset
+ 0, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOGRAVITY|MF_PAIN, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_HHZDUST
+ -1, // doomednum
+ S_HHZDUST1, // 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
+ 3*FRACUNIT, // speed
+ FRACUNIT, // radius
+ FRACUNIT, // height
+ 0, // display offset
+ 4, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_NOBLOCKMAP|MF_NOGRAVITY|MF_NOCLIPHEIGHT|MF_NOCLIP, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_CACOLANTERN
+ 3102, // doomednum
+ S_CACO_LOOK, // spawnstate
+ 1, // spawnhealth
+ S_CACO_WAKE1, // seestate
+ sfx_s3k8a, // seesound
+ 32, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 200, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_CACO_DIE_FLAGS, // deathstate
+ S_NULL, // xdeathstate
+ sfx_lntdie, // deathsound
+ FRACUNIT, // speed
+ 32*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 0, // damage
+ sfx_lntsit, // activesound
+ MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY|MF_RUNSPAWNFUNC|MF_NOGRAVITY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_CACOSHARD
+ -1, // doomednum
+ S_CACOSHARD_RANDOMIZE, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 200, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_NULL, // deathstate
+ S_NULL, // xdeathstate
+ sfx_lntdie, // deathsound
+ FRACUNIT, // speed
+ FRACUNIT, // radius
+ FRACUNIT, // height
+ 0, // display offset
+ 0, // mass
+ 0, // damage
+ sfx_None, // activesound
+ MF_MISSILE|MF_NOBLOCKMAP|MF_RUNSPAWNFUNC, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_CACOFIRE
+ -1, // doomednum
+ S_CACOFIRE1, // spawnstate
+ 1000, // spawnhealth
+ S_NULL, // seestate
+ sfx_s3k70, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 200, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_CACOFIRE_EXPLODE1, // deathstate
+ S_NULL, // xdeathstate
+ sfx_s3k81, // deathsound
+ 20*FRACUNIT, // speed
+ 16*FRACUNIT, // radius
+ 16*FRACUNIT, // height
+ 0, // display offset
+ 0, // mass
+ 20, // damage
+ sfx_s3k48, // activesound
+ MF_MISSILE|MF_NOBLOCKMAP|MF_NOGRAVITY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_SPINBOBERT
+ 3100, // doomednum
+ S_SPINBOBERT_MOVE_FLIPUP, // spawnstate
+ 1, // spawnhealth
+ S_NULL, // seestate
+ sfx_s3ka0, // seesound
+ 8, // 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_s3k92, // deathsound
+ 20*FRACUNIT, // speed
+ 32*FRACUNIT, // radius
+ 32*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 20, // damage
+ sfx_s3k48, // activesound
+ MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY|MF_NOGRAVITY, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_SPINBOBERT_FIRE1
+ -1, // doomednum
+ S_SPINBOBERT_FIRE_MOVE, // spawnstate
+ 1, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_ghosty, // attacksound
+ S_NULL, // painstate
+ 200, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_XPLD1, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ 10*FRACUNIT, // speed
+ 16*FRACUNIT, // radius
+ 16*FRACUNIT, // height
+ 0, // display offset
+ 0, // mass
+ 20, // damage
+ sfx_None, // activesound
+ MF_PAIN|MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_SPINBOBERT_FIRE2
+ -1, // doomednum
+ S_SPINBOBERT_FIRE_MOVE, // spawnstate
+ 1, // spawnhealth
+ S_NULL, // seestate
+ sfx_None, // seesound
+ 8, // reactiontime
+ sfx_ghosty, // attacksound
+ S_NULL, // painstate
+ 200, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_XPLD1, // deathstate
+ S_NULL, // xdeathstate
+ sfx_None, // deathsound
+ -10*FRACUNIT, // speed - only difference from above
+ 16*FRACUNIT, // radius
+ 16*FRACUNIT, // height
+ 0, // display offset
+ 0, // mass
+ 20, // damage
+ sfx_None, // activesound
+ MF_PAIN|MF_NOGRAVITY|MF_NOCLIPHEIGHT, // flags
+ S_NULL // raisestate
+ },
+
+ { // MT_HANGSTER
+ 3195, // doomednum
+ S_HANGSTER_LOOK, // spawnstate
+ 1, // spawnhealth
+ S_HANGSTER_SWOOP1, // seestate
+ sfx_s3ka0, // seesound
+ 8, // reactiontime
+ sfx_None, // attacksound
+ S_NULL, // painstate
+ 200, // painchance
+ sfx_None, // painsound
+ S_NULL, // meleestate
+ S_NULL, // missilestate
+ S_XPLD_FLICKY, // deathstate
+ S_NULL, // xdeathstate
+ sfx_pop, // deathsound
+ 20*FRACUNIT, // speed
+ 24*FRACUNIT, // radius
+ 24*FRACUNIT, // height
+ 0, // display offset
+ 100, // mass
+ 20, // damage
+ sfx_s3k48, // activesound
+ MF_SPECIAL|MF_SHOOTABLE|MF_ENEMY|MF_NOGRAVITY|MF_SPAWNCEILING, // flags
+ S_NULL // raisestate
+ },
+
{ // MT_TELEPORTMAN
751, // doomednum
S_INVISIBLE, // spawnstate
@@ -15548,7 +16326,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
1000, // spawnhealth
S_NULL, // seestate
sfx_ambint, // seesound
- 0, // reactiontime
+ 4, // reactiontime
sfx_None, // attacksound
S_NULL, // painstate
255, // painchance
@@ -15562,7 +16340,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
8*FRACUNIT, // radius
16*FRACUNIT, // height
0, // display offset
- 4, // mass
+ 0, // mass
0, // damage
sfx_rocks1, // activesound
MF_PAIN|MF_BOUNCE, // flags
@@ -16022,7 +16800,7 @@ mobjinfo_t mobjinfo[NUMMOBJTYPES] =
30*FRACUNIT, // radius
40*FRACUNIT, // height
0, // display offset
- 100, // mass
+ 0, // mass
0, // damage
sfx_None, // activesound
MF_NOBLOCKMAP|MF_MISSILE|MF_NOGRAVITY|MF_NOSECTOR, // flags
diff --git a/src/info.h b/src/info.h
index dad067a234..dde746236d 100644
--- a/src/info.h
+++ b/src/info.h
@@ -221,6 +221,9 @@ void A_Boss5Jump();
void A_LightBeamReset();
void A_MineExplode();
void A_MineRange();
+void A_ConnectToGround();
+void A_SpawnParticleRelative();
+void A_MultiShotDist();
// ratio of states to sprites to mobj types is roughly 6 : 1 : 1
#define NUMMOBJFREESLOTS 256
@@ -444,6 +447,12 @@ typedef enum sprite
SPR_XMS4, // Lamppost
SPR_XMS5, // Hanging Star
+ // Halloween Scenery
+ SPR_PUMK, // Pumpkins
+ SPR_HHPL, // Dr Seuss Trees
+ SPR_SHRM, // Mushroom
+ SPR_HHZM, // Misc
+
// Botanic Serenity Scenery
SPR_BSZ1, // Tall flowers
SPR_BSZ2, // Medium flowers
@@ -494,6 +503,8 @@ typedef enum sprite
SPR_FL14, // Dove
SPR_FL15, // Cat
SPR_FL16, // Canary
+ SPR_FS01, // Spider
+ SPR_FS02, // Bat
// Springs
SPR_SPRY, // yellow spring
@@ -575,6 +586,16 @@ typedef enum sprite
SPR_NPRU, // Nights Powerups
SPR_CAPS, // Capsule thingy for NiGHTS
+ // Secret badniks and hazards, shhhh
+ SPR_FMCE,
+ SPR_HMCE,
+ SPR_CACO,
+ SPR_BAL2,
+ SPR_SBOB,
+ SPR_SBFL,
+ SPR_SBSK,
+ SPR_HBAT,
+
// Debris
SPR_SPRK, // spark
SPR_BOM1, // Robot Explosion
@@ -2289,6 +2310,51 @@ typedef enum state
S_XMASBERRYBUSH,
S_XMASBUSH,
+ // Halloween Scenery
+ // Pumpkins
+ S_JACKO1,
+ S_JACKO1OVERLAY_1,
+ S_JACKO1OVERLAY_2,
+ S_JACKO1OVERLAY_3,
+ S_JACKO1OVERLAY_4,
+ S_JACKO2,
+ S_JACKO2OVERLAY_1,
+ S_JACKO2OVERLAY_2,
+ S_JACKO2OVERLAY_3,
+ S_JACKO2OVERLAY_4,
+ S_JACKO3,
+ S_JACKO3OVERLAY_1,
+ S_JACKO3OVERLAY_2,
+ S_JACKO3OVERLAY_3,
+ S_JACKO3OVERLAY_4,
+ // Dr Seuss Trees
+ S_HHZTREE_TOP,
+ S_HHZTREE_TRUNK,
+ S_HHZTREE_LEAF,
+ // Mushroom
+ S_HHZSHROOM_1,
+ S_HHZSHROOM_2,
+ S_HHZSHROOM_3,
+ S_HHZSHROOM_4,
+ S_HHZSHROOM_5,
+ S_HHZSHROOM_6,
+ S_HHZSHROOM_7,
+ S_HHZSHROOM_8,
+ S_HHZSHROOM_9,
+ S_HHZSHROOM_10,
+ S_HHZSHROOM_11,
+ S_HHZSHROOM_12,
+ S_HHZSHROOM_13,
+ S_HHZSHROOM_14,
+ S_HHZSHROOM_15,
+ S_HHZSHROOM_16,
+ // Misc
+ S_HHZGRASS,
+ S_HHZTENT1,
+ S_HHZTENT2,
+ S_HHZSTALAGMITE_TALL,
+ S_HHZSTALAGMITE_SHORT,
+
// Botanic Serenity's loads of scenery states
S_BSZTALLFLOWER_RED,
S_BSZTALLFLOWER_PURPLE,
@@ -2728,6 +2794,19 @@ typedef enum state
S_FLICKY_16_FLAP2,
S_FLICKY_16_FLAP3,
+ // Spider
+ S_SECRETFLICKY_01_OUT,
+ S_SECRETFLICKY_01_AIM,
+ S_SECRETFLICKY_01_HOP,
+ S_SECRETFLICKY_01_UP,
+ S_SECRETFLICKY_01_DOWN,
+
+ // Bat
+ S_SECRETFLICKY_02_OUT,
+ S_SECRETFLICKY_02_FLAP1,
+ S_SECRETFLICKY_02_FLAP2,
+ S_SECRETFLICKY_02_FLAP3,
+
S_YELLOWSPRING,
S_YELLOWSPRING2,
S_YELLOWSPRING3,
@@ -3224,6 +3303,85 @@ typedef enum state
S_NIGHTOPIANHELPER8,
S_NIGHTOPIANHELPER9,
+ // Secret badniks and hazards, shhhh
+ S_SMASHSPIKE_FLOAT,
+ S_SMASHSPIKE_EASE1,
+ S_SMASHSPIKE_EASE2,
+ S_SMASHSPIKE_FALL,
+ S_SMASHSPIKE_STOMP1,
+ S_SMASHSPIKE_STOMP2,
+ S_SMASHSPIKE_RISE1,
+ S_SMASHSPIKE_RISE2,
+
+ S_HHZDUST1,
+ S_HHZDUST2,
+ S_HHZDUST3,
+ S_HHZDUST4,
+
+ S_CACO_LOOK,
+ S_CACO_WAKE1,
+ S_CACO_WAKE2,
+ S_CACO_WAKE3,
+ S_CACO_WAKE4,
+ S_CACO_ROAR,
+ S_CACO_CHASE,
+ S_CACO_CHASE_REPEAT,
+ S_CACO_RANDOM,
+ S_CACO_PREPARE_SOUND,
+ S_CACO_PREPARE1,
+ S_CACO_PREPARE2,
+ S_CACO_PREPARE3,
+ S_CACO_SHOOT_SOUND,
+ S_CACO_SHOOT1,
+ S_CACO_SHOOT2,
+ S_CACO_CLOSE,
+ S_CACO_DIE_FLAGS,
+ S_CACO_DIE_GIB1,
+ S_CACO_DIE_GIB2,
+ S_CACO_DIE_SCREAM,
+ S_CACO_DIE_SHATTER,
+ S_CACO_DIE_FALL,
+ S_CACOSHARD_RANDOMIZE,
+ S_CACOSHARD1_1,
+ S_CACOSHARD1_2,
+ S_CACOSHARD2_1,
+ S_CACOSHARD2_2,
+ S_CACOFIRE1,
+ S_CACOFIRE2,
+ S_CACOFIRE3,
+ S_CACOFIRE_EXPLODE1,
+ S_CACOFIRE_EXPLODE2,
+ S_CACOFIRE_EXPLODE3,
+ S_CACOFIRE_EXPLODE4,
+
+ S_SPINBOBERT_MOVE_FLIPUP,
+ S_SPINBOBERT_MOVE_UP,
+ S_SPINBOBERT_MOVE_FLIPDOWN,
+ S_SPINBOBERT_MOVE_DOWN,
+ S_SPINBOBERT_FIRE_MOVE,
+ S_SPINBOBERT_FIRE_GHOST,
+ S_SPINBOBERT_FIRE_TRAIL1,
+ S_SPINBOBERT_FIRE_TRAIL2,
+ S_SPINBOBERT_FIRE_TRAIL3,
+
+ S_HANGSTER_LOOK,
+ S_HANGSTER_SWOOP1,
+ S_HANGSTER_SWOOP2,
+ S_HANGSTER_ARC1,
+ S_HANGSTER_ARC2,
+ S_HANGSTER_ARC3,
+ S_HANGSTER_FLY1,
+ S_HANGSTER_FLY2,
+ S_HANGSTER_FLY3,
+ S_HANGSTER_FLY4,
+ S_HANGSTER_FLYREPEAT,
+ S_HANGSTER_ARCUP1,
+ S_HANGSTER_ARCUP2,
+ S_HANGSTER_ARCUP3,
+ S_HANGSTER_RETURN1,
+ S_HANGSTER_RETURN2,
+ S_HANGSTER_RETURN3,
+
S_CRUMBLE1,
S_CRUMBLE2,
@@ -3650,6 +3808,22 @@ typedef enum mobj_type
MT_XMASBERRYBUSH,
MT_XMASBUSH,
+ // Halloween Scenery
+ // Pumpkins
+ MT_JACKO1,
+ MT_JACKO2,
+ MT_JACKO3,
+ // Dr Seuss Trees
+ MT_HHZTREE_TOP,
+ MT_HHZTREE_PART,
+ // Misc
+ MT_HHZSHROOM,
+ MT_HHZGRASS,
+ MT_HHZTENTACLE1,
+ MT_HHZTENTACLE2,
+ MT_HHZSTALAGMITE_TALL,
+ MT_HHZSTALAGMITE_SHORT,
+
// Botanic Serenity scenery
MT_BSZTALLFLOWER_RED,
MT_BSZTALLFLOWER_PURPLE,
@@ -3735,6 +3909,9 @@ typedef enum mobj_type
MT_FLICKY_14, // Dove
MT_FLICKY_15, // Cat
MT_FLICKY_16, // Canary
+ MT_SECRETFLICKY_01, // Spider
+ MT_SECRETFLICKY_02, // Bat
+ MT_SEED,
// Environmental Effects
MT_RAIN, // Rain
@@ -3747,7 +3924,6 @@ typedef enum mobj_type
MT_WATERZAP,
MT_SPINDUST, // Spindash dust
MT_TFOG,
- MT_SEED,
MT_PARTICLE,
MT_PARTICLEGEN, // For fans, etc.
@@ -3770,6 +3946,7 @@ typedef enum mobj_type
MT_AWATERH, // Ambient Water Sound 8
MT_RANDOMAMBIENT,
MT_RANDOMAMBIENT2,
+ MT_MACHINEAMBIENCE,
MT_CORK,
@@ -3837,6 +4014,20 @@ typedef enum mobj_type
MT_EGGCAPSULE,
MT_NIGHTOPIANHELPER, // the actual helper object that orbits you
+ // Secret badniks and hazards, shhhh
+ MT_SMASHINGSPIKEBALL,
+ MT_HHZDUST,
+
+ MT_CACOLANTERN,
+ MT_CACOSHARD,
+ MT_CACOFIRE,
+
+ MT_SPINBOBERT,
+ MT_SPINBOBERT_FIRE1,
+ MT_SPINBOBERT_FIRE2,
+
+ MT_HANGSTER,
+
// Utility Objects
MT_TELEPORTMAN,
MT_ALTVIEWMAN,
diff --git a/src/p_enemy.c b/src/p_enemy.c
index cc1d14a9b4..e5a465dcfc 100644
--- a/src/p_enemy.c
+++ b/src/p_enemy.c
@@ -249,6 +249,9 @@ void A_Boss5Jump(mobj_t *actor);
void A_LightBeamReset(mobj_t *actor);
void A_MineExplode(mobj_t *actor);
void A_MineRange(mobj_t *actor);
+void A_ConnectToGround(mobj_t *actor);
+void A_SpawnParticleRelative(mobj_t *actor);
+void A_MultiShotDist(mobj_t *actor);
//
// ENEMY THINKING
@@ -3420,7 +3423,7 @@ void A_BubbleSpawn(mobj_t *actor)
if (!(actor->flags2 & MF2_AMBUSH))
{
// Quick! Look through players!
- // Don't spawn bubbles unless a player is relatively close by (var2).
+ // Don't spawn bubbles unless a player is relatively close by (var1).
for (i = 0; i < MAXPLAYERS; ++i)
if (playeringame[i] && players[i].mo
&& P_AproxDistance(actor->x - players[i].mo->x, actor->y - players[i].mo->y) < (locvar1<<FRACBITS))
@@ -7061,6 +7064,7 @@ void A_SpawnObjectRelative(mobj_t *actor)
if (actor->eflags & MFE_VERTICALFLIP)
mo->flags2 |= MF2_OBJECTFLIP;
+
}
// Function: A_ChangeAngleRelative
@@ -10736,3 +10740,146 @@ void A_MineRange(mobj_t *actor)
if ((dm>>FRACBITS) < locvar1)
P_SetMobjState(actor, actor->info->meleestate);
}
+
+// Function: A_ConnectToGround
+// Description: Create a palm tree trunk/mine chain.
+//
+// var1 = Object type to connect to ground
+// var2 = Object type to place on ground
+//
+void A_ConnectToGround(mobj_t *actor)
+{
+ mobj_t *work;
+ fixed_t workz;
+ fixed_t workh;
+ INT8 dir;
+ angle_t ang;
+ INT32 locvar1 = var1;
+ INT32 locvar2 = var2;
+
+#ifdef HAVE_BLUA
+ if (LUA_CallAction("A_ConnectToGround", actor))
+ return;
+#endif
+
+ P_AdjustMobjFloorZ_FFloors(actor, actor->subsector->sector, 2);
+
+ if (actor->flags2 & MF2_OBJECTFLIP)
+ {
+ workz = actor->ceilingz - (actor->z + actor->height);
+ dir = -1;
+ }
+ else
+ {
+ workz = actor->floorz - actor->z;
+ dir = 1;
+ }
+
+ if (locvar2)
+ {
+ if (actor->flags2 & MF2_OBJECTFLIP)
+ workz -= FixedMul(mobjinfo[locvar2].height, actor->scale);
+ work = P_SpawnMobjFromMobj(actor, 0, 0, workz, locvar2);
+ }
+
+ if (!locvar1)
+ return;
+
+ workh = FixedMul(mobjinfo[locvar1].height, actor->scale);
+
+ if (actor->flags2 & MF2_OBJECTFLIP)
+ workz -= workh;
+
+ ang = actor->angle + ANGLE_45;
+ while (dir*workz < 0)
+ {
+ work = P_SpawnMobjFromMobj(actor, 0, 0, workz, locvar1);
+ if (work)
+ work->angle = ang;
+ ang += ANGLE_90;
+ workz += dir*workh;
+ }
+
+ if (workz != 0)
+ actor->z += workz;
+}
+
+// Function: A_SpawnParticleRelative
+//
+// Description: Spawns a particle effect relative to the location of the actor
+//
+// var1:
+// var1 >> 16 = x
+// var1 & 65535 = y
+// var2:
+// var2 >> 16 = z
+// var2 & 65535 = state
+//
+void A_SpawnParticleRelative(mobj_t *actor)
+{
+ INT16 x, y, z; // Want to be sure we can use negative values
+ statenum_t state;
+ mobj_t *mo;
+ INT32 locvar1 = var1;
+ INT32 locvar2 = var2;
+#ifdef HAVE_BLUA
+ if (LUA_CallAction("A_SpawnParticleRelative", actor))
+ return;
+#endif
+
+ CONS_Debug(DBG_GAMELOGIC, "A_SpawnParticleRelative called from object type %d, var1: %d, var2: %d\n", actor->type, locvar1, locvar2);
+
+ x = (INT16)(locvar1>>16);
+ y = (INT16)(locvar1&65535);
+ z = (INT16)(locvar2>>16);
+ state = (mobjtype_t)(locvar2&65535);
+
+ // Spawn objects correctly in reverse gravity.
+ // NOTE: Doing actor->z + actor->height is the bottom of the object while the object has reverse gravity. - Flame
+ mo = P_SpawnMobj(actor->x + FixedMul(x<<FRACBITS, actor->scale),
+ actor->y + FixedMul(y<<FRACBITS, actor->scale),
+ (actor->eflags & MFE_VERTICALFLIP) ? ((actor->z + actor->height - mobjinfo[MT_PARTICLE].height) - FixedMul(z<<FRACBITS, actor->scale)) : (actor->z + FixedMul(z<<FRACBITS, actor->scale)), MT_PARTICLE);
+
+ // Spawn objects with an angle matching the spawner's, rather than spawning Eastwards - Monster Iestyn
+ mo->angle = actor->angle;
+
+ if (actor->eflags & MFE_VERTICALFLIP)
+ mo->flags2 |= MF2_OBJECTFLIP;
+
+ P_SetMobjState(mo, state);
+}
+
+// Function: A_MultiShotDist
+//
+// Description: Spawns multiple shots based on player proximity
+//
+// var1:
+// same as A_MultiShot
+// var2:
+// same as A_MultiShot
+//
+void A_MultiShotDist(mobj_t *actor)
+{
+ INT32 locvar1 = var1;
+ INT32 locvar2 = var2;
+#ifdef HAVE_BLUA
+ if (LUA_CallAction("A_MultiShotDist", actor))
+ return;
+#endif
+
+ {
+ UINT8 i;
+ // Quick! Look through players!
+ // Don't spawn dust unless a player is relatively close by (var1).
+ for (i = 0; i < MAXPLAYERS; ++i)
+ if (playeringame[i] && players[i].mo
+ && P_AproxDistance(actor->x - players[i].mo->x, actor->y - players[i].mo->y) < (1600<<FRACBITS))
+ break; // Stop looking.
+ if (i == MAXPLAYERS)
+ return; // don't make bubble!
+ }
+
+ var1 = locvar1;
+ var2 = locvar2;
+ A_MultiShot(actor);
+}
diff --git a/src/p_floor.c b/src/p_floor.c
index c72de6b703..de5d30d80f 100644
--- a/src/p_floor.c
+++ b/src/p_floor.c
@@ -3304,7 +3304,7 @@ INT32 EV_MarioBlock(ffloor_t *rover, sector_t *sector, mobj_t *puncher)
P_SetThingPosition(thing);
if (thing->flags & MF_SHOOTABLE)
P_DamageMobj(thing, puncher, puncher, 1, 0);
- else if (thing->type == MT_RING || thing->type == MT_COIN)
+ else if (thing->type == MT_RING || thing->type == MT_COIN || thing->type == MT_TOKEN)
{
thing->momz = FixedMul(3*FRACUNIT, thing->scale);
P_TouchSpecialThing(thing, puncher, false);
diff --git a/src/p_inter.c b/src/p_inter.c
index 5de8b7fd37..c9cb6539ff 100644
--- a/src/p_inter.c
+++ b/src/p_inter.c
@@ -2427,6 +2427,13 @@ void P_KillMobj(mobj_t *target, mobj_t *inflictor, mobj_t *source, UINT8 damaget
P_LinedefExecute(target->spawnpoint->angle, (source ? source : inflictor), target->subsector->sector);
break;
+ case MT_SPINBOBERT:
+ if (target->hnext)
+ P_KillMobj(target->hnext, inflictor, source, damagetype);
+ if (target->hprev)
+ P_KillMobj(target->hprev, inflictor, source, damagetype);
+ break;
+
case MT_EGGTRAP:
// Time for birdies! Yaaaaaaaay!
target->fuse = TICRATE*2;
diff --git a/src/p_local.h b/src/p_local.h
index 49d3ed6147..1958e6559f 100644
--- a/src/p_local.h
+++ b/src/p_local.h
@@ -256,6 +256,7 @@ fixed_t P_CameraCeilingZ(camera_t *mobj, sector_t *sector, sector_t *boundsec, f
boolean P_InsideANonSolidFFloor(mobj_t *mobj, ffloor_t *rover);
boolean P_CheckDeathPitCollide(mobj_t *mo);
boolean P_CheckSolidLava(mobj_t *mo, ffloor_t *rover);
+void P_AdjustMobjFloorZ_FFloors(mobj_t *mo, sector_t *sector, UINT8 motype);
mobj_t *P_SpawnMobjFromMobj(mobj_t *mobj, fixed_t xofs, fixed_t yofs, fixed_t zofs, mobjtype_t type);
diff --git a/src/p_map.c b/src/p_map.c
index 3715e765bd..9313d21497 100644
--- a/src/p_map.c
+++ b/src/p_map.c
@@ -673,10 +673,11 @@ static boolean PIT_CheckThing(mobj_t *thing)
return true; // underneath
if (tmthing->player && tmthing->flags & MF_SHOOTABLE && thing->health > 0)
{
- UINT8 damagetype = 0;
- if (thing->flags & MF_FIRE) // BURN!
+ UINT8 damagetype = thing->info->mass;
+ if (!damagetype && thing->flags & MF_FIRE) // BURN!
damagetype = DMG_FIRE;
- P_DamageMobj(tmthing, thing, thing, 1, damagetype);
+ if (P_DamageMobj(tmthing, thing, thing, 1, damagetype) && thing->info->attacksound)
+ S_StartSound(thing, thing->info->attacksound);
}
return true;
}
@@ -689,10 +690,11 @@ static boolean PIT_CheckThing(mobj_t *thing)
return true; // underneath
if (thing->player && thing->flags & MF_SHOOTABLE && tmthing->health > 0)
{
- UINT8 damagetype = 0;
- if (tmthing->flags & MF_FIRE) // BURN!
+ UINT8 damagetype = tmthing->info->mass;
+ if (!damagetype && tmthing->flags & MF_FIRE) // BURN!
damagetype = DMG_FIRE;
- P_DamageMobj(thing, tmthing, tmthing, 1, damagetype);
+ if (P_DamageMobj(thing, tmthing, tmthing, 1, damagetype) && tmthing->info->attacksound)
+ S_StartSound(tmthing, tmthing->info->attacksound);
}
return true;
}
@@ -860,7 +862,12 @@ static boolean PIT_CheckThing(mobj_t *thing)
P_SetThingPosition(tmthing);
}
else if (!(tmthing->type == MT_SHELL && thing->player)) // player collision handled in touchspecial
- P_DamageMobj(thing, tmthing, tmthing->target, 1, 0);
+ {
+ UINT8 damagetype = tmthing->info->mass;
+ if (!damagetype && tmthing->flags & MF_FIRE) // BURN!
+ damagetype = DMG_FIRE;
+ P_DamageMobj(thing, tmthing, tmthing->target, 1, damagetype);
+ }
// don't traverse any more
diff --git a/src/p_mobj.c b/src/p_mobj.c
index 45e1434d25..a7fa3bf97d 100644
--- a/src/p_mobj.c
+++ b/src/p_mobj.c
@@ -2200,7 +2200,7 @@ static void P_SceneryXYMovement(mobj_t *mo)
// 1 - forces false check for water (rings)
// 2 - forces false check for water + different quicksand behaviour (scenery)
//
-static void P_AdjustMobjFloorZ_FFloors(mobj_t *mo, sector_t *sector, UINT8 motype)
+void P_AdjustMobjFloorZ_FFloors(mobj_t *mo, sector_t *sector, UINT8 motype)
{
ffloor_t *rover;
fixed_t delta1, delta2, thingtop;
@@ -2764,7 +2764,7 @@ static boolean P_ZMovement(mobj_t *mo)
else if (mo->type == MT_FALLINGROCK)
{
if (P_MobjFlip(mo)*mom.z > FixedMul(2*FRACUNIT, mo->scale))
- S_StartSound(mo, mo->info->activesound + P_RandomKey(mo->info->mass));
+ S_StartSound(mo, mo->info->activesound + P_RandomKey(mo->info->reactiontime));
mom.z /= 2; // Rocks not so bouncy
@@ -7410,6 +7410,61 @@ void P_MobjThinker(mobj_t *mobj)
mobj->z += FINESINE(mobj->extravalue1*(FINEMASK+1)/360);
P_SetThingPosition(mobj);
break;
+ case MT_SMASHINGSPIKEBALL:
+ mobj->momx = mobj->momy = 0;
+ if (mobj->state-states == S_SMASHSPIKE_FALL && P_IsObjectOnGround(mobj))
+ {
+ P_SetMobjState(mobj, S_SMASHSPIKE_STOMP1);
+ S_StartSound(mobj, sfx_spsmsh);
+ }
+ else if (mobj->state-states == S_SMASHSPIKE_RISE2 && P_MobjFlip(mobj)*(mobj->z - mobj->movecount) >= 0)
+ {
+ mobj->momz = 0;
+ P_SetMobjState(mobj, S_SMASHSPIKE_FLOAT);
+ }
+ break;
+ case MT_HANGSTER:
+ {
+ statenum_t st = mobj->state-states;
+ //ghost image trail when flying down
+ if (st == S_HANGSTER_SWOOP1 || st == S_HANGSTER_SWOOP2)
+ {
+ P_SpawnGhostMobj(mobj);
+ //curve when in line with target, otherwise curve to avoid crashing into floor
+ if ((mobj->z - mobj->floorz <= 80*FRACUNIT) || (mobj->target && (mobj->z - mobj->target->z <= 80*FRACUNIT)))
+ P_SetMobjState(mobj, (st = S_HANGSTER_ARC1));
+ }
+
+ //swoop arc movement stuff
+ if (st == S_HANGSTER_ARC1)
+ {
+ A_FaceTarget(mobj);
+ P_Thrust(mobj, mobj->angle, 1*FRACUNIT);
+ }
+ else if (st == S_HANGSTER_ARC2)
+ P_Thrust(mobj, mobj->angle, 2*FRACUNIT);
+ else if (st == S_HANGSTER_ARC3)
+ P_Thrust(mobj, mobj->angle, 4*FRACUNIT);
+ //if movement has stopped while flying (like hitting a wall), fly up immediately
+ else if (st == S_HANGSTER_FLY1 && !mobj->momx && !mobj->momy)
+ {
+ mobj->extravalue1 = 0;
+ P_SetMobjState(mobj, S_HANGSTER_ARCUP1);
+ }
+ //after swooping back up, check for ceiling
+ else if ((st == S_HANGSTER_RETURN1 || st == S_HANGSTER_RETURN2) && mobj->momz == 0 && mobj->ceilingz == (mobj->z + mobj->height))
+ P_SetMobjState(mobj, (st = S_HANGSTER_RETURN3));
+
+ //should you roost on a ceiling with F_SKY1 as its flat, disappear forever
+ if (st == S_HANGSTER_RETURN3 && mobj->momz == 0 && mobj->ceilingz == (mobj->z + mobj->height)
+ && mobj->subsector->sector->ceilingpic == skyflatnum
+ && mobj->subsector->sector->ceilingheight == mobj->ceilingz)
+ {
+ P_RemoveMobj(mobj);
+ return;
+ }
+ }
+ break;
case MT_EGGCAPSULE:
if (!mobj->reactiontime)
{
@@ -8015,6 +8070,8 @@ for (i = ((mobj->flags2 & MF2_STRONGBOX) ? strongboxamt : weakboxamt); i; --i) s
case MT_WALLSPIKE:
P_SetMobjState(mobj, mobj->state->nextstate);
mobj->fuse = mobj->info->speed;
+ if (mobj->spawnpoint)
+ mobj->fuse += (mobj->spawnpoint->angle/360);
break;
case MT_NIGHTSCORE:
P_RemoveMobj(mobj);
@@ -8396,7 +8453,7 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
if (titlemapinaction) mobj->flags &= ~MF_NOTHINK;
break;
case MT_CYBRAKDEMON_NAPALM_BOMB_LARGE:
- mobj->fuse = mobj->info->mass;
+ mobj->fuse = mobj->info->painchance;
break;
case MT_BLACKEGGMAN:
{
@@ -8410,8 +8467,8 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
// Collision helper can be stood on but not pushed
mobj->flags2 |= MF2_STANDONME;
break;
- case MT_WALLSPIKE:
case MT_SPIKE:
+ case MT_WALLSPIKE:
mobj->flags2 |= MF2_STANDONME;
break;
case MT_GFZTREE:
@@ -8481,6 +8538,20 @@ mobj_t *P_SpawnMobj(fixed_t x, fixed_t y, fixed_t z, mobjtype_t type)
case MT_FLICKY_08:
mobj->color = (P_RandomChance(FRACUNIT/2) ? SKINCOLOR_RED : SKINCOLOR_AQUA);
break;
+ case MT_SMASHINGSPIKEBALL:
+ mobj->movecount = mobj->z;
+ break;
+ case MT_SPINBOBERT:
+ {
+ mobj_t *fire;
+ fire = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_SPINBOBERT_FIRE1);
+ P_SetTarget(&fire->target, mobj);
+ P_SetTarget(&mobj->hnext, fire);
+ fire = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_SPINBOBERT_FIRE2);
+ P_SetTarget(&fire->target, mobj);
+ P_SetTarget(&mobj->hprev, fire);
+ }
+ break;
case MT_REDRING: // Make MT_REDRING red by default
mobj->color = skincolor_redring;
break;
@@ -10208,12 +10279,42 @@ ML_EFFECT4 : Don't clip inside the ground
break;
case MT_THZTREE:
{ // Spawn the branches
- angle_t mobjangle = FixedAngle(mthing->angle*FRACUNIT);
+ angle_t mobjangle = FixedAngle((mthing->angle % 113)*FRACUNIT);
P_SpawnMobjFromMobj(mobj, 1*FRACUNIT, 0, 0, MT_THZTREEBRANCH)->angle = mobjangle + ANGLE_22h;
P_SpawnMobjFromMobj(mobj, 0, 1*FRACUNIT, 0, MT_THZTREEBRANCH)->angle = mobjangle + ANGLE_157h;
P_SpawnMobjFromMobj(mobj, -1*FRACUNIT, 0, 0, MT_THZTREEBRANCH)->angle = mobjangle + ANGLE_270;
}
break;
+ case MT_HHZTREE_TOP:
+ { // Spawn the branches
+ angle_t mobjangle;
+ mobj_t *leaf;
+ mobjangle = FixedAngle((mthing->angle % 90)*FRACUNIT);
+#define doleaf(x, y) \
+ leaf = P_SpawnMobjFromMobj(mobj, x, y, 0, MT_HHZTREE_PART);\
+ leaf->angle = mobjangle;\
+ P_SetMobjState(leaf, leaf->info->seestate);\
+ mobjangle += ANGLE_90
+ doleaf(1*FRACUNIT, 0);
+ doleaf(0, 1*FRACUNIT);
+ doleaf(-1*FRACUNIT, 0);
+ doleaf(0, -1*FRACUNIT);
+#undef doleaf
+ }
+ break;
+ case MT_JACKO1:
+ case MT_JACKO2:
+ case MT_JACKO3:
+ {
+ mobj_t *overlay = P_SpawnMobjFromMobj(mobj, 0, 0, 0, MT_OVERLAY);
+ P_SetTarget(&overlay->target, mobj);
+ P_SetMobjState(overlay, mobj->info->raisestate);
+ }
+ break;
+ case MT_SMASHINGSPIKEBALL:
+ if (mthing->angle > 0)
+ mobj->tics += mthing->angle;
+ break;
default:
break;
}
@@ -10246,9 +10347,6 @@ ML_EFFECT4 : Don't clip inside the ground
}
else if (i == MT_TOKEN)
{
- if (mthing->options & MTF_OBJECTSPECIAL) // Mario Block version
- mobj->flags &= ~(MF_NOGRAVITY|MF_NOCLIPHEIGHT);
-
// We advanced tokenbits earlier due to the return check.
// Subtract 1 here for the correct value.
mobj->health = 1 << (tokenbits - 1);
@@ -10296,7 +10394,9 @@ ML_EFFECT4 : Don't clip inside the ground
if (mthing->options & MTF_OBJECTSPECIAL)
{
mobj->flags &= ~MF_SCENERY;
- mobj->fuse = mthing->angle + mobj->info->speed;
+ mobj->fuse = (16 - mthing->extrainfo) * (mthing->angle + mobj->info->speed) / 16;
+ if (mthing->options & MTF_EXTRA)
+ P_SetMobjState(mobj, mobj->info->meleestate);
}
// Use per-thing collision for spikes if the deaf flag isn't checked.
if (!(mthing->options & MTF_AMBUSH) && !metalrecording)
@@ -10313,7 +10413,9 @@ ML_EFFECT4 : Don't clip inside the ground
if (mthing->options & MTF_OBJECTSPECIAL)
{
mobj->flags &= ~MF_SCENERY;
- mobj->fuse = mobj->info->speed;
+ mobj->fuse = (16 - mthing->extrainfo) * ((mthing->angle/360) + mobj->info->speed) / 16;
+ if (mthing->options & MTF_EXTRA)
+ P_SetMobjState(mobj, mobj->info->meleestate);
}
// Use per-thing collision for spikes if the deaf flag isn't checked.
if (!(mthing->options & MTF_AMBUSH) && !metalrecording)
diff --git a/src/p_user.c b/src/p_user.c
index 8ae91f81c0..d2dc36a8e7 100644
--- a/src/p_user.c
+++ b/src/p_user.c
@@ -3565,7 +3565,7 @@ static void P_DoFiring(player_t *player, ticcmd_t *cmd)
if (mo)
{
//P_InstaThrust(mo, player->mo->angle, FixedMul(mo->info->speed, player->mo->scale));
- mo->fuse = mo->info->mass;
+ mo->fuse = mo->info->reactiontime;
}
}
// Scatter
diff --git a/src/sounds.c b/src/sounds.c
index 3a7219c6d5..cabc7e6868 100644
--- a/src/sounds.c
+++ b/src/sounds.c
@@ -76,6 +76,8 @@ sfxinfo_t S_sfx[NUMSFX] =
{"steam1", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Steam jet"}, // Tails 06-19-2001
{"steam2", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Steam jet"}, // Tails 06-19-2001
{"wbreak", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wood breaking"},
+ {"ambmac", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Machinery"},
+ {"spsmsh", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Heavy impact"},
{"rainin", true, 24, 4, -1, NULL, 0, -1, -1, LUMPERROR, "Rain"},
{"litng1", false, 16, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Lightning"},
@@ -226,6 +228,12 @@ sfxinfo_t S_sfx[NUMSFX] =
{"prloop", false, 104, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Gust of wind"},
{"timeup", true, 256, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ominous Countdown"},
+ // Halloween
+ {"lntsit", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Cacolantern awake"},
+ {"lntdie", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Cacolantern death"},
+ {"pumpkn", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pumpkin smash"},
+ {"ghosty", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Laughter"},
+
// Mario
{"koopfr" , true, 127, 8, -1, NULL, 0, -1, -1, LUMPERROR, "Fire"},
{"mario1", false, 60, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Hitting a ceiling"},
@@ -295,16 +303,16 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k45", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Lightning zap"},
{"s3k46", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Transformation"},
{"s3k47", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising dust"},
- {"s3k48", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Metallic clink"},
+ {"s3k48", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Pulse"},
{"s3k49", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Falling rock"},
{"s3k4a", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Grab"},
{"s3k4b", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Water splash"},
{"s3k4c", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Heavy hit"},
{"s3k4d", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing bullet"},
- {"s3k4e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Bomb explosion"},
+ {"s3k4e", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Big explosion"},
{"s3k4f", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Flamethrower"},
{"s3k50", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Siren"},
- {"s3k51", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Falling bomb"},
+ {"s3k51", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Falling hazard"},
{"s3k52", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spike"},
{"s3k53", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Powering up"},
{"s3k54", false, 64, 64, -1, NULL, 0, -1, -1, LUMPERROR, "Firing"}, // MetalSonic shot fire
@@ -325,7 +333,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k63", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Starpost"},
{"s3k64", false, 64, 2, -1, NULL, 0, -1, -1, LUMPERROR, "Clatter"},
{"s3k65", false, 255, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Got blue sphere"}, // Blue Spheres
- {"s3k66", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Special stage clear"},
+ {"s3k66", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Special stage end"},
{"s3k67", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Firing missile"},
{"s3k68", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Unknown possibilities"},
{"s3k69", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Switch click"},
@@ -372,7 +380,7 @@ sfxinfo_t S_sfx[NUMSFX] =
{"s3k92", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Ghost"},
{"s3k93", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rebuilding"},
{"s3k94", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Spike"},
- {"s3k95", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Rising from lava"},
+ {"s3k95", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Lava burst"},
{"s3k96", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Falling object"},
{"s3k97", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Wind"},
{"s3k98", false, 64, 0, -1, NULL, 0, -1, -1, LUMPERROR, "Falling spike"},
diff --git a/src/sounds.h b/src/sounds.h
index 60451b6ea8..ab024c2531 100644
--- a/src/sounds.h
+++ b/src/sounds.h
@@ -142,6 +142,8 @@ typedef enum
sfx_steam1,
sfx_steam2,
sfx_wbreak,
+ sfx_ambmac,
+ sfx_spsmsh,
sfx_rainin,
sfx_litng1,
@@ -292,6 +294,12 @@ typedef enum
sfx_prloop,
sfx_timeup, // Was gonna be played when less than ten seconds are on the clock; uncomment uses of this to see it in-context
+ // Halloween
+ sfx_lntsit,
+ sfx_lntdie,
+ sfx_pumpkn,
+ sfx_ghosty,
+
// Mario
sfx_koopfr,
sfx_mario1,
--
GitLab