additionalequipment kv can now load custom script

Author: MyGamepedia

sp/src/game/server/ai_basenpc.cpp

@@ -8051,7 +8051,30 @@ void CAI_BaseNPC::NPCInit ( void )
 	{	// Does this npc spawn with a weapon
 		if ( m_spawnEquipment != NULL_STRING && strcmp(STRING(m_spawnEquipment), "0"))
 		{
-			CBaseCombatWeapon *pWeapon = Weapon_Create( STRING(m_spawnEquipment) );
+			CBaseCombatWeapon *pWeapon;
+#ifdef MAPBASE
+			char szWeaponName[MAX_WEAPON_STRING] = "";
+			char szScriptName[MAX_WEAPON_STRING] = "";
+
+			//we can have a custom script name for the weapon on npc spawn, split by a comma
+			const char* pComma = strchr(m_spawnEquipment.ToCStr(), ',');
+			if (pComma)
+			{
+				size_t weaponLen = pComma - m_spawnEquipment.ToCStr();
+				if (weaponLen > 0 && weaponLen < sizeof(szWeaponName))
+				{
+					V_strncpy(szWeaponName, m_spawnEquipment.ToCStr(), weaponLen + 1);
+				}
+				V_strncpy(szScriptName, pComma + 1, sizeof(szScriptName));
+				Msg("Script %s\n", szScriptName);
+
+				m_spawnEquipment = MAKE_STRING(szWeaponName);
+				pWeapon = CBaseEntity::Create(szWeaponName, Vector(0, 0, 0), QAngle(0, 0, 0), this);
+			}
+			else
+#endif // MAPBASE
+				pWeapon = Weapon_Create( STRING(m_spawnEquipment) );
+				
 			if ( pWeapon )
 			{
 				// If I have a name, make my weapon match it with "_weapon" appended
@@ -8066,6 +8089,12 @@ void CAI_BaseNPC::NPCInit ( void )
 					pWeapon->AddEffects( EF_NOSHADOW );
 				}
 
+#ifdef MAPBASE
+				//load script if not empty
+				if (szScriptName[0] != '\0')
+					pCombatWeapon->SetCustomWeaponScriptName(szScriptName);
+#endif // MAPBASE
+
 				Weapon_Equip( pWeapon );
 			}
 		}

sp/src/game/shared/basecombatweapon_shared.cpp

@@ -2041,12 +2041,18 @@ void CBaseCombatWeapon::InputForceSecondaryFire( inputdata_t &inputdata )
 }
 
 //-----------------------------------------------------------------------------
-// Purpose: Input to change the weapon script.
+// Purpose: Input to change the weapon script name and re-Precache
 //-----------------------------------------------------------------------------
 void CBaseCombatWeapon::InputChangeScript(inputdata_t& inputdata)
 {
-	const char* pszNewScript = inputdata.value.String();
+	SetCustomWeaponScriptName(inputdata.value.String());
+}
 
+//-----------------------------------------------------------------------------
+// Purpose: Changes weapon script by name
+//-----------------------------------------------------------------------------
+void CBaseCombatWeapon::SetCustomWeaponScriptName(const char* pszNewScript)
+{
 	//don't update if empty or already used this script
 	if (!pszNewScript || !pszNewScript[0] || FClassnameIs(this, pszNewScript))
 		return;
@@ -2145,7 +2151,7 @@ void CBaseCombatWeapon::InputChangeScript(inputdata_t& inputdata)
 
 		if (UsesClipsForAmmo2())
 			m_iClip2 = GetMaxClip2();
-		
+
 		return;
 	}
 
@@ -2157,7 +2163,7 @@ void CBaseCombatWeapon::InputChangeScript(inputdata_t& inputdata)
 
 		if (UsesClipsForAmmo2() && m_iClip2 > GetMaxClip2())
 			m_iClip2 = GetMaxClip2();
-		
+
 		return;
 	}
 }

sp/src/game/shared/basecombatweapon_shared.h

@@ -220,6 +220,7 @@ class CBaseCombatWeapon : public BASECOMBATWEAPON_DERIVED_FROM
 	virtual const char*		GetClassname();
 #if !defined( CLIENT_DLL )
 	virtual bool			ClassMatches( string_t nameStr );
+	void					SetCustomWeaponScriptName(const char* pszNewScript);
 #endif
 	virtual bool			ClassMatches( const char* pszClassOrWildcard );
 #endif