diff options
| author | Alexander Pickering <alexandermpickering@gmail.com> | 2017-01-13 20:33:59 -0500 |
|---|---|---|
| committer | Alexander Pickering <alexandermpickering@gmail.com> | 2017-01-13 20:33:59 -0500 |
| commit | f4ee62bb0725a3ae94477b2818071f506e4dfd9f (patch) | |
| tree | 5b185d1f93aea4e14a2d93e4addfde4dafda9bed /gamemode/inventorysystem/prayers | |
| parent | 98e0462e4f6b13ff26af5211409352d45dd9453e (diff) | |
| download | artery-f4ee62bb0725a3ae94477b2818071f506e4dfd9f.tar.gz artery-f4ee62bb0725a3ae94477b2818071f506e4dfd9f.tar.bz2 artery-f4ee62bb0725a3ae94477b2818071f506e4dfd9f.zip | |
Finished up shaped inventory, and more work on shared functions.
Diffstat (limited to 'gamemode/inventorysystem/prayers')
| -rw-r--r-- | gamemode/inventorysystem/prayers/sh_prayers.lua | 14 |
1 files changed, 12 insertions, 2 deletions
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 |