ACF squishy by default setting (#16)

* make squishty damage off by default

* squishy by default setting

* check shows default

Author: textstack

lua/warden/gui/cl_menu.lua

@@ -5,15 +5,18 @@ end)
 local setPermPnl
 local setPermPnlExtra
 local checks = {}
+local permChecks = {}
 
 local function setPerms(panel)
+	permChecks = {}
+
 	panel:Help(Warden.L("Configure prop protection settings."))
 
 	panel:CheckBox(Warden.L("Let me touch others' entities"), "warden_touch")
 	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)
+	hook.Run("WardenPermsHeader", panel, permChecks)
 
 	setPermPnl = vgui.Create("WardenSetPerms")
 	panel:AddItem(setPermPnl)
@@ -123,6 +126,10 @@ local function setPerms(panel)
 
 	setPermPnlExtra = panel
 
+	for _, v in ipairs(permChecks) do
+		v()
+	end
+
 	panel.Refresh()
 end
 
@@ -297,7 +304,7 @@ local function serverSettings(panel)
 	Warden.SetUpCheck(panel, "Allow physics damage", "phy_damage")
 	Warden.SetUpCheck(panel, "Burning players take damage", "fire_damage")
 
-	hook.Run("WardenSettingsPlayers", panel)
+	hook.Run("WardenSettingsPlayers", panel, checks)
 
 	Warden.AddSpacer(panel)
 
@@ -314,7 +321,7 @@ local function serverSettings(panel)
 	Warden.SetUpWang(panel, "Default admin level", "default_admin_level", Warden.ADMIN_LEVEL_MIN, Warden.ADMIN_LEVEL_MAX)
 	Warden.SetUpWang(panel, "AL to bypass filters", "admin_level_filter_bypass", Warden.ADMIN_LEVEL_MIN_1, Warden.ADMIN_LEVEL_MAX)
 
-	hook.Run("WardenSettingsExtra", panel)
+	hook.Run("WardenSettingsExtra", panel, checks)
 
 	Warden.AddSpacer(panel)
 
@@ -353,6 +360,10 @@ hook.Add("SpawnMenuOpened", "Warden", function()
 	for _, v in ipairs(checks) do
 		v()
 	end
+
+	for _, v in ipairs(permChecks) do
+		v()
+	end
 end)
 
 hook.Add("WardenRepopSetPerms", "Warden", function()

lua/warden/intercompat/cl_acf.lua

@@ -1,14 +1,32 @@
-CreateClientConVar("warden_acf_squishy_damage", "1", true, true, "Whether ACF should treat all your entities as squishy when inflicting damage", 0, 1)
+local cvarSquishy = CreateClientConVar("warden_acf_squishy_damage", "-1", true, true, "Whether ACF should treat all your entities as squishy when inflicting damage", -1, 1)
 
 hook.Add("WardenSettingsExtra", "WardenACF", function(panel)
 	if not GetGlobalBool("WardenACF", false) then return end
 
 	Warden.AddSpacer(panel)
+	Warden.SetUpCheck(panel, "ACF-squishy by default", "acf_default_squishy_damage")
 	Warden.SetUpCheck(panel, "Override ACF's perms", "override_acf")
 end)
 
-hook.Add("WardenPermsHeader", "WardenACF", function(panel)
+hook.Add("WardenPermsHeader", "WardenACF", function(panel, checks)
 	if not GetGlobalBool("WardenACF", false) then return end
 
-	panel:CheckBox(Warden.L("Make my entities ACF-squishy"), "warden_acf_squishy_damage")
+	local check = panel:CheckBox(Warden.L("Make my entities ACF-squishy"))
+
+	function check:OnChange(val)
+		cvarSquishy:SetBool(val)
+	end
+
+	table.insert(checks, function()
+		if not IsValid(check) then return end
+
+		local val = cvarSquishy:GetInt()
+		if val < 0 then
+			val = Warden.GetServerBool("acf_default_squishy_damage", true)
+		else
+			val = val ~= 0
+		end
+
+		check:SetChecked(val)
+	end)
 end)

lua/warden/intercompat/sv_acf.lua

@@ -22,7 +22,12 @@ hook.Add("PostGamemodeLoaded", "WardenACFCompat", function()
 
 	local function isForcedSquishy(ent)
 		local owner = ent:WardenGetOwner()
-		return IsValid(owner) and owner:IsPlayer() and owner:GetInfoNum("warden_acf_squishy_damage", 1) ~= 0
+		if not IsValid(owner) or not owner:IsPlayer() then return false end
+
+		local squishy = owner:GetInfoNum("warden_acf_squishy_damage", -1)
+		if squishy < 0 then return Warden.GetServerBool("acf_default_squishy_damage", true) end
+
+		return squishy ~= 0
 	end
 
 	local function overrideOnDamage(self, ...)

lua/warden_framework/sh_defaults.lua

@@ -77,6 +77,8 @@ Warden.SetDefaultServerSetting("admin_level_needs_admin", true)
 Warden.SetDefaultServerSetting("default_admin_level", 0)
 Warden.SetDefaultServerSetting("admin_level_filter_bypass", 4)
 
+Warden.SetDefaultServerSetting("acf_default_squishy_damage", true)
+
 local function onCami()
 	local cmdType = GetGlobalString("WardenCommands")
 	if not CAMI and cmdType == "" then return end

resource/localization/en-PT/warden.properties

@@ -111,4 +111,5 @@ 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.make_my_entities_acf-squishy=Make my things ACF-squishy
-warden.burning_players_take_damage=Burning pirates get hurt
+warden.burning_players_take_damage=Burning pirates get hurt
+warden.acf-squishy_by_default=ACF-squishy by default

resource/localization/en/warden.properties

@@ -111,4 +111,5 @@ warden.notify_when_perms_are_granted-revoked=Notify when perms are granted/revok
 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.make_my_entities_acf-squishy=Make my entities ACF-squishy
-warden.burning_players_take_damage=Burning players take damage
+warden.burning_players_take_damage=Burning players take damage
+warden.acf-squishy_by_default=ACF-squishy by default