Merge remote-tracking branch 'origin/master'

sleepySva · Jul 27, 2021 · aa4f869 · aa4f869
2 parents 75d6f9c + 28362b9
commit aa4f869
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/interface/scripted/xrc_arcana_bag/2.png b/interface/scripted/xrc_arcana_bag/2.png
diff --git a/interface/scripted/xrc_arcana_bag/LAJ_slot.lua b/interface/scripted/xrc_arcana_bag/LAJ_slot.lua
@@ -12,10 +12,10 @@ function itemHasTags(e) for _,r in pairs(AI) do if root.itemHasTag(e.name,r) the
 
 
 --https://steamcommunity.com/sharedfiles/filedetails/?id=1258008544
---And Shattered Alchemy
+--https://steamcommunity.com/workshop/filedetails/?id=1945946369
 function leftClickSlot(slot)
   local bag = bagType
-  widget.setItemSlotItem(slot, status.statusProperty("arcana_bag_"..bag)[""..slot])
+  widget.setItemSlotItem(slot, player.getProperty("arcana_bag_"..bag)[""..slot])
   if player.swapSlotItem() then
 	if has_value() then
       if widget.itemSlotItem(slot) then

diff --git a/interface/scripted/xrc_arcana_bag/lua.lua b/interface/scripted/xrc_arcana_bag/lua.lua
@@ -28,17 +28,17 @@ end
 function init2(b)
   bagType = b
   AI = root.assetJson("/arcana_bags.config:"..b) or {"a","a"}
-  if status.statusProperty("arcana_bag_"..bagType) == nil then status.setStatusProperty("arcana_bag_"..bagType,{}) end
+  if player.getProperty("arcana_bag_"..bagType) == nil then player.setProperty("arcana_bag_"..bagType,{}) end
 
   for foo = 1, slots do
-    widget.setItemSlotItem("_"..foo, status.statusProperty("arcana_bag_"..bagType)["_"..foo] or nil)
+    widget.setItemSlotItem("_"..foo, player.getProperty("arcana_bag_"..bagType)["_"..foo] or nil)
   end
 end
 function changeTab(_,a) widget.setText("title","^#ff0,shadow;"..title[a+1]) init2(a) end
 function setBagSlot(data,key)
-local pos = status.statusProperty("arcana_bag_"..bagType)
+local pos = player.getProperty("arcana_bag_"..bagType)
 pos[key] = data
-status.setStatusProperty("arcana_bag_"..bagType, pos)
+player.setProperty("arcana_bag_"..bagType, pos)
 end
 
 function uninit() widget.playSound(s) end
diff --git a/items/active/arcana_bags/2.png b/items/active/arcana_bags/2.png