mirror of
https://github.com/celisej567/source-sdk-2013.git
synced 2026-09-23 20:09:45 +03:00
Added a bajillion new activities
This commit is contained in:
Blixibon
@@ -2183,6 +2183,8 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
|
||||
ADD_ACTIVITY_TO_SR( ACT_RELOAD_AR2_LOW );
|
||||
|
||||
ADD_ACTIVITY_TO_SR( ACT_GESTURE_RELOAD_AR2 );
|
||||
|
||||
ADD_ACTIVITY_TO_SR( ACT_COVER_AR2_LOW );
|
||||
#endif
|
||||
|
||||
#ifdef SHARED_COMBINE_ACTIVITIES
|
||||
@@ -2245,14 +2247,42 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
|
||||
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_PISTOL_STIMULATED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_PISTOL_STIMULATED );
|
||||
|
||||
ADD_ACTIVITY_TO_SR( ACT_WALK_CROUCH_PISTOL );
|
||||
ADD_ACTIVITY_TO_SR( ACT_WALK_CROUCH_AIM_PISTOL );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RUN_CROUCH_PISTOL );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RUN_CROUCH_AIM_PISTOL );
|
||||
|
||||
ADD_ACTIVITY_TO_SR( ACT_IDLE_SHOTGUN );
|
||||
ADD_ACTIVITY_TO_SR( ACT_WALK_SHOTGUN );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RUN_SHOTGUN );
|
||||
|
||||
ADD_ACTIVITY_TO_SR( ACT_COVER_SHOTGUN_LOW );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_SHOTGUN_LOW );
|
||||
|
||||
ADD_ACTIVITY_TO_SR( ACT_WALK_SHOTGUN_RELAXED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_WALK_SHOTGUN_STIMULATED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RUN_SHOTGUN_RELAXED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RUN_SHOTGUN_STIMULATED );
|
||||
|
||||
ADD_ACTIVITY_TO_SR( ACT_IDLE_AIM_SHOTGUN_STIMULATED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_WALK_AIM_SHOTGUN_STIMULATED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RUN_AIM_SHOTGUN_STIMULATED );
|
||||
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_RPG_LOW );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_RPG_LOW );
|
||||
ADD_ACTIVITY_TO_SR( ACT_GESTURE_RANGE_ATTACK_RPG );
|
||||
|
||||
ADD_ACTIVITY_TO_SR( ACT_RUN_PACKAGE );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RUN_SUITCASE );
|
||||
|
||||
ADD_ACTIVITY_TO_SR( ACT_ARM_RIFLE );
|
||||
ADD_ACTIVITY_TO_SR( ACT_ARM_SHOTGUN );
|
||||
ADD_ACTIVITY_TO_SR( ACT_ARM_RPG );
|
||||
ADD_ACTIVITY_TO_SR( ACT_ARM_MELEE );
|
||||
ADD_ACTIVITY_TO_SR( ACT_DISARM_RIFLE );
|
||||
ADD_ACTIVITY_TO_SR( ACT_DISARM_SHOTGUN );
|
||||
ADD_ACTIVITY_TO_SR( ACT_DISARM_RPG );
|
||||
ADD_ACTIVITY_TO_SR( ACT_DISARM_MELEE );
|
||||
#endif
|
||||
|
||||
#ifdef EXPANDED_NAVIGATION_ACTIVITIES
|
||||
@@ -2263,4 +2293,158 @@ void CAI_BaseNPC::InitDefaultActivitySR(void)
|
||||
ADD_ACTIVITY_TO_SR( ACT_CLIMB_MOUNT_BOTTOM );
|
||||
ADD_ACTIVITY_TO_SR( ACT_CLIMB_DISMOUNT_BOTTOM );
|
||||
#endif
|
||||
|
||||
#ifdef EXPANDED_HL2_COVER_ACTIVITIES
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK1_MED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK2_MED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_MED );
|
||||
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_AR2_MED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_SMG1_MED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_SHOTGUN_MED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_PISTOL_MED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_RPG_MED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_REVOLVER_MED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_ATTACK_CROSSBOW_MED );
|
||||
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_AR2_MED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_SMG1_MED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_SHOTGUN_MED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_PISTOL_MED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_RPG_MED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_REVOLVER_MED );
|
||||
ADD_ACTIVITY_TO_SR( ACT_RANGE_AIM_CROSSBOW_MED );
|
||||
|
||||
ADD_ACTIVITY_TO_SR( ACT_COVER_WALL_R );
|
||||
ADD_ACTIVITY_TO_SR( ACT_COVER_WALL_L );
|
||||
ADD_ACTIVITY_TO_SR( ACT_COVER_WALL_LOW_R );
|
||||
ADD_ACTIVITY_TO_SR( ACT_COVER_WALL_LOW_L );
|
||||
|
||||
ADD_ACTIVITY_TO_SR( ACT_COVER_WALL_R_RIFLE );
|
||||
ADD_ACTIVITY_TO_SR( ACT_COVER_WALL_L_RIFLE );
|
||||
ADD_ACTIVITY_TO_SR( ACT_COVER_WALL_LOW_R_RIFLE );
|
||||
ADD_ACTIVITY_TO_SR( ACT_COVER_WALL_LOW_L_RIFLE );
|
||||
|
||||
ADD_ACTIVITY_TO_SR( ACT_COVER_WALL_R_PISTOL );
|
||||
ADD_ACTIVITY_TO_SR( ACT_COVER_WALL_L_PISTOL );
|
||||
ADD_ACTIVITY_TO_SR( ACT_COVER_WALL_LOW_R_PISTOL );
|
||||
ADD_ACTIVITY_TO_SR( ACT_COVER_WALL_LOW_L_PISTOL );
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef MAPBASE
|
||||
//-----------------------------------------------------------------------------
|
||||
// Purpose: This is a multi-purpose table which links NPC activities to their gesture variants.
|
||||
//-----------------------------------------------------------------------------
|
||||
CAI_BaseNPC::actlink_t CAI_BaseNPC::gm_ActivityGestureLinks[] =
|
||||
{
|
||||
{ ACT_RANGE_ATTACK1, ACT_GESTURE_RANGE_ATTACK1 },
|
||||
{ ACT_RANGE_ATTACK2, ACT_GESTURE_RANGE_ATTACK2 },
|
||||
{ ACT_MELEE_ATTACK1, ACT_GESTURE_MELEE_ATTACK1 },
|
||||
{ ACT_MELEE_ATTACK2, ACT_GESTURE_MELEE_ATTACK2 },
|
||||
{ ACT_RELOAD, ACT_GESTURE_RELOAD },
|
||||
|
||||
{ ACT_RANGE_ATTACK1_LOW, ACT_GESTURE_RANGE_ATTACK1 }, // NOTE: ACT_GESTURE_RANGE_ATTACK1_LOW exists, but isn't used
|
||||
{ ACT_RANGE_ATTACK2_LOW, ACT_GESTURE_RANGE_ATTACK2 }, // NOTE: ACT_GESTURE_RANGE_ATTACK2_LOW exists, but isn't used
|
||||
{ ACT_RELOAD_LOW, ACT_GESTURE_RELOAD },
|
||||
|
||||
{ ACT_MELEE_ATTACK_SWING, ACT_GESTURE_MELEE_ATTACK_SWING },
|
||||
|
||||
// -----------------------------------------------------------
|
||||
|
||||
{ ACT_RANGE_ATTACK_AR2, ACT_GESTURE_RANGE_ATTACK_AR2 },
|
||||
{ ACT_RANGE_ATTACK_AR2_LOW, ACT_GESTURE_RANGE_ATTACK_AR2 },
|
||||
{ ACT_RANGE_ATTACK_SMG1, ACT_GESTURE_RANGE_ATTACK_SMG1 },
|
||||
{ ACT_RANGE_ATTACK_SMG1_LOW, ACT_GESTURE_RANGE_ATTACK_SMG1 },
|
||||
{ ACT_RANGE_ATTACK_SHOTGUN, ACT_GESTURE_RANGE_ATTACK_SHOTGUN },
|
||||
{ ACT_RANGE_ATTACK_SHOTGUN_LOW, ACT_GESTURE_RANGE_ATTACK_SHOTGUN },
|
||||
{ ACT_RANGE_ATTACK_PISTOL, ACT_GESTURE_RANGE_ATTACK_PISTOL },
|
||||
{ ACT_RANGE_ATTACK_PISTOL_LOW, ACT_GESTURE_RANGE_ATTACK_PISTOL },
|
||||
|
||||
// -----------------------------------------------------------
|
||||
|
||||
{ ACT_SMALL_FLINCH, ACT_GESTURE_SMALL_FLINCH },
|
||||
{ ACT_BIG_FLINCH, ACT_GESTURE_BIG_FLINCH },
|
||||
{ ACT_FLINCH_HEAD, ACT_GESTURE_FLINCH_HEAD },
|
||||
{ ACT_FLINCH_CHEST, ACT_GESTURE_FLINCH_CHEST },
|
||||
{ ACT_FLINCH_STOMACH, ACT_GESTURE_FLINCH_STOMACH },
|
||||
{ ACT_FLINCH_LEFTARM, ACT_GESTURE_FLINCH_LEFTARM },
|
||||
{ ACT_FLINCH_RIGHTARM, ACT_GESTURE_FLINCH_RIGHTARM },
|
||||
{ ACT_FLINCH_LEFTLEG, ACT_GESTURE_FLINCH_LEFTLEG },
|
||||
{ ACT_FLINCH_RIGHTLEG, ACT_GESTURE_FLINCH_RIGHTLEG },
|
||||
|
||||
// -----------------------------------------------------------
|
||||
|
||||
#if AR2_ACTIVITY_FIX == 1
|
||||
{ ACT_RELOAD_AR2, ACT_GESTURE_RELOAD_AR2 },
|
||||
{ ACT_RELOAD_AR2_LOW, ACT_GESTURE_RELOAD_AR2 },
|
||||
#endif
|
||||
{ ACT_RELOAD_SMG1, ACT_GESTURE_RELOAD_SMG1 },
|
||||
{ ACT_RELOAD_SMG1_LOW, ACT_GESTURE_RELOAD_SMG1 },
|
||||
{ ACT_RELOAD_SHOTGUN, ACT_GESTURE_RELOAD_SHOTGUN },
|
||||
{ ACT_RELOAD_SHOTGUN_LOW, ACT_GESTURE_RELOAD_SHOTGUN },
|
||||
{ ACT_RELOAD_PISTOL, ACT_GESTURE_RELOAD_PISTOL },
|
||||
{ ACT_RELOAD_PISTOL_LOW, ACT_GESTURE_RELOAD_PISTOL },
|
||||
|
||||
#ifdef SHARED_COMBINE_ACTIVITIES
|
||||
{ ACT_SPECIAL_ATTACK1, ACT_GESTURE_SPECIAL_ATTACK1 },
|
||||
{ ACT_SPECIAL_ATTACK2, ACT_GESTURE_SPECIAL_ATTACK2 },
|
||||
{ ACT_COMBINE_THROW_GRENADE, ACT_GESTURE_COMBINE_THROW_GRENADE },
|
||||
{ ACT_COMBINE_AR2_ALTFIRE, ACT_GESTURE_COMBINE_AR2_ALTFIRE },
|
||||
|
||||
{ ACT_SIGNAL_ADVANCE, ACT_GESTURE_SIGNAL_ADVANCE },
|
||||
{ ACT_SIGNAL_FORWARD, ACT_GESTURE_SIGNAL_FORWARD },
|
||||
{ ACT_SIGNAL_GROUP, ACT_GESTURE_SIGNAL_GROUP },
|
||||
{ ACT_SIGNAL_HALT, ACT_GESTURE_SIGNAL_HALT },
|
||||
{ ACT_SIGNAL_LEFT, ACT_GESTURE_SIGNAL_LEFT },
|
||||
{ ACT_SIGNAL_RIGHT, ACT_GESTURE_SIGNAL_RIGHT },
|
||||
{ ACT_SIGNAL_TAKECOVER, ACT_GESTURE_SIGNAL_TAKECOVER },
|
||||
#endif
|
||||
|
||||
#ifdef EXPANDED_HL2_WEAPON_ACTIVITIES
|
||||
{ ACT_RANGE_ATTACK_REVOLVER, ACT_GESTURE_RANGE_ATTACK_REVOLVER },
|
||||
{ ACT_RANGE_ATTACK_REVOLVER_LOW, ACT_GESTURE_RANGE_ATTACK_REVOLVER },
|
||||
{ ACT_RANGE_ATTACK_CROSSBOW, ACT_GESTURE_RANGE_ATTACK_CROSSBOW },
|
||||
{ ACT_RANGE_ATTACK_CROSSBOW_LOW, ACT_GESTURE_RANGE_ATTACK_CROSSBOW },
|
||||
{ ACT_RANGE_ATTACK_RPG, ACT_GESTURE_RANGE_ATTACK_RPG },
|
||||
{ ACT_RANGE_ATTACK_RPG_LOW, ACT_GESTURE_RANGE_ATTACK_RPG },
|
||||
|
||||
{ ACT_RELOAD_REVOLVER, ACT_GESTURE_RELOAD_REVOLVER },
|
||||
{ ACT_RELOAD_REVOLVER_LOW, ACT_GESTURE_RELOAD_REVOLVER },
|
||||
{ ACT_RELOAD_CROSSBOW, ACT_GESTURE_RELOAD_CROSSBOW },
|
||||
{ ACT_RELOAD_CROSSBOW_LOW, ACT_GESTURE_RELOAD_CROSSBOW },
|
||||
#endif
|
||||
};
|
||||
|
||||
Activity CAI_BaseNPC::GetGestureVersionOfActivity( Activity inActivity )
|
||||
{
|
||||
actlink_t *pTable = gm_ActivityGestureLinks;
|
||||
int actCount = ARRAYSIZE( gm_ActivityGestureLinks );
|
||||
|
||||
for ( int i = 0; i < actCount; i++, pTable++ )
|
||||
{
|
||||
if ( inActivity == pTable->sequence )
|
||||
{
|
||||
return pTable->gesture;
|
||||
}
|
||||
}
|
||||
|
||||
return ACT_INVALID;
|
||||
}
|
||||
|
||||
Activity CAI_BaseNPC::GetSequenceVersionOfGesture( Activity inActivity )
|
||||
{
|
||||
actlink_t *pTable = gm_ActivityGestureLinks;
|
||||
int actCount = ARRAYSIZE( gm_ActivityGestureLinks );
|
||||
|
||||
for (int i = 0; i < actCount; i++, pTable++)
|
||||
{
|
||||
if (inActivity == pTable->gesture)
|
||||
{
|
||||
return pTable->sequence;
|
||||
}
|
||||
}
|
||||
|
||||
return ACT_INVALID;
|
||||
}
|
||||
#endif
|
||||
|
||||
Reference in New Issue
Block a user