diff options
| author | Alexander Pickering <Alexander.Pickering@anondomain.site90.net> | 2015-12-30 23:07:37 -0500 |
|---|---|---|
| committer | Alexander Pickering <Alexander.Pickering@anondomain.site90.net> | 2015-12-30 23:07:37 -0500 |
| commit | ad6b6494ace327d04c71fdc8f74e2b2f26033d6a (patch) | |
| tree | f906fb972b987baa916341c631ba181b2555f285 | |
| parent | 5ed16717129121ebb9c7c1012d1ce17f2aa71bf7 (diff) | |
| parent | 92d76fbc18f3904c137c161bf4639ff0bfc2530e (diff) | |
| download | wintersurvival2-ad6b6494ace327d04c71fdc8f74e2b2f26033d6a.tar.gz wintersurvival2-ad6b6494ace327d04c71fdc8f74e2b2f26033d6a.tar.bz2 wintersurvival2-ad6b6494ace327d04c71fdc8f74e2b2f26033d6a.zip | |
Merge branch 'grave-remove-if-empyty' into development
| -rw-r--r-- | entities/entities/ws_grave/init.lua | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/entities/entities/ws_grave/init.lua b/entities/entities/ws_grave/init.lua index 17995ba..21da15b 100644 --- a/entities/entities/ws_grave/init.lua +++ b/entities/entities/ws_grave/init.lua @@ -9,13 +9,13 @@ function ENT:Initialize() self:SetMoveType(MOVETYPE_NONE)
self:SetSolid(SOLID_VPHYSICS)
self:SetUseType(SIMPLE_USE)
-
+
local phys = self:GetPhysicsObject()
phys:EnableMotion(false)
phys:Sleep()
-
+
self:SetHealth(30)
-
+
self.StoredItems = {}
end
@@ -26,7 +26,7 @@ function ENT:AddItem(item,quantity) return
end
end
-
+
table.insert(self.StoredItems,{Name = item, Quantity = quantity})
end
@@ -35,13 +35,16 @@ function ENT:TakeItem(pl,item,quantity) if (v.Name == item) then
quantity = math.min(quantity,v.Quantity)
v.Quantity = v.Quantity - quantity
-
+
pl:AddItem(item,quantity)
-
+
if (v.Quantity <= 0) then table.remove(self.StoredItems,k) end
break
end
end
+ if(self.StoreDItems == {}) then
+ self:Remove()
+ end
end
function ENT:GetItems()
@@ -55,6 +58,6 @@ end function ENT:OnTakeDamage(dmg)
self:SetHealth(self:Health()-dmg)
-
+
if (self:Health() <= 0) then self:Remove() end
end
|
