Armor: Armor system

gamemodes/terrortown/entities/weapons/weapon_ttt_armor.lua

@@ -0,0 +1,43 @@
+SWEP.Base = "weapon_tttbase"
+
+SWEP.Spawnable = true
+SWEP.AutoSpawnable = false
+SWEP.AdminSpawnable = true
+SWEP.AllowDrop = false
+
+SWEP.Kind = WEAPON_EXTRA
+
+if SERVER then
+	AddCSLuaFile()
+else
+	SWEP.PrintName = "Armor"
+
+
+	SWEP.Icon = "vgui/ttt/icon_armor"
+	SWEP.EquipMenuData = {
+		type = "Weapon",
+		desc = "ttt2_weapon_armor_desc"
+	}
+end
+
+SWEP.CanBuy = {ROLE_TRAITOR, ROLE_DETECTIVE}
+
+function SWEP:Equip(buyer)
+	if SERVER then
+		buyer:IncreaseArmor(30)
+		self:Remove()
+	end
+end
+
+-- REGISTER STATUS ICONS
+if CLIENT then
+	hook.Add("Initialize", "ttt2_base_register_armor_status", function() 
+		STATUS:RegisterStatus("ttt_weapon_armor", {
+			hud = {
+				Material("vgui/ttt/perks/hud_armor.png"),
+				Material("vgui/ttt/perks/hud_armor_reinforced.png")
+			},
+			type = "good"
+		})
+	end)
+end

gamemodes/terrortown/gamemode/client/cl_status.lua

@@ -8,14 +8,19 @@ STATUS.active = {}
 
 ---
 -- Registers a @{STATUS}
--- @param number id The index of the new status
+-- @param number id the index of the new status
 -- @param table data
 -- @return boolean whether the creation was successfully
 -- @realm client
 function STATUS:RegisterStatus(id, data)
 	if STATUS.registered[id] ~= nil then  -- name is not unique
 		return false
 	end
+
+	-- support single and multible icons per status effect
+	if data.hud.GetTexture then
+		data.hud = {data.hud}
+	end
 
 	STATUS.registered[id] = data
 
@@ -25,23 +30,26 @@ end
 ---
 -- Adds a status to the currently active ones
 -- @param number id The id of the registered @{STATUS}
+-- @param number active_icon
 -- @realm client
-function STATUS:AddStatus(id)
+function STATUS:AddStatus(id, active_icon)
 	if STATUS.registered[id] == nil then return end
 
 	STATUS.active[id] = table.Copy(STATUS.registered[id])
+	self:SetActiveIcon(id, active_icon or 1)
 end
 
 ---
 -- Adds a timed status to the currently active ones
 -- @param number id The id of the registered @{STATUS}
 -- @param number duration The duration of the @{STATUS}. If the time elapsed,
 -- the @{STATUS} will be removed automatically
+-- @param number active_icon
 -- @realm client
-function STATUS:AddTimedStatus(id, duration, showDuration)
+function STATUS:AddTimedStatus(id, duration, showDuration, active_icon)
 	if STATUS.registered[id] == nil or duration == 0 then return end
 
-	self:AddStatus(id)
+	self:AddStatus(id, active_icon)
 
 	STATUS.active[id].displaytime = CurTime() + duration
 
@@ -56,6 +64,41 @@ function STATUS:AddTimedStatus(id, duration, showDuration)
 	end
 end
 
+---
+-- Changes the active icon for a specifiv active effect for a given @{Player}
+-- @param number id The id of the registered @{STATUS}
+-- @param number active_icon
+-- @realm client
+function STATUS:SetActiveIcon(id, active_icon)
+	if STATUS.active[id] == nil then return end
+
+	local max_amount = (self.registered[id].hud.GetTexture) and 1 or #STATUS.registered[id].hud
+
+	if active_icon < 1 or active_icon > max_amount then
+		active_icon = 1
+	end
+
+	STATUS.active[id].active_icon = active_icon
+end
+
+---
+-- Checks if a @{STATUS} is registered
+-- @param number id the index of the status
+-- @return boolean whether the status is registered
+-- @realm client
+function STATUS:Registered(id)
+	return (STATUS.registered[id] ~= nil) and true or false
+end
+
+---
+-- Checks if a @{STATUS} is active
+-- @param number id the index of the status
+-- @return boolean whether the status is active
+-- @realm client
+function STATUS:Active(id)
+	return (STATUS.active[id] ~= nil) and true or false
+end
+
 ---
 -- Removes a currently active status
 -- @param number id The id of the registered @{STATUS}
