Body armour adjustments (#1783)

- adds a new cvar for blocking crowbar damage
- removed crowbar damage being reduced by "classic" armour: crowbar
damage was never blocked by armour in ttt
- set headshot damage to be reduced by default: this was never an
oversight or mistake in ttt, it is a deliberate balance change, body
armour initially only protected against shots to the torso but bku
updated it to also protect against headshots and limbshots
- adds TTT2ArmorHandlePlayerTakeDamage hook (probably needs a better
name)

this is a draft because this is untested right now, will test later

Author: wgetJane

CHANGELOG.md

@@ -9,16 +9,20 @@ All notable changes to TTT2 will be documented here. Inspired by [keep a changel
 - Added C4 cvars for adjusting the range & falloff of C4 explosions (by @Spanospy)
   - C4 explosions will now also respect the weapon's configured damage scaling
 - Added option to select preferred unit of length for distance displays (by @wgetJane)
+- Added `GM:TTT2ArmorHandlePlayerTakeDamage` hook for modifying/overriding armor behavior (by @wgetJane)
+- Added server option for body armor to protect against crowbar damage (by @wgetJane)
 - Added `GM:TTTLastWordsMsg` hook from base TTT (Facepunch/garrysmod/pull/2227, by @wgetJane)
 - Port new TTT entity ttt_filter_role to TTT2 (Facepunch/garrysmod/pull/2225 by @figardo, ported by @wgetJane)
 
 ### Changed
+
 - Updated Russian and English localization files (by @Satton2)
 - Updated the list of troublesome addons used by the addonchecker
-- Allow workshop addons to pack rearm scripts (Facepunch/garrysmod/pull/2139, by @figardo)
+- Changed option for body armor to protect against headshot damage by default (by @wgetJane)
 
 ### Fixed
 
+- Fixed classic armour protecting against crowbar damage (by @wgetJane)
 - Fixed C4/Radio sounds not playing outside of PAS (Facepunch/garrysmod/pull/2203, by @figardo)
 - Fixed players sometimes being revealed as dead when they chat/voicechat right as they die (Facepunch/garrysmod/pull/2229, by @wgetJane)
 

gamemodes/terrortown/gamemode/server/sv_armor.lua

@@ -64,7 +64,7 @@ ARMOR.cv = {
     -- @realm server
     item_armor_block_headshots = CreateConVar(
         "ttt_item_armor_block_headshots",
-        0,
+        1,
         { FCVAR_NOTIFY, FCVAR_ARCHIVE }
     ),
 
@@ -75,6 +75,14 @@ ARMOR.cv = {
         0,
         { FCVAR_NOTIFY, FCVAR_ARCHIVE }
     ),
+
+    ---
+    -- @realm server
+    item_armor_block_clubdmg = CreateConVar(
+        "ttt_item_armor_block_clubdmg",
+        0,
+        { FCVAR_NOTIFY, FCVAR_ARCHIVE }
+    ),
 }
 
 hook.Add("TTT2SyncGlobals", "AddArmorGlobals", function()
@@ -160,10 +168,15 @@ function ARMOR:HandlePlayerTakeDamage(ply, infl, att, amount, dmginfo)
         return
     end
 
+    -- handle if crowbar damage should be ignored by the armor
+    if dmginfo:IsDamageType(DMG_CLUB) and not self.cv.item_armor_block_clubdmg:GetBool() then
+        return
+    end
+
     -- fallback for players who prefer the vanilla armor
     if not self.cv.armor_dynamic:GetBool() then
-        -- classic armor only shields from bullet/crowbar damage
-        if dmginfo:IsDamageType(DMG_BULLET) or dmginfo:IsDamageType(DMG_CLUB) then
+        -- classic armor only shields from bullet damage
+        if dmginfo:IsDamageType(DMG_BULLET) then
             dmginfo:ScaleDamage(0.7)
         end
 
@@ -191,6 +204,19 @@ function ARMOR:HandlePlayerTakeDamage(ply, infl, att, amount, dmginfo)
     dmginfo:SetDamage(damageReduced * self.cv.health_factor + damage - damageReduced)
 end
 
+---
+-- Handles the @{ARMOR} of a @{Player}, called by @{GM:PlayerTakeDamage}
+-- @param Player ply The @{Player} taking damage
+-- @param Entity infl The inflictor
+-- @param Player|Entity att The attacker
+-- @param number amount Amount of damage
+-- @param CTakeDamageInfo dmginfo Damage info
+-- @realm server
+-- @hook
+function GM:TTT2ArmorHandlePlayerTakeDamage(ply, infl, att, amount, dmginfo)
+    return ARMOR:HandlePlayerTakeDamage(ply, infl, att, amount, dmginfo)
+end
+
 ---
 -- @class Player
 

gamemodes/terrortown/gamemode/server/sv_player.lua

@@ -1486,9 +1486,11 @@ function GM:PlayerTakeDamage(ent, infl, att, amount, dmginfo)
             dmginfo:ScaleDamage(att:GetDamageFactor())
         end
 
+        --
         -- before the karma is calculated, but after all other damage hooks / damage change is processed,
         -- the armor system should come into place (GM functions are called last)
-        ARMOR:HandlePlayerTakeDamage(ent, infl, att, amount, dmginfo)
+        -- @realm server
+        hook.Run("TTT2ArmorHandlePlayerTakeDamage", ent, infl, att, amount, dmginfo)
 
         if ent ~= att then
             -- process the effects of the damage on karma

lua/terrortown/lang/en.lua

@@ -1609,7 +1609,7 @@ Haste mode balances the game by increasing the round time with every dead player
 If haste mode is enabled, the fixed round time is ignored.]]
 L.help_round_limit = "After one of the set limit conditions is met, a map change is triggered."
 L.help_armor_balancing = "The following values can be used to balance the armor."
-L.help_item_armor_classic = "If classic armor mode is enabled, only the previous settings matter. Classic armor mode means that a player can only buy armor once in a round, and that this armor blocks 30% of the incoming bullet and crowbar damage until they die."
+L.help_item_armor_classic = "If classic armor mode is enabled, only the previous settings matter. Classic armor mode means that a player can only buy armor once in a round, and that this armor blocks 30% of the incoming bullet damage until they die."
 L.help_item_armor_dynamic = [[
 Dynamic armor is the TTT2 approach to make armor more interesting. The amount of armor that can be bought is now unlimited, and the armor value stacks. Getting damaged decreases the armor value. The armor value per bought armor item is set in the 'Equipment Settings' of said item.
 
@@ -2829,3 +2829,6 @@ L.choice_distance_unit_0 = "Inches"
 L.choice_distance_unit_1 = "Meters"
 L.choice_distance_unit_2 = "Yards"
 L.choice_distance_unit_3 = "Feet"
+
+-- 2025-03-06
+L.label_armor_block_clubdmg = "Enable armor blocking crowbar damage"

lua/terrortown/menus/gamemode/administration/playersettings.lua

@@ -36,6 +36,11 @@ function CLGAMEMODESUBMENU:Populate(parent)
         label = "label_armor_block_blastdmg",
     })
 
+    form2:MakeCheckBox({
+        serverConvar = "ttt_item_armor_block_clubdmg",
+        label = "label_armor_block_clubdmg",
+    })
+
     form2:MakeHelp({
         label = "help_item_armor_classic",
     })