Fix debris error

Also trying to slightly unbreak the weapons menu
ACF-Team · Jan 22, 2025 · 81355df · 81355df
1 parent edc34df
commit 81355df
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 13 deletions.
diff --git a/lua/acf/damage/debris_cl.lua b/lua/acf/damage/debris_cl.lua
@@ -1,5 +1,5 @@
-local ACF     = ACF
-
+local ACF         = ACF
+local Damage      = ACF.Damage
 local Effects     = ACF.Utilities.Effects
 local AllowDebris = GetConVar("acf_debris")
 local AutoLod     = GetConVar("acf_debris_autolod")
@@ -192,7 +192,7 @@ local function CreateGib(Position, Angles, Material, Color, Normal, Power, Min,
     return true
 end
 
-function ACF.CreateDebris(Model, Position, Angles, Material, Color, Normal, Power, CanGib, Ignite)
+function Damage.CreateDebris(Model, Position, Angles, Material, Color, Normal, Power, CanGib, Ignite)
     if not AllowDebris:GetBool() then return end
     if not Model then return end
 
@@ -238,7 +238,7 @@ local function SpawnDebris(EntID, Normal, Power, CanGib, Ignite)
 
         local NewColor = EntInfo.Color:ToVector() * math.Rand(0.3, 0.6)
 
-        ACF.CreateDebris(
+        Damage.CreateDebris(
             EntInfo.Model,
             EntInfo.Position,
             EntInfo.Angles,

diff --git a/lua/acf/menu/items_cl/ammo_menu.lua b/lua/acf/menu/items_cl/ammo_menu.lua
@@ -199,7 +199,7 @@ end
 ---If the first is defined, this function will effectively do nothing.
 ---If the latter is defined, only the information regarding the ammo crate (armor, mass and capacity by default) will be omitted.
 ---@param ToolData table<string, any> The copy of the local player's client data variables.
-local function AddInformation(Base, ToolData)
+local function AddCrateInformation(Base, ToolData)
 	if Ammo.PreCreateCrateInformation then
 		local Result = Ammo:PreCreateCrateInformation(Base, ToolData, BulletData)
 
@@ -243,6 +243,8 @@ local function AddInformation(Base, ToolData)
 
 	if not Result then return end
 
+	AddCrateInformation(Base, ToolData)
+
 	if Ammo.OnCreateAmmoInformation then
 		Ammo:OnCreateAmmoInformation(Base, ToolData, BulletData)
 	end
@@ -370,8 +372,7 @@ end
 
 ---Updates and populates the current ammunition menu.
 ---@param Menu userdata The panel in which the entire ACF menu is being placed on.
----@param Settings? table<string, boolean> The lookup table containing all the settings for the menu.
-function ACF.UpdateAmmoMenu(Menu, Settings)
+function ACF.UpdateAmmoMenu(Menu)
 	if not Ammo then return end
 
 	local ToolData = ACF.GetAllClientData()
@@ -397,15 +398,12 @@ function ACF.UpdateAmmoMenu(Menu, Settings)
 		Ammo:OnCreateAmmoMenu(Base, ToolData, BulletData)
 	end
 
-	if not Settings.SuppressMenu then
-		AddGraph(Base, ToolData)
-	end
-
 	hook.Run("ACF_OnCreateAmmoMenu", Base, ToolData, Ammo, BulletData)
 
 	AddPreview(Base, ToolData)
 	AddControls(Base, ToolData)
 	AddInformation(Base, ToolData)
+	AddGraph(Base, ToolData)
 
 	Menu:EndTemporal(Base)
 end
@@ -474,7 +472,7 @@ function ACF.CreateAmmoMenu(Menu)
 
 		Desc:SetText(Data.Description)
 
-		ACF.UpdateAmmoMenu(Menu, {})
+		ACF.UpdateAmmoMenu(Menu)
 	end
 
 	Menu.AmmoBase = Base

diff --git a/lua/acf/menu/items_cl/scanner.lua b/lua/acf/menu/items_cl/scanner.lua
@@ -17,7 +17,6 @@ This was designed to help the community hold each other accountable, and can hel
 
     playerList:AddColumn("Player Name")
     local function PopulatePlayerList()
-        print("PopulatePlayerList called")
         local _, selected = playerList:GetSelectedLine()
         if IsValid(selected) and IsValid(selected.player) then
             selected = selected.player