rain-plus/zombiesurvival-evolved
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #1 from JetBoom/master

Browse source 
pull request
This commit is contained in:
mctgmod 2019-03-18 23:00:26 +00:00 committed by GitHub
commit 9a33ca6973
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gamemodes/zombiesurvival/gamemode/cl_init.lua
View file

@ -1780,6 +1780,10 @@ function GM:PlayerBindPress(pl, bind, wasin)
elseif P_Team(pl) == TEAM_HUMAN then elseif P_Team(pl) == TEAM_HUMAN then
self:ToggleOTSCamera() self:ToggleOTSCamera()
end end
elseif bind == "impulse 100" then
if P_Team(pl) == TEAM_UNDEAD and pl:Alive() then
self:ToggleZombieVision()
end
end end
end end

4
gamemodes/zombiesurvival/gamemode/cl_postprocess.lua
View file

@ -260,10 +260,6 @@ function GM:ToggleZombieVision(onoff)
end end
end end
net.Receive("zs_togglezvision", function(length)
gamemode.Call("ToggleZombieVision")
end)
local CModWhiteOut = { local CModWhiteOut = {
["$pp_colour_addr"] = 0, ["$pp_colour_addr"] = 0,
["$pp_colour_addg"] = 0, ["$pp_colour_addg"] = 0,

11
gamemodes/zombiesurvival/gamemode/init.lua
View file

@ -474,7 +474,6 @@ function GM:AddNetworkStrings()
util.AddNetworkString("zs_deployableout") util.AddNetworkString("zs_deployableout")
util.AddNetworkString("zs_trinketconsumed") util.AddNetworkString("zs_trinketconsumed")
util.AddNetworkString("zs_nailremoved") util.AddNetworkString("zs_nailremoved")
util.AddNetworkString("zs_togglezvision")
util.AddNetworkString("zs_remantlercontent") util.AddNetworkString("zs_remantlercontent")
util.AddNetworkString("zs_classunlockstate") util.AddNetworkString("zs_classunlockstate")
util.AddNetworkString("zs_changeclass") util.AddNetworkString("zs_changeclass")
@ -2200,11 +2199,6 @@ function GM:PlayerInitialSpawnRound(pl)
local uniqueid = pl:UniqueID() local uniqueid = pl:UniqueID()
if table.HasValue(self.FanList, uniqueid) then
pl.DamageVulnerability = (pl.DamageVulnerability or 1) + 10
pl:PrintTranslatedMessage(HUD_PRINTTALK, "thanks_for_being_a_fan_of_zs")
end
if self.PreviouslyDied[uniqueid] or ZSBOT then if self.PreviouslyDied[uniqueid] or ZSBOT then
-- They already died and reconnected. -- They already died and reconnected.
pl:ChangeTeam(TEAM_UNDEAD) pl:ChangeTeam(TEAM_UNDEAD)
@ -4314,11 +4308,6 @@ end
function GM:PlayerSwitchFlashlight(pl, newstate) function GM:PlayerSwitchFlashlight(pl, newstate)
if pl:Team() == TEAM_UNDEAD then if pl:Team() == TEAM_UNDEAD then
if newstate then
net.Start("zs_togglezvision")
net.Send(pl)
end
return false return false
end end

11
gamemodes/zombiesurvival/gamemode/sh_globals.lua
View file

@ -327,14 +327,3 @@ GM.ValidBeaconMessages = {
"message_beacon_24", "message_beacon_24",
"message_beacon_25" "message_beacon_25"
} }
GM.FanList = {
"1418945843",
"1595085577",
"3311458935",
"3023059541",
"2000875318",
"778584317",
"6086255",
"2867054481"
}