From c3176b34d00f88aefd5d45005e7ed2283972ec8c Mon Sep 17 00:00:00 2001
From: Blixibon <acj3017@gmail.com>
Date: Thu, 4 Nov 2021 09:30:28 -0500
Subject: [PATCH] Integrated Reload_NPC into more animation events and changed
 weapon_crossbow to be able to use a bodygroup instead of a skin for the empty
 bolt

---
 sp/src/game/server/ai_basenpc.cpp              |  8 ++++++--
 sp/src/game/server/hl2/weapon_crossbow.cpp     | 18 +++++++++++++-----
 sp/src/game/shared/basecombatweapon_shared.cpp |  5 +++--
 sp/src/game/shared/basecombatweapon_shared.h   |  2 +-
 .../shared/mapbase/weapon_custom_scripted.cpp  |  5 +++--
 .../shared/mapbase/weapon_custom_scripted.h    |  2 +-
 6 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/sp/src/game/server/ai_basenpc.cpp b/sp/src/game/server/ai_basenpc.cpp
index 225d8096..fc8cd287 100644
--- a/sp/src/game/server/ai_basenpc.cpp
+++ b/sp/src/game/server/ai_basenpc.cpp
@@ -9723,7 +9723,7 @@ void CAI_BaseNPC::HandleAnimEvent( animevent_t *pEvent )
   			if ( GetActiveWeapon() )
   			{
 #ifdef MAPBASE
-				GetActiveWeapon()->Reload_NPC();
+				GetActiveWeapon()->Reload_NPC( true );
 #else
   				GetActiveWeapon()->WeaponSound( RELOAD_NPC );
   				GetActiveWeapon()->m_iClip1 = GetActiveWeapon()->GetMaxClip1(); 
@@ -9747,8 +9747,12 @@ void CAI_BaseNPC::HandleAnimEvent( animevent_t *pEvent )
 	case EVENT_WEAPON_RELOAD_FILL_CLIP:
 		{
   			if ( GetActiveWeapon() )
-  			{
+			{
+#ifdef MAPBASE
+				GetActiveWeapon()->Reload_NPC( false );
+#else
   				GetActiveWeapon()->m_iClip1 = GetActiveWeapon()->GetMaxClip1(); 
+#endif
   				ClearCondition(COND_LOW_PRIMARY_AMMO);
   				ClearCondition(COND_NO_PRIMARY_AMMO);
   				ClearCondition(COND_NO_SECONDARY_AMMO);
diff --git a/sp/src/game/server/hl2/weapon_crossbow.cpp b/sp/src/game/server/hl2/weapon_crossbow.cpp
index 20ec1cc9..1ce3329c 100644
--- a/sp/src/game/server/hl2/weapon_crossbow.cpp
+++ b/sp/src/game/server/hl2/weapon_crossbow.cpp
@@ -542,7 +542,7 @@ public:
 	virtual bool	Holster( CBaseCombatWeapon *pSwitchingTo = NULL );
 	virtual bool	Reload( void );
 #ifdef MAPBASE
-	virtual void	Reload_NPC( void );
+	virtual void	Reload_NPC( bool bPlaySound = true );
 #endif
 	virtual void	ItemPostFrame( void );
 	virtual void	ItemBusyFrame( void );
@@ -819,11 +819,15 @@ bool CWeaponCrossbow::Reload( void )
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------
-void CWeaponCrossbow::Reload_NPC( void )
+void CWeaponCrossbow::Reload_NPC( bool bPlaySound )
 {
-	BaseClass::Reload_NPC();
+	BaseClass::Reload_NPC( bPlaySound );
 
-	m_nSkin = 0;
+	int iBody = FindBodygroupByName( "bolt" );
+	if (iBody != -1)
+		SetBodygroup( iBody, 0 );
+	else
+		m_nSkin = 0;
 }
 #endif
 
@@ -973,7 +977,11 @@ void CWeaponCrossbow::FireNPCBolt( CAI_BaseNPC *pOwner, Vector &vecShootOrigin,
 
 	m_iClip1--;
 
-	m_nSkin = 1;
+	int iBody = FindBodygroupByName( "bolt" );
+	if (iBody != -1)
+		SetBodygroup( iBody, 1 );
+	else
+		m_nSkin = 1;
 
 	WeaponSound( SINGLE_NPC );
 	WeaponSound( SPECIAL2 );
diff --git a/sp/src/game/shared/basecombatweapon_shared.cpp b/sp/src/game/shared/basecombatweapon_shared.cpp
index 1036259e..3e23ab0f 100644
--- a/sp/src/game/shared/basecombatweapon_shared.cpp
+++ b/sp/src/game/shared/basecombatweapon_shared.cpp
@@ -2374,9 +2374,10 @@ bool CBaseCombatWeapon::Reload( void )
 //-----------------------------------------------------------------------------
 // Purpose: 
 //-----------------------------------------------------------------------------
-void CBaseCombatWeapon::Reload_NPC( void )
+void CBaseCombatWeapon::Reload_NPC( bool bPlaySound )
 {
-	WeaponSound( RELOAD_NPC );
+	if (bPlaySound)
+		WeaponSound( RELOAD_NPC );
 
 	if (UsesClipsForAmmo1())
 	{
diff --git a/sp/src/game/shared/basecombatweapon_shared.h b/sp/src/game/shared/basecombatweapon_shared.h
index 0f2fe433..abfdb3b0 100644
--- a/sp/src/game/shared/basecombatweapon_shared.h
+++ b/sp/src/game/shared/basecombatweapon_shared.h
@@ -321,7 +321,7 @@ public:
 	bool					ReloadsSingly( void ) const;
 #ifdef MAPBASE
 	// Originally created for the crossbow, can be used to add special NPC reloading behavior
-	virtual void			Reload_NPC( void );
+	virtual void			Reload_NPC( bool bPlaySound = true );
 #endif
 
 	virtual bool			AutoFiresFullClip( void ) { return false; }
diff --git a/sp/src/game/shared/mapbase/weapon_custom_scripted.cpp b/sp/src/game/shared/mapbase/weapon_custom_scripted.cpp
index 7bd4862c..d9155f32 100644
--- a/sp/src/game/shared/mapbase/weapon_custom_scripted.cpp
+++ b/sp/src/game/shared/mapbase/weapon_custom_scripted.cpp
@@ -398,9 +398,10 @@ bool CWeaponCustomScripted::Reload( void )
 	return BaseClass::Reload();
 }
 
-void CWeaponCustomScripted::Reload_NPC( void )
+void CWeaponCustomScripted::Reload_NPC( bool bPlaySound )
 {
-	SIMPLE_VOID_OVERRIDE( Reload_NPC, NULL );
+	ScriptVariant_t pArgs[] = { bPlaySound };
+	SIMPLE_VOID_OVERRIDE( Reload_NPC, pArgs );
 
 	BaseClass::Reload_NPC();
 }
diff --git a/sp/src/game/shared/mapbase/weapon_custom_scripted.h b/sp/src/game/shared/mapbase/weapon_custom_scripted.h
index f1493ce0..924f1031 100644
--- a/sp/src/game/shared/mapbase/weapon_custom_scripted.h
+++ b/sp/src/game/shared/mapbase/weapon_custom_scripted.h
@@ -77,7 +77,7 @@ public:
 	void			FinishReload( void );
 	void			AbortReload( void );
 	bool			Reload( void );
-	void			Reload_NPC( void );
+	void			Reload_NPC( bool bPlaySound = true );
 
 	// Weapon firing
 	void			PrimaryAttack( void );				// do "+ATTACK"