Respawn Timer Overhaul & Repo Update

* Fixes #64 (Timer related)

* Will need Locale translation

.editorconfig

@@ -1,9 +1,9 @@
 root = true
 
 [*]
-indent_size = 2
-indent_style = space
-end_of_line = lf
+indent_size = 4
+indent_style = tab
+end_of_line = crlf
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true

config.lua

@@ -14,12 +14,6 @@ local minute = 60 * second
 -- How much time before auto respawn at hospital
 Config.RespawnDelayAfterRPDeath   = 10 * minute
 
--- How much time before a menu opens to ask the player if he wants to respawn at hospital now
--- The player is not obliged to select YES, but he will be auto respawn
--- at the end of RespawnDelayAfterRPDeath just above.
-Config.RespawnToHospitalMenuTimer   = true
-Config.MenuRespawnToHospitalDelay   = 5 * minute
-
 Config.EnablePlayerManagement       = false
 Config.EnableSocietyOwnedVehicles   = false
 
@@ -27,14 +21,14 @@ Config.RemoveWeaponsAfterRPDeath    = true
 Config.RemoveCashAfterRPDeath       = true
 Config.RemoveItemsAfterRPDeath      = true
 
--- Will display a timer that shows RespawnDelayAfterRPDeath time remaining
+-- Will display a timer that shows RespawnDelayAfterRPDeath as a countdown
 Config.ShowDeathTimer               = true
 
--- Will allow to respawn at any time, don't use with RespawnToHospitalMenuTimer enabled!
+-- Will allow respawn after half of RespawnDelayAfterRPDeath has elapsed.
 Config.EarlyRespawn                 = false
