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

Added a cvar to toggle companion NPCs being able to pick up weapons they couldn't use prior to Mapbase's animation changes

Browse Source
This commit is contained in:
Blixibon 2021-11-04 08:44:18 -05:00
parent 440c8b5121
commit 2c55c6cea7
1 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sp/src/game/server/hl2/npc_playercompanion.cpp
View File

@ -61,6 +61,10 @@ int AE_COMPANION_RELEASE_FLARE;
#define COMPANION_MELEE_DIST 64.0 #define COMPANION_MELEE_DIST 64.0
#endif #endif
#ifdef MAPBASE
ConVar ai_allow_new_weapons( "ai_allow_new_weapons", "1", FCVAR_NONE, "Allows companion NPCs to automatically pick up and use weapons they were unable pick up before, i.e. 357s or crossbows." );
#endif
#define MAX_TIME_BETWEEN_BARRELS_EXPLODING 5.0f #define MAX_TIME_BETWEEN_BARRELS_EXPLODING 5.0f
#define MAX_TIME_BETWEEN_CONSECUTIVE_PLAYER_KILLS 3.0f #define MAX_TIME_BETWEEN_CONSECUTIVE_PLAYER_KILLS 3.0f
@ -2737,6 +2741,13 @@ bool CNPC_PlayerCompanion::Weapon_CanUse( CBaseCombatWeapon *pWeapon )
{ {
return (NumWeaponsInSquad("weapon_shotgun") < 1 ); return (NumWeaponsInSquad("weapon_shotgun") < 1 );
} }
#ifdef MAPBASE
else if (EntIsClass( pWeapon, gm_isz_class_Pistol ) || EntIsClass( pWeapon, gm_isz_class_357 ) || EntIsClass( pWeapon, gm_isz_class_Crossbow ))
{
// The AI automatically detects these weapons as usable now that there's animations for them, so ensure this behavior can be toggled in situations where that's not desirable
return ai_allow_new_weapons.GetBool();
}
#endif
else else
{ {
return true; return true;