Skip to content

Commit c4c0648

Browse files
BitlBitl
committed
1 parent dfd0d06 commit c4c0648

File tree

5 files changed

+117
-47
lines changed

5 files changed

+117
-47
lines changed

‎sp/src/game/server/ai_activity.cpp

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -507,6 +507,29 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
507507
ADD_ACTIVITY_TO_SR( ACT_WALK_RPG_RELAXED );
508508
ADD_ACTIVITY_TO_SR( ACT_RUN_RPG_RELAXED );
509509

510+
//AR2 activities
511+
ADD_ACTIVITY_TO_SR(ACT_COMBINE_AR2_ALTFIRE);
512+
ADD_ACTIVITY_TO_SR(ACT_IDLE_AR2);
513+
ADD_ACTIVITY_TO_SR(ACT_IDLE_ANGRY_AR2);
514+
ADD_ACTIVITY_TO_SR(ACT_IDLE_AR2_RELAXED);
515+
ADD_ACTIVITY_TO_SR(ACT_IDLE_AR2_STIMULATED);
516+
ADD_ACTIVITY_TO_SR(ACT_WALK_AR2_RELAXED);
517+
ADD_ACTIVITY_TO_SR(ACT_RUN_AR2_RELAXED);
518+
ADD_ACTIVITY_TO_SR(ACT_WALK_AR2_STIMULATED);
519+
ADD_ACTIVITY_TO_SR(ACT_RUN_AR2_STIMULATED);
520+
ADD_ACTIVITY_TO_SR(ACT_IDLE_AIM_AR2_STIMULATED);
521+
ADD_ACTIVITY_TO_SR(ACT_WALK_AIM_AR2_STIMULATED);
522+
ADD_ACTIVITY_TO_SR(ACT_RUN_AIM_AR2_STIMULATED);
523+
ADD_ACTIVITY_TO_SR(ACT_WALK_AR2);
524+
ADD_ACTIVITY_TO_SR(ACT_WALK_AIM_AR2);
525+
ADD_ACTIVITY_TO_SR(ACT_WALK_CROUCH_AR2);
526+
ADD_ACTIVITY_TO_SR(ACT_WALK_CROUCH_AIM_AR2);
527+
ADD_ACTIVITY_TO_SR(ACT_RUN_AR2);
528+
ADD_ACTIVITY_TO_SR(ACT_RUN_AIM_AR2);
529+
ADD_ACTIVITY_TO_SR(ACT_RELOAD_AR2);
530+
ADD_ACTIVITY_TO_SR(ACT_RELOAD_AR2_LOW);
531+
ADD_ACTIVITY_TO_SR(ACT_GESTURE_RELOAD_AR2);
532+
510533
ADD_ACTIVITY_TO_SR( ACT_WALK_RIFLE );
511534
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_RIFLE );
512535
ADD_ACTIVITY_TO_SR( ACT_WALK_CROUCH_RIFLE );

‎sp/src/game/server/hl2/npc_combine.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ int COMBINE_AE_ALTFIRE;
9696
Activity ACT_COMBINE_THROW_GRENADE;
9797
Activity ACT_COMBINE_LAUNCH_GRENADE;
9898
Activity ACT_COMBINE_BUGBAIT;
99-
Activity ACT_COMBINE_AR2_ALTFIRE;
10099
Activity ACT_WALK_EASY;
101100
Activity ACT_WALK_MARCH;
102101

@@ -4118,7 +4117,6 @@ DECLARE_TASK( TASK_COMBINE_SET_STANDING )
41184117
DECLARE_ACTIVITY( ACT_COMBINE_THROW_GRENADE )
41194118
DECLARE_ACTIVITY( ACT_COMBINE_LAUNCH_GRENADE )
41204119
DECLARE_ACTIVITY( ACT_COMBINE_BUGBAIT )
4121-
DECLARE_ACTIVITY( ACT_COMBINE_AR2_ALTFIRE )
41224120
DECLARE_ACTIVITY( ACT_WALK_EASY )
41234121
DECLARE_ACTIVITY( ACT_WALK_MARCH )
41244122

‎sp/src/game/server/hl2/weapon_ar2.cpp