@@ -81,11 +124,15 @@ function STATUS:RemoveAll()
 end
 
 net.Receive("ttt2_status_effect_add", function()
-	STATUS:AddStatus(net.ReadString())
+	STATUS:AddStatus(net.ReadString(), net.ReadUInt(8))
+end)
+
+net.Receive("ttt2_status_effect_set_id", function()
+	STATUS:SetActiveIcon(net.ReadString(), net.ReadUInt(8))
 end)
 
 net.Receive("ttt2_status_effect_add_timed", function()
-	STATUS:AddTimedStatus(net.ReadString(), net.ReadUInt(32), net.ReadBool())
+	STATUS:AddTimedStatus(net.ReadString(), net.ReadUInt(32), net.ReadBool(), net.ReadUInt(8))
 end)
 
 net.Receive("ttt2_status_effect_remove", function()

gamemodes/terrortown/gamemode/client/cl_targetid.lua

@@ -59,6 +59,8 @@ end
 indicator_col = Color(255, 255, 255, 130)
 
 local propspec_outline = Material("models/props_combine/portalball001_sheet")
+local base = Material("vgui/ttt/dynamic/sprite_base")
+local base_overlay = Material("vgui/ttt/dynamic/sprite_base_overlay")
 
 ---
 -- Called after all translucent entities are drawn.
@@ -78,22 +80,25 @@ function GM:PostDrawTranslucentRenderables(bDrawingDepth, bDrawingSkybox)
 
 	if client:IsSpecial() then
 		dir = (client:GetForward() * -1)
-
 		for i = 1, #plys do
 			local ply = plys[i]
 			local rd = ply:GetSubRoleData()
-
-			local pos = ply:GetPos()
-			pos.z = pos.z + 80
-
+
+			local pos = ply:GetBonePosition(6)
+			pos.z = pos.z + 20
+
+			local ea = ply:EyeAngles()
+			ea.pitch = 0
+			local shift = Vector(2,0,0)
+			shift:Rotate(ea)
+			pos:Add(shift)
+
 			if ply ~= client
 			and ply:IsActive()
 			and ply:IsSpecial()
 			and (not client:IsActive() or ply:IsInTeam(client))
 			and not ply:GetSubRoleData().avoidTeamIcons
 			then
-				local base = Material("vgui/ttt/dynamic/sprite_base")
-				local base_overlay = Material("vgui/ttt/dynamic/sprite_base_overlay.png")
 				local icon = Material("vgui/ttt/dynamic/roles/icon_" .. rd.abbr)
 				local incol = ply:GetRoleColor()
 

gamemodes/terrortown/gamemode/server/sv_main.lua

@@ -515,6 +515,7 @@ function GM:SyncGlobals()
 	SetGlobalBool("ttt_highlight_vip", GetConVar("ttt_highlight_vip"):GetBool())
 	SetGlobalBool("ttt_highlight_addondev", GetConVar("ttt_highlight_addondev"):GetBool())
 	SetGlobalBool("ttt_highlight_supporter", GetConVar("ttt_highlight_supporter"):GetBool())
+	SetGlobalBool("ttt_armor_classic", GetConVar("ttt_armor_classic"):GetBool())
 	SetGlobalBool("ttt_locational_voice", GetConVar("ttt_locational_voice"):GetBool())
 	SetGlobalInt("ttt_idle_limit", idle_time:GetInt())
 	SetGlobalBool("ttt_idle", idle_enabled:GetBool())

gamemodes/terrortown/gamemode/server/sv_player.lua

@@ -1430,14 +1430,21 @@ function GM:PlayerTakeDamage(ent, infl, att, amount, dmginfo)
 	-- start painting blood decals
 	util.StartBleeding(ent, dmginfo:GetDamage(), 5)
 
-	-- general actions for pvp damage
+	-- handle damage scaling by karma
 	if ent ~= att and IsValid(att) and att:IsPlayer() and GetRoundState() == ROUND_ACTIVE and math.floor(dmginfo:GetDamage()) > 0 then
-
 		-- scale everything to karma damage factor except the knife, because it
 		-- assumes a kill
 		if not dmginfo:IsDamageType(DMG_SLASH) then
 			dmginfo:ScaleDamage(att:GetDamageFactor())
 		end
+	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)
+	HandlePlayerArmorSystem(ent, infl, att, amount, dmginfo)
+
+	-- handle karma change / log etc
+	if ent ~= att and IsValid(att) and att:IsPlayer() and GetRoundState() == ROUND_ACTIVE and math.floor(dmginfo:GetDamage()) > 0 then
 
 		-- process the effects of the damage on karma
 		KARMA.Hurt(att, ent, dmginfo)
