MapBase/source-sdk-2013-mapbase
1
0
Fork 0
mirror of https://github.com/mapbase-source/source-sdk-2013.git synced 2025-01-27 06:07:56 +03:00
Code Issues Packages Projects Releases Wiki Activity

Added crossbow readiness activities

Browse Source
This commit is contained in:
Blixibon 2021-11-11 19:06:04 -06:00
parent 4fbb9bc602
commit ad9e02885e
3 changed files with 65 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
sp/src/game/server/hl2/weapon_crossbow.cpp
View File

@ -644,8 +644,50 @@ acttable_t CWeaponCrossbow::m_acttable[] =
{ ACT_IDLE, ACT_IDLE_CROSSBOW, true },
{ ACT_IDLE_ANGRY, ACT_IDLE_ANGRY_CROSSBOW, true },
// Readiness activities (not aiming)
{ ACT_IDLE_RELAXED, ACT_IDLE_CROSSBOW_RELAXED, false },//never aims
{ ACT_IDLE_STIMULATED, ACT_IDLE_CROSSBOW_STIMULATED, false },
{ ACT_IDLE_AGITATED, ACT_IDLE_ANGRY_CROSSBOW, false },//always aims
{ ACT_WALK_RELAXED, ACT_WALK_CROSSBOW_RELAXED, false },//never aims
{ ACT_WALK_STIMULATED, ACT_WALK_CROSSBOW_STIMULATED, false },
{ ACT_WALK_AGITATED, ACT_WALK_AIM_CROSSBOW, false },//always aims
{ ACT_RUN_RELAXED, ACT_RUN_CROSSBOW_RELAXED, false },//never aims
{ ACT_RUN_STIMULATED, ACT_RUN_CROSSBOW_STIMULATED, false },
{ ACT_RUN_AGITATED, ACT_RUN_AIM_CROSSBOW, false },//always aims
// Readiness activities (aiming)
{ ACT_IDLE_AIM_RELAXED, ACT_IDLE_CROSSBOW_RELAXED, false },//never aims
{ ACT_IDLE_AIM_STIMULATED, ACT_IDLE_AIM_CROSSBOW_STIMULATED, false },
{ ACT_IDLE_AIM_AGITATED, ACT_IDLE_ANGRY_CROSSBOW, false },//always aims
{ ACT_WALK_AIM_RELAXED, ACT_WALK_CROSSBOW_RELAXED, false },//never aims
{ ACT_WALK_AIM_STIMULATED, ACT_WALK_AIM_CROSSBOW_STIMULATED, false },
{ ACT_WALK_AIM_AGITATED, ACT_WALK_AIM_CROSSBOW, false },//always aims
{ ACT_RUN_AIM_RELAXED, ACT_RUN_CROSSBOW_RELAXED, false },//never aims
{ ACT_RUN_AIM_STIMULATED, ACT_RUN_AIM_CROSSBOW_STIMULATED, false },
{ ACT_RUN_AIM_AGITATED, ACT_RUN_AIM_CROSSBOW, false },//always aims
//End readiness activities
{ ACT_WALK, ACT_WALK_CROSSBOW, true },
{ ACT_WALK_AIM, ACT_WALK_AIM_CROSSBOW, true },
{ ACT_WALK_AIM, ACT_WALK_AIM_CROSSBOW, true },
{ ACT_WALK_CROUCH, ACT_WALK_CROUCH_RIFLE, true },
{ ACT_WALK_CROUCH_AIM, ACT_WALK_CROUCH_AIM_RIFLE, true },
{ ACT_RUN, ACT_RUN_CROSSBOW, true },
{ ACT_RUN_AIM, ACT_RUN_AIM_CROSSBOW, true },
{ ACT_RUN_CROUCH, ACT_RUN_CROUCH_RIFLE, true },
{ ACT_RUN_CROUCH_AIM, ACT_RUN_CROUCH_AIM_RIFLE, true },
{ ACT_GESTURE_RANGE_ATTACK1, ACT_GESTURE_RANGE_ATTACK_CROSSBOW, true },
{ ACT_RANGE_ATTACK1_LOW, ACT_RANGE_ATTACK_CROSSBOW_LOW, true },
{ ACT_COVER_LOW, ACT_COVER_CROSSBOW_LOW, false },
{ ACT_RANGE_AIM_LOW, ACT_RANGE_AIM_CROSSBOW_LOW, false },
{ ACT_RELOAD_LOW, ACT_RELOAD_CROSSBOW_LOW, false },
{ ACT_GESTURE_RELOAD, ACT_GESTURE_RELOAD_CROSSBOW, true },
{ ACT_ARM, ACT_ARM_RIFLE, false },
{ ACT_DISARM, ACT_DISARM_RIFLE, false },
#else
{ ACT_RANGE_ATTACK1, ACT_RANGE_ATTACK_SMG1, true },
{ ACT_RELOAD, ACT_RELOAD_SMG1, true },
@ -654,7 +696,6 @@ acttable_t CWeaponCrossbow::m_acttable[] =
{ ACT_WALK, ACT_WALK_RIFLE, true },
{ ACT_WALK_AIM, ACT_WALK_AIM_RIFLE, true },
#endif
// Readiness activities (not aiming)
{ ACT_IDLE_RELAXED, ACT_IDLE_SMG1_RELAXED, false },//never aims
@ -683,24 +724,6 @@ acttable_t CWeaponCrossbow::m_acttable[] =
{ ACT_RUN_AIM_AGITATED, ACT_RUN_AIM_RIFLE, false },//always aims
//End readiness activities
#ifdef EXPANDED_HL2_WEAPON_ACTIVITIES
{ ACT_WALK_AIM, ACT_WALK_AIM_CROSSBOW, true },
{ ACT_WALK_CROUCH, ACT_WALK_CROUCH_RIFLE, true },
{ ACT_WALK_CROUCH_AIM, ACT_WALK_CROUCH_AIM_RIFLE, true },
{ ACT_RUN, ACT_RUN_CROSSBOW, true },
{ ACT_RUN_AIM, ACT_RUN_AIM_CROSSBOW, true },
{ ACT_RUN_CROUCH, ACT_RUN_CROUCH_RIFLE, true },
{ ACT_RUN_CROUCH_AIM, ACT_RUN_CROUCH_AIM_RIFLE, true },
{ ACT_GESTURE_RANGE_ATTACK1, ACT_GESTURE_RANGE_ATTACK_CROSSBOW, true },
{ ACT_RANGE_ATTACK1_LOW, ACT_RANGE_ATTACK_CROSSBOW_LOW, true },
{ ACT_COVER_LOW, ACT_COVER_CROSSBOW_LOW, false },
{ ACT_RANGE_AIM_LOW, ACT_RANGE_AIM_CROSSBOW_LOW, false },
{ ACT_RELOAD_LOW, ACT_RELOAD_CROSSBOW_LOW, false },
{ ACT_GESTURE_RELOAD, ACT_GESTURE_RELOAD_CROSSBOW, true },
{ ACT_ARM, ACT_ARM_RIFLE, false },
{ ACT_DISARM, ACT_DISARM_RIFLE, false },
#else
{ ACT_WALK_AIM, ACT_WALK_AIM_RIFLE, true },
{ ACT_WALK_CROUCH, ACT_WALK_CROUCH_RIFLE, true },
{ ACT_WALK_CROUCH_AIM, ACT_WALK_CROUCH_AIM_RIFLE, true },

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

