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-06-15 22:05:32 +00:00
parent e5a67c396f
commit 6745c970e9
2 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

32
source/enemy/nmjfish.cpp
View file

@ -81,6 +81,7 @@ void CNpcMotherJellyfishEnemy::postInit()
m_movementTimer = GameState::getOneSecondInFrames() * 5; m_movementTimer = GameState::getOneSecondInFrames() * 5;
m_pulsateTimer = GameState::getOneSecondInFrames(); m_pulsateTimer = GameState::getOneSecondInFrames();
m_pauseTimer = m_maxPauseTimer = GameState::getOneSecondInFrames();
m_renderScale = 4096; m_renderScale = 4096;
} }
@ -145,24 +146,33 @@ void CNpcMotherJellyfishEnemy::processMovement( int _frames )
{ {
if ( m_pulsateTimer <= 0 ) if ( m_pulsateTimer <= 0 )
{ {
// fire at player if ( m_pauseTimer <= 0 )
{
// fire at player
s16 heading = ratan2( playerYDist, playerXDist ) & 4095; s16 heading = ratan2( playerYDist, playerXDist ) & 4095;
CProjectile *projectile; CProjectile *projectile;
projectile = CProjectile::Create(); projectile = CProjectile::Create();
DVECTOR newPos = Pos; DVECTOR newPos = Pos;
projectile->init( newPos, heading ); projectile->init( newPos, heading );
projectile->setGraphic( FRM__LIGHTNING2 ); projectile->setGraphic( FRM__LIGHTNING2 );
m_movementTimer = GameState::getOneSecondInFrames() * 5; m_movementTimer = GameState::getOneSecondInFrames() * 5;
m_pulsateTimer = GameState::getOneSecondInFrames(); m_pulsateTimer = GameState::getOneSecondInFrames();
m_pauseTimer = m_maxPauseTimer;
}
else
{
m_pauseTimer -= _frames;
}
} }
else else
{ {
m_pulsateTimer -= _frames; m_pulsateTimer -= _frames;
m_renderScale = 4096 + ( ( 256 * rsin( ( ( m_pulsateTimer << 14 ) / GameState::getOneSecondInFrames() ) & 4095 ) ) >> 12 ); m_renderScale = 2048 + ( ( ( 4096 - 2048 ) * m_health ) / m_data[m_type].initHealth );
m_renderScale += ( ( 256 * rsin( ( ( m_pulsateTimer << 14 ) / GameState::getOneSecondInFrames() ) & 4095 ) ) >> 12 );
} }
} }
else else
@ -579,6 +589,8 @@ void CNpcMotherJellyfishEnemy::processShot( int _frames )
m_health -= 5; m_health -= 5;
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 + ( ( 3 * ( m_data[m_type].initHealth - m_health ) ) / m_data[m_type].initHealth );
m_maxPauseTimer = ( GameState::getOneSecondInFrames() * m_health ) / m_data[m_type].initHealth;
} }
m_state = NPC_GENERIC_HIT_RECOIL; m_state = NPC_GENERIC_HIT_RECOIL;

2
source/enemy/nmjfish.h
View file

@ -50,6 +50,8 @@ protected:
int m_jellyfishCount; int m_jellyfishCount;
s32 m_spawnTimer; s32 m_spawnTimer;
s32 m_pulsateTimer; s32 m_pulsateTimer;
s32 m_pauseTimer;
s32 m_maxPauseTimer;
s32 m_cycleWidth; s32 m_cycleWidth;
s32 m_halfCycleWidth; s32 m_halfCycleWidth;
bool m_meterOn; bool m_meterOn;