diff --git a/client/esx_jobs_cl.lua b/client/esx_jobs_cl.lua index 9089c25a..ebfd4d1a 100644 --- a/client/esx_jobs_cl.lua +++ b/client/esx_jobs_cl.lua @@ -11,10 +11,8 @@ local Keys = { } local PlayerData = {} -local menuIsShowed = false -local hintIsShowed = false - - +local menuIsShowed = false +local hintIsShowed = false local hasAlreadyEnteredMarker = false local Blips = {} local JobBlips = {} @@ -30,19 +28,17 @@ local isInPublicMarker = false local newTask = false local hintToDisplay = "no hint to display" local jobDone = false -local onDuty = false -local moneyInBank = 0 - -local spawner = 0 +local onDuty = false +local moneyInBank = 0 +local spawner = 0 local myPlate = {} - local isJobVehicleDestroyed = false -local cautionVehicleInCaseofDrop = 0 +local cautionVehicleInCaseofDrop = 0 local maxCautionVehicleInCaseofDrop = 0 -local vehicleObjInCaseofDrop = nil -local vehicleInCaseofDrop = nil -local vehicleHashInCaseofDrop = nil +local vehicleObjInCaseofDrop = nil +local vehicleInCaseofDrop = nil +local vehicleHashInCaseofDrop = nil local vehicleMaxHealthInCaseofDrop = nil local vehicleOldHealthInCaseofDrop = nil @@ -173,7 +169,6 @@ AddEventHandler('esx_jobs:action', function(job, zone) SetEntityCoords(GetPlayerPed(-1), w.Teleport.x, w.Teleport.y, w.Teleport.z) end - TriggerEvent('esx_vehiclelock:updatePlayerCars', "remove", myPlate[i]) table.remove(myPlate, i) if vehicleObjInCaseofDrop.HasCaution then @@ -322,17 +317,10 @@ AddEventHandler('esx_jobs:spawnJobVehicle', function(spawnPoint, vehicle) SetNetworkIdCanMigrate(id, true) local platePrefix = "WORK" - for k,v in pairs(Config.Plates) do - if PlayerData.job.name == k then - platePrefix = v - end - end - plate = platePrefix .. plate SetVehicleNumberPlateText(veh, plate) table.insert(myPlate, plate) plate = string.gsub(plate, " ", "") - TriggerEvent('esx_vehiclelock:updatePlayerCars', "add", plate) SetVehRadioStation(veh, "OFF") TaskWarpPedIntoVehicle(playerPed, veh, -1) isJobVehicleDestroyed = false diff --git a/config.lua b/config.lua index c77115f2..a29ec8b8 100644 --- a/config.lua +++ b/config.lua @@ -1,45 +1,30 @@ Config = {} Config.DrawDistance = 100.0 Config.Locale = 'fr' - -Config.Plates = { - taxi = "TAXI", - fisherman = "FISH", - cop = "LSPD", - ambulance = "EMS", - depanneur = "MECA", - fuel = "FUEL", - lumberjack = "BUCH", - miner = "MINE", - reporter = "JOUR", - slaughterer = "ABAT", - textil = "COUT", -} - -Config.Jobs = {} +Config.Jobs = {} Config.PublicZones = { - EnterBuilding = { - Pos = { x = -118.213, y = -607.142, z = 35.280 }, - Size = { x = 3.0, y = 3.0, z = 0.2 }, - Color = { r = 204, g = 204, b = 0 }, - Marker = 1, - Blip = false, - Name = "Le Maclerait Libéré", - Type = "teleport", - Hint = "Appuyez sur ~INPUT_PICKUP~ pour entrer dans l'immeuble.", - Teleport = { x = -139.098, y = -620.748, z = 167.820 } - }, + EnterBuilding = { + Pos = { x = -118.21381378174, y = -607.14227294922, z = 35.280723571777 }, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = false, + Name = _U('reporter_name'), + Type = "teleport", + Hint = _U('public_enter'), + Teleport = { x = -139.09838867188, y = -620.74865722656, z = 167.82052612305 } + }, - ExitBuilding = { - Pos = { x = -139.458, y = -617.323, z = 167.820 }, - Size = { x = 3.0, y = 3.0, z = 0.2 }, - Color = { r = 204, g = 204, b = 0 }, - Marker = 1, - Blip = false, - Name = "Le Maclerait Libéré", - Type = "teleport", - Hint = "Appuyez sur ~INPUT_PICKUP~ pour aller à l'entrée de l'immeuble.", - Teleport = { x = -113.07, y = -604.93, z = 35.28 }, - }, + ExitBuilding = { + Pos = { x = -139.45831298828, y = -617.32312011719, z = 167.82052612305 }, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = false, + Name = _U('reporter_name'), + Type = "teleport", + Hint = _U('public_leave'), + Teleport = { x = -113.07, y = -604.93, z = 35.28 }, + }, } diff --git a/esx_jobs.sql b/esx_jobs.sql index 86e17c43..dfe8c454 100644 --- a/esx_jobs.sql +++ b/esx_jobs.sql @@ -24,24 +24,24 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_ ('slaughterer',0,'interim','Intérimaire',0,'{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":67,\"pants_1\":36,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":0,\"torso_1\":56,\"beard_2\":6,\"shoes_1\":12,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":15,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":0,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}','{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":72,\"pants_1\":45,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":1,\"torso_1\":49,\"beard_2\":6,\"shoes_1\":24,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":9,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":5,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}') ; -INSERT INTO `items` (`name`, `label`) VALUES - ('alive_chicken', 'Poulet vivant'), - ('slaughtered_chicken', 'Poulet abattu'), - ('packaged_chicken', 'Poulet en barquette'), - ('fish', 'Poisson'), - ('stone', 'Pierre'), - ('washed_stone', 'Pierre Lavée'), - ('copper', 'Cuivre'), - ('iron', 'Fer'), - ('gold', 'Or'), - ('diamond', 'Diamant'), - ('wood', 'Bois'), - ('cutted_wood', 'Bois coupé'), - ('packaged_plank', 'Paquet de planches'), - ('petrol', 'Pétrole'), - ('petrol_raffin', 'Pétrole Raffiné'), - ('essence', 'Essence'), - ('whool', 'Laine'), - ('fabric', 'Tissu'), - ('clothe', 'Vêtement') +INSERT INTO `items` (`name`, `label`, `limit`) VALUES + ('alive_chicken', 'Poulet vivant', 20), + ('slaughtered_chicken', 'Poulet abattu', 20), + ('packaged_chicken', 'Poulet en barquette', 100), + ('fish', 'Poisson', 100), + ('stone', 'Pierre', 7), + ('washed_stone', 'Pierre Lavée', 7), + ('copper', 'Cuivre', 56), + ('iron', 'Fer', 42), + ('gold', 'Or', 21), + ('diamond', 'Diamant', 50), + ('wood', 'Bois', 20), + ('cutted_wood', 'Bois coupé', 20), + ('packaged_plank', 'Paquet de planches', 100), + ('petrol', 'Pétrole', 24), + ('petrol_raffin', 'Pétrole Raffiné', 24), + ('essence', 'Essence', 24), + ('whool', 'Laine', 40), + ('fabric', 'Tissu', 80), + ('clothe', 'Vêtement', 40) ; diff --git a/locales/br.lua b/locales/br.lua index 80ab53c3..317b277d 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -26,6 +26,8 @@ Locales['br'] = { ['return_vh_button'] = 'pressione ~INPUT_PICKUP~ para devolver o veiculo.', ['delivery_point'] = 'ponto de entrega', ['delivery'] = 'Entrega', + ['public_enter'] = 'pressione ~INPUT_PICKUP~ para entrar no prédio.', + ['public_leave'] = 'pressione ~INPUT_PICKUP~ para ir à entrada do edifício.', -- Trabalho de Lenhador ['lj_locker_room'] = "Vestiario Lenhador", diff --git a/locales/de.lua b/locales/de.lua index 1246ed84..1dfa6672 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,6 +1,6 @@ Locales['de'] = { -- Global menus - ['bank_deposit'] = 'eine Kaution von ~g~', + ['bank_deposit_g'] = 'eine Kaution von ~g~', ['bank_deposit_r'] = 'eine Kaution von ~g~$', ['bank_deposit2'] = '$ ~s~wurde nach deiner Ohmacht getätigt.', ['foot_work'] = 'du musst zu Fuß sein um arbeiten zu können.', @@ -14,6 +14,9 @@ Locales['de'] = { ['not_enough2'] = ' umd die Aktion fortzuführen.', ['caution_taken'] = ' ~s~wurde von dir abgezogen.', ['caution_returned'] = ' ~s~wurde dir zurück gegeben.', + ['public_enter'] = 'drücke ~INPUT_PICKUP~ um das Gebäude zu betreten.', + ['public_leave'] = 'drücke ~INPUT_PICKUP~ um das Gebäude zu verlassen.', + ['reporter_name'] = 'arbeitsamt', -- Lumber Jack job ['lj_cr_title'] = 'Garderobe', diff --git a/locales/en.lua b/locales/en.lua index 095b66cf..387d4b54 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -9,7 +9,7 @@ Locales['en'] = { ['bank_deposit2'] = '$ ~s~was made to you after your fainting.', ['foot_work'] = 'you have to be on foot to be able to work.', ['next_point'] = 'go to the next step after completing this one.', - ['security_deposit'] = 'the security given will be ~g~$', + ['security_deposit'] = 'you will be given ~g~$', ['not_your_vehicle'] = "this is not your vehicle or you must be a driver.", ['in_vehicle'] = 'you must be in a vehicle.', ['wrong_point'] = "you are not at the right point of delivery.", @@ -26,6 +26,8 @@ Locales['en'] = { ['return_vh_button'] = 'press ~INPUT_PICKUP~ to return the vehicle.', ['delivery_point'] = 'delivery point', ['delivery'] = 'delivery', + ['public_enter'] = 'press ~INPUT_PICKUP~ to enter the building.', + ['public_leave'] = 'press ~INPUT_PICKUP~ to go to the entrance of the building.', -- Lumber Jack job ['lj_locker_room'] = "lumberjack's Locker Room", @@ -67,22 +69,22 @@ Locales['en'] = { -- Miner ['m_miner_locker'] = "miner's Locker Room", - ['m_rock'] = ' rock', + ['m_rock'] = 'rock', ['m_pickrocks'] = 'press ~INPUT_PICKUP~ to retrieve rocks.', - ['m_washrock'] = ' washed rocks ', + ['m_washrock'] = 'rock Washing', ['m_rock_button'] = 'press ~INPUT_PICKUP~ to wash the rocks.', - ['m_rock_smelting'] = 'smelthing', - ['m_copper'] = ' copper', - ['m_sell_copper'] = 'sell copper', + ['m_rock_smelting'] = 'rock Smelting', + ['m_copper'] = 'copper', + ['m_sell_copper'] = 'copper Seller', ['m_deliver_copper'] = 'Press ~INPUT_PICKUP~ to deliver the copper.', - ['m_iron'] = ' iron', - ['m_sell_iron'] = 'sell iron', + ['m_iron'] = 'iron', + ['m_sell_iron'] = 'iron Seller', ['m_deliver_iron'] = 'press ~INPUT_PICKUP~ to deliver the iron.', - ['m_gold'] = ' gold', - ['m_sell_gold'] = "sell gold", + ['m_gold'] = 'gold', + ['m_sell_gold'] = "gold Seller", ['m_deliver_gold'] = 'press ~INPUT_PICKUP~ to deliver the gold.', - ['m_diamond'] = ' diamond', - ['m_sell_diamond'] = 'sell diamond', + ['m_diamond'] = 'diamond', + ['m_sell_diamond'] = 'diamond Seller', ['m_deliver_diamond'] = 'press ~INPUT_PICKUP~ to deliver the diamonds.', ['m_melt_button'] = 'press ~INPUT_PICKUP~ to melt the rocks.', diff --git a/locales/fr.lua b/locales/fr.lua index 442377fb..221bf9e6 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -4,7 +4,7 @@ Locales['fr'] = { ['cloak_change'] = 'appuyez sur ~INPUT_PICKUP~ pour vous changer.', ['citizen_wear'] = 'tenue civile', ['job_wear'] = 'tenue de travail', - ['bank_deposit'] = 'une caution de ~g~', + ['bank_deposit_g'] = 'une caution de ~g~', ['bank_deposit_r'] = 'une caution de ~g~$', ['bank_deposit2'] = '$ ~s~vous a été rendue suite à votre évanouissment.', ['foot_work'] = 'vous devez être à pied pour pouvoir travailler.', @@ -26,6 +26,8 @@ Locales['fr'] = { ['return_vh_button'] = 'appuyez sur ~INPUT_PICKUP~ pour rendre le véhicule.', ['delivery_point'] = 'point de livraison', ['delivery'] = 'livraison', + ['public_enter'] = 'appuyez sur ~INPUT_PICKUP~ pour entrer dans l\'immeuble.', + ['public_leave'] = 'appuyez sur ~INPUT_PICKUP~ pour aller à l\'entrée de l\'immeuble.', -- Lumber Jack job ['lj_locker_room'] = "lumberjack's Locker Room", diff --git a/locales/sv.lua b/locales/sv.lua index 5d8564cb..2e180b29 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -23,9 +23,11 @@ Locales['sv'] = { ['spawn_truck_button'] = 'tryck ~INPUT_PICKUP~ för att spawna bilen.', ['service_vh'] = 'service vehicle', ['return_vh'] = 'vehicle return', - ['return_vh_button'] = 'tryck ~INPUT_PICKUP~ to return the vehicle.', + ['return_vh_button'] = 'tryck ~INPUT_PICKUP~ för att ge tillbaka fordonet.', ['delivery_point'] = 'delivery point', ['delivery'] = 'delivery', + ['public_enter'] = 'tryck ~INPUT_PICKUP~ för att gå in i byggnaden.', + ['public_leave'] = 'tryck ~INPUT_PICKUP~ för att lämna byggnaden.', -- Lumber Jack job ['lj_locker_room'] = "Skogshuggare omklädningsrum", @@ -38,7 +40,7 @@ Locales['sv'] = { ['lj_planks'] = 'brädpaket', ['lj_cutwood'] = 'hugg trä', ['lj_pick_boards'] = 'tryck ~INPUT_PICKUP~ för att hämta brädorna.', - ['lj_deliver_button'] = 'tryck ~INPUT_PICKUP~ för att leverera brädorna.', + ['lj_deliver_button'] = 'tryck ~INPUT_PICKUP~ för att sälja brädorna.', -- Fisherman ['fm_fish_locker'] = "Fiskarens Omklädningsrum", @@ -50,7 +52,7 @@ Locales['sv'] = { ['fm_boat_title'] = 'båt', ['fm_boat_return_title'] = 'boat return', ['fm_boat_return_button'] = 'tryck ~INPUT_PICKUP~ för att återvända båten.', - ['fm_deliver_fish'] = 'tryck ~INPUT_PICKUP~ för att leverera fisken.', + ['fm_deliver_fish'] = 'tryck ~INPUT_PICKUP~ för att sälja fisk.', -- Fuel ['f_oil_refiner'] = 'Oljeraffinaderi Omklädningsrum', @@ -63,31 +65,31 @@ Locales['sv'] = { ['f_gas'] = 'gas', ['f_fuel_mixture_button'] = 'tryck ~INPUT_PICKUP~ för att mixa', ['f_deliver_gas'] = 'deliver Gas', - ['f_deliver_gas_button'] = "tryck ~INPUT_PICKUP~ för att leverera bensin", + ['f_deliver_gas_button'] = "tryck ~INPUT_PICKUP~ för att sälja bensin", -- Miner ['m_miner_locker'] = "Gruvarbetarnas Omklädningsrum", - ['m_rock'] = ' sten', + ['m_rock'] = 'sten', ['m_pickrocks'] = 'tryck ~INPUT_PICKUP~ för att hämta sten.', - ['m_washrock'] = ' tvättad sten ', - ['m_rock_button'] = 'tryck ~INPUT_PICKUP~ för att tvätta stenarna.', - ['m_rock_smelting'] = 'smälter', - ['m_copper'] = ' coppar', - ['m_sell_copper'] = 'sälj coppar', - ['m_deliver_copper'] = 'tryck ~INPUT_PICKUP~ för att leverera coppar.', - ['m_iron'] = ' järn', - ['m_sell_iron'] = 'sälj järn', - ['m_deliver_iron'] = 'tryck ~INPUT_PICKUP~ för att leverera järn.', - ['m_gold'] = ' guld', - ['m_sell_gold'] = "sälj guld", - ['m_deliver_gold'] = 'tryck ~INPUT_PICKUP~ för att leverera guld.', - ['m_diamond'] = ' diamant', - ['m_sell_diamond'] = 'sälj diamant', - ['m_deliver_diamond'] = 'tryck ~INPUT_PICKUP~ för att leverera diamant.', - ['m_melt_button'] = 'tryck ~INPUT_PICKUP~ för att smälta stenen.', + ['m_washrock'] = 'sten tvättning', + ['m_rock_button'] = 'tryck ~INPUT_PICKUP~ för att tvätta sten.', + ['m_rock_smelting'] = 'stensmältning', + ['m_copper'] = 'koppar', + ['m_sell_copper'] = 'kopparsäljare', + ['m_deliver_copper'] = 'tryck ~INPUT_PICKUP~ för att sälja koppar.', + ['m_iron'] = 'järn', + ['m_sell_iron'] = 'järnsäljare', + ['m_deliver_iron'] = 'tryck ~INPUT_PICKUP~ för att sälja järn.', + ['m_gold'] = 'guld', + ['m_sell_gold'] = "guldsäljare", + ['m_deliver_gold'] = 'tryck ~INPUT_PICKUP~ för att sälja guld.', + ['m_diamond'] = 'diamant', + ['m_sell_diamond'] = 'diamantsäljare', + ['m_deliver_diamond'] = 'tryck ~INPUT_PICKUP~ för att sälja diamant.', + ['m_melt_button'] = 'tryck ~INPUT_PICKUP~ för att smälta sten.', -- Reporter - ['reporter_name'] = 'Dala City Times', + ['reporter_name'] = 'Aftonbladet', ['reporter_garage'] = 'tryck ~INPUT_PICKUP~ för att gå ner till garaget.', -- Slaughterer @@ -102,7 +104,7 @@ Locales['sv'] = { ['s_packagechicken'] = 'kyckling i förpackning', ['s_unpackaged'] = 'kyckling väntar på att förpackas', ['s_unpackaged_button'] = 'tryck ~INPUT_PICKUP~ för att förpacka kycklingen.', - ['s_deliver'] = 'tryck ~INPUT_PICKUP~ för att leverera kycklingsförpackningen.', + ['s_deliver'] = 'tryck ~INPUT_PICKUP~ för att sälja kycklingsförpackningen.', -- Dress Designer ['dd_dress_locker'] = "Klädesdesigners Omklädningsrum", @@ -112,5 +114,5 @@ Locales['sv'] = { ['dd_makefabric'] = 'tryck ~INPUT_PICKUP~ för att göra tyg.', ['dd_clothing'] = 'kläder', ['dd_makeclothing'] = 'tryck ~INPUT_PICKUP~ för att hämta kläder.', - ['dd_deliver_clothes'] = 'tryck ~INPUT_PICKUP~ för att leverera kläder.', + ['dd_deliver_clothes'] = 'tryck ~INPUT_PICKUP~ för att sälja kläder.', } diff --git a/localization/br_config.lua b/localization/br_config.lua deleted file mode 100644 index 1e7298af..00000000 --- a/localization/br_config.lua +++ /dev/null @@ -1,41 +0,0 @@ -Config = {} -Config.DrawDistance = 100.0 -Config.Locale = 'br' - -Config.Plates = { - fisherman = "PESCA", - fueler = "REFINA", - lumberjack = "LENHA", - miner = "MINE", - reporter = "JORN", - slaughterer = "ABAT", - tailor = "COST" -} - -Config.Jobs = {} - -Config.PublicZones = { - EnterBuilding = { - Pos = { x = -118.21381378174, y = -607.14227294922, z = 35.280723571777 }, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = "Globo News", - Type = "teleport", - Hint = "Pressione ~INPUT_PICKUP~ para entrar no prédio.", - Teleport = { x = -139.09838867188, y = -620.74865722656, z = 167.82052612305 } - }, - - ExitBuilding = { - Pos = { x = -139.45831298828, y = -617.32312011719, z = 167.82052612305 }, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = "Globo News", - Type = "teleport", - Hint = "pressione ~INPUT_PICKUP~ para ir à entrada do edifício.", - Teleport = { x = -113.07, y = -604.93, z = 35.28 }, - }, -} diff --git a/localization/br_esx_jobs.sql b/localization/br_esx_jobs.sql index a9e5cf0f..1996283e 100644 --- a/localization/br_esx_jobs.sql +++ b/localization/br_esx_jobs.sql @@ -19,29 +19,29 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_ ('fisherman', 0, 'interim', 'Temporario', 0, '{}', '{}'), ('fueler', 0, 'interim', 'Temporario', 0, '{}', '{}'), ('reporter', 0, 'employee', 'Temporario', 0, '{}', '{}'), - ('tailor', 0,'interim','Temporario',0,'{\"mask_1\":0,\"arms\":1,\"glasses_1\":0,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":0,\"torso_1\":24,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":0,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":0,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":36,\"tshirt_2\":0,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":48,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}','{\"mask_1\":0,\"arms\":5,\"glasses_1\":5,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":1,\"torso_1\":52,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":1,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":23,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":42,\"tshirt_2\":4,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":36,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}'), + ('tailor', 0, 'interim','Temporario',0,'{\"mask_1\":0,\"arms\":1,\"glasses_1\":0,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":0,\"torso_1\":24,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":0,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":0,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":36,\"tshirt_2\":0,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":48,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}','{\"mask_1\":0,\"arms\":5,\"glasses_1\":5,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":1,\"torso_1\":52,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":1,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":23,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":42,\"tshirt_2\":4,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":36,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}'), ('miner', 0, 'interim', 'Temporario', 0, '{"tshirt_2":1,"ears_1":8,"glasses_1":15,"torso_2":0,"ears_2":2,"glasses_2":3,"shoes_2":1,"pants_1":75,"shoes_1":51,"bags_1":0,"helmet_2":0,"pants_2":7,"torso_1":71,"tshirt_1":59,"arms":2,"bags_2":0,"helmet_1":0}', '{}'), ('slaughterer',0,'interim','Temporario',0,'{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":67,\"pants_1\":36,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":0,\"torso_1\":56,\"beard_2\":6,\"shoes_1\":12,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":15,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":0,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}','{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":72,\"pants_1\":45,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":1,\"torso_1\":49,\"beard_2\":6,\"shoes_1\":24,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":9,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":5,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}') ; INSERT INTO `items` (`name`, `label`) VALUES - ('alive_chicken', 'Frango Vivo'), - ('slaughtered_chicken', 'Frango Abatido'), - ('packaged_chicken', 'Frango na Bandeja'), - ('fish', 'Peixe'), - ('stone', 'Pedra'), - ('washed_stone', 'Pedra Limpa'), - ('copper', 'Cobre'), - ('iron', 'Ferro'), - ('gold', 'Ouro'), - ('diamond', 'Diamante'), - ('wood', 'Madeira'), - ('cutted_wood', 'Madeira Cortada'), - ('packaged_plank', 'Tábua Embalada'), - ('petrol', 'Petroleo'), - ('petrol_raffin', 'Petroleo Refinado'), - ('essence', 'Gasolina'), - ('whool', 'Lã'), - ('fabric', 'Tecido'), - ('clothe', 'Roupa') + ('alive_chicken', 'Frango Vivo', 20), + ('slaughtered_chicken', 'Frango Abatido', 20), + ('packaged_chicken', 'Frango na Bandeja', 100), + ('fish', 'Peixe', 100), + ('stone', 'Pedra', 7), + ('washed_stone', 'Pedra Limpa', 7), + ('copper', 'Cobre', 56), + ('iron', 'Ferro', 42), + ('gold', 'Ouro', 21), + ('diamond', 'Diamante', 50), + ('wood', 'Madeira', 20), + ('cutted_wood', 'Madeira Cortada', 20), + ('packaged_plank', 'Tábua Embalada', 100), + ('petrol', 'Petroleo', 24), + ('petrol_raffin', 'Petroleo Refinado', 24), + ('essence', 'Gasolina', 24), + ('whool', 'Lã', 40), + ('fabric', 'Tecido', 80), + ('clothe', 'Roupa', 40) ; diff --git a/localization/de_config.lua b/localization/de_config.lua deleted file mode 100644 index 2a752002..00000000 --- a/localization/de_config.lua +++ /dev/null @@ -1,41 +0,0 @@ -Config = {} -Config.DrawDistance = 100.0 -Config.Locale = 'de' - -Config.Plates = { - fisherman = "FISH", - fueler = "FUEL", - lumberjack = "BUCH", - miner = "MINE", - reporter = "JOUR", - slaughterer = "ABAT", - tailor = "COUT" -} - -Config.Jobs = {} - -Config.PublicZones = { - EnterBuilding = { - Pos = { x = -118.21381378174, y = -607.14227294922, z = 35.280723571777 }, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = "Arbeitsamt", - Type = "teleport", - Hint = "Drücke ~INPUT_PICKUP~ um das Gebäude zu betreten.", - Teleport = { x = -139.09838867188, y = -620.74865722656, z = 167.82052612305 } - }, - - ExitBuilding = { - Pos = { x = -139.45831298828, y = -617.32312011719, z = 167.82052612305 }, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = "Arbeitsamt", - Type = "teleport", - Hint = "Drücke ~INPUT_PICKUP~ um das Gebäude zu verlassen.", - Teleport = { x = -113.07, y = -604.93, z = 35.28 }, - }, -} diff --git a/localization/de_esx_jobs.sql b/localization/de_esx_jobs.sql index 48f86392..1ef47825 100644 --- a/localization/de_esx_jobs.sql +++ b/localization/de_esx_jobs.sql @@ -24,24 +24,24 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_ ('slaughterer', 0, 'interim', 'Mitarbeiter', 0,'{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":67,\"pants_1\":36,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":0,\"torso_1\":56,\"beard_2\":6,\"shoes_1\":12,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":15,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":0,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}','{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":72,\"pants_1\":45,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":1,\"torso_1\":49,\"beard_2\":6,\"shoes_1\":24,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":9,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":5,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}') ; -INSERT INTO `items` (`name`, `label`) VALUES - ('alive_chicken', 'lebendes Huhn'), - ('slaughtered_chicken', 'geschlachtetes Huhn'), - ('packaged_chicken', 'Hähnchenfilet'), - ('fish', 'Fisch'), - ('stone', 'Felsbrocken'), - ('washed_stone', 'gewaschener Felsbrocken'), - ('copper', 'Kupfer'), - ('iron', 'Eisen'), - ('gold', 'Gold'), - ('diamond', 'Diamant'), - ('wood', 'Holz'), - ('cutted_wood', 'Holzstämme'), - ('packaged_plank', 'Bretterpaket'), - ('petrol', 'Öl'), - ('petrol_raffin', 'bearbeitetes Öl'), - ('essence', 'Benzin'), - ('whool', 'Wolle'), - ('fabric', 'Tuch'), - ('clothe', 'Kleidung') +INSERT INTO `items` (`name`, `label`, `limit`) VALUES + ('alive_chicken', 'lebendes Huhn', 20), + ('slaughtered_chicken', 'geschlachtetes Huhn', 20), + ('packaged_chicken', 'Hähnchenfilet', 100), + ('fish', 'Fisch', 100), + ('stone', 'Felsbrocken', 7), + ('washed_stone', 'gewaschener Felsbrocken', 7), + ('copper', 'Kupfer', 56), + ('iron', 'Eisen', 42), + ('gold', 'Gold', 21), + ('diamond', 'Diamant', 50), + ('wood', 'Holz', 20), + ('cutted_wood', 'Holzstämme', 20), + ('packaged_plank', 'Bretterpaket', 100), + ('petrol', 'Öl', 24), + ('petrol_raffin', 'bearbeitetes Öl', 24), + ('essence', 'Benzin', 24), + ('whool', 'Wolle', 40), + ('fabric', 'Tuch', 80), + ('clothe', 'Kleidung', 40) ; diff --git a/localization/en_config.lua b/localization/en_config.lua deleted file mode 100644 index 32b30f8f..00000000 --- a/localization/en_config.lua +++ /dev/null @@ -1,41 +0,0 @@ -Config = {} -Config.DrawDistance = 100.0 -Config.Locale = 'en' - -Config.Plates = { - fisherman = "FISH", - fueler = "FUEL", - lumberjack = "BUCH", - miner = "MINE", - reporter = "JOUR", - slaughterer = "ABAT", - tailor = "COUT" -} - -Config.Jobs = {} - -Config.PublicZones = { - EnterBuilding = { - Pos = { x = -118.21381378174, y = -607.14227294922, z = 35.280723571777 }, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = "San Andreas Times", - Type = "teleport", - Hint = "Press ~INPUT_PICKUP~ to enter the building.", - Teleport = { x = -139.09838867188, y = -620.74865722656, z = 167.82052612305 } - }, - - ExitBuilding = { - Pos = { x = -139.45831298828, y = -617.32312011719, z = 167.82052612305 }, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = "San Andreas Times", - Type = "teleport", - Hint = "Press ~INPUT_PICKUP~ to go to the entrance of the building.", - Teleport = { x = -113.07, y = -604.93, z = 35.28 }, - }, -} diff --git a/localization/en_esx_jobs.sql b/localization/en_esx_jobs.sql index 13a17760..f36f3185 100644 --- a/localization/en_esx_jobs.sql +++ b/localization/en_esx_jobs.sql @@ -24,24 +24,24 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_ ('slaughterer', 0, 'interim', 'Employee', 0, '{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":67,\"pants_1\":36,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":0,\"torso_1\":56,\"beard_2\":6,\"shoes_1\":12,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":15,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":0,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}','{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":72,\"pants_1\":45,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":1,\"torso_1\":49,\"beard_2\":6,\"shoes_1\":24,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":9,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":5,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}') ; -INSERT INTO `items` (`name`, `label`) VALUES - ('alive_chicken', 'living chicken'), - ('slaughtered_chicken', 'slaughtered chicken'), - ('packaged_chicken', 'chicken fillet'), - ('fish', 'fish'), - ('stone', 'stone'), - ('washed_stone', 'washed stone'), - ('copper', 'copper'), - ('iron', 'iron'), - ('gold', 'gold'), - ('diamond', 'diamond'), - ('wood', 'wood'), - ('cutted_wood', 'cut wood'), - ('packaged_plank', 'packaged wood'), - ('petrol', 'oil'), - ('petrol_raffin', 'processed oil'), - ('essence', 'gas'), - ('whool', 'wool'), - ('fabric', 'fabric'), - ('clothe', 'cloth') +INSERT INTO `items` (`name`, `label`, `limit`) VALUES + ('alive_chicken', 'living chicken', 20), + ('slaughtered_chicken', 'slaughtered chicken', 20), + ('packaged_chicken', 'chicken fillet', 100), + ('fish', 'fish', 100), + ('stone', 'stone', 7), + ('washed_stone', 'washed stone', 7), + ('copper', 'copper', 56), + ('iron', 'iron', 42), + ('gold', 'gold', 21), + ('diamond', 'diamond', 50), + ('wood', 'wood', 20), + ('cutted_wood', 'cut wood', 20), + ('packaged_plank', 'packaged wood', 100), + ('petrol', 'oil', 24), + ('petrol_raffin', 'processed oil', 24), + ('essence', 'gas', 24), + ('whool', 'wool', 40), + ('fabric', 'fabric', 80), + ('clothe', 'cloth', 40) ; diff --git a/localization/sv_config.lua b/localization/sv_config.lua deleted file mode 100644 index ff0df242..00000000 --- a/localization/sv_config.lua +++ /dev/null @@ -1,41 +0,0 @@ -Config = {} -Config.DrawDistance = 100.0 -Config.Locale = 'sv' - -Config.Plates = { - fisherman = "FISK", - fueler = "FUEL", - lumberjack = "LUMB", - miner = "GRUV", - reporter = "TV4", - slaughterer = "SLAK", - tailor = "KLÄD" -} - -Config.Jobs = {} - -Config.PublicZones = { - EnterBuilding = { - Pos = { x = -118.21381378174, y = -607.14227294922, z = 35.280723571777 }, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = "San Andreas Times", - Type = "teleport", - Hint = "Tryck ~INPUT_PICKUP~ för att gå in i byggnaden.", - Teleport = { x = -139.09838867188, y = -620.74865722656, z = 167.82052612305 } - }, - - ExitBuilding = { - Pos = { x = -139.45831298828, y = -617.32312011719, z = 167.82052612305 }, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = "San Andreas Times", - Type = "teleport", - Hint = "Tryck ~INPUT_PICKUP~ för att gå till ingången till byggnaden.", - Teleport = { x = -113.07, y = -604.93, z = 35.28 }, - }, -} diff --git a/localization/sv_esx_jobs.sql b/localization/sv_esx_jobs.sql index b12892f3..4853ee34 100644 --- a/localization/sv_esx_jobs.sql +++ b/localization/sv_esx_jobs.sql @@ -24,24 +24,24 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_ ('slaughterer', 0, 'interim', 'Anställd', 0, '{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":67,\"pants_1\":36,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":0,\"torso_1\":56,\"beard_2\":6,\"shoes_1\":12,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":15,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":0,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}','{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":72,\"pants_1\":45,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":1,\"torso_1\":49,\"beard_2\":6,\"shoes_1\":24,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":9,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":5,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}') ; -INSERT INTO `items` (`name`, `label`) VALUES - ('alive_chicken', 'levande kyckling'), - ('slaughtered_chicken', 'slaktad kyckling'), - ('packaged_chicken', 'paketerad kyckling'), - ('fish', 'fisk'), - ('stone', 'sten'), - ('washed_stone', 'tvättad sten'), - ('copper', 'coppar'), - ('iron', 'järn'), - ('gold', 'guld'), - ('diamond', 'diamant'), - ('wood', 'trä'), - ('cutted_wood', 'sågat trä'), - ('packaged_plank', 'paketerad trä'), - ('petrol', 'olja'), - ('petrol_raffin', 'bearbetad olja'), - ('essence', 'gas'), - ('whool', 'ull'), - ('fabric', 'tyg'), - ('clothe', 'kläde') +INSERT INTO `items` (`name`, `label`, `limit`) VALUES + ('alive_chicken', 'levande kyckling', 20), + ('slaughtered_chicken', 'slaktad kyckling', 20), + ('packaged_chicken', 'paketerad kyckling', 100), + ('fish', 'fisk', 100), + ('stone', 'sten', 7), + ('washed_stone', 'tvättad sten', 7), + ('copper', 'coppar', 56), + ('iron', 'järn', 42), + ('gold', 'guld', 21), + ('diamond', 'diamant', 50), + ('wood', 'trä', 20), + ('cutted_wood', 'sågat trä', 20), + ('packaged_plank', 'paketerad trä', 100), + ('petrol', 'olja', 24), + ('petrol_raffin', 'bearbetad olja', 24), + ('essence', 'gas', 24), + ('whool', 'ull', 40), + ('fabric', 'tyg', 80), + ('clothe', 'kläde', 40) ; diff --git a/server/esx_jobs_sv.lua b/server/esx_jobs_sv.lua index 5e70cad7..6109fbd0 100644 --- a/server/esx_jobs_sv.lua +++ b/server/esx_jobs_sv.lua @@ -47,6 +47,9 @@ local function Work(source, item) if PlayersWorking[source] == true then local xPlayer = ESX.GetPlayerFromId(source) + if xPlayer == nil then + return + end for i=1, #item, 1 do local itemQtty = 0