From 0ceb38e8a1f26716fe4756c1cfbdbbedd1fae5f1 Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Wed, 28 Dec 2016 18:46:17 -0600 Subject: Fixed some stuff --- gamemode/itemsystem/items/sickle.lua | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'gamemode/itemsystem/items/sickle.lua') diff --git a/gamemode/itemsystem/items/sickle.lua b/gamemode/itemsystem/items/sickle.lua index 4703655..9a634bd 100644 --- a/gamemode/itemsystem/items/sickle.lua +++ b/gamemode/itemsystem/items/sickle.lua @@ -1,4 +1,4 @@ - +local ITEM = {} ITEM.Name = "Sickle" ITEM.Class = "weapon" ITEM.Desc = "A sickle. Used for bushes for vines and berries" @@ -39,21 +39,21 @@ ITEM.CD = 0.5 function ITEM:OnPrimary(pl,tr) if (CLIENT) then return end - + if (tr.Hit) then if (IsValid(tr.Entity)) then local ent = tr.Entity local class = ent:GetClass() - + if (class == "player" or class:find("npc_") or class == "ws_pigeon" or class == "ws_prop") then ent:TakeDamage(self.Damage,pl) - + if (class == "ws_prop") then pl:EmitSound(Sound("physics/wood/wood_plank_impact_hard"..math.random(1,3)..".wav"),100,math.random(90,110)) else pl:EmitSound(Sound("physics/flesh/flesh_impact_hard"..math.random(1,6)..".wav"),100,math.random(90,110)) end elseif (ent:IsPlant()) then if (math.random(1,35)/10 < 1) then pl:AddItem("Vine",1) end if (math.random(1,35)/10 < 1) then pl:AddItem("Berry",1) end - + pl:EmitSound(Sound("physics/concrete/rock_impact_hard"..math.random(1,6)..".wav"),100,math.random(90,110)) else pl:EmitSound(Sound("physics/surfaces/sand_impact_bullet"..math.random(1,4)..".wav"),100,math.random(90,110)) @@ -65,3 +65,4 @@ function ITEM:OnPrimary(pl,tr) pl:EmitSound(Sound("weapons/iceaxe/iceaxe_swing1.wav"),100,math.random(90,110)) end end +RegisterItem(ITEM) -- cgit v1.2.3-70-g09d2