celisej567/source-sdk-2013
1
0
Fork 0
mirror of https://github.com/celisej567/source-sdk-2013.git synced 2026-09-23 20:09:45 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added new optional weapon activities for AR3, SMG3, and HMG1

Browse Source
This commit is contained in:
Blixibon
2022-04-26 08:34:11 -05:00
parent 32bbb0c231
commit 033fd9662b
3 changed files with 365 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2448,6 +2448,32 @@ void ActivityList_RegisterSharedActivities( void )
REGISTER_SHARED_ACTIVITY( ACT_IDLE_AIM_AR1_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_WALK_AIM_AR1_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_RUN_AIM_AR1_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_ANGRY_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_WALK_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_RUN_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_WALK_AIM_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_RUN_AIM_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_RELOAD_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_AR3_LOW );
REGISTER_SHARED_ACTIVITY( ACT_RELOAD_AR3_LOW );
REGISTER_SHARED_ACTIVITY( ACT_COVER_AR3_LOW );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_AIM_AR3_LOW );
REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RANGE_ATTACK_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RELOAD_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_AR3_RELAXED );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_AR3_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_WALK_AR3_RELAXED );
REGISTER_SHARED_ACTIVITY( ACT_RUN_AR3_RELAXED );
REGISTER_SHARED_ACTIVITY( ACT_WALK_AR3_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_RUN_AR3_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_AIM_AR3_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_WALK_AIM_AR3_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_RUN_AIM_AR3_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_SMG2 );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_ANGRY_SMG2 );
@@ -2475,6 +2501,58 @@ void ActivityList_RegisterSharedActivities( void )
REGISTER_SHARED_ACTIVITY( ACT_WALK_AIM_SMG2_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_RUN_AIM_SMG2_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_ANGRY_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_WALK_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_RUN_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_WALK_AIM_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_RUN_AIM_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_RELOAD_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_SMG3_LOW );
REGISTER_SHARED_ACTIVITY( ACT_RELOAD_SMG3_LOW );
REGISTER_SHARED_ACTIVITY( ACT_COVER_SMG3_LOW );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_AIM_SMG3_LOW );
REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RANGE_ATTACK_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RELOAD_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_SMG3_RELAXED );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_SMG3_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_WALK_SMG3_RELAXED );
REGISTER_SHARED_ACTIVITY( ACT_RUN_SMG3_RELAXED );
REGISTER_SHARED_ACTIVITY( ACT_WALK_SMG3_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_RUN_SMG3_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_AIM_SMG3_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_WALK_AIM_SMG3_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_RUN_AIM_SMG3_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_HMG1 );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_ANGRY_HMG1 );
REGISTER_SHARED_ACTIVITY( ACT_WALK_HMG1 );
REGISTER_SHARED_ACTIVITY( ACT_RUN_HMG1 );
REGISTER_SHARED_ACTIVITY( ACT_WALK_AIM_HMG1 );
REGISTER_SHARED_ACTIVITY( ACT_RUN_AIM_HMG1 );
//REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_HMG1 );
REGISTER_SHARED_ACTIVITY( ACT_RELOAD_HMG1 );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_HMG1_LOW );
REGISTER_SHARED_ACTIVITY( ACT_RELOAD_HMG1_LOW );
REGISTER_SHARED_ACTIVITY( ACT_COVER_HMG1_LOW );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_AIM_HMG1_LOW );
//REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RANGE_ATTACK_HMG1 );
REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RELOAD_HMG1 );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_HMG1_RELAXED );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_HMG1_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_WALK_HMG1_RELAXED );
REGISTER_SHARED_ACTIVITY( ACT_RUN_HMG1_RELAXED );
REGISTER_SHARED_ACTIVITY( ACT_WALK_HMG1_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_RUN_HMG1_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_AIM_HMG1_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_WALK_AIM_HMG1_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_RUN_AIM_HMG1_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_SNIPER_RIFLE );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_ANGRY_SNIPER_RIFLE );
REGISTER_SHARED_ACTIVITY( ACT_WALK_SNIPER_RIFLE );
@@ -2535,8 +2613,14 @@ void ActivityList_RegisterSharedActivities( void )
#if EXPANDED_HL2_UNUSED_WEAPON_ACTIVITIES
REGISTER_SHARED_ACTIVITY( ACT_RANGE_AIM_AR1_MED );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_AR1_MED );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_AIM_AR3_MED );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_AR3_MED );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_AIM_SMG2_MED );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_SMG2_MED );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_AIM_SMG3_MED );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_SMG3_MED );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_AIM_HMG1_MED );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_HMG1_MED );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_AIM_SNIPER_RIFLE_MED );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_SNIPER_RIFLE_MED );
#endif
@@ -2602,6 +2686,16 @@ void ActivityList_RegisterSharedActivities( void )
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RANGE_ATTACK2_AR1 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RELOAD_AR1 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_JUMP_AR1 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_IDLE_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_RUN_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_WALK_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_IDLE_CROUCH_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_WALK_CROUCH_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RANGE_ATTACK_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RANGE_ATTACK2_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RELOAD_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_JUMP_AR3 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_IDLE_SMG2 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_RUN_SMG2 );
@@ -2612,6 +2706,26 @@ void ActivityList_RegisterSharedActivities( void )
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RANGE_ATTACK2_SMG2 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RELOAD_SMG2 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_JUMP_SMG2 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_IDLE_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_RUN_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_WALK_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_IDLE_CROUCH_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_WALK_CROUCH_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RANGE_ATTACK_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RANGE_ATTACK2_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RELOAD_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_JUMP_SMG3 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_IDLE_HMG1 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_RUN_HMG1 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_WALK_HMG1 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_IDLE_CROUCH_HMG1 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_WALK_CROUCH_HMG1 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RANGE_ATTACK_HMG1 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RANGE_ATTACK2_HMG1 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RELOAD_HMG1 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_JUMP_HMG1 );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_IDLE_SNIPER_RIFLE );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_RUN_SNIPER_RIFLE );

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

