MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2024-12-26 23:05:30 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added proper NPC melee activities

Browse Source
This commit is contained in:
Blixibon 2021-11-05 22:13:53 -05:00
parent 276d9ff24f
commit 67d5d8b20c
5 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sp/src/game/server/ai_activity.cpp
View File

@ -2272,6 +2272,9 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_RPG_LOW ); ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_RPG_LOW );
ADD_ACTIVITY_TO_SR( ACT_GESTURE_RANGE_ATTACK_RPG ); ADD_ACTIVITY_TO_SR( ACT_GESTURE_RANGE_ATTACK_RPG );
ADD_ACTIVITY_TO_SR( ACT_WALK_MELEE );
ADD_ACTIVITY_TO_SR( ACT_RUN_MELEE );
ADD_ACTIVITY_TO_SR( ACT_RUN_PACKAGE ); ADD_ACTIVITY_TO_SR( ACT_RUN_PACKAGE );
ADD_ACTIVITY_TO_SR( ACT_RUN_SUITCASE ); ADD_ACTIVITY_TO_SR( ACT_RUN_SUITCASE );

5
sp/src/game/server/hl2/weapon_crowbar.cpp
View File

@ -43,9 +43,8 @@ acttable_t CWeaponCrowbar::m_acttable[] =
{ ACT_IDLE, ACT_IDLE_ANGRY_MELEE, false }, { ACT_IDLE, ACT_IDLE_ANGRY_MELEE, false },
{ ACT_IDLE_ANGRY, ACT_IDLE_ANGRY_MELEE, false }, { ACT_IDLE_ANGRY, ACT_IDLE_ANGRY_MELEE, false },
#ifdef EXPANDED_HL2_WEAPON_ACTIVITIES #ifdef EXPANDED_HL2_WEAPON_ACTIVITIES
// Just so we don't have to implement more activities, re-use the MP acts { ACT_RUN, ACT_RUN_MELEE, false },
{ ACT_RUN, ACT_MP_RUN_MELEE, false }, { ACT_WALK, ACT_WALK_MELEE, false },
{ ACT_WALK, ACT_MP_WALK_MELEE, false },
{ ACT_ARM, ACT_ARM_MELEE, false }, { ACT_ARM, ACT_ARM_MELEE, false },
{ ACT_DISARM, ACT_DISARM_MELEE, false }, { ACT_DISARM, ACT_DISARM_MELEE, false },

3
sp/src/game/shared/activitylist.cpp
View File

@ -2388,6 +2388,9 @@ void ActivityList_RegisterSharedActivities( void )
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_RPG_LOW ); REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_RPG_LOW );
REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RANGE_ATTACK_RPG ); REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RANGE_ATTACK_RPG );
REGISTER_SHARED_ACTIVITY( ACT_WALK_MELEE );
REGISTER_SHARED_ACTIVITY( ACT_RUN_MELEE );
REGISTER_SHARED_ACTIVITY( ACT_RUN_PACKAGE ); REGISTER_SHARED_ACTIVITY( ACT_RUN_PACKAGE );
REGISTER_SHARED_ACTIVITY( ACT_RUN_SUITCASE ); REGISTER_SHARED_ACTIVITY( ACT_RUN_SUITCASE );

4
sp/src/game/shared/ai_activity.h
View File

@ -2267,6 +2267,10 @@ typedef enum
ACT_RANGE_ATTACK_RPG_LOW, ACT_RANGE_ATTACK_RPG_LOW,
ACT_GESTURE_RANGE_ATTACK_RPG, ACT_GESTURE_RANGE_ATTACK_RPG,
// Melee
ACT_WALK_MELEE,
ACT_RUN_MELEE,
// Citizen accessories // Citizen accessories
ACT_RUN_PACKAGE, ACT_RUN_PACKAGE,
ACT_RUN_SUITCASE, ACT_RUN_SUITCASE,

7
sp/src/game/shared/hl2mp/weapon_stunstick.cpp
View File

@ -82,10 +82,9 @@ acttable_t CWeaponStunStick::m_acttable[] =
{ ACT_MELEE_ATTACK1, ACT_MELEE_ATTACK_SWING, true }, { ACT_MELEE_ATTACK1, ACT_MELEE_ATTACK_SWING, true },
{ ACT_IDLE_ANGRY, ACT_IDLE_ANGRY_MELEE, true }, { ACT_IDLE_ANGRY, ACT_IDLE_ANGRY_MELEE, true },
#ifdef EXPANDED_HL2_WEAPON_ACTIVITIES #ifdef EXPANDED_HL2_WEAPON_ACTIVITIES
// Just so we don't have to implement more activities, re-use the MP acts { ACT_IDLE, ACT_IDLE_MELEE, false },
{ ACT_IDLE, ACT_MP_STAND_MELEE, false }, { ACT_RUN, ACT_RUN_MELEE, false },
{ ACT_RUN, ACT_MP_RUN_MELEE, false }, { ACT_WALK, ACT_WALK_MELEE, false },
{ ACT_WALK, ACT_MP_WALK_MELEE, false },
#endif #endif
}; };