Merge pull request #1 from Dinorush/master

Add missing weapons, add class name callbacks, and restructure

README.md

@@ -1,9 +1,15 @@
 # WeaponFireCallbacks
 
-Provides `AddCallback_OnWeaponFired`
+Provides `WeaponFireCallbacks_AddCallbackOnWeaponFired`, `WeaponFireCallbacks_AddCallbackOnWeaponClassFired`, `WeaponFireCallbacks_RemoveCallbackOnWeaponClassFired`, `WeaponFireCallbacks_AddCallbackOnOwnerClassFired`, and `WeaponFireCallbacks_RemoveCallbackOnOwnerClassFired`
 
 ## Use
 ```cpp
-AddCallback_OnWeaponFired(entity weapon, void functionref(WeaponPrimaryAttackParams attackParams) callback)
+WeaponFireCallbacks_AddCallbackOnWeaponFired( entity weapon, void functionref( entity weapon, WeaponPrimaryAttackParams attackParams, var ammoUsed ) callback )
+
+WeaponFireCallbacks_AddCallbackOnWeaponClassFired( string weaponClass, void functionref( entity weapon, WeaponPrimaryAttackParams attackParams, var ammoUsed ) callback )
+WeaponFireCallbacks_RemoveCallbackOnWeaponClassFired( string weaponClass, void functionref( entity weapon, WeaponPrimaryAttackParams attackParams, var ammoUsed ) callback )
+
+WeaponFireCallbacks_AddCallbackOnOwnerClassFired( string ownerClass, void functionref( entity weapon, WeaponPrimaryAttackParams attackParams, var ammoUsed ) callback )
+WeaponFireCallbacks_RemoveCallbackOnOwnerClassFired( string ownerClass, void functionref( entity weapon, WeaponPrimaryAttackParams attackParams, var ammoUsed ) callback )
 ```
 

keyvalues/scripts/weapons/mp_titanability_ammo_swap.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_ammo_swap"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_ammo_swap"
+}

keyvalues/scripts/weapons/mp_titanability_basic_block.txt

@@ -0,0 +1,4 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanability_basic_block"
+}

keyvalues/scripts/weapons/mp_titanability_electric_smoke.txt

@@ -0,0 +1,4 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanability_smoke"
+}

keyvalues/scripts/weapons/mp_titanability_gun_shield.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_gun_shield"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_gun_shield"
+}

keyvalues/scripts/weapons/mp_titanability_hover.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_TitanHover"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_NPC_OnWeaponPrimaryAttack_TitanHover"
+}

keyvalues/scripts/weapons/mp_titanability_laser_trip.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_laser_trip"
+    "OnWeaponNPCPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNPCPrimaryAttack_titanweapon_laser_trip"
+}

keyvalues/scripts/weapons/mp_titanability_nuke_eject.txt

@@ -0,0 +1,4 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_nuke_eject"
+}

keyvalues/scripts/weapons/mp_titanability_particle_wall.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_particle_wall"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_particle_wall"
+}

keyvalues/scripts/weapons/mp_titanability_phase_dash.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanability_phase_dash"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNPCPrimaryAttack_titanability_phase_dash"
+}

keyvalues/scripts/weapons/mp_titanability_power_shot.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_power_shot"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_power_shot"
+}

keyvalues/scripts/weapons/mp_titanability_rearm.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanability_rearm"
+    "OnWeaponNPCPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNPCPrimaryAttack_titanability_rearm"
+}

keyvalues/scripts/weapons/mp_titanability_rocketeer_ammo_swap.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_rocketeer_ammo_swap"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_rocketeer_ammo_swap"
+}

keyvalues/scripts/weapons/mp_titanability_slow_trap.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_slow_trap"
+    "OnWeaponNPCPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNPCPrimaryAttack_titanweapon_slow_trap"
+}

keyvalues/scripts/weapons/mp_titanability_smoke.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanability_smoke"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_titanability_smoke"
+}

keyvalues/scripts/weapons/mp_titanability_sonar_pulse.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanability_sonar_pulse"
+    "OnWeaponNPCPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNPCPrimaryAttack_titanability_sonar_pulse"
+}

keyvalues/scripts/weapons/mp_titanability_tether_trap.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_tether_trap"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_titanweapon_tether_trap"
+}

keyvalues/scripts/weapons/mp_titanability_timeshift.txt

