From c938d041633104340f866a5906f6dbaffaf1f459 Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Tue, 18 Oct 2016 18:22:54 -0400 Subject: Bugfixes in spells and misc linting --- gamemode/itemsystem/items/runeblink.lua | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'gamemode/itemsystem/items/runeblink.lua') diff --git a/gamemode/itemsystem/items/runeblink.lua b/gamemode/itemsystem/items/runeblink.lua index 4a48b20..c1c2694 100644 --- a/gamemode/itemsystem/items/runeblink.lua +++ b/gamemode/itemsystem/items/runeblink.lua @@ -2,7 +2,7 @@ ITEM.Name = "Blink Rune" ITEM.Class = "resource" ITEM.Desc = "Jump Forward a little" -ITEM.Model = "models/props_combine/breenlight.mdl" +ITEM.Model = "models/props_junk/Rock001a.mdl" ITEM.Icon = Material("wintersurvival2/hud/ws2_icons/icon_runeblink.png") ITEM.Structure = { @@ -30,7 +30,7 @@ ITEM.Range = 64 ITEM.CD = 1 function ITEM:OnPrimary(user) - if(user:HasItem(self.Name,1)) then + if user:HasItem(self.Name,1) then self:OnUse(user) else if not user.UnEquipWeaponSlot then return end @@ -40,15 +40,15 @@ function ITEM:OnPrimary(user) end function ITEM:OnUse(user) - if(CLIENT) then return end - local tr = user:GetEyeTrace() - local edist = tr.HitPos:Distance(user:GetPos()+Vector(0,0,72)) - if(edist < 400) then - user:SetPos(tr.HitPos + (user:GetAimVector()*-32)) - else - user:SetPos(user:GetPos() + user:GetAimVector()*300) - end - - local adjustedlen = math.min(250,edist) - user:RemoveItem(self.Name,1) + if CLIENT then return end + local tr = user:GetEyeTrace() + local edist = tr.HitPos:Distance(user:GetPos() + Vector(0,0,72)) + if edist < 400 then + user:SetPos(tr.HitPos + (user:GetAimVector() * -32)) + else + user:SetPos(user:GetPos() + user:GetAimVector() * 300) + end + + --local adjustedlen = math.min(250,edist) + user:RemoveItem(self.Name,1) end -- cgit v1.2.3-70-g09d2