--- The player can have a fine (on bank account)
-Config.RespawnFine                  = false
-Config.RespawnFineAmount            = 500
+-- The player will be fined for respawning early (on bank account)
+Config.EarlyRespawnFine                  = false
+Config.EarlyRespawnFineAmount            = 500
 
 Config.Blip = {
 	Pos     = { x = 307.76, y = -1433.47, z = 28.97 },

locales/br.lua

@@ -46,13 +46,11 @@ Locales['br'] = {
   -- Phone
   ['alert_ambulance'] = 'Alerta Socorro',
   -- Death
-  ['respawn_at_hospital'] = 'Você quer ser transportado para o hospital ?',
-  ['yes'] = 'Sim',
-  ['no'] = 'no',
-  ['please_wait'] = 'Você será automaticamente transportado para o hospital em ~b~%s minutos %s segundos~s~',
-  ['press_respawn'] = 'Aperte [~b~E~w~] para renascer.',
-  ['respawn_fine'] = 'you paid ~r~$%s~s~ for respawning.',
-  ['distress_send'] = 'press ~b~[G]~s~ to send distress signal',
+  ['please_wait'] = 'you will bleed out in ~b~%s minutes %s seconds~s~\n',
+  ['press_respawn'] = 'press [~b~E~w~] to respawn.',
+  ['respawn_now_fine'] = 'respawn now for ~g~$%s ~w~[Press ~b~E~w~]',
+  ['respawn_fine'] = 'you paid ~r~$%s~s~ to respawn.',
+  ['distress_send'] = 'press [~b~G~s~] to send distress signal',
   ['distress_sent'] = 'distress signal has been sent to available units!',
   ['distress_message'] = 'medical attention required: unconscious citizen!',
   -- Revive
@@ -63,5 +61,4 @@ Locales['br'] = {
   ['not_enough_medikit'] = 'Você não tem ~b~Seringa~w~.',
   ['not_enough_bandage'] = 'Você não tem ~b~Vendagem~w~.',
   ['healed'] = 'Você foi tratado.',
-  -- Misc
 }

locales/de.lua

@@ -37,13 +37,11 @@ Locales['de'] = {
   -- Phone
   ['alert_ambulance'] = 'Notdienst anrufen',
   -- Death
-  ['respawn_at_hospital'] = 'Willst du ins Krankenhaus gebracht werden?',
-  ['yes'] = 'ja',
-  ['no'] = 'no',
-  ['please_wait'] = 'bitte warte ~b~%s minuten %s sekunden~s~ bis zum respawn',
-  ['press_respawn'] = 'Drücke [~b~E~w~] zum respawnen.',
-  ['respawn_fine'] = 'you paid ~r~$%s~s~ for respawning.',
-  ['distress_send'] = 'press ~b~[G]~s~ to send distress signal',
+  ['please_wait'] = 'you will bleed out in ~b~%s minutes %s seconds~s~\n',
+  ['press_respawn'] = 'press [~b~E~w~] to respawn.',
+  ['respawn_now_fine'] = 'respawn now for ~g~$%s ~w~[Press ~b~E~w~]',
+  ['respawn_fine'] = 'you paid ~r~$%s~s~ to respawn.',
+  ['distress_send'] = 'press [~b~G~s~] to send distress signal',
   ['distress_sent'] = 'distress signal has been sent to available units!',
   ['distress_message'] = 'medical attention required: unconscious citizen!',
   -- Revive

locales/en.lua

@@ -46,22 +46,19 @@ Locales['en'] = {
   -- Phone
   ['alert_ambulance'] = 'alert Ambulance',
   -- Death
-  ['respawn_at_hospital'] = 'do you want to force respawn and spawn in the hospital?',
-  ['yes'] = 'yes',
-  ['no'] = 'no',
-  ['please_wait'] = 'you are unconscious and will bleed out in ~b~%s minutes and %s seconds~s~',
+  ['please_wait'] = 'you will bleed out in ~b~%s minutes %s seconds~s~\n',
   ['press_respawn'] = 'press [~b~E~w~] to respawn.',
-  ['respawn_fine'] = 'you paid ~r~$%s~s~ for respawning.',
-  ['distress_send'] = 'press ~b~[G]~s~ to send distress signal',
+  ['respawn_now_fine'] = 'respawn now for ~g~$%s ~w~[Press ~b~E~w~]',
+  ['respawn_fine'] = 'you paid ~r~$%s~s~ to respawn.',
+  ['distress_send'] = 'press [~b~G~s~] to send distress signal',
   ['distress_sent'] = 'distress signal has been sent to available units!',
   ['distress_message'] = 'medical attention required: unconscious citizen!',
   -- Revive
   ['revive_help'] = 'revive a player',
   -- Item
-  ['used_medikit'] = 'You have used 1x medikit',
-  ['used_bandage'] = 'You have used  1x bandage',
+  ['used_medikit'] = 'You have used ~y~1x~s~ medikit',
+  ['used_bandage'] = 'You have used ~y~1x~s~ bandage',
   ['not_enough_medikit'] = 'You do not have ~b~medikit~w~.',
   ['not_enough_bandage'] = 'You do not have ~b~bandage~w~.',
   ['healed'] = 'you have been treated.',
-  -- Misc
 }

locales/es.lua

@@ -36,13 +36,11 @@ Locales['es'] = {
   -- Phone
   ['alert_ambulance'] = 'Alerta de ambulancia',
   -- Death
-  ['respawn_at_hospital'] = '¿Quieres ser transportado al hospital?',
-  ['yes'] = 'oui',
-  ['no'] = 'no',
-  ['please_wait'] = 's\'por favor, espere ~b~%s minutos %s segundos para reparecer~s~',
-  ['press_respawn'] = 'presione [~b~E~w~] para reparecer.',
-  ['respawn_fine'] = 'you paid ~r~$%s~s~ for respawning.',
-  ['distress_send'] = 'press ~b~[G]~s~ to send distress signal',
+  ['please_wait'] = 'you will bleed out in ~b~%s minutes %s seconds~s~\n',
+  ['press_respawn'] = 'press [~b~E~w~] to respawn.',
+  ['respawn_now_fine'] = 'respawn now for ~g~$%s ~w~[Press ~b~E~w~]',
+  ['respawn_fine'] = 'you paid ~r~$%s~s~ to respawn.',
+  ['distress_send'] = 'press [~b~G~s~] to send distress signal',
   ['distress_sent'] = 'distress signal has been sent to available units!',
   ['distress_message'] = 'medical attention required: unconscious citizen!',
   -- Revive

locales/fi.lua

@@ -46,15 +46,13 @@ Locales['fi'] = {
   -- Phone
   ['alert_ambulance'] = 'hälyytys Ensihoidolle',
   -- Death
-  ['respawn_at_hospital'] = 'haluatko respawnata sairaalalle heti ?',
-  ['yes'] = 'kyllä',
-  ['no'] = 'ei',
-  ['please_wait'] = 'olet tajuton, vuodat kuiviin ~b~%s minuutin ja %s sekunnin~s~ kuluttua',
-  ['press_respawn'] = 'paina [~b~E~w~] respawnataksesi.',
-  ['respawn_fine'] = 'sinä maksoit ~r~$%s~s~ respawnaamisesta.',
-  ['distress_send'] = 'paina ~b~[G]~s~ lähettääksesi hätäsignaalin',
-  ['distress_sent'] = 'hätäsignaali lähetetty vapailla yksiköille.',
-  ['distress_message'] = 'tarvittava ensihoitoa: tajuton kansalainen!',
+  ['please_wait'] = 'you will bleed out in ~b~%s minutes %s seconds~s~\n',
+  ['press_respawn'] = 'press [~b~E~w~] to respawn.',
+  ['respawn_now_fine'] = 'respawn now for ~g~$%s ~w~[Press ~b~E~w~]',
+  ['respawn_fine'] = 'you paid ~r~$%s~s~ to respawn.',
+  ['distress_send'] = 'press [~b~G~s~] to send distress signal',
+  ['distress_sent'] = 'distress signal has been sent to available units!',
+  ['distress_message'] = 'medical attention required: unconscious citizen!',
   -- Revive
   ['revive_help'] = 'elvytä pelaaja',
   -- Item

locales/fr.lua

@@ -46,13 +46,11 @@ Locales['fr'] = {
   -- Phone
   ['alert_ambulance'] = 'alerte Ambulance',
   -- Death
-  ['respawn_at_hospital'] = 'voulez-vous être transporté à l\'hôpital ?',
-  ['yes'] = 'oui',
-  ['no'] = 'no',
-  ['please_wait'] = 'Vous serez automatiquement transporté à l\'hôpital dans ~b~%s minutes %s secondes~s~',
-  ['press_respawn'] = 'appuyez sur [~b~E~w~] pour réapparaître.',
-  ['respawn_fine'] = 'vous avez payer ~r~$%s~s~ pour réapparaître.',
-  ['distress_send'] = 'press ~b~[G]~s~ to send distress signal',
+  ['please_wait'] = 'you will bleed out in ~b~%s minutes %s seconds~s~\n',
+  ['press_respawn'] = 'press [~b~E~w~] to respawn.',
+  ['respawn_now_fine'] = 'respawn now for ~g~$%s ~w~[Press ~b~E~w~]',
+  ['respawn_fine'] = 'you paid ~r~$%s~s~ to respawn.',
+  ['distress_send'] = 'press [~b~G~s~] to send distress signal',
   ['distress_sent'] = 'distress signal has been sent to available units!',
   ['distress_message'] = 'medical attention required: unconscious citizen!',
   -- Revive

locales/pl.lua

@@ -46,11 +46,13 @@ Locales['pl'] = {
   -- Phone
   ['alert_ambulance'] = 'wezwij ambulans',
   -- Death
-  ['respawn_at_hospital'] = 'czy chcesz odrodzić się w szpitalu?',
-  ['yes'] = 'tak',
-  ['please_wait'] = 'jesteś nieprzytomny i będziesz się wykrwawiał ~b~%s minut i %s sekund~s~',
-  ['press_respawn'] = 'naciśnij [~b~E~w~] aby się odrodzić.',
-  ['respawn_fine'] = 'zapłaciłeś ~r~$%s~s~ za odrodzenie.',
+  ['please_wait'] = 'you will bleed out in ~b~%s minutes %s seconds~s~\n',
+  ['press_respawn'] = 'press [~b~E~w~] to respawn.',
+  ['respawn_now_fine'] = 'respawn now for ~g~$%s ~w~[Press ~b~E~w~]',
+  ['respawn_fine'] = 'you paid ~r~$%s~s~ to respawn.',
+  ['distress_send'] = 'press [~b~G~s~] to send distress signal',
+  ['distress_sent'] = 'distress signal has been sent to available units!',
+  ['distress_message'] = 'medical attention required: unconscious citizen!',
   -- Revive
   ['revive_help'] = 'ożyw gracza',
   -- Item

locales/sv.lua

@@ -46,15 +46,13 @@ Locales['sv'] = {
   -- Phone
   ['alert_ambulance'] = 'Ring ambulansen',
   -- Death
-  ['respawn_at_hospital'] = 'Vill du snabbresa till sjukhuset?',
-  ['yes'] = 'ja',
-  ['no'] = 'nej',
-  ['please_wait'] = 'du är medvetslös och kommer att dö om ~b~%s minuter och %s sekunder~s~',
-  ['press_respawn'] = 'tryck [~b~E~w~] för att respawna.',
-  ['respawn_fine'] = 'du betalade ~r~$%s~s~ för att respawna.',
-  ['distress_send'] = 'tryck ~b~[G]~s~ för att skicka nödsignal',
-  ['distress_sent'] = 'nödsignal har skickats till samtliga enheter!',
-  ['distress_message'] = 'läkarvård krävs: medvetslös medborgare!',
+  ['please_wait'] = 'you will bleed out in ~b~%s minutes %s seconds~s~\n',
+  ['press_respawn'] = 'press [~b~E~w~] to respawn.',
+  ['respawn_now_fine'] = 'respawn now for ~g~$%s ~w~[Press ~b~E~w~]',
+  ['respawn_fine'] = 'you paid ~r~$%s~s~ to respawn.',
+  ['distress_send'] = 'press [~b~G~s~] to send distress signal',
+  ['distress_sent'] = 'distress signal has been sent to available units!',
+  ['distress_message'] = 'medical attention required: unconscious citizen!',
   -- Revive
   ['revive_help'] = 'Återuppliva en spelare',
   -- Item

localization/en_esx_ambulancejob.sql

@@ -1,27 +1,27 @@
 USE `essentialmode`;
 
 INSERT INTO `addon_account` (name, label, shared) VALUES
-  ('society_ambulance', 'Ambulance', 1)
+  ('society_ambulance', 'EMS', 1)
 ;
 
 INSERT INTO `addon_inventory` (name, label, shared) VALUES
-  ('society_ambulance', 'Ambulance', 1)
+  ('society_ambulance', 'EMS', 1)
 ;
 
 INSERT INTO `datastore` (name, label, shared) VALUES
-  ('society_ambulance', 'Ambulance', 1)
+  ('society_ambulance', 'EMS', 1)
 ;
 
 
 INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES
-  ('ambulance',0,'ambulance','Ambulance',20,'{\"tshirt_2\":0,\"hair_color_1\":5,\"glasses_2\":3,\"shoes\":9,\"torso_2\":3,\"hair_color_2\":0,\"pants_1\":24,\"glasses_1\":4,\"hair_1\":2,\"sex\":0,\"decals_2\":0,\"tshirt_1\":15,\"helmet_1\":8,\"helmet_2\":0,\"arms\":92,\"face\":19,\"decals_1\":60,\"torso_1\":13,\"hair_2\":0,\"skin\":34,\"pants_2\":5}','{\"tshirt_2\":3,\"decals_2\":0,\"glasses\":0,\"hair_1\":2,\"torso_1\":73,\"shoes\":1,\"hair_color_2\":0,\"glasses_1\":19,\"skin\":13,\"face\":6,\"pants_2\":5,\"tshirt_1\":75,\"pants_1\":37,\"helmet_1\":57,\"torso_2\":0,\"arms\":14,\"sex\":1,\"glasses_2\":0,\"decals_1\":0,\"hair_2\":0,\"helmet_2\":0,\"hair_color_1\":0}'),
-  ('ambulance',1,'doctor','Doctor',40,'{\"tshirt_2\":0,\"hair_color_1\":5,\"glasses_2\":3,\"shoes\":9,\"torso_2\":3,\"hair_color_2\":0,\"pants_1\":24,\"glasses_1\":4,\"hair_1\":2,\"sex\":0,\"decals_2\":0,\"tshirt_1\":15,\"helmet_1\":8,\"helmet_2\":0,\"arms\":92,\"face\":19,\"decals_1\":60,\"torso_1\":13,\"hair_2\":0,\"skin\":34,\"pants_2\":5}','{\"tshirt_2\":3,\"decals_2\":0,\"glasses\":0,\"hair_1\":2,\"torso_1\":73,\"shoes\":1,\"hair_color_2\":0,\"glasses_1\":19,\"skin\":13,\"face\":6,\"pants_2\":5,\"tshirt_1\":75,\"pants_1\":37,\"helmet_1\":57,\"torso_2\":0,\"arms\":14,\"sex\":1,\"glasses_2\":0,\"decals_1\":0,\"hair_2\":0,\"helmet_2\":0,\"hair_color_1\":0}'),
-  ('ambulance',2,'chief_doctor','Chief doctor',60,'{\"tshirt_2\":0,\"hair_color_1\":5,\"glasses_2\":3,\"shoes\":9,\"torso_2\":3,\"hair_color_2\":0,\"pants_1\":24,\"glasses_1\":4,\"hair_1\":2,\"sex\":0,\"decals_2\":0,\"tshirt_1\":15,\"helmet_1\":8,\"helmet_2\":0,\"arms\":92,\"face\":19,\"decals_1\":60,\"torso_1\":13,\"hair_2\":0,\"skin\":34,\"pants_2\":5}','{\"tshirt_2\":3,\"decals_2\":0,\"glasses\":0,\"hair_1\":2,\"torso_1\":73,\"shoes\":1,\"hair_color_2\":0,\"glasses_1\":19,\"skin\":13,\"face\":6,\"pants_2\":5,\"tshirt_1\":75,\"pants_1\":37,\"helmet_1\":57,\"torso_2\":0,\"arms\":14,\"sex\":1,\"glasses_2\":0,\"decals_1\":0,\"hair_2\":0,\"helmet_2\":0,\"hair_color_1\":0}'),
-  ('ambulance',3,'boss','Surgeon',80,'{\"tshirt_2\":0,\"hair_color_1\":5,\"glasses_2\":3,\"shoes\":9,\"torso_2\":3,\"hair_color_2\":0,\"pants_1\":24,\"glasses_1\":4,\"hair_1\":2,\"sex\":0,\"decals_2\":0,\"tshirt_1\":15,\"helmet_1\":8,\"helmet_2\":0,\"arms\":92,\"face\":19,\"decals_1\":60,\"torso_1\":13,\"hair_2\":0,\"skin\":34,\"pants_2\":5}','{\"tshirt_2\":3,\"decals_2\":0,\"glasses\":0,\"hair_1\":2,\"torso_1\":73,\"shoes\":1,\"hair_color_2\":0,\"glasses_1\":19,\"skin\":13,\"face\":6,\"pants_2\":5,\"tshirt_1\":75,\"pants_1\":37,\"helmet_1\":57,\"torso_2\":0,\"arms\":14,\"sex\":1,\"glasses_2\":0,\"decals_1\":0,\"hair_2\":0,\"helmet_2\":0,\"hair_color_1\":0}')
+  ('ambulance',0,'ambulance','Jr. EMT',20,'{\"tshirt_2\":0,\"hair_color_1\":5,\"glasses_2\":3,\"shoes\":9,\"torso_2\":3,\"hair_color_2\":0,\"pants_1\":24,\"glasses_1\":4,\"hair_1\":2,\"sex\":0,\"decals_2\":0,\"tshirt_1\":15,\"helmet_1\":8,\"helmet_2\":0,\"arms\":92,\"face\":19,\"decals_1\":60,\"torso_1\":13,\"hair_2\":0,\"skin\":34,\"pants_2\":5}','{\"tshirt_2\":3,\"decals_2\":0,\"glasses\":0,\"hair_1\":2,\"torso_1\":73,\"shoes\":1,\"hair_color_2\":0,\"glasses_1\":19,\"skin\":13,\"face\":6,\"pants_2\":5,\"tshirt_1\":75,\"pants_1\":37,\"helmet_1\":57,\"torso_2\":0,\"arms\":14,\"sex\":1,\"glasses_2\":0,\"decals_1\":0,\"hair_2\":0,\"helmet_2\":0,\"hair_color_1\":0}'),
+  ('ambulance',1,'doctor','EMT',40,'{\"tshirt_2\":0,\"hair_color_1\":5,\"glasses_2\":3,\"shoes\":9,\"torso_2\":3,\"hair_color_2\":0,\"pants_1\":24,\"glasses_1\":4,\"hair_1\":2,\"sex\":0,\"decals_2\":0,\"tshirt_1\":15,\"helmet_1\":8,\"helmet_2\":0,\"arms\":92,\"face\":19,\"decals_1\":60,\"torso_1\":13,\"hair_2\":0,\"skin\":34,\"pants_2\":5}','{\"tshirt_2\":3,\"decals_2\":0,\"glasses\":0,\"hair_1\":2,\"torso_1\":73,\"shoes\":1,\"hair_color_2\":0,\"glasses_1\":19,\"skin\":13,\"face\":6,\"pants_2\":5,\"tshirt_1\":75,\"pants_1\":37,\"helmet_1\":57,\"torso_2\":0,\"arms\":14,\"sex\":1,\"glasses_2\":0,\"decals_1\":0,\"hair_2\":0,\"helmet_2\":0,\"hair_color_1\":0}'),
+  ('ambulance',2,'chief_doctor','Sr. EMT',60,'{\"tshirt_2\":0,\"hair_color_1\":5,\"glasses_2\":3,\"shoes\":9,\"torso_2\":3,\"hair_color_2\":0,\"pants_1\":24,\"glasses_1\":4,\"hair_1\":2,\"sex\":0,\"decals_2\":0,\"tshirt_1\":15,\"helmet_1\":8,\"helmet_2\":0,\"arms\":92,\"face\":19,\"decals_1\":60,\"torso_1\":13,\"hair_2\":0,\"skin\":34,\"pants_2\":5}','{\"tshirt_2\":3,\"decals_2\":0,\"glasses\":0,\"hair_1\":2,\"torso_1\":73,\"shoes\":1,\"hair_color_2\":0,\"glasses_1\":19,\"skin\":13,\"face\":6,\"pants_2\":5,\"tshirt_1\":75,\"pants_1\":37,\"helmet_1\":57,\"torso_2\":0,\"arms\":14,\"sex\":1,\"glasses_2\":0,\"decals_1\":0,\"hair_2\":0,\"helmet_2\":0,\"hair_color_1\":0}'),
+  ('ambulance',3,'boss','EMT Supervisor',80,'{\"tshirt_2\":0,\"hair_color_1\":5,\"glasses_2\":3,\"shoes\":9,\"torso_2\":3,\"hair_color_2\":0,\"pants_1\":24,\"glasses_1\":4,\"hair_1\":2,\"sex\":0,\"decals_2\":0,\"tshirt_1\":15,\"helmet_1\":8,\"helmet_2\":0,\"arms\":92,\"face\":19,\"decals_1\":60,\"torso_1\":13,\"hair_2\":0,\"skin\":34,\"pants_2\":5}','{\"tshirt_2\":3,\"decals_2\":0,\"glasses\":0,\"hair_1\":2,\"torso_1\":73,\"shoes\":1,\"hair_color_2\":0,\"glasses_1\":19,\"skin\":13,\"face\":6,\"pants_2\":5,\"tshirt_1\":75,\"pants_1\":37,\"helmet_1\":57,\"torso_2\":0,\"arms\":14,\"sex\":1,\"glasses_2\":0,\"decals_1\":0,\"hair_2\":0,\"helmet_2\":0,\"hair_color_1\":0}')
 ;
 
 INSERT INTO `jobs` (name, label) VALUES
-  ('ambulance','Ambulance')
+  ('ambulance','EMS')
 ;
 
 INSERT INTO `items` (name, label, `limit`) VALUES

server/main.lua

@@ -6,14 +6,14 @@ RegisterServerEvent('esx_ambulancejob:revive')
 AddEventHandler('esx_ambulancejob:revive', function(target)
 	local _source = source
 	local xPlayer = ESX.GetPlayerFromId(_source)
-	
+
 	xPlayer.addMoney(Config.ReviveReward)
 	TriggerClientEvent('esx_ambulancejob:revive', target)
 end)
 
 RegisterServerEvent('esx_ambulancejob:heal')
 AddEventHandler('esx_ambulancejob:heal', function(target, type)
-  TriggerClientEvent('esx_ambulancejob:heal', target, type)
+	TriggerClientEvent('esx_ambulancejob:heal', target, type)
 end)
 
 TriggerEvent('esx_phone:registerNumber', 'ambulance', _U('alert_ambulance'), true, true)
@@ -62,47 +62,66 @@ ESX.RegisterServerCallback('esx_ambulancejob:removeItemsAfterRPDeath', function(
 		end)
 	end
 
-	if Config.RespawnFine then
-		TriggerClientEvent('esx:showNotification', xPlayer.source, _U('respawn_fine', Config.RespawnFineAmount))
-		xPlayer.removeAccountMoney('bank', Config.RespawnFineAmount)
-	end
-
 	cb()
 end)
 
+if Config.EarlyRespawn and Config.EarlyRespawnFine then
+	ESX.RegisterServerCallback('esx_ambulancejob:checkBalance', function(source, cb)
+
+		local xPlayer = ESX.GetPlayerFromId(source)
+		local bankBalance = xPlayer.getAccount('bank').money
+		local finePayable = false
+
+		if bankBalance >= Config.EarlyRespawnFineAmount then
+			finePayable = true
+		else
+			finePayable = false
+		end
+
+		cb(finePayable)
+	end)
+
+	ESX.RegisterServerCallback('esx_ambulancejob:payFine', function(source, cb)
+		local xPlayer = ESX.GetPlayerFromId(source)
+		TriggerClientEvent('esx:showNotification', xPlayer.source, _U('respawn_fine', Config.EarlyRespawnFineAmount))
+		xPlayer.removeAccountMoney('bank', Config.EarlyRespawnFineAmount)
+		cb()
+	end)
+end
+
 ESX.RegisterServerCallback('esx_ambulancejob:getItemAmount', function(source, cb, item)
-  local xPlayer = ESX.GetPlayerFromId(source)
-  local qtty = xPlayer.getInventoryItem(item).count
-  cb(qtty)
+	local xPlayer = ESX.GetPlayerFromId(source)
+	local qtty = xPlayer.getInventoryItem(item).count
+	cb(qtty)
 end)
 
 RegisterServerEvent('esx_ambulancejob:removeItem')
 AddEventHandler('esx_ambulancejob:removeItem', function(item)
-  local _source = source
-  local xPlayer = ESX.GetPlayerFromId(_source)
-  xPlayer.removeInventoryItem(item, 1)
-  if item == 'bandage' then
-    TriggerClientEvent('esx:showNotification', _source, _U('used_bandage'))
-  elseif item == 'medikit' then
-    TriggerClientEvent('esx:showNotification', _source, _U('used_medikit'))
-  end
+	local _source = source
+	local xPlayer = ESX.GetPlayerFromId(_source)
+	xPlayer.removeInventoryItem(item, 1)
+	if item == 'bandage' then
+		TriggerClientEvent('esx:showNotification', _source, _U('used_bandage'))
+	elseif item == 'medikit' then
+		TriggerClientEvent('esx:showNotification', _source, _U('used_medikit'))
+	end
 end)
 
 RegisterServerEvent('esx_ambulancejob:giveItem')
 AddEventHandler('esx_ambulancejob:giveItem', function(item)
-  local _source = source
-  local xPlayer = ESX.GetPlayerFromId(_source)
-  local limit = xPlayer.getInventoryItem(item).limit
-  local delta = 1
-  local qtty = xPlayer.getInventoryItem(item).count
-  if limit ~= -1 then
-    delta = limit - qtty
-  end
-  if qtty < limit then
-    xPlayer.addInventoryItem(item, delta)
-  else
-    TriggerClientEvent('esx:showNotification', _source, _U('max_item'))
-  end
+	local _source = source
+	local xPlayer = ESX.GetPlayerFromId(_source)
+	local limit = xPlayer.getInventoryItem(item).limit
+	local delta = 1
+	local qtty = xPlayer.getInventoryItem(item).count
+	if limit ~= -1 then
+		delta = limit - qtty
+	end
+	if qtty < limit then
+		xPlayer.addInventoryItem(item, delta)
+	else
+		TriggerClientEvent('esx:showNotification', _source, _U('max_item'))
+	end
 end)
 
 TriggerEvent('es:addGroupCommand', 'revive', 'admin', function(source, args, user)
@@ -115,23 +134,23 @@ TriggerEvent('es:addGroupCommand', 'revive', 'admin', function(source, args, use
 		TriggerClientEvent('esx_ambulancejob:revive', source)
 	end
 end, function(source, args, user)
-	TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient Permissions.")
-end, {help = _U('revive_help'), params = {{name = 'id'}}})
+	TriggerClientEvent('chat:addMessage', source, { args = { '^1SYSTEM', 'Insufficient Permissions.' } })
+end, { help = _U('revive_help'), params = { { name = 'id' } } })
 
 ESX.RegisterUsableItem('medikit', function(source)
-  local _source = source
-  local xPlayer = ESX.GetPlayerFromId(_source)
-  xPlayer.removeInventoryItem('medikit', 1)
-  TriggerClientEvent('esx_ambulancejob:heal', _source, 'big')
-  TriggerClientEvent('esx:showNotification', _source, _U('used_medikit'))
+	local _source = source
+	local xPlayer = ESX.GetPlayerFromId(_source)
+	xPlayer.removeInventoryItem('medikit', 1)
+	TriggerClientEvent('esx_ambulancejob:heal', _source, 'big')
+	TriggerClientEvent('esx:showNotification', _source, _U('used_medikit'))
 end)
 
 ESX.RegisterUsableItem('bandage', function(source)
-  local _source = source
-  local xPlayer = ESX.GetPlayerFromId(_source)
-  xPlayer.removeInventoryItem('bandage', 1)
-  TriggerClientEvent('esx_ambulancejob:heal', _source, 'small')
-  TriggerClientEvent('esx:showNotification', _source, _U('used_bandage'))
+	local _source = source
+	local xPlayer = ESX.GetPlayerFromId(_source)
+	xPlayer.removeInventoryItem('bandage', 1)
+	TriggerClientEvent('esx_ambulancejob:heal', _source, 'small')
+	TriggerClientEvent('esx:showNotification', _source, _U('used_bandage'))
 end)
 
 RegisterServerEvent('esx_ambulancejob:firstSpawn')
@@ -157,4 +176,4 @@ AddEventHandler('esx_ambulancejob:setDeathStatus', function(isDead)
 		['@identifier'] = GetPlayerIdentifiers(_source)[1],
 		['@isDead'] = isDead
 	})
-end)
+end)