class/seeker: Ignore damage done to ragdolls

Support for the reflect setting (mp_friendlyfire 2) now properly works and will no longer spew lua errors into the console, while also logging who damaged who with how much damage. This info is critical to server owners that want to know what exactly went down in a match with this option enabled.

Workshop Package.bat

@@ -1,4 +0,0 @@
-@ECHO OFF
-call env.win.bat
-"%GARRYSMODPATH%\bin\gmad.exe" create -folder "%CD%\Source" -out "%CD%\Pack.gma"
-PAUSE

install.bat

@@ -1,4 +1,4 @@
-@ECHO OFF
-call env.win.bat
-"%GARRYSMODPATH%\bin\gmpublish.exe" update -id 468149739 -icon "media\gamemode_workshop.jpg" -addon "Pack.gma" -changes ""
+@ECHO OFF
+call env.win.bat
+"%GARRYSMODPATH%\bin\gmpublish.exe" update -id 468149739 -icon "media\gamemode_workshop.jpg" -addon "pack.gma" -changes ""
 PAUSE

package.bat

@@ -0,0 +1,4 @@
+@ECHO OFF
+call env.win.bat
+"%GARRYSMODPATH%\bin\gmad.exe" create -folder "%CD%\source" -out "%CD%\pack.gma"
+PAUSE

shell.bat

@@ -1,4 +1,4 @@
-@ECHO OFF
-call env.win.bat
-SET "PATH=%CD%;%GARRYSMODPATH%\bin;%PATH%"
+@ECHO OFF
+call env.win.bat
+SET "PATH=%CD%;%GARRYSMODPATH%\bin;%PATH%"
 CMD

source/gamemodes/prophuntextended/gamemode/cl_init.lua

@@ -41,8 +41,8 @@ function GM:Initialize()
 	print("Prop Hunt CL: Initializing Gamemode Data...")
 	self.Data = {}
 	
-	print("Prop Hunt CL: Creating Huge Ass Font...")
-	surface.CreateFont("PHHugeAssFont", {font="Roboto Bold Condensed", extended=true, size=160, weight=800, antialias=true})
+	print("Prop Hunt CL: Creating Fonts...")
+	surface.CreateFont("RobotoBoldCondensed160", {font="Roboto Bold Condensed", extended=true, size=160, weight=800, antialias=true})
 	
 	print("Prop Hunt CL: Complete.")
 	print("-------------------------------------------------------------------------")
@@ -192,29 +192,46 @@ net.Receive( "PlayerViewOffset", function(len, pl)
 	GAMEMODE:PlayerSetViewOffset(vo, voduck)
 end)
 
