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

Fix not being able to deploy weapons with no ammo

Browse source 
Addresses https://github.com/JetBoom/zombiesurvival/issues/132
This commit is contained in:
JetBoom 2015-04-19 01:54:47 -04:00
parent 123549a962
commit f92ab98363
18 changed files with 52 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gamemodes/zombiesurvival/entities/weapons/weapon_map_base/shared.lua
View file

@ -9,12 +9,12 @@ SWEP.AdminSpawnable = true
SWEP.Primary.ClipSize = -1 SWEP.Primary.ClipSize = -1
SWEP.Primary.DefaultClip = -1 SWEP.Primary.DefaultClip = -1
SWEP.Primary.Automatic = false SWEP.Primary.Automatic = false
SWEP.Primary.Ammo = "None" SWEP.Primary.Ammo = "none"
SWEP.Secondary.ClipSize = -1 SWEP.Secondary.ClipSize = -1
SWEP.Secondary.DefaultClip = -1 SWEP.Secondary.DefaultClip = -1
SWEP.Secondary.Automatic = false SWEP.Secondary.Automatic = false
SWEP.Secondary.Ammo = "None" SWEP.Secondary.Ammo = "none"
SWEP.DrawCrosshair = false SWEP.DrawCrosshair = false
SWEP.Primary.Sound = Sound("") SWEP.Primary.Sound = Sound("")

6
gamemodes/zombiesurvival/entities/weapons/weapon_zs_arsenalcrate/shared.lua
View file

@ -9,10 +9,10 @@ SWEP.Primary.Ammo = "airboatgun"
SWEP.Primary.Delay = 1 SWEP.Primary.Delay = 1
SWEP.Primary.Automatic = true SWEP.Primary.Automatic = true
SWEP.Secondary.ClipSize = -1 SWEP.Secondary.ClipSize = 1
SWEP.Secondary.DefaultClip = -1 SWEP.Secondary.DefaultClip = 1
SWEP.Secondary.Ammo = "dummy"
SWEP.Secondary.Automatic = false SWEP.Secondary.Automatic = false
SWEP.Secondary.Ammo = "none"
SWEP.WalkSpeed = SPEED_NORMAL SWEP.WalkSpeed = SPEED_NORMAL
SWEP.FullWalkSpeed = SPEED_SLOWEST SWEP.FullWalkSpeed = SPEED_SLOWEST

6
gamemodes/zombiesurvival/entities/weapons/weapon_zs_barricadekit/shared.lua
View file

@ -7,10 +7,10 @@ SWEP.Primary.Ammo = "SniperRound"
SWEP.Primary.Delay = 1.25 SWEP.Primary.Delay = 1.25
SWEP.Primary.DefaultClip = 5 SWEP.Primary.DefaultClip = 5
SWEP.Secondary.ClipSize = -1 SWEP.Secondary.ClipSize = 1
SWEP.Secondary.DefaultClip = -1 SWEP.Secondary.DefaultClip = 1
SWEP.Secondary.Ammo = "dummy"
SWEP.Secondary.Automatic = false SWEP.Secondary.Automatic = false
SWEP.Secondary.Ammo = "none"
SWEP.UseHands = true SWEP.UseHands = true

6
gamemodes/zombiesurvival/entities/weapons/weapon_zs_base/shared.lua
View file

@ -16,10 +16,10 @@ SWEP.Primary.Automatic = false
SWEP.Primary.Ammo = "pistol" SWEP.Primary.Ammo = "pistol"
SWEP.RequiredClip = 1 SWEP.RequiredClip = 1
SWEP.Secondary.ClipSize = -1 SWEP.Secondary.ClipSize = 1
SWEP.Secondary.DefaultClip = -1 SWEP.Secondary.DefaultClip = 1
SWEP.Secondary.Automatic = false SWEP.Secondary.Automatic = false
SWEP.Secondary.Ammo = "none" SWEP.Secondary.Ammo = "dummy"
SWEP.WalkSpeed = SPEED_NORMAL SWEP.WalkSpeed = SPEED_NORMAL

