1 files changed, 14 insertions, 53 deletions

diff --git a/gamemode/inventorysystem/skills/cl_skills.lua b/gamemode/inventorysystem/skills/cl_skills.lua
index c324a49..d4dbf65 100644
--- a/gamemode/inventorysystem/skills/cl_skills.lua
+++ b/gamemode/inventorysystem/skills/cl_skills.lua
@@ -1,53 +1,6 @@
 
 local inv = {}
---[[
-inv.allskills = {
-	["forageing"] = {
-		"hunting",
-		"butchering",
-		"woodcutting",
-		"plant identification",
-	},
-	["farming"] = {
-		"domestication",
-		"sowing",
-		"arboriculture",
-		"apiarism",
-		"reaping",
-		"fishing",
-	},
-	["artisanship"] = {
-		"pottery",
-		"glass blowing",
-		"cooking",
-		"tanning",
-		"tailoring",
-		"metalworking",
-		"lockpicking",
-		"herbalism",
-		"alchemy",
-		"jewlery",
-	},
-	["culture"] = {
-		"litteracy",
-		"writeing",
-		"speech",
-		"negotiation",
-		"painting",
-		"performing",
-	},
-	["adventuring"] = {
-		"polearm",
-		"axeplay",
-		"swordplay",
-		"knifeing",
-		"fenceing",
-		"lockpicking",
-		"archery",
-		"throwing",
-	},
-}
-]]
+local sc = nrequire("sh_skillcommon.lua")
 --the gui elements
 local elements = {}
 
@@ -63,17 +16,21 @@ 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 (%d%%)",name,lvl,frac))
+	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 )
 
-	for k,v in pairs(self.allskills) do
+	for k,v in pairs(sc.SkillList()) do
 		local spanel = vgui.Create("DPanel", sheet)
 		spanel:Dock(FILL)
 		local layout = vgui.Create("DListLayout", spanel)
@@ -89,7 +46,7 @@ inv.DrawOnDPanel = function(self,panel)
 				["label"] = label,
 				["bar" ] = bar,
 			}
-			set_xp_of(j,self.skills[j])
+			set_xp_of(j,self.skills[j] or 0)
 			ipanel:Add(label)
 			ipanel:Add(bar)
 			ipanel:InvalidateLayout()
@@ -102,11 +59,15 @@ inv.DrawOnDPanel = function(self,panel)
 
 	local prox = {}
 	prox.Put = function(s,position,item)
-		set_xp_of(position[1],s[position[1]])
+		print("Calling inventory's put")
+		print("At time of call, skill was")
+		PrintTable(self)
+		set_xp_of(position[1],self.skills[position[1]])
 	end
 
 	prox.Remove = function(s,position)
-		set_xp_of(position[1],s[position[1]])
+		print("Calling inventory's remove")
+		set_xp_of(position[1],self.skills[position[1]])
 	end
 
 	return prox