This commit is contained in:
Charles 2001-05-09 16:04:17 +00:00
parent 548031076b
commit 3de584bf8b
7 changed files with 116 additions and 3 deletions

View file

@ -185,6 +185,10 @@
#include "enemy\nshell.h"
#endif
#ifndef __ENEMY_NMJBACK_H__
#include "enemy\nmjback.h"
#endif
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// Enemy NPCs
@ -357,7 +361,17 @@ CNpcEnemy *CNpcEnemy::Create(sThingActor *ThisActor)
case CNpcEnemy::NPC_MOTHER_JELLYFISH:
{
printf("NPC_MOTHER_JELLYFISH\n");
enemy = new ("mother jellyfish") CNpcMotherJellyfishEnemy;
if ( CLevel::getCurrentChapterLevel() == 4 )
{
enemy = new ("mother jellyfish background") CNpcMotherJellyfishBackground;
enemyType = NPC_MOTHER_JELLYFISH_BACKGROUND;
}
else
{
enemy = new ("mother jellyfish") CNpcMotherJellyfishEnemy;
}
break;
}

View file

@ -81,6 +81,7 @@ public:
NPC_BALL_BLOB,
NPC_SHELL,
NPC_PROJECTILE_JELLYFISH,
NPC_MOTHER_JELLYFISH_BACKGROUND,
NPC_UNIT_TYPE_MAX,
};

View file

@ -971,6 +971,28 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
true,
false,
},
{ // NPC_SMALL_JELLYFISH_1
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,
256,
0,
NPC_SHOT_GENERIC,
0,
0,
false,
false,
false,
},
};
CNpcEnemy::NPC_UNIT_TYPE CNpcEnemy::mapEditConvertTable[NPC_UNIT_TYPE_MAX] =
@ -1015,4 +1037,5 @@ CNpcEnemy::NPC_UNIT_TYPE CNpcEnemy::mapEditConvertTable[NPC_UNIT_TYPE_MAX] =
NPC_GHOST_PIRATE,
NPC_OIL_BLOB,
NPC_PARASITIC_WORM_SEGMENT,
NPC_MOTHER_JELLYFISH_BACKGROUND,
};