@@ -0,0 +1,4 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_TimeShift"
+}

keyvalues/scripts/weapons/mp_titancore_amp_core.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_AmpCore"
+    "OnWeaponNPCPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNPCPrimaryAttack_AmpCore"
+}

keyvalues/scripts/weapons/mp_titancore_flame_wave.txt

@@ -0,0 +1,4 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titancore_flame_wave"
+}

keyvalues/scripts/weapons/mp_titancore_salvo_core.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_salvo_core"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_salvo_core"
+}

keyvalues/scripts/weapons/mp_titanweapon_arc_wave.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_arc_wave"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_titanweapon_arc_wave"
+}

keyvalues/scripts/weapons/mp_titanweapon_dumbfire_rockets.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_dumbfire_rockets"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNPCPrimaryAttack_titanweapon_dumbfire_rockets"
+}

keyvalues/scripts/weapons/mp_titanweapon_flame_wall.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_FlameWall"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_FlameWall"
+}

keyvalues/scripts/weapons/mp_titanweapon_flightcore_rockets.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_flightcore_rockets"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_titanweapon_flightcore_rockets"
+}

keyvalues/scripts/weapons/mp_titanweapon_heat_shield.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_heat_shield"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_titanweapon_heat_shield"
+}

keyvalues/scripts/weapons/mp_titanweapon_homing_rockets.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_homing_rockets"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_titanweapon_homing_rockets"
+}

keyvalues/scripts/weapons/mp_titanweapon_laser_lite.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_laser_lite"
+    "OnWeaponNPCPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNPCPrimaryAttack_titanweapon_laser_lite"
+}

keyvalues/scripts/weapons/mp_titanweapon_leadwall.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_leadwall"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_titanweapon_leadwall"
+}

keyvalues/scripts/weapons/mp_titanweapon_meteor.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_Meteor"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_Meteor"
+}

keyvalues/scripts/weapons/mp_titanweapon_orbital_strike.txt

@@ -0,0 +1,4 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_salvo_rockets"
+}

keyvalues/scripts/weapons/mp_titanweapon_particle_accelerator.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_particle_accelerator"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_titanweapon_particle_accelerator"
+}

keyvalues/scripts/weapons/mp_titanweapon_predator_cannon.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_predator_cannon"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_titanweapon_predator_cannon"
+}

keyvalues/scripts/weapons/mp_titanweapon_rocketeer_rocketstream.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_TitanWeapon_Rocketeer_RocketStream"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_TitanWeapon_Rocketeer_RocketStream"
+}

keyvalues/scripts/weapons/mp_titanweapon_salvo_rockets.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_salvo_rockets"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNPCPrimaryAttack_titanweapon_salvo_rockets"
+}

keyvalues/scripts/weapons/mp_titanweapon_shoulder_rockets.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_shoulder_rockets"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_titanweapon_shoulder_rockets"
+}

keyvalues/scripts/weapons/mp_titanweapon_sniper.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_sniper"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_titanweapon_sniper"
+}

keyvalues/scripts/weapons/mp_titanweapon_sticky_40mm.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_40mm"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_titanweapon_40mm"
+}

keyvalues/scripts/weapons/mp_titanweapon_stun_laser.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_stun_laser"
+    "OnWeaponNPCPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNPCPrimaryAttack_titanweapon_stun_laser"
+}

keyvalues/scripts/weapons/mp_titanweapon_tracker_rockets.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_tracker_rockets"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNPCPrimaryAttack_titanweapon_tracker_rockets"
+}

keyvalues/scripts/weapons/mp_titanweapon_vortex_shield.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_vortex_shield"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_titanweapon_vortex_shield"
+}

keyvalues/scripts/weapons/mp_titanweapon_xo16.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+    "OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
+}

keyvalues/scripts/weapons/mp_titanweapon_xo16_vanguard.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+    "OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
+}

keyvalues/scripts/weapons/mp_turretweapon_blaster.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_smr"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_weapon_smr"
+}

keyvalues/scripts/weapons/mp_turretweapon_plasma.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_GenericBoltWithDrop_Player"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponPrimaryAttack_GenericBoltWithDrop_NPC"
+}

keyvalues/scripts/weapons/mp_turretweapon_sentry.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_titanweapon_xo16"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_titanweapon_xo16"
+}

