This commit is contained in:
parent
eddad29b71
commit
92e7e36989
7 changed files with 49 additions and 1 deletions
|
@ -177,6 +177,10 @@
|
||||||
#include "enemy\noilblob.h"
|
#include "enemy\noilblob.h"
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#ifndef __ENEMY_NSHELL_H__
|
||||||
|
#include "enemy\nshell.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||||
// Enemy NPCs
|
// Enemy NPCs
|
||||||
|
@ -471,6 +475,12 @@ CNpcEnemy *CNpcEnemy::Create(sThingActor *ThisActor)
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case CNpcEnemy::NPC_SHELL:
|
||||||
|
{
|
||||||
|
enemy = new ("shell") CNpcShellEnemy;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
{
|
{
|
||||||
printf("UNKNOWN %i\n",enemyType);
|
printf("UNKNOWN %i\n",enemyType);
|
||||||
|
|
|
@ -84,6 +84,7 @@ public:
|
||||||
NPC_IRON_DOGFISH,
|
NPC_IRON_DOGFISH,
|
||||||
NPC_PARASITIC_WORM_SEGMENT,
|
NPC_PARASITIC_WORM_SEGMENT,
|
||||||
NPC_BALL_BLOB,
|
NPC_BALL_BLOB,
|
||||||
|
NPC_SHELL,
|
||||||
NPC_UNIT_TYPE_MAX,
|
NPC_UNIT_TYPE_MAX,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -991,6 +991,27 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
||||||
false,
|
false,
|
||||||
false,
|
false,
|
||||||
},
|
},
|
||||||
|
|
||||||
|
{ // NPC_SHELL
|
||||||
|
ACTORS_SPIDERCRAB_SBK,
|
||||||
|
0,
|
||||||
|
NPC_SENSOR_NONE,
|
||||||
|
NPC_MOVEMENT_STATIC,
|
||||||
|
NPC_CLOSE_NONE,
|
||||||
|
NPC_TIMER_NONE,
|
||||||
|
false,
|
||||||
|
3,
|
||||||
|
128,
|
||||||
|
DETECT_NO_COLLISION,
|
||||||
|
DAMAGE__BURN_ENEMY,
|
||||||
|
16,
|
||||||
|
0,
|
||||||
|
NPC_SHOT_GENERIC,
|
||||||
|
0,
|
||||||
|
0,
|
||||||
|
false,
|
||||||
|
false,
|
||||||
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
CNpcEnemy::NPC_UNIT_TYPE CNpcEnemy::mapEditConvertTable[NPC_UNIT_TYPE_MAX] =
|
CNpcEnemy::NPC_UNIT_TYPE CNpcEnemy::mapEditConvertTable[NPC_UNIT_TYPE_MAX] =
|
||||||
|
@ -1024,6 +1045,7 @@ CNpcEnemy::NPC_UNIT_TYPE CNpcEnemy::mapEditConvertTable[NPC_UNIT_TYPE_MAX] =
|
||||||
NPC_SKULL_STOMPER,
|
NPC_SKULL_STOMPER,
|
||||||
NPC_DUST_DEVIL,
|
NPC_DUST_DEVIL,
|
||||||
NPC_SPIDER_CRAB_SPAWNER,
|
NPC_SPIDER_CRAB_SPAWNER,
|
||||||
|
NPC_SHELL,
|
||||||
//NPC_FALLING_ITEM,
|
//NPC_FALLING_ITEM,
|
||||||
//NPC_FISH_HOOK,
|
//NPC_FISH_HOOK,
|
||||||
//NPC_PENDULUM,
|
//NPC_PENDULUM,
|
||||||
|
|
|
@ -82,7 +82,7 @@ FontBank *CGameScene::s_genericFont;
|
||||||
MATRIX CGameScene::CamMtx;
|
MATRIX CGameScene::CamMtx;
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
CGameScene::ACTOR_TYPE CGameScene::actorType[39] =
|
CGameScene::ACTOR_TYPE CGameScene::actorType[40] =
|
||||||
{
|
{
|
||||||
ACTOR_PLAYER, //SpongeBob=0
|
ACTOR_PLAYER, //SpongeBob=0
|
||||||
ACTOR_FRIEND_NPC, //BarnacleBoy=1
|
ACTOR_FRIEND_NPC, //BarnacleBoy=1
|
||||||
|
@ -123,6 +123,7 @@ CGameScene::ACTOR_TYPE CGameScene::actorType[39] =
|
||||||
ACTOR_ENEMY_NPC, //Stomper=36
|
ACTOR_ENEMY_NPC, //Stomper=36
|
||||||
ACTOR_ENEMY_NPC, //DustDevil=37
|
ACTOR_ENEMY_NPC, //DustDevil=37
|
||||||
ACTOR_ENEMY_NPC, //SiderCrabSpawner=38
|
ACTOR_ENEMY_NPC, //SiderCrabSpawner=38
|
||||||
|
ACTOR_ENEMY_NPC, //Shell=39
|
||||||
};
|
};
|
||||||
|
|
||||||
/*****************************************************************************/
|
/*****************************************************************************/
|
||||||
|
|
|
@ -50,6 +50,7 @@ Squiddart=35
|
||||||
Stomper=36
|
Stomper=36
|
||||||
DustDevil=37
|
DustDevil=37
|
||||||
SpiderCrabSpawner=38
|
SpiderCrabSpawner=38
|
||||||
|
Shell=39
|
||||||
|
|
||||||
|
|
||||||
################################################
|
################################################
|
||||||
|
|
|
@ -362,3 +362,12 @@ Collision=1
|
||||||
Health=2
|
Health=2
|
||||||
# 1st shot stuns, if shot again is killed
|
# 1st shot stuns, if shot again is killed
|
||||||
AttackStrength=20
|
AttackStrength=20
|
||||||
|
|
||||||
|
[Shell]
|
||||||
|
Gfx=..\..\graphics\characters\spidercrab\render\psx\SpiderCrab_Idle0001.bmp
|
||||||
|
WayPoints=16
|
||||||
|
Speed=3
|
||||||
|
TurnRate=0
|
||||||
|
Collision=1
|
||||||
|
Health=2
|
||||||
|
AttackStrength=20
|
||||||
|
|
|
@ -301,6 +301,10 @@ SOURCE=..\..\..\source\enemy\nsdart.h
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\..\..\source\enemy\nshell.h
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\..\..\source\enemy\nshrkman.cpp
|
SOURCE=..\..\..\source\enemy\nshrkman.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue