diff --git a/client/main.lua b/client/main.lua index b8f3b0cb..93364e4f 100644 --- a/client/main.lua +++ b/client/main.lua @@ -43,16 +43,18 @@ function RespawnPed(ped, coords) end RegisterNetEvent('esx_ambulancejob:heal') -AddEventHandler('esx_ambulancejob:heal', function(_type) - local playerPed = GetPlayerPed(-1) +AddEventHandler('esx_ambulancejob:heal', function(healType) + local playerPed = PlayerPedId() local maxHealth = GetEntityMaxHealth(playerPed) - if _type == 'small' then + + if healType == 'small' then local health = GetEntityHealth(playerPed) local newHealth = math.min(maxHealth , math.floor(health + maxHealth/8)) SetEntityHealth(playerPed, newHealth) - elseif _type == 'big' then + elseif healType == 'big' then SetEntityHealth(playerPed, maxHealth) end + ESX.ShowNotification(_U('healed')) end) @@ -94,7 +96,7 @@ function StartDistressSignal() end function SendDistressSignal() - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) ESX.ShowNotification(_U('distress_sent')) @@ -190,7 +192,7 @@ function RemoveItemsAfterRPDeath() ESX.SetPlayerData('loadout', {}) TriggerServerEvent('esx:updateLastPosition', Config.Zones.HospitalInteriorInside1.Pos) - RespawnPed(GetPlayerPed(-1), Config.Zones.HospitalInteriorInside1.Pos) + RespawnPed(PlayerPedId(), Config.Zones.HospitalInteriorInside1.Pos) StopScreenEffect('DeathFailOut') DoScreenFadeIn(800) @@ -215,7 +217,7 @@ function OnPlayerDeath() StartRespawnTimer() StartDistressSignal() - ClearPedTasksImmediately(GetPlayerPed(-1)) + ClearPedTasksImmediately(PlayerPedId()) StartScreenEffect('DeathFailOut', 0, false) end @@ -354,7 +356,7 @@ function OpenMobileAmbulanceActionsMenu() local health = GetEntityHealth(closestPlayerPed) if health == 0 then - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() IsBusy = true ESX.ShowNotification(_U('revive_inprogress')) @@ -392,7 +394,7 @@ function OpenMobileAmbulanceActionsMenu() local health = GetEntityHealth(closestPlayerPed) if health > 0 then - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() IsBusy = true ESX.ShowNotification(_U('heal_inprogress')) @@ -424,7 +426,7 @@ function OpenMobileAmbulanceActionsMenu() local health = GetEntityHealth(closestPlayerPed) if health > 0 then - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() IsBusy = true ESX.ShowNotification(_U('heal_inprogress')) @@ -540,7 +542,7 @@ function OpenVehicleSpawnerMenu() local vehicleProps = data.current.value ESX.Game.SpawnVehicle(vehicleProps.model, Config.Zones.VehicleSpawnPoint.Pos, 270.0, function(vehicle) ESX.Game.SetVehicleProperties(vehicle, vehicleProps) - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() TaskWarpPedIntoVehicle(playerPed, vehicle, -1) end) TriggerServerEvent('esx_society:removeVehicleFromGarage', 'ambulance', vehicleProps) @@ -565,7 +567,7 @@ function OpenVehicleSpawnerMenu() }, function(data, menu) menu.close() ESX.Game.SpawnVehicle(data.current.model, Config.Zones.VehicleSpawnPoint.Pos, 230.0, function(vehicle) - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() TaskWarpPedIntoVehicle(playerPed, vehicle, -1) end) end, function(data, menu) @@ -642,7 +644,7 @@ end) RegisterNetEvent('esx_ambulancejob:revive') AddEventHandler('esx_ambulancejob:revive', function() - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) TriggerServerEvent('esx_ambulancejob:setDeathStatus', 0) @@ -683,11 +685,11 @@ end) AddEventHandler('esx_ambulancejob:hasEnteredMarker', function(zone) if zone == 'HospitalInteriorEntering1' then - TeleportFadeEffect(GetPlayerPed(-1), Config.Zones.HospitalInteriorInside1.Pos) + TeleportFadeEffect(PlayerPedId(), Config.Zones.HospitalInteriorInside1.Pos) end if zone == 'HospitalInteriorExit1' then - TeleportFadeEffect(GetPlayerPed(-1), Config.Zones.HospitalInteriorOutside1.Pos) + TeleportFadeEffect(PlayerPedId(), Config.Zones.HospitalInteriorOutside1.Pos) end if zone == 'HospitalInteriorEntering2' then @@ -704,19 +706,19 @@ AddEventHandler('esx_ambulancejob:hasEnteredMarker', function(zone) end) end - TeleportFadeEffect(GetPlayerPed(-1), Config.Zones.HospitalInteriorInside2.Pos) + TeleportFadeEffect(PlayerPedId(), Config.Zones.HospitalInteriorInside2.Pos) end if zone == 'HospitalInteriorExit2' then - TeleportFadeEffect(GetPlayerPed(-1), Config.Zones.HospitalInteriorOutside2.Pos) + TeleportFadeEffect(PlayerPedId(), Config.Zones.HospitalInteriorOutside2.Pos) end if zone == 'ParkingDoorGoOutInside' then - TeleportFadeEffect(GetPlayerPed(-1), Config.Zones.ParkingDoorGoOutOutside.Pos) + TeleportFadeEffect(PlayerPedId(), Config.Zones.ParkingDoorGoOutOutside.Pos) end if zone == 'ParkingDoorGoInOutside' then - TeleportFadeEffect(GetPlayerPed(-1), Config.Zones.ParkingDoorGoInInside.Pos) + TeleportFadeEffect(PlayerPedId(), Config.Zones.ParkingDoorGoInInside.Pos) end if zone == 'StairsGoTopBottom' then @@ -751,7 +753,7 @@ AddEventHandler('esx_ambulancejob:hasEnteredMarker', function(zone) if zone == 'VehicleDeleter' then - local playerPed = GetPlayerPed(-1) + local playerPed = PlayerPedId() local coords = GetEntityCoords(playerPed) if IsPedInAnyVehicle(playerPed, false) then @@ -777,7 +779,7 @@ AddEventHandler('esx_ambulancejob:hasEnteredMarker', function(zone) end) function FastTravel(pos) - TeleportFadeEffect(GetPlayerPed(-1), pos) + TeleportFadeEffect(PlayerPedId(), pos) end AddEventHandler('esx_ambulancejob:hasExitedMarker', function(zone) @@ -807,7 +809,7 @@ Citizen.CreateThread(function() while true do Citizen.Wait(0) - local coords = GetEntityCoords(GetPlayerPed(-1)) + local coords = GetEntityCoords(PlayerPedId()) for k,v in pairs(Config.Zones) do if(v.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < Config.DrawDistance) then if PlayerData.job ~= nil and PlayerData.job.name == 'ambulance' then @@ -825,7 +827,7 @@ Citizen.CreateThread(function() while true do Citizen.Wait(10) - local coords = GetEntityCoords(GetPlayerPed(-1)) + local coords = GetEntityCoords(PlayerPedId()) local isInMarker = false local currentZone = nil for k,v in pairs(Config.Zones) do @@ -909,7 +911,7 @@ RegisterNetEvent('esx_ambulancejob:requestDeath') AddEventHandler('esx_ambulancejob:requestDeath', function() if Config.AntiCombatLog then Citizen.Wait(5000) - SetEntityHealth(GetPlayerPed(-1), 0) + SetEntityHealth(PlayerPedId(), 0) end end) diff --git a/locales/br.lua b/locales/br.lua index 4ffcc83c..9f7e1114 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -21,8 +21,6 @@ Locales['br'] = { ['player_not_unconscious'] = 'Não está inconsciente', ['player_not_conscious'] = 'that player is not conscious!', -- Boss Menu - ['deposit_society'] = 'Depositar dinheiro', - ['withdraw_society'] = 'Retirar dinheiro da empresa', ['boss_actions'] = 'Menu Administração', -- Misc ['invalid_amount'] = '~r~Quantidade inválida', diff --git a/locales/de.lua b/locales/de.lua index 38b46ab1..b1671811 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -21,8 +21,6 @@ Locales['de'] = { ['player_not_unconscious'] = 'ist nicht im Koma', ['player_not_conscious'] = 'that player is not conscious!', -- Boss Menu - ['deposit_society'] = 'Notdienst einzahlen', - ['withdraw_society'] = 'Notdienst abheben', ['boss_actions'] = 'boss actions', -- Misc ['invalid_amount'] = '~r~ungültiger Betrag', diff --git a/locales/en.lua b/locales/en.lua index 287033f0..9b7a1f92 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -21,8 +21,6 @@ Locales['en'] = { ['player_not_unconscious'] = 'that player is not unconscious!', ['player_not_conscious'] = 'that player is not conscious!', -- Boss Menu - ['deposit_society'] = 'eMS Deposit', - ['withdraw_society'] = 'eMS Withdraw', ['boss_actions'] = 'boss Actions', -- Misc ['invalid_amount'] = '~r~invalid amount', diff --git a/locales/es.lua b/locales/es.lua index ba4f7011..47f009c9 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -20,9 +20,8 @@ Locales['es'] = { ['no_vehicles'] = 'ningún vehículo cerca', ['player_not_unconscious'] = 'n\'estás inconsciente', ['player_not_conscious'] = 'that player is not conscious!', - -- oss Menu - ['deposit_society'] = 'depositar dinero', - ['withdraw_society'] = 'retirar dinero', + -- Boss Menu + ['boss_actions'] = 'boss Actions', -- Misc ['invalid_amount'] = '~r~cantidad no válida', ['open_menu'] = 'Presione ~INPUT_CONTEXT~ para abrir el menú', diff --git a/locales/fi.lua b/locales/fi.lua index cfa5b6b6..4c34e898 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -21,8 +21,6 @@ Locales['fi'] = { ['player_not_unconscious'] = 'tämä pelaaja ei ole tajuton!', ['player_not_conscious'] = 'tämä pelaaja ei ole tajuissaan!', -- Boss Menu - ['deposit_society'] = 'ensihoito talletus', - ['withdraw_society'] = 'ensihoito nosto', ['boss_actions'] = 'pomovalikko', -- Misc ['invalid_amount'] = '~r~Virheellinen summa', diff --git a/locales/fr.lua b/locales/fr.lua index 073193d4..2e94632c 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -21,8 +21,6 @@ Locales['fr'] = { ['player_not_unconscious'] = 'n\'est pas inconscient', ['player_not_conscious'] = 'Cette personne est inconsciente!', -- Boss Menu - ['deposit_society'] = 'déposer argent', - ['withdraw_society'] = 'retirer argent société', ['boss_actions'] = 'action Patron', -- Misc ['invalid_amount'] = '~r~montant invalide', diff --git a/locales/pl.lua b/locales/pl.lua index aca5f6f5..c6e299b7 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -21,8 +21,6 @@ Locales['pl'] = { ['player_not_unconscious'] = 'ten gracz nie jest nieprzytomny!', ['player_not_conscious'] = 'ten gracz nie jest świadomy!', -- Boss Menu - ['deposit_society'] = 'zdeponuj do EMS', - ['withdraw_society'] = 'wyjmij z depozytu EMS', ['boss_actions'] = 'akcje szefa', -- Misc ['invalid_amount'] = '~r~Nieprawidłowa kwota', diff --git a/locales/sv.lua b/locales/sv.lua index b60946d2..6e08adbd 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,65 +1,63 @@ Locales['sv'] = { -- Cloakroom - ['cloakroom'] = 'Omklädnignsrum', - ['ems_clothes_civil'] = 'Civilkläder', - ['ems_clothes_ems'] = 'Ambulanskläder', + ['cloakroom'] = 'omklädnignsrum', + ['ems_clothes_civil'] = 'civilkläder', + ['ems_clothes_ems'] = 'ambulanskläder', -- Vehicles - ['veh_menu'] = 'Fordon', - ['veh_spawn'] = 'Tryck ~INPUT_CONTEXT~ för att ta fram ett fordon', - ['store_veh'] = 'Tryck ~INPUT_CONTEXT~ för att lagra fordonet', - ['ambulance'] = 'Ambulans', - ['helicopter'] = 'Helikopter', + ['veh_menu'] = 'fordon', + ['veh_spawn'] = 'tryck ~INPUT_CONTEXT~ för att öppna garaget.', + ['store_veh'] = 'tryck ~INPUT_CONTEXT~ för att lagra fordonet.', + ['ambulance'] = 'ambulans', + ['helicopter'] = 'helikopter', -- Action Menu - ['hospital'] = 'Sjukhus', - ['revive_inprogress'] = 'Återupplivning pågår...', + ['hospital'] = 'sjukhus', + ['revive_inprogress'] = 'återupplivning pågår . . .', ['revive_complete'] = 'du har återupplivat ~y~%s~s~, bra jobbat!', - ['revive_complete_award'] = 'du har återupplivat ~y~%s~s~ och tjärnat ~g~$%s~s~ i processen, bra jobbat!', + ['revive_complete_award'] = 'du har återupplivat ~y~%s~s~ och tjärnat ~g~%s SEK~s~ i processen, bra jobbat!', ['heal_inprogress'] = 'du behandlar patienten!', ['heal_complete'] = 'du har behandlat ~y~%s~s~', - ['no_players'] = 'Inga spelare i närheten!', - ['no_vehicles'] = 'Inga fordon i närheten!', + ['no_players'] = 'det finns inga spelare i närheten!', + ['no_vehicles'] = 'det finns inget fordon i närheten!', ['player_not_unconscious'] = 'spelaren är inte medvetslös!', ['player_not_conscious'] = 'spelaren är inte vid medvetande!', -- Boss Menu - ['deposit_society'] = 'Sjukvårdens insättning', - ['withdraw_society'] = 'Sjukvårdens uttagning', - ['boss_actions'] = 'Chef meny', + ['boss_actions'] = 'chef meny', -- Misc - ['invalid_amount'] = '~r~Ogiltig mängd', - ['open_menu'] = 'Teyck ~INPUT_CONTEXT~ för att öppna menyn', - ['deposit_amount'] = 'Mängd att sätta in', - ['money_withdraw'] = 'Mängd att ta ut', - ['fast_travel'] = 'Tryck på ~INPUT_CONTEXT~ för att snabbresa.', - ['open_pharmacy'] = 'Tryck på ~INPUT_CONTEXT~ för att öppna apoteket.', - ['pharmacy_menu_title'] = 'Apotek', - ['pharmacy_take'] = 'Ta', - ['medikit'] = 'Medicinkit', - ['bandage'] = 'Bandage', - ['max_item'] = 'Du har redan tillräckligt mycket på dig.', + ['invalid_amount'] = '~r~ogiltig mängd', + ['open_menu'] = 'tryck ~INPUT_CONTEXT~ för att öppna menyn.', + ['deposit_amount'] = 'mängd att sätta in', + ['money_withdraw'] = 'mängd att ta ut', + ['fast_travel'] = 'tryck på ~INPUT_CONTEXT~ för att snabbresa.', + ['open_pharmacy'] = 'tryck på ~INPUT_CONTEXT~ för att öppna apoteket.', + ['pharmacy_menu_title'] = 'apotek', + ['pharmacy_take'] = 'ta', + ['medikit'] = 'medicinkit', + ['bandage'] = 'bandage', + ['max_item'] = 'du har redan tillräckligt mycket på dig.', -- F6 Menu - ['ems_menu'] = 'Ambulansmeny', - ['ems_menu_title'] = 'Ambulansmeny', - ['ems_menu_revive'] = 'Återuppliva spelare', - ['ems_menu_putincar'] = 'Sätt i fordon', - ['ems_menu_small'] = 'Behandla mindre skador', - ['ems_menu_big'] = 'Behandla svåra skador', + ['ems_menu'] = 'ambulansmeny', + ['ems_menu_title'] = 'ambulansmeny', + ['ems_menu_revive'] = 'återuppliva spelare', + ['ems_menu_putincar'] = 'sätt i fordon', + ['ems_menu_small'] = 'behandla mindre skador', + ['ems_menu_big'] = 'behandla svåra skador', -- Phone - ['alert_ambulance'] = 'Ring ambulansen', + ['alert_ambulance'] = 'ambulanssamtal', -- Death - ['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!', + ['please_wait'] = 'du är medvetslös och kommer att dö om ~b~%s minuter och %s sekunder~s~\n', + ['press_respawn'] = 'tryck [~b~E~s~] för att respawna.', + ['respawn_now_fine'] = 'respawna nu för ~g~%s SEK~s~ [Tryck ~b~E~s~]', + ['respawn_fine'] = 'du betalade ~r~%s SEK~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!', -- Revive - ['revive_help'] = 'Återuppliva en spelare', + ['revive_help'] = 'återuppliva en spelare', -- Item - ['used_medikit'] = 'Du har använt ~y~1x~s~ ~b~Medecinkit~s~', - ['used_bandage'] = 'Du har använt ~y~1x~s~ ~b~Bandage~s~', - ['not_enough_medikit'] = 'Du har inget ~b~Medecinkit~w~.', - ['not_enough_bandage'] = 'Du har inget ~b~Bandage~w~.', + ['used_medikit'] = 'du har använt ~y~1x~s~ ~b~Medecinkit~s~', + ['used_bandage'] = 'du har använt ~y~1x~s~ ~b~Bandage~s~', + ['not_enough_medikit'] = 'du har inget ~b~Medecinkit~s~.', + ['not_enough_bandage'] = 'du har inget ~b~Bandage~s~.', ['healed'] = 'dina skador har blivit behandlade.', -- Misc }