diff options
| author | Alexander Pickering <Alexander.Pickering@anondomain.site90.net> | 2015-12-29 00:24:19 -0500 |
|---|---|---|
| committer | Alexander Pickering <Alexander.Pickering@anondomain.site90.net> | 2015-12-29 00:24:19 -0500 |
| commit | d5c8b78eb7da5f85f10da2ee0633fa324b35b0d5 (patch) | |
| tree | b730f14a15378aa7f088a25a8244e353b460a961 | |
| parent | 6aec4eeb33ba60f7316a8b0baa3a098888bf2336 (diff) | |
| download | wintersurvival2-d5c8b78eb7da5f85f10da2ee0633fa324b35b0d5.tar.gz wintersurvival2-d5c8b78eb7da5f85f10da2ee0633fa324b35b0d5.tar.bz2 wintersurvival2-d5c8b78eb7da5f85f10da2ee0633fa324b35b0d5.zip | |
Fixed nature rune being infinitely re-useable
| -rw-r--r-- | gamemode/itemsystem/items/runenature.lua | 1 | ||||
| -rw-r--r-- | gamemode/npcsystem/npcs/bird.lua | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gamemode/itemsystem/items/runenature.lua b/gamemode/itemsystem/items/runenature.lua index 286a957..2ebbff6 100644 --- a/gamemode/itemsystem/items/runenature.lua +++ b/gamemode/itemsystem/items/runenature.lua @@ -36,4 +36,5 @@ function ITEM:OnUse(user) if not user then return end
user:SetHealth(math.min(100,user:Health()+25))
user:AddFatigue(10)
+ user:RemoveItem(self.Name,1)
end
diff --git a/gamemode/npcsystem/npcs/bird.lua b/gamemode/npcsystem/npcs/bird.lua index b1702d0..007c16a 100644 --- a/gamemode/npcsystem/npcs/bird.lua +++ b/gamemode/npcsystem/npcs/bird.lua @@ -47,7 +47,11 @@ function NPC:Behave() --Check if there are any players nearby
local players = ents.FindByClass("Player")
for k,v in pairs(players) do
- if(v:GetPos():Distance(self:GetPos()) < 300) then
+ local fardist = 800
+ local closedist = 300
+ local iscrouched = v:Crouching()
+ local dist = v:GetPos():Distance(self:GetPos())
+ if((dist < fardist and not iscrouched) or (dist < closedist)) then
self:StartActivity(ACT_FLY)
print("I should fly away")
self:SetSequence( "Fly01" )
|