Lines changed: 48 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -62,52 +62,55 @@ PRECACHE_WEAPON_REGISTER(weapon_ar2);
6262
acttable_t CWeaponAR2::m_acttable[] =
6363
{
6464
{ ACT_RANGE_ATTACK1, ACT_RANGE_ATTACK_AR2, true },
65-
{ ACT_RELOAD, ACT_RELOAD_SMG1, true }, // FIXME: hook to AR2 unique
66-
{ ACT_IDLE, ACT_IDLE_SMG1, true }, // FIXME: hook to AR2 unique
67-
{ ACT_IDLE_ANGRY, ACT_IDLE_ANGRY_SMG1, true }, // FIXME: hook to AR2 unique
68-
69-
{ ACT_WALK, ACT_WALK_RIFLE, true },
70-
71-
// Readiness activities (not aiming)
72-
{ ACT_IDLE_RELAXED, ACT_IDLE_SMG1_RELAXED, false },//never aims
73-
{ ACT_IDLE_STIMULATED, ACT_IDLE_SMG1_STIMULATED, false },
74-
{ ACT_IDLE_AGITATED, ACT_IDLE_ANGRY_SMG1, false },//always aims
75-
76-
{ ACT_WALK_RELAXED, ACT_WALK_RIFLE_RELAXED, false },//never aims
77-
{ ACT_WALK_STIMULATED, ACT_WALK_RIFLE_STIMULATED, false },
78-
{ ACT_WALK_AGITATED, ACT_WALK_AIM_RIFLE, false },//always aims
79-
80-
{ ACT_RUN_RELAXED, ACT_RUN_RIFLE_RELAXED, false },//never aims
81-
{ ACT_RUN_STIMULATED, ACT_RUN_RIFLE_STIMULATED, false },
82-
{ ACT_RUN_AGITATED, ACT_RUN_AIM_RIFLE, false },//always aims
83-
84-
// Readiness activities (aiming)
85-
{ ACT_IDLE_AIM_RELAXED, ACT_IDLE_SMG1_RELAXED, false },//never aims
86-
{ ACT_IDLE_AIM_STIMULATED, ACT_IDLE_AIM_RIFLE_STIMULATED, false },
87-
{ ACT_IDLE_AIM_AGITATED, ACT_IDLE_ANGRY_SMG1, false },//always aims
88-
89-
{ ACT_WALK_AIM_RELAXED, ACT_WALK_RIFLE_RELAXED, false },//never aims
90-
{ ACT_WALK_AIM_STIMULATED, ACT_WALK_AIM_RIFLE_STIMULATED, false },
91-
{ ACT_WALK_AIM_AGITATED, ACT_WALK_AIM_RIFLE, false },//always aims
92-
93-
{ ACT_RUN_AIM_RELAXED, ACT_RUN_RIFLE_RELAXED, false },//never aims
94-
{ ACT_RUN_AIM_STIMULATED, ACT_RUN_AIM_RIFLE_STIMULATED, false },
95-
{ ACT_RUN_AIM_AGITATED, ACT_RUN_AIM_RIFLE, false },//always aims
96-
//End readiness activities
97-
98-
{ ACT_WALK_AIM, ACT_WALK_AIM_RIFLE, true },
99-
{ ACT_WALK_CROUCH, ACT_WALK_CROUCH_RIFLE, true },
100-
{ ACT_WALK_CROUCH_AIM, ACT_WALK_CROUCH_AIM_RIFLE, true },
101-
{ ACT_RUN, ACT_RUN_RIFLE, true },
102-
{ ACT_RUN_AIM, ACT_RUN_AIM_RIFLE, true },
103-
{ ACT_RUN_CROUCH, ACT_RUN_CROUCH_RIFLE, true },
104-
{ ACT_RUN_CROUCH_AIM, ACT_RUN_CROUCH_AIM_RIFLE, true },
105-
{ ACT_GESTURE_RANGE_ATTACK1, ACT_GESTURE_RANGE_ATTACK_AR2, false },
106-
{ ACT_COVER_LOW, ACT_COVER_SMG1_LOW, false }, // FIXME: hook to AR2 unique
65+
{ ACT_RANGE_ATTACK2, ACT_COMBINE_AR2_ALTFIRE, true }, // Shared with Soldiers and Citizens.
66+
{ ACT_RELOAD, ACT_RELOAD_AR2, true },
67+
{ ACT_IDLE, ACT_IDLE_AR2, true },
68+
{ ACT_IDLE_ANGRY, ACT_IDLE_ANGRY_AR2, true },
69+
70+
{ ACT_WALK, ACT_WALK_AR2, true },
71+
72+
// Readiness activities (not aiming)
73+
{ ACT_IDLE_RELAXED, ACT_IDLE_AR2_RELAXED, false }, // Citizens only. Never aims.
74+
{ ACT_IDLE_STIMULATED, ACT_IDLE_AR2_STIMULATED, false },
75+
{ ACT_IDLE_AGITATED, ACT_IDLE_ANGRY_AR2, false }, // Citizens only. Always aims.
76+
77+
{ ACT_WALK_RELAXED, ACT_WALK_AR2_RELAXED, false }, // Citizens only. Never aims.
78+
{ ACT_WALK_STIMULATED, ACT_WALK_AR2_STIMULATED, false },
79+
{ ACT_WALK_AGITATED, ACT_WALK_AIM_AR2, false }, // Citizens only. Always aims.
80+
81+
{ ACT_RUN_RELAXED, ACT_RUN_AR2_RELAXED, false }, // Citizens only. Never aims.
82+
{ ACT_RUN_STIMULATED, ACT_RUN_AR2_STIMULATED, false },
83+
{ ACT_RUN_AGITATED, ACT_RUN_AIM_AR2, false }, // Citizens only. Always aims.
84+
85+
// Readiness activities (aiming)
86+
{ ACT_IDLE_AIM_RELAXED, ACT_IDLE_AR2_RELAXED, false }, // Citizens only. Never aims.
87+
{ ACT_IDLE_AIM_STIMULATED, ACT_IDLE_AIM_AR2_STIMULATED, false },
88+
{ ACT_IDLE_AIM_AGITATED, ACT_IDLE_ANGRY_AR2, false }, // Citizens only. Always aims.
89+
90+
{ ACT_WALK_AIM_RELAXED, ACT_WALK_AR2_RELAXED, false }, // Citizens only. Never aims.
91+
{ ACT_WALK_AIM_STIMULATED, ACT_WALK_AIM_AR2_STIMULATED, false },
92+
{ ACT_WALK_AIM_AGITATED, ACT_WALK_AIM_AR2, false }, // Citizens only. Always aims.
93+
94+
{ ACT_RUN_AIM_RELAXED, ACT_RUN_AR2_RELAXED, false }, // Citizens only. Never aims.
95+
{ ACT_RUN_AIM_STIMULATED, ACT_RUN_AIM_AR2_STIMULATED, false },
96+
{ ACT_RUN_AIM_AGITATED, ACT_RUN_AIM_AR2, false }, // Citizens only. Always aims.
97+
//End readiness activities
98+
99+
{ ACT_WALK_AIM, ACT_WALK_AIM_AR2, true },
100+
{ ACT_WALK_CROUCH, ACT_WALK_CROUCH_RIFLE, true }, // This doesn't have unique Citizen anims.
101+
{ ACT_WALK_CROUCH_AIM, ACT_WALK_CROUCH_AIM_RIFLE, true }, // This doesn't have unique Citizen anims.
102+
{ ACT_RUN, ACT_RUN_AR2, true },
103+
{ ACT_RUN_AIM, ACT_RUN_AIM_AR2_STIMULATED, true }, // Exists, but only for stimulated readiness.
104+
{ ACT_RUN_CROUCH, ACT_RUN_CROUCH_RIFLE, true }, // This doesn't have unique Citizen anims.
105+
{ ACT_RUN_CROUCH_AIM, ACT_RUN_CROUCH_AIM_RIFLE, true }, // This doesn't have unique Citizen anims.
106+
107+
{ ACT_COVER_LOW, ACT_COVER_LOW, false }, // No unique activity ID. ACT_COVER_LOW for both Citizens and Soldiers.
107108
{ ACT_RANGE_AIM_LOW, ACT_RANGE_AIM_AR2_LOW, false },
108-
{ ACT_RANGE_ATTACK1_LOW, ACT_RANGE_ATTACK_SMG1_LOW, true }, // FIXME: hook to AR2 unique
109-
{ ACT_RELOAD_LOW, ACT_RELOAD_SMG1_LOW, false },
110-
{ ACT_GESTURE_RELOAD, ACT_GESTURE_RELOAD_SMG1, true },
109+
110+
{ ACT_RANGE_ATTACK1_LOW, ACT_RANGE_ATTACK_AR2_LOW, true },
111+
{ ACT_RELOAD_LOW, ACT_RELOAD_SMG1_LOW, false }, // No unique activity ID for both Citizens and Soldiers.
112+
{ ACT_GESTURE_RELOAD, ACT_GESTURE_RELOAD_AR2, true },
113+
111114
// { ACT_RANGE_ATTACK2, ACT_RANGE_ATTACK_AR2_GRENADE, true },
112115
{ ACT_HL2MP_IDLE, ACT_HL2MP_IDLE_AR2, false },
113116
{ ACT_HL2MP_RUN, ACT_HL2MP_RUN_AR2, false },

‎sp/src/game/shared/activitylist.cpp

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -620,6 +620,29 @@ void ActivityList_RegisterSharedActivities( void )
620620
REGISTER_SHARED_ACTIVITY( ACT_WALK_RPG_RELAXED );
621621
REGISTER_SHARED_ACTIVITY( ACT_RUN_RPG_RELAXED );
622622

623+
//AR2 activities
624+
REGISTER_SHARED_ACTIVITY(ACT_COMBINE_AR2_ALTFIRE);
625+
REGISTER_SHARED_ACTIVITY(ACT_IDLE_AR2);
626+
REGISTER_SHARED_ACTIVITY(ACT_IDLE_ANGRY_AR2);
627+
REGISTER_SHARED_ACTIVITY(ACT_IDLE_AR2_RELAXED);
628+
REGISTER_SHARED_ACTIVITY(ACT_IDLE_AR2_STIMULATED);
629+
REGISTER_SHARED_ACTIVITY(ACT_WALK_AR2_RELAXED);
630+
REGISTER_SHARED_ACTIVITY(ACT_RUN_AR2_RELAXED);
631+
REGISTER_SHARED_ACTIVITY(ACT_WALK_AR2_STIMULATED);
632+
REGISTER_SHARED_ACTIVITY(ACT_RUN_AR2_STIMULATED);
633+
REGISTER_SHARED_ACTIVITY(ACT_IDLE_AIM_AR2_STIMULATED);
634+
REGISTER_SHARED_ACTIVITY(ACT_WALK_AIM_AR2_STIMULATED);
635+
REGISTER_SHARED_ACTIVITY(ACT_RUN_AIM_AR2_STIMULATED);
636+
REGISTER_SHARED_ACTIVITY(ACT_WALK_AR2);
637+
REGISTER_SHARED_ACTIVITY(ACT_WALK_AIM_AR2);
638+
REGISTER_SHARED_ACTIVITY(ACT_WALK_CROUCH_AR2);
639+
REGISTER_SHARED_ACTIVITY(ACT_WALK_CROUCH_AIM_AR2);
640+
REGISTER_SHARED_ACTIVITY(ACT_RUN_AR2);
641+
REGISTER_SHARED_ACTIVITY(ACT_RUN_AIM_AR2);
642+
REGISTER_SHARED_ACTIVITY(ACT_RELOAD_AR2);
643+
REGISTER_SHARED_ACTIVITY(ACT_RELOAD_AR2_LOW);
644+
REGISTER_SHARED_ACTIVITY(ACT_GESTURE_RELOAD_AR2);
645+
623646
REGISTER_SHARED_ACTIVITY( ACT_WALK_RIFLE );
624647
REGISTER_SHARED_ACTIVITY( ACT_WALK_AIM_RIFLE );
625648
REGISTER_SHARED_ACTIVITY( ACT_WALK_CROUCH_RIFLE );

‎sp/src/game/shared/ai_activity.h

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,29 @@ typedef enum
447447
ACT_WALK_RPG_RELAXED,
448448
ACT_RUN_RPG_RELAXED,
449449

450+
//AR2 activities
451+
ACT_COMBINE_AR2_ALTFIRE,
452+
ACT_IDLE_AR2,
453+
ACT_IDLE_ANGRY_AR2,
454+
ACT_IDLE_AR2_RELAXED,
455+
ACT_IDLE_AR2_STIMULATED,
456+
ACT_WALK_AR2_RELAXED,
457+
ACT_RUN_AR2_RELAXED,
458+
ACT_WALK_AR2_STIMULATED,
459+
ACT_RUN_AR2_STIMULATED,
460+
ACT_IDLE_AIM_AR2_STIMULATED,
461+
ACT_WALK_AIM_AR2_STIMULATED,
462+
ACT_RUN_AIM_AR2_STIMULATED,
463+
ACT_WALK_AR2,
464+
ACT_WALK_AIM_AR2,
465+
ACT_WALK_CROUCH_AR2,
466+
ACT_WALK_CROUCH_AIM_AR2,
467+
ACT_RUN_AR2,
468+
ACT_RUN_AIM_AR2,
469+
ACT_RELOAD_AR2,
470+
ACT_RELOAD_AR2_LOW,
471+
ACT_GESTURE_RELOAD_AR2,
472+
450473
ACT_WALK_RIFLE,
451474
ACT_WALK_AIM_RIFLE,
452475
ACT_WALK_CROUCH_RIFLE,

0 commit comments

Comments
 (0)