@@ -1446,6 +1453,64 @@ function GM:PlayerTakeDamage(ent, infl, att, amount, dmginfo)
 	end
 end
 
+function HandlePlayerArmorSystem(ent, infl, att, amount, dmginfo)
+	-- armor does not help when the head receives damage
+	--if ent:LastHitGroup() == HITGROUP_HEAD then return end
+	-- DISABLED for now since the hook gets called twice, once with 0 damage, but with a hitgroup and once
+	-- with damage but no hitgroup. I have to dig deeper into this
+
+	-- some entities cause this hook to be triggered, ignore 0 damage events
+	if dmginfo:GetDamage() == 0 then return end
+
+	-- fallback for players who prefer the vanilla armor
+	if GetConVar("ttt_armor_classic"):GetBool() and ent:Armor() > 0 then
+		dmginfo:ScaleDamage(0.7)
+		return
+	end
+
+	print("-------------------------------------------------------")
+
+	-- handle different damage type factors
+	local armor_factor, body_factor
+	if dmginfo:IsDamageType(DMG_BULLET) or dmginfo:IsDamageType(DMG_CLUB) then -- bullet or crowbar damage
+		armor_factor = 1.0
+		body_factor = 1.0
+		print("damage type	: bullet or crowbar")
+	elseif dmginfo:IsDamageType(DMG_BURN) or dmginfo:IsDamageType(DMG_BLAST) then -- fire or explosion damage
+		armor_factor = 1.5
+		body_factor = 0.75
+		print("damage type	: fire or explosion")
+	else
+		return
+	end
+
+	-- calculate damage
+	local damage = dmginfo:GetDamage()
+	local armor = ent:Armor()
+
+	print("current HP	 : " .. tostring(ent:Health()))
+	print("current Armor  : " .. tostring(armor))
+	print("damage to take : " .. tostring(damage))
+
+	-- normal damage handling when no armor is available
+	if armor == 0 then return end
+
+	local cv_armor_factor = ent:ArmorIsReinforced() and GetConVar("ttt_armor_rei_damage_block_pct"):GetFloat() or GetConVar("ttt_armor_damage_block_pct"):GetFloat()
+	local cv_body_factor = ent:ArmorIsReinforced() and GetConVar("ttt_armor_rei_damage_health_pct"):GetFloat() or GetConVar("ttt_armor_damage_health_pct"):GetFloat()
+
+	print("armor factor   : " .. tostring(cv_armor_factor))
+	print("body factor	: " .. tostring(cv_body_factor))
+
+	armor = armor - cv_armor_factor * armor_factor * damage
+	print("armor internal : " .. tostring(armor))
+	ent:SetArmor(math.max(armor, 0))
+	print("new armor	  : " .. tostring(ent:Armor()))
+
+	local new_damage = cv_body_factor * body_factor * damage - math.min(armor, 0)
+	print("calced dmg	 : " .. tostring(new_damage))
+	dmginfo:SetDamage(new_damage)
+end
+
 ---
 -- Called whenever an @{NPC} is killed
 -- @param NPC npc The killed @{NPC}

