aboutsummaryrefslogtreecommitdiff
path: root/gamemode/inventorysystem/skills
diff options
context:
space:
mode:
Diffstat (limited to 'gamemode/inventorysystem/skills')
-rw-r--r--gamemode/inventorysystem/skills/cl_skills.lua9
-rw-r--r--gamemode/inventorysystem/skills/sh_skillcommon.lua4
-rw-r--r--gamemode/inventorysystem/skills/sh_skills.lua17
3 files changed, 0 insertions, 30 deletions
diff --git a/gamemode/inventorysystem/skills/cl_skills.lua b/gamemode/inventorysystem/skills/cl_skills.lua
index fed0f46..d0a5421 100644
--- a/gamemode/inventorysystem/skills/cl_skills.lua
+++ b/gamemode/inventorysystem/skills/cl_skills.lua
@@ -16,17 +16,12 @@ local levelfunc = function(val)
end
local set_xp_of = function(name,ammt)
- print("setting xp of", name," to ", ammt)
local lvl,frac = levelfunc(ammt)
elements[name].label:SetText(string.format("%s : %d (%2.5f%%)",name,lvl,frac))
elements[name].bar:SetFraction(frac)
end
inv.DrawOnDPanel = function(self,panel)
- print("Drawing skills on panel")
- PrintTable(sc.SkillList())
- print("with")
- PrintTable(self.skills)
local sheet = vgui.Create( "DColumnSheet", panel )
sheet:Dock( FILL )
@@ -59,14 +54,10 @@ inv.DrawOnDPanel = function(self,panel)
local prox = {}
prox.Put = function(s,position,item)
- print("Calling inventory's put")
- print("At time of call, skill was")
- PrintTable(self)
set_xp_of(position[1],self.skills[position[1]] or item.ammt)--Observer might be called before our put()
end
prox.Remove = function(s,position)
- print("Calling inventory's remove")
set_xp_of(position[1],self.skills[position[1]] or itm.ammt)
end
diff --git a/gamemode/inventorysystem/skills/sh_skillcommon.lua b/gamemode/inventorysystem/skills/sh_skillcommon.lua
index fd05eaa..9640421 100644
--- a/gamemode/inventorysystem/skills/sh_skillcommon.lua
+++ b/gamemode/inventorysystem/skills/sh_skillcommon.lua
@@ -39,8 +39,6 @@ local lib = {}
local skills = {}
--Skillname is a table of {string_group,string_name}
function lib.RegisterSkill(skillname)
- print("funcs.RegisterSkill called with")
- PrintTable(skillname)
local group,name = skillname[1],skillname[2]
if not skills[group] then
skills[group] = {}
@@ -57,8 +55,6 @@ function lib.RegisterSkill(skillname)
else
skills[group][#skills[group] + 1] = name
end
- print("After registering skill, skills is")
- PrintTable(skills)
end
function lib.SkillList()
diff --git a/gamemode/inventorysystem/skills/sh_skills.lua b/gamemode/inventorysystem/skills/sh_skills.lua
index 9b6edd5..a1c878f 100644
--- a/gamemode/inventorysystem/skills/sh_skills.lua
+++ b/gamemode/inventorysystem/skills/sh_skills.lua
@@ -81,12 +81,9 @@ inv.skills = {}
local function calculate_skills()
for k,v in pairs(sc.SkillList()) do
for i,j in pairs(v) do
- print("settings inv's skills' ", j, " to 0")
inv.skills[j] = 0
end
end
- print("After calculating skills, inv was")
- PrintTable(inv)
end
calculate_skills()
@@ -99,15 +96,9 @@ item should be
}
]]
inv.FindPlaceFor = function(self, item)
- print("finding place for ")
- PrintTable(item)
if not item.isskill then
return nil
end
- print("Skill inventory trying to find place for, looking in ")
- PrintTable(inv.skills)
- print("for")
- print(item.name)
if inv.skills[item.name] then
return {item.name}
else
@@ -120,8 +111,6 @@ inv.CanFitIn = function(self,position,item)
end
inv.Put = function(self,position,item)
- print("item is")
- PrintTable(item)
self.skills[position[1]] = (self.skills[position[1]] or 0) + item.ammt
end
@@ -155,17 +144,11 @@ inv.DeSerialize = function(self,data)
return table.Copy(inv)
end
calculate_skills()
- print("At the time we deserialized, sc.skilllist was")
- PrintTable(sc.SkillList())
- print("Before making a copy of, inv is")
- PrintTable(inv)
local cpy = table.Copy(self)
local gen = util.JSONToTable(data)
for k,v in pairs(gen) do
cpy.skills[k] = v
end
- print("AFter deserializing inventory, it is")
- PrintTable(cpy)
return cpy
end