This commit is contained in:
Charles
parent
86a4f34d1f
commit
d49041bf92
5 changed files with 0 additions and 238 deletions
|
|
@ -59,7 +59,6 @@ enemy_src := npc \
|
|||
nsjfish \
|
||||
nclam \
|
||||
nscrab \
|
||||
ngpirate \
|
||||
nshrkman \
|
||||
ngeneric \
|
||||
nanemone \
|
||||
|
|
@ -83,7 +82,6 @@ enemy_src := npc \
|
|||
ndustdev \
|
||||
npbug \
|
||||
nprojjf \
|
||||
nmjback \
|
||||
nsjback \
|
||||
nsj2back \
|
||||
nbuttfly \
|
||||
|
|
|
|||
|
|
@ -99,10 +99,6 @@
|
|||
#include "enemy\nbblob.h"
|
||||
#endif
|
||||
|
||||
#ifndef __ENEMY_NGPIRATE_H__
|
||||
#include "enemy\ngpirate.h"
|
||||
#endif
|
||||
|
||||
#ifndef __ENEMY_NPUFFA_H__
|
||||
#include "enemy\npuffa.h"
|
||||
#endif
|
||||
|
|
@ -171,22 +167,10 @@
|
|||
#include "enemy\nangler.h"
|
||||
#endif
|
||||
|
||||
#ifndef __ENEMY_NMINE_H__
|
||||
#include "enemy\nmine.h"
|
||||
#endif
|
||||
|
||||
#ifndef __ENEMY_NSTRFISH_H__
|
||||
#include "enemy\nstrfish.h"
|
||||
#endif
|
||||
|
||||
#ifndef __ENEMY_NGHOST_H__
|
||||
#include "enemy\nghost.h"
|
||||
#endif
|
||||
|
||||
#ifndef __ENEMY_NOILBLOB_H__
|
||||
#include "enemy\noilblob.h"
|
||||
#endif
|
||||
|
||||
#ifndef __ENEMY_NSHELL_H__
|
||||
#include "enemy\nshell.h"
|
||||
#endif
|
||||
|
|
@ -312,12 +296,6 @@ CNpcEnemy *CNpcEnemy::Create(int enemyType)
|
|||
break;
|
||||
}
|
||||
|
||||
case CNpcEnemy::NPC_GHOST_PIRATE:
|
||||
{
|
||||
enemy = new ("ghost pirate") CNpcGhostPirateEnemy;
|
||||
break;
|
||||
}
|
||||
|
||||
case CNpcEnemy::NPC_PUFFA_FISH:
|
||||
{
|
||||
enemy = new ("puffa fish") CNpcPuffaFishEnemy;
|
||||
|
|
@ -420,30 +398,12 @@ CNpcEnemy *CNpcEnemy::Create(int enemyType)
|
|||
break;
|
||||
}
|
||||
|
||||
case CNpcEnemy::NPC_MINE:
|
||||
{
|
||||
enemy = new ("mine") CNpcMineEnemy;
|
||||
break;
|
||||
}
|
||||
|
||||
case CNpcEnemy::NPC_NINJA_STARFISH:
|
||||
{
|
||||
enemy = new ("ninja starfish") CNpcNinjaStarfishEnemy;
|
||||
break;
|
||||
}
|
||||
|
||||
case CNpcEnemy::NPC_GHOST:
|
||||
{
|
||||
enemy = new ("ghost") CNpcGhostEnemy;
|
||||
break;
|
||||
}
|
||||
|
||||
case CNpcEnemy::NPC_OIL_BLOB:
|
||||
{
|
||||
enemy = new ("oil blob") CNpcOilBlobEnemy;
|
||||
break;
|
||||
}
|
||||
|
||||
case CNpcEnemy::NPC_SHELL:
|
||||
{
|
||||
enemy = new ("shell") CNpcShellEnemy;
|
||||
|
|
|
|||
|
|
@ -58,30 +58,24 @@ public:
|
|||
NPC_PUFFA_FISH,
|
||||
NPC_ANGLER_FISH,
|
||||
NPC_HERMIT_CRAB,
|
||||
NPC_MINE,
|
||||
NPC_BOOGER_MONSTER,
|
||||
NPC_SPIDER_CRAB,
|
||||
NPC_SPIDER_CRAB_SPAWNER,
|
||||
NPC_EYEBALL,
|
||||
NPC_BABY_OCTOPUS,
|
||||
NPC_ZOMBIE_FISH_FOLK,
|
||||
NPC_NINJA_STARFISH,
|
||||
NPC_GHOST,
|
||||
NPC_GHOST_PIRATE,
|
||||
NPC_FLAMING_SKULL,
|
||||
NPC_SHARK_MAN,
|
||||
NPC_OIL_BLOB,
|
||||
NPC_SKULL_STOMPER,
|
||||
NPC_MOTHER_JELLYFISH,
|
||||
NPC_SUB_SHARK,
|
||||
NPC_PARASITIC_WORM,
|
||||
NPC_FLYING_DUTCHMAN,
|
||||
NPC_IRON_DOGFISH,
|
||||
NPC_PARASITIC_WORM_SEGMENT,
|
||||
NPC_BALL_BLOB,
|
||||
NPC_SHELL,
|
||||
NPC_PROJECTILE_JELLYFISH,
|
||||
NPC_MOTHER_JELLYFISH_BACKGROUND,
|
||||
NPC_SMALL_JELLYFISH_BACKGROUND,
|
||||
NPC_SMALL_JELLYFISH_2_BACKGROUND,
|
||||
NPC_BUTTERFLY_BACKGROUND,
|
||||
|
|
|
|||
|
|
@ -530,32 +530,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
true,
|
||||
},
|
||||
|
||||
{ // NPC_MINE
|
||||
ACTORS_CLAM_SBK,
|
||||
ANIM_CLAM_SIDESNAP,
|
||||
NPC_SENSOR_NONE,
|
||||
NPC_MOVEMENT_STATIC,
|
||||
NPC_CLOSE_NONE,
|
||||
NPC_TIMER_NONE,
|
||||
false,
|
||||
0,
|
||||
128,
|
||||
DETECT_ALL_COLLISION,
|
||||
DAMAGE__HIT_ENEMY,
|
||||
1,
|
||||
0,
|
||||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
true,
|
||||
CSoundMediator::NUM_SFXIDS,
|
||||
CSoundMediator::SFX_HAZARD__MINE,
|
||||
false,
|
||||
},
|
||||
|
||||
{ // NPC_BOOGER_MONSTER
|
||||
ACTORS_CLAM_SBK,
|
||||
ANIM_CLAM_SIDESNAP,
|
||||
|
|
@ -712,32 +686,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
false,
|
||||
},
|
||||
|
||||
{ // NPC_NINJA_STARFISH
|
||||
ACTORS_CLAM_SBK,
|
||||
ANIM_CLAM_SIDESNAP,
|
||||
NPC_SENSOR_GENERIC_USER_CLOSE,
|
||||
NPC_MOVEMENT_STATIC,
|
||||
NPC_CLOSE_GENERIC_USER_SEEK,
|
||||
NPC_TIMER_NONE,
|
||||
false,
|
||||
3,
|
||||
64,
|
||||
DETECT_ALL_COLLISION,
|
||||
DAMAGE__HIT_ENEMY,
|
||||
1,
|
||||
0,
|
||||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
true,
|
||||
CSoundMediator::NUM_SFXIDS,
|
||||
CSoundMediator::NUM_SFXIDS,
|
||||
false,
|
||||
},
|
||||
|
||||
{ // NPC_GHOST
|
||||
ACTORS_GHOST_SBK,
|
||||
ANIM_GHOST_IDLE,
|
||||
|
|
@ -764,32 +712,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
false,
|
||||
},
|
||||
|
||||
{ // NPC_GHOST_PIRATE
|
||||
ACTORS_CLAM_SBK,
|
||||
ANIM_CLAM_SIDESNAP,
|
||||
NPC_SENSOR_NONE,
|
||||
NPC_MOVEMENT_STATIC,
|
||||
NPC_CLOSE_NONE,
|
||||
NPC_TIMER_NONE,
|
||||
false,
|
||||
0,
|
||||
128,
|
||||
DETECT_ALL_COLLISION,
|
||||
DAMAGE__HIT_ENEMY,
|
||||
1,
|
||||
0,
|
||||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
true,
|
||||
CSoundMediator::NUM_SFXIDS,
|
||||
CSoundMediator::NUM_SFXIDS,
|
||||
false,
|
||||
},
|
||||
|
||||
{ // NPC_FLAMING_SKULL
|
||||
ACTORS_FLAMINGSKULL_SBK,
|
||||
ANIM_FLAMINGSKULL_MOVE,
|
||||
|
|
@ -842,32 +764,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
false,
|
||||
},
|
||||
|
||||
{ // NPC_OIL_BLOB
|
||||
ACTORS_CLAM_SBK,
|
||||
ANIM_CLAM_SIDESNAP,
|
||||
NPC_SENSOR_GENERIC_USER_CLOSE,
|
||||
NPC_MOVEMENT_STATIC,
|
||||
NPC_CLOSE_GENERIC_USER_SEEK,
|
||||
NPC_TIMER_NONE,
|
||||
false,
|
||||
3,
|
||||
64,
|
||||
DETECT_ALL_COLLISION,
|
||||
DAMAGE__HIT_ENEMY,
|
||||
1,
|
||||
0,
|
||||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
true,
|
||||
CSoundMediator::NUM_SFXIDS,
|
||||
CSoundMediator::NUM_SFXIDS,
|
||||
false,
|
||||
},
|
||||
|
||||
{ // NPC_SKULL_STOMPER
|
||||
ACTORS_STOMPER_SBK,
|
||||
ANIM_STOMPER_CRUSH,
|
||||
|
|
@ -1025,32 +921,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
true,
|
||||
},
|
||||
|
||||
{ // NPC_PARASITIC_WORM_SEGMENT
|
||||
ACTORS_GIANTWORM_SBK,
|
||||
ANIM_GIANTWORM_BODYSTATIC,
|
||||
NPC_SENSOR_NONE,
|
||||
NPC_MOVEMENT_STATIC,
|
||||
NPC_CLOSE_NONE,
|
||||
NPC_TIMER_NONE,
|
||||
false,
|
||||
3,
|
||||
2048,
|
||||
DETECT_ALL_COLLISION,
|
||||
DAMAGE__HIT_ENEMY,
|
||||
1,
|
||||
0,
|
||||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
CSoundMediator::NUM_SFXIDS,
|
||||
CSoundMediator::NUM_SFXIDS,
|
||||
false,
|
||||
},
|
||||
|
||||
{ // NPC_BALL_BLOB
|
||||
ACTORS_BALLBLOB_SBK,
|
||||
ANIM_BALLBLOB_IDLE,
|
||||
|
|
@ -1129,32 +999,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
false,
|
||||
},
|
||||
|
||||
{ // NPC_MOTHER_JELLYFISH_BACKGROUND
|
||||
ACTORS_MOTHERJELLYFISH_SBK,
|
||||
ANIM_CLAM_SIDESNAP,
|
||||
NPC_SENSOR_NONE,
|
||||
NPC_MOVEMENT_FIXED_PATH,
|
||||
NPC_CLOSE_NONE,
|
||||
NPC_TIMER_NONE,
|
||||
false,
|
||||
2,
|
||||
128,
|
||||
DETECT_NO_COLLISION,
|
||||
DAMAGE__SHOCK_ENEMY,
|
||||
1,
|
||||
0,
|
||||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
false,
|
||||
CSoundMediator::NUM_SFXIDS,
|
||||
CSoundMediator::NUM_SFXIDS,
|
||||
false,
|
||||
},
|
||||
|
||||
{ // NPC_SMALL_JELLYFISH_BACKGROUND
|
||||
0,//ACTORS_JELLYFISH1_SBK,
|
||||
FRM_JELLYFISH1_SWIM1,
|
||||
|
|
@ -1270,11 +1114,5 @@ CNpcEnemy::NPC_UNIT_TYPE CNpcEnemy::mapEditConvertTable[NPC_UNIT_TYPE_MAX] =
|
|||
//
|
||||
NPC_FISH_FOLK,
|
||||
NPC_ANGLER_FISH,
|
||||
NPC_MINE,
|
||||
NPC_ZOMBIE_FISH_FOLK,
|
||||
NPC_NINJA_STARFISH,
|
||||
NPC_GHOST_PIRATE,
|
||||
NPC_OIL_BLOB,
|
||||
NPC_PARASITIC_WORM_SEGMENT,
|
||||
NPC_MOTHER_JELLYFISH_BACKGROUND,
|
||||
};
|
||||
|
|
|
|||
|
|
@ -241,14 +241,6 @@ SOURCE=..\..\..\source\enemy\nghost.h
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\enemy\ngpirate.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\enemy\ngpirate.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\enemy\nhcrab.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
@ -257,18 +249,6 @@ SOURCE=..\..\..\source\enemy\nhcrab.h
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\enemy\nmine.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\enemy\nmjback.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\enemy\nmjback.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\enemy\nmjfish.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
@ -285,10 +265,6 @@ SOURCE=..\..\..\source\enemy\nocto.h
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\enemy\noilblob.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\enemy\npbug.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
@ -421,10 +397,6 @@ SOURCE=..\..\..\source\enemy\nsstomp.h
|
|||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\enemy\nstrfish.h
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
||||
SOURCE=..\..\..\source\enemy\nworm.cpp
|
||||
# End Source File
|
||||
# Begin Source File
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue