ACF damage permission changes (#12)

* Add ACF squishy damage override

* Remove ACF damage gravgun check

* update warden's ui for new ACF config

* always call the old ACF.Check

* update help text

* remove commented code

---------

Co-authored-by: textstack <[email protected]>

Author: Bonyoze

lua/warden/gui/cl_menu.lua

@@ -13,6 +13,8 @@ local function setPerms(panel)
 	panel:CheckBox(Warden.L("Let me touch my own entities"), "warden_touch_self")
 	panel:CheckBox(Warden.L("Save my perms across sessions"), "warden_perm_persist")
 
+	hook.Run("WardenPermsHeader", panel)
+
 	setPermPnl = vgui.Create("WardenSetPerms")
 	panel:AddItem(setPermPnl)
 

lua/warden/intercompat/cl_acf.lua

@@ -1,44 +1,14 @@
+CreateClientConVar("warden_acf_squishy_damage", "1", true, true, "Whether ACF should treat all your entities as squishy when inflicting damage", 0, 1)
+
 hook.Add("WardenSettingsExtra", "WardenACF", function(panel)
 	if not GetGlobalBool("WardenACF", false) then return end
 
 	Warden.AddSpacer(panel)
 	Warden.SetUpCheck(panel, "Override ACF's perms", "override_acf")
 end)
 
-local function paintOverACF(item)
-	item.OldCPanelFunction = item.OldCPanelFunction or item.CPanelFunction
-	if not item.OldCPanelFunction then return end
-
-	function item.CPanelFunction(panel)
-		item.OldCPanelFunction(panel)
-
-		function panel:PaintOver(w, h)
-			local headerHeight = self:GetHeaderHeight()
-
-			if headerHeight >= h then return end
-			if not Warden.GetServerBool("override_acf", false) then return end
-
-			surface.SetDrawColor(255, 0, 0)
-			surface.DrawOutlinedRect(0, headerHeight, w, h - headerHeight, 2)
-		end
-	end
-end
-
-local function acfOverride()
-	local toolMenu = spawnmenu.GetToolMenu("Utilities")
-	for _, v in ipairs(toolMenu) do
-		if v.ItemName ~= "ACF" then continue end
-
-		for _, v1 in ipairs(v) do
-			paintOverACF(v1)
-		end
-	end
-end
+hook.Add("WardenPermsHeader", "WardenACF", function(panel)
+	if not GetGlobalBool("WardenACF", false) then return end
 
-hook.Add("PopulateToolMenu", "WardenACF", function()
-	timer.Simple(0, function()
-		if GetGlobalBool("WardenACF", false) then
-			acfOverride()
-		end
-	end)
-end)
+	panel:CheckBox(Warden.L("Make my entities ACF-squishy"), "warden_acf_squishy_damage")
+end)

lua/warden/intercompat/sv_acf.lua

@@ -1,5 +1,5 @@
 hook.Add("PostGamemodeLoaded", "WardenACFCompat", function()
-	if not ACF or not ACF.Permissions then return end
+	if not ACF or not ACF.Permissions or not ACF.Damage then return end
 
 	local oldCanDamage = ACF.Permissions.CanDamage
 	function ACF.Permissions.CanDamage(ent, _, dmgInfo)
@@ -12,12 +12,47 @@ hook.Add("PostGamemodeLoaded", "WardenACFCompat", function()
 
 		local attacker = dmgInfo:GetAttacker()
 		if not Warden.CheckPermission(attacker, ent, Warden.PERMISSION_DAMAGE) then return false end
-		if not Warden.CheckPermission(attacker, ent, Warden.PERMISSION_GRAVGUN) then return false end
 
-		return true
+		return oldCanDamage(ent, nil, dmgInfo)
 	end
 
 	hook.Add("ACF_PreDamageEntity", "ACF_DamagePermissionCore", ACF.Permissions.CanDamage)
 
+	local doSquishyDamage = ACF.Damage.doSquishyDamage
+
+	local function isForcedSquishy(ent)
+		local owner = ent:WardenGetOwner()
+		return IsValid(owner) and owner:IsPlayer() and owner:GetInfoNum("warden_acf_squishy_damage", 1) ~= 0
+	end
+
+	local function overrideOnDamage(self, ...)
+		-- use the squishy damage handler instead of the entity's custom method
+		if isForcedSquishy(self) then
+			return doSquishyDamage(self, ...)
+		end
+		return self:ACF_OldOnDamage(...)
+	end
+
+	local oldCheck = ACF.Check
+	function ACF.Check(ent, forceUpdate)
+		local value = oldCheck(ent, forceUpdate)
+		if value ~= false then
+			if isForcedSquishy(ent) then
+				if ent.ACF_OnDamage and not ent.ACF_OldOnDamage then
+					ent.ACF_OldOnDamage = ent.ACF_OnDamage
+					ent.ACF_OnDamage = overrideOnDamage
+				end
+				-- tell ACF to treat this entity as squishy
+				return "Squishy"
+			else
+				if ent.ACF_OldOnDamage then
+					ent.ACF_OnDamage = ent.ACF_OldOnDamage
+					ent.ACF_OldOnDamage = nil
+				end
+			end
+		end
+		return value
+	end
+
 	SetGlobalBool("WardenACF", true)
 end)

resource/localization/en-PT/warden.properties

@@ -109,4 +109,5 @@ warden.notify_the_server_on_cleanup=Tell the whole ship when swabbing
 warden.allow_physgun_reload=Allow physgun reload
 warden.notify_when_perms_are_granted-revoked=Say when perms are given/stolen
 warden.-s_has_granted_you_-s_access=%s has given you %s access
-warden.-s_has_revoked_-s_access_from_you=%s has stolen %s access from you
+warden.-s_has_revoked_-s_access_from_you=%s has stolen %s access from you
+warden.make_my_entities_acf-squishy=Make my things ACF-squishy

resource/localization/en/warden.properties

@@ -109,4 +109,5 @@ warden.notify_the_server_on_cleanup=Notify the server on cleanup
 warden.allow_physgun_reload=Allow physgun reload
 warden.notify_when_perms_are_granted-revoked=Notify when perms are granted/revoked
 warden.-s_has_granted_you_-s_access=%s has granted you %s access
-warden.-s_has_revoked_-s_access_from_you=%s has revoked %s access from you
+warden.-s_has_revoked_-s_access_from_you=%s has revoked %s access from you
+warden.make_my_entities_acf-squishy=Make my entities ACF-squishy