progressbar and dialogue update
added props to progressbar fixed dialogue for nesting
This commit is contained in:
1 parent
58782dfcd0
commit
f8d46b9f7b
7 files changed
+85
-121
No files matched your search
@@ -1,53 +0,0 @@
|
||||
if GetResourceState('ox_lib') ~= 'started' or (BridgeClientConfig.ProgressBarSystem ~= "ox" and BridgeClientConfig.InputSystem ~= "auto") then return end
|
||||
ProgressBar = ProgressBar or {}
|
||||
|
||||
local function convertFromQB(options)
|
||||
if not options then return options end
|
||||
|
||||
return {
|
||||
duration = options.duration,
|
||||
label = options.label,
|
||||
position = 'bottom',
|
||||
useWhileDead = options.useWhileDead,
|
||||
canCancel = options.canCancel,
|
||||
disable = {
|
||||
move = options.controlDisables?.disableMovement,
|
||||
car = options.controlDisables?.disableCarMovement,
|
||||
combat = options.controlDisables?.disableCombat,
|
||||
mouse = options.controlDisables?.disableMouse
|
||||
},
|
||||
anim = {
|
||||
dict = options.animation?.animDict,
|
||||
clip = options.animation?.anim
|
||||
}
|
||||
}
|
||||
end
|
||||
|
||||
function ProgressBar.Open(options, cb, isQBInput)
|
||||
if isQBInput then
|
||||
options = convertFromQB(options)
|
||||
end
|
||||
|
||||
local style = options.style or 'bar'
|
||||
local success = style == 'circle' and exports.ox_lib:progressCircle(options) or exports.ox_lib:progressBar(options)
|
||||
|
||||
if cb then cb(not success) end
|
||||
return success
|
||||
end
|
||||
|
||||
RegisterCommand("progressbar", function()
|
||||
ProgressBar.Open({
|
||||
duration = 5000,
|
||||
label = "Searching",
|
||||
disable = {
|
||||
move = true,
|
||||
combat = true
|
||||
},
|
||||
anim = {
|
||||
dict = "anim@amb@clubhouse@tutorial@bkr_tut_ig3@",
|
||||
clip = "machinic_loop_mechandplayer"
|
||||
}
|
||||
}, function(cancelled)
|
||||
print(cancelled and "Cancelled" or "Complete")
|
||||
end)
|
||||
end)
|
||||
@@ -43,6 +43,23 @@ ProgressBar = ProgressBar or {}
|
||||
|
||||
local function convertFromQB(options)
|
||||
if not options then return options end
|
||||
local prop1 = options.prop or {}
|
||||
local prop2 = options.propTwo or {}
|
||||
local props = {
|
||||
{
|
||||
model = prop1.model,
|
||||
bone = prop1.bone,
|
||||
pos = prop1.coords,
|
||||
rot = prop1.rotation,
|
||||
},
|
||||
{
|
||||
model = prop2.model,
|
||||
bone = prop2.bone,
|
||||
pos = prop2.coords,
|
||||
rot = prop2.rotation,
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return {
|
||||
duration = options.duration,
|
||||
@@ -59,7 +76,8 @@ local function convertFromQB(options)
|
||||
anim = {
|
||||
dict = options.animation?.animDict,
|
||||
clip = options.animation?.anim
|
||||
}
|
||||
},
|
||||
prop = props,
|
||||
}
|
||||
end
|
||||
|
||||
|
||||
@@ -1,55 +0,0 @@
|
||||
if GetResourceState('progressbar') ~= 'started' or (BridgeClientConfig.ProgressBarSystem ~= "qb" and BridgeClientConfig.ProgressBarSystem ~= "auto") then return end
|
||||
ProgressBar = ProgressBar or {}
|
||||
|
||||
local function convertFromOx(options)
|
||||
if not options then return options end
|
||||
|
||||
return {
|
||||
name = options.label,
|
||||
duration = options.duration,
|
||||
label = options.label,
|
||||
useWhileDead = options.useWhileDead,
|
||||
canCancel = options.canCancel,
|
||||
controlDisables = {
|
||||
disableMovement = options.disable?.move,
|
||||
disableCarMovement = options.disable?.car,
|
||||
disableMouse = options.disable?.mouse,
|
||||
disableCombat = options.disable?.combat
|
||||
},
|
||||
animation = {
|
||||
animDict = options.anim?.dict,
|
||||
anim = options.anim?.clip
|
||||
},
|
||||
prop = {},
|
||||
propTwo = {}
|
||||
}
|
||||
end
|
||||
|
||||
function ProgressBar.Open(options, cb, qbFormat)
|
||||
if not exports['progressbar'] then return false end
|
||||
|
||||
if not qbFormat then
|
||||
options = convertFromOx(options)
|
||||
end
|
||||
|
||||
exports['progressbar']:Progress(options, cb)
|
||||
end
|
||||
|
||||
|
||||
-- Example usage:
|
||||
RegisterCommand("progressbar", function()
|
||||
ProgressBar.Open({
|
||||
duration = 5000,
|
||||
label = "Searching",
|
||||
disable = {
|
||||
move = true,
|
||||
combat = true
|
||||
},
|
||||
anim = {
|
||||
dict = "anim@amb@clubhouse@tutorial@bkr_tut_ig3@",
|
||||
clip = "machinic_loop_mechandplayer"
|
||||
}
|
||||
}, function(cancelled)
|
||||
print(cancelled and "Cancelled" or "Complete")
|
||||
end)
|
||||
end)
|
||||
@@ -65,7 +65,8 @@ ProgressBar = ProgressBar or {}
|
||||
|
||||
local function convertFromOx(options)
|
||||
if not options then return options end
|
||||
|
||||
local prop1 = options.prop[1] or options.prop or {}
|
||||
local prop2 = options.prop[2] or {}
|
||||
return {
|
||||
name = options.label,
|
||||
duration = options.duration,
|
||||
@@ -82,8 +83,18 @@ local function convertFromOx(options)
|
||||
animDict = options.anim?.dict,
|
||||
anim = options.anim?.clip
|
||||
},
|
||||
prop = {},
|
||||
propTwo = {}
|
||||
prop = {
|
||||
model = prop1.model,
|
||||
bone = prop1.bone,
|
||||
coords = prop1.pos,
|
||||
rotation = prop1.rot
|
||||
},
|
||||
propTwo = {
|
||||
model = prop2.model,
|
||||
bone = prop2.bone,
|
||||
coords = prop2.pos,
|
||||
rotation = prop2.rot
|
||||
}
|
||||
}
|
||||
end
|
||||
|
||||
@@ -110,7 +121,12 @@ RegisterCommand("progressbar", function()
|
||||
anim = {
|
||||
dict = "anim@amb@clubhouse@tutorial@bkr_tut_ig3@",
|
||||
clip = "machinic_loop_mechandplayer"
|
||||
}
|
||||
},
|
||||
prop = {
|
||||
model = "prop_ar_arrow_3",
|
||||
pos = vector3(0.0, 0.0, 0.0),
|
||||
rot = vector3(0.0, 0.0, 0.0)
|
||||
},
|
||||
}, function(cancelled)
|
||||
print(cancelled and "Cancelled" or "Complete")
|
||||
end)
|
||||
|
||||
Reference in new issue
Block a user