From ed4b7ad8871dc23ef60aabaf6807b1bfe0165d00 Mon Sep 17 00:00:00 2001 From: Romain Lanz Date: Thu, 14 Sep 2017 12:38:31 +0200 Subject: [PATCH] chore(coding-style): correct indentation --- .editorconfig | 9 ++ __resource.lua | 34 +++---- config.lua | 130 +++++++++++++-------------- esx_ambulancejob.sql | 4 +- locales/br.lua | 88 +++++++++--------- locales/de.lua | 88 +++++++++--------- locales/en.lua | 90 +++++++++---------- locales/es.lua | 92 +++++++++---------- locales/fr.lua | 90 +++++++++---------- localization/de_esx_ambulancejob.sql | 4 +- server/main.lua | 92 +++++++++---------- 11 files changed, 365 insertions(+), 356 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..41c2aaf2 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_size = 2 +indent_style = space +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true \ No newline at end of file diff --git a/__resource.lua b/__resource.lua index 37621073..8dc4f3d5 100644 --- a/__resource.lua +++ b/__resource.lua @@ -3,24 +3,24 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Ambulance Job' server_scripts { - '@mysql-async/lib/MySQL.lua', - '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'config.lua', - 'server/main.lua' + '@mysql-async/lib/MySQL.lua', + '@es_extended/locale.lua', + 'locales/de.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'locales/es.lua', + 'config.lua', + 'server/main.lua' } client_scripts { - '@es_extended/locale.lua', - 'locales/de.lua', - 'locales/br.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'config.lua', - 'client/main.lua' + '@es_extended/locale.lua', + 'locales/de.lua', + 'locales/br.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'locales/es.lua', + 'config.lua', + 'client/main.lua' } diff --git a/config.lua b/config.lua index 380de97a..e9971e5e 100644 --- a/config.lua +++ b/config.lua @@ -1,6 +1,6 @@ Config = {} Config.DrawDistance = 100.0 -Config.MarkerColor = {r = 102, g = 0, b = 102} +Config.MarkerColor = { r = 102, g = 0, b = 102 } Config.RespawnDelayAfterRPDeath = 4 * 60 * 1000 Config.MenuRespawnToHospitalDelay = 1 * 60 * 1000 Config.EnableSocietyOwnedVehicles = false @@ -8,85 +8,85 @@ Config.RemoveWeaponsAfterRPDeath = true Config.RemoveCashAfterRPDeath = true Config.RemoveItemsAfterRPDeath = true Config.EnablePlayerManagement = false -Config.ShowDeathTimer = true -Config.EarlyRespawn = true -Config.EarlyRespawnFine = true -Config.EarlyRespawnFineAmount = 500 +Config.ShowDeathTimer = true +Config.EarlyRespawn = true +Config.EarlyRespawnFine = true +Config.EarlyRespawnFineAmount = 500 Config.Locale = 'fr' Config.Zones = { - HospitalInteriorEntering1 = { - Pos = {x = 1151.447, y = -1529.491, z = 34.375}, - Size = {x = 1.5, y = 1.5, z = 1.0}, - Type = 1 - }, + HospitalInteriorEntering1 = { + Pos = { x = 1151.447, y = -1529.491, z = 34.375 }, + Size = { x = 1.5, y = 1.5, z = 1.0 }, + Type = 1 + }, - HospitalInteriorInside1 = { - Pos = {x = 251.464, y = -1369.770, z = 28.648}, - Size = {x = 1.5, y = 1.5, z = 1.0}, - Type = -1 - }, + HospitalInteriorInside1 = { + Pos = { x = 251.464, y = -1369.770, z = 28.648 }, + Size = { x = 1.5, y = 1.5, z = 1.0 }, + Type = -1 + }, - HospitalInteriorOutside1 = { - Pos = {x = 1153.364, y = -1525.731, z = 33.843}, - Size = {x = 1.5, y = 1.5, z = 1.0}, - Type = -1 - }, + HospitalInteriorOutside1 = { + Pos = { x = 1153.364, y = -1525.731, z = 33.843 }, + Size = { x = 1.5, y = 1.5, z = 1.0 }, + Type = -1 + }, - HospitalInteriorExit1 = { - Pos = {x = 253.612, y = -1371.66, z = 28.647}, - Size = {x = 1.5, y = 1.5, z = 1.0}, - Type = 1 - }, + HospitalInteriorExit1 = { + Pos = { x = 253.612, y = -1371.66, z = 28.647 }, + Size = { x = 1.5, y = 1.5, z = 1.0 }, + Type = 1 + }, - HospitalInteriorEntering2 = { - Pos = {x = 1137.181, y = -1597.504, z = 33.692}, - Size = {x = 1.5, y = 1.5, z = 1.0}, - Type = 1 - }, + HospitalInteriorEntering2 = { + Pos = { x = 1137.181, y = -1597.504, z = 33.692 }, + Size = { x = 1.5, y = 1.5, z = 1.0 }, + Type = 1 + }, - HospitalInteriorInside2 = { - Pos = {x = 240.508, y = -1360.565, z = 28.647}, - Size = {x = 1.5, y = 1.5, z = 1.0}, - Type = -1 - }, + HospitalInteriorInside2 = { + Pos = { x = 240.508, y = -1360.565, z = 28.647 }, + Size = { x = 1.5, y = 1.5, z = 1.0 }, + Type = -1 + }, - HospitalInteriorOutside2 = { - Pos = {x = 1137.922, y = -1601.434, z = 33.692}, - Size = {x = 1.5, y = 1.5, z = 1.0}, - Type = -1 - }, + HospitalInteriorOutside2 = { + Pos = { x = 1137.922, y = -1601.434, z = 33.692 }, + Size = { x = 1.5, y = 1.5, z = 1.0 }, + Type = -1 + }, - HospitalInteriorExit2 = { - Pos = {x = 238.587, y = -1359.113, z = 28.647}, - Size = {x = 1.5, y = 1.5, z = 1.0}, - Type = 1 - }, + HospitalInteriorExit2 = { + Pos = { x = 238.587, y = -1359.113, z = 28.647 }, + Size = { x = 1.5, y = 1.5, z = 1.0 }, + Type = 1 + }, - AmbulanceActions = { - Pos = {x = 244.048, y = -1366.330, z = 28.647}, - Size = {x = 1.5, y = 1.5, z = 1.0}, - Type = 1 - }, + AmbulanceActions = { + Pos = { x = 244.048, y = -1366.330, z = 28.647 }, + Size = { x = 1.5, y = 1.5, z = 1.0 }, + Type = 1 + }, - VehicleSpawner = { - Pos = {x = 1128.290, y = -1601.451, z = 33.893}, - Size = {x = 1.5, y = 1.5, z = 1.0}, - Type = 1 - }, + VehicleSpawner = { + Pos = { x = 1128.290, y = -1601.451, z = 33.893 }, + Size = { x = 1.5, y = 1.5, z = 1.0 }, + Type = 1 + }, - VehicleSpawnPoint = { - Pos = {x = 1138.061, y = -1607.882, z = 34.692}, - Size = {x = 1.5, y = 1.5, z = 1.0}, - Type = -1 - }, + VehicleSpawnPoint = { + Pos = { x = 1138.061, y = -1607.882, z = 34.692 }, + Size = { x = 1.5, y = 1.5, z = 1.0 }, + Type = -1 + }, - VehicleDeleter = { - Pos = {x = 1122.436, y = -1617.600, z = 33.692}, - Size = {x = 3.0, y = 3.0, z = 2.0}, - Type = 1 - } + VehicleDeleter = { + Pos = { x = 1122.436, y = -1617.600, z = 33.692 }, + Size = { x = 3.0, y = 3.0, z = 2.0 }, + Type = 1 + } } diff --git a/esx_ambulancejob.sql b/esx_ambulancejob.sql index 4d22f6be..aae0c0d8 100644 --- a/esx_ambulancejob.sql +++ b/esx_ambulancejob.sql @@ -1,6 +1,6 @@ USE `essentialmode`; -INSERT INTO `addon_account` (name, label, shared) VALUES +INSERT INTO `addon_account` (name, label, shared) VALUES ('society_ambulance', 'Ambulance', 1) ; @@ -11,6 +11,6 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_ ('ambulance',3,'boss','Chirurgien',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 +INSERT INTO `jobs` (name, label) VALUES ('ambulance','Ambulance') ; diff --git a/locales/br.lua b/locales/br.lua index 07949889..359f6fe8 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,46 +1,46 @@ Locales['br'] = { - --Cloakroom - ['cloakroom'] = 'Vestiario', - ['ems_clothes_civil'] = 'Roupa casual', - ['ems_clothes_ems'] = 'Uniforme paramedico', - --Vehicles - ['veh_menu'] = 'Veículo', - ['veh_spawn'] = 'Pressione ~INPUT_CONTEXT~ para escolher veículo ou helicoptero', - ['store_veh'] = 'Pressione ~INPUT_CONTEXT~ para gaurdar o veículo', - ['ambulance'] = 'Ambulância', - ['helicopter'] = 'Helicoptero', - --Action Menu - ['hospital'] = 'Hospital', - ['revive_inprogress'] = 'Reanimação em progresso', - ['revive_complete'] = 'Você reviveu', - ['no_players'] = 'Nenhum jogador nas proximidades', - ['no_vehicles'] = 'Nenhum veículo nas proximidades', - ['isdead'] = 'esta morto', - ['unconscious'] = 'Não está inconsciente', - --Boss Menu - ['deposit_society'] = 'eMS Depositou', - ['withdraw_society'] = 'eMS Sacou', - --Misc - ['invalid_amount'] = '~r~quantidade inválida', - ['open_menu'] = 'Pressione ~INPUT_CONTEXT~ para abrir o menu', - ['deposit_amount'] = 'Quantidade para deposito', - ['money_withdraw'] = 'Quantidade para sacar', - -- F6 Menu - ['ems_menu'] = 'eMS Menu', - ['ems_menu_title'] = 'Paramedico - EMS Menu', - ['ems_menu_revive'] = 'Reviver jogador', - ['ems_menu_putincar'] = 'Colocar no veículo', - -- Phone - ['alert_ambulance'] = 'ambulância de alerta', - -- Death - ['respawn_at_hospital'] = 'você quer ser transportado para o hospital?', - ['yes'] = 'sim', - ['please_wait'] = 'por favor, espere ~b~', - ['minutes'] = ' minutos ', - ['seconds_fine'] = ' segundos ~w~para respawn \nRespawn agora para ~g~$', - ['seconds'] = ' segundos ~w~para respawn.', - ['press_respawn_fine'] = '~w~ [Pressione ~b~E~w~]', - ['press_respawn'] = 'pressione [~b~E~w~] para respawn.', - -- Revive - ['revive_help'] = 'reviver um jogador', + -- Cloakroom + ['cloakroom'] = 'Vestiario', + ['ems_clothes_civil'] = 'Roupa casual', + ['ems_clothes_ems'] = 'Uniforme paramedico', + -- Vehicles + ['veh_menu'] = 'Veículo', + ['veh_spawn'] = 'Pressione ~INPUT_CONTEXT~ para escolher veículo ou helicoptero', + ['store_veh'] = 'Pressione ~INPUT_CONTEXT~ para gaurdar o veículo', + ['ambulance'] = 'Ambulância', + ['helicopter'] = 'Helicoptero', + -- Action Menu + ['hospital'] = 'Hospital', + ['revive_inprogress'] = 'Reanimação em progresso', + ['revive_complete'] = 'Você reviveu', + ['no_players'] = 'Nenhum jogador nas proximidades', + ['no_vehicles'] = 'Nenhum veículo nas proximidades', + ['isdead'] = 'esta morto', + ['unconscious'] = 'Não está inconsciente', + -- Boss Menu + ['deposit_society'] = 'eMS Depositou', + ['withdraw_society'] = 'eMS Sacou', + -- Misc + ['invalid_amount'] = '~r~quantidade inválida', + ['open_menu'] = 'Pressione ~INPUT_CONTEXT~ para abrir o menu', + ['deposit_amount'] = 'Quantidade para deposito', + ['money_withdraw'] = 'Quantidade para sacar', + -- F6 Menu + ['ems_menu'] = 'eMS Menu', + ['ems_menu_title'] = 'Paramedico - EMS Menu', + ['ems_menu_revive'] = 'Reviver jogador', + ['ems_menu_putincar'] = 'Colocar no veículo', + -- Phone + ['alert_ambulance'] = 'ambulância de alerta', + -- Death + ['respawn_at_hospital'] = 'você quer ser transportado para o hospital?', + ['yes'] = 'sim', + ['please_wait'] = 'por favor, espere ~b~', + ['minutes'] = ' minutos ', + ['seconds_fine'] = ' segundos ~w~para respawn \nRespawn agora para ~g~$', + ['seconds'] = ' segundos ~w~para respawn.', + ['press_respawn_fine'] = '~w~ [Pressione ~b~E~w~]', + ['press_respawn'] = 'pressione [~b~E~w~] para respawn.', + -- Revive + ['revive_help'] = 'reviver um jogador', } diff --git a/locales/de.lua b/locales/de.lua index 41a263cc..5f3b0328 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,46 +1,46 @@ Locales['de'] = { - --Cloakroom - ['cloakroom'] = 'Umkleide', - ['ems_clothes_civil'] = 'Zivilkleidung', - ['ems_clothes_ems'] = 'Arbeitskleidung', - --Vehicles - ['veh_menu'] = 'Fahrzeuge', - ['veh_spawn'] = 'Drücke ~INPUT_CONTEXT~ um ein Fahrzeug zu bekommen', - ['store_veh'] = 'Drücke ~INPUT_CONTEXT~ um das Fahrzeug zu parken', - ['ambulance'] = 'Krankenwagen', - ['helicopter'] = 'Helicopter', - --Action Menu - ['hospital'] = 'Krankenhaus', - ['revive_inprogress'] = 'wiederbeleben im Gange', - ['revive_complete'] = 'du wurdest wiederbelebt ', - ['no_players'] = 'keine Spieler in der Nähe', - ['no_vehicles'] = 'keine Fahrzeuge in der Nähe', - ['isdead'] = 'ist gestorben', - ['unconscious'] = 'ist nicht im Koma', - --Boss Menu - ['deposit_society'] = 'Notdienst einzahlen', - ['withdraw_society'] = 'Notdienst abheben', - --Misc - ['invalid_amount'] = '~r~ungültiger Betrag', - ['open_menu'] = 'Drücke ~INPUT_CONTEXT~ um das Menü zu öffnen', - ['deposit_amount'] = 'Betrag zum einzahlen', - ['money_withdraw'] = 'Betrag zum abheben', - -- F6 Menu - ['ems_menu'] = 'Notdienst - Menü', - ['ems_menu_title'] = 'Notdienst - Menü', - ['ems_menu_revive'] = 'Spieler wiederbeleben', - ['ems_menu_putincar'] = 'in Fahrzeug setzen', - -- Phone - ['alert_ambulance'] = 'Notdienst anrufen', - -- Death - ['respawn_at_hospital'] = 'Willst du ins Krankenhaus gebracht werden?', - ['yes'] = 'ja', - ['please_wait'] = 'bitte warte ~b~', - ['minutes'] = ' minuten ', - ['seconds_fine'] = ' sekunden ~w~zum respawnen\nRespawn jetzt für ~g~$', - ['seconds'] = ' sekunden ~w~bis zum respawn.', - ['press_respawn_fine'] = '~w~ [Drücke ~b~E~w~]', - ['press_respawn'] = 'Drücke [~b~E~w~] zum respawnen.', - -- Revive - ['revive_help'] = 'Spieler wiederbeleben', + -- Cloakroom + ['cloakroom'] = 'Umkleide', + ['ems_clothes_civil'] = 'Zivilkleidung', + ['ems_clothes_ems'] = 'Arbeitskleidung', + -- Vehicles + ['veh_menu'] = 'Fahrzeuge', + ['veh_spawn'] = 'Drücke ~INPUT_CONTEXT~ um ein Fahrzeug zu bekommen', + ['store_veh'] = 'Drücke ~INPUT_CONTEXT~ um das Fahrzeug zu parken', + ['ambulance'] = 'Krankenwagen', + ['helicopter'] = 'Helicopter', + -- Action Menu + ['hospital'] = 'Krankenhaus', + ['revive_inprogress'] = 'wiederbeleben im Gange', + ['revive_complete'] = 'du wurdest wiederbelebt ', + ['no_players'] = 'keine Spieler in der Nähe', + ['no_vehicles'] = 'keine Fahrzeuge in der Nähe', + ['isdead'] = 'ist gestorben', + ['unconscious'] = 'ist nicht im Koma', + -- Boss Menu + ['deposit_society'] = 'Notdienst einzahlen', + ['withdraw_society'] = 'Notdienst abheben', + -- Misc + ['invalid_amount'] = '~r~ungültiger Betrag', + ['open_menu'] = 'Drücke ~INPUT_CONTEXT~ um das Menü zu öffnen', + ['deposit_amount'] = 'Betrag zum einzahlen', + ['money_withdraw'] = 'Betrag zum abheben', + -- F6 Menu + ['ems_menu'] = 'Notdienst - Menü', + ['ems_menu_title'] = 'Notdienst - Menü', + ['ems_menu_revive'] = 'Spieler wiederbeleben', + ['ems_menu_putincar'] = 'in Fahrzeug setzen', + -- Phone + ['alert_ambulance'] = 'Notdienst anrufen', + -- Death + ['respawn_at_hospital'] = 'Willst du ins Krankenhaus gebracht werden?', + ['yes'] = 'ja', + ['please_wait'] = 'bitte warte ~b~', + ['minutes'] = ' minuten ', + ['seconds_fine'] = ' sekunden ~w~zum respawnen\nRespawn jetzt für ~g~$', + ['seconds'] = ' sekunden ~w~bis zum respawn.', + ['press_respawn_fine'] = '~w~ [Drücke ~b~E~w~]', + ['press_respawn'] = 'Drücke [~b~E~w~] zum respawnen.', + -- Revive + ['revive_help'] = 'Spieler wiederbeleben', } diff --git a/locales/en.lua b/locales/en.lua index 7386d01e..f3d8982b 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,47 +1,47 @@ Locales['en'] = { - --Cloakroom - ['cloakroom'] = 'locker Room', - ['ems_clothes_civil'] = 'civilian Clothes', - ['ems_clothes_ems'] = 'eMS Clothes', - --Vehicles - ['veh_menu'] = 'vehicle', - ['veh_spawn'] = 'press ~INPUT_CONTEXT~ to get a Vehicle or Helicopter', - ['store_veh'] = 'press ~INPUT_CONTEXT~ to store the vehicle', - ['ambulance'] = 'ambulance', - ['helicopter'] = 'helicopter', - --Action Menu - ['hospital'] = 'hospital', - ['revive_inprogress'] = 'revive in progress', - ['revive_complete'] = 'you have been revived ', - ['no_players'] = 'no players nearby', - ['no_vehicles'] = 'no vehicles nearby', - ['isdead'] = 'is dead', - ['unconscious'] = 'is not unconscious', - --Boss Menu - ['deposit_society'] = 'eMS Deposit', - ['withdraw_society'] = 'eMS Withdraw', - ['boss_actions'] = 'boss Actions', - --Misc - ['invalid_amount'] = '~r~invalid amount', - ['open_menu'] = 'press ~INPUT_CONTEXT~ to open the menu', - ['deposit_amount'] = 'deposit Amount', - ['money_withdraw'] = 'amount withdrawn', - -- F6 Menu - ['ems_menu'] = 'eMS Menu', - ['ems_menu_title'] = 'ambulance - EMS Menu', - ['ems_menu_revive'] = 'revive Player', - ['ems_menu_putincar'] = 'put in Vehicle', - -- Phone - ['alert_ambulance'] = 'alert Ambulance', - -- Death - ['respawn_at_hospital'] = 'do you want to be transported to the hospital?', - ['yes'] = 'yes', - ['please_wait'] = 'please wait ~b~', - ['minutes'] = ' minutes ', - ['seconds_fine'] = ' seconds ~w~to respawn \nRespawn now for ~g~$', - ['seconds'] = ' seconds ~w~to respawn.', - ['press_respawn_fine'] = '~w~ [Press ~b~E~w~]', - ['press_respawn'] = 'press [~b~E~w~] to respawn.', - -- Revive - ['revive_help'] = 'revive a player', + -- Cloakroom + ['cloakroom'] = 'locker Room', + ['ems_clothes_civil'] = 'civilian Clothes', + ['ems_clothes_ems'] = 'eMS Clothes', + -- Vehicles + ['veh_menu'] = 'vehicle', + ['veh_spawn'] = 'press ~INPUT_CONTEXT~ to get a Vehicle or Helicopter', + ['store_veh'] = 'press ~INPUT_CONTEXT~ to store the vehicle', + ['ambulance'] = 'ambulance', + ['helicopter'] = 'helicopter', + -- Action Menu + ['hospital'] = 'hospital', + ['revive_inprogress'] = 'revive in progress', + ['revive_complete'] = 'you have been revived ', + ['no_players'] = 'no players nearby', + ['no_vehicles'] = 'no vehicles nearby', + ['isdead'] = 'is dead', + ['unconscious'] = 'is not unconscious', + -- Boss Menu + ['deposit_society'] = 'eMS Deposit', + ['withdraw_society'] = 'eMS Withdraw', + ['boss_actions'] = 'boss Actions', + -- Misc + ['invalid_amount'] = '~r~invalid amount', + ['open_menu'] = 'press ~INPUT_CONTEXT~ to open the menu', + ['deposit_amount'] = 'deposit Amount', + ['money_withdraw'] = 'amount withdrawn', + -- F6 Menu + ['ems_menu'] = 'eMS Menu', + ['ems_menu_title'] = 'ambulance - EMS Menu', + ['ems_menu_revive'] = 'revive Player', + ['ems_menu_putincar'] = 'put in Vehicle', + -- Phone + ['alert_ambulance'] = 'alert Ambulance', + -- Death + ['respawn_at_hospital'] = 'do you want to be transported to the hospital?', + ['yes'] = 'yes', + ['please_wait'] = 'please wait ~b~', + ['minutes'] = ' minutes ', + ['seconds_fine'] = ' seconds ~w~to respawn \nRespawn now for ~g~$', + ['seconds'] = ' seconds ~w~to respawn.', + ['press_respawn_fine'] = '~w~ [Press ~b~E~w~]', + ['press_respawn'] = 'press [~b~E~w~] to respawn.', + -- Revive + ['revive_help'] = 'revive a player', } diff --git a/locales/es.lua b/locales/es.lua index d6dddfc3..139404ca 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -1,46 +1,46 @@ -Locales['es'] = { - --Cloakroom - ['cloakroom'] = 'Guardarropa', - ['ems_clothes_civil'] = 'Camiseta', - ['ems_clothes_ems'] = 'Equipo de ambulancia', - --Vehicles - ['veh_menu'] = 'vehículo', - ['veh_spawn'] = 'Presione ~INPUT_CONTEXT~ para sacar un vehículo', - ['store_veh'] = 'Presione ~INPUT_CONTEXT~ para alamcenar un vehículo', - ['ambulance'] = 'Ambulancia', - ['helicopter'] = 'helicóptero', - --Action Menu - ['hospital'] = 'hospital', - ['revive_inprogress'] = 'reanimación en curso', - ['revive_complete'] = 'has sido reanimado ', - ['no_players'] = 'ningún jugador cerca', - ['no_vehicles'] = 'ningún vehículo cerca', - ['isdead'] = 'Has muerto', - ['unconscious'] = 'n\'estás inconsciente', - --Boss Menu - ['deposit_society'] = 'depositar dinero', - ['withdraw_society'] = 'retirar dinero', - --Misc - ['invalid_amount'] = '~r~cantidad no válida', - ['open_menu'] = 'Presione ~INPUT_CONTEXT~ para abrir el menú', - ['deposit_amount'] = 'cantidad de fianza depositada', - ['money_withdraw'] = 'cantidad de fianza retirada', - -- F6 Menu - ['ems_menu'] = 'ayuda ciudadana', - ['ems_menu_title'] = 'ambulancia - Ayuda Ciudadana', - ['ems_menu_revive'] = 'reanimar', - ['ems_menu_putincar'] = 'meter en el vehículo', - -- Phone - ['alert_ambulance'] = 'Alerta de ambulancia', - -- Death - ['respawn_at_hospital'] = '¿Quieres ser transportado al hospital?', - ['yes'] = 'oui', - ['please_wait'] = 's\'por favor, espere ~b~', - ['minutes'] = ' minutos ', - ['seconds_fine'] = ' segundos ~w~to reparecer \nReapareciendo ahora por ~g~€', - ['seconds'] = ' segundos ~w~para reparecer.', - ['press_respawn_fine'] = '~w~ [Pulsa ~b~E~w~]', - ['press_respawn'] = 'presione [~b~E~w~] para reparecer.', - -- Revive - ['revive_help'] = 'reviver un jugador', -} +Locales['es'] = { + -- Cloakroom + ['cloakroom'] = 'Guardarropa', + ['ems_clothes_civil'] = 'Camiseta', + ['ems_clothes_ems'] = 'Equipo de ambulancia', +-- Vehicles + ['veh_menu'] = 'vehículo', + ['veh_spawn'] = 'Presione ~INPUT_CONTEXT~ para sacar un vehículo', + ['store_veh'] = 'Presione ~INPUT_CONTEXT~ para alamcenar un vehículo', + ['ambulance'] = 'Ambulancia', + ['helicopter'] = 'helicóptero', + -- Action Menu + ['hospital'] = 'hospital', + ['revive_inprogress'] = 'reanimación en curso', + ['revive_complete'] = 'has sido reanimado ', + ['no_players'] = 'ningún jugador cerca', + ['no_vehicles'] = 'ningún vehículo cerca', + ['isdead'] = 'Has muerto', + ['unconscious'] = 'n\'estás inconsciente', + -- oss Menu + ['deposit_society'] = 'depositar dinero', + ['withdraw_society'] = 'retirar dinero', + -- Misc + ['invalid_amount'] = '~r~cantidad no válida', + ['open_menu'] = 'Presione ~INPUT_CONTEXT~ para abrir el menú', + ['deposit_amount'] = 'cantidad de fianza depositada', + ['money_withdraw'] = 'cantidad de fianza retirada', + -- F6 Menu + ['ems_menu'] = 'ayuda ciudadana', + ['ems_menu_title'] = 'ambulancia - Ayuda Ciudadana', + ['ems_menu_revive'] = 'reanimar', + ['ems_menu_putincar'] = 'meter en el vehículo', + -- Phone + ['alert_ambulance'] = 'Alerta de ambulancia', + -- Death + ['respawn_at_hospital'] = '¿Quieres ser transportado al hospital?', + ['yes'] = 'oui', + ['please_wait'] = 's\'por favor, espere ~b~', + ['minutes'] = ' minutos ', + ['seconds_fine'] = ' segundos ~w~to reparecer \nReapareciendo ahora por ~g~€', + ['seconds'] = ' segundos ~w~para reparecer.', + ['press_respawn_fine'] = '~w~ [Pulsa ~b~E~w~]', + ['press_respawn'] = 'presione [~b~E~w~] para reparecer.', + -- Revive + ['revive_help'] = 'reviver un jugador', +} diff --git a/locales/fr.lua b/locales/fr.lua index b2c57384..decee714 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,47 +1,47 @@ Locales['fr'] = { - --Cloakroom - ['cloakroom'] = 'Vestiaire', - ['ems_clothes_civil'] = 'Tenue Civil', - ['ems_clothes_ems'] = 'Tenue Ambulancier', - --Vehicles - ['veh_menu'] = 'véhicule', - ['veh_spawn'] = 'appuyez sur ~INPUT_CONTEXT~ pour sortir un véhicule', - ['store_veh'] = 'appuyez sur ~INPUT_CONTEXT~ pour ranger le véhicule', - ['ambulance'] = 'ambulance', - ['helicopter'] = 'hélicoptère', - --Action Menu - ['hospital'] = 'hôpital', - ['revive_inprogress'] = 'réanimation en cours', - ['revive_complete'] = 'vous avez réanimé ', - ['no_players'] = 'aucun joueur à proximité', - ['no_vehicles'] = 'aucun véhicule à proximité', - ['isdead'] = 'a succombé', - ['unconscious'] = 'n\'est pas inconscient', - --Boss Menu - ['deposit_society'] = 'déposer argent', - ['withdraw_society'] = 'retirer argent société', - ['boss_actions'] = 'action Patron', - --Misc - ['invalid_amount'] = '~r~montant invalide', - ['open_menu'] = 'appuyez sur ~INPUT_CONTEXT~ pour ouvrir le menu', - ['deposit_amount'] = 'montant du dépôt', - ['money_withdraw'] = 'montant du retrait', - -- F6 Menu - ['ems_menu'] = 'interaction citoyen', - ['ems_menu_title'] = 'ambulance - Interactions Citoyen', - ['ems_menu_revive'] = 'réanimer', - ['ems_menu_putincar'] = 'mettre dans véhicule', - -- Phone - ['alert_ambulance'] = 'alerte Ambulance', - -- Death - ['respawn_at_hospital'] = 'voulez-vous être transporté à l\'hôpital ?', - ['yes'] = 'oui', - ['please_wait'] = 's\'il vous plaît, attendez ~b~', - ['minutes'] = ' minutes ', - ['seconds_fine'] = ' secondes ~w~ pour réapparaître \nRéapparaître maintenant pour ~g~$', - ['seconds'] = ' secondes ~w~ pour réapparaître.', - ['press_respawn_fine'] = '~w~ [Presse ~b~E~w~]', - ['press_respawn'] = 'appuyez [~b~E~w~] sur pour réapparaître.', - -- Revive - ['revive_help'] = 'relancer un joueur', + -- Cloakroom + ['cloakroom'] = 'Vestiaire', + ['ems_clothes_civil'] = 'Tenue Civil', + ['ems_clothes_ems'] = 'Tenue Ambulancier', + -- Vehicles + ['veh_menu'] = 'véhicule', + ['veh_spawn'] = 'appuyez sur ~INPUT_CONTEXT~ pour sortir un véhicule', + ['store_veh'] = 'appuyez sur ~INPUT_CONTEXT~ pour ranger le véhicule', + ['ambulance'] = 'ambulance', + ['helicopter'] = 'hélicoptère', + -- Action Menu + ['hospital'] = 'hôpital', + ['revive_inprogress'] = 'réanimation en cours', + ['revive_complete'] = 'vous avez réanimé ', + ['no_players'] = 'aucun joueur à proximité', + ['no_vehicles'] = 'aucun véhicule à proximité', + ['isdead'] = 'a succombé', + ['unconscious'] = 'n\'est pas inconscient', + -- Boss Menu + ['deposit_society'] = 'déposer argent', + ['withdraw_society'] = 'retirer argent société', + ['boss_actions'] = 'action Patron', + -- Misc + ['invalid_amount'] = '~r~montant invalide', + ['open_menu'] = 'appuyez sur ~INPUT_CONTEXT~ pour ouvrir le menu', + ['deposit_amount'] = 'montant du dépôt', + ['money_withdraw'] = 'montant du retrait', + -- F6 Menu + ['ems_menu'] = 'interaction citoyen', + ['ems_menu_title'] = 'ambulance - Interactions Citoyen', + ['ems_menu_revive'] = 'réanimer', + ['ems_menu_putincar'] = 'mettre dans véhicule', + -- Phone + ['alert_ambulance'] = 'alerte Ambulance', + -- Death + ['respawn_at_hospital'] = 'voulez-vous être transporté à l\'hôpital ?', + ['yes'] = 'oui', + ['please_wait'] = 's\'il vous plaît, attendez ~b~', + ['minutes'] = ' minutes ', + ['seconds_fine'] = ' secondes ~w~ pour réapparaître \nRéapparaître maintenant pour ~g~$', + ['seconds'] = ' secondes ~w~ pour réapparaître.', + ['press_respawn_fine'] = '~w~ [Presse ~b~E~w~]', + ['press_respawn'] = 'appuyez [~b~E~w~] sur pour réapparaître.', + -- Revive + ['revive_help'] = 'relancer un joueur', } diff --git a/localization/de_esx_ambulancejob.sql b/localization/de_esx_ambulancejob.sql index cd81e976..c2b62522 100644 --- a/localization/de_esx_ambulancejob.sql +++ b/localization/de_esx_ambulancejob.sql @@ -1,6 +1,6 @@ USE `essentialmode`; -INSERT INTO `addon_account` (name, label, shared) VALUES +INSERT INTO `addon_account` (name, label, shared) VALUES ('society_ambulance', 'Notdienst', 1) ; @@ -11,6 +11,6 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_ ('ambulance',3,'boss','Chirurg',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 +INSERT INTO `jobs` (name, label) VALUES ('ambulance','Notdienst') ; diff --git a/server/main.lua b/server/main.lua index e4c9d7fc..70b9e57d 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,7 +4,7 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_ambulancejob:revive') AddEventHandler('esx_ambulancejob:revive', function(target) - TriggerClientEvent('esx_ambulancejob:revive', target) + TriggerClientEvent('esx_ambulancejob:revive', target) end) TriggerEvent('esx_phone:registerNumber', 'ambulance', _U('alert_ambulance'), true, true) @@ -12,59 +12,59 @@ TriggerEvent('esx_society:registerSociety', 'ambulance', 'Ambulance', 'society_a ESX.RegisterServerCallback('esx_ambulancejob:removeItemsAfterRPDeath', function(source, cb) - local xPlayer = ESX.GetPlayerFromId(source) + local xPlayer = ESX.GetPlayerFromId(source) - if Config.RemoveCashAfterRPDeath then - xPlayer.removeMoney(xPlayer.getMoney()) - xPlayer.setAccountMoney('black_money', 0) - end + if Config.RemoveCashAfterRPDeath then + xPlayer.removeMoney(xPlayer.getMoney()) + xPlayer.setAccountMoney('black_money', 0) + end - if Config.RemoveItemsAfterRPDeath then - for i=1, #xPlayer.inventory, 1 do - if xPlayer.inventory[i].count > 0 then - xPlayer.setInventoryItem(xPlayer.inventory[i].name, 0) - end - end - end + if Config.RemoveItemsAfterRPDeath then + for i=1, #xPlayer.inventory, 1 do + if xPlayer.inventory[i].count > 0 then + xPlayer.setInventoryItem(xPlayer.inventory[i].name, 0) + end + end + end - if Config.RemoveWeaponsAfterRPDeath then - for i=1, #xPlayer.loadout, 1 do - xPlayer.removeWeapon(xPlayer.loadout[i].name) - end - end + if Config.RemoveWeaponsAfterRPDeath then + for i=1, #xPlayer.loadout, 1 do + xPlayer.removeWeapon(xPlayer.loadout[i].name) + end + end - cb() + cb() end) ESX.RegisterServerCallback('esx_ambulancejob:removeItemsAfterRPDeathRemoveMoney', function(source, cb) - local xPlayer = ESX.GetPlayerFromId(source) + local xPlayer = ESX.GetPlayerFromId(source) - if Config.RemoveCashAfterRPDeath then - xPlayer.removeMoney(xPlayer.getMoney()) - xPlayer.setAccountMoney('black_money', 0) - end + if Config.RemoveCashAfterRPDeath then + xPlayer.removeMoney(xPlayer.getMoney()) + xPlayer.setAccountMoney('black_money', 0) + end - if Config.EarlyRespawn and Config.EarlyRespawnFine then - xPlayer.removeAccountMoney('bank', Config.EarlyRespawnFineAmount) - end + if Config.EarlyRespawn and Config.EarlyRespawnFine then + xPlayer.removeAccountMoney('bank', Config.EarlyRespawnFineAmount) + end - if Config.RemoveItemsAfterRPDeath then - for i=1, #xPlayer.inventory, 1 do - if xPlayer.inventory[i].count > 0 and not xPlayer.inventory[i].rare then - xPlayer.setInventoryItem(xPlayer.inventory[i].name, 0) - end - end - end + if Config.RemoveItemsAfterRPDeath then + for i=1, #xPlayer.inventory, 1 do + if xPlayer.inventory[i].count > 0 and not xPlayer.inventory[i].rare then + xPlayer.setInventoryItem(xPlayer.inventory[i].name, 0) + end + end + end - if Config.RemoveWeaponsAfterRPDeath then - for i=1, #xPlayer.loadout, 1 do - xPlayer.removeWeapon(xPlayer.loadout[i].name) - end - end + if Config.RemoveWeaponsAfterRPDeath then + for i=1, #xPlayer.loadout, 1 do + xPlayer.removeWeapon(xPlayer.loadout[i].name) + end + end - cb() + cb() end) @@ -78,12 +78,12 @@ end) TriggerEvent('es:addGroupCommand', 'revive', 'admin', function(source, args, user) - if args[2] ~= nil then - TriggerClientEvent('esx_ambulancejob:revive', tonumber(args[2])) - else - TriggerClientEvent('esx_ambulancejob:revive', source) - end + if args[2] ~= nil then + TriggerClientEvent('esx_ambulancejob:revive', tonumber(args[2])) + else + TriggerClientEvent('esx_ambulancejob:revive', source) + end end, function(source, args, user) - TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient Permissions.") + TriggerClientEvent('chatMessage', source, "SYSTEM", {255, 0, 0}, "Insufficient Permissions.") end, {help = _U('revive_help'), params = {{name = 'id'}}})