From f0448c30809ab517ac8f14277ae50710ca0a4825 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Tue, 18 Feb 2025 04:17:50 +0300 Subject: [PATCH] move inventory.get_uses, inventory.use from stdmin to stdlib --- res/scripts/stdlib.lua | 25 +++++++++++++++++++++++++ res/scripts/stdmin.lua | 25 ------------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/res/scripts/stdlib.lua b/res/scripts/stdlib.lua index 47094bc7..acd833b0 100644 --- a/res/scripts/stdlib.lua +++ b/res/scripts/stdlib.lua @@ -94,6 +94,31 @@ elseif __vc_app then complete_app_lib(__vc_app) end +function inventory.get_uses(invid, slot) + local uses = inventory.get_data(invid, slot, "uses") + if uses == nil then + return item.uses(inventory.get(invid, slot)) + end + return uses +end + + +function inventory.use(invid, slot) + local itemid, count = inventory.get(invid, slot) + if itemid == nil then + return + end + local item_uses = inventory.get_uses(invid, slot) + if item_uses == nil then + return + end + if item_uses == 1 then + inventory.set(invid, slot, itemid, count - 1) + elseif item_uses > 1 then + inventory.set_data(invid, slot, "uses", item_uses - 1) + end +end + ------------------------------------------------ ------------------- Events --------------------- ------------------------------------------------ diff --git a/res/scripts/stdmin.lua b/res/scripts/stdmin.lua index 60824c84..5ebf0176 100644 --- a/res/scripts/stdmin.lua +++ b/res/scripts/stdmin.lua @@ -497,28 +497,3 @@ end function file.prefix(path) return path:match("^([^:]+)") end - -function inventory.get_uses(invid, slot) - local uses = inventory.get_data(invid, slot, "uses") - if uses == nil then - return item.uses(inventory.get(invid, slot)) - end - return uses -end - - -function inventory.use(invid, slot) - local itemid, count = inventory.get(invid, slot) - if itemid == nil then - return - end - local item_uses = inventory.get_uses(invid, slot) - if item_uses == nil then - return - end - if item_uses == 1 then - inventory.set(invid, slot, itemid, count - 1) - elseif item_uses > 1 then - inventory.set_data(invid, slot, "uses", item_uses - 1) - end -end