6
gamemodes/zombiesurvival/entities/weapons/weapon_zs_basemelee/shared.lua
View file

@ -18,10 +18,10 @@ SWEP.MeleeRange = 65
SWEP.MeleeSize = 1.5 SWEP.MeleeSize = 1.5
SWEP.MeleeKnockBack = 0 SWEP.MeleeKnockBack = 0
SWEP.Secondary.ClipSize = -1 SWEP.Secondary.ClipSize = 1
SWEP.Secondary.DefaultClip = -1 SWEP.Secondary.DefaultClip = 1
SWEP.Secondary.Ammo = "dummy"
SWEP.Secondary.Automatic = true SWEP.Secondary.Automatic = true
SWEP.Secondary.Ammo = "none"
SWEP.WalkSpeed = SPEED_FAST SWEP.WalkSpeed = SPEED_FAST

6
gamemodes/zombiesurvival/entities/weapons/weapon_zs_boardpack/shared.lua
View file

@ -9,10 +9,10 @@ SWEP.Primary.Ammo = "SniperRound"
SWEP.Primary.Delay = 1 SWEP.Primary.Delay = 1
SWEP.Primary.DefaultClip = 3 SWEP.Primary.DefaultClip = 3
SWEP.Secondary.ClipSize = -1 SWEP.Secondary.ClipSize = 1
SWEP.Secondary.DefaultClip = -1 SWEP.Secondary.DefaultClip = 1
SWEP.Secondary.Ammo = "dummy"
SWEP.Secondary.Automatic = true SWEP.Secondary.Automatic = true
SWEP.Secondary.Ammo = "none"
SWEP.Secondary.Delay = 0.15 SWEP.Secondary.Delay = 0.15
SWEP.WalkSpeed = SPEED_NORMAL SWEP.WalkSpeed = SPEED_NORMAL

7
gamemodes/zombiesurvival/entities/weapons/weapon_zs_detpack/shared.lua
View file

@ -9,10 +9,9 @@ SWEP.Primary.Ammo = "sniperpenetratedround"
SWEP.Primary.Delay = 1 SWEP.Primary.Delay = 1
SWEP.Primary.Automatic = true SWEP.Primary.Automatic = true
SWEP.Secondary.ClipSize = -1 SWEP.Secondary.ClipSize = 1
SWEP.Secondary.DefaultClip = -1 SWEP.Secondary.DefaultClip = 1
SWEP.Secondary.Automatic = false SWEP.Secondary.Ammo = "dummy"
SWEP.Secondary.Ammo = "none"
SWEP.WalkSpeed = SPEED_NORMAL SWEP.WalkSpeed = SPEED_NORMAL
SWEP.FullWalkSpeed = SPEED_SLOW SWEP.FullWalkSpeed = SPEED_SLOW

7
gamemodes/zombiesurvival/entities/weapons/weapon_zs_drone.lua
View file

@ -42,10 +42,9 @@ SWEP.Primary.Ammo = "drone"
SWEP.Primary.Delay = 1 SWEP.Primary.Delay = 1
SWEP.Primary.DefaultClip = 1 SWEP.Primary.DefaultClip = 1
SWEP.Secondary.ClipSize = -1 SWEP.Secondary.ClipSize = 1
SWEP.Secondary.DefaultClip = -1 SWEP.Secondary.DefaultClip = 1
SWEP.Secondary.Automatic = false SWEP.Secondary.Ammo = "dummy"
SWEP.Secondary.Ammo = "none"
SWEP.WalkSpeed = SPEED_FAST SWEP.WalkSpeed = SPEED_FAST

7
gamemodes/zombiesurvival/entities/weapons/weapon_zs_ffemitter/shared.lua
View file

@ -9,10 +9,9 @@ SWEP.Primary.Ammo = "slam"
SWEP.Primary.Delay = 1 SWEP.Primary.Delay = 1
SWEP.Primary.Automatic = true SWEP.Primary.Automatic = true
SWEP.Secondary.ClipSize = -1 SWEP.Secondary.ClipSize = 1
SWEP.Secondary.DefaultClip = -1 SWEP.Secondary.DefaultClip = 1
SWEP.Secondary.Automatic = false SWEP.Secondary.Ammo = "dummy"
SWEP.Secondary.Ammo = "none"
SWEP.WalkSpeed = SPEED_NORMAL SWEP.WalkSpeed = SPEED_NORMAL
SWEP.FullWalkSpeed = SPEED_SLOWEST SWEP.FullWalkSpeed = SPEED_SLOWEST

