This commit is contained in:
Charles 2001-04-02 15:52:09 +00:00
parent b93a5cb4cb
commit 9153260b12
12 changed files with 400 additions and 77 deletions

View file

@ -27,6 +27,78 @@
#include <ACTOR_CLAM_ANIM.h>
#endif
#ifndef __ANIM_ANENOMELVL1_HEADER__
#include <ACTOR_ANENOMELVL1_ANIM.h>
#endif
#ifndef __ANIM_BABYOCTOPUS_HEADER__
#include <ACTOR_BABYOCTOPUS_ANIM.h>
#endif
#ifndef __ANIM_CATERPILLAR_HEADER__
#include <ACTOR_CATERPILLAR_ANIM.h>
#endif
#ifndef __ANIM_DUSTDEVIL_HEADER__
#include <ACTOR_DUSTDEVIL_ANIM.h>
#endif
#ifndef __ANIM_EYEBALL_HEADER__
#include <ACTOR_EYEBALL_ANIM.h>
#endif
#ifndef __ANIM_FLAMINGSKULL_HEADER__
#include <ACTOR_FLAMINGSKULL_ANIM.h>
#endif
#ifndef __ANIM_FLYINGDUTCHMAN_HEADER__
#include <ACTOR_FLYINGDUTCHMAN_ANIM.h>
#endif
#ifndef __ANIM_GHOST_HEADER__
#include <ACTOR_GHOST_ANIM.h>
#endif
#ifndef __ANIM_HERMITCRAB_HEADER__
#include <ACTOR_HERMITCRAB_ANIM.h>
#endif
#ifndef __ANIM_IRONDOGFISH_HEADER__
#include <ACTOR_IRONDOGFISH_ANIM.h>
#endif
#ifndef __ANIM_JELLYFISH1_HEADER__
#include <ACTOR_JELLYFISH1_ANIM.h>
#endif
#ifndef __ANIM_PUFFAFISH_HEADER__
#include <ACTOR_PUFFAFISH_ANIM.h>
#endif
#ifndef __ANIM_SHARKMAN_HEADER__
#include <ACTOR_SHARKMAN_ANIM.h>
#endif
#ifndef __ANIM_SKELETALFISH_HEADER__
#include <ACTOR_SKELETALFISH_ANIM.h>
#endif
#ifndef __ANIM_SPIDERCRAB_HEADER__
#include <ACTOR_SPIDERCRAB_ANIM.h>
#endif
#ifndef __ANIM_SQUIDDART_HEADER__
#include <ACTOR_SQUIDDART_ANIM.h>
#endif
#ifndef __ANIM_STOMPER_HEADER__
#include <ACTOR_STOMPER_ANIM.h>
#endif
#ifndef __ANIM_SPIKEYANENOME_HEADER__
#include <ACTOR_SPIKEYANENOME_ANIM.h>
#endif
//#ifndef __ANIM_SHARKSUB_HEADER__
//#include <ACTOR_SHARKSUB_ANIM.h>
//#endif
@ -120,6 +192,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__SQUASH_ENEMY,
0,
0,
},
{ // NPC_FISH_HOOK
@ -137,11 +210,12 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__NONE,
0,
0,
},
{ // NPC_DUST_DEVIL
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
ACTORS_DUSTDEVIL_SBK,
ANIM_DUSTDEVIL_TWIST,
NPC_INIT_RETURNING_HAZARD,
NPC_SENSOR_NONE,
NPC_MOVEMENT_RETURNING_HAZARD,
@ -154,6 +228,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__NONE,
0,
ANIM_DUSTDEVIL_TWIST,
},
{ // NPC_PENDULUM
@ -171,6 +246,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
0,
0,
},
{ // NPC_FIREBALL
@ -188,6 +264,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__BURN_ENEMY,
0,
0,
},
{ // NPC_SAW_BLADE
@ -205,11 +282,12 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
0,
0,
},
{ // NPC_SMALL_JELLYFISH_1
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
ACTORS_JELLYFISH1_SBK,
ANIM_JELLYFISH1_IDLE,
NPC_INIT_DEFAULT,
NPC_SENSOR_JELLYFISH_USER_CLOSE,
NPC_MOVEMENT_FIXED_PATH,
@ -222,6 +300,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__SHOCK_ENEMY,
16,
ANIM_JELLYFISH1_SWIM,
},
{ // NPC_SMALL_JELLYFISH_2
@ -239,14 +318,15 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__SHOCK_ENEMY,
32,
0,
},
{ // NPC_ANEMONE_1
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
ACTORS_ANENOMELVL1_SBK,
ANIM_ANENOMELVL1_BEND,
NPC_INIT_DEFAULT,
NPC_SENSOR_ANEMONE_USER_CLOSE,
NPC_MOVEMENT_STATIC,
NPC_MOVEMENT_STATIC_CYCLE_ANIM,
NPC_MOVEMENT_MODIFIER_NONE,
NPC_CLOSE_ANEMONE_1_ATTACK,
NPC_TIMER_NONE,
@ -256,11 +336,12 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__NONE,
16,
0,
},
{ // NPC_ANEMONE_2
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
ACTORS_SPIKEYANENOME_SBK,
ANIM_SPIKEYANENOME_BODY,
NPC_INIT_DEFAULT,
NPC_SENSOR_ANEMONE_USER_CLOSE,
NPC_MOVEMENT_STATIC,
@ -273,6 +354,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__NONE,
32,
0,
},
{ // NPC_ANEMONE_3
@ -290,11 +372,12 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__NONE,
48,
0,
},
{ // NPC_SKELETAL_FISH
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
ACTORS_SKELETALFISH_SBK,
ANIM_SKELETALFISH_IDLE,
NPC_INIT_DEFAULT,
NPC_SENSOR_GENERIC_USER_VISIBLE,
NPC_MOVEMENT_FIXED_PATH,
@ -307,6 +390,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__BITE_ENEMY,
0,
ANIM_SKELETALFISH_SWIM,
},
{ // NPC_CLAM_JUMP
@ -324,6 +408,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
0,
0,
},
{ // NPC_CLAM_STATIC
@ -341,11 +426,12 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
0,
0,
},
{ // NPC_SQUID_DART
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
ACTORS_SQUIDDART_SBK,
ANIM_SQUIDDART_SWIM,
NPC_INIT_DEFAULT,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FIXED_PATH,
@ -358,6 +444,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
16,
ANIM_SQUIDDART_SWIM,
},
{ // NPC_FISH_FOLK
@ -375,11 +462,12 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__NONE,
0,
0,
},
{ // NPC_PRICKLY_BUG
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
ACTORS_CATERPILLAR_SBK,
ANIM_CATERPILLAR_CRAWL,
NPC_INIT_DEFAULT,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FIXED_PATH_WALK,
@ -392,6 +480,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__POISON_ENEMY,
48,
ANIM_CATERPILLAR_CRAWL,
},
{ // NPC_SEA_SNAKE
@ -409,11 +498,12 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__SHOCK_ENEMY,
56,
0,
},
{ // NPC_PUFFA_FISH
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
ACTORS_PUFFAFISH_SBK,
ANIM_PUFFAFISH_PUFFUPIDLE,
NPC_INIT_DEFAULT,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FIXED_PATH,
@ -426,6 +516,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
64,
ANIM_PUFFAFISH_SWIM,
},
{ // NPC_ANGLER_FISH
@ -443,16 +534,17 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__NONE,
0,
0,
},
{ // NPC_HERMIT_CRAB
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
NPC_INIT_DEFAULT,
NPC_SENSOR_NONE,
ACTORS_HERMITCRAB_SBK,
ANIM_HERMITCRAB_IDLE,
NPC_INIT_HERMIT_CRAB,
NPC_SENSOR_HERMIT_CRAB_USER_CLOSE,
NPC_MOVEMENT_FIXED_PATH_WALK,
NPC_MOVEMENT_MODIFIER_NONE,
NPC_CLOSE_NONE,
NPC_CLOSE_HERMIT_CRAB_ATTACK,
NPC_TIMER_NONE,
false,
2,
@ -460,6 +552,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
0,
ANIM_HERMITCRAB_SCUTTLE,
},
{ // NPC_MINE
@ -477,6 +570,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
0,
0,
},
{ // NPC_BOOGER_MONSTER
@ -494,11 +588,12 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__BITE_ENEMY,
0,
0,
},
{ // NPC_SPIDER_CRAB
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
ACTORS_SPIDERCRAB_SBK,
ANIM_SPIDERCRAB_IDLE,
NPC_INIT_DEFAULT,
NPC_SENSOR_SPIDER_CRAB_USER_CLOSE,
NPC_MOVEMENT_FIXED_PATH_WALK,
@ -511,11 +606,12 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__PINCH_ENEMY,
0,
ANIM_SPIDERCRAB_RUN,
},
{ // NPC_EYEBALL
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
ACTORS_EYEBALL_SBK,
ANIM_EYEBALL_STALK,
NPC_INIT_DEFAULT,
NPC_SENSOR_EYEBALL_USER_CLOSE,
NPC_MOVEMENT_STATIC,
@ -528,11 +624,12 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
32,
0,
},
{ // NPC_BABY_OCTOPUS
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
ACTORS_BABYOCTOPUS_SBK,
ANIM_BABYOCTOPUS_IDLE,
NPC_INIT_DEFAULT,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FIXED_PATH,
@ -545,6 +642,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
0,
ANIM_BABYOCTOPUS_SWIM,
},
{ // NPC_ZOMBIE_FISH_FOLK
@ -562,6 +660,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
16,
0,
},
{ // NPC_NINJA_STARFISH
@ -579,11 +678,12 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
16,
0,
},
{ // NPC_GHOST
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
ACTORS_GHOST_SBK,
ANIM_GHOST_IDLE,
NPC_INIT_DEFAULT,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FIXED_PATH,
@ -596,6 +696,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
0,
ANIM_GHOST_MOVE,
},
{ // NPC_GHOST_PIRATE
@ -613,14 +714,15 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
160,
0,
},
{ // NPC_FLAMING_SKULL
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
ACTORS_FLAMINGSKULL_SBK,
ANIM_FLAMINGSKULL_MOVE,
NPC_INIT_FLAMING_SKULL,
NPC_SENSOR_FLAMING_SKULL_USER_CLOSE,
NPC_MOVEMENT_STATIC,
NPC_MOVEMENT_STATIC_CYCLE_ANIM,
NPC_MOVEMENT_MODIFIER_NONE,
NPC_CLOSE_FLAMING_SKULL_ATTACK,
NPC_TIMER_NONE,
@ -630,11 +732,12 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__BURN_ENEMY,
16,
ANIM_FLAMINGSKULL_MOVE,
},
{ // NPC_SHARK_MAN
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
ACTORS_SHARKMAN_SBK,
ANIM_SHARKMAN_IDLE1_,
NPC_INIT_DEFAULT,
NPC_SENSOR_GENERIC_USER_VISIBLE,
NPC_MOVEMENT_FIXED_PATH_WALK,
@ -647,6 +750,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__BITE_ENEMY,
16,
ANIM_SHARKMAN_RUN,
},
{ // NPC_OIL_BLOB
@ -664,11 +768,12 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
0,
0,
},
{ // NPC_SKULL_STOMPER
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
ACTORS_STOMPER_SBK,
ANIM_STOMPER_CRUSH,
NPC_INIT_SKULL_STOMPER,
NPC_SENSOR_SKULL_STOMPER_USER_CLOSE,
NPC_MOVEMENT_STATIC,
@ -681,6 +786,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__SQUASH_ENEMY,
0,
ANIM_STOMPER_CRUSH,
},
{ // NPC_MOTHER_JELLYFISH
@ -698,6 +804,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__SHOCK_ENEMY,
256,
0,
},
{ // NPC_SUB_SHARK
@ -715,6 +822,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
256,
0,
},
{ // NPC_PARASITIC_WORM
@ -732,11 +840,12 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
256,
0,
},
{ // NPC_FLYING_DUTCHMAN
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
ACTORS_FLYINGDUTCHMAN_SBK,
ANIM_FLYINGDUTCHMAN_FLY,
NPC_INIT_FLYING_DUTCHMAN,
NPC_SENSOR_NONE,
NPC_MOVEMENT_FLYING_DUTCHMAN,
@ -749,11 +858,12 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
256,
ANIM_FLYINGDUTCHMAN_FLY,
},
{ // NPC_IRON_DOGFISH
ACTORS_CLAM_SBK,
ANIM_CLAM_SIDESNAP,
ACTORS_IRONDOGFISH_SBK,
ANIM_IRONDOGFISH_IDLE,
NPC_INIT_IRON_DOGFISH,
NPC_SENSOR_IRON_DOGFISH_USER_CLOSE,
NPC_MOVEMENT_IRON_DOGFISH,
@ -766,6 +876,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
256,
ANIM_IRONDOGFISH_WALK,
},
{ // NPC_PARASITIC_WORM_SEGMENT
@ -783,5 +894,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
false,
DAMAGE__HIT_ENEMY,
256,
0,
},
};