diff --git a/gamemodes/zombiesurvival/content/materials/killicon/redeem.vmt b/gamemodes/zombiesurvival/content/materials/killicon/redeem.vmt deleted file mode 100644 index 661fb7a..0000000 --- a/gamemodes/zombiesurvival/content/materials/killicon/redeem.vmt +++ /dev/null @@ -1,8 +0,0 @@ -"UnlitGeneric" -{ - "$translucent" 1 - "$basetexture" "killicon/redeem" - "$vertexcolor" 0 - "$ignorez" 1 - "$additive" 1 -} diff --git a/gamemodes/zombiesurvival/content/materials/killicon/redeem.vtf b/gamemodes/zombiesurvival/content/materials/killicon/redeem.vtf deleted file mode 100644 index 76fe67e..0000000 Binary files a/gamemodes/zombiesurvival/content/materials/killicon/redeem.vtf and /dev/null differ diff --git a/gamemodes/zombiesurvival/content/materials/killicon/redeem_v2.vmt b/gamemodes/zombiesurvival/content/materials/killicon/redeem_v2.vmt new file mode 100644 index 0000000..bbded17 --- /dev/null +++ b/gamemodes/zombiesurvival/content/materials/killicon/redeem_v2.vmt @@ -0,0 +1,10 @@ +"UnlitGeneric" +{ + "$basetexture" "killicon/redeem_v2" + "$nolod" 1 + "$nomip" 1 + "$ignorez" 1 + "$translucent" 1 + "$vertexalpha" 1 + "$vertexcolor" 1 +} diff --git a/gamemodes/zombiesurvival/content/materials/killicon/redeem_v2.vtf b/gamemodes/zombiesurvival/content/materials/killicon/redeem_v2.vtf new file mode 100644 index 0000000..e8a95b7 Binary files /dev/null and b/gamemodes/zombiesurvival/content/materials/killicon/redeem_v2.vtf differ diff --git a/gamemodes/zombiesurvival/gamemode/cl_deathnotice.lua b/gamemodes/zombiesurvival/gamemode/cl_deathnotice.lua index 8818dd0..60d79e5 100644 --- a/gamemodes/zombiesurvival/gamemode/cl_deathnotice.lua +++ b/gamemodes/zombiesurvival/gamemode/cl_deathnotice.lua @@ -63,7 +63,7 @@ killicon.AddFont("weapon_slam", "zsdeathnotice", "*", color_white) killicon.AddFont("weapon_crowbar", "zsdeathnotice", "6", color_white) killicon.AddFont("headshot", "zsdeathnoticecs", "D", color_white) -killicon.Add("redeem", "killicon/redeem", color_white) +killicon.Add("redeem", "killicon/redeem_v2", color_white) killicon.Add("weapon_zs_zombie", "zombiesurvival/killicons/zombie", color_white) killicon.Add("weapon_zs_freshdead", "zombiesurvival/killicons/zombie", color_white) diff --git a/gamemodes/zombiesurvival/gamemode/cl_init.lua b/gamemodes/zombiesurvival/gamemode/cl_init.lua index 3c55421..20f11ad 100644 --- a/gamemodes/zombiesurvival/gamemode/cl_init.lua +++ b/gamemodes/zombiesurvival/gamemode/cl_init.lua @@ -1,4 +1,5 @@ -- Sometimes persistent ones don't get created. +-- Sometimes persistent ones don't get created. local dummy = CreateClientConVar("_zs_dummyconvar", 1, false, false) local oldCreateClientConVar = CreateClientConVar function CreateClientConVar(...) diff --git a/gamemodes/zombiesurvival/gamemode/init.lua b/gamemodes/zombiesurvival/gamemode/init.lua index 9a6cd6d..c27d9a9 100644 --- a/gamemodes/zombiesurvival/gamemode/init.lua +++ b/gamemodes/zombiesurvival/gamemode/init.lua @@ -216,8 +216,8 @@ function GM:AddResources() end resource.AddFile("materials/refract_ring.vmt") - resource.AddFile("materials/killicon/redeem.vtf") - resource.AddFile("materials/killicon/redeem.vmt") + resource.AddFile("materials/killicon/redeem_v2.vtf") + resource.AddFile("materials/killicon/redeem_v2.vmt") resource.AddFile("materials/killicon/zs_axe.vtf") resource.AddFile("materials/killicon/zs_keyboard.vtf") resource.AddFile("materials/killicon/zs_sledgehammer.vtf") @@ -1670,20 +1670,13 @@ function GM:GetDynamicSpawning() end function GM:PlayerRedeemed(pl, silent, noequip) - if not silent then - net.Start("zs_playerredeemed") - net.WriteEntity(pl) - net.WriteString(pl:Name()) - net.Broadcast() - end - pl:RemoveStatus("overridemodel", false, true) pl:ChangeTeam(TEAM_HUMAN) - pl:DoHulls() if not noequip then pl.m_PreRedeem = true end pl:UnSpectateAndSpawn() pl.m_PreRedeem = nil + pl:DoHulls() local frags = pl:Frags() if frags < 0 then @@ -1697,6 +1690,13 @@ function GM:PlayerRedeemed(pl, silent, noequip) pl:SetZombieClass(self.DefaultZombieClass) pl.SpawnedTime = CurTime() + + if not silent then + net.Start("zs_playerredeemed") + net.WriteEntity(pl) + net.WriteString(pl:Name()) + net.Broadcast() + end end function GM:PlayerDisconnected(pl)