aboutsummaryrefslogtreecommitdiff
path: root/gamemode/inventorysystem/prayers/sh_prayers.lua
diff options
context:
space:
mode:
authorAlexander Pickering <alexandermpickering@gmail.com>2017-10-09 16:20:46 -0400
committerAlexander Pickering <alexandermpickering@gmail.com>2017-10-09 16:20:46 -0400
commitda81a0a23a3704dd2de3ab2249496c1ad1912d1c (patch)
tree915edc671acbb292191adad2f25f87ba26e567cf /gamemode/inventorysystem/prayers/sh_prayers.lua
parent497be6ff15989c7bf9de5beb138d2ef042dca6bd (diff)
downloadartery-da81a0a23a3704dd2de3ab2249496c1ad1912d1c.tar.gz
artery-da81a0a23a3704dd2de3ab2249496c1ad1912d1c.tar.bz2
artery-da81a0a23a3704dd2de3ab2249496c1ad1912d1c.zip
Updated internal representation of inventories
Diffstat (limited to 'gamemode/inventorysystem/prayers/sh_prayers.lua')
-rw-r--r--gamemode/inventorysystem/prayers/sh_prayers.lua13
1 files changed, 12 insertions, 1 deletions
diff --git a/gamemode/inventorysystem/prayers/sh_prayers.lua b/gamemode/inventorysystem/prayers/sh_prayers.lua
index 83414b7..15cd2af 100644
--- a/gamemode/inventorysystem/prayers/sh_prayers.lua
+++ b/gamemode/inventorysystem/prayers/sh_prayers.lua
@@ -1,7 +1,16 @@
+--[[
+ prayers must have a "Pray" method,
+ a "Name" string,
+ a "Description" string
+]]
local reg = nrequire("inventory/inventory.lua")
local itm = nrequire("item.lua")
local inv = {}
+if CLIENT then
+ inv = nrequire("cl_prayers.lua")
+end
+
inv.Name = "Prayers"
inv.track = {}
function inv:FindPlaceFor(item)
@@ -42,12 +51,14 @@ function inv:Serialize()
end
function inv:DeSerialize(str)
+ local cpy = table.Copy(self)
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)
+ cpy:Put({i},this_prayer)
end
+ return cpy
end