7
gamemodes/zombiesurvival/entities/weapons/weapon_zs_grenade/shared.lua
View file

@ -10,10 +10,9 @@ SWEP.Primary.Ammo = "grenade"
SWEP.Primary.Delay = 1.25 SWEP.Primary.Delay = 1.25
SWEP.Primary.DefaultClip = 1 SWEP.Primary.DefaultClip = 1
SWEP.Secondary.ClipSize = -1 SWEP.Secondary.ClipSize = 1
SWEP.Secondary.DefaultClip = -1 SWEP.Secondary.DefaultClip = 1
SWEP.Secondary.Automatic = false SWEP.Secondary.Ammo = "dummy"
SWEP.Secondary.Ammo = "none"
SWEP.WalkSpeed = SPEED_FAST SWEP.WalkSpeed = SPEED_FAST

7
gamemodes/zombiesurvival/entities/weapons/weapon_zs_hammer/shared.lua
View file

@ -13,10 +13,9 @@ SWEP.Primary.Ammo = "GaussEnergy"
SWEP.Primary.Delay = 1 SWEP.Primary.Delay = 1
SWEP.Primary.DefaultClip = 16 SWEP.Primary.DefaultClip = 16
SWEP.Secondary.ClipSize = -1 SWEP.Secondary.ClipSize = 1
SWEP.Secondary.DefaultClip = -1 SWEP.Secondary.DefaultClip = 1
SWEP.Secondary.Automatic = false SWEP.Secondary.Ammo = "dummy"
SWEP.Secondary.Ammo = "none"
SWEP.MeleeDamage = 35 SWEP.MeleeDamage = 35
SWEP.MeleeRange = 50 SWEP.MeleeRange = 50

7
gamemodes/zombiesurvival/entities/weapons/weapon_zs_manhack.lua
View file

@ -45,10 +45,9 @@ SWEP.Primary.Ammo = "manhack"
SWEP.Primary.Delay = 1 SWEP.Primary.Delay = 1
SWEP.Primary.DefaultClip = 1 SWEP.Primary.DefaultClip = 1
SWEP.Secondary.ClipSize = -1 SWEP.Secondary.ClipSize = 1
SWEP.Secondary.DefaultClip = -1 SWEP.Secondary.DefaultClip = 1
SWEP.Secondary.Automatic = false SWEP.Secondary.Ammo = "dummy"
SWEP.Secondary.Ammo = "none"
SWEP.WalkSpeed = SPEED_FAST SWEP.WalkSpeed = SPEED_FAST

6
gamemodes/zombiesurvival/entities/weapons/weapon_zs_medicalkit.lua
View file

@ -29,9 +29,9 @@ SWEP.Primary.Ammo = "Battery"
SWEP.Secondary.Delay = 20 SWEP.Secondary.Delay = 20
SWEP.Secondary.Heal = 10 SWEP.Secondary.Heal = 10
SWEP.Secondary.ClipSize = -1 SWEP.Secondary.ClipSize = 1
SWEP.Secondary.DefaultClip = -1 SWEP.Secondary.DefaultClip = 1
SWEP.Secondary.Ammo = "none" SWEP.Secondary.Ammo = "dummy"
SWEP.WalkSpeed = SPEED_NORMAL SWEP.WalkSpeed = SPEED_NORMAL

6
gamemodes/zombiesurvival/entities/weapons/weapon_zs_messagebeacon/shared.lua
View file

