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

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

View File

@@ -2332,6 +2332,32 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
ADD_ACTIVITY_TO_SR( ACT_IDLE_AIM_AR1_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_AR1_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_AR1_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_IDLE_AR3 );
ADD_ACTIVITY_TO_SR( ACT_IDLE_ANGRY_AR3 );
ADD_ACTIVITY_TO_SR( ACT_WALK_AR3 );
ADD_ACTIVITY_TO_SR( ACT_RUN_AR3 );
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_AR3 );
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_AR3 );
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_AR3 );
ADD_ACTIVITY_TO_SR( ACT_RELOAD_AR3 );
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_AR3_LOW );
ADD_ACTIVITY_TO_SR( ACT_RELOAD_AR3_LOW );
ADD_ACTIVITY_TO_SR( ACT_COVER_AR3_LOW );
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_AR3_LOW );
ADD_ACTIVITY_TO_SR( ACT_GESTURE_RANGE_ATTACK_AR3 );
ADD_ACTIVITY_TO_SR( ACT_GESTURE_RELOAD_AR3 );
ADD_ACTIVITY_TO_SR( ACT_IDLE_AR3_RELAXED );
ADD_ACTIVITY_TO_SR( ACT_IDLE_AR3_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_WALK_AR3_RELAXED );
ADD_ACTIVITY_TO_SR( ACT_RUN_AR3_RELAXED );
ADD_ACTIVITY_TO_SR( ACT_WALK_AR3_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_RUN_AR3_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_IDLE_AIM_AR3_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_AR3_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_AR3_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_IDLE_SMG2 );
ADD_ACTIVITY_TO_SR( ACT_IDLE_ANGRY_SMG2 );
@@ -2358,6 +2384,58 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
ADD_ACTIVITY_TO_SR( ACT_IDLE_AIM_SMG2_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_SMG2_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_SMG2_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_IDLE_SMG3 );
ADD_ACTIVITY_TO_SR( ACT_IDLE_ANGRY_SMG3 );
ADD_ACTIVITY_TO_SR( ACT_WALK_SMG3 );
ADD_ACTIVITY_TO_SR( ACT_RUN_SMG3 );
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_SMG3 );
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_SMG3 );
//ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_SMG3 );
ADD_ACTIVITY_TO_SR( ACT_RELOAD_SMG3 );
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_SMG3_LOW );
ADD_ACTIVITY_TO_SR( ACT_RELOAD_SMG3_LOW );
ADD_ACTIVITY_TO_SR( ACT_COVER_SMG3_LOW );
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_SMG3_LOW );
//ADD_ACTIVITY_TO_SR( ACT_GESTURE_RANGE_ATTACK_SMG3 );
ADD_ACTIVITY_TO_SR( ACT_GESTURE_RELOAD_SMG3 );
ADD_ACTIVITY_TO_SR( ACT_IDLE_SMG3_RELAXED );
ADD_ACTIVITY_TO_SR( ACT_IDLE_SMG3_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_WALK_SMG3_RELAXED );
ADD_ACTIVITY_TO_SR( ACT_RUN_SMG3_RELAXED );
ADD_ACTIVITY_TO_SR( ACT_WALK_SMG3_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_RUN_SMG3_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_IDLE_AIM_SMG3_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_SMG3_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_SMG3_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_IDLE_HMG1 );
ADD_ACTIVITY_TO_SR( ACT_IDLE_ANGRY_HMG1 );
ADD_ACTIVITY_TO_SR( ACT_WALK_HMG1 );
ADD_ACTIVITY_TO_SR( ACT_RUN_HMG1 );
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_HMG1 );
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_HMG1 );
//ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_HMG1 );
ADD_ACTIVITY_TO_SR( ACT_RELOAD_HMG1 );
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_HMG1_LOW );
ADD_ACTIVITY_TO_SR( ACT_RELOAD_HMG1_LOW );
ADD_ACTIVITY_TO_SR( ACT_COVER_HMG1_LOW );
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_HMG1_LOW );
//ADD_ACTIVITY_TO_SR( ACT_GESTURE_RANGE_ATTACK_HMG1 );
ADD_ACTIVITY_TO_SR( ACT_GESTURE_RELOAD_HMG1 );
ADD_ACTIVITY_TO_SR( ACT_IDLE_HMG1_RELAXED );
ADD_ACTIVITY_TO_SR( ACT_IDLE_HMG1_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_WALK_HMG1_RELAXED );
ADD_ACTIVITY_TO_SR( ACT_RUN_HMG1_RELAXED );
ADD_ACTIVITY_TO_SR( ACT_WALK_HMG1_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_RUN_HMG1_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_IDLE_AIM_HMG1_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_HMG1_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_HMG1_STIMULATED );
ADD_ACTIVITY_TO_SR( ACT_IDLE_SNIPER_RIFLE );
ADD_ACTIVITY_TO_SR( ACT_IDLE_ANGRY_SNIPER_RIFLE );
@@ -2419,8 +2497,14 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
#if EXPANDED_HL2_UNUSED_WEAPON_ACTIVITIES
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_AR1_MED );
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_AR1_MED );
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_AR3_MED );
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_AR3_MED );
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_SMG2_MED );
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_SMG2_MED );
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_SMG3_MED );
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_SMG3_MED );
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_HMG1_MED );
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 );
#endif
@@ -2486,6 +2570,16 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RANGE_ATTACK2_AR1 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RELOAD_AR1 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_JUMP_AR1 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_IDLE_AR3 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_RUN_AR3 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_WALK_AR3 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_IDLE_CROUCH_AR3 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_WALK_CROUCH_AR3 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RANGE_ATTACK_AR3 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RANGE_ATTACK2_AR3 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RELOAD_AR3 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_JUMP_AR3 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_IDLE_SMG2 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_RUN_SMG2 );
@@ -2496,6 +2590,26 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RANGE_ATTACK2_SMG2 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RELOAD_SMG2 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_JUMP_SMG2 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_IDLE_SMG3 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_RUN_SMG3 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_WALK_SMG3 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_IDLE_CROUCH_SMG3 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_WALK_CROUCH_SMG3 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RANGE_ATTACK_SMG3 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RANGE_ATTACK2_SMG3 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RELOAD_SMG3 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_JUMP_SMG3 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_IDLE_HMG1 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_RUN_HMG1 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_WALK_HMG1 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_IDLE_CROUCH_HMG1 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_WALK_CROUCH_HMG1 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RANGE_ATTACK_HMG1 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RANGE_ATTACK2_HMG1 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_GESTURE_RELOAD_HMG1 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_JUMP_HMG1 );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_IDLE_SNIPER_RIFLE );
ADD_ACTIVITY_TO_SR( ACT_HL2MP_RUN_SNIPER_RIFLE );
@@ -2614,11 +2728,16 @@ CAI_BaseNPC::actlink_t CAI_BaseNPC::gm_ActivityGestureLinks[] =
#if EXPANDED_HL2_UNUSED_WEAPON_ACTIVITIES
{ ACT_RANGE_ATTACK_AR1, ACT_GESTURE_RANGE_ATTACK_AR1 },
{ ACT_RANGE_ATTACK_AR1_LOW, ACT_GESTURE_RANGE_ATTACK_AR1 },
{ ACT_RANGE_ATTACK_AR3, ACT_GESTURE_RANGE_ATTACK_AR3 },
{ ACT_RANGE_ATTACK_AR3_LOW, ACT_GESTURE_RANGE_ATTACK_AR3 },
{ ACT_RANGE_ATTACK_AR2_GRENADE, ACT_GESTURE_RANGE_ATTACK_AR2_GRENADE },
{ ACT_RANGE_ATTACK_HMG1, ACT_GESTURE_RANGE_ATTACK_HMG1 },
{ ACT_RANGE_ATTACK_HMG1_LOW, ACT_GESTURE_RANGE_ATTACK_HMG1 },
{ ACT_RANGE_ATTACK_ML, ACT_GESTURE_RANGE_ATTACK_ML },
{ ACT_RANGE_ATTACK_SMG2, ACT_GESTURE_RANGE_ATTACK_SMG2 },
{ ACT_RANGE_ATTACK_SMG2_LOW, ACT_GESTURE_RANGE_ATTACK_SMG2 },
{ ACT_RANGE_ATTACK_SMG3, ACT_GESTURE_RANGE_ATTACK_SMG3 },
{ ACT_RANGE_ATTACK_SMG3_LOW, ACT_GESTURE_RANGE_ATTACK_SMG3 },
{ ACT_RANGE_ATTACK_SLAM, ACT_GESTURE_RANGE_ATTACK_SLAM },
{ ACT_RANGE_ATTACK_TRIPWIRE, ACT_GESTURE_RANGE_ATTACK_TRIPWIRE },
{ ACT_RANGE_ATTACK_THROW, ACT_GESTURE_RANGE_ATTACK_THROW },
@@ -2627,8 +2746,14 @@ CAI_BaseNPC::actlink_t CAI_BaseNPC::gm_ActivityGestureLinks[] =
{ ACT_RELOAD_AR1, ACT_GESTURE_RELOAD_AR1 },
{ ACT_RELOAD_AR1_LOW, ACT_GESTURE_RELOAD_AR1 },
{ ACT_RELOAD_AR3, ACT_GESTURE_RELOAD_AR3 },
{ ACT_RELOAD_AR3_LOW, ACT_GESTURE_RELOAD_AR3 },
{ ACT_RELOAD_SMG2, ACT_GESTURE_RELOAD_SMG2 },
{ ACT_RELOAD_SMG2_LOW, ACT_GESTURE_RELOAD_SMG2 },
{ ACT_RELOAD_SMG3, ACT_GESTURE_RELOAD_SMG3 },
{ ACT_RELOAD_SMG3_LOW, ACT_GESTURE_RELOAD_SMG3 },
{ ACT_RELOAD_HMG1, ACT_GESTURE_RELOAD_HMG1 },
{ ACT_RELOAD_HMG1_LOW, ACT_GESTURE_RELOAD_HMG1 },
{ ACT_RELOAD_SNIPER_RIFLE, ACT_GESTURE_RELOAD_SNIPER_RIFLE },
{ ACT_RELOAD_SNIPER_RIFLE_LOW, ACT_GESTURE_RELOAD_SNIPER_RIFLE },
#endif
@@ -2646,6 +2771,14 @@ CAI_BaseNPC::actlink_t CAI_BaseNPC::gm_ActivityGestureLinks[] =
{ ACT_RANGE_ATTACK_REVOLVER_MED, ACT_GESTURE_RANGE_ATTACK_REVOLVER },
{ ACT_RANGE_ATTACK_CROSSBOW_MED, ACT_GESTURE_RANGE_ATTACK_CROSSBOW },
#endif
#if EXPANDED_HL2_UNUSED_WEAPON_ACTIVITIES
{ ACT_RANGE_ATTACK_AR1_MED, ACT_GESTURE_RANGE_ATTACK_AR1 },
{ ACT_RANGE_ATTACK_AR3_MED, ACT_GESTURE_RANGE_ATTACK_AR3 },
{ ACT_RANGE_ATTACK_SMG2_MED, ACT_GESTURE_RANGE_ATTACK_SMG2 },
{ ACT_RANGE_ATTACK_SMG3_MED, ACT_GESTURE_RANGE_ATTACK_SMG3 },
{ ACT_RANGE_ATTACK_HMG1_MED, ACT_GESTURE_RANGE_ATTACK_HMG1 },
{ ACT_RANGE_ATTACK_SNIPER_RIFLE_MED, ACT_GESTURE_RANGE_ATTACK_SNIPER_RIFLE },
#endif
#endif
};