From cfd4ada7888e050ef9ccb3684d7620d55fe88f26 Mon Sep 17 00:00:00 2001 From: Jacob Hansen <89487861+JHansen2000@users.noreply.github.com> Date: Sun, 2 Jun 2024 15:48:26 -0400 Subject: [PATCH] fix: qbx_medical exports to PascalCase and self exports too * Updated qbx_medical exports to PascalCase and ensured qbx_ambulancejobs are also in PascalCase * Removed unused variable * Added dependencies to fxmanifest - qbx_core/medical, ox_lib/inventory --- client/hospital.lua | 2 +- client/job.lua | 1 - client/laststand.lua | 2 +- client/setdownedstate.lua | 12 ++++++------ client/wounding.lua | 6 +++--- fxmanifest.lua | 7 +++++++ 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/client/hospital.lua b/client/hospital.lua index 5837ecf..e76d4ef 100644 --- a/client/hospital.lua +++ b/client/hospital.lua @@ -60,7 +60,7 @@ local function putPlayerInBed(hospitalName, bedIndex, isRevive, skipOpenCheck) bedOccupyingData = sharedConfig.locations.hospitals[hospitalName].beds[bedIndex] IsInHospitalBed = true exports.qbx_medical:DisableDamageEffects() - exports.qbx_medical:disableRespawn() + exports.qbx_medical:DisableRespawn() CanLeaveBed = false setBedCam() CreateThread(function() diff --git a/client/job.lua b/client/job.lua index c7528a5..9e876e3 100644 --- a/client/job.lua +++ b/client/job.lua @@ -1,6 +1,5 @@ local config = require 'config.client' local sharedConfig = require 'config.shared' -local checkVehicle = false local WEAPONS = exports.qbx_core:GetWeapons() ---Configures and spawns a vehicle and teleports player to the driver seat. diff --git a/client/laststand.lua b/client/laststand.lua index e55db74..449c2c4 100644 --- a/client/laststand.lua +++ b/client/laststand.lua @@ -21,7 +21,7 @@ lib.callback.register('hospital:client:UseFirstAid', function() end) lib.callback.register('hospital:client:canHelp', function() - return exports.qbx_medical:getLaststand() and exports.qbx_medical:getLaststandTime() <= 300 + return exports.qbx_medical:GetLaststand() and exports.qbx_medical:GetLaststandTime() <= 300 end) ---@param targetId number playerId diff --git a/client/setdownedstate.lua b/client/setdownedstate.lua index b6d1e63..59bbae1 100644 --- a/client/setdownedstate.lua +++ b/client/setdownedstate.lua @@ -7,12 +7,12 @@ local function getDoctorCount() end local function displayRespawnText() - local deathTime = exports.qbx_medical:getDeathTime() + local deathTime = exports.qbx_medical:GetDeathTime() if deathTime > 0 and doctorCount > 0 then qbx.drawText2d({ text = locale('info.respawn_txt', math.ceil(deathTime)), coords = vec2(1.0, 1.44), scale = 0.6 }) else qbx.drawText2d({ - text = locale('info.respawn_revive', exports.qbx_medical:getRespawnHoldTimeDeprecated(), sharedConfig.checkInCost), + text = locale('info.respawn_revive', exports.qbx_medical:GetRespawnHoldTimeDeprecated(), sharedConfig.checkInCost), coords = vec2(1.0, 1.44), scale = 0.6 }) @@ -27,7 +27,7 @@ local function playDeadAnimation(ped) TaskPlayAnim(ped, InBedDict, InBedAnim, 1.0, 1.0, -1, 1, 0, false, false, false) end else - exports.qbx_medical:playDeadAnimation() + exports.qbx_medical:PlayDeadAnimation() end end @@ -54,7 +54,7 @@ local function handleRequestingEms() end local function handleLastStand() - local laststandTime = exports.qbx_medical:getLaststandTime() + local laststandTime = exports.qbx_medical:GetLaststandTime() if laststandTime > config.laststandTimer or doctorCount == 0 then qbx.drawText2d({ text = locale('info.bleed_out', math.ceil(laststandTime)), coords = vec2(1.0, 1.44), scale = 0.6 }) else @@ -66,8 +66,8 @@ end ---Set dead and last stand states. CreateThread(function() while true do - local isDead = exports.qbx_medical:isDead() - local inLaststand = exports.qbx_medical:getLaststand() + local isDead = exports.qbx_medical:IsDead() + local inLaststand = exports.qbx_medical:GetLaststand() if isDead or inLaststand then if isDead then handleDead(cache.ped) diff --git a/client/wounding.lua b/client/wounding.lua index 8afeec4..ad25ed4 100644 --- a/client/wounding.lua +++ b/client/wounding.lua @@ -28,7 +28,7 @@ lib.callback.register('hospital:client:UseIfaks', function() painkillerAmount += 1 end if math.random(1, 100) < 50 then - exports.qbx_medical:removeBleed(1) + exports.qbx_medical:RemoveBleed(1) end return true else @@ -58,10 +58,10 @@ lib.callback.register('hospital:client:UseBandage', function() then SetEntityHealth(cache.ped, GetEntityHealth(cache.ped) + 10) if math.random(1, 100) < 50 then - exports.qbx_medical:removeBleed(1) + exports.qbx_medical:RemoveBleed(1) end if math.random(1, 100) < 7 then - exports.qbx_medical:resetMinorInjuries() + exports.qbx_medical:ResetMinorInjuries() end return true else diff --git a/fxmanifest.lua b/fxmanifest.lua index 0e35ca0..a475473 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -7,6 +7,13 @@ version '1.0.0' ox_lib 'locale' +dependencies { + 'qbx_core', + 'qbx_medical', + 'ox_lib', + 'ox_inventory' +} + shared_scripts { '@ox_lib/init.lua', '@qbx_core/modules/lib.lua',