@ -2352,6 +2352,17 @@ void ActivityList_RegisterSharedActivities( void )
REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RANGE_ATTACK_CROSSBOW );
REGISTER_SHARED_ACTIVITY( ACT_GESTURE_RELOAD_CROSSBOW );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_CROSSBOW_RELAXED );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_CROSSBOW_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_WALK_CROSSBOW_RELAXED );
REGISTER_SHARED_ACTIVITY( ACT_RUN_CROSSBOW_RELAXED );
REGISTER_SHARED_ACTIVITY( ACT_WALK_CROSSBOW_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_RUN_CROSSBOW_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_AIM_CROSSBOW_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_WALK_AIM_CROSSBOW_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_RUN_AIM_CROSSBOW_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_PISTOL_RELAXED );
REGISTER_SHARED_ACTIVITY( ACT_IDLE_PISTOL_STIMULATED );
REGISTER_SHARED_ACTIVITY( ACT_WALK_PISTOL_RELAXED );

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

@ -2228,6 +2228,17 @@ typedef enum
ACT_GESTURE_RANGE_ATTACK_CROSSBOW,
ACT_GESTURE_RELOAD_CROSSBOW,
ACT_IDLE_CROSSBOW_RELAXED,
ACT_IDLE_CROSSBOW_STIMULATED,
ACT_WALK_CROSSBOW_RELAXED,
ACT_RUN_CROSSBOW_RELAXED,
ACT_WALK_CROSSBOW_STIMULATED,
ACT_RUN_CROSSBOW_STIMULATED,
ACT_IDLE_AIM_CROSSBOW_STIMULATED,
ACT_WALK_AIM_CROSSBOW_STIMULATED,
ACT_RUN_AIM_CROSSBOW_STIMULATED,
// Pistol
ACT_IDLE_PISTOL_RELAXED,
ACT_IDLE_PISTOL_STIMULATED,