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-03-05 21:29:44 +00:00
parent 93c3ae5e34
commit 238864c265
3 changed files with 45 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/enemy/npc.cpp
View file

@ -230,6 +230,8 @@ void CNpcEnemy::init()
m_rotation = 0; m_rotation = 0;
m_reversed = false; m_reversed = false;
m_health = m_data[this->m_type].initHealth;
m_extension = EXTEND_RIGHT; m_extension = EXTEND_RIGHT;
Pos.vx = 100; Pos.vx = 100;

2
source/enemy/npc.h
View file

@ -338,6 +338,7 @@ protected:
u16 turnSpeed; u16 turnSpeed;
bool detectCollision; bool detectCollision;
DAMAGE_TYPE damageToUserType; DAMAGE_TYPE damageToUserType;
u16 initHealth;
} }
NPC_DATA; NPC_DATA;
@ -479,6 +480,7 @@ protected:
u8 m_salvoCount; u8 m_salvoCount;
bool m_animPlaying; bool m_animPlaying;
bool m_reversed; bool m_reversed;
s32 m_health;
int m_frame; int m_frame;
int m_animNo; int m_animNo;

41
source/enemy/npcdata.cpp
View file

@ -75,6 +75,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__SQUASH_ENEMY, DAMAGE__SQUASH_ENEMY,
0,
}, },
{ // NPC_FISH_HOOK { // NPC_FISH_HOOK
@ -91,6 +92,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__NONE, DAMAGE__NONE,
0,
}, },
{ // NPC_DUST_DEVIL { // NPC_DUST_DEVIL
@ -107,6 +109,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
2048, 2048,
false, false,
DAMAGE__NONE, DAMAGE__NONE,
0,
}, },
{ // NPC_PENDULUM { // NPC_PENDULUM
@ -123,6 +126,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
2048, 2048,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
0,
}, },
{ // NPC_FIREBALL { // NPC_FIREBALL
@ -139,6 +143,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
2048, 2048,
false, false,
DAMAGE__BURN_ENEMY, DAMAGE__BURN_ENEMY,
0,
}, },
{ // NPC_SAW_BLADE { // NPC_SAW_BLADE
@ -155,6 +160,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
2048, 2048,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
0,
}, },
{ // NPC_LINEAR_PLATFORM { // NPC_LINEAR_PLATFORM
@ -171,6 +177,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__NONE, DAMAGE__NONE,
0,
}, },
{ // NPC_CIRCULAR_PLATFORM { // NPC_CIRCULAR_PLATFORM
@ -187,6 +194,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__NONE, DAMAGE__NONE,
0,
}, },
{ // NPC_SMALL_JELLYFISH_1 { // NPC_SMALL_JELLYFISH_1
@ -203,6 +211,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__SHOCK_ENEMY, DAMAGE__SHOCK_ENEMY,
16,
}, },
{ // NPC_SMALL_JELLYFISH_2 { // NPC_SMALL_JELLYFISH_2
@ -219,6 +228,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__SHOCK_ENEMY, DAMAGE__SHOCK_ENEMY,
32,
}, },
{ // NPC_ANEMONE_1 { // NPC_ANEMONE_1
@ -235,6 +245,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__NONE, DAMAGE__NONE,
16,
}, },
{ // NPC_ANEMONE_2 { // NPC_ANEMONE_2
@ -251,6 +262,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__NONE, DAMAGE__NONE,
32,
}, },
{ // NPC_ANEMONE_3 { // NPC_ANEMONE_3
@ -267,6 +279,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__NONE, DAMAGE__NONE,
48,
}, },
{ // NPC_SKELETAL_FISH { // NPC_SKELETAL_FISH
@ -283,6 +296,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
2048, 2048,
false, false,
DAMAGE__BITE_ENEMY, DAMAGE__BITE_ENEMY,
0,
}, },
{ // NPC_CLAM_JUMP { // NPC_CLAM_JUMP
@ -299,6 +313,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
0,
}, },
{ // NPC_CLAM_STATIC { // NPC_CLAM_STATIC
@ -315,6 +330,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
0,
}, },
{ // NPC_SQUID_DART { // NPC_SQUID_DART
@ -331,6 +347,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
256, 256,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
16,
}, },
{ // NPC_FISH_FOLK { // NPC_FISH_FOLK
@ -347,6 +364,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
2048, 2048,
false, false,
DAMAGE__NONE, DAMAGE__NONE,
0,
}, },
{ // NPC_PRICKLY_BUG { // NPC_PRICKLY_BUG
@ -363,6 +381,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__POISON_ENEMY, DAMAGE__POISON_ENEMY,
48,
}, },
{ // NPC_SEA_SNAKE_1 { // NPC_SEA_SNAKE_1
@ -379,6 +398,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
256, 256,
false, false,
DAMAGE__SHOCK_ENEMY, DAMAGE__SHOCK_ENEMY,
56,
}, },
{ // NPC_SEA_SNAKE_2 { // NPC_SEA_SNAKE_2
@ -395,6 +415,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
256, 256,
false, false,
DAMAGE__SHOCK_ENEMY, DAMAGE__SHOCK_ENEMY,
56,
}, },
{ // NPC_PUFFA_FISH { // NPC_PUFFA_FISH
@ -411,6 +432,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
64,
}, },
{ // NPC_ANGLER_FISH { // NPC_ANGLER_FISH
@ -427,6 +449,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__NONE, DAMAGE__NONE,
0,
}, },
{ // NPC_HERMIT_CRAB { // NPC_HERMIT_CRAB
@ -443,6 +466,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
0,
}, },
{ // NPC_MINE { // NPC_MINE
@ -459,6 +483,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
0,
}, },
{ // NPC_BOOGER_MONSTER { // NPC_BOOGER_MONSTER
@ -475,6 +500,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__BITE_ENEMY, DAMAGE__BITE_ENEMY,
0,
}, },
{ // NPC_SPIDER_CRAB { // NPC_SPIDER_CRAB
@ -491,6 +517,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
2048, 2048,
false, false,
DAMAGE__PINCH_ENEMY, DAMAGE__PINCH_ENEMY,
0,
}, },
{ // NPC_EYEBALL { // NPC_EYEBALL
@ -507,6 +534,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
32,
}, },
{ // NPC_BABY_OCTOPUS { // NPC_BABY_OCTOPUS
@ -523,6 +551,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
512, 512,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
0,
}, },
{ // NPC_ZOMBIE_FISH_FOLK { // NPC_ZOMBIE_FISH_FOLK
@ -539,6 +568,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
2048, 2048,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
16,
}, },
{ // NPC_NINJA_STARFISH { // NPC_NINJA_STARFISH
@ -555,6 +585,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
64, 64,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
16,
}, },
{ // NPC_GHOST { // NPC_GHOST
@ -571,6 +602,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
0,
}, },
{ // NPC_GHOST_PIRATE { // NPC_GHOST_PIRATE
@ -587,6 +619,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
160,
}, },
{ // NPC_FLAMING_SKULL { // NPC_FLAMING_SKULL
@ -603,6 +636,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
128, 128,
false, false,
DAMAGE__BURN_ENEMY, DAMAGE__BURN_ENEMY,
16,
}, },
{ // NPC_SHARK_MAN { // NPC_SHARK_MAN
@ -619,6 +653,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
2048, 2048,
false, false,
DAMAGE__BITE_ENEMY, DAMAGE__BITE_ENEMY,
16,
}, },
{ // NPC_OIL_BLOB { // NPC_OIL_BLOB
@ -635,6 +670,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
64, 64,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
0,
}, },
{ // NPC_SKULL_STOMPER { // NPC_SKULL_STOMPER
@ -651,6 +687,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
2048, 2048,
false, false,
DAMAGE__SQUASH_ENEMY, DAMAGE__SQUASH_ENEMY,
0,
}, },
{ // NPC_MOTHER_JELLYFISH { // NPC_MOTHER_JELLYFISH
@ -667,6 +704,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
256, 256,
false, false,
DAMAGE__SHOCK_ENEMY, DAMAGE__SHOCK_ENEMY,
256,
}, },
{ // NPC_SUB_SHARK { // NPC_SUB_SHARK
@ -683,6 +721,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
64, 64,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
256,
}, },
{ // NPC_FLYING_DUTCHMAN { // NPC_FLYING_DUTCHMAN
@ -699,6 +738,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
256, 256,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
256,
}, },
{ // NPC_IRON_DOGFISH { // NPC_IRON_DOGFISH
@ -715,5 +755,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
2048, 2048,
false, false,
DAMAGE__HIT_ENEMY, DAMAGE__HIT_ENEMY,
256,
}, },
}; };