@ -9,10 +9,10 @@ SWEP.Primary.Ammo = "striderminigun"
SWEP.Primary.Delay = 1 SWEP.Primary.Delay = 1
SWEP.Primary.Automatic = true SWEP.Primary.Automatic = true
SWEP.Secondary.ClipSize = -1 SWEP.Secondary.ClipSize = 1
SWEP.Secondary.DefaultClip = -1 SWEP.Secondary.DefaultClip = 1
SWEP.Secondary.Automatic = false SWEP.Secondary.Automatic = false
SWEP.Secondary.Ammo = "none" SWEP.Secondary.Ammo = "dummy"
SWEP.WalkSpeed = SPEED_NORMAL SWEP.WalkSpeed = SPEED_NORMAL
SWEP.FullWalkSpeed = SPEED_SLOW SWEP.FullWalkSpeed = SPEED_SLOW

6
gamemodes/zombiesurvival/entities/weapons/weapon_zs_resupplybox/shared.lua
View file

@ -9,10 +9,10 @@ SWEP.Primary.Ammo = "helicoptergun"
SWEP.Primary.Delay = 1 SWEP.Primary.Delay = 1
SWEP.Primary.Automatic = true SWEP.Primary.Automatic = true
SWEP.Secondary.ClipSize = -1 SWEP.Secondary.ClipSize = 1
SWEP.Secondary.DefaultClip = -1 SWEP.Secondary.DefaultClip = 1
SWEP.Secondary.Automatic = false SWEP.Secondary.Automatic = false
SWEP.Secondary.Ammo = "none" SWEP.Secondary.Ammo = "dummy"
SWEP.WalkSpeed = SPEED_NORMAL SWEP.WalkSpeed = SPEED_NORMAL
SWEP.FullWalkSpeed = SPEED_SLOWEST SWEP.FullWalkSpeed = SPEED_SLOWEST

6
gamemodes/zombiesurvival/entities/weapons/weapon_zs_spotlamp/shared.lua
View file

@ -9,10 +9,10 @@ SWEP.Primary.Ammo = "spotlamp"
SWEP.Primary.Delay = 1 SWEP.Primary.Delay = 1
SWEP.Primary.Automatic = true SWEP.Primary.Automatic = true
SWEP.Secondary.ClipSize = -1 SWEP.Secondary.ClipSize = 1
SWEP.Secondary.DefaultClip = -1 SWEP.Secondary.DefaultClip = 1
SWEP.Secondary.Automatic = false SWEP.Secondary.Automatic = false
SWEP.Secondary.Ammo = "none" SWEP.Secondary.Ammo = "dummy"
SWEP.WalkSpeed = SPEED_NORMAL SWEP.WalkSpeed = SPEED_NORMAL
SWEP.FullWalkSpeed = SPEED_SLOWEST SWEP.FullWalkSpeed = SPEED_SLOWEST

6
gamemodes/zombiesurvival/entities/weapons/weapon_zs_stone.lua
View file

@ -42,10 +42,10 @@ SWEP.Primary.Ammo = "stone"
SWEP.Primary.Delay = 1 SWEP.Primary.Delay = 1
SWEP.Primary.DefaultClip = 1 SWEP.Primary.DefaultClip = 1
SWEP.Secondary.ClipSize = -1 SWEP.Secondary.ClipSize = 1
SWEP.Secondary.DefaultClip = -1 SWEP.Secondary.DefaultClip = 1
SWEP.Secondary.Automatic = false SWEP.Secondary.Automatic = false
SWEP.Secondary.Ammo = "none" SWEP.Secondary.Ammo = "dummy"
SWEP.WalkSpeed = SPEED_FAST SWEP.WalkSpeed = SPEED_FAST

2
gamemodes/zombiesurvival/gamemode/shared.lua
View file

@ -109,6 +109,8 @@ function GM:AddCustomAmmo()
game.AddAmmoType({name = "manhack"}) game.AddAmmoType({name = "manhack"})
game.AddAmmoType({name = "manhack_saw"}) game.AddAmmoType({name = "manhack_saw"})
game.AddAmmoType({name = "drone"}) game.AddAmmoType({name = "drone"})
game.AddAmmoType({name = "dummy"})
end end
function GM:CanRemoveOthersNail(pl, nailowner, ent) function GM:CanRemoveOthersNail(pl, nailowner, ent)