edshot99/Buildmode-ULX
1
0
Fork 0
forked from kythre/Buildmode-ULX
Code Pull Requests Activity

Fixed https://github.com/kythre/Buildmode-ULX/issues/66 and https://github.com/kythre/Buildmode-ULX/issues/31

Browse Source 
Added a setting to change spawn protection
This commit is contained in:
Kyle 2020-08-12 16:56:19 -05:00
parent ebb2ed6438
commit 1a5f1f3a99
3 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
.vs/slnx.sqlite Normal file
View File

Binary file not shown.

22
lua/ulx/modules/sh/sh_kyle_buildmode.lua
View File

@ -478,10 +478,11 @@ end )
hook.Add("PlayerSpawn", "kyleBuildmodePlayerSpawn", function(z)
--z:GetNWBool("_kyle_died") makes sure that the player is spawning after an actual death and not the ulib respawn function
if ((_Kyle_Buildmode["spawnwithbuildmode"]=="1" and not z:GetNWBool("_Kyle_pvpoverride")) or z:GetNWBool("_Kyle_Buildmode")) and z:GetNWBool("_kyle_died") then
if ((_Kyle_Buildmode["spawnwithbuildmode"]=="1" and not _Kyle_Buildmode["persistpvp"]=="1") or z:GetNWBool("_Kyle_Buildmode")) and z:GetNWBool("_kyle_died") then
_kyle_Buildmode_Enable(z)
elseif (not z:GetNWBool("_Kyle_Buildmode")) and z:GetNWBool("_kyle_died") then
if tonumber(_Kyle_Buildmode["spawnprotection"])>0 then
if tonumber(_Kyle_Buildmode["spawnprotection"])>0 and not _Kyle_Buildmode["persistpvp"]=="1" then
z:SendLua("GAMEMODE:AddNotify(\"".._Kyle_Buildmode["spawnprotection"].." seconds of Spawn Protection enabled. Type !pvp to disable\",NOTIFY_GENERIC, 5)")
z.buildmode = true
z:SetNWBool("_Kyle_Buildmode", true)
@ -508,7 +509,6 @@ end )
hook.Add("PlayerInitialSpawn", "kyleBuildmodePlayerInitilaSpawn", function (z)
z:SetNWBool("_kyle_died", true)
z:SetNWBool("_Kyle_pvpoverride", false)
end )
hook.Add("PostPlayerDeath", "kyleBuildmodePostPlayerDeath", function(z)
@ -682,9 +682,6 @@ hook.Add("HUDPaint", "KyleBuildehudpaint", function()
end)
local kylebuildmode = ulx.command( "_Kyle_1", "ulx build", function( calling_ply, should_revoke )
if _Kyle_Buildmode["persistpvp"]=="1" then
calling_ply:SetNWBool("_Kyle_pvpoverride", not should_revoke)
end
if not calling_ply.buildmode and not should_revoke and not calling_ply:GetNWBool("kylependingbuildchange") then
if _Kyle_Buildmode["builddelay"]!="0" then
local delay = tonumber(_Kyle_Buildmode["builddelay"])
@ -725,15 +722,12 @@ kylebuildmode:setOpposite("ulx pvp", {_, true}, "!pvp")
local kylebuildmodeadmin = ulx.command("_Kyle_1", "ulx fbuild", function( calling_ply, target_plys, should_revoke)
local affected_plys = {}
for y,z in pairs(target_plys) do
if calling_ply == z and _Kyle_Buildmode["persistpvp"]=="1" then
z:SetNWBool("_Kyle_pvpoverride", not should_revoke)
if not z.buildmode and not should_revoke then
_kyle_Buildmode_Enable(z)
elseif z.buildmode and should_revoke then
_kyle_Buildmode_Disable(z)
end
if not z.buildmode and not should_revoke then
_kyle_Buildmode_Enable(z)
elseif z.buildmode and should_revoke then
_kyle_Buildmode_Disable(z)
end
table.insert(affected_plys, z)
table.insert(affected_plys, z)
end
if should_revoke then

9
lua/ulx/xgui/settings/cl_kyle_buildmode.lua
View File

@ -12,7 +12,7 @@ local panels = {
{ --panel_entering
["panelItems"] = {
["spawnwithbuildmode"] = {0, "Players Spawn with Buildmode"},
["persistpvp"] = {0, "Override the above if the player enables PVP"},
["persistpvp"] = {0, "Force PVP on respawn if the player died with PVP"},
["builddelay"] = {1, "Buildmode Delay"}
}
},
@ -39,6 +39,7 @@ local panels = {
},
{ -- panel_extras
panelItems = {
["spawnprotection"] = {1, "Amount of seconds to enable Buildmode temporarily on spawn"},
["adminsbypassrestrictions"] = {0, "Admins Bypass Restrictions"},
["antipropkillpvper"] = {0, "Prevent PVPers from Propkilling"},
["antipropkill"] = {0, "Prevent Builders from Propkilling"}
@ -85,7 +86,11 @@ for k, e in pairs(panels) do
end
y = y + 20
if e[1] == 0 then
y = y + 20
elseif e[1] == 1 then
y = y + 25
end --
end
end
end