diff options
| author | Alexander Pickering <alexandermpickering@gmail.com> | 2017-11-05 00:23:32 -0400 |
|---|---|---|
| committer | Alexander Pickering <alexandermpickering@gmail.com> | 2017-11-05 00:23:32 -0400 |
| commit | f53052a063b73e92c4e92b214e439b446600fe8a (patch) | |
| tree | 2e0c4952ef1cac1515750d047c0b8d8486fe5192 /gamemode/inventorysystem | |
| parent | 5d77d8475af7aff27eb026a4b56065387c024165 (diff) | |
| download | artery-f53052a063b73e92c4e92b214e439b446600fe8a.tar.gz artery-f53052a063b73e92c4e92b214e439b446600fe8a.tar.bz2 artery-f53052a063b73e92c4e92b214e439b446600fe8a.zip | |
Minor update
Diffstat (limited to 'gamemode/inventorysystem')
| -rw-r--r-- | gamemode/inventorysystem/shapedinventory/sh_shaped.lua | 2 | ||||
| -rw-r--r-- | gamemode/inventorysystem/skills/cl_skills.lua | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/gamemode/inventorysystem/shapedinventory/sh_shaped.lua b/gamemode/inventorysystem/shapedinventory/sh_shaped.lua index 69e18ca..1b53d43 100644 --- a/gamemode/inventorysystem/shapedinventory/sh_shaped.lua +++ b/gamemode/inventorysystem/shapedinventory/sh_shaped.lua @@ -11,7 +11,7 @@ if CLIENT then inv = nrequire("cl_shaped.lua") end inv.Name = "Shaped Inventory" inv.tracker = {} inv.width = 5 -inv.height = 10 +inv.height = 5 local function calcposition(width,height,row,col) return ((row-1) * width) + col diff --git a/gamemode/inventorysystem/skills/cl_skills.lua b/gamemode/inventorysystem/skills/cl_skills.lua index d4dbf65..fed0f46 100644 --- a/gamemode/inventorysystem/skills/cl_skills.lua +++ b/gamemode/inventorysystem/skills/cl_skills.lua @@ -62,12 +62,12 @@ inv.DrawOnDPanel = function(self,panel) print("Calling inventory's put") print("At time of call, skill was") PrintTable(self) - set_xp_of(position[1],self.skills[position[1]]) + 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]]) + set_xp_of(position[1],self.skills[position[1]] or itm.ammt) end return prox |