This commit is contained in:
parent
f09523467a
commit
fe1a61ba0e
5 changed files with 41 additions and 7 deletions
|
@ -63,6 +63,7 @@ enemy_src := 2denemy \
|
||||||
nanemone \
|
nanemone \
|
||||||
neyeball \
|
neyeball \
|
||||||
nsstomp \
|
nsstomp \
|
||||||
|
nbooger \
|
||||||
enemy
|
enemy
|
||||||
|
|
||||||
projectl_src := projectl
|
projectl_src := projectl
|
||||||
|
|
|
@ -69,10 +69,10 @@ void CNpc::processCloseClamAttack( int _frames )
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
this->m_controlFunc = NPC_CONTROL_MOVEMENT;
|
m_controlFunc = NPC_CONTROL_MOVEMENT;
|
||||||
this->m_timerFunc = NPC_TIMER_ATTACK_DONE;
|
m_timerFunc = NPC_TIMER_ATTACK_DONE;
|
||||||
this->m_timerTimer = GameState::getOneSecondInFrames();
|
m_timerTimer = GameState::getOneSecondInFrames();
|
||||||
this->m_sensorFunc = NPC_SENSOR_NONE;
|
m_sensorFunc = NPC_SENSOR_NONE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -241,10 +241,10 @@ CNpc::NPC_DATA CNpc::m_data[NPC_UNIT_TYPE_MAX] =
|
||||||
|
|
||||||
{ // NPC_BOOGER_MONSTER
|
{ // NPC_BOOGER_MONSTER
|
||||||
NPC_INIT_DEFAULT,
|
NPC_INIT_DEFAULT,
|
||||||
NPC_SENSOR_NONE,
|
NPC_SENSOR_BOOGER_MONSTER_USER_CLOSE,
|
||||||
NPC_MOVEMENT_STATIC,
|
NPC_MOVEMENT_STATIC,
|
||||||
NPC_MOVEMENT_MODIFIER_NONE,
|
NPC_MOVEMENT_MODIFIER_NONE,
|
||||||
NPC_CLOSE_NONE,
|
NPC_CLOSE_BOOGER_MONSTER_ATTACK,
|
||||||
NPC_TIMER_NONE,
|
NPC_TIMER_NONE,
|
||||||
false,
|
false,
|
||||||
0,
|
0,
|
||||||
|
@ -387,7 +387,7 @@ CNpc::NPC_DATA CNpc::m_data[NPC_UNIT_TYPE_MAX] =
|
||||||
|
|
||||||
void CNpc::init()
|
void CNpc::init()
|
||||||
{
|
{
|
||||||
m_type = NPC_SKULL_STOMPER;
|
m_type = NPC_BOOGER_MONSTER;
|
||||||
|
|
||||||
m_heading = m_fireHeading = 0;
|
m_heading = m_fireHeading = 0;
|
||||||
m_movementTimer = 0;
|
m_movementTimer = 0;
|
||||||
|
@ -774,6 +774,21 @@ bool CNpc::processSensor()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
case NPC_SENSOR_BOOGER_MONSTER_USER_CLOSE:
|
||||||
|
{
|
||||||
|
if ( xDistSqr + yDistSqr < 400 )
|
||||||
|
{
|
||||||
|
m_controlFunc = NPC_CONTROL_CLOSE;
|
||||||
|
m_extendDir = EXTEND_UP;
|
||||||
|
|
||||||
|
return( true );
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
return( false );
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
default:
|
default:
|
||||||
return( false );
|
return( false );
|
||||||
}
|
}
|
||||||
|
@ -978,6 +993,13 @@ void CNpc::processClose(int _frames)
|
||||||
case NPC_CLOSE_SKULL_STOMPER_ATTACK:
|
case NPC_CLOSE_SKULL_STOMPER_ATTACK:
|
||||||
processCloseSkullStomperAttack( _frames );
|
processCloseSkullStomperAttack( _frames );
|
||||||
|
|
||||||
|
break;
|
||||||
|
|
||||||
|
case NPC_CLOSE_BOOGER_MONSTER_ATTACK:
|
||||||
|
processCloseBoogerMonsterAttack( _frames );
|
||||||
|
|
||||||
|
break;
|
||||||
|
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
|
@ -100,6 +100,7 @@ protected:
|
||||||
NPC_SENSOR_ANEMONE_USER_CLOSE,
|
NPC_SENSOR_ANEMONE_USER_CLOSE,
|
||||||
NPC_SENSOR_EYEBALL_USER_CLOSE,
|
NPC_SENSOR_EYEBALL_USER_CLOSE,
|
||||||
NPC_SENSOR_SKULL_STOMPER_USER_CLOSE,
|
NPC_SENSOR_SKULL_STOMPER_USER_CLOSE,
|
||||||
|
NPC_SENSOR_BOOGER_MONSTER_USER_CLOSE,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum NPC_CLOSE_FUNC
|
enum NPC_CLOSE_FUNC
|
||||||
|
@ -115,6 +116,7 @@ protected:
|
||||||
NPC_CLOSE_ANEMONE_2_ATTACK,
|
NPC_CLOSE_ANEMONE_2_ATTACK,
|
||||||
NPC_CLOSE_EYEBALL_ATTACK,
|
NPC_CLOSE_EYEBALL_ATTACK,
|
||||||
NPC_CLOSE_SKULL_STOMPER_ATTACK,
|
NPC_CLOSE_SKULL_STOMPER_ATTACK,
|
||||||
|
NPC_CLOSE_BOOGER_MONSTER_ATTACK,
|
||||||
};
|
};
|
||||||
|
|
||||||
enum NPC_MOVEMENT_FUNC
|
enum NPC_MOVEMENT_FUNC
|
||||||
|
@ -142,6 +144,7 @@ protected:
|
||||||
enum
|
enum
|
||||||
{
|
{
|
||||||
NPC_JELLYFISH_RESISTANCE = 64,
|
NPC_JELLYFISH_RESISTANCE = 64,
|
||||||
|
NPC_BOOGER_MONSTER_MAX_EXTENSION = 20,
|
||||||
EXTEND_UP = true,
|
EXTEND_UP = true,
|
||||||
EXTEND_DOWN = false,
|
EXTEND_DOWN = false,
|
||||||
EXTEND_RIGHT = true,
|
EXTEND_RIGHT = true,
|
||||||
|
@ -210,6 +213,10 @@ protected:
|
||||||
|
|
||||||
void processCloseSkullStomperAttack( int _frames );
|
void processCloseSkullStomperAttack( int _frames );
|
||||||
|
|
||||||
|
// booger monster functions
|
||||||
|
|
||||||
|
void processCloseBoogerMonsterAttack( int _frames );
|
||||||
|
|
||||||
// data
|
// data
|
||||||
|
|
||||||
static NPC_DATA m_data[NPC_UNIT_TYPE_MAX];
|
static NPC_DATA m_data[NPC_UNIT_TYPE_MAX];
|
||||||
|
|
|
@ -129,6 +129,10 @@ SOURCE=..\..\..\source\enemy\nanemone.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
||||||
|
SOURCE=..\..\..\source\enemy\nbooger.cpp
|
||||||
|
# End Source File
|
||||||
|
# Begin Source File
|
||||||
|
|
||||||
SOURCE=..\..\..\source\enemy\nclam.cpp
|
SOURCE=..\..\..\source\enemy\nclam.cpp
|
||||||
# End Source File
|
# End Source File
|
||||||
# Begin Source File
|
# Begin Source File
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue