zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-07-16 16:21:36 +00:00
parent 23eb3b6f29
commit ed08839edd
4 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
source/enemy/nmjfish.cpp
View file

@ -778,9 +778,9 @@ void CNpcMotherJellyfishEnemy::processShot( int _frames )
{ {
case NPC_GENERIC_HIT_CHECK_HEALTH: case NPC_GENERIC_HIT_CHECK_HEALTH:
{ {
if ( m_health > 5 ) if ( m_health > 3 )
{ {
m_health -= 5; m_health -= 3;
m_renderScale = 2048 + ( ( ( 4096 - 2048 ) * m_health ) / m_data[m_type].initHealth ); m_renderScale = 2048 + ( ( ( 4096 - 2048 ) * m_health ) / m_data[m_type].initHealth );
m_speed = m_data[m_type].speed + ( ( 2 * ( m_data[m_type].initHealth - m_health ) ) / m_data[m_type].initHealth ); m_speed = m_data[m_type].speed + ( ( 2 * ( m_data[m_type].initHealth - m_health ) ) / m_data[m_type].initHealth );

2
source/enemy/npc.cpp
View file

@ -1230,7 +1230,7 @@ void CNpcEnemy::processShot( int _frames )
{ {
case NPC_GENERIC_HIT_CHECK_HEALTH: case NPC_GENERIC_HIT_CHECK_HEALTH:
{ {
m_health -= 5; m_health -= 3;
if ( m_health <= 0 ) if ( m_health <= 0 )
{ {

8
source/enemy/npcdata.cpp
View file

@ -801,7 +801,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
256, 256,
DETECT_ALL_COLLISION, DETECT_ALL_COLLISION,
DAMAGE__SHOCK_ENEMY, DAMAGE__SHOCK_ENEMY,
50, 30,
0, 0,
NPC_SHOT_GENERIC, NPC_SHOT_GENERIC,
0, 0,
@ -827,7 +827,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
2048, 2048,
DETECT_ALL_COLLISION, DETECT_ALL_COLLISION,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
50, 30,
0, 0,
NPC_SHOT_GENERIC, NPC_SHOT_GENERIC,
ANIM_SHARKSUB_DEATH, ANIM_SHARKSUB_DEATH,
@ -879,7 +879,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
2048, 2048,
DETECT_ALL_COLLISION, DETECT_ALL_COLLISION,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
50, 30,
ANIM_FLYINGDUTCHMAN_FLY, ANIM_FLYINGDUTCHMAN_FLY,
NPC_SHOT_GENERIC, NPC_SHOT_GENERIC,
ANIM_FLYINGDUTCHMAN_DEATH, ANIM_FLYINGDUTCHMAN_DEATH,
@ -906,7 +906,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
//DETECT_ALL_COLLISION, //DETECT_ALL_COLLISION,
DETECT_ATTACK_COLLISION_GENERIC, DETECT_ATTACK_COLLISION_GENERIC,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
50, 30,
ANIM_IRONDOGFISH_WALK, ANIM_IRONDOGFISH_WALK,
NPC_SHOT_GENERIC, NPC_SHOT_GENERIC,
ANIM_IRONDOGFISH_DIE, ANIM_IRONDOGFISH_DIE,

2
source/enemy/nsshark.cpp
View file

@ -678,7 +678,7 @@ void CNpcSubSharkEnemy::processShot( int _frames )
{ {
case NPC_GENERIC_HIT_CHECK_HEALTH: case NPC_GENERIC_HIT_CHECK_HEALTH:
{ {
m_health -= 5; m_health -= 3;
if ( m_health <= 0 ) if ( m_health <= 0 )
{ {