From 78e40d9fd55b6ba23db4f459e2c7e9ae2109cf5a Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Mon, 24 Oct 2016 21:52:20 -0400 Subject: Allowed items to be dropped --- gamemode/shared/itemsystem/weapons/rustyaxe.lua | 36 ++++++++++++++----------- 1 file changed, 21 insertions(+), 15 deletions(-) (limited to 'gamemode/shared/itemsystem/weapons/rustyaxe.lua') diff --git a/gamemode/shared/itemsystem/weapons/rustyaxe.lua b/gamemode/shared/itemsystem/weapons/rustyaxe.lua index 71d8603..f21500d 100644 --- a/gamemode/shared/itemsystem/weapons/rustyaxe.lua +++ b/gamemode/shared/itemsystem/weapons/rustyaxe.lua @@ -66,6 +66,7 @@ end local positionset = {} +--[[ local function swingarc(player,times,positions,onhit) local positionpoints = {} table.insert(positionset,positionpoints) @@ -102,6 +103,7 @@ hook.Add( "HUDPaint", "weaponswings", function() --render.DrawSprite( pos, 16, 16, white ) -- Draw the sprite in the middle of the map, at 16x16 in it's original colour with full alpha. cam.End3D() end ) +]] --Optional, what to do when the player clicks, and this item is in the slot in inventory. only works for items equipable in left and right item.lastSwing = {} @@ -117,13 +119,13 @@ item.onClick = function(self,owner) ["forward"] = function() owner:SetLuaAnimation("axe_swing_up") timer.Simple(2.33,function() owner:StopLuaAnimation("axe_swing_up") end) - local hits = swingarc(owner,{ + local hits = ART.swingarc(owner,{ 1,1.1,1.2,1.3 },{ - fow*20 + up*90, - fow*45 + up*70, - fow*35 + up*45, - fow*20 + up*30, + fow*20 + up*26, + fow*45 + up*6, + fow*35 + up*-13, + fow*20 + up*-34, },function(tr) if tr.Entity.TakeDamage ~= nil and tr.Entity ~= owner then tr.Entity:TakeDamage(5, owner, owner:GetActiveWeapon()) @@ -137,13 +139,13 @@ item.onClick = function(self,owner) ["left"] = function() owner:SetLuaAnimation("axe_swing_left") timer.Simple(2.33,function() owner:StopLuaAnimation("axe_swing_left") end) - local hits = swingarc(owner,{ + local hits = ART.swingarc(owner,{ 1,1.1,1.2,1.3 },{ - rig*30 + up*59, - rig*10 + fow*30 + up*55, - rig*-10 + fow*30 + up*54, - rig*-30 + up*50, + rig*30 + up*-5, + rig*10 + fow*30 + up*-9, + rig*-10 + fow*30 + up*-10, + rig*-30 + up*-15, },function(tr) if tr.Entity.TakeDamage ~= nil and tr.Entity ~= owner then tr.Entity:TakeDamage(5, owner, owner:GetActiveWeapon()) @@ -154,13 +156,13 @@ item.onClick = function(self,owner) ["right"] = function() owner:SetLuaAnimation("axe_swing_right") timer.Simple(2.33,function() owner:StopLuaAnimation("axe_swing_right") end) - local hits = swingarc(owner,{ + local hits = ART.swingarc(owner,{ 1,1.1,1.2,1.3 },{ - rig*-30 + up*59, - rig*-10 + fow*30 + up*55, - rig*10 + fow*30 + up*54, - rig*30 + up*50, + rig*-30 + up*-5, + rig*-10 + fow*30 + up*-9, + rig*10 + fow*30 + up*-10, + rig*30 + up*-15, },function(tr) if tr.Entity.TakeDamage ~= nil and tr.Entity ~= owner then tr.Entity:TakeDamage(5, owner, owner:GetActiveWeapon()) @@ -192,6 +194,10 @@ item.onUnEquip = function(self,who) ART.RemovePAC(who,"rustyaxe") end +item.onDropped = function(self, ent) + ART.ApplyPAC(ent,"rustyaxe") +end + print("Hello from scrapgun.lua") --Don't forget to register the item! ART.RegisterItem(item) -- cgit v1.2.3-70-g09d2