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-21 15:06:22 +00:00
parent d2e22c5ed9
commit 56e15cf346
2 changed files with 102 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

97
source/enemy/nmjfish.cpp
View file

@ -75,7 +75,7 @@ void CNpcMotherJellyfishEnemy::postInit()
legs[i]->Setup( legsPos[i].vx, legsPos[i].vy, i > 1 );
}
m_RGB = 255 + ( 128 << 8 ) + ( 255 << 16 );
m_RGB = MJ_PINK;
targetPos = Pos;
@ -86,6 +86,8 @@ void CNpcMotherJellyfishEnemy::postInit()
m_speed = m_data[m_type].speed + ( ( 3 * ( m_data[m_type].initHealth - m_health ) ) / m_data[m_type].initHealth );
m_pauseTimer = m_maxPauseTimer = ( GameState::getOneSecondInFrames() * m_health ) / m_data[m_type].initHealth;
m_invulnerableTimer = 0;
m_attackCounter = 0;
}
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@ -182,9 +184,36 @@ void CNpcMotherJellyfishEnemy::processMovement( int _frames )
m_movementTimer = GameState::getOneSecondInFrames() * 5;
m_pulsateTimer = GameState::getOneSecondInFrames();
m_pauseTimer = m_maxPauseTimer;
m_RGB = MJ_PINK;
m_attackCounter++;
if ( m_attackCounter > 2 )
{
m_attackCounter = 0;
m_state = MOTHER_JELLYFISH_STRAFE_START;
s32 minX, maxX, minY, maxY;
m_npcPath.getPathXExtents( &minX, &maxX );
m_npcPath.getPathYExtents( &minY, &maxY );
targetPos.vx = minX;
targetPos.vy = minY;
}
}
else
{
if ( m_RGB == MJ_PINK )
{
m_RGB = MJ_WHITE;
}
else
{
m_RGB = MJ_PINK;
}
m_pauseTimer -= _frames;
}
}
@ -280,6 +309,70 @@ void CNpcMotherJellyfishEnemy::processMovement( int _frames )
break;
}
case MOTHER_JELLYFISH_STRAFE_START:
{
s32 distX, distY;
distX = targetPos.vx - Pos.vx;
distY = targetPos.vy - Pos.vy;
if( abs( distX ) < 10 && abs( distY ) < 10 )
{
s32 minX, maxX, minY, maxY;
m_npcPath.getPathXExtents( &minX, &maxX );
m_npcPath.getPathYExtents( &minY, &maxY );
targetPos.vx = maxX;
targetPos.vy = minY;
m_state = MOTHER_JELLYFISH_STRAFE;
}
else
{
processGenericGotoTarget( _frames, distX, distY, m_speed );
}
break;
}
case MOTHER_JELLYFISH_STRAFE:
{
if ( m_RGB == MJ_PINK )
{
m_RGB = MJ_WHITE;
}
else
{
m_RGB = MJ_PINK;
}
s32 distX, distY;
distX = targetPos.vx - Pos.vx;
distY = targetPos.vy - Pos.vy;
if( abs( distX ) < 10 && abs( distY ) < 10 )
{
s32 minX, maxX, minY, maxY;
m_npcPath.getPathXExtents( &minX, &maxX );
m_npcPath.getPathYExtents( &minY, &maxY );
targetPos.vx = minX + ( getRnd() % ( maxX - minX + 1 ) );
targetPos.vy = minY + ( getRnd() % ( maxY - minY + 1 ) );
m_state = MOTHER_JELLYFISH_CYCLE;
m_RGB = MJ_PINK;
}
else
{
processGenericGotoTarget( _frames, distX, distY, m_speed );
}
break;
}
}
@ -541,6 +634,8 @@ void CNpcMotherJellyfishEnemy::render()
SprFrame = m_actorGfx->Render(renderPos,m_animNo,( m_frame >> 8 ),false);
m_actorGfx->RotateScale( SprFrame, renderPos, 0, m_renderScale, m_renderScale );
setRGB0( SprFrame, ( m_RGB & 255 ), ( ( m_RGB >> 8 ) & 255 ), ( ( m_RGB >> 16 ) & 255 ) );
sBBox boundingBox = m_actorGfx->GetBBox();
setCollisionSize( ( boundingBox.XMax - boundingBox.XMin ), ( boundingBox.YMax - boundingBox.YMin ) );
setCollisionCentreOffset( ( boundingBox.XMax + boundingBox.XMin ) >> 1, ( boundingBox.YMax + boundingBox.YMin ) >> 1 );

6
source/enemy/nmjfish.h
View file

@ -18,6 +18,9 @@
#include "fx\fxjfish.h"
#include "fx\fxnrgbar.h"
#define MJ_PINK ( 255 + ( 128 << 8 ) + ( 255 << 16 ) )
#define MJ_WHITE ( 255 + ( 255 << 8 ) + ( 255 << 16 ) )
class CNpcMotherJellyfishEnemy : public CNpcEnemy
{
public:
@ -48,6 +51,8 @@ protected:
MOTHER_JELLYFISH_BEGIN_CIRCLE = 1,
MOTHER_JELLYFISH_CIRCLE,
MOTHER_JELLYFISH_EXIT,
MOTHER_JELLYFISH_STRAFE_START,
MOTHER_JELLYFISH_STRAFE,
};
int m_jellyfishCount;
@ -60,6 +65,7 @@ protected:
bool m_meterOn;
s16 m_renderScale;
s32 m_invulnerableTimer;
u8 m_attackCounter;
CFXJellyFishLegs *legs[4];
DVECTOR legsPos[4];