MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2024-10-16 23:37:06 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added "DUAL_PISTOLS" as new category of optional unused HL2 weapon activities

Browse Source
This commit is contained in:
Blixibon 2022-11-21 00:48:21 -06:00
parent d6f4ea38a2
commit a2e91759e0
3 changed files with 116 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2462,6 +2462,32 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
ADD_ACTIVITY_TO_SR( ACT_IDLE_AIM_SNIPER_RIFLE_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_SNIPER_RIFLE_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_SNIPER_RIFLE_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_IDLE_DUAL_PISTOLS );
ADD_ACTIVITY_TO_SR( ACT_IDLE_ANGRY_DUAL_PISTOLS );
ADD_ACTIVITY_TO_SR( ACT_WALK_DUAL_PISTOLS );
ADD_ACTIVITY_TO_SR( ACT_RUN_DUAL_PISTOLS );
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_DUAL_PISTOLS );
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_DUAL_PISTOLS );
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_DUAL_PISTOLS );
ADD_ACTIVITY_TO_SR( ACT_RELOAD_DUAL_PISTOLS );
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_DUAL_PISTOLS_LOW );
ADD_ACTIVITY_TO_SR( ACT_RELOAD_DUAL_PISTOLS_LOW );
ADD_ACTIVITY_TO_SR( ACT_COVER_DUAL_PISTOLS_LOW );
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_DUAL_PISTOLS_LOW );
ADD_ACTIVITY_TO_SR( ACT_GESTURE_RANGE_ATTACK_DUAL_PISTOLS );
ADD_ACTIVITY_TO_SR( ACT_GESTURE_RELOAD_DUAL_PISTOLS );
ADD_ACTIVITY_TO_SR( ACT_IDLE_DUAL_PISTOLS_RELAXED );
ADD_ACTIVITY_TO_SR( ACT_IDLE_DUAL_PISTOLS_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_WALK_DUAL_PISTOLS_RELAXED );
ADD_ACTIVITY_TO_SR( ACT_RUN_DUAL_PISTOLS_RELAXED );
ADD_ACTIVITY_TO_SR( ACT_WALK_DUAL_PISTOLS_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_RUN_DUAL_PISTOLS_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_IDLE_AIM_DUAL_PISTOLS_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_DUAL_PISTOLS_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_DUAL_PISTOLS_STIMULATED );
#endif
#if EXPANDED_NAVIGATION_ACTIVITIES
@ -2507,6 +2533,8 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_HMG1_MED );
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_SNIPER_RIFLE_MED );
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_SNIPER_RIFLE_MED );
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_DUAL_PISTOLS_MED );
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_DUAL_PISTOLS_MED );
#endif
ADD_ACTIVITY_TO_SR( ACT_COVER_WALL_R );
@ -2620,6 +2648,16 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RANGE_ATTACK2_SNIPER_RIFLE );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RELOAD_SNIPER_RIFLE );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_JUMP_SNIPER_RIFLE );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_IDLE_DUAL_PISTOLS );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_RUN_DUAL_PISTOLS );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_WALK_DUAL_PISTOLS );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_IDLE_CROUCH_DUAL_PISTOLS );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_WALK_CROUCH_DUAL_PISTOLS );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RANGE_ATTACK_DUAL_PISTOLS );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RANGE_ATTACK2_DUAL_PISTOLS );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RELOAD_DUAL_PISTOLS );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_JUMP_DUAL_PISTOLS );
#endif
ADD_ACTIVITY_TO_SR( ACT_HL2MP_IDLE_USE );

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

@ -2578,6 +2578,32 @@ void ActivityList_RegisterSharedActivities( void )
REGISTER_SHARED_ACTIVITY( ACT_IDLE_AIM_SNIPER_RIFLE_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_WALK_AIM_SNIPER_RIFLE_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_RUN_AIM_SNIPER_RIFLE_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_DUAL_PISTOLS );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_ANGRY_DUAL_PISTOLS );
REGISTER_SHARED_ACTIVITY( ACT_WALK_DUAL_PISTOLS );
REGISTER_SHARED_ACTIVITY( ACT_RUN_DUAL_PISTOLS );
REGISTER_SHARED_ACTIVITY( ACT_WALK_AIM_DUAL_PISTOLS );
REGISTER_SHARED_ACTIVITY( ACT_RUN_AIM_DUAL_PISTOLS );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_DUAL_PISTOLS );
REGISTER_SHARED_ACTIVITY( ACT_RELOAD_DUAL_PISTOLS );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_DUAL_PISTOLS_LOW );
REGISTER_SHARED_ACTIVITY( ACT_RELOAD_DUAL_PISTOLS_LOW );
REGISTER_SHARED_ACTIVITY( ACT_COVER_DUAL_PISTOLS_LOW );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_AIM_DUAL_PISTOLS_LOW );
REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RANGE_ATTACK_DUAL_PISTOLS );
REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RELOAD_DUAL_PISTOLS );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_DUAL_PISTOLS_RELAXED );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_DUAL_PISTOLS_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_WALK_DUAL_PISTOLS_RELAXED );
REGISTER_SHARED_ACTIVITY( ACT_RUN_DUAL_PISTOLS_RELAXED );
REGISTER_SHARED_ACTIVITY( ACT_WALK_DUAL_PISTOLS_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_RUN_DUAL_PISTOLS_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_AIM_DUAL_PISTOLS_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_WALK_AIM_DUAL_PISTOLS_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_RUN_AIM_DUAL_PISTOLS_STIMULATED );
#endif
#if EXPANDED_NAVIGATION_ACTIVITIES
@ -2623,6 +2649,8 @@ void ActivityList_RegisterSharedActivities( void )
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 );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_AIM_DUAL_PISTOLS_MED );
REGISTER_SHARED_ACTIVITY( ACT_RANGE_ATTACK_DUAL_PISTOLS_MED );
#endif
REGISTER_SHARED_ACTIVITY( ACT_COVER_WALL_R );
@ -2736,6 +2764,16 @@ void ActivityList_RegisterSharedActivities( void )
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RANGE_ATTACK2_SNIPER_RIFLE );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RELOAD_SNIPER_RIFLE );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_JUMP_SNIPER_RIFLE );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_IDLE_DUAL_PISTOLS );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_RUN_DUAL_PISTOLS );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_WALK_DUAL_PISTOLS );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_IDLE_CROUCH_DUAL_PISTOLS );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_WALK_CROUCH_DUAL_PISTOLS );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RANGE_ATTACK_DUAL_PISTOLS );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RANGE_ATTACK2_DUAL_PISTOLS );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_GESTURE_RELOAD_DUAL_PISTOLS );
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_JUMP_DUAL_PISTOLS );
#endif
REGISTER_SHARED_ACTIVITY( ACT_HL2MP_IDLE_USE );

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