keyvalues/scripts/weapons/mp_weapon_alternator_smg.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
 	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_alternator_smg"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_alternator_smg"
 }

keyvalues/scripts/weapons/mp_weapon_arc_launcher.txt

@@ -0,0 +1,4 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_arc_launcher"
+}

keyvalues/scripts/weapons/mp_weapon_arena1.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_GenericBoltWithDrop_Player"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponPrimaryAttack_GenericBoltWithDrop_NPC"
+}

keyvalues/scripts/weapons/mp_weapon_arena2.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_GenericBoltWithDrop_Player"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponPrimaryAttack_GenericBoltWithDrop_NPC"
+}

keyvalues/scripts/weapons/mp_weapon_autopistol.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
-	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_generic"
+    "OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
 }

keyvalues/scripts/weapons/mp_weapon_car.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
-	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_generic"
+    "OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
 }

keyvalues/scripts/weapons/mp_weapon_defender.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
 	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_defender"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_weapon_defender"
 }

keyvalues/scripts/weapons/mp_weapon_dmr.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
-	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_generic"
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
 }

keyvalues/scripts/weapons/mp_weapon_doubletake.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
 	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_doubletake"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_weapon_doubletake"
 }

keyvalues/scripts/weapons/mp_weapon_dronebeam.txt

@@ -0,0 +1,4 @@
+WeaponData
+{
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_DroneBeam"
+}

keyvalues/scripts/weapons/mp_weapon_droneplasma.txt

@@ -0,0 +1,4 @@
+WeaponData
+{
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_DronePlasma"
+}

keyvalues/scripts/weapons/mp_weapon_dronerocket.txt

@@ -0,0 +1,4 @@
+WeaponData
+{
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_dronerocket"
+}

keyvalues/scripts/weapons/mp_weapon_engineer_combat_drone.txt

@@ -0,0 +1,4 @@
+WeaponData
+{
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_engineer_combat_drone"
+}

keyvalues/scripts/weapons/mp_weapon_engineer_turret.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+    "OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
+}

keyvalues/scripts/weapons/mp_weapon_epg.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
 	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_GenericBoltWithDrop_Player"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponPrimaryAttack_GenericBoltWithDrop_NPC"
 }

keyvalues/scripts/weapons/mp_weapon_esaw.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
 	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_lmg"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
 }

keyvalues/scripts/weapons/mp_weapon_g2.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
-	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_generic"
+    "OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
 }

keyvalues/scripts/weapons/mp_weapon_gunship_launcher.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_GunshipLauncher"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_GunshipLauncher"
+}

keyvalues/scripts/weapons/mp_weapon_gunship_missile.txt

@@ -0,0 +1,4 @@
+WeaponData
+{
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_gunship_missile"
+}

keyvalues/scripts/weapons/mp_weapon_hemlok.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
-	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_generic"
+    "OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
 }

keyvalues/scripts/weapons/mp_weapon_hemlok_smg.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
-	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_generic"
+    "OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
 }

keyvalues/scripts/weapons/mp_weapon_lmg.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
 	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_lmg"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
 }

keyvalues/scripts/weapons/mp_weapon_lstar.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
 	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_lstar"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_weapon_lstar"
 }

keyvalues/scripts/weapons/mp_weapon_mastiff.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
-	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_mastiff"
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_mastiff"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_weapon_mastiff"
 }

keyvalues/scripts/weapons/mp_weapon_mega_turret.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_mega_turret"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_weapon_mega_turret"
+}

keyvalues/scripts/weapons/mp_weapon_mgl.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
 	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_mgl"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_weapon_mgl"
 }

keyvalues/scripts/weapons/mp_weapon_npc_rocket_launcher.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_npc_rocket_launcher"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_weapon_npc_rocket_launcher"
+}

keyvalues/scripts/weapons/mp_weapon_pulse_lmg.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
 	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_GenericBoltWithDrop_Player"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponPrimaryAttack_GenericBoltWithDrop_NPC"
 }

keyvalues/scripts/weapons/mp_weapon_r97.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
-	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_generic"
+    "OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
 }

keyvalues/scripts/weapons/mp_weapon_rocket_launcher.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
 	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_rocket_launcher"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_weapon_rocket_launcher"
 }

keyvalues/scripts/weapons/mp_weapon_rspn101.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
-	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_generic"
+    "OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
 }

