Skip to content

Commit

Permalink
One more hook naming pass
Browse files Browse the repository at this point in the history
ACF_OnMissileLaunched -> ACF_OnLaunchMissile
  • Loading branch information
thecraftianman committed Jan 15, 2025
1 parent df4ac44 commit d57b9a1
Show file tree
Hide file tree
Showing 11 changed files with 19 additions and 18 deletions.
2 changes: 1 addition & 1 deletion lua/acf/core/laser/laser_sv.lua
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,6 @@ hook.Add("ACF_OnLoadPlayer", "ACF Laser Setup", function(Player)
net.Send(Player)
end)

hook.Add("ACF_OnMissileLaunched", "ACF Laser Filter Update", function(Missile)
hook.Add("ACF_OnLaunchMissile", "ACF Laser Filter Update", function(Missile)
ACF.FilterLaserEntity(Missile)
end)
2 changes: 1 addition & 1 deletion lua/acf/entities/ammo_types/flare.lua
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ function Ammo:GetDisplayData(Data)
BurnTime = Data.BurnTime,
}

hook.Run("ACF_OnGetDisplayData", self, Data, Display)
hook.Run("ACF_OnRequestDisplayData", self, Data, Display)

return Display
end
Expand Down
2 changes: 1 addition & 1 deletion lua/acf/entities/components/computers.lua
Original file line number Diff line number Diff line change
Expand Up @@ -266,7 +266,7 @@ do -- Optical guidance computer
return math.floor(Value * 0.00254) * 393.7
end

hook.Add("ACF_OnMissileLaunched", "ACF Optical Computer Filter", function(Missile)
hook.Add("ACF_OnLaunchMissile", "ACF Optical Computer Filter", function(Missile)
for Computer in pairs(Computers) do
local Filter = Computer.Filter

Expand Down
3 changes: 2 additions & 1 deletion lua/acf/hooks/hooks_missiles_sv.lua
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ local Hooks = ACF.Utilities.Hooks
Hooks.Add("ACF_Missiles_Server", function(Gamemode)
--- Called after a missile is fired.
--- @param Entity entity The missile entity that was launched.
function Gamemode:ACF_OnMissileLaunched()
function Gamemode:ACF_OnLaunchMissile()
end

--- Called when a missile attempts to create an explosion.
Expand All @@ -17,6 +17,7 @@ Hooks.Add("ACF_Missiles_Server", function(Gamemode)

--- Called when a missile plays its sound if the ACF Sound Extension Project by looterz is installed.
--- This is a legacy hook from ACF-2 and may be removed at any time.
--- @deprecated
--- @param Entity entity The missile entity to play sound on.
--- @param Sound string The sound to play.
function Gamemode:ACF_SOUND_MISSILE()
Expand Down
2 changes: 1 addition & 1 deletion lua/acf/menu/items_cl/missiles.lua
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,6 @@ end

ACF.AddMenuItem(101, "Entities", "Missiles", "wand", CreateMenu)

hook.Add("ACF_PreCreateTraceControls", "ACF Missiles Remove Tracer Checkbox", function(_, ToolData)
hook.Add("ACF_PreCreateTracerControls", "ACF Missiles Remove Tracer Checkbox", function(_, ToolData)
if ToolData.PrimaryClass == "acf_rack" then return false end
end)
4 changes: 2 additions & 2 deletions lua/entities/acf_computer/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@ do -- Spawn and update function
Class.OnSpawn(Entity, Data, Class, Computer)
end

hook.Run("ACF_OnEntitySpawn", "acf_computer", Entity, Data, Class, Computer)
hook.Run("ACF_OnSpawnEntity", "acf_computer", Entity, Data, Class, Computer)

WireLib.TriggerOutput(Entity, "Entity", Entity)

Expand Down Expand Up @@ -280,7 +280,7 @@ do -- Spawn and update function
Class.OnUpdate(self, Data, Class, Computer)
end

hook.Run("ACF_OnEntityUpdate", "acf_computer", self, Data, Class, Computer)
hook.Run("ACF_OnUpdateEntity", "acf_computer", self, Data, Class, Computer)

self:UpdateOverlay(true)

Expand Down
2 changes: 1 addition & 1 deletion lua/entities/acf_glatgm/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ function MakeACF_GLATGM(Gun, BulletData)

Missiles[Entity] = true

hook.Run("ACF_OnMissileLaunched", Entity)
hook.Run("ACF_OnLaunchMissile", Entity)

return Entity
end
Expand Down
6 changes: 3 additions & 3 deletions lua/entities/acf_missile/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@ hook.Add("CanDrive", "acf_missile_CanDrive", function(_, Entity)
if ActiveMissiles[Entity] then return false end
end)

hook.Add("ACF_OnMissileLaunched", "ACF Missile Rack Filter", function(Missile)
hook.Add("ACF_OnLaunchMissile", "ACF Missile Rack Filter", function(Missile)
local Count = #Missile.Filter

for K in pairs(ActiveMissiles) do
Expand Down Expand Up @@ -408,7 +408,7 @@ function MakeACF_Missile(Player, Pos, Ang, Rack, MountPoint, Crate)
Missile.Inputs = WireLib.CreateInputs(Missile, Inputs)
Missile.Outputs = WireLib.CreateOutputs(Missile, Outputs)

hook.Run("ACF_OnEntitySpawn", "acf_missile", Missile, Data, Class, Crate)
hook.Run("ACF_OnSpawnEntity", "acf_missile", Missile, Data, Class, Crate)

WireLib.TriggerOutput(Missile, "Entity", Missile)

Expand Down Expand Up @@ -549,7 +549,7 @@ function ENT:Launch(Delay, IsMisfire)
UpdateBodygroups(self, "OnLaunch")
UpdateSkin(self)

hook.Run("ACF_OnMissileLaunched", self)
hook.Run("ACF_OnLaunchMissile", self)
end

function ENT:DoFlight(ToPos, ToDir)
Expand Down
6 changes: 3 additions & 3 deletions lua/entities/acf_rack/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -215,7 +215,7 @@ do -- Spawning and Updating --------------------
RackData.OnSpawn(Rack, Data, RackData)
end

hook.Run("ACF_OnEntitySpawn", "acf_rack", Rack, Data, RackData)
hook.Run("ACF_OnSpawnEntity", "acf_rack", Rack, Data, RackData)

WireLib.TriggerOutput(Rack, "Rate of Fire", 60)
WireLib.TriggerOutput(Rack, "Reload Time", 1)
Expand Down Expand Up @@ -284,7 +284,7 @@ do -- Spawning and Updating --------------------
Rack.OnUpdate(self, Data, Rack)
end

hook.Run("ACF_OnEntityUpdate", "acf_rack", self, Data, Rack)
hook.Run("ACF_OnUpdateEntity", "acf_rack", self, Data, Rack)

local Crates = self.Crates

Expand Down Expand Up @@ -551,7 +551,7 @@ do -- Firing -----------------------------------
function ENT:Shoot()
local Index, Point = self:GetNextMountPoint("Loaded", self.PointIndex)
local Delay = self.FireDelay
local CanFire = hook.Run("ACF_WeaponCanFire", self)
local CanFire = hook.Run("ACF_PreFireWeapon", self)

if Index and CanFire then
ShootMissile(self, Point)
Expand Down
4 changes: 2 additions & 2 deletions lua/entities/acf_radar/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -417,7 +417,7 @@ do -- Spawn and Update functions
Class.OnSpawn(Radar, Data, Class, RadarData)
end

hook.Run("ACF_OnEntitySpawn", "acf_radar", Radar, Data, Class, RadarData)
hook.Run("ACF_OnSpawnEntity", "acf_radar", Radar, Data, Class, RadarData)

WireLib.TriggerOutput(Radar, "Entity", Radar)

Expand Down Expand Up @@ -474,7 +474,7 @@ do -- Spawn and Update functions
Class.OnUpdate(self, Data, Class, Radar)
end

hook.Run("ACF_OnEntityUpdate", "acf_radar", self, Data, Class, Radar)
hook.Run("ACF_OnUpdateEntity", "acf_radar", self, Data, Class, Radar)

self:UpdateOverlay(true)

Expand Down
4 changes: 2 additions & 2 deletions lua/entities/acf_receiver/init.lua
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,7 @@ do -- Spawn and Update functions
Class.OnSpawn(Receiver, Data, Class, ReceiverData)
end

hook.Run("ACF_OnEntitySpawn", "acf_receiver", Receiver, Data, Class, ReceiverData)
hook.Run("ACF_OnSpawnEntity", "acf_receiver", Receiver, Data, Class, ReceiverData)

WireLib.TriggerOutput(Receiver, "Entity", Receiver)

Expand Down Expand Up @@ -252,7 +252,7 @@ do -- Spawn and Update functions
Class.OnUpdate(self, Data, Class, Receiver)
end

hook.Run("ACF_OnEntityUpdate", "acf_Receiver", self, Data, Class, Receiver)
hook.Run("ACF_OnUpdateEntity", "acf_Receiver", self, Data, Class, Receiver)

self:UpdateOverlay(true)

Expand Down

0 comments on commit d57b9a1

Please sign in to comment.