This commit is contained in:
parent
796aeddca7
commit
bc760c2dd3
15 changed files with 447 additions and 367 deletions
|
@ -334,7 +334,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -358,7 +357,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -382,7 +380,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -406,7 +403,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -430,7 +426,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -454,7 +449,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -463,10 +457,10 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
ACTORS_JELLYFISH1_SBK,
|
||||
ANIM_JELLYFISH1_IDLE,
|
||||
NPC_INIT_DEFAULT,
|
||||
NPC_SENSOR_JELLYFISH_USER_CLOSE,
|
||||
NPC_SENSOR_USER_CLOSE,
|
||||
NPC_MOVEMENT_FIXED_PATH,
|
||||
NPC_MOVEMENT_MODIFIER_JELLYFISH,
|
||||
NPC_CLOSE_JELLYFISH_EVADE,
|
||||
NPC_MOVEMENT_MODIFIER_NONE,
|
||||
NPC_CLOSE_NONE,
|
||||
NPC_TIMER_NONE,
|
||||
false,
|
||||
2,
|
||||
|
@ -478,7 +472,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
ANIM_JELLYFISH1_SWIM,
|
||||
NPC_COLLISION_GENERIC,
|
||||
true,
|
||||
true,
|
||||
},
|
||||
|
@ -487,10 +480,10 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
ACTORS_CLAM_SBK,
|
||||
ANIM_CLAM_SIDESNAP,
|
||||
NPC_INIT_DEFAULT,
|
||||
NPC_SENSOR_JELLYFISH_USER_CLOSE,
|
||||
NPC_SENSOR_USER_CLOSE,
|
||||
NPC_MOVEMENT_FIXED_PATH,
|
||||
NPC_MOVEMENT_MODIFIER_JELLYFISH,
|
||||
NPC_CLOSE_JELLYFISH_EVADE,
|
||||
NPC_MOVEMENT_MODIFIER_NONE,
|
||||
NPC_CLOSE_NONE,
|
||||
NPC_TIMER_NONE,
|
||||
false,
|
||||
3,
|
||||
|
@ -502,7 +495,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
true,
|
||||
},
|
||||
|
@ -511,7 +503,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
ACTORS_ANENOMELVL1_SBK,
|
||||
ANIM_ANENOMELVL1_BEND,
|
||||
NPC_INIT_DEFAULT,
|
||||
NPC_SENSOR_ANEMONE_USER_CLOSE,
|
||||
NPC_SENSOR_USER_CLOSE,
|
||||
NPC_MOVEMENT_STATIC_CYCLE_ANIM,
|
||||
NPC_MOVEMENT_MODIFIER_NONE,
|
||||
NPC_CLOSE_ANEMONE_1_ATTACK,
|
||||
|
@ -526,7 +518,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -535,7 +526,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
ACTORS_SPIKEYANENOME_SBK,
|
||||
ANIM_SPIKEYANENOME_BODY,
|
||||
NPC_INIT_ANEMONE_2,
|
||||
NPC_SENSOR_ANEMONE_USER_CLOSE,
|
||||
NPC_SENSOR_USER_CLOSE,
|
||||
NPC_MOVEMENT_STATIC_CYCLE_ANIM,
|
||||
NPC_MOVEMENT_MODIFIER_NONE,
|
||||
NPC_CLOSE_ANEMONE_2_ATTACK,
|
||||
|
@ -550,7 +541,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -559,7 +549,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
ACTORS_ANENOMELVL3_SBK,
|
||||
ANIM_ANENOMELVL3_BEND,
|
||||
NPC_INIT_DEFAULT,
|
||||
NPC_SENSOR_ANEMONE_USER_CLOSE,
|
||||
NPC_SENSOR_USER_CLOSE,
|
||||
NPC_MOVEMENT_STATIC_CYCLE_ANIM,
|
||||
NPC_MOVEMENT_MODIFIER_NONE,
|
||||
NPC_CLOSE_ANEMONE_3_ATTACK,
|
||||
|
@ -574,7 +564,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -598,7 +587,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
ANIM_SKELETALFISH_DIE,
|
||||
ANIM_SKELETALFISH_GETHIT,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -622,7 +610,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -646,7 +633,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -670,7 +656,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -694,7 +679,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -718,7 +702,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
ANIM_CATERPILLAR_DIE,
|
||||
ANIM_CATERPILLAR_GETHIT,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -742,7 +725,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -766,7 +748,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -790,7 +771,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -799,7 +779,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
ACTORS_HERMITCRAB_SBK,
|
||||
ANIM_HERMITCRAB_IDLE,
|
||||
NPC_INIT_HERMIT_CRAB,
|
||||
NPC_SENSOR_HERMIT_CRAB_USER_CLOSE,
|
||||
NPC_SENSOR_USER_CLOSE,
|
||||
NPC_MOVEMENT_FIXED_PATH_WALK,
|
||||
NPC_MOVEMENT_MODIFIER_NONE,
|
||||
NPC_CLOSE_HERMIT_CRAB_ATTACK,
|
||||
|
@ -814,7 +794,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
ANIM_HERMITCRAB_DIE,
|
||||
ANIM_HERMITCRAB_GETHIT,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -838,7 +817,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -862,7 +840,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -871,10 +848,10 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
ACTORS_SPIDERCRAB_SBK,
|
||||
ANIM_SPIDERCRAB_IDLE,
|
||||
NPC_INIT_SPIDER_CRAB,
|
||||
NPC_SENSOR_SPIDER_CRAB_USER_CLOSE,
|
||||
NPC_SENSOR_USER_CLOSE,
|
||||
NPC_MOVEMENT_FIXED_PATH_WALK,
|
||||
NPC_MOVEMENT_MODIFIER_NONE,
|
||||
NPC_CLOSE_SPIDER_CRAB_ATTACK,
|
||||
NPC_CLOSE_NONE,
|
||||
NPC_TIMER_NONE,
|
||||
false,
|
||||
3,
|
||||
|
@ -886,7 +863,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
ANIM_SPIDERCRAB_DIE,
|
||||
ANIM_SPIDERCRAB_HIT,
|
||||
NPC_COLLISION_SPIDER_CRAB_BITE,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -896,7 +872,7 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
ANIM_SPIDERCRAB_IDLE,
|
||||
NPC_INIT_DEFAULT,
|
||||
NPC_SENSOR_NONE,
|
||||
NPC_MOVEMENT_SPIDER_CRAB_SPAWNER,
|
||||
NPC_MOVEMENT_STATIC,
|
||||
NPC_MOVEMENT_MODIFIER_NONE,
|
||||
NPC_CLOSE_NONE,
|
||||
NPC_TIMER_NONE,
|
||||
|
@ -910,7 +886,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_NONE,
|
||||
ANIM_SPIDERCRAB_DIE,
|
||||
ANIM_SPIDERCRAB_HIT,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -934,7 +909,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -958,7 +932,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
ANIM_BABYOCTOPUS_DIE,
|
||||
ANIM_BABYOCTOPUS_HIT,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -982,7 +955,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -1006,7 +978,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -1030,7 +1001,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -1054,7 +1024,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -1078,7 +1047,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -1102,7 +1070,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
ANIM_SHARKMAN_DIE,
|
||||
ANIM_SHARKMAN_BLOCK,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -1126,7 +1093,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -1150,7 +1116,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -1174,7 +1139,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -1198,7 +1162,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -1222,7 +1185,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -1246,7 +1208,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
ANIM_FLYINGDUTCHMAN_GETHIT,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -1270,7 +1231,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
ANIM_IRONDOGFISH_GETHIT,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -1294,7 +1254,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
@ -1318,7 +1277,6 @@ CNpcEnemy::NPC_DATA CNpcEnemy::m_data[NPC_UNIT_TYPE_MAX] =
|
|||
NPC_SHOT_GENERIC,
|
||||
0,
|
||||
0,
|
||||
NPC_COLLISION_GENERIC,
|
||||
false,
|
||||
false,
|
||||
},
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue