From ed08839edd96040d5f8aa49456c1eff6e84b367a Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 16 Jul 2001 16:21:36 +0000 Subject: [PATCH] --- source/enemy/nmjfish.cpp | 4 ++-- source/enemy/npc.cpp | 2 +- source/enemy/npcdata.cpp | 8 ++++---- source/enemy/nsshark.cpp | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/enemy/nmjfish.cpp b/source/enemy/nmjfish.cpp index 487cb79c7..d14ffd1cf 100644 --- a/source/enemy/nmjfish.cpp +++ b/source/enemy/nmjfish.cpp @@ -778,9 +778,9 @@ void CNpcMotherJellyfishEnemy::processShot( int _frames ) { 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_speed = m_data[m_type].speed + ( ( 2 * ( m_data[m_type].initHealth - m_health ) ) / m_data[m_type].initHealth ); diff --git a/source/enemy/npc.cpp b/source/enemy/npc.cpp index a92450378..dff51fa64 100644 --- a/source/enemy/npc.cpp +++ b/source/enemy/npc.cpp @@ -1230,7 +1230,7 @@ void CNpcEnemy::processShot( int _frames ) { case NPC_GENERIC_HIT_CHECK_HEALTH: { - m_health -= 5; + m_health -= 3; if ( m_health <= 0 ) { diff --git a/source/enemy/npcdata.cpp b/source/enemy/npcdata.cpp index 43bcbfde3..fdc9286aa 100644 --- a/source/enemy/npcdata.cpp +++ b/source/enemy/npcdata.cpp @@ -801,7 +801,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = 256, DETECT_ALL_COLLISION, DAMAGE__SHOCK_ENEMY, - 50, + 30, 0, NPC_SHOT_GENERIC, 0, @@ -827,7 +827,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = 2048, DETECT_ALL_COLLISION, DAMAGE__HIT_ENEMY, - 50, + 30, 0, NPC_SHOT_GENERIC, ANIM_SHARKSUB_DEATH, @@ -879,7 +879,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = 2048, DETECT_ALL_COLLISION, DAMAGE__HIT_ENEMY, - 50, + 30, ANIM_FLYINGDUTCHMAN_FLY, NPC_SHOT_GENERIC, ANIM_FLYINGDUTCHMAN_DEATH, @@ -906,7 +906,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] = //DETECT_ALL_COLLISION, DETECT_ATTACK_COLLISION_GENERIC, DAMAGE__HIT_ENEMY, - 50, + 30, ANIM_IRONDOGFISH_WALK, NPC_SHOT_GENERIC, ANIM_IRONDOGFISH_DIE, diff --git a/source/enemy/nsshark.cpp b/source/enemy/nsshark.cpp index 4efbacf0d..c38588ab9 100644 --- a/source/enemy/nsshark.cpp +++ b/source/enemy/nsshark.cpp @@ -678,7 +678,7 @@ void CNpcSubSharkEnemy::processShot( int _frames ) { case NPC_GENERIC_HIT_CHECK_HEALTH: { - m_health -= 5; + m_health -= 3; if ( m_health <= 0 ) {