From f4ee62bb0725a3ae94477b2818071f506e4dfd9f Mon Sep 17 00:00:00 2001 From: Alexander Pickering Date: Fri, 13 Jan 2017 20:33:59 -0500 Subject: Finished up shaped inventory, and more work on shared functions. --- gamemode/inventorysystem/prayers/sh_prayers.lua | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'gamemode/inventorysystem/prayers/sh_prayers.lua') diff --git a/gamemode/inventorysystem/prayers/sh_prayers.lua b/gamemode/inventorysystem/prayers/sh_prayers.lua index 208540d..83414b7 100644 --- a/gamemode/inventorysystem/prayers/sh_prayers.lua +++ b/gamemode/inventorysystem/prayers/sh_prayers.lua @@ -1,5 +1,5 @@ -local reg = nrequire("inventory.lua") +local reg = nrequire("inventory/inventory.lua") local itm = nrequire("item.lua") local inv = {} inv.Name = "Prayers" @@ -27,7 +27,7 @@ function inv:Has(a) end function inv:Remove(pos) for i = 1,pos[1] do - self.track[i] = self.track[i+1] + self.track[i] = self.track[i + 1] end end function inv:Get(pos) @@ -38,6 +38,16 @@ function inv:Serialize() for k,v in pairs(self.track) do ret[v.Name] = v:Serialize() end + return util.TableToJSON(ret) +end + +function inv:DeSerialize(str) + local tbl = util.JSONToTable(str) + local i = 1 + for k,v in pairs(tbl) do + local this_prayer = itm.GetItemByName(k):DeSerialize(v) + self:Put({i},this_prayer) + end end -- cgit v1.2.3-70-g09d2