keyvalues/scripts/weapons/mp_weapon_rspn101_og.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
-	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_generic"
+    "OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
 }

keyvalues/scripts/weapons/mp_weapon_semipistol.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
-	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_generic"
+    "OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
 }

keyvalues/scripts/weapons/mp_weapon_shotgun.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
 	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_shotgun"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_weapon_shotgun"
 }

keyvalues/scripts/weapons/mp_weapon_shotgun_doublebarrel.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
 	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_shotgun_doublebarrel"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_shotgun_doublebarrel"
 }

keyvalues/scripts/weapons/mp_weapon_shotgun_pistol.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
 	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_shotgun_pistol"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_weapon_shotgun_pistol"
 }

keyvalues/scripts/weapons/mp_weapon_smart_pistol.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
 	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_smart_pistol"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
 }

keyvalues/scripts/weapons/mp_weapon_smr.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
 	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_smr"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_weapon_smr"
 }

keyvalues/scripts/weapons/mp_weapon_sniper.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
 	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_sniper"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_weapon_sniper"
 }

keyvalues/scripts/weapons/mp_weapon_softball.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
 	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_softball"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_weapon_softball"
 }

keyvalues/scripts/weapons/mp_weapon_spectre_spawner.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+    "OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
+}

keyvalues/scripts/weapons/mp_weapon_super_spectre.txt

@@ -0,0 +1,4 @@
+WeaponData
+{
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_SuperSpectre"
+}

keyvalues/scripts/weapons/mp_weapon_turretlaser_mega.txt

@@ -0,0 +1,4 @@
+WeaponData
+{
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_TurretLaser_Mega"
+}

keyvalues/scripts/weapons/mp_weapon_turretlaser_mega_fort_war.txt

@@ -0,0 +1,4 @@
+WeaponData
+{
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_TurretLaser_Mega"
+}

keyvalues/scripts/weapons/mp_weapon_turretplasma.txt

@@ -0,0 +1,4 @@
+WeaponData
+{
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_TurretPlasma"
+}

keyvalues/scripts/weapons/mp_weapon_turretplasma_mega.txt

@@ -0,0 +1,4 @@
+WeaponData
+{
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_TurretPlasma_Mega"
+}

keyvalues/scripts/weapons/mp_weapon_vinson.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
-	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_generic"
+    "OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
 }

keyvalues/scripts/weapons/mp_weapon_wingman.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
-	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_generic"
+    "OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
 }

keyvalues/scripts/weapons/mp_weapon_wingman_n.txt

@@ -1,4 +1,5 @@
 WeaponData
 {
 	"OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_sniper"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
 }

keyvalues/scripts/weapons/mp_weapon_yh803.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+    "OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_yh803Rocket"
+}

keyvalues/scripts/weapons/mp_weapon_yh803_bullet.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+    "OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+	"OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack_weapon_yh803"
+}

keyvalues/scripts/weapons/mp_weapon_yh803_bullet_overcharged.txt

@@ -0,0 +1,5 @@
+WeaponData
+{
+    "OnWeaponPrimaryAttack"							"WeaponFireCallbacks_OnWeaponPrimaryAttack"
+    "OnWeaponNpcPrimaryAttack"						"WeaponFireCallbacks_OnWeaponNpcPrimaryAttack"
+}

mod.json

@@ -7,7 +7,11 @@
     "Scripts": [
         {
             "Path": "weaponFireCallbacks.gnut",
-            "RunOn": "SERVER"
+            "RunOn": "CLIENT || SERVER"
+        },
+        {
+            "Path": "weaponFireReroutes.gnut",
+            "RunOn": "CLIENT || SERVER"
         }
     ]
 }

mod/scripts/vscripts/weaponFireCallbacks.gnut

@@ -3,194 +3,151 @@ untyped
 globalize_all_functions
 
 struct {
-    table < entity, array< void functionref(WeaponPrimaryAttackParams attackParams) > > weaponCallbacks
+    table < entity, array< void functionref( entity weapon, WeaponPrimaryAttackParams attackParams, var ammoUsed ) > > weaponCallbacks
+    table < string, array< void functionref( entity weapon, WeaponPrimaryAttackParams attackParams, var ammoUsed ) > > weaponClassCallbacks
+    table < string, array< void functionref( entity weapon, WeaponPrimaryAttackParams attackParams, var ammoUsed ) > > ownerClassCallbacks
+    bool clearThreadRunning = false // Only used on client
 } file
 
-void function AddCallback_OnWeaponFired(entity weapon, void functionref(WeaponPrimaryAttackParams attackParams) callback){
-    if(weapon in file.weaponCallbacks){
-        file.weaponCallbacks[weapon].append(callback)
-    }else{
+void function WeaponFireCallbacks_AddCallbackOnWeaponFired( entity weapon, void functionref( entity weapon, WeaponPrimaryAttackParams attackParams, var ammoUsed ) callback )
+{
+    if ( !IsValid( weapon ) )
+        return
+
+    if ( weapon in file.weaponCallbacks )
+        file.weaponCallbacks[weapon].append( callback )
+    else
         file.weaponCallbacks[weapon] <- [callback]
-    }
-    AddEntityDestroyedCallback(weapon, HandleWeaponDestroyed)
+
+    #if SERVER
+    AddEntityDestroyedCallback( weapon, WeaponFireCallbacks_HandleWeaponDestroyed )
+    #else
+    // Per-entity destroyed callbacks don't exist on client. Client needs to clear invalid keys periodically.
+    if ( !file.clearThreadRunning )
+        thread ClearInvalidWeaponsThread()
+    #endif
 }
 
-function HandleWeaponDestroyed(weapon){
-    entity w = expect entity(weapon)
-    if(w in file.weaponCallbacks){
+void function WeaponFireCallbacks_AddCallbackOnWeaponClassFired( string weaponClass, void functionref( entity weapon, WeaponPrimaryAttackParams attackParams, var ammoUsed ) callback )
+{
+    if ( weaponClass in file.weaponClassCallbacks )
+        file.weaponClassCallbacks[weaponClass].append( callback )
+    else
+        file.weaponClassCallbacks[weaponClass] <- [callback]
+}
+
+void function WeaponFireCallbacks_RemoveCallbackOnWeaponClassFired( string weaponClass, void functionref( entity weapon, WeaponPrimaryAttackParams attackParams, var ammoUsed ) callback )
+{
+    if ( weaponClass in file.weaponClassCallbacks )
+    {
+        file.weaponClassCallbacks[weaponClass].fastremovebyvalue( callback )
+        if ( file.weaponClassCallbacks[weaponClass].len() == 0 )
+            delete file.weaponClassCallbacks[weaponClass]
+    }
+}
+
+void function WeaponFireCallbacks_AddCallbackOnOwnerClassFired( string ownerClass, void functionref( entity weapon, WeaponPrimaryAttackParams attackParams, var ammoUsed ) callback )
+{
+    if ( ownerClass in file.ownerClassCallbacks )
+        file.ownerClassCallbacks[ownerClass].append( callback )
+    else
+        file.ownerClassCallbacks[ownerClass] <- [callback]
+}
+
+void function WeaponFireCallbacks_RemoveCallbackOnOwnerClassFired( string ownerClass, void functionref( entity weapon, WeaponPrimaryAttackParams attackParams, var ammoUsed ) callback )
+{
+    if ( ownerClass in file.ownerClassCallbacks )
+    {
+        file.ownerClassCallbacks[ownerClass].fastremovebyvalue( callback )
+        if ( file.ownerClassCallbacks[ownerClass].len() == 0 )
+            delete file.ownerClassCallbacks[ownerClass]
+    }
+}
+
+function WeaponFireCallbacks_HandleWeaponDestroyed( weapon )
+{
+    entity w = expect entity( weapon )
+    if ( w in file.weaponCallbacks )
         delete file.weaponCallbacks[w]
-    }
 }
 
-void function OnWeaponFired(entity weapon, WeaponPrimaryAttackParams attackParams){
-    if(weapon in file.weaponCallbacks){
-        array< void functionref(WeaponPrimaryAttackParams attackParams) > callbacks = file.weaponCallbacks[weapon]
-        foreach(callback in callbacks){
-            callback(attackParams)
-        }
-    }
-}
-
-
-var function WeaponFireCallbacks_OnWeaponPrimaryAttack_alternator_smg( entity weapon, WeaponPrimaryAttackParams attackParams )
+#if CLIENT
+void function ClearInvalidWeaponsThread()
 {
-    var result = OnWeaponPrimaryAttack_alternator_smg(weapon, attackParams)
-    if(result == 0){
-        return 0
-    }
-    OnWeaponFired(weapon, attackParams)
-    return result
-}
+    file.clearThreadRunning = true
 
-var function WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_defender( entity weapon, WeaponPrimaryAttackParams attackParams )
+    while( file.weaponCallbacks.len() > 0 )
+    {
+        array< entity > invalidList = []
+
+        foreach( key, callback in file.weaponCallbacks )
+        {
+            if ( !IsValid( key ) )
+                invalidList.append( key )
+        }
+
+        foreach( w in invalidList )
+            delete file.weaponCallbacks[w]
+        
+        wait 1.0 // Some arbitrary number that isn't WaitFrame(), don't need to run this very often
+    }
+
+    file.clearThreadRunning = false
+}
+#endif
+
+void function WeaponFireCallbacks_OnWeaponFired( entity weapon, WeaponPrimaryAttackParams attackParams, var ammoUsed )
 {
-    var result = OnWeaponPrimaryAttack_weapon_defender(weapon, attackParams)
-    if(result == 0){
-        return 0
+    if ( weapon in file.weaponCallbacks )
+    {
+        #if CLIENT
+            ClearInvalidWeapons()
+        #endif
+        
+        array< void functionref( entity weapon, WeaponPrimaryAttackParams attackParams, var ammoUsed ) > callbacks = file.weaponCallbacks[weapon]
+        foreach ( callback in callbacks )
+            callback( weapon, attackParams, ammoUsed )
+    }
+
+    string weaponClass = weapon.GetWeaponClassName()
+    if ( weaponClass in file.weaponClassCallbacks )
+    {
+        array< void functionref( entity weapon, WeaponPrimaryAttackParams attackParams, var ammoUsed ) > callbacks = file.weaponClassCallbacks[weaponClass]
+        foreach ( callback in callbacks )
+            callback( weapon, attackParams, ammoUsed )
+    }
+
+    entity owner = weapon.GetWeaponOwner()
+    if ( !IsValid( owner ) )
+        return
+
+    string ownerClass = owner.GetClassName()
+    if ( ownerClass in file.ownerClassCallbacks )
+    {
+        array< void functionref( entity weapon, WeaponPrimaryAttackParams attackParams, var ammoUsed ) > callbacks = file.ownerClassCallbacks[ownerClass]
+        foreach ( callback in callbacks )
+            callback( weapon, attackParams, ammoUsed )
     }
-    OnWeaponFired(weapon, attackParams)
-    return result
 }
 
-var function WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_doubletake( entity weapon, WeaponPrimaryAttackParams attackParams )
+var function WeaponFireCallbacks_OnWeaponPrimaryAttack( entity weapon, WeaponPrimaryAttackParams attackParams )
 {
-    var result = OnWeaponPrimaryAttack_weapon_doubletake(weapon, attackParams)
-    if(result == 0){
+    weapon.EmitWeaponNpcSound( LOUD_WEAPON_AI_SOUND_RADIUS_MP, 0.2 )
+    var result = weapon.FireWeaponBullet( attackParams.pos, attackParams.dir, 1, weapon.GetWeaponDamageFlags() )
+    if ( result == 0 )
         return 0
-    }
-    OnWeaponFired(weapon, attackParams)
+    WeaponFireCallbacks_OnWeaponFired( weapon, attackParams, result )
     return result
 }
 
-var function WeaponFireCallbacks_OnWeaponPrimaryAttack_lmg( entity weapon, WeaponPrimaryAttackParams attackParams )
+#if SERVER
+var function WeaponFireCallbacks_OnWeaponNpcPrimaryAttack( entity weapon, WeaponPrimaryAttackParams attackParams )
 {
-    var result = OnWeaponPrimaryAttack_lmg(weapon, attackParams)
-    if(result == 0){
+    weapon.EmitWeaponNpcSound( LOUD_WEAPON_AI_SOUND_RADIUS_MP, 0.2 )
+    var result = weapon.FireWeaponBullet( attackParams.pos, attackParams.dir, 1, weapon.GetWeaponDamageFlags() )
+    if ( result == 0 )
         return 0
-    }
-    OnWeaponFired(weapon, attackParams)
-    return result
-}
-
-var function WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_lstar( entity weapon, WeaponPrimaryAttackParams attackParams )
-{
-    var result = OnWeaponPrimaryAttack_weapon_lstar(weapon, attackParams)
-    if(result == 0){
-        return 0
-    }
-    OnWeaponFired(weapon, attackParams)
-    return result
-}
-
-var function WeaponFireCallbacks_OnWeaponPrimaryAttack_mastiff( entity weapon, WeaponPrimaryAttackParams attackParams )
-{
-    var result = OnWeaponPrimaryAttack_weapon_mastiff(weapon, attackParams)
-    if(result == 0){
-        return 0
-    }
-    OnWeaponFired(weapon, attackParams)
-    return result
-}
-
-var function WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_mgl( entity weapon, WeaponPrimaryAttackParams attackParams )
-{
-    var result = OnWeaponPrimaryAttack_weapon_mgl(weapon, attackParams)
-    if(result == 0){
-        return 0
-    }
-    OnWeaponFired(weapon, attackParams)
-    return result
-}
-
-var function WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_rocket_launcher( entity weapon, WeaponPrimaryAttackParams attackParams )
-{
-    var result = OnWeaponPrimaryAttack_weapon_rocket_launcher(weapon, attackParams)
-    if(result == 0){
-        return 0
-    }
-    OnWeaponFired(weapon, attackParams)
-    return result
-}
-
-var function WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_shotgun( entity weapon, WeaponPrimaryAttackParams attackParams )
-{
-    var result = OnWeaponPrimaryAttack_weapon_shotgun(weapon, attackParams)
-    if(result == 0){
-        return 0
-    }
-    OnWeaponFired(weapon, attackParams)
-    return result
-}
-
-var function WeaponFireCallbacks_OnWeaponPrimaryAttack_shotgun_doublebarrel( entity weapon, WeaponPrimaryAttackParams attackParams )
-{
-    var result = OnWeaponPrimaryAttack_shotgun_doublebarrel(weapon, attackParams)
-    if(result == 0){
-        return 0
-    }
-    OnWeaponFired(weapon, attackParams)
-    return result
-}
-
-var function WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_shotgun_pistol( entity weapon, WeaponPrimaryAttackParams attackParams )
-{
-    var result = OnWeaponPrimaryAttack_weapon_shotgun_pistol(weapon, attackParams)
-    if(result == 0){
-        return 0
-    }
-    OnWeaponFired(weapon, attackParams)
-    return result
-}
-
-var function WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_smart_pistol( entity weapon, WeaponPrimaryAttackParams attackParams )
-{
-    var result = OnWeaponPrimaryAttack_weapon_smart_pistol(weapon, attackParams)
-    if(result == 0){
-        return 0
-    }
-    OnWeaponFired(weapon, attackParams)
-    return result
-}
-
-var function WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_smr( entity weapon, WeaponPrimaryAttackParams attackParams )
-{
-    var result = OnWeaponPrimaryAttack_weapon_smr(weapon, attackParams)
-    if(result == 0){
-        return 0
-    }
-    OnWeaponFired(weapon, attackParams)
-    return result
-}
-
-var function WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_sniper( entity weapon, WeaponPrimaryAttackParams attackParams )
-{
-    var result = OnWeaponPrimaryAttack_weapon_sniper(weapon, attackParams)
-    if(result == 0){
-        return 0
-    }
-    OnWeaponFired(weapon, attackParams)
-    return result
-}
-
-var function WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_softball( entity weapon, WeaponPrimaryAttackParams attackParams )
-{
-    var result = OnWeaponPrimaryAttack_weapon_softball(weapon, attackParams)
-    if(result == 0){
-        return 0
-    }
-    OnWeaponFired(weapon, attackParams)
-    return result
-}
-
-var function WeaponFireCallbacks_OnWeaponPrimaryAttack_weapon_generic( entity weapon, WeaponPrimaryAttackParams attackParams ){
-    OnWeaponFired(weapon, attackParams)
-}
-
-var function WeaponFireCallbacks_OnWeaponPrimaryAttack_GenericBoltWithDrop_Player( entity weapon, WeaponPrimaryAttackParams attackParams ){
-    var result = OnWeaponPrimaryAttack_GenericBoltWithDrop_Player(weapon, attackParams)
-    if(result == 0){
-        return 0
-    }
-    OnWeaponFired(weapon, attackParams)
+    WeaponFireCallbacks_OnWeaponFired( weapon, attackParams, result )
     return result
 }
+#endif