From 60dd3a9851342332b21143ffc13396c81ee41d84 Mon Sep 17 00:00:00 2001 From: Matthew <22198949+MafewTM@users.noreply.github.com> Date: Sun, 24 Dec 2023 09:57:00 -0500 Subject: [PATCH] fix(client): config options and interact sound (#7) --- client/main.lua | 15 +++++++-------- config/client.lua | 2 +- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/client/main.lua b/client/main.lua index 2243fcb..625fa1f 100644 --- a/client/main.lua +++ b/client/main.lua @@ -25,7 +25,7 @@ lib.callback.register('qbx_divegear:client:fillTank', function() end if lib.progressBar({ - duration = config.RefillTankTimeMs, + duration = config.refillTankTimeMs, label = Lang:t('info.filling_air'), useWhileDead = false, canCancel = true, @@ -35,7 +35,6 @@ lib.callback.register('qbx_divegear:client:fillTank', function() blendIn = 8.0 } }) then - oxygenLevel = config.startingOxygenLevel exports.qbx_core:Notify(Lang:t('success.tube_filled'), 'success') if currentGear.enabled then @@ -76,7 +75,7 @@ end local function takeOffSuit() if lib.progressBar({ - duration = config.TakeOffSuitTimeMs, + duration = config.takeOffSuitTimeMs, label = Lang:t('info.pullout_suit'), useWhileDead = false, canCancel = true, @@ -91,7 +90,7 @@ local function takeOffSuit() currentGear.enabled = false deleteGear() exports.qbx_core:Notify(Lang:t('success.took_out')) - TriggerServerEvent('InteractSound_SV:PlayOnSource', nil, 0.25) + -- Stop breathing suit audio end end @@ -112,11 +111,11 @@ local function startOxygenLevelDecrementerThread() if IsPedSwimmingUnderWater(cache.ped) and oxygenLevel > 0 then oxygenLevel -= 1 if oxygenLevel % 10 == 0 and oxygenLevel ~= config.startingOxygenLevel then - TriggerServerEvent('InteractSound_SV:PlayOnSource', 'breathdivingsuit', 0.25) + -- Initiate breathing suit audio end if oxygenLevel == 0 then disableScuba() - TriggerServerEvent('InteractSound_SV:PlayOnSource', nil, 0.25) + -- Stop breathing suit audio end end Wait(1000) @@ -136,7 +135,7 @@ local function putOnSuit() end if lib.progressBar({ - duration = config.PutOnSuitTimeMs, + duration = config.putOnSuitTimeMs, label = Lang:t('info.put_suit'), useWhileDead = false, canCancel = true, @@ -150,7 +149,7 @@ local function putOnSuit() attachGear() enableScuba() currentGear.enabled = true - TriggerServerEvent('InteractSound_SV:PlayOnSource', 'breathdivingsuit', 0.25) + -- Initiate breathing suit audio startOxygenLevelDecrementerThread() startOxygenLevelDrawTextThread() end diff --git a/config/client.lua b/config/client.lua index bf19ce0..c61e1e8 100644 --- a/config/client.lua +++ b/config/client.lua @@ -2,5 +2,5 @@ return { startingOxygenLevel = 100, putOnSuitTimeMs = 5000, takeOffSuitTimeMs = 5000, - RefillTankTimeMs = 5000 + refillTankTimeMs = 5000 } \ No newline at end of file