aboutsummaryrefslogtreecommitdiff
path: root/gamemode/itemsystem
diff options
context:
space:
mode:
authorAlexander Pickering <alexandermpickering@gmail.com>2016-08-22 21:53:19 -0400
committerAlexander Pickering <alexandermpickering@gmail.com>2016-08-22 21:53:19 -0400
commit3c71b9a8d266a2f1b1a826556a6c28158e11a6d6 (patch)
treef5558302ff20be4821dd5e2b29fdcc25737780fc /gamemode/itemsystem
parent1ea4fd38c510840ba11cbb7eda7aec15156fb935 (diff)
downloadwintersurvival2-3c71b9a8d266a2f1b1a826556a6c28158e11a6d6.tar.gz
wintersurvival2-3c71b9a8d266a2f1b1a826556a6c28158e11a6d6.tar.bz2
wintersurvival2-3c71b9a8d266a2f1b1a826556a6c28158e11a6d6.zip
Fixed fireball shareing charges among players
Diffstat (limited to 'gamemode/itemsystem')
-rw-r--r--gamemode/itemsystem/items/spell_fireball.lua21
1 files changed, 15 insertions, 6 deletions
diff --git a/gamemode/itemsystem/items/spell_fireball.lua b/gamemode/itemsystem/items/spell_fireball.lua
index 0cdb356..f5de38d 100644
--- a/gamemode/itemsystem/items/spell_fireball.lua
+++ b/gamemode/itemsystem/items/spell_fireball.lua
@@ -22,7 +22,7 @@ ITEM.Recipe = {
ITEM.CD = 0.25
-ITEM.NumFireballs = 0
+ITEM.NumFireballs = {}
ITEM.MaxFireballs = 3
local fireball = {}
@@ -70,18 +70,27 @@ end
function ITEM:OnSecondary(pl,tr)
ParticleEffect("firetest",pl:GetPos(),pl:GetAngles(),pl)
- if(self.NumFireballs > 0) then
+ if(self.NumFireballs[pl] ~= nil and self.NumFireballs[pl] > 0) then
self:DoFireball(pl)
self.NumFireballs = self.NumFireballs-1
end
end
+hook.Add("PlayerDeath","remove_fireball_count",function(victim,inflictor,attacker)
+ self.NumFireballs[victim] = 0
+end)
+
+hook.Add("PlayerDisconnected","clean_fireball_count",function(ply)
+ self.NumFireballs[ply] = nil
+end)
+
local fireballfunc = function(num,pl,self)
if(num == 0) then return end
- if(self.NumFireballs < self.MaxFireballs) then
- self.NumFireballs = self.NumFireballs+1
- print("New num fireballs:" .. self.NumFireballs)
- end
+ if self.NumFireballs[ply] == nil then
+ self.NumFireballs[ply] = 1
+ elseif self.NumFireballs[ply] < self.MaxFireballs then
+ self.NumFireballs[ply] = self.NumFireballs[ply] + 1
+ end
end
function ITEM:OnPrimary(pl,tr)