@ -45,7 +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.
// Also includes activity names for "AR3", "SMG3", and "DUAL_PISTOLS", 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
@ -2478,6 +2478,33 @@ typedef enum
ACT_IDLE_AIM_SNIPER_RIFLE_STIMULATED,
ACT_WALK_AIM_SNIPER_RIFLE_STIMULATED,
ACT_RUN_AIM_SNIPER_RIFLE_STIMULATED,
// Dual Pistols
ACT_IDLE_DUAL_PISTOLS,
ACT_IDLE_ANGRY_DUAL_PISTOLS,
ACT_WALK_DUAL_PISTOLS,
ACT_RUN_DUAL_PISTOLS,
ACT_WALK_AIM_DUAL_PISTOLS,
ACT_RUN_AIM_DUAL_PISTOLS,
ACT_RANGE_ATTACK_DUAL_PISTOLS,
ACT_RELOAD_DUAL_PISTOLS,
ACT_RANGE_ATTACK_DUAL_PISTOLS_LOW,
ACT_RELOAD_DUAL_PISTOLS_LOW,
ACT_COVER_DUAL_PISTOLS_LOW,
ACT_RANGE_AIM_DUAL_PISTOLS_LOW,
ACT_GESTURE_RANGE_ATTACK_DUAL_PISTOLS,
ACT_GESTURE_RELOAD_DUAL_PISTOLS,
ACT_IDLE_DUAL_PISTOLS_RELAXED,
ACT_IDLE_DUAL_PISTOLS_STIMULATED,
ACT_WALK_DUAL_PISTOLS_RELAXED,
ACT_RUN_DUAL_PISTOLS_RELAXED,
ACT_WALK_DUAL_PISTOLS_STIMULATED,
ACT_RUN_DUAL_PISTOLS_STIMULATED,
ACT_IDLE_AIM_DUAL_PISTOLS_STIMULATED,
ACT_WALK_AIM_DUAL_PISTOLS_STIMULATED,
ACT_RUN_AIM_DUAL_PISTOLS_STIMULATED,
#endif
#if EXPANDED_NAVIGATION_ACTIVITIES
@ -2525,6 +2552,8 @@ typedef enum
ACT_RANGE_ATTACK_HMG1_MED,
ACT_RANGE_AIM_SNIPER_RIFLE_MED,
ACT_RANGE_ATTACK_SNIPER_RIFLE_MED,
ACT_RANGE_AIM_DUAL_PISTOLS_MED,
ACT_RANGE_ATTACK_DUAL_PISTOLS_MED,
#endif
// Wall Cover (for use in custom cover hints)
@ -2640,6 +2669,16 @@ typedef enum
ACT_HL2MP_GESTURE_RANGE_ATTACK2_SNIPER_RIFLE,
ACT_HL2MP_GESTURE_RELOAD_SNIPER_RIFLE,
ACT_HL2MP_JUMP_SNIPER_RIFLE,
ACT_HL2MP_IDLE_DUAL_PISTOLS,
ACT_HL2MP_RUN_DUAL_PISTOLS,
ACT_HL2MP_WALK_DUAL_PISTOLS,
ACT_HL2MP_IDLE_CROUCH_DUAL_PISTOLS,
ACT_HL2MP_WALK_CROUCH_DUAL_PISTOLS,
ACT_HL2MP_GESTURE_RANGE_ATTACK_DUAL_PISTOLS,
ACT_HL2MP_GESTURE_RANGE_ATTACK2_DUAL_PISTOLS,
ACT_HL2MP_GESTURE_RELOAD_DUAL_PISTOLS,
ACT_HL2MP_JUMP_DUAL_PISTOLS,
#endif
ACT_HL2MP_IDLE_USE,