@@ -45,6 +45,7 @@
// This enables a bunch of new activities for unused Half-Life 2 weapons, particularly those which exist in the SDK, but are deactivated by default.
// This essentially just means mods which restore those weapons have the option of using custom activities for them.
// Mapbase's backup activity system would allow them to fall back to other weapons if the relevant activities do not exist.
// Also includes activity names for the "AR3" and "SMG3", which were never used in HL2, but may be useful when additional animation sets are needed.
#define EXPANDED_HL2_UNUSED_WEAPON_ACTIVITIES 0
// EXPANDED NAVIGATION ACTIVITIES
@@ -2343,6 +2344,33 @@ typedef enum
ACT_WALK_AIM_AR1_STIMULATED,
ACT_RUN_AIM_AR1_STIMULATED,
// AR3 (new)
ACT_IDLE_AR3,
ACT_IDLE_ANGRY_AR3,
ACT_WALK_AR3,
ACT_RUN_AR3,
ACT_WALK_AIM_AR3,
ACT_RUN_AIM_AR3,
ACT_RANGE_ATTACK_AR3,
ACT_RELOAD_AR3,
ACT_RANGE_ATTACK_AR3_LOW,
ACT_RELOAD_AR3_LOW,
ACT_COVER_AR3_LOW,
ACT_RANGE_AIM_AR3_LOW,
ACT_GESTURE_RANGE_ATTACK_AR3,
ACT_GESTURE_RELOAD_AR3,
ACT_IDLE_AR3_RELAXED,
ACT_IDLE_AR3_STIMULATED,
ACT_WALK_AR3_RELAXED,
ACT_RUN_AR3_RELAXED,
ACT_WALK_AR3_STIMULATED,
ACT_RUN_AR3_STIMULATED,
ACT_IDLE_AIM_AR3_STIMULATED,
ACT_WALK_AIM_AR3_STIMULATED,
ACT_RUN_AIM_AR3_STIMULATED,
// SMG2
ACT_IDLE_SMG2,
ACT_IDLE_ANGRY_SMG2,
@@ -2370,6 +2398,60 @@ typedef enum
ACT_WALK_AIM_SMG2_STIMULATED,
ACT_RUN_AIM_SMG2_STIMULATED,
// SMG3 (new)
ACT_IDLE_SMG3,
ACT_IDLE_ANGRY_SMG3,
ACT_WALK_SMG3,
ACT_RUN_SMG3,
ACT_WALK_AIM_SMG3,
ACT_RUN_AIM_SMG3,
ACT_RANGE_ATTACK_SMG3,
ACT_RELOAD_SMG3,
ACT_RANGE_ATTACK_SMG3_LOW,
ACT_RELOAD_SMG3_LOW,
ACT_COVER_SMG3_LOW,
ACT_RANGE_AIM_SMG3_LOW,
ACT_GESTURE_RANGE_ATTACK_SMG3,
ACT_GESTURE_RELOAD_SMG3,
ACT_IDLE_SMG3_RELAXED,
ACT_IDLE_SMG3_STIMULATED,
ACT_WALK_SMG3_RELAXED,
ACT_RUN_SMG3_RELAXED,
ACT_WALK_SMG3_STIMULATED,
ACT_RUN_SMG3_STIMULATED,
ACT_IDLE_AIM_SMG3_STIMULATED,
ACT_WALK_AIM_SMG3_STIMULATED,
ACT_RUN_AIM_SMG3_STIMULATED,
// HMG1
ACT_IDLE_HMG1,
ACT_IDLE_ANGRY_HMG1,
ACT_WALK_HMG1,
ACT_RUN_HMG1,
ACT_WALK_AIM_HMG1,
ACT_RUN_AIM_HMG1,
//ACT_RANGE_ATTACK_HMG1,
ACT_RELOAD_HMG1,
ACT_RANGE_ATTACK_HMG1_LOW,
ACT_RELOAD_HMG1_LOW,
ACT_COVER_HMG1_LOW,
ACT_RANGE_AIM_HMG1_LOW,
//ACT_GESTURE_RANGE_ATTACK_HMG1,
ACT_GESTURE_RELOAD_HMG1,
ACT_IDLE_HMG1_RELAXED,
ACT_IDLE_HMG1_STIMULATED,
ACT_WALK_HMG1_RELAXED,
ACT_RUN_HMG1_RELAXED,
ACT_WALK_HMG1_STIMULATED,
ACT_RUN_HMG1_STIMULATED,
ACT_IDLE_AIM_HMG1_STIMULATED,
ACT_WALK_AIM_HMG1_STIMULATED,
ACT_RUN_AIM_HMG1_STIMULATED,
// Sniper Rifle
ACT_IDLE_SNIPER_RIFLE,
ACT_IDLE_ANGRY_SNIPER_RIFLE,
@@ -2433,8 +2515,14 @@ typedef enum
// MED activities for unused weapons
ACT_RANGE_AIM_AR1_MED,
ACT_RANGE_ATTACK_AR1_MED,
ACT_RANGE_AIM_AR3_MED,
ACT_RANGE_ATTACK_AR3_MED,
ACT_RANGE_AIM_SMG2_MED,
ACT_RANGE_ATTACK_SMG2_MED,
ACT_RANGE_AIM_SMG3_MED,
ACT_RANGE_ATTACK_SMG3_MED,
ACT_RANGE_AIM_HMG1_MED,
ACT_RANGE_ATTACK_HMG1_MED,
ACT_RANGE_AIM_SNIPER_RIFLE_MED,
ACT_RANGE_ATTACK_SNIPER_RIFLE_MED,
#endif
@@ -2503,6 +2591,16 @@ typedef enum
ACT_HL2MP_GESTURE_RELOAD_AR1,
ACT_HL2MP_JUMP_AR1,
ACT_HL2MP_IDLE_AR3,
ACT_HL2MP_RUN_AR3,
ACT_HL2MP_WALK_AR3,
ACT_HL2MP_IDLE_CROUCH_AR3,
ACT_HL2MP_WALK_CROUCH_AR3,
ACT_HL2MP_GESTURE_RANGE_ATTACK_AR3,
ACT_HL2MP_GESTURE_RANGE_ATTACK2_AR3,
ACT_HL2MP_GESTURE_RELOAD_AR3,
ACT_HL2MP_JUMP_AR3,
ACT_HL2MP_IDLE_SMG2,
ACT_HL2MP_RUN_SMG2,
ACT_HL2MP_WALK_SMG2,
@@ -2513,6 +2611,26 @@ typedef enum
ACT_HL2MP_GESTURE_RELOAD_SMG2,
ACT_HL2MP_JUMP_SMG2,
ACT_HL2MP_IDLE_SMG3,
ACT_HL2MP_RUN_SMG3,
ACT_HL2MP_WALK_SMG3,
ACT_HL2MP_IDLE_CROUCH_SMG3,
ACT_HL2MP_WALK_CROUCH_SMG3,
ACT_HL2MP_GESTURE_RANGE_ATTACK_SMG3,
ACT_HL2MP_GESTURE_RANGE_ATTACK2_SMG3,
ACT_HL2MP_GESTURE_RELOAD_SMG3,
ACT_HL2MP_JUMP_SMG3,
ACT_HL2MP_IDLE_HMG1,
ACT_HL2MP_RUN_HMG1,
ACT_HL2MP_WALK_HMG1,
ACT_HL2MP_IDLE_CROUCH_HMG1,
ACT_HL2MP_WALK_CROUCH_HMG1,
ACT_HL2MP_GESTURE_RANGE_ATTACK_HMG1,
ACT_HL2MP_GESTURE_RANGE_ATTACK2_HMG1,
ACT_HL2MP_GESTURE_RELOAD_HMG1,
ACT_HL2MP_JUMP_HMG1,
ACT_HL2MP_IDLE_SNIPER_RIFLE,
ACT_HL2MP_RUN_SNIPER_RIFLE,
ACT_HL2MP_WALK_SNIPER_RIFLE,