From 383aebf4bd5cfaf31702b3b5bbf94d331d6256fd Mon Sep 17 00:00:00 2001
From: Alexander Pickering <Alexander.Pickering@anondomain.site90.net>
Date: Tue, 29 Dec 2015 22:34:58 -0500
Subject: Added dodos

---
 entities/entities/ws_npc_ambient/init.lua   | 22 ++++++++++++++++++++--
 entities/entities/ws_npc_ambient/shared.lua | 19 -------------------
 2 files changed, 20 insertions(+), 21 deletions(-)

(limited to 'entities')

diff --git a/entities/entities/ws_npc_ambient/init.lua b/entities/entities/ws_npc_ambient/init.lua
index f9aa726..ee39178 100644
--- a/entities/entities/ws_npc_ambient/init.lua
+++ b/entities/entities/ws_npc_ambient/init.lua
@@ -22,12 +22,30 @@ function ENT:Initialize()
     ]]--
 end
 
-function ENT:OnTakeDamage(dmg)
+function ENT:OnInjured(dmg)
     print("Taking some dammage")
+    local itempos = self:GetPos()
 	self:SetHealth(self:Health() - dmg:GetDamage())
     if self.OnDammage != nil then self:OnDammage(dmg) end
 	if self:Health() <= 0 then //run on death
-        self:Remove()
+        if(CLIENT) then return end
+        if not self.Drops then return end
+        print("Looks like we have some drops")
+        local rng = math.random(0,100)
+        for k,v in pairs(self.Drops) do
+            local itemname = self.Drops[k][1]
+            local itemchance = self.Drops[k][2]
+            local heightoffset = 10
+            if rng < itemchance then
+                print("Createing a " .. itemname)
+                local drop = ents.Create("ws_item")
+                drop.Item = GetItemByName(itemname)
+                drop:SetModel(drop.Item.Model)
+                drop:SetPos(itempos + (self:GetUp()*heightoffset))
+                drop:Spawn()
+                heightoffset = heightoffset + 10
+            end
+        end
 		--self:SetSchedule( SCHED_FALL_TO_GROUND )
 	end
 end
diff --git a/entities/entities/ws_npc_ambient/shared.lua b/entities/entities/ws_npc_ambient/shared.lua
index cac9e39..ba65e2b 100644
--- a/entities/entities/ws_npc_ambient/shared.lua
+++ b/entities/entities/ws_npc_ambient/shared.lua
@@ -15,25 +15,6 @@ ENT.Act 			= nil
    Desc: Called just before entity is deleted
 ---------------------------------------------------------*/
 function ENT:OnRemove()
-	print("Doing onremove")
-	if(CLIENT) then return end
-	if not self.Drops then return end
-	print("Looks like we have some drops")
-	local rng = math.random(0,100)
-	for k,v in pairs(self.Drops) do
-		local itemname = self.Drops[k][1]
-		local itemchance = self.Drops[k][2]
-		local heightoffset = 10
-		if rng < itemchance then
-			print("Createing a " .. itemname)
-			local drop = ents.Create("ws_item")
-			drop.Item = GetItemByName(itemname)
-			drop:SetModel(drop.Item.Model)
-			drop:SetPos(self:GetUp()*heightoffset)
-			drop:Spawn()
-			heightoffset = heightoffset + 10
-		end
-	end
 end
 
 function ENT:BehaveAct()
-- 
cgit v1.2.3-70-g09d2