diff options
| author | Alexander Pickering <Alexander.Pickering@anondomain.site90.net> | 2015-12-28 22:43:36 -0500 |
|---|---|---|
| committer | Alexander Pickering <Alexander.Pickering@anondomain.site90.net> | 2015-12-28 22:43:36 -0500 |
| commit | 789be4eda3dcac19eb9fe3a290b3283529277c9d (patch) | |
| tree | f135b7de8704dbc04472febfdea8d008971cb624 /entities | |
| parent | 5c4ebc932d8c02522802c842d43d863d89aca162 (diff) | |
| download | wintersurvival2-789be4eda3dcac19eb9fe3a290b3283529277c9d.tar.gz wintersurvival2-789be4eda3dcac19eb9fe3a290b3283529277c9d.tar.bz2 wintersurvival2-789be4eda3dcac19eb9fe3a290b3283529277c9d.zip | |
Updated to current
Diffstat (limited to 'entities')
| -rw-r--r-- | entities/entities/ws_alter/init.lua | 31 |
1 files changed, 17 insertions, 14 deletions
diff --git a/entities/entities/ws_alter/init.lua b/entities/entities/ws_alter/init.lua index a8f6641..5f413b2 100644 --- a/entities/entities/ws_alter/init.lua +++ b/entities/entities/ws_alter/init.lua @@ -15,45 +15,48 @@ 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
function ENT:Think()
local HasItems = {}
-
+
for k,v in pairs(self.StoredItems) do
if (ResurrectionTable[v.Name] and v.Quantity >= ResurrectionTable[v.Name]) then
HasItems[v.Name] = {k,ResurrectionTable[v.Name]}
end
end
-
+
if (table.Count(HasItems) >= table.Count(ResurrectionTable)) then
for k,v in pairs(player.GetAll()) do
if (v:IsPigeon() and v:Alive() and v:GetPos():Distance(self:GetPos()) < 200) then
v:SetHuman(true)
v:KillSilent()
+ if(v:Alive()) then
+ v:Kill()
+ end
v:ChatPrint("You have been resurrected from the dead!")
self:EmitSound("wintersurvival2/ritual/wololo.mp3")
-
+
for a,b in pairs(HasItems) do
if (self.StoredItems[b[1]].Quantity == b[2]) then table.remove(self.StoredItems,b[1])
else self.StoredItems[b[1]].Quantity = self.StoredItems[b[1]].Quantity-b[2] end
end
-
v:Spawn()
-
+ v:SetPos(self:GetPos())
+
break
end
end
end
-
+
self:NextThink(CurTime()+10)
return true
end
@@ -65,7 +68,7 @@ function ENT:AddItem(item,quantity) return
end
end
-
+
table.insert(self.StoredItems,{Name = item, Quantity = quantity})
end
@@ -74,9 +77,9 @@ 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
@@ -94,6 +97,6 @@ end function ENT:OnTakeDamage(dmg)
self:SetHealth(self:Health()-dmg)
-
+
if (self:Health() <= 0) then self:Remove() end
-end
\ No newline at end of file +end
|