gamemodes/terrortown/gamemode/server/sv_status.lua

@@ -5,6 +5,7 @@ STATUS = {}
 
 -- register networkt messages
 util.AddNetworkString("ttt2_status_effect_add")
+util.AddNetworkString("ttt2_status_effect_set_id")
 util.AddNetworkString("ttt2_status_effect_add_timed")
 util.AddNetworkString("ttt2_status_effect_remove")
 util.AddNetworkString("ttt2_status_effect_remove_all")
@@ -13,11 +14,26 @@ util.AddNetworkString("ttt2_status_effect_remove_all")
 -- Adds a status for a given @{Player}
 -- @param Player ply
 -- @param string id
+-- @param number active_icon
 -- @realm server
-function STATUS:AddStatus(ply, id)
-    net.Start("ttt2_status_effect_add")
-    net.WriteString(id)
-    net.Send(ply)
+function STATUS:AddStatus(ply, id, active_icon)
+	net.Start("ttt2_status_effect_add")
+	net.WriteString(id)
+	net.WriteUInt(active_icon or 1, 8)
+	net.Send(ply)
+end
+
+---
+-- Changes the active icon for a specifiv active effect for a given @{Player}
+-- @param Player ply
+-- @param string id
+-- @param number active_icon
+-- @realm server
+function STATUS:SetActiveIcon(ply, id, active_icon)
+	net.Start("ttt2_status_effect_set_id")
+	net.WriteString(id)
+	net.WriteUInt(active_icon or 1, 8)
+	net.Send(ply)
 end
 
 ---
@@ -26,13 +42,15 @@ end
 -- @param string id
 -- @param number duration the time
 -- @param boolean showDuration
+-- @param number active_icon
 -- @realm server
-function STATUS:AddTimedStatus(ply, id, duration, showDuration)
-    net.Start("ttt2_status_effect_add_timed")
-    net.WriteString(id)
-    net.WriteUInt(duration, 32)
-    net.WriteBool(showDuration or false)
-    net.Send(ply)
+function STATUS:AddTimedStatus(ply, id, duration, showDuration, active_icon)
+	net.Start("ttt2_status_effect_add_timed")
+	net.WriteString(id)
+	net.WriteUInt(duration, 32)
+	net.WriteBool(showDuration or false)
+	net.WriteUInt(active_icon or 1, 8)
+	net.Send(ply)
 end
 
 ---
@@ -41,20 +59,20 @@ end
 -- @param string id
 -- @realm server
 function STATUS:RemoveStatus(ply, id)
-    net.Start("ttt2_status_effect_remove")
-    net.WriteString(id)
-    net.Send(ply)
+	net.Start("ttt2_status_effect_remove")
+	net.WriteString(id)
+	net.Send(ply)
 end
 
 ---
 -- Removes each status for a given @{Player}
 -- @param Player ply
 -- @realm server
 function STATUS:RemoveAll(ply)
-    net.Start("ttt2_status_effect_remove_all")
-    net.Send(ply)
+	net.Start("ttt2_status_effect_remove_all")
+	net.Send(ply)
 end
 
 hook.Add("PlayerSpawn", "status_removed", function(ply)
-    STATUS:RemoveAll(ply)
+	STATUS:RemoveAll(ply)
 end)

gamemodes/terrortown/gamemode/shared/hud_elements/base_elements/pure_skin_element.lua

@@ -52,10 +52,10 @@ if CLIENT then
 		surface.SetDrawColor(clr(c))
 		surface.DrawRect(x, y, w, h)
 
-		local w2 = math.Round(w * (p or 1))
+		local w_ = math.Round(w * (p or 1))
 
 		surface.SetDrawColor(0, 0, 0, 165)
-		surface.DrawRect(x + w2, y, w - w2, h)
+		surface.DrawRect(x + w_, y, w - w_, h)
 
 		-- draw lines around this bar
 		self:DrawLines(x, y, w, h, c.a)