Merge pull request #13 from The-Order-Of-The-Sacred-Framework/dev

Dev
This commit is contained in:
MrNewb authored and GitHub committed 2025-01-26 19:26:47 -05:00
commit 8aa76b95c1
7 files changed
+24 -6

No files matched your search

+1 -1
View File
@@ -4,7 +4,7 @@ lua54 'yes'
use_experimental_fxv2_oal 'yes'
author 'The Order of the Sacred Framework'
description 'A bridge made for the community to use as a base for their own projects. This bridge will allow a single format to work with nearly all commonly used systems while still offering expandability.'
version '0.1.6'
version '0.2.0'
shared_scripts {
'@ox_lib/init.lua',
+1 -1
View File
@@ -202,7 +202,7 @@ Framework.RegisterUsableItem = function(itemName, cb)
local func = function(src, item, itemData)
itemData = itemData or item
itemData.metadata = itemData.metadata or itemData.info or {}
cb(src, itemName, itemData)
cb(src, itemData)
end
ESX.RegisterUsableItem(itemName, func)
end
+1 -1
View File
@@ -181,7 +181,7 @@ Framework.RegisterUsableItem = function(itemName, cb)
exports(itemName, function(event, item, inventory, slot, data)
local slotData = exports.ox_inventory:GetSlot(inventory.id, slot)
if event == 'usingItem' then
cb(inventory.id, item, slotData)
cb(inventory.id, slotData)
return false
end
end)
+1 -1
View File
@@ -252,7 +252,7 @@ Framework.RegisterUsableItem = function(itemName, cb)
local func = function(src, item, itemData)
itemData = itemData or item
itemData.metadata = itemData.metadata or itemData.info or {}
cb(src, itemName, itemData)
cb(src, itemData)
end
QBCore.Functions.CreateUseableItem(itemName, func)
end
+2 -2
View File
@@ -239,7 +239,7 @@ Framework.RegisterUsableItem = function(itemName, cb)
local func = function(src, item, itemData)
itemData = itemData or item
itemData.metadata = itemData.metadata or itemData.info or {}
cb(src, itemName, itemData)
cb(src, itemData)
end
return QBox:CreateUseableItem(itemName, cb)
return QBox:CreateUseableItem(itemName, func)
end
+7
View File
@@ -21,6 +21,13 @@ Target.AddGlobalPlayer = function(options)
ox_target:addGlobalPlayer(options)
end
Target.AddGlobalVehicle = function(options)
for k, v in pairs(options) do
options[k].onSelect = v.onSelect or v.action
end
ox_target:addGlobalVehicle(options)
end
Target.AddLocalEntity = function(entities, options)
for k, v in pairs(options) do
options[k].onSelect = v.onSelect or v.action
+11
View File
@@ -23,6 +23,17 @@ Target.AddGlobalPlayer = function(options)
})
end
Target.AddGlobalVehicle = function(options)
for k, v in pairs(options) do
options[k].action = v.action or v.onSelect
end
exports['qb-target']:AddGlobalVehicle({
options = options,
distance = options.distance or 1.5
})
end
Target.AddLocalEntity = function(entities, options)
for k, v in pairs(options) do
options[k].action = v.action or v.onSelect