feat: moved damage effects loop to medical

Qbox-project · Nov 24, 2023 · de777dd · de777dd
1 parent 632fa1c
commit de777dd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 15 deletions.
diff --git a/client/damage/damage.lua b/client/damage/damage.lua
diff --git a/client/hospital.lua b/client/hospital.lua
@@ -59,6 +59,7 @@ local function putPlayerInBed(hospitalName, bedIndex, isRevive, skipOpenCheck)
     bedIndexOccupying = bedIndex
     bedOccupyingData = Config.Locations.hospitals[hospitalName].beds[bedIndex]
     IsInHospitalBed = true
+    exports.qbx_medical:DisableDamageEffects()
     exports.qbx_medical:disableRespawn()
     CanLeaveBed = false
     setBedCam()
@@ -81,7 +82,7 @@ end)
 
 ---Notifies doctors, and puts player in a hospital bed.
 local function checkIn(hospitalName)
-    local canCheckIn = lib.callback.await('qbx_ambulancejob:server:onCheckIn')
+    local canCheckIn = lib.callback.await('qbx_ambulancejob:server:canCheckIn')
     if not canCheckIn then return end
 
     exports.scully_emotemenu:playEmoteByCommand('notepad')
@@ -166,7 +167,7 @@ else
 
             if hospital.checkIn then
                 local function enterCheckInZone()
-                    local numDoctors = lib.callback.await('hospital:GetDoctors')
+                    local numDoctors = lib.callback.await('qbx_ambulancejob:server:getNumDoctors')
                     if numDoctors >= Config.MinimalDoctors then
                         lib.showTextUI(Lang:t('text.call_doc'))
                     else
@@ -252,6 +253,7 @@ local function leaveBed()
     bedObject = nil
     bedOccupyingData = nil
     IsInHospitalBed = false
+    exports.qbx_medical:EnableDamageEffects()
 
     if QBX.PlayerData.metadata.injail <= 0 then return end
     TriggerEvent("prison:client:Enter", QBX.PlayerData.metadata.injail)

diff --git a/client/setdownedstate.lua b/client/setdownedstate.lua
@@ -1,7 +1,7 @@
 local doctorCount = 0
 
 local function getDoctorCount()
-    return lib.callback.await('hospital:GetDoctors')
+    return lib.callback.await('qbx_ambulancejob:server:getNumDoctors')
 end
 
 local function displayRespawnText()

diff --git a/client/wounding.lua b/client/wounding.lua
@@ -27,6 +27,7 @@ lib.callback.register('hospital:client:UseIfaks', function()
         TriggerServerEvent('hud:server:RelieveStress', math.random(12, 24))
         SetEntityHealth(ped, GetEntityHealth(ped) + 10)
         OnPainKillers = true
+        exports.qbx_medical:DisableDamageEffects()
         if painkillerAmount < 3 then
             painkillerAmount += 1
         end
@@ -101,6 +102,7 @@ lib.callback.register('hospital:client:UsePainkillers', function()
         StopAnimTask(ped, "mp_suicide", "pill", 1.0)
         TriggerEvent("inventory:client:ItemBox", exports.ox_inventory:Items()["painkillers"], "remove")
         OnPainKillers = true
+        exports.qbx_medical:DisableDamageEffects()
         if painkillerAmount < 3 then
             painkillerAmount += 1
         end
@@ -118,6 +120,7 @@ local function consumePainKiller()
     if painkillerAmount > 0 then return end
     painkillerAmount = 0
     OnPainKillers = false
+    exports.qbx_medical:EnableDamageEffects()
 end
 
 CreateThread(function()

diff --git a/server/main.lua b/server/main.lua
@@ -179,12 +179,12 @@ end)
 
 -- Callbacks
 
-lib.callback.register('hospital:GetDoctors', function()
+lib.callback.register('qbx_ambulancejob:server:getNumDoctors', function()
 	local count = exports.qbx_core:GetDutyCountType('ems')
 	return count
 end)
 
-lib.callback.register('qbx_ambulancejob:server:onCheckIn', function(source)
+lib.callback.register('qbx_ambulancejob:server:canCheckIn', function(source)
 	local numDoctors = exports.qbx_core:GetDutyCountType('ems')
 	if numDoctors < Config.MinimalDoctors then
 		return true