+-- ------------------------------------------------------------------------- --
+--! Special Drawing
+-- ------------------------------------------------------------------------- --
+function DrawNamePlates(bDrawingDepth, bDrawingSkybox)
+	if (!GAMEMODE.Config.NamePlates:Show()) then
+		return
+	end
+	
+	local scale = GAMEMODE.Config.NamePlates:Scale()	
+	local pls = team.GetPlayers(GAMEMODE.Teams.Seekers)
+	if (LocalPlayer():Team() == GAMEMODE.Teams.Hiders) then
+		pls = table.Add(pls, team.GetPlayers(GAMEMODE.Teams.Hiders))
+	end	
+	
+	for i,v in ipairs(pls) do
+		if (v:Alive() && v != LocalPlayer()) then
+			local color = HSVToColor(GAMEMODE.Config.NamePlates:TintHue(),
+				GAMEMODE.Config.NamePlates:TintSaturation(),
+				GAMEMODE.Config.NamePlates:TintValue())
+			if GAMEMODE.Config.NamePlates:TintHealth() then
+				local healthPrc = v:Health() / v:GetMaxHealth()
+				color = HSVToColor(120 * healthPrc, 1.0, 1.0)				
+			elseif GAMEMODE.Config.NamePlates:TintTeam() then
+				color = team.GetColor(v:Team())
+			end			
+			
+			local pos = v:GetPos() + v:GetViewOffset() + Vector(0, 0, GAMEMODE.Config.NamePlates:Height())
+			local ang = Angle(0, LocalPlayer():EyeAngles().y - 90, 90 - LocalPlayer():EyeAngles().x)
+			cam.Start3D2D(pos, ang, scale)
+				draw.DrawText(v:GetName(), "RobotoBoldCondensed160", 0, -draw.GetFontHeight("RobotoBoldCondensed160") / 2, color, TEXT_ALIGN_CENTER)
+			cam.End3D2D()
+		end
+	end	
+end
+hook.Add("PostDrawTranslucentRenderables", "PHDrawNamePlates", DrawNamePlates)
+
 -- ------------------------------------------------------------------------- --
 --! Old Code
 -- ------------------------------------------------------------------------- --
 --[[
--- Render halos and player names.
-function DrawPlayerNames(bDrawingDepth, bDrawingSkybox)
-	for i,v in ipairs(player.GetAll()) do
-		if v:Alive() && v != LocalPlayer() then
-			local pos = v:GetPos() + v:GetViewOffset() + Vector(0, 0, 5)
-			local ang = Angle(0, LocalPlayer():EyeAngles().y - 90, 90 - LocalPlayer():EyeAngles().x)
-			local healthPrc = v:Health() / v:GetMaxHealth()
-			local healthCol = HSVToColor(120 * healthPrc, 1.0, 1.0)
-			
-			if v:Team() == TEAM_HUNTERS || LocalPlayer():Team() == TEAM_PROPS then
-				cam.Start3D2D(pos, ang, 0.15)
-					draw.DrawText(v:GetName(), "Trebuchet24", 0, -draw.GetFontHeight("Trebuchet24"), healthCol, TEXT_ALIGN_CENTER)
-				cam.End3D2D()
-			end
-		end
-	end
-end
-hook.Add("PostDrawTranslucentRenderables", "PH_DrawPlayerNames", DrawPlayerNames)
-
 function DrawPlayerHalos(bDrawingDepth, bDrawingSkybox)
 	for i,v in ipairs(player.GetAll()) do
 		if v:Alive() then

source/gamemodes/prophuntextended/gamemode/init.lua

@@ -241,7 +241,19 @@ function GM:PlayerUse(ply, ent) return player_manager.RunClass(ply, "Use", ent)
 function GM:AllowPlayerPickup(ply, ent)	return player_manager.RunClass(ply, "AllowPickup", ent) end
 function GM:PlayerSetModel(ply)	return player_manager.RunClass(ply, "SetModel") end
 
--- Called when an entity takes damage
+-- Damage
+function GM:PlayerShouldTakeDamage(victim, attacker)
+	return player_manager.RunClass(victim, "ShouldTakeDamage", attacker)
+end
+
+function GM:PlayerHurt(victim, attacker, healthRemaining, damageTaken)
+	player_manager.RunClass(victim, "Hurt", victim, attacker, healthRemaining, damageTaken)
+	
+	if (IsValid(attacker) && attacker:IsPlayer()) then
+		player_manager.RunClass(attacker, "Damage", victim, attacker, healthRemaining, damageTaken)
+	end
+end
+
 function GM:EntityTakeDamage(ent, dmg)
 	local att = dmg:GetAttacker()
 	

source/gamemodes/prophuntextended/gamemode/player_class/class_seeker.lua

@@ -96,30 +96,51 @@ function CLASS:ShouldTakeDamage(attacker)
 				local ffmode = GetConVarNumber("mp_friendlyfire")
 				if (ffmode == 0) then -- Not Allowed
 					return false
-				elseif (ffmode == 2) then -- Damage self instead
-					if (IsValid(attacker) && attacker:IsPlayer()) then
-						attacker:SetHealth(attacker:Health() - damageTaken)
-					end
-					return false
 				end
 			end
 		end
 	end
 	return true
 end
+
+function CLASS:Damage(victim, attacker, healthRemaining, damageDealt)
+	if ((victim != attacker) && victim:IsPlayer() && attacker:IsPlayer() && (attacker:Team() == victim:Team())) then
+		if (GAMEMODE.Config:DebugLog()) then
+			print("Prop Hunt: Seeker '"..attacker:GetName().."' (SteamID: "..attacker:SteamID()..") damaged seeker '"..victim:GetName().."' (SteamID: "..victim:SteamID()..") with "..damageDealt.." damage.")
+		end
+	end
+end
+
+function CLASS:Hurt(victim, attacker, healthRemaining, damageTaken)
+	if ((victim != attacker) && victim:IsPlayer() && attacker:IsPlayer() && (attacker:Team() == victim:Team())) then
+		if (GAMEMODE.Config:DebugLog()) then 
+			print("Prop Hunt: Seeker '"..victim:GetName().."' (SteamID: "..victim:SteamID()..") was hurt by seeker '"..attacker:GetName().."' (SteamID: "..attacker:SteamID()..") with "..damageTaken.." damage.")
+		end
+		
+		if (GetConVarNumber("mp_friendlyfire") == 2) then
+			victim:SetHealth(healthRemaining + damageTaken)
+			attacker:TakeDamage(damageTaken, attacker, attacker)
+			print("Prop Hunt: Seeker '"..victim:GetName().."' (SteamID: "..victim:SteamID()..") reflected "..damageTaken.." to seeker '"..attacker:GetName().."' (SteamID: "..attacker:SteamID()..").")
+		end
+	end
+end
+
 function CLASS:DamageEntity(ent, att, dmg)
 	if (GAMEMODE.Config:DebugLog()) then print("Prop Hunt: Seeker '"..self.Player:GetName().."' (SteamID: "..self.Player:SteamID()..") damaged entity "..ent:GetClass()..".") end
+
+	if (GAMEMODE:GetRoundState() != GAMEMODE.States.Seek) then return end	
+	if (!IsValid(ent) || !IsValid(att)) then return end
+	if (att == ent) then return end
 	
 	-- Only take damage during this phase.
-	if (GAMEMODE:GetRoundState() == GAMEMODE.States.Seek) then
-		if IsValid(ent) && (!(ent:IsPlayer())) then
-			if (ent:GetClass() == "ph_prop") then
-				ent:GetOwner():TakeDamageInfo(dmg)
-				self.Player.Data.RandomWeight = self.Player.Data.RandomWeight - 1
-			elseif (ent:GetClass() == "func_breakable") then -- ToDo: Make Configurable which entities don't hurt?
-			else
-				att:TakeDamage(GAMEMODE.Config.Seeker:HealthPenalty(), ent, ent)
-			end
+	if IsValid(ent) && (!(ent:IsPlayer())) then
+		if (ent:GetClass() == "ph_prop") then
+			ent:GetOwner():TakeDamageInfo(dmg)
+			self.Player.Data.RandomWeight = self.Player.Data.RandomWeight - 1
+		elseif (ent:GetClass() == "func_breakable") then
+		elseif (ent:GetClass() == "prop_ragdoll") then
+		else
+			att:TakeDamage(GAMEMODE.Config.Seeker:HealthPenalty(), ent, ent)
 		end
 	end
 end

source/gamemodes/prophuntextended/gamemode/sh_config.lua

@@ -40,7 +40,6 @@ end
 --! Debug Settings
 -- ------------------------------------------------------------------------- --
 -- Debug Mode
-
 GM.Config.ConVars.Debug = CreateConVarIfNotExists("ph_debug", "0", FCVAR_CHEAT + FCVAR_REPLICATED, "Prop Hunt: Enable Debug Mode")
 function GM.Config:Debug()
 	return self.ConVars.Debug:GetBool()
@@ -410,4 +409,56 @@ if CLIENT then
 	function GM.Config.Camera:Lag()
 		return math.Clamp(self.ConVars.Lag:GetFloat(), self:LagMinimum(), self:LagMaximum())
 	end
-end
+end
+
+-- ------------------------------------------------------------------------- --
+--! Name Plates
+-- ------------------------------------------------------------------------- --
+GM.Config.NamePlates = {}
+GM.Config.NamePlates.ConVars = {}
+
+if CLIENT then
+	-- Show
+	GM.Config.NamePlates.ConVars.Show = CreateConVarIfNotExists("ph_nameplates_show", "1", FCVAR_ARCHIVE + FCVAR_CLIENTDLL, "Nameplates: Show a name plate above each player in your team (or all players if spectating).")
+	function GM.Config.NamePlates:Show()
+		return self.ConVars.Show:GetBool()
+	end
+	
+	-- Scale
+	GM.Config.NamePlates.ConVars.Scale = CreateConVarIfNotExists("ph_nameplates_scale", "0.05", FCVAR_ARCHIVE + FCVAR_CLIENTDLL, "Nameplates: World scale of name plate, a setting of 1 means 1px = 1unit.")
+	function GM.Config.NamePlates:Scale()
+		return self.ConVars.Scale:GetFloat()
+	end
+	
+	-- Height
+	GM.Config.NamePlates.ConVars.Height = CreateConVarIfNotExists("ph_nameplates_height", "10", FCVAR_ARCHIVE + FCVAR_CLIENTDLL, "Nameplates: Height above player.")
+	function GM.Config.NamePlates:Height()
+		return self.ConVars.Height:GetFloat()
+	end
+	
+	-- Tint Color
+	GM.Config.NamePlates.ConVars.TintHue = CreateConVarIfNotExists("ph_nameplates_tint_hue", "0", FCVAR_ARCHIVE + FCVAR_CLIENTDLL, "Nameplates: Tint hue.")
+	function GM.Config.NamePlates:TintHue()
+		return self.ConVars.TintHue:GetFloat()
+	end
+	GM.Config.NamePlates.ConVars.TintSaturation = CreateConVarIfNotExists("ph_nameplates_tint_saturation", "0", FCVAR_ARCHIVE + FCVAR_CLIENTDLL, "Nameplates: Tint saturation.")
+	function GM.Config.NamePlates:TintSaturation()
+		return self.ConVars.TintSaturation:GetFloat()
+	end
+	GM.Config.NamePlates.ConVars.TintValue = CreateConVarIfNotExists("ph_nameplates_tint_value", "1", FCVAR_ARCHIVE + FCVAR_CLIENTDLL, "Nameplates: Tint value.")
+	function GM.Config.NamePlates:TintValue()
+		return self.ConVars.TintValue:GetFloat()
+	end
+	
+	-- Tint By Health
+	GM.Config.NamePlates.ConVars.TintHealth = CreateConVarIfNotExists("ph_nameplates_tint_health", "0", FCVAR_ARCHIVE + FCVAR_CLIENTDLL, "Nameplates: Tint the nameplate using their health percent.")
+	function GM.Config.NamePlates:TintHealth()
+		return self.ConVars.TintHealth:GetBool()
+	end
+	
+	-- Tint By Team
+	GM.Config.NamePlates.ConVars.TintTeam = CreateConVarIfNotExists("ph_nameplates_tint_team", "0", FCVAR_ARCHIVE + FCVAR_CLIENTDLL, "Nameplates: Tint the nameplate with the team colors.")
+	function GM.Config.NamePlates:TintTeam()
+		return self.ConVars.TintTeam:GetBool()
+	end	
+end

source/gamemodes/prophuntextended/gamemode/sh_init.lua

@@ -26,8 +26,8 @@
 --! Gamemode Information
 -- ------------------------------------------------------------------------- --
 GM.Name		= "Prop Hunt Extended"
-GM.Author	= "Michael 'Xaymar' Dirks (Based on Kow@lskis Version, Original by AMT)"
-GM.Email	= "michael.fabian.dirks@gmail.com"
+GM.Author	= "Michael Fabian 'Xaymar' Dirks"
+GM.Email	= "info@xaymar.com"
 GM.Website	= "http://xaymar.com/"
 
 GM.TeamBased = true
@@ -104,17 +104,6 @@ function GM:PlayerTick(ply, mv)
 	return player_manager.RunClass(ply, "Tick", mv)
 end
 
-function GM:PlayerHurt(victim, attacker, healthRemaining, damageTaken)
-	player_manager.RunClass(victim, "Hurt", victim, attacker, healthRemaining, damageTaken)
-	
-	if (IsValid(attacker) && attacker:IsPlayer()) then
-		player_manager.RunClass(attacker, "Damage", victim, attacker, healthRemaining, damageTaken)
-	end
-end
-function GM:PlayerShouldTakeDamage(victim, attacker)
-	return player_manager.RunClass(victim, "ShouldTakeDamage", attacker)
-end
-
 -- ------------------------------------------------------------------------- --
 --! Gamemode Functionality
 -- ------------------------------------------------------------------------- --