From 8fbc5b27c5f4ccbb1a446a72e140a46b36bd898b Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 30 Apr 2018 16:27:37 +0200 Subject: [PATCH] Dead cannot use F6, proper alignment, missing SQL info, i18n fixes --- __resource.lua | 28 ++++--- client/main.lua | 35 ++++++-- esx_mecanojob.sql | 30 +++---- locales/br.lua | 2 +- locales/sv.lua | 128 +++++++++++++++--------------- localization/esx_mecanojob_en.sql | 30 +++---- localization/esx_mecanojob_sv.sql | 30 +++---- 7 files changed, 152 insertions(+), 131 deletions(-) diff --git a/__resource.lua b/__resource.lua index 8b44d660..78891252 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,22 +2,24 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Mecano Job' -version '1.0.0' +version '1.1.0' client_scripts { - '@es_extended/locale.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'config.lua', - 'client/main.lua' + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'locales/br.lua', + 'locales/sv.lua', + 'config.lua', + 'client/main.lua' } server_scripts { - '@es_extended/locale.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'config.lua', - 'server/main.lua' + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'locales/br.lua', + 'locales/sv.lua', + 'config.lua', + 'server/main.lua' } diff --git a/client/main.lua b/client/main.lua index 33e71e1e..9db24127 100644 --- a/client/main.lua +++ b/client/main.lua @@ -22,21 +22,25 @@ local TargetCoords = nil local CurrentlyTowedVehicle = nil local Blips = {} local NPCOnJob = false -local NPCTargetTowable = nil -local NPCTargetTowableZone = nil +local NPCTargetTowable = nil +local NPCTargetTowableZone = nil local NPCHasSpawnedTowable = false local NPCLastCancel = GetGameTimer() - 5 * 60000 local NPCHasBeenNextToTowable = false local NPCTargetDeleterZone = false +local IsDead = false ESX = nil GUI.Time = 0 Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end + + Citizen.Wait(5000) + PlayerData = ESX.GetPlayerData() end) function SelectRandomTowable() @@ -112,6 +116,7 @@ function OpenMecanoActionsMenu() 'default', GetCurrentResourceName(), 'mecano_actions', { title = _U('mechanic'), + align = 'top-left', elements = elements }, function(data, menu) @@ -174,6 +179,7 @@ function OpenMecanoActionsMenu() 'default', GetCurrentResourceName(), 'spawn_vehicle', { title = _U('service_vehicle'), + align = 'top-left', elements = elements }, function(data, menu) @@ -270,6 +276,7 @@ function OpenMecanoHarvestMenu() 'default', GetCurrentResourceName(), 'mecano_harvest', { title = _U('harvest'), + align = 'top-left', elements = elements }, function(data, menu) @@ -316,6 +323,7 @@ function OpenMecanoCraftMenu() 'default', GetCurrentResourceName(), 'mecano_craft', { title = _U('craft'), + align = 'top-left', elements = elements }, function(data, menu) @@ -355,6 +363,7 @@ function OpenMobileMecanoActionsMenu() 'default', GetCurrentResourceName(), 'mobile_mecano_actions', { title = _U('mechanic'), + align = 'top-left', elements = { {label = _U('billing'), value = 'billing'}, {label = _U('hijack'), value = 'hijack_vehicle'}, @@ -662,6 +671,7 @@ function OpenGetStocksMenu() 'default', GetCurrentResourceName(), 'stocks_menu', { title = _U('mechanic_stock'), + align = 'top-left', elements = elements }, function(data, menu) @@ -723,6 +733,7 @@ ESX.TriggerServerCallback('esx_mecanojob:getPlayerInventory', function(inventory 'default', GetCurrentResourceName(), 'stocks_menu', { title = _U('inventory'), + align = 'top-left', elements = elements }, function(data, menu) @@ -1190,11 +1201,11 @@ Citizen.CreateThread(function() end end - if IsControlJustReleased(0, Keys['F6']) and PlayerData.job ~= nil and PlayerData.job.name == 'mecano' then + if IsControlJustReleased(0, Keys['F6']) and not IsDead and PlayerData.job ~= nil and PlayerData.job.name == 'mecano' then OpenMobileMecanoActionsMenu() end - if IsControlJustReleased(0, Keys['DELETE']) and PlayerData.job ~= nil and PlayerData.job.name == 'mecano' then + if IsControlJustReleased(0, Keys['DELETE']) and not IsDead and PlayerData.job ~= nil and PlayerData.job.name == 'mecano' then if NPCOnJob then @@ -1221,3 +1232,11 @@ Citizen.CreateThread(function() end end) + +AddEventHandler('esx:onPlayerDeath', function() + IsDead = true +end) + +AddEventHandler('playerSpawned', function(spawn) + IsDead = false +end) \ No newline at end of file diff --git a/esx_mecanojob.sql b/esx_mecanojob.sql index 3e6459a1..d839578f 100644 --- a/esx_mecanojob.sql +++ b/esx_mecanojob.sql @@ -1,30 +1,30 @@ USE `essentialmode`; INSERT INTO `addon_account` (name, label, shared) VALUES - ('society_mecano','Mécano',1) + ('society_mecano', 'Mécano', 1) ; INSERT INTO `addon_inventory` (name, label, shared) VALUES - ('society_mecano','Mécano',1) + ('society_mecano', 'Mécano', 1) ; INSERT INTO `jobs` (name, label) VALUES - ('mecano','Mécano') + ('mecano', 'Mécano') ; INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES - ('mecano',0,'recrue','Recrue',12,'{}','{}'), - ('mecano',1,'novice','Novice',24,'{}','{}'), - ('mecano',2,'experimente','Experimente',36,'{}','{}'), - ('mecano',3,'chief','Chef d\'équipe',48,'{}','{}'), - ('mecano',4,'boss','Patron',0,'{}','{}') + ('mecano',0,'recrue','Recrue',12,'{}','{}'), + ('mecano',1,'novice','Novice',24,'{}','{}'), + ('mecano',2,'experimente','Experimente',36,'{}','{}'), + ('mecano',3,'chief','Chef d\'équipe',48,'{}','{}'), + ('mecano',4,'boss','Patron',0,'{}','{}') ; -INSERT INTO `items` (name, label) VALUES - ('gazbottle', 'bouteille de gaz'), - ('fixtool', 'outils réparation'), - ('carotool', 'outils carosserie'), - ('blowpipe', 'Chalumeaux'), - ('fixkit', 'Kit réparation'), - ('carokit', 'Kit carosserie') +INSERT INTO `items` (name, label, limit) VALUES + ('gazbottle', 'bouteille de gaz', 11), + ('fixtool', 'outils réparation', 6), + ('carotool', 'outils carosserie', 4), + ('blowpipe', 'Chalumeaux', 10), + ('fixkit', 'Kit réparation', 5), + ('carokit', 'Kit carosserie', 3) ; diff --git a/locales/br.lua b/locales/br.lua index cd935a5f..799b868e 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,4 +1,4 @@ -Locales['en'] = { +Locales['br'] = { ['mechanic'] = 'Mecânico', ['drive_to_indicated'] = '~y~Dirija~s~ para a localização indicada.', ['mission_canceled'] = 'Missão ~r~cancelada~s~', diff --git a/locales/sv.lua b/locales/sv.lua index fcafea0a..d617f0f0 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,82 +1,82 @@ Locales['sv'] = { ['mechanic'] = 'mekaniker', - ['drive_to_indicated'] = '~y~Kör~s~ till den angivna platsen.', - ['mission_canceled'] = 'Uppdrag ~r~avbrutet~s~', - ['fordon_list'] = 'fordons lista', + ['drive_to_indicated'] = 'Vänligen ~y~kör~s~ till den angivna platsen.', + ['mission_canceled'] = '~r~Uppdraget har avbrutits~s~', + ['vehicle_list'] = 'Fordon', ['work_wear'] = 'arbetskläder', - ['civ_wear'] = 'civil kläder', - ['deposit_stock'] = 'insättning fond', - ['withdraw_stock'] = 'annullera fond', - ['boss_actions'] = 'boss Actions', - ['service_fordon'] = 'service fordon', + ['civ_wear'] = 'civil klädsel', + ['deposit_stock'] = 'Sätt in objekt', + ['withdraw_stock'] = 'Ta ut objekt', + ['boss_actions'] = 'Chef meny', + ['service_vehicle'] = 'service fordon', ['flat_bed'] = 'flatbed', - ['tow_truck'] = 'tow Truck', - ['service_full'] = 'service fullt: ', - ['open_actions'] = 'tryck ~INPUT_CONTEXT~ för att öppna menyn.', - ['harvest'] = 'bärga', - ['harvest_menu'] = 'tryck ~INPUT_CONTEXT~ för att öppna bärningsmenyn.', - ['not_experienced_enough'] = 'du har inte tillräckligt med ~r~erfarenheter~s~ för att göra detta.', - ['gas_can'] = 'bensindunk', + ['tow_truck'] = 'bärgningsbil', + ['service_full'] = 'service full: ', + ['open_actions'] = 'Tryck ~INPUT_CONTEXT~ för att öppna menyn.', + ['harvest'] = 'skörda', + ['harvest_menu'] = 'Tryck ~INPUT_CONTEXT~ för att öppna menyn.', + ['not_experienced_enough'] = 'Du är inte ~r~erfaren nog~s~ att utföra uppgiften.', + ['gas_can'] = 'gasbehållare', ['repair_tools'] = 'reparationsverktyg', ['body_work_tools'] = 'karossverktyg', ['blowtorch'] = 'blåslampa', ['repair_kit'] = 'reparationssats', ['body_kit'] = 'kroppssats', ['craft'] = 'hantverk', - ['craft_menu'] = 'tryck ~INPUT_CONTEXT~ för att komma till hantverksmenyn.', + ['craft_menu'] = 'Tryck ~INPUT_CONTEXT~ för att öppna menyn.', ['billing'] = 'fakturering', ['hijack'] = 'kapa', ['repair'] = 'reparera', - ['clean'] = 'rengör', + ['clean'] = 'Tvätta', ['imp_veh'] = 'beslagta', - ['place_objects'] = 'placera Objekt', + ['place_objects'] = 'placera objekt', ['invoice_amount'] = 'fakturabelopp', ['amount_invalid'] = 'Ogiltigt belopp', - ['no_players_nearby'] = 'inga spelare nära', - ['vehicle_unlocked'] = 'fordon ~g~Olåst', - ['vehicle_repaired'] = 'fordon ~g~Reparerat', - ['vehicle_cleaned'] = 'fordon ~g~Rengjort', - ['vehicle_impounded'] = 'fordon ~r~Beslagtagit', - ['must_seat_driver'] = 'du måste sitta i ~r~förarsätet!', - ['must_near'] = 'du måste vara ~r~nära ett fordon~s~ för att beslagta.', - ['fordon_success_attached'] = 'fordon ~b~påkopplat~s~!.', - ['please_drop_off'] = 'vänligen släpp av fordonet hos bilförsäljaren', - ['cant_attach_own_tt'] = '~r~du kan inte~s~ koppla på din egna tow truck', - ['no_veh_att'] = 'det finns inget ~r~fordon~s~ att koppla på', - ['not_right_veh'] = 'detta är inte korrekt fordon', - ['veh_det_succ'] = 'fordon ~b~avkopplat~s~!', - ['imp_flatbed'] = '~r~Åtgärd omöjligt!~s~ Du behöver en ~b~Flatbed~s~ för att kunna göra detta', - ['objects'] = 'föremål', - ['roadcone'] = 'vägkon', + ['no_players_nearby'] = 'det finns inga spelare i närheten', + ['vehicle_unlocked'] = 'fordon ~g~olåst', + ['vehicle_repaired'] = 'fordon ~g~reparerade', + ['vehicle_cleaned'] = 'fordon ~g~rengöras', + ['vehicle_impounded'] = 'fordon ~r~beslaget', + ['must_seat_driver'] = 'du måste sitta i ~r~förarsätet!~s~', + ['must_near'] = 'du måste vara ~r~nära ett fordon~s~ för att beslagta det.', + ['vehicle_success_attached'] = 'fordonet är ~b~bundet~s~!', + ['please_drop_off'] = 'vänligen släpp av fordonet hos ~y~bilförsäljaren~s~', + ['cant_attach_own_tt'] = 'du kan ~r~inte~s~ binda din egna truck!', + ['no_veh_att'] = 'det finns inget ~r~fordon~s~ i närheten', + ['not_right_veh'] = 'detta är ~r~inte~s~ rätt fordon', + ['veh_det_succ'] = 'fordonet har ~b~lossnat~s~!', + ['imp_flatbed'] = '~r~Det går inte!~s~ Du måste ha en ~b~Flatbed~s~ för det!', + ['objects'] = 'objekt', + ['roadcone'] = 'kona', ['toolbox'] = 'verktygslåda', - ['mechanic_stock'] = 'mekaniker Fond', - ['quantity'] = 'mängd', - ['invalid_quantity'] = 'ogiltig mängd', + ['mechanic_stock'] = 'mekaniker lager', + ['quantity'] = 'kvantitet', + ['invalid_quantity'] = 'ogiltig kvantitet', ['inventory'] = 'förråd', - ['veh_unlocked'] = '~g~fordon Olåst', - ['hijack_failed'] = '~r~Kapning misslyckat', - ['body_repaired'] = '~g~Body reparerat', - ['veh_repaired'] = '~g~fordon reparerat', - ['veh_stored'] = 'tryck ~INPUT_CONTEXT~ för att spara fordon.', - ['tryck_remove_obj'] = 'tryck ~INPUT_CONTEXT~ för att ta bort föremål', - ['please_tow'] = 'vänligen ~y~bogsera~s~ fordonet', - ['wait_five'] = 'du måste ~r~vänta~s~ 5 minuter', - ['must_in_flatbed'] = 'du måste vara i en flatbed för att påbörja uppdraget', - ['mechanic_customer'] = 'mekaniker Kund', - ['you_do_not_room'] = '~r~Du har inte mer utrymme', - ['recovery_gas_can'] = '~b~Bensindunks~s~ hämtning...', - ['recovery_repair_tools'] = '~b~Reparationsverktygs~s~ hämtning...', - ['recovery_body_tools'] = '~b~Kroppsverktygs~s~ hämtning...', - ['not_enough_gas_can'] = 'Du har inte ~r~tillräckligt~s~ med bensindunkar.', - ['assembling_blowtorch'] = 'Monterar ~b~Blåslampa~s~...', - ['not_enough_repair_tools'] = 'Du har inte ~r~tillräckligt~s~ Reparationsverktyg.', - ['assembling_repair_kit'] = 'Monterar ~b~Reparationsverktyg~s~...', - ['not_enough_body_tools'] = 'Du har inte ~r~tillräckligt~s~ Kroppsverktyg.', - ['assembling_body_kit'] = 'Monterar ~b~Kroppsverktyg~s~...', - ['your_comp_earned'] = 'ditt företag har ~g~fått~s~ ~g~$', - ['you_used_blowtorch'] = 'du använde en ~b~Blåslampa', - ['you_used_repair_kit'] = 'du använde ~b~Reparationsverktyg', - ['you_used_body_kit'] = 'du använde ~b~Kroppsverktyg', - ['you_removed'] = 'du har tagit bort x', - ['you_added'] = 'du har lagt till x', -} + ['veh_unlocked'] = '~g~Fordon har låsts upp', + ['hijack_failed'] = '~r~Kapningen misslyckades', + ['body_repaired'] = '~g~Karossen har lagats', + ['veh_repaired'] = '~g~Fordonet har lagats', + ['veh_stored'] = 'tryck ~INPUT_CONTEXT~ för att förvara fordonet.', + ['press_remove_obj'] = 'tryck ~INPUT_CONTEXT~ för att ta bort objektet.', + ['please_tow'] = 'Vänligen ~y~bogsera~s~ fordonet', + ['wait_five'] = 'Du måste ~r~vänta~s~ 5 minuter', + ['must_in_flatbed'] = 'Du måste vara i en ~y~flatbed~s~ för att starta uppdraget', + ['mechanic_customer'] = 'mekaniker kund', + ['you_do_not_room'] = '~r~Du har inte mer plats', + ['recovery_gas_can'] = '~b~Gasbehållare~s~ återvinns...', + ['recovery_repair_tools'] = '~b~Reparationsverktyg~s~ återvinns...', + ['recovery_body_tools'] = '~b~Karossverktyg~s~ återvinns...', + ['not_enough_gas_can'] = 'Du har ~r~inte tillräckligt~s~ många gasbehållare!', + ['assembling_blowtorch'] = 'Tillverkar ~b~blåslampa~s~...', + ['not_enough_repair_tools'] = 'Du har ~r~inte tillräckligt~s~ många reparationsverktyg!', + ['assembling_repair_kit'] = 'Tillverkar ~b~reparationssats~s~...', + ['not_enough_body_tools'] = 'Du har ~r~inte tillräckligt~s~ många karossverktyg!', + ['assembling_body_kit'] = 'Tillverkar ~b~karossverktyg~s~...', + ['your_comp_earned'] = 'ditt företag har ~g~tjänat~s~ ~g~$', + ['you_used_blowtorch'] = 'du har använt en ~b~blåslampa~s~', + ['you_used_repair_kit'] = 'du har använt en ~b~reparationssats~s~', + ['you_used_body_kit'] = 'du har använt en ~b~karossverktyg~s~', + ['you_removed'] = 'du har ~r~tagit bort~s~ x', + ['you_added'] = 'du ~y~la till~s~ x' +} \ No newline at end of file diff --git a/localization/esx_mecanojob_en.sql b/localization/esx_mecanojob_en.sql index 31c457f2..8d223092 100644 --- a/localization/esx_mecanojob_en.sql +++ b/localization/esx_mecanojob_en.sql @@ -1,30 +1,30 @@ USE `essentialmode`; INSERT INTO `addon_account` (name, label, shared) VALUES - ('society_mecano','Mechanic',1) + ('society_mecano', 'Mechanic', 1) ; INSERT INTO `addon_inventory` (name, label, shared) VALUES - ('society_mecano','Mechanic',1) + ('society_mecano', 'Mechanic', 1) ; INSERT INTO `jobs` (name, label) VALUES - ('mecano','Mechanic') + ('mecano', 'Mechanic') ; INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES - ('mecano',0,'recrue','Recruit',12,'{}','{}'), - ('mecano',1,'novice','Novice',24,'{}','{}'), - ('mecano',2,'experimente','Experienced',36,'{}','{}'), - ('mecano',3,'chief','Leader',48,'{}','{}'), - ('mecano',4,'boss','Boss',0,'{}','{}') + ('mecano',0,'recrue','Recruit',12,'{}','{}'), + ('mecano',1,'novice','Novice',24,'{}','{}'), + ('mecano',2,'experimente','Experienced',36,'{}','{}'), + ('mecano',3,'chief','Leader',48,'{}','{}'), + ('mecano',4,'boss','Boss',0,'{}','{}') ; -INSERT INTO `items` (name, label) VALUES - ('gazbottle', 'Gas Bottle'), - ('fixtool', 'Repair Tools'), - ('carotool', 'Tools'), - ('blowpipe', 'Blowtorch'), - ('fixkit', 'Repair Kit'), - ('carokit', 'Body Kit') +INSERT INTO `items` (name, label, limit) VALUES + ('gazbottle', 'Gas Bottle', 11), + ('fixtool', 'Repair Tools', 6), + ('carotool', 'Tools', 4), + ('blowpipe', 'Blowtorch', 10), + ('fixkit', 'Repair Kit', 5), + ('carokit', 'Body Kit', 3) ; diff --git a/localization/esx_mecanojob_sv.sql b/localization/esx_mecanojob_sv.sql index 8c78e056..ad085adf 100644 --- a/localization/esx_mecanojob_sv.sql +++ b/localization/esx_mecanojob_sv.sql @@ -1,30 +1,30 @@ USE `essentialmode`; INSERT INTO `addon_account` (name, label, shared) VALUES - ('society_mecano','Mekaniker',1) + ('society_mecano', 'Mekaniker', 1) ; INSERT INTO `addon_inventory` (name, label, shared) VALUES - ('society_mecano','Mekaniker',1) + ('society_mecano', 'Mekaniker', 1) ; INSERT INTO `jobs` (name, label) VALUES - ('mecano','Mekaniker') + ('mecano', 'Mekaniker') ; INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES - ('mecano',0,'recrue','Rekryt',12,'{}','{}'), - ('mecano',1,'novice','Nyanställd',24,'{}','{}'), - ('mecano',2,'experimente','Erfaren',36,'{}','{}'), - ('mecano',3,'chief','Chef',48,'{}','{}'), - ('mecano',4,'boss','Bossen',0,'{}','{}') + ('mecano',0,'recrue','Rekryt',12,'{}','{}'), + ('mecano',1,'novice','Nyanställd',24,'{}','{}'), + ('mecano',2,'experimente','Erfaren',36,'{}','{}'), + ('mecano',3,'chief','Chef',48,'{}','{}'), + ('mecano',4,'boss','Ägare',0,'{}','{}') ; -INSERT INTO `items` (name, label) VALUES - ('gazbottle', 'Gas Flaska'), - ('fixtool', 'Reparationsverktyg'), - ('carotool', 'Verktyg'), - ('blowpipe', 'Blåslampa'), - ('fixkit', 'Reparationssats'), - ('carokit', 'Plåt Verktyg') +INSERT INTO `items` (name, label, limit) VALUES + ('gazbottle', 'Gas Flaska', 11), + ('fixtool', 'Reparationsverktyg', 6), + ('carotool', 'Verktyg', 4), + ('blowpipe', 'Blåslampa', 10), + ('fixkit', 'Reparationssats', 5), + ('carokit', 'Karosskit', 3) ;