From 5c191995f7ffccab01e0600191661579991f4da9 Mon Sep 17 00:00:00 2001 From: Ffrankys <44752471+Ffrankys@users.noreply.github.com> Date: Fri, 15 Mar 2019 22:39:11 +0100 Subject: [PATCH 01/17] Update de_esx_jobs.sql --- localization/de_esx_jobs.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/de_esx_jobs.sql b/localization/de_esx_jobs.sql index 2e68f197..9ea10827 100644 --- a/localization/de_esx_jobs.sql +++ b/localization/de_esx_jobs.sql @@ -41,7 +41,7 @@ INSERT INTO `items` (`name`, `label`, `limit`) VALUES ('petrol', 'Öl', 24), ('petrol_raffin', 'bearbeitetes Öl', 24), ('essence', 'Benzin', 24), - ('whool', 'Wolle', 40), + ('wool', 'Wolle', 40), ('fabric', 'Tuch', 80), ('clothe', 'Kleidung', 40) ; From 935f54c8e3b651b9cf193fa15414371e9de1103b Mon Sep 17 00:00:00 2001 From: rex2630 Date: Wed, 13 Nov 2019 16:57:03 +0100 Subject: [PATCH 02/17] Support for new ESX --- server/main.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/main.lua b/server/main.lua index cded8b57..b383a65b 100644 --- a/server/main.lua +++ b/server/main.lua @@ -26,9 +26,9 @@ local function Work(source, item) end if item[i].name ~= _U('delivery') and itemQtty >= item[i].max then - TriggerClientEvent('esx:showNotification', source, _U('max_limit', item[i].name)) + xPlayer.showNotification(_U('max_limit', item[i].name)) elseif item[i].requires ~= "nothing" and requiredItemQtty <= 0 then - TriggerClientEvent('esx:showNotification', source, _U('not_enough', item[1].requires_name)) + xPlayer.showNotification(_U('not_enough', item[1].requires_name)) else if item[i].name ~= _U('delivery') then -- Chances to drop the item @@ -84,7 +84,7 @@ AddEventHandler('esx_jobs:caution', function(cautionType, cautionAmount, spawnPo account.addMoney(cautionAmount) end) - TriggerClientEvent('esx:showNotification', source, _U('bank_deposit_taken', ESX.Math.GroupDigits(cautionAmount))) + xPlayer.showNotification(_U('bank_deposit_taken', ESX.Math.GroupDigits(cautionAmount))) TriggerClientEvent('esx_jobs:spawnJobVehicle', source, spawnPoint, vehicle) elseif cautionType == "give_back" then @@ -99,7 +99,7 @@ AddEventHandler('esx_jobs:caution', function(cautionType, cautionAmount, spawnPo xPlayer.addAccountMoney('bank', toGive) account.removeMoney(toGive) - TriggerClientEvent('esx:showNotification', source, _U('bank_deposit_returned', ESX.Math.GroupDigits(toGive))) + xPlayer.showNotification(_U('bank_deposit_returned', ESX.Math.GroupDigits(toGive))) end) end end) From 5a38d951e87d39993eabde2ca2c5d56b64dfdd68 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 7 Dec 2019 11:22:40 +0100 Subject: [PATCH 03/17] Initial code cleanup --- client/jobs/fisherman.lua | 34 +-- client/jobs/fueler.lua | 80 +++---- client/jobs/lumberjack.lua | 80 +++---- client/jobs/miner.lua | 128 +++++------ client/jobs/reporter.lua | 20 +- client/jobs/slaughterer.lua | 80 +++---- client/jobs/tailor.lua | 80 +++---- client/main.lua | 443 +++++++++++++----------------------- locales/en.lua | 2 +- server/main.lua | 10 +- 10 files changed, 421 insertions(+), 536 deletions(-) diff --git a/client/jobs/fisherman.lua b/client/jobs/fisherman.lua index 01cb8ca1..207bc146 100644 --- a/client/jobs/fisherman.lua +++ b/client/jobs/fisherman.lua @@ -9,15 +9,15 @@ Config.Jobs.fisherman = { Truck = { Spawner = 1, - Hash = "benson", - Trailer = "none", + Hash = 'benson', + Trailer = 'none', HasCaution = true }, Boat = { Spawner = 2, - Hash = "tug", - Trailer = "none", + Hash = 'tug', + Trailer = 'none', HasCaution = false } @@ -32,7 +32,7 @@ Config.Jobs.fisherman = { Marker= 1, Blip = true, Name = _U('fm_fish_locker'), - Type = "cloakroom", + Type = 'cloakroom', Hint = _U('cloak_change'), GPS = {x = 880.74, y = -1663.96, z = 29.37} }, @@ -44,19 +44,19 @@ Config.Jobs.fisherman = { Marker= 1, Blip = true, Name = _U('fm_fish_area'), - Type = "work", + Type = 'work', Hint = _U('fm_fish_button'), GPS = {x = 3859.43, y = 4448.83, z = 0.39}, Item = { { name = _U('fm_fish'), - db_name= "fish", + db_name= 'fish', time = 2000, max = 100, add = 1, remove = 1, - requires = "nothing", - requires_name = "Nothing", + requires = 'nothing', + requires_name = 'Nothing', drop = 100 } }, @@ -70,7 +70,7 @@ Config.Jobs.fisherman = { Marker= 1, Blip = true, Name = _U('fm_spawnboat_title'), - Type = "vehspawner", + Type = 'vehspawner', Spawner = 2, Hint = _U('fm_spawnboat'), Caution = 0, @@ -83,7 +83,7 @@ Config.Jobs.fisherman = { Marker= -1, Blip = false, Name = _U('fm_boat_title'), - Type = "vehspawnpt", + Type = 'vehspawnpt', Spawner = 2, GPS = 0, Heading = 270.1 @@ -96,7 +96,7 @@ Config.Jobs.fisherman = { Marker= 1, Blip = false, Name = _U('fm_boat_return_title'), - Type = "vehdelete", + Type = 'vehdelete', Hint = _U('fm_boat_return_button'), Spawner = 2, Caution = 0, @@ -111,7 +111,7 @@ Config.Jobs.fisherman = { Marker= 1, Blip = false, Name = _U('spawn_veh'), - Type = "vehspawner", + Type = 'vehspawner', Spawner = 1, Hint = _U('spawn_veh_button'), Caution = 2000, @@ -124,7 +124,7 @@ Config.Jobs.fisherman = { Marker= -1, Blip = false, Name = _U('service_vh'), - Type = "vehspawnpt", + Type = 'vehspawnpt', Spawner = 1, GPS = 0, Heading = 70.1 @@ -137,7 +137,7 @@ Config.Jobs.fisherman = { Marker= 1, Blip = false, Name = _U('return_vh'), - Type = "vehdelete", + Type = 'vehdelete', Hint = _U('return_vh_button'), Spawner = 1, Caution = 2000, @@ -153,7 +153,7 @@ Config.Jobs.fisherman = { Marker= 1, Blip = true, Name = _U('delivery_point'), - Type = "delivery", + Type = 'delivery', Spawner = 2, Hint = _U('fm_deliver_fish'), GPS = {x = 3867.44, y = 4463.62, z = 1.72}, @@ -164,7 +164,7 @@ Config.Jobs.fisherman = { remove = 1, max = 100, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua price = 11, - requires = "fish", + requires = 'fish', requires_name = _U('fm_fish'), drop = 100 } diff --git a/client/jobs/fueler.lua b/client/jobs/fueler.lua index 3f9c681d..f34922c5 100644 --- a/client/jobs/fueler.lua +++ b/client/jobs/fueler.lua @@ -9,8 +9,8 @@ Config.Jobs.fueler = { Truck = { Spawner = 1, - Hash = "phantom", - Trailer = "tanker", + Hash = 'phantom', + Trailer = 'tanker', HasCaution = true } @@ -24,9 +24,9 @@ Config.Jobs.fueler = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = true, - Name = _U("f_oil_refiner"), - Type = "cloakroom", - Hint = _U("cloak_change"), + Name = _U('f_oil_refiner'), + Type = 'cloakroom', + Hint = _U('cloak_change'), GPS = {x = 554.59, y = -2314.43, z = 4.86} }, @@ -36,22 +36,22 @@ Config.Jobs.fueler = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = true, - Name = _U("f_drill_oil"), - Type = "work", + Name = _U('f_drill_oil'), + Type = 'work', Item = { { - name = _U("f_fuel"), - db_name = "petrol", + name = _U('f_fuel'), + db_name = 'petrol', time = 5000, max = 24, add = 1, remove = 1, - requires = "nothing", - requires_name = "Nothing", + requires = 'nothing', + requires_name = 'Nothing', drop = 100 } }, - Hint = _U("f_drillbutton"), + Hint = _U('f_drillbutton'), GPS = {x = 2736.94, y = 1417.99, z = 23.48} }, @@ -61,22 +61,22 @@ Config.Jobs.fueler = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = true, - Name = _U("f_fuel_refine"), - Type = "work", + Name = _U('f_fuel_refine'), + Type = 'work', Item = { { - name = _U("f_fuel_refine"), - db_name = "petrol_raffin", + name = _U('f_fuel_refine'), + db_name = 'petrol_raffin', time = 5000, max = 24, add = 1, remove = 2, - requires = "petrol", - requires_name = _U("f_fuel"), + requires = 'petrol', + requires_name = _U('f_fuel'), drop = 100 } }, - Hint = _U("f_refine_fuel_button"), + Hint = _U('f_refine_fuel_button'), GPS = {x = 265.75, y = -3013.39, z = 4.73} }, @@ -86,22 +86,22 @@ Config.Jobs.fueler = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = true, - Name = _U("f_fuel_mixture"), - Type = "work", + Name = _U('f_fuel_mixture'), + Type = 'work', Item = { { - name = _U("f_gas"), - db_name = "essence", + name = _U('f_gas'), + db_name = 'essence', time = 5000, max = 24, add = 2, remove = 1, - requires = "petrol_raffin", - requires_name = _U("f_fuel_refine"), + requires = 'petrol_raffin', + requires_name = _U('f_fuel_refine'), drop = 100 } }, - Hint = _U("f_fuel_mixture_button"), + Hint = _U('f_fuel_mixture_button'), GPS = {x = 491.40, y = -2163.37, z = 4.91} }, @@ -111,10 +111,10 @@ Config.Jobs.fueler = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = false, - Name = _U("spawn_veh"), - Type = "vehspawner", + Name = _U('spawn_veh'), + Type = 'vehspawner', Spawner = 1, - Hint = _U("spawn_truck_button"), + Hint = _U('spawn_truck_button'), Caution = 2000, GPS = {x = 602.25, y = 2926.62, z = 39.68} }, @@ -124,8 +124,8 @@ Config.Jobs.fueler = { Size = {x = 3.0, y = 3.0, z = 1.0}, Marker = -1, Blip = false, - Name = _U("service_vh"), - Type = "vehspawnpt", + Name = _U('service_vh'), + Type = 'vehspawnpt', Spawner = 1, GPS = 0, Heading = 0 @@ -137,9 +137,9 @@ Config.Jobs.fueler = { Color = {r = 255, g = 0, b = 0}, Marker = 1, Blip = false, - Name = _U("return_vh"), - Type = "vehdelete", - Hint = _U("return_vh_button"), + Name = _U('return_vh'), + Type = 'vehdelete', + Hint = _U('return_vh_button'), Spawner = 1, Caution = 2000, GPS = 0, @@ -152,23 +152,23 @@ Config.Jobs.fueler = { Size = {x = 10.0, y = 10.0, z = 1.0}, Marker = 1, Blip = true, - Name = _U("f_deliver_gas"), - Type = "delivery", + Name = _U('f_deliver_gas'), + Type = 'delivery', Spawner = 1, Item = { { - name = _U("delivery"), + name = _U('delivery'), time = 500, remove = 1, max = 100, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua price = 61, - requires = "essence", - requires_name = _U("f_gas"), + requires = 'essence', + requires_name = _U('f_gas'), drop = 100 } }, - Hint = _U("f_deliver_gas_button"), + Hint = _U('f_deliver_gas_button'), GPS = {x = 609.58, y = 2856.74, z = 39.49} } diff --git a/client/jobs/lumberjack.lua b/client/jobs/lumberjack.lua index b76fec5d..e6892c27 100644 --- a/client/jobs/lumberjack.lua +++ b/client/jobs/lumberjack.lua @@ -9,8 +9,8 @@ Config.Jobs.lumberjack = { Truck = { Spawner = 1, - Hash = "phantom", - Trailer = "trailers", + Hash = 'phantom', + Trailer = 'trailers', HasCaution = true } @@ -24,9 +24,9 @@ Config.Jobs.lumberjack = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = true, - Name = _U("lj_locker_room"), - Type = "cloakroom", - Hint = _U("cloak_change") + Name = _U('lj_locker_room'), + Type = 'cloakroom', + Hint = _U('cloak_change') }, Wood = { @@ -35,22 +35,22 @@ Config.Jobs.lumberjack = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = true, - Name = _U("lj_mapblip"), - Type = "work", + Name = _U('lj_mapblip'), + Type = 'work', Item = { { - name = _U("lj_wood"), - db_name = "wood", + name = _U('lj_wood'), + db_name = 'wood', time = 3000, max = 20, add = 1, remove = 1, - requires = "nothing", - requires_name = "Nothing", + requires = 'nothing', + requires_name = 'Nothing', drop = 100 } }, - Hint = _U("lj_pickup") + Hint = _U('lj_pickup') }, CuttedWood = { @@ -59,22 +59,22 @@ Config.Jobs.lumberjack = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = false, - Name = _U("lj_cutwood"), - Type = "work", + Name = _U('lj_cutwood'), + Type = 'work', Item = { { - name = _U("lj_cutwood"), - db_name = "cutted_wood", + name = _U('lj_cutwood'), + db_name = 'cutted_wood', time = 5000, max = 20, add = 1, remove = 1, - requires = "wood", - requires_name = _U("lj_wood"), + requires = 'wood', + requires_name = _U('lj_wood'), drop = 100 } }, - Hint = _U("lj_cutwood_button") + Hint = _U('lj_cutwood_button') }, Planks = { @@ -83,22 +83,22 @@ Config.Jobs.lumberjack = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = false, - Name = _U("lj_board"), - Type = "work", + Name = _U('lj_board'), + Type = 'work', Item = { { - name = _U("lj_planks"), - db_name = "packaged_plank", + name = _U('lj_planks'), + db_name = 'packaged_plank', time = 4000, max = 100, add = 5, remove = 1, - requires = "cutted_wood", - requires_name = _U("lj_cutwood"), + requires = 'cutted_wood', + requires_name = _U('lj_cutwood'), drop = 100 } }, - Hint = _U("lj_pick_boards") + Hint = _U('lj_pick_boards') }, VehicleSpawner = { @@ -107,10 +107,10 @@ Config.Jobs.lumberjack = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = false, - Name = _U("spawn_veh"), - Type = "vehspawner", + Name = _U('spawn_veh'), + Type = 'vehspawner', Spawner = 1, - Hint = _U("spawn_veh_button"), + Hint = _U('spawn_veh_button'), Caution = 2000 }, @@ -119,8 +119,8 @@ Config.Jobs.lumberjack = { Size = {x = 3.0, y = 3.0, z = 1.0}, Marker = -1, Blip = false, - Name = _U("service_vh"), - Type = "vehspawnpt", + Name = _U('service_vh'), + Type = 'vehspawnpt', Spawner = 1, Heading = 264.40 }, @@ -131,9 +131,9 @@ Config.Jobs.lumberjack = { Color = {r = 255, g = 0, b = 0}, Marker = 1, Blip = false, - Name = _U("return_vh"), - Type = "vehdelete", - Hint = _U("return_vh_button"), + Name = _U('return_vh'), + Type = 'vehdelete', + Hint = _U('return_vh_button'), Spawner = 1, Caution = 2000, GPS = 0, @@ -146,22 +146,22 @@ Config.Jobs.lumberjack = { Size = {x = 5.0, y = 5.0, z = 3.0}, Marker = 1, Blip = true, - Name = _U("delivery_point"), - Type = "delivery", + Name = _U('delivery_point'), + Type = 'delivery', Spawner = 1, Item = { { - name = _U("delivery"), + name = _U('delivery'), time = 500, remove = 1, max = 100, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua price = 13, - requires = "packaged_plank", - requires_name = _U("lj_planks"), + requires = 'packaged_plank', + requires_name = _U('lj_planks'), drop = 100 } }, - Hint = _U("lj_deliver_button") + Hint = _U('lj_deliver_button') } } diff --git a/client/jobs/miner.lua b/client/jobs/miner.lua index 20e7520e..a26041fe 100644 --- a/client/jobs/miner.lua +++ b/client/jobs/miner.lua @@ -9,8 +9,8 @@ Config.Jobs.miner = { Truck = { Spawner = 1, - Hash = "rubble", - Trailer = "none", + Hash = 'rubble', + Trailer = 'none', HasCaution = true } @@ -24,9 +24,9 @@ Config.Jobs.miner = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = true, - Name = _U("m_miner_locker"), - Type = "cloakroom", - Hint = _U("cloak_change"), + Name = _U('m_miner_locker'), + Type = 'cloakroom', + Hint = _U('cloak_change'), GPS = {x = 884.86, y = -2176.51, z = 29.51} }, @@ -36,22 +36,22 @@ Config.Jobs.miner = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = true, - Name = _U("m_rock"), - Type = "work", + Name = _U('m_rock'), + Type = 'work', Item = { { - name = _U("m_rock"), - db_name = "stone", + name = _U('m_rock'), + db_name = 'stone', time = 3000, max = 7, add = 1, remove = 1, - requires = "nothing", - requires_name = "Nothing", + requires = 'nothing', + requires_name = 'Nothing', drop = 100 } }, - Hint = _U("m_pickrocks"), + Hint = _U('m_pickrocks'), GPS = {x = 289.24, y = 2862.90, z = 42.64} }, @@ -61,22 +61,22 @@ Config.Jobs.miner = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = true, - Name = _U("m_washrock"), - Type = "work", + Name = _U('m_washrock'), + Type = 'work', Item = { { - name = _U("m_washrock"), - db_name = "washed_stone", + name = _U('m_washrock'), + db_name = 'washed_stone', time = 5000, max = 7, add = 1, remove = 1, - requires = "stone", - requires_name = _U("m_rock"), + requires = 'stone', + requires_name = _U('m_rock'), drop = 100 } }, - Hint = _U("m_rock_button"), + Hint = _U('m_rock_button'), GPS = {x = 1109.14, y = -2007.87, z = 30.01} }, @@ -86,43 +86,43 @@ Config.Jobs.miner = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = true, - Name = _U("m_rock_smelting"), - Type = "work", + Name = _U('m_rock_smelting'), + Type = 'work', Item = { { - name = _U("m_copper"), - db_name = "copper", + name = _U('m_copper'), + db_name = 'copper', time = 4000, max = 56, add = 8, remove = 1, - requires = "washed_stone", - requires_name = _U("m_washrock"), + requires = 'washed_stone', + requires_name = _U('m_washrock'), drop = 100 }, { - name = _U("m_iron"), - db_name = "iron", + name = _U('m_iron'), + db_name = 'iron', max = 42, add = 6, drop = 100 }, { - name = _U("m_gold"), - db_name = "gold", + name = _U('m_gold'), + db_name = 'gold', max = 21, add = 3, drop = 100 }, { - name = _U("m_diamond"), - db_name = "diamond", + name = _U('m_diamond'), + db_name = 'diamond', max = 50, add = 1, drop = 5 } }, - Hint = _U("m_melt_button"), + Hint = _U('m_melt_button'), GPS = {x = -169.48, y = -2659.16, z = 5.00} }, @@ -132,10 +132,10 @@ Config.Jobs.miner = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = false, - Name = _U("spawn_veh"), - Type = "vehspawner", + Name = _U('spawn_veh'), + Type = 'vehspawner', Spawner = 1, - Hint = _U("spawn_veh_button"), + Hint = _U('spawn_veh_button'), Caution = 2000, GPS = {x = 2962.40, y = 2746.20, z = 42.39} }, @@ -145,8 +145,8 @@ Config.Jobs.miner = { Size = {x = 5.0, y = 5.0, z = 1.0}, Marker = -1, Blip = false, - Name = _U("service_vh"), - Type = "vehspawnpt", + Name = _U('service_vh'), + Type = 'vehspawnpt', Spawner = 1, Heading = 90.1, GPS = 0 @@ -158,9 +158,9 @@ Config.Jobs.miner = { Color = {r = 255, g = 0, b = 0}, Marker = 1, Blip = false, - Name = _U("return_vh"), - Type = "vehdelete", - Hint = _U("return_vh_button"), + Name = _U('return_vh'), + Type = 'vehdelete', + Hint = _U('return_vh_button'), Spawner = 1, Caution = 2000, GPS = 0, @@ -173,22 +173,22 @@ Config.Jobs.miner = { Size = {x = 5.0, y = 5.0, z = 3.0}, Marker = 1, Blip = true, - Name = _U("m_sell_copper"), - Type = "delivery", + Name = _U('m_sell_copper'), + Type = 'delivery', Spawner = 1, Item = { { - name = _U("delivery"), + name = _U('delivery'), time = 500, remove = 1, max = 56, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua price = 5, - requires = "copper", - requires_name = _U("m_copper"), + requires = 'copper', + requires_name = _U('m_copper'), drop = 100 } }, - Hint = _U("m_deliver_copper"), + Hint = _U('m_deliver_copper'), GPS = {x = -148.78, y = -1040.38, z = 26.27} }, @@ -199,22 +199,22 @@ Config.Jobs.miner = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = true, - Name = _U("m_sell_iron"), - Type = "delivery", + Name = _U('m_sell_iron'), + Type = 'delivery', Spawner = 1, Item = { { - name = _U("delivery"), + name = _U('delivery'), time = 500, remove = 1, max = 42, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua price = 9, - requires = "iron", - requires_name = _U("m_iron"), + requires = 'iron', + requires_name = _U('m_iron'), drop = 100 } }, - Hint = _U("m_deliver_iron"), + Hint = _U('m_deliver_iron'), GPS = {x = 261.48, y = 207.35, z = 109.28} }, @@ -225,22 +225,22 @@ Config.Jobs.miner = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = true, - Name = _U("m_sell_gold"), - Type = "delivery", + Name = _U('m_sell_gold'), + Type = 'delivery', Spawner = 1, Item = { { - name = _U("delivery"), + name = _U('delivery'), time = 500, remove = 1, max = 21, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua price = 25, - requires = "gold", - requires_name = _U("m_gold"), + requires = 'gold', + requires_name = _U('m_gold'), drop = 100 } }, - Hint = _U("m_deliver_gold"), + Hint = _U('m_deliver_gold'), GPS = {x = -621.04, y = -228.53, z = 37.05} }, @@ -251,22 +251,22 @@ Config.Jobs.miner = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = true, - Name = _U("m_sell_diamond"), - Type = "delivery", + Name = _U('m_sell_diamond'), + Type = 'delivery', Spawner = 1, Item = { { - name = _U("delivery"), + name = _U('delivery'), time = 500, remove = 1, max = 50, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua price = 250, - requires = "diamond", - requires_name = _U("m_diamond"), + requires = 'diamond', + requires_name = _U('m_diamond'), drop = 100 } }, - Hint = _U("m_deliver_diamond"), + Hint = _U('m_deliver_diamond'), GPS = {x = 2962.40, y = 2746.20, z = 42.39} } diff --git a/client/jobs/reporter.lua b/client/jobs/reporter.lua index 6cc12b9a..71766d2e 100644 --- a/client/jobs/reporter.lua +++ b/client/jobs/reporter.lua @@ -9,8 +9,8 @@ Config.Jobs.reporter = { Truck = { Spawner = 1, - Hash = "rumpo", - Trailer = "none", + Hash = 'rumpo', + Trailer = 'none', HasCaution = true } @@ -24,10 +24,10 @@ Config.Jobs.reporter = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = true, - Name = _U("reporter_name"), - Type = "vehspawner", + Name = _U('reporter_name'), + Type = 'vehspawner', Spawner = 1, - Hint = _U("reporter_garage"), + Hint = _U('reporter_garage'), Caution = 2000 }, @@ -36,8 +36,8 @@ Config.Jobs.reporter = { Size = {x = 3.0, y = 3.0, z = 1.0}, Marker = -1, Blip = false, - Name = _U("service_vh"), - Type = "vehspawnpt", + Name = _U('service_vh'), + Type = 'vehspawnpt', Spawner = 1, Heading = 200.1 }, @@ -48,9 +48,9 @@ Config.Jobs.reporter = { Color = {r = 255, g = 0, b = 0}, Marker = 1, Blip = false, - Name = _U("return_vh"), - Type = "vehdelete", - Hint = _U("return_vh_button"), + Name = _U('return_vh'), + Type = 'vehdelete', + Hint = _U('return_vh_button'), Spawner = 1, Caution = 2000, GPS = 0, diff --git a/client/jobs/slaughterer.lua b/client/jobs/slaughterer.lua index 9de175da..1f7c26f2 100644 --- a/client/jobs/slaughterer.lua +++ b/client/jobs/slaughterer.lua @@ -9,8 +9,8 @@ Config.Jobs.slaughterer = { Truck = { Spawner = 1, - Hash = "benson", - Trailer = "none", + Hash = 'benson', + Trailer = 'none', HasCaution = true } }, @@ -23,9 +23,9 @@ Config.Jobs.slaughterer = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = true, - Name = _U("s_slaughter_locker"), - Type = "cloakroom", - Hint = _U("cloak_change") + Name = _U('s_slaughter_locker'), + Type = 'cloakroom', + Hint = _U('cloak_change') }, AliveChicken = { @@ -34,22 +34,22 @@ Config.Jobs.slaughterer = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = true, - Name = _U("s_hen"), - Type = "work", + Name = _U('s_hen'), + Type = 'work', Item = { { - name = _U("s_alive_chicken"), - db_name = "alive_chicken", + name = _U('s_alive_chicken'), + db_name = 'alive_chicken', time = 3000, max = 20, add = 1, remove = 1, - requires = "nothing", - requires_name = "Nothing", + requires = 'nothing', + requires_name = 'Nothing', drop = 100 } }, - Hint = _U("s_catch_hen") + Hint = _U('s_catch_hen') }, SlaughterHouse = { @@ -58,22 +58,22 @@ Config.Jobs.slaughterer = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = false, - Name = _U("s_slaughtered"), - Type = "work", + Name = _U('s_slaughtered'), + Type = 'work', Item = { { - name = _U("s_slaughtered_chicken"), - db_name = "slaughtered_chicken", + name = _U('s_slaughtered_chicken'), + db_name = 'slaughtered_chicken', time = 5000, max = 20, add = 1, remove = 1, - requires = "alive_chicken", - requires_name = _U("s_alive_chicken"), + requires = 'alive_chicken', + requires_name = _U('s_alive_chicken'), drop = 100 } }, - Hint = _U("s_chop_animal") + Hint = _U('s_chop_animal') }, Packaging = { @@ -82,22 +82,22 @@ Config.Jobs.slaughterer = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = false, - Name = _U("s_package"), - Type = "work", + Name = _U('s_package'), + Type = 'work', Item = { { - name = _U("s_packagechicken"), - db_name = "packaged_chicken", + name = _U('s_packagechicken'), + db_name = 'packaged_chicken', time = 4000, max = 100, add = 5, remove = 1, - requires = "slaughtered_chicken", - requires_name = _U("s_unpackaged"), + requires = 'slaughtered_chicken', + requires_name = _U('s_unpackaged'), drop = 100 } }, - Hint = _U("s_unpackaged_button") + Hint = _U('s_unpackaged_button') }, VehicleSpawner = { @@ -106,10 +106,10 @@ Config.Jobs.slaughterer = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = false, - Name = _U("spawn_veh"), - Type = "vehspawner", + Name = _U('spawn_veh'), + Type = 'vehspawner', Spawner = 1, - Hint = _U("spawn_veh_button"), + Hint = _U('spawn_veh_button'), Caution = 2000 }, @@ -118,8 +118,8 @@ Config.Jobs.slaughterer = { Size = {x = 3.0, y = 3.0, z = 1.0}, Marker = -1, Blip = false, - Name = _U("service_vh"), - Type = "vehspawnpt", + Name = _U('service_vh'), + Type = 'vehspawnpt', Spawner = 1, Heading = 130.1 }, @@ -130,9 +130,9 @@ Config.Jobs.slaughterer = { Color = {r = 255, g = 0, b = 0}, Marker = 1, Blip = false, - Name = _U("return_vh"), - Type = "vehdelete", - Hint = _U("return_vh_button"), + Name = _U('return_vh'), + Type = 'vehdelete', + Hint = _U('return_vh_button'), Spawner = 1, Caution = 2000, GPS = 0, @@ -145,22 +145,22 @@ Config.Jobs.slaughterer = { Size = {x = 5.0, y = 5.0, z = 1.0}, Marker = 1, Blip = true, - Name = _U("delivery_point"), - Type = "delivery", + Name = _U('delivery_point'), + Type = 'delivery', Spawner = 1, Item = { { - name = _U("delivery"), + name = _U('delivery'), time = 500, remove = 1, max = 100, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua price = 23, - requires = "packaged_chicken", - requires_name = _U("s_packagechicken"), + requires = 'packaged_chicken', + requires_name = _U('s_packagechicken'), drop = 100 } }, - Hint = _U("s_deliver") + Hint = _U('s_deliver') } } } diff --git a/client/jobs/tailor.lua b/client/jobs/tailor.lua index 73204220..2d805c7e 100644 --- a/client/jobs/tailor.lua +++ b/client/jobs/tailor.lua @@ -9,8 +9,8 @@ Config.Jobs.tailor = { Truck = { Spawner = 1, - Hash = "youga2", - Trailer = "none", + Hash = 'youga2', + Trailer = 'none', HasCaution = true } @@ -24,9 +24,9 @@ Config.Jobs.tailor = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = true, - Name = _U("dd_dress_locker"), - Type = "cloakroom", - Hint = _U("cloak_change"), + Name = _U('dd_dress_locker'), + Type = 'cloakroom', + Hint = _U('cloak_change'), GPS = {x = 740.80, y = -970.06, z = 23.46} }, @@ -36,22 +36,22 @@ Config.Jobs.tailor = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = true, - Name = _U("dd_wool"), - Type = "work", + Name = _U('dd_wool'), + Type = 'work', Item = { { - name = _U("dd_wool"), - db_name = "wool", + name = _U('dd_wool'), + db_name = 'wool', time = 3000, max = 40, add = 1, remove = 1, - requires = "nothing", - requires_name = "Nothing", + requires = 'nothing', + requires_name = 'Nothing', drop = 100 } }, - Hint = _U("dd_pickup"), + Hint = _U('dd_pickup'), GPS = {x = 715.95, y = -959.63, z = 29.39} }, @@ -61,22 +61,22 @@ Config.Jobs.tailor = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = false, - Name = _U("dd_fabric"), - Type = "work", + Name = _U('dd_fabric'), + Type = 'work', Item = { { - name = _U("dd_fabric"), - db_name = "fabric", + name = _U('dd_fabric'), + db_name = 'fabric', time = 5000, max = 80, add = 2, remove = 1, - requires = "wool", - requires_name = _U("dd_wool"), + requires = 'wool', + requires_name = _U('dd_wool'), drop = 100 } }, - Hint = _U("dd_makefabric"), + Hint = _U('dd_makefabric'), GPS = {x = 712.92, y = -970.58, z = 29.39} }, @@ -86,22 +86,22 @@ Config.Jobs.tailor = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = false, - Name = _U("dd_clothing"), - Type = "work", + Name = _U('dd_clothing'), + Type = 'work', Item = { { - name = _U("dd_clothing"), - db_name = "clothe", + name = _U('dd_clothing'), + db_name = 'clothe', time = 4000, max = 40, add = 1, remove = 2, - requires = "fabric", - requires_name = _U("dd_fabric"), + requires = 'fabric', + requires_name = _U('dd_fabric'), drop = 100 } }, - Hint = _U("dd_makeclothing"), + Hint = _U('dd_makeclothing'), GPS = {x = 429.59, y = -807.34, z = 28.49} }, @@ -111,10 +111,10 @@ Config.Jobs.tailor = { Color = {r = 204, g = 204, b = 0}, Marker = 1, Blip = false, - Name = _U("spawn_veh"), - Type = "vehspawner", + Name = _U('spawn_veh'), + Type = 'vehspawner', Spawner = 1, - Hint = _U("spawn_veh_button"), + Hint = _U('spawn_veh_button'), Caution = 2000, GPS = {x = 1978.92, y = 5171.70, z = 46.63} }, @@ -124,8 +124,8 @@ Config.Jobs.tailor = { Size = {x = 3.0, y = 3.0, z = 1.0}, Marker = -1, Blip = false, - Name = _U("service_vh"), - Type = "vehspawnpt", + Name = _U('service_vh'), + Type = 'vehspawnpt', Spawner = 1, Heading = 270.1, GPS = 0 @@ -137,9 +137,9 @@ Config.Jobs.tailor = { Color = {r = 255, g = 0, b = 0}, Marker = 1, Blip = false, - Name = _U("return_vh"), - Type = "vehdelete", - Hint = _U("return_vh_button"), + Name = _U('return_vh'), + Type = 'vehdelete', + Hint = _U('return_vh_button'), Spawner = 1, Caution = 2000, GPS = 0, @@ -152,22 +152,22 @@ Config.Jobs.tailor = { Size = {x = 5.0, y = 5.0, z = 3.0}, Marker = 1, Blip = true, - Name = _U("delivery_point"), - Type = "delivery", + Name = _U('delivery_point'), + Type = 'delivery', Spawner = 1, Item = { { - name = _U("delivery"), + name = _U('delivery'), time = 500, remove = 1, max = 100, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua price = 40, - requires = "clothe", - requires_name = _U("dd_clothing"), + requires = 'clothe', + requires_name = _U('dd_clothing'), drop = 100 } }, - Hint = _U("dd_deliver_clothes"), + Hint = _U('dd_deliver_clothes'), GPS = {x = 1978.92, y = 5171.70, z = 46.63} } } diff --git a/client/main.lua b/client/main.lua index fc710ac3..1db333c1 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,33 +1,5 @@ -local Keys = { - ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, - ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, - ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, - ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, - ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, - ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, - ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, - ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, - ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 -} - -local PlayerData = {} -local menuIsShowed = false -local hintIsShowed = false -local hasAlreadyEnteredMarker = false -local Blips = {} -local JobBlips = {} -local isInMarker = false -local isInPublicMarker = false - -local hintToDisplay = "no hint to display" -local onDuty = false -local spawner = 0 -local myPlate = {} - -local vehicleObjInCaseofDrop = nil -local vehicleInCaseofDrop = nil - -local vehicleMaxHealth = nil +local menuIsShowed, hintIsShowed, hintToDisplay, hasAlreadyEnteredMarker, isInMarker, onDuty, vehicleObjInCaseofDrop, vehicleInCaseofDrop, vehicleMaxHealth +local PlayerData, Blips, JobBlips, myPlate, spawner = {}, {}, {}, {}, 0 ESX = nil @@ -54,14 +26,13 @@ end) function OpenMenu() ESX.UI.Menu.CloseAll() - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'cloakroom', - { + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'cloakroom', { title = _U('cloakroom'), + align = 'top-left', elements = { {label = _U('job_wear'), value = 'job_wear'}, {label = _U('citizen_wear'), value = 'citizen_wear'} - } - }, function(data, menu) + }}, function(data, menu) if data.current.value == 'citizen_wear' then onDuty = false ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin) @@ -86,136 +57,121 @@ end AddEventHandler('esx_jobs:action', function(job, zone) menuIsShowed = true - if zone.Type == "cloakroom" then + if zone.Type == 'cloakroom' then OpenMenu() - elseif zone.Type == "work" then - hintToDisplay = "no hint to display" + elseif zone.Type == 'work' then + hintToDisplay = nil hintIsShowed = false local playerPed = PlayerPedId() - if IsPedInAnyVehicle(playerPed, false) then - ESX.ShowNotification(_U('foot_work')) - else + if IsPedOnFoot(playerPed) then TriggerServerEvent('esx_jobs:startWork', zone.Item) + else + ESX.ShowNotification(_U('foot_work')) end - elseif zone.Type == "vehspawner" then - local spawnPoint = nil - local vehicle = nil + elseif zone.Type == 'vehspawner' then + local jobObject, spawnPoint, vehicle = Config.Jobs[PlayerData.job.name] - for k,v in pairs(Config.Jobs) do - if PlayerData.job.name == k then - for l,w in pairs(v.Zones) do - if w.Type == "vehspawnpt" and w.Spawner == zone.Spawner then - spawnPoint = w - spawner = w.Spawner - end + if jobObject then + for k,v in pairs(jobObject.Zones) do + if v.Type == 'vehspawnpt' and v.Spawner == zone.Spawner then + spawnPoint = v + spawner = v.Spawner + break end + end - for m,x in pairs(v.Vehicles) do - if x.Spawner == zone.Spawner then - vehicle = x - end + for k,v in pairs(jobObject.Vehicles) do + if v.Spawner == zone.Spawner then + vehicle = v + break end end end - if ESX.Game.IsSpawnPointClear(spawnPoint.Pos, 5.0) then + if jobObject and spawnPoint and vehicle and ESX.Game.IsSpawnPointClear(spawnPoint.Pos, 5.0) then spawnVehicle(spawnPoint, vehicle, zone.Caution) else ESX.ShowNotification(_U('spawn_blocked')) end - elseif zone.Type == "vehdelete" then - local looping = true + elseif zone.Type == 'vehdelete' then + local jobObject = Config.Jobs[PlayerData.job.name] - for k,v in pairs(Config.Jobs) do - if PlayerData.job.name == k then - for l,w in pairs(v.Zones) do - if w.Type == "vehdelete" and w.Spawner == zone.Spawner then - local playerPed = PlayerPedId() + if jobObject then + for k,v in pairs(jobObject.Zones) do + if v.Type == 'vehdelete' and v.Spawner == zone.Spawner then + local playerPed = PlayerPedId() - if IsPedInAnyVehicle(playerPed, false) then + if IsPedInAnyVehicle(playerPed, false) then + local vehicle = GetVehiclePedIsIn(playerPed, false) + local plate = ESX.Math.Trim(GetVehicleNumberPlateText(vehicle)) + local driverPed = GetPedInVehicleSeat(vehicle, -1) - local vehicle = GetVehiclePedIsIn(playerPed, false) - local plate = GetVehicleNumberPlateText(vehicle) - plate = string.gsub(plate, " ", "") - local driverPed = GetPedInVehicleSeat(vehicle, -1) + if playerPed == driverPed then + if myPlate[plate] then + myPlate[plate] = nil - if playerPed == driverPed then + local vehicleHealth = GetVehicleEngineHealth(vehicleInCaseofDrop) - for i=1, #myPlate, 1 do - if myPlate[i] == plate then - - local vehicleHealth = GetVehicleEngineHealth(vehicleInCaseofDrop) - local giveBack = ESX.Math.Round(vehicleHealth / vehicleMaxHealth, 2) - - TriggerServerEvent('esx_jobs:caution', "give_back", giveBack, 0, 0) - DeleteVehicle(GetVehiclePedIsIn(playerPed, false)) - - if w.Teleport ~= 0 then - ESX.Game.Teleport(playerPed, w.Teleport) - end - - table.remove(myPlate, i) - - if vehicleObjInCaseofDrop.HasCaution then - vehicleInCaseofDrop = nil - vehicleObjInCaseofDrop = nil - vehicleMaxHealth = nil - end - - break - end + -- fix for people using cheat engine to modify engine health + if vehicleHealth > vehicleMaxHealth then + vehicleHealth = vehicleMaxHealth end - else - ESX.ShowNotification(_U('not_your_vehicle')) - end + local giveBack = ESX.Math.Round(vehicleHealth / vehicleMaxHealth, 2) + TriggerServerEvent('esx_jobs:caution', 'give_back', giveBack, 0, 0) + DeleteVehicle(GetVehiclePedIsIn(playerPed, false)) + + if v.Teleport ~= 0 then + ESX.Game.Teleport(playerPed, v.Teleport) + end + + if vehicleObjInCaseofDrop.HasCaution then + vehicleInCaseofDrop, vehicleObjInCaseofDrop, vehicleMaxHealth = nil, nil, nil + end + end + else + ESX.ShowNotification(_U('not_your_vehicle')) end - looping = false - break end - if looping == false then - break - end + break end end - if looping == false then - break - end end - elseif zone.Type == "delivery" then - if Blips['delivery'] ~= nil then - RemoveBlip(Blips['delivery']) - Blips['delivery'] = nil + elseif zone.Type == 'delivery' then + if Blips.delivery then + RemoveBlip(Blips.delivery) + Blips.delivery = nil end - hintToDisplay = "no hint to display" + hintToDisplay = nil hintIsShowed = false TriggerServerEvent('esx_jobs:startWork', zone.Item) end + --nextStep(zone.GPS) end) function nextStep(gps) if gps ~= 0 then - if Blips['delivery'] ~= nil then - RemoveBlip(Blips['delivery']) - Blips['delivery'] = nil + if Blips.delivery then + RemoveBlip(Blips.delivery) + Blips.delivery = nil end - Blips['delivery'] = AddBlipForCoord(gps.x, gps.y, gps.z) - SetBlipRoute(Blips['delivery'], true) + Blips.delivery = AddBlipForCoord(gps.x, gps.y, gps.z) + SetBlipRoute(Blips.delivery, true) ESX.ShowNotification(_U('next_point')) end end AddEventHandler('esx_jobs:hasExitedMarker', function(zone) TriggerServerEvent('esx_jobs:stopWork') - hintToDisplay = "no hint to display" + hintToDisplay = nil menuIsShowed = false hintIsShowed = false isInMarker = false @@ -232,11 +188,9 @@ AddEventHandler('esx:setJob', function(job) end) function deleteBlips() - if JobBlips[1] ~= nil then - for i=1, #JobBlips, 1 do - RemoveBlip(JobBlips[i]) - JobBlips[i] = nil - end + for k,v in ipairs(JobBlips) do + RemoveBlip(v) + JobBlips[k] = nil end end @@ -244,7 +198,7 @@ function refreshBlips() local zones = {} local blipInfo = {} - if PlayerData.job ~= nil then + if PlayerData.job then for jobKey,jobValues in pairs(Config.Jobs) do if jobKey == PlayerData.job.name then @@ -253,14 +207,13 @@ function refreshBlips() if zoneValues.Blip then local blip = AddBlipForCoord(zoneValues.Pos.x, zoneValues.Pos.y, zoneValues.Pos.z) SetBlipSprite (blip, jobValues.BlipInfos.Sprite) - SetBlipDisplay (blip, 4) SetBlipScale (blip, 1.2) SetBlipCategory(blip, 3) SetBlipColour (blip, jobValues.BlipInfos.Color) SetBlipAsShortRange(blip, true) - BeginTextCommandSetBlipName("STRING") - AddTextComponentString(zoneValues.Name) + BeginTextCommandSetBlipName('STRING') + AddTextComponentSubstringPlayerName(zoneValues.Name) EndTextCommandSetBlipName(blip) table.insert(JobBlips, blip) end @@ -271,7 +224,7 @@ function refreshBlips() end function spawnVehicle(spawnPoint, vehicle, vehicleCaution) - hintToDisplay = 'no hint to display' + hintToDisplay = nil hintIsShowed = false TriggerServerEvent('esx_jobs:caution', 'take', vehicleCaution, spawnPoint, vehicle) end @@ -282,7 +235,7 @@ AddEventHandler('esx_jobs:spawnJobVehicle', function(spawnPoint, vehicle) ESX.Game.SpawnVehicle(vehicle.Hash, spawnPoint.Pos, spawnPoint.Heading, function(spawnedVehicle) - if vehicle.Trailer ~= "none" then + if vehicle.Trailer ~= 'none' then ESX.Game.SpawnVehicle(vehicle.Trailer, spawnPoint.Pos, spawnPoint.Heading, function(trailer) AttachVehicleToTrailer(spawnedVehicle, trailer, 1.1) end) @@ -291,8 +244,7 @@ AddEventHandler('esx_jobs:spawnJobVehicle', function(spawnPoint, vehicle) -- save & set plate local plate = 'WORK' .. math.random(100, 900) SetVehicleNumberPlateText(spawnedVehicle, plate) - table.insert(myPlate, plate) - plate = string.gsub(plate, " ", "") + myPlate[plate] = true TaskWarpPedIntoVehicle(playerPed, spawnedVehicle, -1) @@ -307,9 +259,9 @@ end) -- Show top left hint Citizen.CreateThread(function() while true do - Citizen.Wait(10) + Citizen.Wait(0) - if hintIsShowed then + if hintIsShowed and hintToDisplay then ESX.ShowHelpNotification(hintToDisplay) else Citizen.Wait(500) @@ -317,185 +269,118 @@ Citizen.CreateThread(function() end end) --- Display markers (only if on duty and the player's job ones) +-- Draw markers (only if on duty and the player's job ones) Citizen.CreateThread(function() while true do - Citizen.Wait(1) - local zones = {} + Citizen.Wait(0) + local zones, currentZone, isInMarker = {} + local letSleep, playerPed = true, PlayerPedId() + local playerCoords = GetEntityCoords(playerPed) - if PlayerData.job ~= nil then - for k,v in pairs(Config.Jobs) do - if PlayerData.job.name == k then - zones = v.Zones - end + if PlayerData.job then + if Config.Jobs[PlayerData.job.name] then + zones = Config.Jobs[PlayerData.job.name].Zones end - local coords = GetEntityCoords(PlayerPedId()) for k,v in pairs(zones) do - if onDuty or v.Type == "cloakroom" or PlayerData.job.name == "reporter" then - if(v.Marker ~= -1 and GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < Config.DrawDistance) then - DrawMarker(v.Marker, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, v.Color.r, v.Color.g, v.Color.b, 100, false, true, 2, false, false, false, false) - end - end - end - end - end -end) + local distance = GetDistanceBetweenCoords(playerCoords, v.Pos.x, v.Pos.y, v.Pos.z, true) --- Display public markers -Citizen.CreateThread(function() - while true do - Citizen.Wait(0) - local coords = GetEntityCoords(PlayerPedId()) - for k,v in pairs(Config.PublicZones) do - if(v.Marker ~= -1 and GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < Config.DrawDistance) then - DrawMarker(v.Marker, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, v.Color.r, v.Color.g, v.Color.b, 100, false, true, 2, false, false, false, false) - end - end - end -end) - --- Activate public marker -Citizen.CreateThread(function() - while true do - Citizen.Wait(0) - local coords = GetEntityCoords(PlayerPedId()) - local position = nil - local zone = nil - - for k,v in pairs(Config.PublicZones) do - if GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x/2 then - isInPublicMarker = true - position = v.Teleport - zone = v - break - else - isInPublicMarker = false - end - end - - if IsControlJustReleased(0, Keys['E']) and isInPublicMarker then - ESX.Game.Teleport(PlayerPedId(), position) - isInPublicMarker = false - end - - -- hide or show top left zone hints - if isInPublicMarker then - hintToDisplay = zone.Hint - hintIsShowed = true - else - if not isInMarker then - hintToDisplay = "no hint to display" - hintIsShowed = false - end - end - end -end) - --- Activate menu when player is inside marker -Citizen.CreateThread(function() - while true do - - Citizen.Wait(1) - - if PlayerData.job ~= nil and PlayerData.job.name ~= 'unemployed' then - local zones = nil - local job = nil - - for k,v in pairs(Config.Jobs) do - if PlayerData.job.name == k then - job = v - zones = v.Zones - end - end - - if zones ~= nil then - local coords = GetEntityCoords(PlayerPedId()) - local currentZone = nil - local zone = nil - local lastZone = nil - - for k,v in pairs(zones) do - if GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x then - isInMarker = true - currentZone = k - zone = v - break - else - isInMarker = false + if onDuty or v.Type == 'cloakroom' or PlayerData.job.name == 'reporter' then + if(v.Marker ~= -1 and distance < Config.DrawDistance) then + letSleep = false + DrawMarker(v.Marker, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, v.Color.r, v.Color.g, v.Color.b, 100, false, true, 2, false, nil, nil, false) end end - if IsControlJustReleased(0, Keys['E']) and not menuIsShowed and isInMarker then - if onDuty or zone.Type == "cloakroom" or PlayerData.job.name == "reporter" then - TriggerEvent('esx_jobs:action', job, zone) - end + if distance < v.Size.x then + letSleep, isInMarker, currentZone = false, true, v + break end + end - -- hide or show top left zone hints - if isInMarker and not menuIsShowed then + if IsControlJustReleased(0, 38) and not menuIsShowed and isInMarker then + if onDuty or currentZone.Type == 'cloakroom' or PlayerData.job.name == 'reporter' then + TriggerEvent('esx_jobs:action', PlayerData.job.name, currentZone) + end + end + + -- hide or show top left zone hints + if isInMarker and not menuIsShowed then + hintIsShowed = true + if (onDuty or currentZone.Type == 'cloakroom' or PlayerData.job.name == 'reporter') and currentZone.Type ~= 'vehdelete' then + hintToDisplay = currentZone.Hint hintIsShowed = true - if (onDuty or zone.Type == "cloakroom" or PlayerData.job.name == "reporter") and zone.Type ~= "vehdelete" then - hintToDisplay = zone.Hint - hintIsShowed = true - elseif zone.Type == "vehdelete" and (onDuty or PlayerData.job.name == "reporter") then - local playerPed = PlayerPedId() + elseif currentZone.Type == 'vehdelete' and (onDuty or PlayerData.job.name == 'reporter') then + local playerPed = PlayerPedId() - if IsPedInAnyVehicle(playerPed, false) then - local vehicle = GetVehiclePedIsIn(playerPed, false) - local driverPed = GetPedInVehicleSeat(vehicle, -1) - local plate = GetVehicleNumberPlateText(vehicle) - plate = string.gsub(plate, " ", "") + if IsPedInAnyVehicle(playerPed, false) then + local vehicle = GetVehiclePedIsIn(playerPed, false) + local driverPed = GetPedInVehicleSeat(vehicle, -1) + local plate = ESX.Math.Trim(GetVehicleNumberPlateText(vehicle)) - if playerPed == driverPed then - - for i=1, #myPlate, 1 do - if myPlate[i] == plate then - hintToDisplay = zone.Hint - break - end - end - - else - hintToDisplay = _U('not_your_vehicle') + if playerPed == driverPed then + if myPlate[plate] then + hintToDisplay = currentZone.Hint end else - hintToDisplay = _U('in_vehicle') + hintToDisplay = _U('not_your_vehicle') end - hintIsShowed = true - elseif onDuty and zone.Spawner ~= spawner then - hintToDisplay = _U('wrong_point') - hintIsShowed = true else - if not isInPublicMarker then - hintToDisplay = "no hint to display" - hintIsShowed = false - end + hintToDisplay = _U('in_vehicle') end - end - - if isInMarker and not hasAlreadyEnteredMarker then - hasAlreadyEnteredMarker = true - end - - if not isInMarker and hasAlreadyEnteredMarker then - hasAlreadyEnteredMarker = false - TriggerEvent('esx_jobs:hasExitedMarker', zone) + hintIsShowed = true + elseif onDuty and currentZone.Spawner ~= spawner then + hintToDisplay = _U('wrong_point') + hintIsShowed = true + else + hintToDisplay = nil + hintIsShowed = false end end + + if isInMarker and not hasAlreadyEnteredMarker then + hasAlreadyEnteredMarker = true + end + + if not isInMarker and hasAlreadyEnteredMarker then + hasAlreadyEnteredMarker = false + TriggerEvent('esx_jobs:hasExitedMarker', currentZone) + end + end + + for k,v in pairs(Config.PublicZones) do + local distance = GetDistanceBetweenCoords(playerCoords, v.Pos.x, v.Pos.y, v.Pos.z, true) + + if v.Marker ~= -1 and distance < Config.DrawDistance then + DrawMarker(v.Marker, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, v.Color.r, v.Color.g, v.Color.b, 100, false, true, 2, false, nil, nil, false) + letSleep = false + end + + if distance < v.Size.x / 2 then + letSleep, isInPublicMarker = false, true + ESX.ShowHelpNotification(v.Hint) + + if IsControlJustReleased(0, 38) then + ESX.Game.Teleport(playerPed, v.Teleport) + end + end + end + + if letSleep then + Citizen.Wait(500) end end end) Citizen.CreateThread(function() -- Slaughterer - RemoveIpl("CS1_02_cf_offmission") - RequestIpl("CS1_02_cf_onmission1") - RequestIpl("CS1_02_cf_onmission2") - RequestIpl("CS1_02_cf_onmission3") - RequestIpl("CS1_02_cf_onmission4") + RemoveIpl('CS1_02_cf_offmission') + RequestIpl('CS1_02_cf_onmission1') + RequestIpl('CS1_02_cf_onmission2') + RequestIpl('CS1_02_cf_onmission3') + RequestIpl('CS1_02_cf_onmission4') -- Tailor - RequestIpl("id2_14_during_door") - RequestIpl("id2_14_during1") + RequestIpl('id2_14_during_door') + RequestIpl('id2_14_during1') end) diff --git a/locales/en.lua b/locales/en.lua index 2e1c948d..98cc6e61 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -8,7 +8,7 @@ Locales['en'] = { ['bank_deposit_taken'] = 'a security deposit of ~r~$%s~s~ was taken from you.', ['foot_work'] = 'you have to be on foot to be able to work.', ['next_point'] = 'go to the next step after completing this one.', - ['not_your_vehicle'] = 'this is not your vehicle or you must be a driver.', + ['not_your_vehicle'] = 'you are not the driver of this vehicle.', ['in_vehicle'] = 'you must sit in a vehicle.', ['wrong_point'] = 'you are not at the right point of delivery.', ['max_limit'] = 'you cannot carry more ~y~%s~s~', diff --git a/server/main.lua b/server/main.lua index b383a65b..6463a136 100644 --- a/server/main.lua +++ b/server/main.lua @@ -21,13 +21,13 @@ local function Work(source, item) end local requiredItemQtty = 0 - if item[1].requires ~= "nothing" then + if item[1].requires ~= 'nothing' then requiredItemQtty = xPlayer.getInventoryItem(item[1].requires).count end if item[i].name ~= _U('delivery') and itemQtty >= item[i].max then xPlayer.showNotification(_U('max_limit', item[i].name)) - elseif item[i].requires ~= "nothing" and requiredItemQtty <= 0 then + elseif item[i].requires ~= 'nothing' and requiredItemQtty <= 0 then xPlayer.showNotification(_U('not_enough', item[1].requires_name)) else if item[i].name ~= _U('delivery') then @@ -46,7 +46,7 @@ local function Work(source, item) end end - if item[1].requires ~= "nothing" then + if item[1].requires ~= 'nothing' then local itemToRemoveQtty = xPlayer.getInventoryItem(item[1].requires).count if itemToRemoveQtty > 0 then xPlayer.removeInventoryItem(item[1].requires, item[1].remove) @@ -78,7 +78,7 @@ RegisterServerEvent('esx_jobs:caution') AddEventHandler('esx_jobs:caution', function(cautionType, cautionAmount, spawnPoint, vehicle) local xPlayer = ESX.GetPlayerFromId(source) - if cautionType == "take" then + if cautionType == 'take' then TriggerEvent('esx_addonaccount:getAccount', 'caution', xPlayer.identifier, function(account) xPlayer.removeAccountMoney('bank', cautionAmount) account.addMoney(cautionAmount) @@ -86,7 +86,7 @@ AddEventHandler('esx_jobs:caution', function(cautionType, cautionAmount, spawnPo xPlayer.showNotification(_U('bank_deposit_taken', ESX.Math.GroupDigits(cautionAmount))) TriggerClientEvent('esx_jobs:spawnJobVehicle', source, spawnPoint, vehicle) - elseif cautionType == "give_back" then + elseif cautionType == 'give_back' then if cautionAmount > 1 then print(('esx_jobs: %s is using cheat engine!'):format(xPlayer.identifier)) From 5e8b248e0a51ece35de2d43440e998651ff9c167 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 7 Dec 2019 12:44:36 +0100 Subject: [PATCH 04/17] Completed server-sided code, and fixed serious caution flaws --- README.md | 2 +- __resource.lua | 25 +++- client/main.lua | 49 ++++--- config.lua | 2 + {client/jobs => jobs}/fisherman.lua | 4 +- {client/jobs => jobs}/fueler.lua | 8 +- {client/jobs => jobs}/lumberjack.lua | 8 +- {client/jobs => jobs}/miner.lua | 14 +- {client/jobs => jobs}/reporter.lua | 0 {client/jobs => jobs}/slaughterer.lua | 8 +- {client/jobs => jobs}/tailor.lua | 8 +- locales/br.lua | 1 + locales/en.lua | 1 + locales/fi.lua | 1 + locales/fr.lua | 1 + locales/sv.lua | 1 + server/main.lua | 180 +++++++++++++++----------- 17 files changed, 181 insertions(+), 132 deletions(-) rename {client/jobs => jobs}/fisherman.lua (98%) rename {client/jobs => jobs}/fueler.lua (98%) rename {client/jobs => jobs}/lumberjack.lua (97%) rename {client/jobs => jobs}/miner.lua (97%) rename {client/jobs => jobs}/reporter.lua (100%) rename {client/jobs => jobs}/slaughterer.lua (97%) rename {client/jobs => jobs}/tailor.lua (98%) diff --git a/README.md b/README.md index 893f0492..9b58d298 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ start esx_jobs ### License esx_jobs - jobs -Copyright (C) 2015-2018 Jérémie N'gadi +Copyright (C) 2015-2019 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/__resource.lua b/__resource.lua index 5abaf658..2cf3ecb0 100644 --- a/__resource.lua +++ b/__resource.lua @@ -12,6 +12,15 @@ server_scripts { 'locales/fr.lua', 'locales/sv.lua', 'config.lua', + + 'jobs/fisherman.lua', + 'jobs/fueler.lua', + 'jobs/lumberjack.lua', + 'jobs/miner.lua', + 'jobs/reporter.lua', + 'jobs/slaughterer.lua', + 'jobs/tailor.lua', + 'server/main.lua' } @@ -23,13 +32,15 @@ client_scripts { 'locales/fr.lua', 'locales/sv.lua', 'config.lua', - 'client/jobs/fisherman.lua', - 'client/jobs/fueler.lua', - 'client/jobs/lumberjack.lua', - 'client/jobs/miner.lua', - 'client/jobs/reporter.lua', - 'client/jobs/slaughterer.lua', - 'client/jobs/tailor.lua', + + 'jobs/fisherman.lua', + 'jobs/fueler.lua', + 'jobs/lumberjack.lua', + 'jobs/miner.lua', + 'jobs/reporter.lua', + 'jobs/slaughterer.lua', + 'jobs/tailor.lua', + 'client/main.lua' } diff --git a/client/main.lua b/client/main.lua index 1db333c1..492c0a81 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,5 +1,5 @@ -local menuIsShowed, hintIsShowed, hintToDisplay, hasAlreadyEnteredMarker, isInMarker, onDuty, vehicleObjInCaseofDrop, vehicleInCaseofDrop, vehicleMaxHealth -local PlayerData, Blips, JobBlips, myPlate, spawner = {}, {}, {}, {}, 0 +local menuIsShowed, hintIsShowed, hintToDisplay, hasAlreadyEnteredMarker, isInMarker, vehicleObjInCaseofDrop, vehicleInCaseofDrop, vehicleMaxHealth +local PlayerData, Blips, JobBlips, myPlate, onDuty, spawner = {}, {}, {}, {}, false, 0 ESX = nil @@ -55,7 +55,7 @@ function OpenMenu() end) end -AddEventHandler('esx_jobs:action', function(job, zone) +AddEventHandler('esx_jobs:action', function(job, zone, zoneIndex) menuIsShowed = true if zone.Type == 'cloakroom' then OpenMenu() @@ -65,7 +65,7 @@ AddEventHandler('esx_jobs:action', function(job, zone) local playerPed = PlayerPedId() if IsPedOnFoot(playerPed) then - TriggerServerEvent('esx_jobs:startWork', zone.Item) + TriggerServerEvent('esx_jobs:startWork', zoneIndex) else ESX.ShowNotification(_U('foot_work')) end @@ -150,7 +150,7 @@ AddEventHandler('esx_jobs:action', function(job, zone) hintToDisplay = nil hintIsShowed = false - TriggerServerEvent('esx_jobs:startWork', zone.Item) + TriggerServerEvent('esx_jobs:startWork', zoneIndex) end --nextStep(zone.GPS) @@ -195,28 +195,25 @@ function deleteBlips() end function refreshBlips() - local zones = {} - local blipInfo = {} - if PlayerData.job then - for jobKey,jobValues in pairs(Config.Jobs) do + local jobObject = Config.Jobs[PlayerData.job.name] - if jobKey == PlayerData.job.name then - for zoneKey,zoneValues in pairs(jobValues.Zones) do + if jobObject then + for k,v in pairs(jobObject.Zones) do + if v.Blip then + local blip = AddBlipForCoord(v.Pos.x, v.Pos.y, v.Pos.z) - if zoneValues.Blip then - local blip = AddBlipForCoord(zoneValues.Pos.x, zoneValues.Pos.y, zoneValues.Pos.z) - SetBlipSprite (blip, jobValues.BlipInfos.Sprite) - SetBlipScale (blip, 1.2) - SetBlipCategory(blip, 3) - SetBlipColour (blip, jobValues.BlipInfos.Color) - SetBlipAsShortRange(blip, true) + SetBlipSprite (blip, jobObject.BlipInfos.Sprite) + SetBlipScale (blip, 1.2) + SetBlipCategory(blip, 3) + SetBlipColour (blip, jobObject.BlipInfos.Color) + SetBlipAsShortRange(blip, true) - BeginTextCommandSetBlipName('STRING') - AddTextComponentSubstringPlayerName(zoneValues.Name) - EndTextCommandSetBlipName(blip) - table.insert(JobBlips, blip) - end + BeginTextCommandSetBlipName('STRING') + AddTextComponentSubstringPlayerName(v.Name) + EndTextCommandSetBlipName(blip) + + table.insert(JobBlips, blip) end end end @@ -273,7 +270,7 @@ end) Citizen.CreateThread(function() while true do Citizen.Wait(0) - local zones, currentZone, isInMarker = {} + local zones, currentZone, currentZoneIndex, isInMarker = {} local letSleep, playerPed = true, PlayerPedId() local playerCoords = GetEntityCoords(playerPed) @@ -293,14 +290,14 @@ Citizen.CreateThread(function() end if distance < v.Size.x then - letSleep, isInMarker, currentZone = false, true, v + letSleep, isInMarker, currentZone, currentZoneIndex = false, true, v, k break end end if IsControlJustReleased(0, 38) and not menuIsShowed and isInMarker then if onDuty or currentZone.Type == 'cloakroom' or PlayerData.job.name == 'reporter' then - TriggerEvent('esx_jobs:action', PlayerData.job.name, currentZone) + TriggerEvent('esx_jobs:action', PlayerData.job.name, currentZone, currentZoneIndex) end end diff --git a/config.lua b/config.lua index 334f1357..676570e8 100644 --- a/config.lua +++ b/config.lua @@ -3,6 +3,8 @@ Config.DrawDistance = 100.0 Config.Locale = 'fr' Config.Jobs = {} +Config.MaxCaution = 10000 -- the max caution allowed + Config.PublicZones = { EnterBuilding = { diff --git a/client/jobs/fisherman.lua b/jobs/fisherman.lua similarity index 98% rename from client/jobs/fisherman.lua rename to jobs/fisherman.lua index 207bc146..f86e332d 100644 --- a/client/jobs/fisherman.lua +++ b/jobs/fisherman.lua @@ -51,7 +51,7 @@ Config.Jobs.fisherman = { { name = _U('fm_fish'), db_name= 'fish', - time = 2000, + time = 2, max = 100, add = 1, remove = 1, @@ -160,7 +160,7 @@ Config.Jobs.fisherman = { Item = { { name = _U('delivery'), - time = 500, + time = 0.5, remove = 1, max = 100, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua price = 11, diff --git a/client/jobs/fueler.lua b/jobs/fueler.lua similarity index 98% rename from client/jobs/fueler.lua rename to jobs/fueler.lua index f34922c5..8b6edeb6 100644 --- a/client/jobs/fueler.lua +++ b/jobs/fueler.lua @@ -42,7 +42,7 @@ Config.Jobs.fueler = { { name = _U('f_fuel'), db_name = 'petrol', - time = 5000, + time = 5, max = 24, add = 1, remove = 1, @@ -67,7 +67,7 @@ Config.Jobs.fueler = { { name = _U('f_fuel_refine'), db_name = 'petrol_raffin', - time = 5000, + time = 5, max = 24, add = 1, remove = 2, @@ -92,7 +92,7 @@ Config.Jobs.fueler = { { name = _U('f_gas'), db_name = 'essence', - time = 5000, + time = 5, max = 24, add = 2, remove = 1, @@ -158,7 +158,7 @@ Config.Jobs.fueler = { Item = { { name = _U('delivery'), - time = 500, + time = 0.5, remove = 1, max = 100, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua price = 61, diff --git a/client/jobs/lumberjack.lua b/jobs/lumberjack.lua similarity index 97% rename from client/jobs/lumberjack.lua rename to jobs/lumberjack.lua index e6892c27..5eca3b24 100644 --- a/client/jobs/lumberjack.lua +++ b/jobs/lumberjack.lua @@ -41,7 +41,7 @@ Config.Jobs.lumberjack = { { name = _U('lj_wood'), db_name = 'wood', - time = 3000, + time = 3, max = 20, add = 1, remove = 1, @@ -65,7 +65,7 @@ Config.Jobs.lumberjack = { { name = _U('lj_cutwood'), db_name = 'cutted_wood', - time = 5000, + time = 5, max = 20, add = 1, remove = 1, @@ -89,7 +89,7 @@ Config.Jobs.lumberjack = { { name = _U('lj_planks'), db_name = 'packaged_plank', - time = 4000, + time = 4, max = 100, add = 5, remove = 1, @@ -152,7 +152,7 @@ Config.Jobs.lumberjack = { Item = { { name = _U('delivery'), - time = 500, + time = 0.5, remove = 1, max = 100, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua price = 13, diff --git a/client/jobs/miner.lua b/jobs/miner.lua similarity index 97% rename from client/jobs/miner.lua rename to jobs/miner.lua index a26041fe..edbffb6d 100644 --- a/client/jobs/miner.lua +++ b/jobs/miner.lua @@ -42,7 +42,7 @@ Config.Jobs.miner = { { name = _U('m_rock'), db_name = 'stone', - time = 3000, + time = 3, max = 7, add = 1, remove = 1, @@ -67,7 +67,7 @@ Config.Jobs.miner = { { name = _U('m_washrock'), db_name = 'washed_stone', - time = 5000, + time = 5, max = 7, add = 1, remove = 1, @@ -92,7 +92,7 @@ Config.Jobs.miner = { { name = _U('m_copper'), db_name = 'copper', - time = 4000, + time = 4, max = 56, add = 8, remove = 1, @@ -179,7 +179,7 @@ Config.Jobs.miner = { Item = { { name = _U('delivery'), - time = 500, + time = 0.5, remove = 1, max = 56, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua price = 5, @@ -205,7 +205,7 @@ Config.Jobs.miner = { Item = { { name = _U('delivery'), - time = 500, + time = 0.5, remove = 1, max = 42, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua price = 9, @@ -231,7 +231,7 @@ Config.Jobs.miner = { Item = { { name = _U('delivery'), - time = 500, + time = 0.5, remove = 1, max = 21, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua price = 25, @@ -257,7 +257,7 @@ Config.Jobs.miner = { Item = { { name = _U('delivery'), - time = 500, + time = 0.5, remove = 1, max = 50, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua price = 250, diff --git a/client/jobs/reporter.lua b/jobs/reporter.lua similarity index 100% rename from client/jobs/reporter.lua rename to jobs/reporter.lua diff --git a/client/jobs/slaughterer.lua b/jobs/slaughterer.lua similarity index 97% rename from client/jobs/slaughterer.lua rename to jobs/slaughterer.lua index 1f7c26f2..d07077c6 100644 --- a/client/jobs/slaughterer.lua +++ b/jobs/slaughterer.lua @@ -40,7 +40,7 @@ Config.Jobs.slaughterer = { { name = _U('s_alive_chicken'), db_name = 'alive_chicken', - time = 3000, + time = 3, max = 20, add = 1, remove = 1, @@ -64,7 +64,7 @@ Config.Jobs.slaughterer = { { name = _U('s_slaughtered_chicken'), db_name = 'slaughtered_chicken', - time = 5000, + time = 5, max = 20, add = 1, remove = 1, @@ -88,7 +88,7 @@ Config.Jobs.slaughterer = { { name = _U('s_packagechicken'), db_name = 'packaged_chicken', - time = 4000, + time = 4, max = 100, add = 5, remove = 1, @@ -151,7 +151,7 @@ Config.Jobs.slaughterer = { Item = { { name = _U('delivery'), - time = 500, + time = 0.5, remove = 1, max = 100, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua price = 23, diff --git a/client/jobs/tailor.lua b/jobs/tailor.lua similarity index 98% rename from client/jobs/tailor.lua rename to jobs/tailor.lua index 2d805c7e..bac08078 100644 --- a/client/jobs/tailor.lua +++ b/jobs/tailor.lua @@ -42,7 +42,7 @@ Config.Jobs.tailor = { { name = _U('dd_wool'), db_name = 'wool', - time = 3000, + time = 3, max = 40, add = 1, remove = 1, @@ -67,7 +67,7 @@ Config.Jobs.tailor = { { name = _U('dd_fabric'), db_name = 'fabric', - time = 5000, + time = 5, max = 80, add = 2, remove = 1, @@ -92,7 +92,7 @@ Config.Jobs.tailor = { { name = _U('dd_clothing'), db_name = 'clothe', - time = 4000, + time = 4, max = 40, add = 1, remove = 2, @@ -158,7 +158,7 @@ Config.Jobs.tailor = { Item = { { name = _U('delivery'), - time = 500, + time = 0.5, remove = 1, max = 100, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua price = 40, diff --git a/locales/br.lua b/locales/br.lua index feff893a..013c4d1d 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -6,6 +6,7 @@ Locales['br'] = { ['job_wear'] = 'colocar uniforme', ['bank_deposit_returned'] = 'um depósito de segurança de ~g~$%s~s~ foi devolvido a você.', ['bank_deposit_taken'] = 'um depósito de segurança de ~g~$%s~s~ foi tirado de você.', + ['caution_afford'] = 'you cannot afford the caution of ~g~$%s~s~', ['foot_work'] = 'você deve estar a pé para poder trabalhar.', ['next_point'] = 'vá para o próximo passo depois de completar este.', ['not_your_vehicle'] = 'este não é o seu veículo ou você deve ser um motorista.', diff --git a/locales/en.lua b/locales/en.lua index 98cc6e61..5d04ac4b 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -6,6 +6,7 @@ Locales['en'] = { ['job_wear'] = 'workers clothes', ['bank_deposit_returned'] = 'a security deposit of ~g~$%s~s~ was returned to you.', ['bank_deposit_taken'] = 'a security deposit of ~r~$%s~s~ was taken from you.', + ['caution_afford'] = 'you cannot afford the caution of ~g~$%s~s~', ['foot_work'] = 'you have to be on foot to be able to work.', ['next_point'] = 'go to the next step after completing this one.', ['not_your_vehicle'] = 'you are not the driver of this vehicle.', diff --git a/locales/fi.lua b/locales/fi.lua index 2d84df38..51236475 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -6,6 +6,7 @@ Locales['fi'] = { ['job_wear'] = 'työvaatteet', ['bank_deposit_returned'] = 'vakuuden summa ~g~€%s~s~ palautettiin sinulle.', ['bank_deposit_taken'] = 'vakuuden summa ~r~€%s~s~ otettiin sinulta.', + ['caution_afford'] = 'you cannot afford the caution of ~g~$%s~s~', ['foot_work'] = 'sinun täytyy olla jalan, jotta voit työskennellä', ['next_point'] = 'mene seuraavaan pisteeseen kun olet valmis täällä', ['not_your_vehicle'] = 'tämä ei ole sinun ajoneuvo tai et ole sen kuski', diff --git a/locales/fr.lua b/locales/fr.lua index 55ebe0ed..7ec5fd24 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -6,6 +6,7 @@ Locales['fr'] = { ['job_wear'] = 'tenue de travail', ['bank_deposit_returned'] = 'une caution de ~g~$%s~s~ vous a été rendue.', ['bank_deposit_taken'] = 'une caution de ~g~$%s~s~ vous a été prélevée.', + ['caution_afford'] = 'you cannot afford the caution of ~g~$%s~s~', ['foot_work'] = 'vous devez être à pied pour pouvoir travailler.', ['next_point'] = 'rendez-vous à la prochaine étape après avoir complété celle-ci.', ['not_your_vehicle'] = 'ce n\'est pas votre véhicule ou vous devez être conducteur.', diff --git a/locales/sv.lua b/locales/sv.lua index 2d0c451f..49a99e88 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -6,6 +6,7 @@ Locales['sv'] = { ['job_wear'] = 'arbetskläder', ['bank_deposit_returned'] = 'en deposition på ~g~%s SEK~s~ har återvänts till dig.', ['bank_deposit_taken'] = 'en deposition på ~r~%s SEK~s~ togs från dig.', + ['caution_afford'] = 'you cannot afford the caution of ~g~$%s~s~', ['foot_work'] = 'du måste vara till fots för att kunna arbeta.', ['next_point'] = 'gå till nästa steg efter att du har avslutat här.', ['not_your_vehicle'] = 'det här är inte ditt fordon eller så måste du vara föraren.', diff --git a/server/main.lua b/server/main.lua index 6463a136..2541f01c 100644 --- a/server/main.lua +++ b/server/main.lua @@ -1,105 +1,139 @@ -local PlayersWorking = {} +local playersWorking = {} + ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) -local function Work(source, item) +Citizen.CreateThread(function() + while true do + Citizen.Wait(1000) + local timeNow = os.clock() - SetTimeout(item[1].time, function() + for playerId,data in pairs(playersWorking) do + Citizen.Wait(10) + local xPlayer = ESX.GetPlayerFromId(playerId) - if PlayersWorking[source] == true then + -- is player still online? + if xPlayer then + local distance = #(xPlayer.getCoords(true) - data.zoneCoords) - local xPlayer = ESX.GetPlayerFromId(source) - if xPlayer == nil then - return - end + -- player still within zone limits? + if distance <= data.zoneMaxDistance then + -- calculate the elapsed time + local timeElapsed = timeNow - data.time - for i=1, #item, 1 do - local itemQtty = 0 - if item[i].name ~= _U('delivery') then - itemQtty = xPlayer.getInventoryItem(item[i].db_name).count - end + if timeElapsed > data.jobItem[1].time then + data.time = os.clock() - local requiredItemQtty = 0 - if item[1].requires ~= 'nothing' then - requiredItemQtty = xPlayer.getInventoryItem(item[1].requires).count - end + for k,v in ipairs(data.jobItem) do + local itemQtty, requiredItemQtty = 0, 0 - if item[i].name ~= _U('delivery') and itemQtty >= item[i].max then - xPlayer.showNotification(_U('max_limit', item[i].name)) - elseif item[i].requires ~= 'nothing' and requiredItemQtty <= 0 then - xPlayer.showNotification(_U('not_enough', item[1].requires_name)) - else - if item[i].name ~= _U('delivery') then - -- Chances to drop the item - if item[i].drop == 100 then - xPlayer.addInventoryItem(item[i].db_name, item[i].add) - else - local chanceToDrop = math.random(100) - if chanceToDrop <= item[i].drop then - xPlayer.addInventoryItem(item[i].db_name, item[i].add) + if v.name ~= _U('delivery') then + itemQtty = xPlayer.getInventoryItem(v.db_name).count + end + + if data.jobItem[1].requires ~= 'nothing' then + requiredItemQtty = xPlayer.getInventoryItem(data.jobItem[1].requires).count + end + + if v.name ~= _U('delivery') and itemQtty >= v.max then + xPlayer.showNotification(_U('max_limit', v.name)) + playersWorking[playerId] = nil + elseif v.requires ~= 'nothing' and requiredItemQtty <= 0 then + xPlayer.showNotification(_U('not_enough', data.jobItem[1].requires_name)) + playersWorking[playerId] = nil + else + if v.name ~= _U('delivery') then + -- chances to drop the item + if v.drop == 100 then + xPlayer.addInventoryItem(v.db_name, v.add) + else + local chanceToDrop = math.random(100) + if chanceToDrop <= v.drop then + xPlayer.addInventoryItem(v.db_name, v.add) + end + end + else + xPlayer.addMoney(v.price) + end + end + end + + if data.jobItem[1].requires ~= 'nothing' then + local itemToRemoveQtty = xPlayer.getInventoryItem(data.jobItem[1].requires).count + if itemToRemoveQtty > 0 then + xPlayer.removeInventoryItem(data.jobItem[1].requires, data.jobItem[1].remove) end end - else - xPlayer.addMoney(item[i].price) end + else + playersWorking[playerId] = nil end + else + playersWorking[playerId] = nil end - - if item[1].requires ~= 'nothing' then - local itemToRemoveQtty = xPlayer.getInventoryItem(item[1].requires).count - if itemToRemoveQtty > 0 then - xPlayer.removeInventoryItem(item[1].requires, item[1].remove) - end - end - - Work(source, item) - end - end) -end + end +end) RegisterServerEvent('esx_jobs:startWork') -AddEventHandler('esx_jobs:startWork', function(item) - if not PlayersWorking[source] then - PlayersWorking[source] = true - Work(source, item) - else - print(('esx_jobs: %s attempted to exploit the marker!'):format(GetPlayerIdentifiers(source)[1])) +AddEventHandler('esx_jobs:startWork', function(zoneIndex) + if not playersWorking[source] then + local xPlayer = ESX.GetPlayerFromId(source) + + if xPlayer then + local jobObject = Config.Jobs[xPlayer.job.name] + + if jobObject then + local jobZone = jobObject.Zones[zoneIndex] + + if jobZone and jobZone.Item then + playersWorking[source] = { + jobItem = jobZone.Item, + zoneCoords = vector3(jobZone.Pos.x, jobZone.Pos.y, jobZone.Pos.z), + zoneMaxDistance = jobZone.Size.x, + time = os.clock() + } + end + end + end end end) RegisterServerEvent('esx_jobs:stopWork') AddEventHandler('esx_jobs:stopWork', function() - PlayersWorking[source] = false + if playersWorking[source] then + playersWorking[source] = nil + end end) -RegisterServerEvent('esx_jobs:caution') +RegisterNetEvent('esx_jobs:caution') AddEventHandler('esx_jobs:caution', function(cautionType, cautionAmount, spawnPoint, vehicle) local xPlayer = ESX.GetPlayerFromId(source) if cautionType == 'take' then - TriggerEvent('esx_addonaccount:getAccount', 'caution', xPlayer.identifier, function(account) - xPlayer.removeAccountMoney('bank', cautionAmount) - account.addMoney(cautionAmount) - end) - - xPlayer.showNotification(_U('bank_deposit_taken', ESX.Math.GroupDigits(cautionAmount))) - TriggerClientEvent('esx_jobs:spawnJobVehicle', source, spawnPoint, vehicle) - elseif cautionType == 'give_back' then - - if cautionAmount > 1 then - print(('esx_jobs: %s is using cheat engine!'):format(xPlayer.identifier)) - return + if cautionAmount <= Config.MaxCaution and cautionAmount > 0 then + TriggerEvent('esx_addonaccount:getAccount', 'caution', xPlayer.identifier, function(account) + if xPlayer.getAccount('bank').money >= cautionAmount then + xPlayer.removeAccountMoney('bank', cautionAmount) + account.addMoney(cautionAmount) + xPlayer.showNotification(_U('bank_deposit_taken', ESX.Math.GroupDigits(cautionAmount))) + TriggerClientEvent('esx_jobs:spawnJobVehicle', xPlayer.source, spawnPoint, vehicle) + else + xPlayer.showNotification(_U('caution_afford', ESX.Math.GroupDigits(cautionAmount))) + end + end) + end + elseif cautionType == 'give_back' then + if cautionAmount <= 1 and cautionAmount > 0 then + TriggerEvent('esx_addonaccount:getAccount', 'caution', xPlayer.identifier, function(account) + local caution = account.money + local toGive = ESX.Math.Round(caution * cautionAmount) + + xPlayer.addAccountMoney('bank', toGive) + account.removeMoney(toGive) + TriggerClientEvent('esx:showNotification', source, _U('bank_deposit_returned', ESX.Math.GroupDigits(toGive))) + end) end - - TriggerEvent('esx_addonaccount:getAccount', 'caution', xPlayer.identifier, function(account) - local caution = account.money - local toGive = ESX.Math.Round(caution * cautionAmount) - - xPlayer.addAccountMoney('bank', toGive) - account.removeMoney(toGive) - xPlayer.showNotification(_U('bank_deposit_returned', ESX.Math.GroupDigits(toGive))) - end) end end) From 2ba4cafcafa7be33cba8b66373d11d5c9c37efef Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:08:25 +0100 Subject: [PATCH 05/17] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) rename __resource.lua => fxmanifest.lua (92%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 92% rename from __resource.lua rename to fxmanifest.lua index 2cf3ecb0..b4f6e1cc 100644 --- a/__resource.lua +++ b/fxmanifest.lua @@ -1,4 +1,6 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' +fx_version 'adamant' + +game 'gta5' description 'ESX Jobs' @@ -49,4 +51,4 @@ dependencies { 'esx_addonaccount', 'skinchanger', 'esx_skin' -} \ No newline at end of file +} From cf23d9c2ed5974f9179b3e4c7fd150c40d0a95fe Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 6 Mar 2020 21:03:15 +0100 Subject: [PATCH 06/17] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9b58d298..019ba15d 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ start esx_jobs ### License esx_jobs - jobs -Copyright (C) 2015-2019 Jérémie N'gadi +Copyright (C) 2015-2020 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. From dc242b97c3289159838f1439799316003e91af59 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 6 Mar 2020 21:08:39 +0100 Subject: [PATCH 07/17] Added Spanish translation thanks to @JuannmaCh Co-Authored-By: JuannmaCh --- fxmanifest.lua | 2 + locales/es.lua | 115 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 117 insertions(+) create mode 100644 locales/es.lua diff --git a/fxmanifest.lua b/fxmanifest.lua index b4f6e1cc..0218f333 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -10,6 +10,7 @@ server_scripts { '@es_extended/locale.lua', 'locales/br.lua', 'locales/en.lua', + 'locales/es.lua', 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', @@ -31,6 +32,7 @@ client_scripts { 'locales/br.lua', 'locales/fi.lua', 'locales/en.lua', + 'locales/es.lua', 'locales/fr.lua', 'locales/sv.lua', 'config.lua', diff --git a/locales/es.lua b/locales/es.lua new file mode 100644 index 00000000..ff99dad7 --- /dev/null +++ b/locales/es.lua @@ -0,0 +1,115 @@ +Locales['es'] = { + -- Global menus + ['cloakroom'] = 'guardarropas', + ['cloak_change'] = 'presiona ~INPUT_PICKUP~ para cambiarte la ropa.', + ['citizen_wear'] = 'ropa de civil', + ['job_wear'] = 'ropa de trabajo', + ['bank_deposit_returned'] = 'un deposito de seguro de ~g~$%s~s~ se te devolvió.', + ['bank_deposit_taken'] = 'un deposito de seguro de ~r~$%s~s~ se te tomó.', + ['caution_afford'] = 'no puedes pagar el deposito de seguro de ~g~$%s~s~', + ['foot_work'] = 'debes estar en pie para trabajar.', + ['next_point'] = 've al siguiente punto tras terminar este.', + ['not_your_vehicle'] = 'no eres el conductor.', + ['in_vehicle'] = 'debes estar en un vehiculo.', + ['wrong_point'] = 'no estas en el punto correcto de entrega.', + ['max_limit'] = 'no puedes llevar mas ~y~%s~s~', + ['not_enough'] = 'no tienes suficientes ~y~%s~s~ para continuar esta tarea.', + ['spawn_veh'] = 'spawnear vehiculo', + ['spawn_veh_button'] = 'presiona ~INPUT_PICKUP~ para pedir el vehiculo de entrega.', + ['spawn_truck_button'] = 'presiona ~INPUT_PICKUP~ para spawnear un camion.', + ['spawn_blocked'] = 'el punto de spawn esta bloqueado!', + ['service_vh'] = 'vehiculo de servicio', + ['return_vh'] = 'devolver vehiculo', + ['return_vh_button'] = 'presiona ~INPUT_PICKUP~ para devolver vehiculo.', + ['delivery_point'] = 'punto de entrega', + ['delivery'] = 'entrega', + ['public_enter'] = 'presiona ~INPUT_PICKUP~ para entrar al edificio.', + ['public_leave'] = 'presiona ~INPUT_PICKUP~ para ir a la entrada del edificio.', + + -- Lumber Jack job + ['lj_locker_room'] = 'guardarropas', + ['lj_mapblip'] = 'pila de madera', + ['lj_wood'] = 'madera', + ['lj_pickup'] = 'presiona ~INPUT_PICKUP~ para agarrar madera.', + ['lj_cutwood'] = 'cortar madera', + ['lj_cutwood_button'] = 'presiona ~INPUT_PICKUP~ para cortar madera.', + ['lj_board'] = 'tablas', + ['lj_planks'] = 'empaquetar', + ['lj_cutwood'] = 'cortar madera', + ['lj_pick_boards'] = 'presiona ~INPUT_PICKUP~ para agarrar tablas.', + ['lj_deliver_button'] = 'presiona ~INPUT_PICKUP~ para entregar tablas.', + + -- Fisherman + ['fm_fish_locker'] = 'guardarropas', + ['fm_fish'] = 'pescar', + ['fm_fish_area'] = 'area de pesca', + ['fm_fish_button'] = 'presiona ~INPUT_PICKUP~ para pescar.', + ['fm_spawnboat_title'] = 'spawnear bote', + ['fm_spawnboat'] = 'presiona ~INPUT_PICKUP~ para pedir un bote.', + ['fm_boat_title'] = 'bote', + ['fm_boat_return_title'] = 'devolver bote', + ['fm_boat_return_button'] = 'presiona ~INPUT_PICKUP~ para devolver un bote.', + ['fm_deliver_fish'] = 'presiona ~INPUT_PICKUP~ para entregar pescados.', + + -- Fuel + ['f_oil_refiner'] = 'guardarropas', + ['f_drill_oil'] = 'agujerear para encontrar petroleo', + ['f_fuel'] = 'petroleo', + ['f_drillbutton'] = 'presiona ~INPUT_PICKUP~ para agujerear.', + ['f_fuel_refine'] = 'refinar petroleo', + ['f_refine_fuel_button'] = 'presiona ~INPUT_PICKUP~ para refinar.', + ['f_fuel_mixture'] = 'mezclar petroleo refinado', + ['f_gas'] = 'gas', + ['f_fuel_mixture_button'] = 'presiona ~INPUT_PICKUP~ para mezclar petroleo.', + ['f_deliver_gas'] = 'entregar gas', + ['f_deliver_gas_button'] = 'presiona ~INPUT_PICKUP~ para entregar gasolina.', + + -- Miner + ['m_miner_locker'] = 'guardarropas', + ['m_rock'] = 'roca', + ['m_pickrocks'] = 'presiona ~INPUT_PICKUP~ para agarrar rocas.', + ['m_washrock'] = 'lavado de rocas', + ['m_rock_button'] = 'presiona ~INPUT_PICKUP~ para lavar rocas.', + ['m_rock_smelting'] = 'derretir rocas', + ['m_copper'] = 'cobre', + ['m_sell_copper'] = 'vender cobre', + ['m_deliver_copper'] = 'presiona ~INPUT_PICKUP~ para entregar el cobre.', + ['m_iron'] = 'hierro', + ['m_sell_iron'] = 'vender hierro', + ['m_deliver_iron'] = 'presiona ~INPUT_PICKUP~ para entregar el hierro.', + ['m_gold'] = 'oro', + ['m_sell_gold'] = 'vender oro', + ['m_deliver_gold'] = 'presiona ~INPUT_PICKUP~ para entregar oro.', + ['m_diamond'] = 'diamantes', + ['m_sell_diamond'] = 'vender diamantes', + ['m_deliver_diamond'] = 'presiona ~INPUT_PICKUP~ para entregar los diamantes.', + ['m_melt_button'] = 'presiona ~INPUT_PICKUP~ para derretir rocas.', + + -- Reporter + ['reporter_name'] = 'periódico San Andreas', + ['reporter_garage'] = 'presiona ~INPUT_PICKUP~ para ir al garage.', + + -- Slaughterer + ['s_slaughter_locker'] = 'guardarropas', + ['s_hen'] = 'gGallinero', + ['s_alive_chicken'] = 'pollos vivos', + ['s_catch_hen'] = 'presiona ~INPUT_PICKUP~ para agarrar pollos vivos.', + ['s_slaughtered_chicken'] = 'pollo listo para empaquetar', + ['s_chop_animal'] = 'presiona ~INPUT_PICKUP~ para cortar los pollos.', + ['s_slaughtered'] = 'matadero', + ['s_package'] = 'empaquetando', + ['s_packagechicken'] = 'pollo en bandeja', + ['s_unpackaged'] = 'pollo para empaquetar', + ['s_unpackaged_button'] = 'presiona ~INPUT_PICKUP~ para poner el pollo en una bandeja.', + ['s_deliver'] = 'presiona ~INPUT_PICKUP~ para entregar bandejas de pollos.', + + -- Dress Designer + ['dd_dress_locker'] = 'guardarropas', + ['dd_wool'] = 'lana', + ['dd_pickup'] = 'presiona ~INPUT_PICKUP~ para agarrar lana.', + ['dd_fabric'] = 'tela', + ['dd_makefabric'] = 'presiona ~INPUT_PICKUP~ para hacer tela.', + ['dd_clothing'] = 'ropa', + ['dd_makeclothing'] = 'presiona ~INPUT_PICKUP~ para agarrar ropa.', + ['dd_deliver_clothes'] = 'presiona ~INPUT_PICKUP~ para entregar ropa.', +} From bc5bf99d4bd52daf8efe2663ea180ae0f2406ad9 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 26 Mar 2020 12:32:35 +0100 Subject: [PATCH 08/17] Fixed sql file for latest ESX, fixes #108 --- localization/br_esx_jobs.sql | 40 ++++++++++++++++++------------------ localization/de_esx_jobs.sql | 40 ++++++++++++++++++------------------ localization/en_esx_jobs.sql | 38 +++++++++++++++++----------------- localization/fi_esx_jobs.sql | 40 ++++++++++++++++++------------------ localization/sv_esx_jobs.sql | 40 ++++++++++++++++++------------------ 5 files changed, 99 insertions(+), 99 deletions(-) diff --git a/localization/br_esx_jobs.sql b/localization/br_esx_jobs.sql index 7892cbc6..a072620c 100644 --- a/localization/br_esx_jobs.sql +++ b/localization/br_esx_jobs.sql @@ -24,24 +24,24 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_ ('slaughterer',0,'employee','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', 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), - ('wool', 'Lã', 40), - ('fabric', 'Tecido', 80), - ('clothe', 'Roupa', 40) +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('alive_chicken', 'Frango Vivo', 1), + ('slaughtered_chicken', 'Frango Abatido', 1), + ('packaged_chicken', 'Frango na Bandeja', 1), + ('fish', 'Peixe', 1), + ('stone', 'Pedra', 1), + ('washed_stone', 'Pedra Limpa', 1), + ('copper', 'Cobre', 1), + ('iron', 'Ferro', 1), + ('gold', 'Ouro', 1), + ('diamond', 'Diamante', 1), + ('wood', 'Madeira', 1), + ('cutted_wood', 'Madeira Cortada', 1), + ('packaged_plank', 'Tábua Embalada', 1), + ('petrol', 'Petroleo', 1), + ('petrol_raffin', 'Petroleo Refinado', 1), + ('essence', 'Gasolina', 1), + ('wool', 'Lã', 1), + ('fabric', 'Tecido', 1), + ('clothe', 'Roupa', 1) ; diff --git a/localization/de_esx_jobs.sql b/localization/de_esx_jobs.sql index 9ea10827..2613a1e5 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,'employee','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`, `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), - ('wool', 'Wolle', 40), - ('fabric', 'Tuch', 80), - ('clothe', 'Kleidung', 40) +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('alive_chicken', 'lebendes Huhn', 1), + ('slaughtered_chicken', 'geschlachtetes Huhn', 1), + ('packaged_chicken', 'Hähnchenfilet', 1), + ('fish', 'Fisch', 1), + ('stone', 'Felsbrocken', 1), + ('washed_stone', 'gewaschener Felsbrocken', 1), + ('copper', 'Kupfer', 1), + ('iron', 'Eisen', 1), + ('gold', 'Gold', 1), + ('diamond', 'Diamant', 1), + ('wood', 'Holz', 1), + ('cutted_wood', 'Holzstämme', 1), + ('packaged_plank', 'Bretterpaket', 1), + ('petrol', 'Öl', 1), + ('petrol_raffin', 'bearbeitetes Öl', 1), + ('essence', 'Benzin', 1), + ('wool', 'Wolle', 1), + ('fabric', 'Tuch', 1), + ('clothe', 'Kleidung', 1) ; diff --git a/localization/en_esx_jobs.sql b/localization/en_esx_jobs.sql index 89cd925f..43fa050e 100644 --- a/localization/en_esx_jobs.sql +++ b/localization/en_esx_jobs.sql @@ -25,23 +25,23 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_ ; 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), - ('wool', 'wool', 40), - ('fabric', 'fabric', 80), - ('clothe', 'cloth', 40) + ('alive_chicken', 'Living chicken', 1), + ('slaughtered_chicken', 'Slaughtered chicken', 1), + ('packaged_chicken', 'Chicken fillet', 1), + ('fish', 'Fish', 1), + ('stone', 'Stone', 1), + ('washed_stone', 'Washed stone', 1), + ('copper', 'Copper', 1), + ('iron', 'Iron', 1), + ('gold', 'Gold', 1), + ('diamond', 'Diamond', 1), + ('wood', 'Wood', 1), + ('cutted_wood', 'Cut wood', 1), + ('packaged_plank', 'Packaged wood', 1), + ('petrol', 'Oil', 1), + ('petrol_raffin', 'Processed oil', 1), + ('essence', 'Gas', 1), + ('wool', 'Wool', 1), + ('fabric', 'Fabric', 1), + ('clothe', 'Cloth', 1) ; diff --git a/localization/fi_esx_jobs.sql b/localization/fi_esx_jobs.sql index 8a751f3c..4a86be05 100644 --- a/localization/fi_esx_jobs.sql +++ b/localization/fi_esx_jobs.sql @@ -24,24 +24,24 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_ ('slaughterer', 0, 'interim', 'Työläinen', 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`, `limit`) VALUES - ('alive_chicken', 'Elävä kana', 20), - ('slaughtered_chicken', 'Teurastettu kana', 20), - ('packaged_chicken', 'Kananfilee', 100), - ('fish', 'Kala', 100), - ('stone', 'Kivi', 7), - ('washed_stone', 'Puhdistettu Kivi', 7), - ('copper', 'Kupari', 56), - ('iron', 'Rauta', 42), - ('gold', 'Kulta', 21), - ('diamond', 'Timantti', 50), - ('wood', 'Puu', 20), - ('cutted_wood', 'Pilkottu Puu', 20), - ('packaged_plank', 'Paketoitu Lankku', 100), - ('petrol', 'Öljy', 24), - ('petrol_raffin', 'Prosessoitu Öljy', 24), - ('essence', 'Polttoöljy', 24), - ('wool', 'Villa', 40), - ('fabric', 'Kangas', 80), - ('clothe', 'Vaate', 40) +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('alive_chicken', 'Elävä kana', 1), + ('slaughtered_chicken', 'Teurastettu kana', 1), + ('packaged_chicken', 'Kananfilee', 1), + ('fish', 'Kala', 1), + ('stone', 'Kivi', 1), + ('washed_stone', 'Puhdistettu Kivi', 1), + ('copper', 'Kupari', 1), + ('iron', 'Rauta', 1), + ('gold', 'Kulta', 1), + ('diamond', 'Timantti', 1), + ('wood', 'Puu', 1), + ('cutted_wood', 'Pilkottu Puu', 1), + ('packaged_plank', 'Paketoitu Lankku', 1), + ('petrol', 'Öljy', 1), + ('petrol_raffin', 'Prosessoitu Öljy', 1), + ('essence', 'Polttoöljy', 1), + ('wool', 'Villa', 1), + ('fabric', 'Kangas', 1), + ('clothe', 'Vaate', 1) ; diff --git a/localization/sv_esx_jobs.sql b/localization/sv_esx_jobs.sql index 7116073a..92ababa6 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, 'employee', '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`, `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), - ('wool', 'ull', 40), - ('fabric', 'tyg', 80), - ('clothe', 'kläde', 40) +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('alive_chicken', 'Levande kyckling', 1), + ('slaughtered_chicken', 'Slaktad kyckling', 1), + ('packaged_chicken', 'Paketerad kyckling', 1), + ('fish', 'Fisk', 1), + ('stone', 'Sten', 1), + ('washed_stone', 'Tvättad sten', 1), + ('copper', 'Koppar', 1), + ('iron', 'Järn', 1), + ('gold', 'Guld', 1), + ('diamond', 'Diamant', 1), + ('wood', 'Trä', 1), + ('cutted_wood', 'Sågat trä', 1), + ('packaged_plank', 'Paketerad trä', 1), + ('petrol', 'Råolja', 1), + ('petrol_raffin', 'Raffinerad olja', 1), + ('essence', 'Gas', 1), + ('wool', 'Ull', 1), + ('fabric', 'Textil', 1), + ('clothe', 'Tyg', 1) ; From 9bcddfed264521147bb240458908ca4e69c9d7f0 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Thu, 26 Mar 2020 12:33:15 +0100 Subject: [PATCH 09/17] Update esx_jobs.sql --- esx_jobs.sql | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/esx_jobs.sql b/esx_jobs.sql index ed88e1aa..70b8ca37 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,'employee','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`, `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), - ('wool', 'Laine', 40), - ('fabric', 'Tissu', 80), - ('clothe', 'Vêtement', 40) +INSERT INTO `items` (`name`, `label`, `weight`) VALUES + ('alive_chicken', 'Poulet vivant', 1), + ('slaughtered_chicken', 'Poulet abattu', 1), + ('packaged_chicken', 'Poulet en barquette', 1), + ('fish', 'Poisson', 1), + ('stone', 'Pierre', 1), + ('washed_stone', 'Pierre Lavée', 1), + ('copper', 'Cuivre', 1), + ('iron', 'Fer', 1), + ('gold', 'Or', 1), + ('diamond', 'Diamant', 1), + ('wood', 'Bois', 1), + ('cutted_wood', 'Bois coupé', 1), + ('packaged_plank', 'Paquet de planches', 1), + ('petrol', 'Pétrole', 1), + ('petrol_raffin', 'Pétrole Raffiné', 1), + ('essence', 'Essence', 1), + ('wool', 'Laine', 1), + ('fabric', 'Tissu', 1), + ('clothe', 'Vêtement', 1) ; From d143cbfaa3581039a6b3b3215df00506da0d6345 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Apr 2020 10:57:09 +0200 Subject: [PATCH 10/17] Update en_esx_jobs.sql --- localization/en_esx_jobs.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/localization/en_esx_jobs.sql b/localization/en_esx_jobs.sql index 43fa050e..81bb5347 100644 --- a/localization/en_esx_jobs.sql +++ b/localization/en_esx_jobs.sql @@ -24,7 +24,7 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_ ('slaughterer', 0, 'employee', '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`, `limit`) VALUES +INSERT INTO `items` (`name`, `label`, `weight`) VALUES ('alive_chicken', 'Living chicken', 1), ('slaughtered_chicken', 'Slaughtered chicken', 1), ('packaged_chicken', 'Chicken fillet', 1), From bc023c0c4dc041946225f2d4340c8ba3d9bda76b Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Apr 2020 16:49:44 +0200 Subject: [PATCH 11/17] Latest ESX code --- esx_jobs.sql | 2 +- localization/br_esx_jobs.sql | 2 +- localization/de_esx_jobs.sql | 2 +- localization/en_esx_jobs.sql | 2 +- localization/fi_esx_jobs.sql | 2 +- localization/sv_esx_jobs.sql | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/esx_jobs.sql b/esx_jobs.sql index 70b8ca37..7d4a4b9a 100644 --- a/esx_jobs.sql +++ b/esx_jobs.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `addon_account` (name, label, shared) VALUES ('caution', 'Caution', 0) diff --git a/localization/br_esx_jobs.sql b/localization/br_esx_jobs.sql index a072620c..aa7edbba 100644 --- a/localization/br_esx_jobs.sql +++ b/localization/br_esx_jobs.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `addon_account` (name, label, shared) VALUES ('caution', 'Deposito', 0) diff --git a/localization/de_esx_jobs.sql b/localization/de_esx_jobs.sql index 2613a1e5..7105f605 100644 --- a/localization/de_esx_jobs.sql +++ b/localization/de_esx_jobs.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `addon_account` (name, label, shared) VALUES ('caution', 'Caution', 0) diff --git a/localization/en_esx_jobs.sql b/localization/en_esx_jobs.sql index 81bb5347..a6fe73eb 100644 --- a/localization/en_esx_jobs.sql +++ b/localization/en_esx_jobs.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `addon_account` (name, label, shared) VALUES ('caution', 'caution', 0) diff --git a/localization/fi_esx_jobs.sql b/localization/fi_esx_jobs.sql index 4a86be05..69191aa7 100644 --- a/localization/fi_esx_jobs.sql +++ b/localization/fi_esx_jobs.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `addon_account` (name, label, shared) VALUES ('caution', 'caution', 0) diff --git a/localization/sv_esx_jobs.sql b/localization/sv_esx_jobs.sql index 92ababa6..ddc1f8aa 100644 --- a/localization/sv_esx_jobs.sql +++ b/localization/sv_esx_jobs.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `addon_account` (name, label, shared) VALUES ('caution', 'caution', 0) From 6cbc37ddf77f15076fefea7a271820af6add99fb Mon Sep 17 00:00:00 2001 From: Berkeratay <64588333+Berkeratay@users.noreply.github.com> Date: Fri, 3 Jul 2020 09:59:30 -0700 Subject: [PATCH 12/17] Vehicle spawns with %100 fuel (#120) * Vehicle spawns with %100 fuel On Jobs Vehicles spawn with random fuel level creates problem for players. This little fix from Legacy fuel solve that problem. * For Native Fuel not Legacy starts with %100 I edited the code based on the request from legacy to native Not tested by me --- client/main.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/main.lua b/client/main.lua index 492c0a81..7f997a57 100644 --- a/client/main.lua +++ b/client/main.lua @@ -244,6 +244,9 @@ AddEventHandler('esx_jobs:spawnJobVehicle', function(spawnPoint, vehicle) myPlate[plate] = true TaskWarpPedIntoVehicle(playerPed, spawnedVehicle, -1) + Citizen.Wait(1) + SetVehicleFuelLevel(vehicle, 100.0) + DecorSetFloat(vehicle, "_FUEL_LEVEL", GetVehicleFuelLevel(vehicle)) if vehicle.HasCaution then vehicleInCaseofDrop = spawnedVehicle From 51eb647e19b5505060cbd3c2135d2ee5e29f1af5 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Fri, 3 Jul 2020 18:59:54 +0200 Subject: [PATCH 13/17] Added czech locale + minor changes (#111) * Fixed uppercase * Added czech language * Added czech locale * Fixed uppercase * Minor cleanup * Minor cleanup * Minor cleanup * Minor cleanup --- fxmanifest.lua | 2 + locales/br.lua | 196 ++++++++++++++++++++++++------------------------ locales/cs.lua | 115 ++++++++++++++++++++++++++++ locales/en.lua | 198 ++++++++++++++++++++++++------------------------- locales/es.lua | 196 ++++++++++++++++++++++++------------------------ locales/fi.lua | 198 ++++++++++++++++++++++++------------------------- locales/fr.lua | 196 ++++++++++++++++++++++++------------------------ locales/sv.lua | 198 ++++++++++++++++++++++++------------------------- 8 files changed, 708 insertions(+), 591 deletions(-) create mode 100644 locales/cs.lua diff --git a/fxmanifest.lua b/fxmanifest.lua index 0218f333..8f8b0317 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -14,6 +14,7 @@ server_scripts { 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', + 'locales/cs.lua', 'config.lua', 'jobs/fisherman.lua', @@ -35,6 +36,7 @@ client_scripts { 'locales/es.lua', 'locales/fr.lua', 'locales/sv.lua', + 'locales/cs.lua', 'config.lua', 'jobs/fisherman.lua', diff --git a/locales/br.lua b/locales/br.lua index 013c4d1d..2c1b838a 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,115 +1,115 @@ Locales['br'] = { -- Global menus - ['cloakroom'] = 'vestiário', - ['cloak_change'] = 'pressione ~INPUT_PICKUP~ mudar de roupa.', - ['citizen_wear'] = 'retirar uniforme', - ['job_wear'] = 'colocar uniforme', - ['bank_deposit_returned'] = 'um depósito de segurança de ~g~$%s~s~ foi devolvido a você.', - ['bank_deposit_taken'] = 'um depósito de segurança de ~g~$%s~s~ foi tirado de você.', - ['caution_afford'] = 'you cannot afford the caution of ~g~$%s~s~', - ['foot_work'] = 'você deve estar a pé para poder trabalhar.', - ['next_point'] = 'vá para o próximo passo depois de completar este.', - ['not_your_vehicle'] = 'este não é o seu veículo ou você deve ser um motorista.', - ['in_vehicle'] = 'você deve estar em um veículo.', - ['wrong_point'] = 'você não está no ponto certo de entrega.', - ['max_limit'] = 'você tem o máximo ~y~%s~s~', - ['not_enough'] = 'você não tem o suficiente ~y~%s~s~ para continuar esta tarefa.', - ['spawn_veh'] = 'veiculo Spawnado', - ['spawn_veh_button'] = 'pressione ~INPUT_PICKUP~ chamar o veículo de entrega.', - ['spawn_truck_button'] = 'pressione ~INPUT_PICKUP~ spawnar o caminhão.', - ['spawn_blocked'] = 'an vehicle is blocking the spawnpoint!', - ['service_vh'] = 'veículo de serviço', - ['return_vh'] = 'veiculo devolvido', - ['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.', + ['cloakroom'] = 'vestiário', + ['cloak_change'] = 'pressione ~INPUT_PICKUP~ mudar de roupa.', + ['citizen_wear'] = 'retirar uniforme', + ['job_wear'] = 'colocar uniforme', + ['bank_deposit_returned'] = 'um depósito de segurança de ~g~$%s~s~ foi devolvido a você.', + ['bank_deposit_taken'] = 'um depósito de segurança de ~g~$%s~s~ foi tirado de você.', + ['caution_afford'] = 'you cannot afford the caution of ~g~$%s~s~', + ['foot_work'] = 'você deve estar a pé para poder trabalhar.', + ['next_point'] = 'vá para o próximo passo depois de completar este.', + ['not_your_vehicle'] = 'este não é o seu veículo ou você deve ser um motorista.', + ['in_vehicle'] = 'você deve estar em um veículo.', + ['wrong_point'] = 'você não está no ponto certo de entrega.', + ['max_limit'] = 'você tem o máximo ~y~%s~s~', + ['not_enough'] = 'você não tem o suficiente ~y~%s~s~ para continuar esta tarefa.', + ['spawn_veh'] = 'veiculo Spawnado', + ['spawn_veh_button'] = 'pressione ~INPUT_PICKUP~ chamar o veículo de entrega.', + ['spawn_truck_button'] = 'pressione ~INPUT_PICKUP~ spawnar o caminhão.', + ['spawn_blocked'] = 'an vehicle is blocking the spawnpoint!', + ['service_vh'] = 'veículo de serviço', + ['return_vh'] = 'veiculo devolvido', + ['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.', -- Lumber Jack job - ['lj_locker_room'] = 'vestiario Lenhador', - ['lj_mapblip'] = 'pilha de madeira', - ['lj_wood'] = 'madeira', - ['lj_pickup'] = 'pressione ~INPUT_PICKUP~ para recuperar madeira.', - ['lj_cutwood'] = 'corte de Madeira', - ['lj_cutwood_button'] = 'pressione ~INPUT_PICKUP~ para cortar madeira.', - ['lj_board'] = 'tábua', - ['lj_planks'] = 'tábua embalada', - ['lj_cutwood'] = 'madeira cortada', - ['lj_pick_boards'] = 'pressione ~INPUT_PICKUP~ para recuperar tábuas.', - ['lj_deliver_button'] = 'pressione ~INPUT_PICKUP~ para entregar as tábuas.', + ['lj_locker_room'] = 'vestiario Lenhador', + ['lj_mapblip'] = 'pilha de madeira', + ['lj_wood'] = 'madeira', + ['lj_pickup'] = 'pressione ~INPUT_PICKUP~ para recuperar madeira.', + ['lj_cutwood'] = 'corte de Madeira', + ['lj_cutwood_button'] = 'pressione ~INPUT_PICKUP~ para cortar madeira.', + ['lj_board'] = 'tábua', + ['lj_planks'] = 'tábua embalada', + ['lj_cutwood'] = 'madeira cortada', + ['lj_pick_boards'] = 'pressione ~INPUT_PICKUP~ para recuperar tábuas.', + ['lj_deliver_button'] = 'pressione ~INPUT_PICKUP~ para entregar as tábuas.', -- Fisherman - ['fm_fish_locker'] = 'vestiario Pescador', - ['fm_fish'] = 'peixe', - ['fm_fish_area'] = 'area de pesca', - ['fm_fish_button'] = 'pressione ~INPUT_PICKUP~ para pescar.', - ['fm_spawnboat_title'] = 'Spawnar Barco', - ['fm_spawnboat'] = 'pressione ~INPUT_PICKUP~ para chamar um barco.', - ['fm_boat_title'] = 'barco', - ['fm_boat_return_title'] = 'devolver barco', - ['fm_boat_return_button'] = 'Pressione ~INPUT_PICKUP~ para devolver o barco.', - ['fm_deliver_fish'] = 'pressione ~INPUT_PICKUP~ para entregar os peixes.', + ['fm_fish_locker'] = 'vestiario Pescador', + ['fm_fish'] = 'peixe', + ['fm_fish_area'] = 'area de pesca', + ['fm_fish_button'] = 'pressione ~INPUT_PICKUP~ para pescar.', + ['fm_spawnboat_title'] = 'Spawnar Barco', + ['fm_spawnboat'] = 'pressione ~INPUT_PICKUP~ para chamar um barco.', + ['fm_boat_title'] = 'barco', + ['fm_boat_return_title'] = 'devolver barco', + ['fm_boat_return_button'] = 'Pressione ~INPUT_PICKUP~ para devolver o barco.', + ['fm_deliver_fish'] = 'pressione ~INPUT_PICKUP~ para entregar os peixes.', -- Fuel - ['f_oil_refiner'] = 'vestiario Refinador', - ['f_drill_oil'] = 'broca de óleo', - ['f_fuel'] = 'óleo', - ['f_drillbutton'] = 'pressione ~INPUT_PICKUP~ para perfurar.', - ['f_fuel_refine'] = 'refinar óleo', - ['f_refine_fuel_button'] = 'pressione ~INPUT_PICKUP~ para refinar.', - ['f_fuel_mixture'] = 'misturar o óleo refinado', - ['f_gas'] = 'gasolina', - ['f_fuel_mixture_button'] = 'pressione ~INPUT_PICKUP~ para misturar.', - ['f_deliver_gas'] = 'entregar Gasolina', - ['f_deliver_gas_button'] = 'pressione ~INPUT_PICKUP~ para entregar a gasolina.', + ['f_oil_refiner'] = 'vestiario Refinador', + ['f_drill_oil'] = 'broca de óleo', + ['f_fuel'] = 'óleo', + ['f_drillbutton'] = 'pressione ~INPUT_PICKUP~ para perfurar.', + ['f_fuel_refine'] = 'refinar óleo', + ['f_refine_fuel_button'] = 'pressione ~INPUT_PICKUP~ para refinar.', + ['f_fuel_mixture'] = 'misturar o óleo refinado', + ['f_gas'] = 'gasolina', + ['f_fuel_mixture_button'] = 'pressione ~INPUT_PICKUP~ para misturar.', + ['f_deliver_gas'] = 'entregar Gasolina', + ['f_deliver_gas_button'] = 'pressione ~INPUT_PICKUP~ para entregar a gasolina.', -- Miner - ['m_miner_locker'] = 'vestiario Minerador', - ['m_rock'] = 'pedregulho', - ['m_pickrocks'] = 'pressione ~INPUT_PICKUP~ para obter pedras.', - ['m_washrock'] = 'pedras limpas ', - ['m_rock_button'] = 'pressione ~INPUT_PICKUP~ para lavar as pedras.', - ['m_rock_smelting'] = 'fundição', - ['m_copper'] = 'cobre', - ['m_sell_copper'] = 'vender cobre', - ['m_deliver_copper'] = 'pressione ~INPUT_PICKUP~ para entregar cobre.', - ['m_iron'] = 'ferro', - ['m_sell_iron'] = 'vender ferro', - ['m_deliver_iron'] = 'pressione ~INPUT_PICKUP~ para entregar ferro.', - ['m_gold'] = 'ouro', - ['m_sell_gold'] = 'vender ouro', - ['m_deliver_gold'] = 'pressione ~INPUT_PICKUP~ para entregar ouro.', - ['m_diamond'] = 'diamante', - ['m_sell_diamond'] = 'vender diamante', - ['m_deliver_diamond'] = 'pressione ~INPUT_PICKUP~ para entregar diamantes.', - ['m_melt_button'] = 'pressione ~INPUT_PICKUP~ para derreter as pedras.', + ['m_miner_locker'] = 'vestiario Minerador', + ['m_rock'] = 'pedregulho', + ['m_pickrocks'] = 'pressione ~INPUT_PICKUP~ para obter pedras.', + ['m_washrock'] = 'pedras limpas ', + ['m_rock_button'] = 'pressione ~INPUT_PICKUP~ para lavar as pedras.', + ['m_rock_smelting'] = 'fundição', + ['m_copper'] = 'cobre', + ['m_sell_copper'] = 'vender cobre', + ['m_deliver_copper'] = 'pressione ~INPUT_PICKUP~ para entregar cobre.', + ['m_iron'] = 'ferro', + ['m_sell_iron'] = 'vender ferro', + ['m_deliver_iron'] = 'pressione ~INPUT_PICKUP~ para entregar ferro.', + ['m_gold'] = 'ouro', + ['m_sell_gold'] = 'vender ouro', + ['m_deliver_gold'] = 'pressione ~INPUT_PICKUP~ para entregar ouro.', + ['m_diamond'] = 'diamante', + ['m_sell_diamond'] = 'vender diamante', + ['m_deliver_diamond'] = 'pressione ~INPUT_PICKUP~ para entregar diamantes.', + ['m_melt_button'] = 'pressione ~INPUT_PICKUP~ para derreter as pedras.', -- Reporter - ['reporter_name'] = 'globo News', - ['reporter_garage'] = 'pressione ~INPUT_PICKUP~ para descer à garagem.', + ['reporter_name'] = 'globo News', + ['reporter_garage'] = 'pressione ~INPUT_PICKUP~ para descer à garagem.', -- Slaughterer - ['s_slaughter_locker'] = 'vestiario Abatedor', - ['s_hen'] = 'galinheiro', - ['s_alive_chicken'] = 'galinha viva', - ['s_catch_hen'] = 'pressione ~INPUT_PICKUP~ para pegar galinha viva.', - ['s_slaughtered_chicken'] = 'frango para ser embalado', - ['s_chop_animal'] = 'pressione ~INPUT_PICKUP~ para cortar as galinhas.', - ['s_slaughtered'] = 'matadouro', - ['s_package'] = 'embalamento', - ['s_packagechicken'] = 'frango na bandeija', - ['s_unpackaged'] = 'frango para ser embalado', - ['s_unpackaged_button'] = 'pressione ~INPUT_PICKUP~ para colocar o frango em uma bandeja.', - ['s_deliver'] = 'pressione ~INPUT_PICKUP~ para entregar as bandejas de frango.', + ['s_slaughter_locker'] = 'vestiario Abatedor', + ['s_hen'] = 'galinheiro', + ['s_alive_chicken'] = 'galinha viva', + ['s_catch_hen'] = 'pressione ~INPUT_PICKUP~ para pegar galinha viva.', + ['s_slaughtered_chicken'] = 'frango para ser embalado', + ['s_chop_animal'] = 'pressione ~INPUT_PICKUP~ para cortar as galinhas.', + ['s_slaughtered'] = 'matadouro', + ['s_package'] = 'embalamento', + ['s_packagechicken'] = 'frango na bandeija', + ['s_unpackaged'] = 'frango para ser embalado', + ['s_unpackaged_button'] = 'pressione ~INPUT_PICKUP~ para colocar o frango em uma bandeja.', + ['s_deliver'] = 'pressione ~INPUT_PICKUP~ para entregar as bandejas de frango.', -- Dress Designer - ['dd_dress_locker'] = 'vestiario Costureiro', - ['dd_wool'] = 'lã', - ['dd_pickup'] = 'pressione ~INPUT_PICKUP~ para obter lã.', - ['dd_fabric'] = 'tecido', - ['dd_makefabric'] = 'Pressione ~INPUT_PICKUP~ para fazer tecido.', - ['dd_clothing'] = 'roupas', - ['dd_makeclothing'] = 'pressione ~INPUT_PICKUP~ para obter roupas.', - ['dd_deliver_clothes'] = 'pressione ~INPUT_PICKUP~ para entregar roupas.', + ['dd_dress_locker'] = 'vestiario Costureiro', + ['dd_wool'] = 'lã', + ['dd_pickup'] = 'pressione ~INPUT_PICKUP~ para obter lã.', + ['dd_fabric'] = 'tecido', + ['dd_makefabric'] = 'pressione ~INPUT_PICKUP~ para fazer tecido.', + ['dd_clothing'] = 'roupas', + ['dd_makeclothing'] = 'pressione ~INPUT_PICKUP~ para obter roupas.', + ['dd_deliver_clothes'] = 'pressione ~INPUT_PICKUP~ para entregar roupas.', } diff --git a/locales/cs.lua b/locales/cs.lua new file mode 100644 index 00000000..18cb39ae --- /dev/null +++ b/locales/cs.lua @@ -0,0 +1,115 @@ +Locales['cs'] = { + -- Global menus + ['cloakroom'] = 'satna', + ['cloak_change'] = 'stiskni ~INPUT_PICKUP~ pro prevleceni.', + ['citizen_wear'] = 'civilni obleceni', + ['job_wear'] = 'pracovni obleceni', + ['bank_deposit_returned'] = 'bezpecnostni poplatek ~g~$%s~s~ ti byl vracen.', + ['bank_deposit_taken'] = 'bezpecnostni poplatek ~r~$%s~s~ ti byl odebram.', + ['caution_afford'] = 'nemuzes si dovolit kauci ~g~$%s~s~', + ['foot_work'] = 'musis byt na nohach, aby jsi mohl pracovat.', + ['next_point'] = 'bez do dalsiho bodu po dokonceni tohoto.', + ['not_your_vehicle'] = 'nejsi ridic tohoto vozidla.', + ['in_vehicle'] = 'musis byt ve vozidle.', + ['wrong_point'] = 'nejsi na spravnem bodu doruceni.', + ['max_limit'] = 'neuneses vic ~y~%s~s~', + ['not_enough'] = 'nemas dostatek ~y~%s~s~ pro pokracovani v tomto ukolu.', + ['spawn_veh'] = 'spawnout vozidlo', + ['spawn_veh_button'] = 'stiksni ~INPUT_PICKUP~ pro privolani dorucovaciho voziidla.', + ['spawn_truck_button'] = 'stiskni ~INPUT_PICKUP~ pro spawnuti trucku.', + ['spawn_blocked'] = 'vozidlo blokuje spawn!', + ['service_vh'] = 'opravit vozidlo', + ['return_vh'] = 'vraceni vozidla', + ['return_vh_button'] = 'stiskni ~INPUT_PICKUP~ pro navrat vozidla.', + ['delivery_point'] = 'dorucovaci bod', + ['delivery'] = 'doruceni', + ['public_enter'] = 'stiskni ~INPUT_PICKUP~ pro vstup do budovy.', + ['public_leave'] = 'stiskni ~INPUT_PICKUP~ pro odchod z budovy.', + + -- Lumber Jack job + ['lj_locker_room'] = 'drevorubcova satna', + ['lj_mapblip'] = 'vyroba dreva', + ['lj_wood'] = 'drevo', + ['lj_pickup'] = 'stiskni ~INPUT_PICKUP~ pro ziskani dreva.', + ['lj_cutwood'] = 'rezani dreva', + ['lj_cutwood_button'] = 'stiskni ~INPUT_PICKUP~ pro rezani dreva.', + ['lj_board'] = 'prkna', + ['lj_planks'] = 'baleni prken', + ['lj_cutwood'] = 'rezat drevo', + ['lj_pick_boards'] = 'stiskni ~INPUT_PICKUP~ pro ziskani prken.', + ['lj_deliver_button'] = 'stiskni ~INPUT_PICKUP~ pro doruceni prken.', + + -- Fisherman + ['fm_fish_locker'] = 'rybarova satna', + ['fm_fish'] = 'ryba', + ['fm_fish_area'] = 'rybarska oblast', + ['fm_fish_button'] = 'stiskni ~INPUT_PICKUP~ pro rybareni.', + ['fm_spawnboat_title'] = 'spawnout lod', + ['fm_spawnboat'] = 'stiskni ~INPUT_PICKUP~ pro privolani lodi.', + ['fm_boat_title'] = 'lod', + ['fm_boat_return_title'] = 'vraceni lodi', + ['fm_boat_return_button'] = 'stiskni ~INPUT_PICKUP~ pro vraceni lodi.', + ['fm_deliver_fish'] = 'stiskni ~INPUT_PICKUP~ pro doruceni ryby.', + + -- Fuel + ['f_oil_refiner'] = 'satna ropne rafinerie', + ['f_drill_oil'] = 'ropny vrtak', + ['f_fuel'] = 'ropa', + ['f_drillbutton'] = 'stiskni ~INPUT_PICKUP~ pro vrtani.', + ['f_fuel_refine'] = 'refinovat ropu', + ['f_refine_fuel_button'] = 'stiskni ~INPUT_PICKUP~ pro refinovani.', + ['f_fuel_mixture'] = 'mix. rafinovaneho oleje', + ['f_gas'] = 'palivo', + ['f_fuel_mixture_button'] = 'stiskni ~INPUT_PICKUP~ pro smichani ropy.', + ['f_deliver_gas'] = 'doruceni paliva', + ['f_deliver_gas_button'] = 'stiskni ~INPUT_PICKUP~ pro doruceni paliva.', + + -- Miner + ['m_miner_locker'] = 'hornikova satna', + ['m_rock'] = 'kamen', + ['m_pickrocks'] = 'stiskni ~INPUT_PICKUP~ pro ziskani kamenu.', + ['m_washrock'] = 'myti kamenu', + ['m_rock_button'] = 'stiskni ~INPUT_PICKUP~ pro myti kamenu.', + ['m_rock_smelting'] = 'drceni kamenu', + ['m_copper'] = 'med', + ['m_sell_copper'] = 'prodejce medi', + ['m_deliver_copper'] = 'stiskni ~INPUT_PICKUP~ pro doruceni medi.', + ['m_iron'] = 'zelezo', + ['m_sell_iron'] = 'prodejce zeleza', + ['m_deliver_iron'] = 'stiskni ~INPUT_PICKUP~ pro doruceni zeleza.', + ['m_gold'] = 'zlato', + ['m_sell_gold'] = 'zlaty prodejce', + ['m_deliver_gold'] = 'stiskni ~INPUT_PICKUP~ pro doruceni zlata.', + ['m_diamond'] = 'diamant', + ['m_sell_diamond'] = 'diamantovy prodejce', + ['m_deliver_diamond'] = 'stiskni ~INPUT_PICKUP~ pro doruceni diamantu.', + ['m_melt_button'] = 'stiskni ~INPUT_PICKUP~ pro drceni kamenu.', + + -- Reporter + ['reporter_name'] = 'noviny San Andreas', + ['reporter_garage'] = 'stiskni ~INPUT_PICKUP~ pro pristup do garaze.', + + -- Slaughterer + ['s_slaughter_locker'] = 'reznikova satna', + ['s_hen'] = 'kurnik', + ['s_alive_chicken'] = 'zive kure', + ['s_catch_hen'] = 'stiskni ~INPUT_PICKUP~ pro chyceni ziveho kurete.', + ['s_slaughtered_chicken'] = 'kure na zabaleni', + ['s_chop_animal'] = 'stiskni ~INPUT_PICKUP~ pro nasekani kurat.', + ['s_slaughtered'] = 'reznikuv dum', + ['s_package'] = 'baleni', + ['s_packagechicken'] = 'kure v zasobniku', + ['s_unpackaged'] = 'kure k zabaleni', + ['s_unpackaged_button'] = 'stiskni ~INPUT_PICKUP~ pro vlozeni kurete do prihradky.', + ['s_deliver'] = 'stiskni ~INPUT_PICKUP~ pro doruceni kurat v prihradkach.', + + -- Dress Designer + ['dd_dress_locker'] = 'satna navrhare obleceni', + ['dd_wool'] = 'vlna', + ['dd_pickup'] = 'stiskni ~INPUT_PICKUP~ pro ziskani vlny.', + ['dd_fabric'] = 'latka', + ['dd_makefabric'] = 'stiskni ~INPUT_PICKUP~ pro vyrobu latky.', + ['dd_clothing'] = 'obleceni', + ['dd_makeclothing'] = 'stiskni ~INPUT_PICKUP~ pro vyrobu obleceni.', + ['dd_deliver_clothes'] = 'stiskni ~INPUT_PICKUP~ pro doruceni obleceni.', +} diff --git a/locales/en.lua b/locales/en.lua index 5d04ac4b..8cd6ba0b 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,115 +1,115 @@ Locales['en'] = { -- Global menus - ['cloakroom'] = 'Locker Room', - ['cloak_change'] = 'press ~INPUT_PICKUP~ to change clothes.', - ['citizen_wear'] = 'civilian clothes', - ['job_wear'] = 'workers clothes', - ['bank_deposit_returned'] = 'a security deposit of ~g~$%s~s~ was returned to you.', - ['bank_deposit_taken'] = 'a security deposit of ~r~$%s~s~ was taken from you.', - ['caution_afford'] = 'you cannot afford the caution of ~g~$%s~s~', - ['foot_work'] = 'you have to be on foot to be able to work.', - ['next_point'] = 'go to the next step after completing this one.', - ['not_your_vehicle'] = 'you are not the driver of this vehicle.', - ['in_vehicle'] = 'you must sit in a vehicle.', - ['wrong_point'] = 'you are not at the right point of delivery.', - ['max_limit'] = 'you cannot carry more ~y~%s~s~', - ['not_enough'] = 'you do not have enough ~y~%s~s~ to continue this task.', - ['spawn_veh'] = 'spawn vehicle', - ['spawn_veh_button'] = 'press ~INPUT_PICKUP~ to call the delivery vehicle.', - ['spawn_truck_button'] = 'press ~INPUT_PICKUP~ to spawn the truck.', - ['spawn_blocked'] = 'an vehicle is blocking the spawnpoint!', - ['service_vh'] = 'service vehicle', - ['return_vh'] = 'vehicle return', - ['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.', + ['cloakroom'] = 'locker Room', + ['cloak_change'] = 'press ~INPUT_PICKUP~ to change clothes.', + ['citizen_wear'] = 'civilian clothes', + ['job_wear'] = 'workers clothes', + ['bank_deposit_returned'] = 'a security deposit of ~g~$%s~s~ was returned to you.', + ['bank_deposit_taken'] = 'a security deposit of ~r~$%s~s~ was taken from you.', + ['caution_afford'] = 'you cannot afford the caution of ~g~$%s~s~', + ['foot_work'] = 'you have to be on foot to be able to work.', + ['next_point'] = 'go to the next step after completing this one.', + ['not_your_vehicle'] = 'you are not the driver of this vehicle.', + ['in_vehicle'] = 'you must sit in a vehicle.', + ['wrong_point'] = 'you are not at the right point of delivery.', + ['max_limit'] = 'you cannot carry more ~y~%s~s~', + ['not_enough'] = 'you do not have enough ~y~%s~s~ to continue this task.', + ['spawn_veh'] = 'spawn vehicle', + ['spawn_veh_button'] = 'press ~INPUT_PICKUP~ to call the delivery vehicle.', + ['spawn_truck_button'] = 'press ~INPUT_PICKUP~ to spawn the truck.', + ['spawn_blocked'] = 'an vehicle is blocking the spawnpoint!', + ['service_vh'] = 'service vehicle', + ['return_vh'] = 'vehicle return', + ['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', - ['lj_mapblip'] = 'wood pile', - ['lj_wood'] = 'wood', - ['lj_pickup'] = 'press ~INPUT_PICKUP~ to retrieve wood.', - ['lj_cutwood'] = 'wood cutting', - ['lj_cutwood_button'] = 'press ~INPUT_PICKUP~ to cut wood.', - ['lj_board'] = 'boards', - ['lj_planks'] = 'package board', - ['lj_cutwood'] = 'cut wood', - ['lj_pick_boards'] = 'press ~INPUT_PICKUP~ to retrieve boards.', - ['lj_deliver_button'] = 'press ~INPUT_PICKUP~ to deliver the boards.', + ['lj_locker_room'] = 'lumberjack\'s Locker Room', + ['lj_mapblip'] = 'wood pile', + ['lj_wood'] = 'wood', + ['lj_pickup'] = 'press ~INPUT_PICKUP~ to retrieve wood.', + ['lj_cutwood'] = 'wood cutting', + ['lj_cutwood_button'] = 'press ~INPUT_PICKUP~ to cut wood.', + ['lj_board'] = 'boards', + ['lj_planks'] = 'package board', + ['lj_cutwood'] = 'cut wood', + ['lj_pick_boards'] = 'press ~INPUT_PICKUP~ to retrieve boards.', + ['lj_deliver_button'] = 'press ~INPUT_PICKUP~ to deliver the boards.', -- Fisherman - ['fm_fish_locker'] = 'fishermen\'s Locker Room', - ['fm_fish'] = 'fish', - ['fm_fish_area'] = 'fishing area', - ['fm_fish_button'] = 'press ~INPUT_PICKUP~ to fish.', - ['fm_spawnboat_title'] = 'spawn boat', - ['fm_spawnboat'] = 'press ~INPUT_PICKUP~ to call the boat.', - ['fm_boat_title'] = 'boat', - ['fm_boat_return_title'] = 'boat return', - ['fm_boat_return_button'] = 'Press ~INPUT_PICKUP~ to return the boat.', - ['fm_deliver_fish'] = 'press ~INPUT_PICKUP~ to deliver the fish.', + ['fm_fish_locker'] = 'fishermen\'s Locker Room', + ['fm_fish'] = 'fish', + ['fm_fish_area'] = 'fishing area', + ['fm_fish_button'] = 'press ~INPUT_PICKUP~ to fish.', + ['fm_spawnboat_title'] = 'spawn boat', + ['fm_spawnboat'] = 'press ~INPUT_PICKUP~ to call the boat.', + ['fm_boat_title'] = 'boat', + ['fm_boat_return_title'] = 'boat return', + ['fm_boat_return_button'] = 'press ~INPUT_PICKUP~ to return the boat.', + ['fm_deliver_fish'] = 'press ~INPUT_PICKUP~ to deliver the fish.', -- Fuel - ['f_oil_refiner'] = 'oil Refiner Locker Room', - ['f_drill_oil'] = 'drill for oil', - ['f_fuel'] = 'oil', - ['f_drillbutton'] = 'press ~INPUT_PICKUP~ to drill.', - ['f_fuel_refine'] = 'refine oil', - ['f_refine_fuel_button'] = 'press ~INPUT_PICKUP~ to refine.', - ['f_fuel_mixture'] = 'mix refined oil', - ['f_gas'] = 'gas', - ['f_fuel_mixture_button'] = 'press ~INPUT_PICKUP~ to mix oil.', - ['f_deliver_gas'] = 'deliver Gas', - ['f_deliver_gas_button'] = 'press ~INPUT_PICKUP~ to deliver gasoline.', + ['f_oil_refiner'] = 'oil Refiner Locker Room', + ['f_drill_oil'] = 'drill for oil', + ['f_fuel'] = 'oil', + ['f_drillbutton'] = 'press ~INPUT_PICKUP~ to drill.', + ['f_fuel_refine'] = 'refine oil', + ['f_refine_fuel_button'] = 'press ~INPUT_PICKUP~ to refine.', + ['f_fuel_mixture'] = 'mix refined oil', + ['f_gas'] = 'gas', + ['f_fuel_mixture_button'] = 'press ~INPUT_PICKUP~ to mix oil.', + ['f_deliver_gas'] = 'deliver Gas', + ['f_deliver_gas_button'] = 'press ~INPUT_PICKUP~ to deliver gasoline.', -- Miner - ['m_miner_locker'] = 'miner\'s Locker Room', - ['m_rock'] = 'rock', - ['m_pickrocks'] = 'press ~INPUT_PICKUP~ to retrieve rocks.', - ['m_washrock'] = 'rock Washing', - ['m_rock_button'] = 'press ~INPUT_PICKUP~ to wash the rocks.', - ['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'] = 'iron Seller', - ['m_deliver_iron'] = 'press ~INPUT_PICKUP~ to deliver the iron.', - ['m_gold'] = 'gold', - ['m_sell_gold'] = 'gold Seller', - ['m_deliver_gold'] = 'press ~INPUT_PICKUP~ to deliver the gold.', - ['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.', + ['m_miner_locker'] = 'miner\'s Locker Room', + ['m_rock'] = 'rock', + ['m_pickrocks'] = 'press ~INPUT_PICKUP~ to retrieve rocks.', + ['m_washrock'] = 'rock Washing', + ['m_rock_button'] = 'press ~INPUT_PICKUP~ to wash the rocks.', + ['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'] = 'iron Seller', + ['m_deliver_iron'] = 'press ~INPUT_PICKUP~ to deliver the iron.', + ['m_gold'] = 'gold', + ['m_sell_gold'] = 'gold Seller', + ['m_deliver_gold'] = 'press ~INPUT_PICKUP~ to deliver the gold.', + ['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.', -- Reporter - ['reporter_name'] = 'san Andreas Times', - ['reporter_garage'] = 'Press ~INPUT_PICKUP~ to go down to the garage.', + ['reporter_name'] = 'san Andreas Times', + ['reporter_garage'] = 'press ~INPUT_PICKUP~ to go down to the garage.', -- Slaughterer - ['s_slaughter_locker'] = 'butcher\'s Locker Room', - ['s_hen'] = 'chicken coop', - ['s_alive_chicken'] = 'live Chicken', - ['s_catch_hen'] = 'press ~INPUT_PICKUP~ to catch live chickens.', - ['s_slaughtered_chicken'] = 'chicken to be packed', - ['s_chop_animal'] = 'press ~INPUT_PICKUP~ to chop the chickens.', - ['s_slaughtered'] = 'slaughter house', - ['s_package'] = 'packaging', - ['s_packagechicken'] = 'chicken in tray', - ['s_unpackaged'] = 'chicken to be packed', - ['s_unpackaged_button'] = 'press ~INPUT_PICKUP~ to set the chicken in a tray.', - ['s_deliver'] = 'press ~INPUT_PICKUP~ to deliver the chicken trays.', + ['s_slaughter_locker'] = 'butcher\'s Locker Room', + ['s_hen'] = 'chicken coop', + ['s_alive_chicken'] = 'live Chicken', + ['s_catch_hen'] = 'press ~INPUT_PICKUP~ to catch live chickens.', + ['s_slaughtered_chicken'] = 'chicken to be packed', + ['s_chop_animal'] = 'press ~INPUT_PICKUP~ to chop the chickens.', + ['s_slaughtered'] = 'slaughter house', + ['s_package'] = 'packaging', + ['s_packagechicken'] = 'chicken in tray', + ['s_unpackaged'] = 'chicken to be packed', + ['s_unpackaged_button'] = 'press ~INPUT_PICKUP~ to set the chicken in a tray.', + ['s_deliver'] = 'press ~INPUT_PICKUP~ to deliver the chicken trays.', -- Dress Designer - ['dd_dress_locker'] = 'dress Designer\'s Locker Room', - ['dd_wool'] = 'wool', - ['dd_pickup'] = 'press ~INPUT_PICKUP~ to retrieve wool.', - ['dd_fabric'] = 'fabric', - ['dd_makefabric'] = 'press ~INPUT_PICKUP~ to make fabric.', - ['dd_clothing'] = 'clothing', - ['dd_makeclothing'] = 'press ~INPUT_PICKUP~ to retrieve clothing.', - ['dd_deliver_clothes'] = 'press ~INPUT_PICKUP~ to deliver the clothes.', - } + ['dd_dress_locker'] = 'dress Designer\'s Locker Room', + ['dd_wool'] = 'wool', + ['dd_pickup'] = 'press ~INPUT_PICKUP~ to retrieve wool.', + ['dd_fabric'] = 'fabric', + ['dd_makefabric'] = 'press ~INPUT_PICKUP~ to make fabric.', + ['dd_clothing'] = 'clothing', + ['dd_makeclothing'] = 'press ~INPUT_PICKUP~ to retrieve clothing.', + ['dd_deliver_clothes'] = 'press ~INPUT_PICKUP~ to deliver the clothes.', + } diff --git a/locales/es.lua b/locales/es.lua index ff99dad7..89c82ec3 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -1,115 +1,115 @@ Locales['es'] = { -- Global menus - ['cloakroom'] = 'guardarropas', - ['cloak_change'] = 'presiona ~INPUT_PICKUP~ para cambiarte la ropa.', - ['citizen_wear'] = 'ropa de civil', - ['job_wear'] = 'ropa de trabajo', - ['bank_deposit_returned'] = 'un deposito de seguro de ~g~$%s~s~ se te devolvió.', - ['bank_deposit_taken'] = 'un deposito de seguro de ~r~$%s~s~ se te tomó.', - ['caution_afford'] = 'no puedes pagar el deposito de seguro de ~g~$%s~s~', - ['foot_work'] = 'debes estar en pie para trabajar.', - ['next_point'] = 've al siguiente punto tras terminar este.', - ['not_your_vehicle'] = 'no eres el conductor.', - ['in_vehicle'] = 'debes estar en un vehiculo.', - ['wrong_point'] = 'no estas en el punto correcto de entrega.', - ['max_limit'] = 'no puedes llevar mas ~y~%s~s~', - ['not_enough'] = 'no tienes suficientes ~y~%s~s~ para continuar esta tarea.', - ['spawn_veh'] = 'spawnear vehiculo', - ['spawn_veh_button'] = 'presiona ~INPUT_PICKUP~ para pedir el vehiculo de entrega.', - ['spawn_truck_button'] = 'presiona ~INPUT_PICKUP~ para spawnear un camion.', - ['spawn_blocked'] = 'el punto de spawn esta bloqueado!', - ['service_vh'] = 'vehiculo de servicio', - ['return_vh'] = 'devolver vehiculo', - ['return_vh_button'] = 'presiona ~INPUT_PICKUP~ para devolver vehiculo.', - ['delivery_point'] = 'punto de entrega', - ['delivery'] = 'entrega', - ['public_enter'] = 'presiona ~INPUT_PICKUP~ para entrar al edificio.', - ['public_leave'] = 'presiona ~INPUT_PICKUP~ para ir a la entrada del edificio.', + ['cloakroom'] = 'guardarropas', + ['cloak_change'] = 'presiona ~INPUT_PICKUP~ para cambiarte la ropa.', + ['citizen_wear'] = 'ropa de civil', + ['job_wear'] = 'ropa de trabajo', + ['bank_deposit_returned'] = 'un deposito de seguro de ~g~$%s~s~ se te devolvió.', + ['bank_deposit_taken'] = 'un deposito de seguro de ~r~$%s~s~ se te tomó.', + ['caution_afford'] = 'no puedes pagar el deposito de seguro de ~g~$%s~s~', + ['foot_work'] = 'debes estar en pie para trabajar.', + ['next_point'] = 've al siguiente punto tras terminar este.', + ['not_your_vehicle'] = 'no eres el conductor.', + ['in_vehicle'] = 'debes estar en un vehiculo.', + ['wrong_point'] = 'no estas en el punto correcto de entrega.', + ['max_limit'] = 'no puedes llevar mas ~y~%s~s~', + ['not_enough'] = 'no tienes suficientes ~y~%s~s~ para continuar esta tarea.', + ['spawn_veh'] = 'spawnear vehiculo', + ['spawn_veh_button'] = 'presiona ~INPUT_PICKUP~ para pedir el vehiculo de entrega.', + ['spawn_truck_button'] = 'presiona ~INPUT_PICKUP~ para spawnear un camion.', + ['spawn_blocked'] = 'el punto de spawn esta bloqueado!', + ['service_vh'] = 'vehiculo de servicio', + ['return_vh'] = 'devolver vehiculo', + ['return_vh_button'] = 'presiona ~INPUT_PICKUP~ para devolver vehiculo.', + ['delivery_point'] = 'punto de entrega', + ['delivery'] = 'entrega', + ['public_enter'] = 'presiona ~INPUT_PICKUP~ para entrar al edificio.', + ['public_leave'] = 'presiona ~INPUT_PICKUP~ para ir a la entrada del edificio.', -- Lumber Jack job - ['lj_locker_room'] = 'guardarropas', - ['lj_mapblip'] = 'pila de madera', - ['lj_wood'] = 'madera', - ['lj_pickup'] = 'presiona ~INPUT_PICKUP~ para agarrar madera.', - ['lj_cutwood'] = 'cortar madera', - ['lj_cutwood_button'] = 'presiona ~INPUT_PICKUP~ para cortar madera.', - ['lj_board'] = 'tablas', - ['lj_planks'] = 'empaquetar', - ['lj_cutwood'] = 'cortar madera', - ['lj_pick_boards'] = 'presiona ~INPUT_PICKUP~ para agarrar tablas.', - ['lj_deliver_button'] = 'presiona ~INPUT_PICKUP~ para entregar tablas.', + ['lj_locker_room'] = 'guardarropas', + ['lj_mapblip'] = 'pila de madera', + ['lj_wood'] = 'madera', + ['lj_pickup'] = 'presiona ~INPUT_PICKUP~ para agarrar madera.', + ['lj_cutwood'] = 'cortar madera', + ['lj_cutwood_button'] = 'presiona ~INPUT_PICKUP~ para cortar madera.', + ['lj_board'] = 'tablas', + ['lj_planks'] = 'empaquetar', + ['lj_cutwood'] = 'cortar madera', + ['lj_pick_boards'] = 'presiona ~INPUT_PICKUP~ para agarrar tablas.', + ['lj_deliver_button'] = 'presiona ~INPUT_PICKUP~ para entregar tablas.', -- Fisherman - ['fm_fish_locker'] = 'guardarropas', - ['fm_fish'] = 'pescar', - ['fm_fish_area'] = 'area de pesca', - ['fm_fish_button'] = 'presiona ~INPUT_PICKUP~ para pescar.', - ['fm_spawnboat_title'] = 'spawnear bote', - ['fm_spawnboat'] = 'presiona ~INPUT_PICKUP~ para pedir un bote.', - ['fm_boat_title'] = 'bote', - ['fm_boat_return_title'] = 'devolver bote', - ['fm_boat_return_button'] = 'presiona ~INPUT_PICKUP~ para devolver un bote.', - ['fm_deliver_fish'] = 'presiona ~INPUT_PICKUP~ para entregar pescados.', + ['fm_fish_locker'] = 'guardarropas', + ['fm_fish'] = 'pescar', + ['fm_fish_area'] = 'area de pesca', + ['fm_fish_button'] = 'presiona ~INPUT_PICKUP~ para pescar.', + ['fm_spawnboat_title'] = 'spawnear bote', + ['fm_spawnboat'] = 'presiona ~INPUT_PICKUP~ para pedir un bote.', + ['fm_boat_title'] = 'bote', + ['fm_boat_return_title'] = 'devolver bote', + ['fm_boat_return_button'] = 'presiona ~INPUT_PICKUP~ para devolver un bote.', + ['fm_deliver_fish'] = 'presiona ~INPUT_PICKUP~ para entregar pescados.', -- Fuel - ['f_oil_refiner'] = 'guardarropas', - ['f_drill_oil'] = 'agujerear para encontrar petroleo', - ['f_fuel'] = 'petroleo', - ['f_drillbutton'] = 'presiona ~INPUT_PICKUP~ para agujerear.', - ['f_fuel_refine'] = 'refinar petroleo', - ['f_refine_fuel_button'] = 'presiona ~INPUT_PICKUP~ para refinar.', - ['f_fuel_mixture'] = 'mezclar petroleo refinado', - ['f_gas'] = 'gas', - ['f_fuel_mixture_button'] = 'presiona ~INPUT_PICKUP~ para mezclar petroleo.', - ['f_deliver_gas'] = 'entregar gas', - ['f_deliver_gas_button'] = 'presiona ~INPUT_PICKUP~ para entregar gasolina.', + ['f_oil_refiner'] = 'guardarropas', + ['f_drill_oil'] = 'agujerear para encontrar petroleo', + ['f_fuel'] = 'petroleo', + ['f_drillbutton'] = 'presiona ~INPUT_PICKUP~ para agujerear.', + ['f_fuel_refine'] = 'refinar petroleo', + ['f_refine_fuel_button'] = 'presiona ~INPUT_PICKUP~ para refinar.', + ['f_fuel_mixture'] = 'mezclar petroleo refinado', + ['f_gas'] = 'gas', + ['f_fuel_mixture_button'] = 'presiona ~INPUT_PICKUP~ para mezclar petroleo.', + ['f_deliver_gas'] = 'entregar gas', + ['f_deliver_gas_button'] = 'presiona ~INPUT_PICKUP~ para entregar gasolina.', -- Miner - ['m_miner_locker'] = 'guardarropas', - ['m_rock'] = 'roca', - ['m_pickrocks'] = 'presiona ~INPUT_PICKUP~ para agarrar rocas.', - ['m_washrock'] = 'lavado de rocas', - ['m_rock_button'] = 'presiona ~INPUT_PICKUP~ para lavar rocas.', - ['m_rock_smelting'] = 'derretir rocas', - ['m_copper'] = 'cobre', - ['m_sell_copper'] = 'vender cobre', - ['m_deliver_copper'] = 'presiona ~INPUT_PICKUP~ para entregar el cobre.', - ['m_iron'] = 'hierro', - ['m_sell_iron'] = 'vender hierro', - ['m_deliver_iron'] = 'presiona ~INPUT_PICKUP~ para entregar el hierro.', - ['m_gold'] = 'oro', - ['m_sell_gold'] = 'vender oro', - ['m_deliver_gold'] = 'presiona ~INPUT_PICKUP~ para entregar oro.', - ['m_diamond'] = 'diamantes', - ['m_sell_diamond'] = 'vender diamantes', - ['m_deliver_diamond'] = 'presiona ~INPUT_PICKUP~ para entregar los diamantes.', - ['m_melt_button'] = 'presiona ~INPUT_PICKUP~ para derretir rocas.', + ['m_miner_locker'] = 'guardarropas', + ['m_rock'] = 'roca', + ['m_pickrocks'] = 'presiona ~INPUT_PICKUP~ para agarrar rocas.', + ['m_washrock'] = 'lavado de rocas', + ['m_rock_button'] = 'presiona ~INPUT_PICKUP~ para lavar rocas.', + ['m_rock_smelting'] = 'derretir rocas', + ['m_copper'] = 'cobre', + ['m_sell_copper'] = 'vender cobre', + ['m_deliver_copper'] = 'presiona ~INPUT_PICKUP~ para entregar el cobre.', + ['m_iron'] = 'hierro', + ['m_sell_iron'] = 'vender hierro', + ['m_deliver_iron'] = 'presiona ~INPUT_PICKUP~ para entregar el hierro.', + ['m_gold'] = 'oro', + ['m_sell_gold'] = 'vender oro', + ['m_deliver_gold'] = 'presiona ~INPUT_PICKUP~ para entregar oro.', + ['m_diamond'] = 'diamantes', + ['m_sell_diamond'] = 'vender diamantes', + ['m_deliver_diamond'] = 'presiona ~INPUT_PICKUP~ para entregar los diamantes.', + ['m_melt_button'] = 'presiona ~INPUT_PICKUP~ para derretir rocas.', -- Reporter - ['reporter_name'] = 'periódico San Andreas', - ['reporter_garage'] = 'presiona ~INPUT_PICKUP~ para ir al garage.', + ['reporter_name'] = 'periódico San Andreas', + ['reporter_garage'] = 'presiona ~INPUT_PICKUP~ para ir al garage.', -- Slaughterer - ['s_slaughter_locker'] = 'guardarropas', - ['s_hen'] = 'gGallinero', - ['s_alive_chicken'] = 'pollos vivos', - ['s_catch_hen'] = 'presiona ~INPUT_PICKUP~ para agarrar pollos vivos.', - ['s_slaughtered_chicken'] = 'pollo listo para empaquetar', - ['s_chop_animal'] = 'presiona ~INPUT_PICKUP~ para cortar los pollos.', - ['s_slaughtered'] = 'matadero', - ['s_package'] = 'empaquetando', - ['s_packagechicken'] = 'pollo en bandeja', - ['s_unpackaged'] = 'pollo para empaquetar', - ['s_unpackaged_button'] = 'presiona ~INPUT_PICKUP~ para poner el pollo en una bandeja.', - ['s_deliver'] = 'presiona ~INPUT_PICKUP~ para entregar bandejas de pollos.', + ['s_slaughter_locker'] = 'guardarropas', + ['s_hen'] = 'gGallinero', + ['s_alive_chicken'] = 'pollos vivos', + ['s_catch_hen'] = 'presiona ~INPUT_PICKUP~ para agarrar pollos vivos.', + ['s_slaughtered_chicken'] = 'pollo listo para empaquetar', + ['s_chop_animal'] = 'presiona ~INPUT_PICKUP~ para cortar los pollos.', + ['s_slaughtered'] = 'matadero', + ['s_package'] = 'empaquetando', + ['s_packagechicken'] = 'pollo en bandeja', + ['s_unpackaged'] = 'pollo para empaquetar', + ['s_unpackaged_button'] = 'presiona ~INPUT_PICKUP~ para poner el pollo en una bandeja.', + ['s_deliver'] = 'presiona ~INPUT_PICKUP~ para entregar bandejas de pollos.', -- Dress Designer - ['dd_dress_locker'] = 'guardarropas', - ['dd_wool'] = 'lana', - ['dd_pickup'] = 'presiona ~INPUT_PICKUP~ para agarrar lana.', - ['dd_fabric'] = 'tela', - ['dd_makefabric'] = 'presiona ~INPUT_PICKUP~ para hacer tela.', - ['dd_clothing'] = 'ropa', - ['dd_makeclothing'] = 'presiona ~INPUT_PICKUP~ para agarrar ropa.', - ['dd_deliver_clothes'] = 'presiona ~INPUT_PICKUP~ para entregar ropa.', + ['dd_dress_locker'] = 'guardarropas', + ['dd_wool'] = 'lana', + ['dd_pickup'] = 'presiona ~INPUT_PICKUP~ para agarrar lana.', + ['dd_fabric'] = 'tela', + ['dd_makefabric'] = 'presiona ~INPUT_PICKUP~ para hacer tela.', + ['dd_clothing'] = 'ropa', + ['dd_makeclothing'] = 'presiona ~INPUT_PICKUP~ para agarrar ropa.', + ['dd_deliver_clothes'] = 'presiona ~INPUT_PICKUP~ para entregar ropa.', } diff --git a/locales/fi.lua b/locales/fi.lua index 51236475..a656b526 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,115 +1,115 @@ Locales['fi'] = { -- Global menus - ['cloakroom'] = 'vaatelokero', - ['cloak_change'] = 'paina ~INPUT_PICKUP~ vaihtaaksesi vaatteet', - ['citizen_wear'] = 'siviilivaatteet', - ['job_wear'] = 'työvaatteet', - ['bank_deposit_returned'] = 'vakuuden summa ~g~€%s~s~ palautettiin sinulle.', - ['bank_deposit_taken'] = 'vakuuden summa ~r~€%s~s~ otettiin sinulta.', - ['caution_afford'] = 'you cannot afford the caution of ~g~$%s~s~', - ['foot_work'] = 'sinun täytyy olla jalan, jotta voit työskennellä', - ['next_point'] = 'mene seuraavaan pisteeseen kun olet valmis täällä', - ['not_your_vehicle'] = 'tämä ei ole sinun ajoneuvo tai et ole sen kuski', - ['in_vehicle'] = 'sinun täytyy olla ajoneuvossa', - ['wrong_point'] = 'et ole oikeassa paikassa', - ['max_limit'] = 'sinulla on jo maksimi määrä ~y~%s~s~', - ['not_enough'] = 'sinulla ei ole tarpeeksi ~y~%s~s~ jatkaaksesi täällä.', - ['spawn_veh'] = 'spawnaa ajoneuvo', - ['spawn_veh_button'] = 'paina ~INPUT_PICKUP~ soittaaksesi kuljetus ajoneuvo', - ['spawn_truck_button'] = 'paina ~INPUT_PICKUP~ spawnataksesi rekka.', - ['spawn_blocked'] = 'an vehicle is blocking the spawnpoint!', - ['service_vh'] = 'huolla ajonevuo', - ['return_vh'] = 'palauta ajoneuvo', - ['return_vh_button'] = 'paina ~INPUT_PICKUP~ palautaaksesi ajoneuvo.', - ['delivery_point'] = 'toimituspiste', - ['delivery'] = 'toimitus', - ['public_enter'] = 'paina ~INPUT_PICKUP~ mennäksesi taloon sisälle.', - ['public_leave'] = 'paina ~INPUT_PICKUP~ poistuaksesi talosta.', + ['cloakroom'] = 'vaatelokero', + ['cloak_change'] = 'paina ~INPUT_PICKUP~ vaihtaaksesi vaatteet', + ['citizen_wear'] = 'siviilivaatteet', + ['job_wear'] = 'työvaatteet', + ['bank_deposit_returned'] = 'vakuuden summa ~g~€%s~s~ palautettiin sinulle.', + ['bank_deposit_taken'] = 'vakuuden summa ~r~€%s~s~ otettiin sinulta.', + ['caution_afford'] = 'you cannot afford the caution of ~g~$%s~s~', + ['foot_work'] = 'sinun täytyy olla jalan, jotta voit työskennellä', + ['next_point'] = 'mene seuraavaan pisteeseen kun olet valmis täällä', + ['not_your_vehicle'] = 'tämä ei ole sinun ajoneuvo tai et ole sen kuski', + ['in_vehicle'] = 'sinun täytyy olla ajoneuvossa', + ['wrong_point'] = 'et ole oikeassa paikassa', + ['max_limit'] = 'sinulla on jo maksimi määrä ~y~%s~s~', + ['not_enough'] = 'sinulla ei ole tarpeeksi ~y~%s~s~ jatkaaksesi täällä.', + ['spawn_veh'] = 'spawnaa ajoneuvo', + ['spawn_veh_button'] = 'paina ~INPUT_PICKUP~ soittaaksesi kuljetus ajoneuvo', + ['spawn_truck_button'] = 'paina ~INPUT_PICKUP~ spawnataksesi rekka.', + ['spawn_blocked'] = 'an vehicle is blocking the spawnpoint!', + ['service_vh'] = 'huolla ajonevuo', + ['return_vh'] = 'palauta ajoneuvo', + ['return_vh_button'] = 'paina ~INPUT_PICKUP~ palautaaksesi ajoneuvo.', + ['delivery_point'] = 'toimituspiste', + ['delivery'] = 'toimitus', + ['public_enter'] = 'paina ~INPUT_PICKUP~ mennäksesi taloon sisälle.', + ['public_leave'] = 'paina ~INPUT_PICKUP~ poistuaksesi talosta.', -- Lumber Jack job - ['lj_locker_room'] = 'metsurin Pukulokero', - ['lj_mapblip'] = 'Puukasa', - ['lj_wood'] = 'puu', - ['lj_pickup'] = 'paina ~INPUT_PICKUP~ kerätäksesi puita', - ['lj_cutwood'] = 'puun hakkuu', - ['lj_cutwood_button'] = 'paina ~INPUT_PICKUP~ pilkkoaksesi puita.', - ['lj_board'] = 'lankkuja', - ['lj_planks'] = 'paketoituja lankkuja', - ['lj_cutwood'] = 'pilko puita', - ['lj_pick_boards'] = 'paina ~INPUT_PICKUP~ saadaksesi lankkuja', - ['lj_deliver_button'] = 'paina ~INPUT_PICKUP~ toimitaaksesi lankut.', + ['lj_locker_room'] = 'metsurin Pukulokero', + ['lj_mapblip'] = 'puukasa', + ['lj_wood'] = 'puu', + ['lj_pickup'] = 'paina ~INPUT_PICKUP~ kerätäksesi puita', + ['lj_cutwood'] = 'puun hakkuu', + ['lj_cutwood_button'] = 'paina ~INPUT_PICKUP~ pilkkoaksesi puita.', + ['lj_board'] = 'lankkuja', + ['lj_planks'] = 'paketoituja lankkuja', + ['lj_cutwood'] = 'pilko puita', + ['lj_pick_boards'] = 'paina ~INPUT_PICKUP~ saadaksesi lankkuja', + ['lj_deliver_button'] = 'paina ~INPUT_PICKUP~ toimitaaksesi lankut.', -- Fisherman - ['fm_fish_locker'] = 'kalastajan Pukulokero', - ['fm_fish'] = 'kala', - ['fm_fish_area'] = 'kalastus alue', - ['fm_fish_button'] = 'paina ~INPUT_PICKUP~ kalastaaksesi', - ['fm_spawnboat_title'] = 'spawnaa laiva', - ['fm_spawnboat'] = 'paina ~INPUT_PICKUP~ soittaaksesi laiva.', - ['fm_boat_title'] = 'laiva', - ['fm_boat_return_title'] = 'laivan palautus', - ['fm_boat_return_button'] = 'paina ~INPUT_PICKUP~ palautaaksesi laiva', - ['fm_deliver_fish'] = 'paina ~INPUT_PICKUP~ myydäksesi kalat', + ['fm_fish_locker'] = 'kalastajan Pukulokero', + ['fm_fish'] = 'kala', + ['fm_fish_area'] = 'kalastus alue', + ['fm_fish_button'] = 'paina ~INPUT_PICKUP~ kalastaaksesi', + ['fm_spawnboat_title'] = 'spawnaa laiva', + ['fm_spawnboat'] = 'paina ~INPUT_PICKUP~ soittaaksesi laiva.', + ['fm_boat_title'] = 'laiva', + ['fm_boat_return_title'] = 'laivan palautus', + ['fm_boat_return_button'] = 'paina ~INPUT_PICKUP~ palautaaksesi laiva', + ['fm_deliver_fish'] = 'paina ~INPUT_PICKUP~ myydäksesi kalat', -- Fuel - ['f_oil_refiner'] = 'Öljynjalostajan Pukulokero', - ['f_drill_oil'] = 'poraa että saat öljyä', - ['f_fuel'] = 'öljy', - ['f_drillbutton'] = 'paina ~INPUT_PICKUP~ porataksesi', - ['f_fuel_refine'] = 'puhdista öljy', - ['f_refine_fuel_button'] = 'paina ~INPUT_PICKUP~ puhdistaaksesi', - ['f_fuel_mixture'] = 'sekoita puhdistettu öljy', - ['f_gas'] = 'Polttoöljy', - ['f_fuel_mixture_button'] = 'paina ~INPUT_PICKUP~ sekoita', - ['f_deliver_gas'] = 'toimita polttoöljy', - ['f_deliver_gas_button'] = 'paina ~INPUT_PICKUP~ myydäksesi Polttoöljyä', + ['f_oil_refiner'] = 'öljynjalostajan Pukulokero', + ['f_drill_oil'] = 'poraa että saat öljyä', + ['f_fuel'] = 'öljy', + ['f_drillbutton'] = 'paina ~INPUT_PICKUP~ porataksesi', + ['f_fuel_refine'] = 'puhdista öljy', + ['f_refine_fuel_button'] = 'paina ~INPUT_PICKUP~ puhdistaaksesi', + ['f_fuel_mixture'] = 'sekoita puhdistettu öljy', + ['f_gas'] = 'polttoöljy', + ['f_fuel_mixture_button'] = 'paina ~INPUT_PICKUP~ sekoita', + ['f_deliver_gas'] = 'toimita polttoöljy', + ['f_deliver_gas_button'] = 'paina ~INPUT_PICKUP~ myydäksesi Polttoöljyä', -- Miner - ['m_miner_locker'] = 'Kaivostyöläisen Pukulokero', - ['m_rock'] = 'kivi', - ['m_pickrocks'] = 'paina ~INPUT_PICKUP~ louhiaksesi kiviä.', - ['m_washrock'] = 'puhdistettu kivi', - ['m_rock_button'] = 'paina ~INPUT_PICKUP~ puhdistaaksesi kiviä', - ['m_rock_smelting'] = 'sulatus', - ['m_copper'] = 'kupari', - ['m_sell_copper'] = 'myy kupari', - ['m_deliver_copper'] = 'paina ~INPUT_PICKUP~ myydäksesi kuparit', - ['m_iron'] = 'metalli', - ['m_sell_iron'] = 'myy metalli', - ['m_deliver_iron'] = 'paina ~INPUT_PICKUP~ myydäksesi metallit', - ['m_gold'] = 'kulta', - ['m_sell_gold'] = 'myy kulta', - ['m_deliver_gold'] = 'paina ~INPUT_PICKUP~ myydäksesi kullat', - ['m_diamond'] = 'timantti', - ['m_sell_diamond'] = 'myy timantti', - ['m_deliver_diamond'] = 'paina ~INPUT_PICKUP~ myydäksesi timantit', - ['m_melt_button'] = 'paina ~INPUT_PICKUP~ sulattaaksesi kivet', + ['m_miner_locker'] = 'kaivostyöläisen Pukulokero', + ['m_rock'] = 'kivi', + ['m_pickrocks'] = 'paina ~INPUT_PICKUP~ louhiaksesi kiviä.', + ['m_washrock'] = 'puhdistettu kivi', + ['m_rock_button'] = 'paina ~INPUT_PICKUP~ puhdistaaksesi kiviä', + ['m_rock_smelting'] = 'sulatus', + ['m_copper'] = 'kupari', + ['m_sell_copper'] = 'myy kupari', + ['m_deliver_copper'] = 'paina ~INPUT_PICKUP~ myydäksesi kuparit', + ['m_iron'] = 'metalli', + ['m_sell_iron'] = 'myy metalli', + ['m_deliver_iron'] = 'paina ~INPUT_PICKUP~ myydäksesi metallit', + ['m_gold'] = 'kulta', + ['m_sell_gold'] = 'myy kulta', + ['m_deliver_gold'] = 'paina ~INPUT_PICKUP~ myydäksesi kullat', + ['m_diamond'] = 'timantti', + ['m_sell_diamond'] = 'myy timantti', + ['m_deliver_diamond'] = 'paina ~INPUT_PICKUP~ myydäksesi timantit', + ['m_melt_button'] = 'paina ~INPUT_PICKUP~ sulattaaksesi kivet', -- Reporter - ['reporter_name'] = 'san Andreas Times', - ['reporter_garage'] = 'paina ~INPUT_PICKUP~ mennäksesi alas talliin', + ['reporter_name'] = 'san Andreas Times', + ['reporter_garage'] = 'paina ~INPUT_PICKUP~ mennäksesi alas talliin', -- Slaughterer - ['s_slaughter_locker'] = 'teurastajan Pukulokero', - ['s_hen'] = 'kanakoppi', - ['s_alive_chicken'] = 'elävä kana', - ['s_catch_hen'] = 'paina ~INPUT_PICKUP~ ottaaksesi kana kiinni', - ['s_slaughtered_chicken'] = 'teurasta kana', - ['s_chop_animal'] = 'paina ~INPUT_PICKUP~ teurastaaksesi kanoja.', - ['s_slaughtered'] = 'teurastamo', - ['s_package'] = 'paketointi', - ['s_packagechicken'] = 'kananfilee', - ['s_unpackaged'] = 'kana paketoitavaksi', - ['s_unpackaged_button'] = 'paina ~INPUT_PICKUP~ laittaaksesi kanoja pakettiin', - ['s_deliver'] = 'paina ~INPUT_PICKUP~ myydäksesi kananfileet', + ['s_slaughter_locker'] = 'teurastajan Pukulokero', + ['s_hen'] = 'kanakoppi', + ['s_alive_chicken'] = 'elävä kana', + ['s_catch_hen'] = 'paina ~INPUT_PICKUP~ ottaaksesi kana kiinni', + ['s_slaughtered_chicken'] = 'teurasta kana', + ['s_chop_animal'] = 'paina ~INPUT_PICKUP~ teurastaaksesi kanoja.', + ['s_slaughtered'] = 'teurastamo', + ['s_package'] = 'paketointi', + ['s_packagechicken'] = 'kananfilee', + ['s_unpackaged'] = 'kana paketoitavaksi', + ['s_unpackaged_button'] = 'paina ~INPUT_PICKUP~ laittaaksesi kanoja pakettiin', + ['s_deliver'] = 'paina ~INPUT_PICKUP~ myydäksesi kananfileet', -- Dress Designer - ['dd_dress_locker'] = 'vaatevalmistajan Pukulokero', - ['dd_wool'] = 'villa', - ['dd_pickup'] = 'paina ~INPUT_PICKUP~ kerätäksesi villaa', - ['dd_fabric'] = 'kangas', - ['dd_makefabric'] = 'paina ~INPUT_PICKUP~ tehdäksesi kangasta', - ['dd_clothing'] = 'asuste', - ['dd_makeclothing'] = 'paina ~INPUT_PICKUP~ tehdäksesi asusteita', - ['dd_deliver_clothes'] = 'paina ~INPUT_PICKUP~ myydäksesi asusteita', - } + ['dd_dress_locker'] = 'vaatevalmistajan Pukulokero', + ['dd_wool'] = 'villa', + ['dd_pickup'] = 'paina ~INPUT_PICKUP~ kerätäksesi villaa', + ['dd_fabric'] = 'kangas', + ['dd_makefabric'] = 'paina ~INPUT_PICKUP~ tehdäksesi kangasta', + ['dd_clothing'] = 'asuste', + ['dd_makeclothing'] = 'paina ~INPUT_PICKUP~ tehdäksesi asusteita', + ['dd_deliver_clothes'] = 'paina ~INPUT_PICKUP~ myydäksesi asusteita', +} diff --git a/locales/fr.lua b/locales/fr.lua index 7ec5fd24..ab76c2a4 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,115 +1,115 @@ Locales['fr'] = { -- Global menus - ['cloakroom'] = 'vestiaire', - ['cloak_change'] = 'appuyez sur ~INPUT_PICKUP~ pour vous changer.', - ['citizen_wear'] = 'tenue civile', - ['job_wear'] = 'tenue de travail', - ['bank_deposit_returned'] = 'une caution de ~g~$%s~s~ vous a été rendue.', - ['bank_deposit_taken'] = 'une caution de ~g~$%s~s~ vous a été prélevée.', - ['caution_afford'] = 'you cannot afford the caution of ~g~$%s~s~', - ['foot_work'] = 'vous devez être à pied pour pouvoir travailler.', - ['next_point'] = 'rendez-vous à la prochaine étape après avoir complété celle-ci.', - ['not_your_vehicle'] = 'ce n\'est pas votre véhicule ou vous devez être conducteur.', - ['in_vehicle'] = 'vous devez être dans un véhicule.', - ['wrong_point'] = 'vous n\'êtes pas au bon point de livraison.', - ['max_limit'] = 'vous avez le maximum de ~y~%s~s~', - ['not_enough'] = 'vous n\'avez plus assez de ~y~%s~s~ pour continuer cette tâche.', - ['spawn_veh'] = 'spawner véhicule de fonction', - ['spawn_veh_button'] = 'appuyez sur ~INPUT_PICKUP~ pour appeler le véhicule de livraison.', - ['spawn_truck_button'] = 'appuyez sur ~INPUT_PICKUP~ pour appeler le camion.', - ['spawn_blocked'] = 'an vehicle is blocking the spawnpoint!', - ['service_vh'] = 'véhicule de fonction', - ['return_vh'] = 'supression du véhicule', - ['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.', + ['cloakroom'] = 'vestiaire', + ['cloak_change'] = 'appuyez sur ~INPUT_PICKUP~ pour vous changer.', + ['citizen_wear'] = 'tenue civile', + ['job_wear'] = 'tenue de travail', + ['bank_deposit_returned'] = 'une caution de ~g~$%s~s~ vous a été rendue.', + ['bank_deposit_taken'] = 'une caution de ~g~$%s~s~ vous a été prélevée.', + ['caution_afford'] = 'you cannot afford the caution of ~g~$%s~s~', + ['foot_work'] = 'vous devez être à pied pour pouvoir travailler.', + ['next_point'] = 'rendez-vous à la prochaine étape après avoir complété celle-ci.', + ['not_your_vehicle'] = 'ce n\'est pas votre véhicule ou vous devez être conducteur.', + ['in_vehicle'] = 'vous devez être dans un véhicule.', + ['wrong_point'] = 'vous n\'êtes pas au bon point de livraison.', + ['max_limit'] = 'vous avez le maximum de ~y~%s~s~', + ['not_enough'] = 'vous n\'avez plus assez de ~y~%s~s~ pour continuer cette tâche.', + ['spawn_veh'] = 'spawner véhicule de fonction', + ['spawn_veh_button'] = 'appuyez sur ~INPUT_PICKUP~ pour appeler le véhicule de livraison.', + ['spawn_truck_button'] = 'appuyez sur ~INPUT_PICKUP~ pour appeler le camion.', + ['spawn_blocked'] = 'an vehicle is blocking the spawnpoint!', + ['service_vh'] = 'véhicule de fonction', + ['return_vh'] = 'supression du véhicule', + ['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'] = 'vestiaire du bûcheron', - ['lj_mapblip'] = 'tas de bois', - ['lj_wood'] = 'bois', - ['lj_pickup'] = 'appuyez sur ~INPUT_PICKUP~ pour récupérer du bois.', - ['lj_cutwood'] = 'découpe du bois', - ['lj_cutwood_button'] = 'appuyez sur ~INPUT_PICKUP~ pour couper du bois.', - ['lj_board'] = 'planches', - ['lj_planks'] = 'paquet de planche', - ['lj_cutwood'] = 'bois coupé', - ['lj_pick_boards'] = 'appuyez sur ~INPUT_PICKUP~ pour récupérer des planches.', - ['lj_deliver_button'] = 'appuyez sur ~INPUT_PICKUP~ pour livrer les planches.', + ['lj_locker_room'] = 'vestiaire du bûcheron', + ['lj_mapblip'] = 'tas de bois', + ['lj_wood'] = 'bois', + ['lj_pickup'] = 'appuyez sur ~INPUT_PICKUP~ pour récupérer du bois.', + ['lj_cutwood'] = 'découpe du bois', + ['lj_cutwood_button'] = 'appuyez sur ~INPUT_PICKUP~ pour couper du bois.', + ['lj_board'] = 'planches', + ['lj_planks'] = 'paquet de planche', + ['lj_cutwood'] = 'bois coupé', + ['lj_pick_boards'] = 'appuyez sur ~INPUT_PICKUP~ pour récupérer des planches.', + ['lj_deliver_button'] = 'appuyez sur ~INPUT_PICKUP~ pour livrer les planches.', -- Fisherman - ['fm_fish_locker'] = 'vestiaire du pêcheur', - ['fm_fish'] = 'poisson', - ['fm_fish_area'] = 'zone de pêche', - ['fm_fish_button'] = 'appuyez sur ~INPUT_PICKUP~ pour pêcher.', - ['fm_spawnboat_title'] = 'spawner bateau', - ['fm_spawnboat'] = 'appuyez sur ~INPUT_PICKUP~ pour appeler le bateau.', - ['fm_boat_title'] = 'bateau', - ['fm_boat_return_title'] = 'supression du bateau', - ['fm_boat_return_button'] = 'appuyez sur ~INPUT_PICKUP~ pour rendre le bateau.', - ['fm_deliver_fish'] = 'appuyez sur ~INPUT_PICKUP~ pour livrer le poisson.', + ['fm_fish_locker'] = 'vestiaire du pêcheur', + ['fm_fish'] = 'poisson', + ['fm_fish_area'] = 'zone de pêche', + ['fm_fish_button'] = 'appuyez sur ~INPUT_PICKUP~ pour pêcher.', + ['fm_spawnboat_title'] = 'spawner bateau', + ['fm_spawnboat'] = 'appuyez sur ~INPUT_PICKUP~ pour appeler le bateau.', + ['fm_boat_title'] = 'bateau', + ['fm_boat_return_title'] = 'supression du bateau', + ['fm_boat_return_button'] = 'appuyez sur ~INPUT_PICKUP~ pour rendre le bateau.', + ['fm_deliver_fish'] = 'appuyez sur ~INPUT_PICKUP~ pour livrer le poisson.', -- Fuel - ['f_oil_refiner'] = 'vestiaire du raffineur', - ['f_drill_oil'] = 'extraction le pétrole', - ['f_fuel'] = 'pétrole', - ['f_drillbutton'] = 'appuyez sur ~INPUT_PICKUP~ pour forer.', - ['f_fuel_refine'] = 'pétrol raffiné', - ['f_refine_fuel_button'] = 'appuyez sur ~INPUT_PICKUP~ pour raffiner le pétrole.', - ['f_fuel_mixture'] = 'mélange', - ['f_gas'] = 'essence', - ['f_fuel_mixture_button'] = 'appuyez sur ~INPUT_PICKUP~ pour mélanger.', - ['f_deliver_gas'] = 'livraison d\'essence.', - ['f_deliver_gas_button'] = 'appuyez sur ~INPUT_PICKUP~ pour livrer l\'essence.', + ['f_oil_refiner'] = 'vestiaire du raffineur', + ['f_drill_oil'] = 'extraction le pétrole', + ['f_fuel'] = 'pétrole', + ['f_drillbutton'] = 'appuyez sur ~INPUT_PICKUP~ pour forer.', + ['f_fuel_refine'] = 'pétrol raffiné', + ['f_refine_fuel_button'] = 'appuyez sur ~INPUT_PICKUP~ pour raffiner le pétrole.', + ['f_fuel_mixture'] = 'mélange', + ['f_gas'] = 'essence', + ['f_fuel_mixture_button'] = 'appuyez sur ~INPUT_PICKUP~ pour mélanger.', + ['f_deliver_gas'] = 'livraison d\'essence.', + ['f_deliver_gas_button'] = 'appuyez sur ~INPUT_PICKUP~ pour livrer l\'essence.', -- Miner - ['m_miner_locker'] = 'vestiaire du mineur', - ['m_rock'] = 'rocher', - ['m_pickrocks'] = 'appuyez sur ~INPUT_PICKUP~ pour récupérer des rochers.', - ['m_washrock'] = 'roche lavé', - ['m_rock_button'] = 'appuyez sur ~INPUT_PICKUP~ pour laver les roches.', - ['m_rock_smelting'] = 'fonderie', - ['m_copper'] = 'cuivre', - ['m_sell_copper'] = 'revente de cuivre', - ['m_deliver_copper'] = 'appuyez sur ~INPUT_PICKUP~ pour livrer le cuivre.', - ['m_iron'] = 'fer', - ['m_sell_iron'] = 'revente de fer', - ['m_deliver_iron'] = 'appuyez sur ~INPUT_PICKUP~ pour livrer le fer.', - ['m_gold'] = 'or', - ['m_sell_gold'] = 'revente d\'or', - ['m_deliver_gold'] = 'appuyez sur ~INPUT_PICKUP~ pour livrer l\'or\'.', - ['m_diamond'] = 'diamant', - ['m_sell_diamond'] = 'revente de diamants', - ['m_deliver_diamond'] = 'appuyez sur ~INPUT_PICKUP~ pour livrer les diamants.', - ['m_melt_button'] = 'appuyez sur ~INPUT_PICKUP~ pour fondre les roches.', + ['m_miner_locker'] = 'vestiaire du mineur', + ['m_rock'] = 'rocher', + ['m_pickrocks'] = 'appuyez sur ~INPUT_PICKUP~ pour récupérer des rochers.', + ['m_washrock'] = 'roche lavé', + ['m_rock_button'] = 'appuyez sur ~INPUT_PICKUP~ pour laver les roches.', + ['m_rock_smelting'] = 'fonderie', + ['m_copper'] = 'cuivre', + ['m_sell_copper'] = 'revente de cuivre', + ['m_deliver_copper'] = 'appuyez sur ~INPUT_PICKUP~ pour livrer le cuivre.', + ['m_iron'] = 'fer', + ['m_sell_iron'] = 'revente de fer', + ['m_deliver_iron'] = 'appuyez sur ~INPUT_PICKUP~ pour livrer le fer.', + ['m_gold'] = 'or', + ['m_sell_gold'] = 'revente d\'or', + ['m_deliver_gold'] = 'appuyez sur ~INPUT_PICKUP~ pour livrer l\'or\'.', + ['m_diamond'] = 'diamant', + ['m_sell_diamond'] = 'revente de diamants', + ['m_deliver_diamond'] = 'appuyez sur ~INPUT_PICKUP~ pour livrer les diamants.', + ['m_melt_button'] = 'appuyez sur ~INPUT_PICKUP~ pour fondre les roches.', -- Reporter - ['reporter_name'] = 'le Maclerait Libéré', - ['reporter_garage'] = 'appuyez sur ~INPUT_PICKUP~ pour descendre au garage.', + ['reporter_name'] = 'le Maclerait Libéré', + ['reporter_garage'] = 'appuyez sur ~INPUT_PICKUP~ pour descendre au garage.', -- Slaughterer - ['s_slaughter_locker'] = 'vestiaire de l\'abatteur', - ['s_hen'] = 'poulailler', - ['s_alive_chicken'] = 'poulet vivant', - ['s_catch_hen'] = 'appuyez sur ~INPUT_PICKUP~ pour attrapper des poulets vivants.', - ['s_slaughtered_chicken'] = 'poulet à conditionner', - ['s_chop_animal'] = 'appuyez sur ~INPUT_PICKUP~ pour dépecer les poulets.', - ['s_slaughtered'] = 'abattoir', - ['s_package'] = 'emballage', - ['s_packagechicken'] = 'poulet en barquette', - ['s_unpackaged'] = 'poulet à conditionner', - ['s_unpackaged_button'] = 'appuyez sur ~INPUT_PICKUP~ pour conditionner le poulet en barquette.', - ['s_deliver'] = 'appuyez sur ~INPUT_PICKUP~ pour livrer les barquettes de poulet.', + ['s_slaughter_locker'] = 'vestiaire de l\'abatteur', + ['s_hen'] = 'poulailler', + ['s_alive_chicken'] = 'poulet vivant', + ['s_catch_hen'] = 'appuyez sur ~INPUT_PICKUP~ pour attrapper des poulets vivants.', + ['s_slaughtered_chicken'] = 'poulet à conditionner', + ['s_chop_animal'] = 'appuyez sur ~INPUT_PICKUP~ pour dépecer les poulets.', + ['s_slaughtered'] = 'abattoir', + ['s_package'] = 'emballage', + ['s_packagechicken'] = 'poulet en barquette', + ['s_unpackaged'] = 'poulet à conditionner', + ['s_unpackaged_button'] = 'appuyez sur ~INPUT_PICKUP~ pour conditionner le poulet en barquette.', + ['s_deliver'] = 'appuyez sur ~INPUT_PICKUP~ pour livrer les barquettes de poulet.', -- Dress Designer - ['dd_dress_locker'] = 'vestiaire du couturier', - ['dd_wool'] = 'laine', - ['dd_pickup'] = 'appuyez sur ~INPUT_PICKUP~ pour récupérer de la laine.', - ['dd_fabric'] = 'tissu', - ['dd_makefabric'] = 'appuyez sur ~INPUT_PICKUP~ pour fabriquer du tissu.', - ['dd_clothing'] = 'vêtement', - ['dd_makeclothing'] = 'appuyez sur ~INPUT_PICKUP~ pour récupérer des vêtements.', - ['dd_deliver_clothes'] = 'appuyez sur ~INPUT_PICKUP~ pour livrer les vêtements.', + ['dd_dress_locker'] = 'vestiaire du couturier', + ['dd_wool'] = 'laine', + ['dd_pickup'] = 'appuyez sur ~INPUT_PICKUP~ pour récupérer de la laine.', + ['dd_fabric'] = 'tissu', + ['dd_makefabric'] = 'appuyez sur ~INPUT_PICKUP~ pour fabriquer du tissu.', + ['dd_clothing'] = 'vêtement', + ['dd_makeclothing'] = 'appuyez sur ~INPUT_PICKUP~ pour récupérer des vêtements.', + ['dd_deliver_clothes'] = 'appuyez sur ~INPUT_PICKUP~ pour livrer les vêtements.', } diff --git a/locales/sv.lua b/locales/sv.lua index 49a99e88..3a39f355 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,115 +1,115 @@ Locales['sv'] = { -- Global menus - ['cloakroom'] = 'omklädningsrum', - ['cloak_change'] = 'tryck ~INPUT_PICKUP~ för att byta kläder.', - ['citizen_wear'] = 'civilkläder', - ['job_wear'] = 'arbetskläder', - ['bank_deposit_returned'] = 'en deposition på ~g~%s SEK~s~ har återvänts till dig.', - ['bank_deposit_taken'] = 'en deposition på ~r~%s SEK~s~ togs från dig.', - ['caution_afford'] = 'you cannot afford the caution of ~g~$%s~s~', - ['foot_work'] = 'du måste vara till fots för att kunna arbeta.', - ['next_point'] = 'gå till nästa steg efter att du har avslutat här.', - ['not_your_vehicle'] = 'det här är inte ditt fordon eller så måste du vara föraren.', - ['in_vehicle'] = 'du måste sitta i ett fordon!', - ['wrong_point'] = 'du är inte på rätt leveranspunkt!', - ['max_limit'] = 'du kan inte bära mer ~y~%s~s~', - ['not_enough'] = 'du har inte tillräckligt med ~y~%s~s~ för att fortsätta denna uppgift.', - ['spawn_veh'] = 'spawna fordon', - ['spawn_veh_button'] = 'tryck ~INPUT_PICKUP~ för att ringa leveransfordonet.', - ['spawn_truck_button'] = 'tryck ~INPUT_PICKUP~ för att spawna bilen.', - ['spawn_blocked'] = 'ett fordon blockerar spawnpointen!', - ['service_vh'] = 'service fordon', - ['return_vh'] = 'lämna service fordon', - ['return_vh_button'] = 'tryck ~INPUT_PICKUP~ för att ge tillbaka fordonet.', - ['delivery_point'] = 'leveranspunkt', - ['delivery'] = 'leverans', - ['public_enter'] = 'tryck ~INPUT_PICKUP~ för att gå in i byggnaden.', - ['public_leave'] = 'tryck ~INPUT_PICKUP~ för att lämna byggnaden.', + ['cloakroom'] = 'omklädningsrum', + ['cloak_change'] = 'tryck ~INPUT_PICKUP~ för att byta kläder.', + ['citizen_wear'] = 'civilkläder', + ['job_wear'] = 'arbetskläder', + ['bank_deposit_returned'] = 'en deposition på ~g~%s SEK~s~ har återvänts till dig.', + ['bank_deposit_taken'] = 'en deposition på ~r~%s SEK~s~ togs från dig.', + ['caution_afford'] = 'you cannot afford the caution of ~g~$%s~s~', + ['foot_work'] = 'du måste vara till fots för att kunna arbeta.', + ['next_point'] = 'gå till nästa steg efter att du har avslutat här.', + ['not_your_vehicle'] = 'det här är inte ditt fordon eller så måste du vara föraren.', + ['in_vehicle'] = 'du måste sitta i ett fordon!', + ['wrong_point'] = 'du är inte på rätt leveranspunkt!', + ['max_limit'] = 'du kan inte bära mer ~y~%s~s~', + ['not_enough'] = 'du har inte tillräckligt med ~y~%s~s~ för att fortsätta denna uppgift.', + ['spawn_veh'] = 'spawna fordon', + ['spawn_veh_button'] = 'tryck ~INPUT_PICKUP~ för att ringa leveransfordonet.', + ['spawn_truck_button'] = 'tryck ~INPUT_PICKUP~ för att spawna bilen.', + ['spawn_blocked'] = 'ett fordon blockerar spawnpointen!', + ['service_vh'] = 'service fordon', + ['return_vh'] = 'lämna service fordon', + ['return_vh_button'] = 'tryck ~INPUT_PICKUP~ för att ge tillbaka fordonet.', + ['delivery_point'] = 'leveranspunkt', + ['delivery'] = 'leverans', + ['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', - ['lj_mapblip'] = 'trähög', - ['lj_wood'] = 'träd', - ['lj_pickup'] = 'tryck ~INPUT_PICKUP~ för att hämta trä.', - ['lj_cutwood'] = 'trädfällning', - ['lj_cutwood_button'] = 'tryck ~INPUT_PICKUP~ för att hugga trä.', - ['lj_board'] = 'brädor', - ['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 sälja brädorna.', + ['lj_locker_room'] = 'skogshuggare omklädningsrum', + ['lj_mapblip'] = 'trähög', + ['lj_wood'] = 'träd', + ['lj_pickup'] = 'tryck ~INPUT_PICKUP~ för att hämta trä.', + ['lj_cutwood'] = 'trädfällning', + ['lj_cutwood_button'] = 'tryck ~INPUT_PICKUP~ för att hugga trä.', + ['lj_board'] = 'brädor', + ['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 sälja brädorna.', -- Fisherman - ['fm_fish_locker'] = 'fiskarens omklädningsrum', - ['fm_fish'] = 'fisk', - ['fm_fish_area'] = 'fiskeoområde', - ['fm_fish_button'] = 'tryck ~INPUT_PICKUP~ för att fiska.', - ['fm_spawnboat_title'] = 'spawn boat', - ['fm_spawnboat'] = 'tryck ~INPUT_PICKUP~ för att spawna båten.', - ['fm_boat_title'] = 'båt', - ['fm_boat_return_title'] = 'lämna tillbaka båt', - ['fm_boat_return_button'] = 'tryck ~INPUT_PICKUP~ för att återvända båten.', - ['fm_deliver_fish'] = 'tryck ~INPUT_PICKUP~ för att sälja fisk.', + ['fm_fish_locker'] = 'fiskarens omklädningsrum', + ['fm_fish'] = 'fisk', + ['fm_fish_area'] = 'fiskeoområde', + ['fm_fish_button'] = 'tryck ~INPUT_PICKUP~ för att fiska.', + ['fm_spawnboat_title'] = 'spawn boat', + ['fm_spawnboat'] = 'tryck ~INPUT_PICKUP~ för att spawna båten.', + ['fm_boat_title'] = 'båt', + ['fm_boat_return_title'] = 'lämna tillbaka båt', + ['fm_boat_return_button'] = 'tryck ~INPUT_PICKUP~ för att återvända båten.', + ['fm_deliver_fish'] = 'tryck ~INPUT_PICKUP~ för att sälja fisk.', -- Fuel - ['f_oil_refiner'] = 'Oljeraffinaderi Omklädningsrum', - ['f_drill_oil'] = 'borra efter olja', - ['f_fuel'] = 'olja', - ['f_drillbutton'] = 'tryck ~INPUT_PICKUP~ för att borra efter olja.', - ['f_fuel_refine'] = 'raffinera oljan', - ['f_refine_fuel_button'] = 'tryck ~INPUT_PICKUP~ för att raffinera olja.', - ['f_fuel_mixture'] = 'blanda raffinerad olja', - ['f_gas'] = 'gas', - ['f_fuel_mixture_button'] = 'tryck ~INPUT_PICKUP~ för att mixa olja.', - ['f_deliver_gas'] = 'leverera gas', - ['f_deliver_gas_button'] = 'tryck ~INPUT_PICKUP~ för att sälja bensin.', + ['f_oil_refiner'] = 'ojeraffinaderi Omklädningsrum', + ['f_drill_oil'] = 'borra efter olja', + ['f_fuel'] = 'olja', + ['f_drillbutton'] = 'tryck ~INPUT_PICKUP~ för att borra efter olja.', + ['f_fuel_refine'] = 'raffinera oljan', + ['f_refine_fuel_button'] = 'tryck ~INPUT_PICKUP~ för att raffinera olja.', + ['f_fuel_mixture'] = 'blanda raffinerad olja', + ['f_gas'] = 'gas', + ['f_fuel_mixture_button'] = 'tryck ~INPUT_PICKUP~ för att mixa olja.', + ['f_deliver_gas'] = 'leverera gas', + ['f_deliver_gas_button'] = 'tryck ~INPUT_PICKUP~ för att sälja bensin.', -- Miner - ['m_miner_locker'] = 'Gruvarbetarnas Omklädningsrum', - ['m_rock'] = 'sten', - ['m_pickrocks'] = 'tryck ~INPUT_PICKUP~ för att hämta sten.', - ['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.', + ['m_miner_locker'] = 'Gruvarbetarnas Omklädningsrum', + ['m_rock'] = 'sten', + ['m_pickrocks'] = 'tryck ~INPUT_PICKUP~ för att hämta sten.', + ['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'] = 'aftonbladet', - ['reporter_garage'] = 'tryck ~INPUT_PICKUP~ för att gå ner till garaget.', + ['reporter_name'] = 'aftonbladet', + ['reporter_garage'] = 'tryck ~INPUT_PICKUP~ för att gå ner till garaget.', -- Slaughterer - ['s_slaughter_locker'] = 'slaktarens omklädningsrum', - ['s_hen'] = 'hönshus', - ['s_alive_chicken'] = 'Levande Kyckling', - ['s_catch_hen'] = 'tryck ~INPUT_PICKUP~ för att fånga en kyckling.', - ['s_slaughtered_chicken'] = 'kyckling som ska packas', - ['s_chop_animal'] = 'tryck ~INPUT_PICKUP~ för att slakta kycklingar.', - ['s_slaughtered'] = 'Slaktarhus', - ['s_package'] = 'förpackning', - ['s_packagechicken'] = 'kyckling i förpackning', - ['s_unpackaged'] = 'kyckling väntar på att förpackas', - ['s_unpackaged_button'] = 'tryck ~INPUT_PICKUP~ för att packa kycklingen.', - ['s_deliver'] = 'tryck ~INPUT_PICKUP~ för att sälja kycklingsförpackningar.', + ['s_slaughter_locker'] = 'slaktarens omklädningsrum', + ['s_hen'] = 'hönshus', + ['s_alive_chicken'] = 'levande Kyckling', + ['s_catch_hen'] = 'tryck ~INPUT_PICKUP~ för att fånga en kyckling.', + ['s_slaughtered_chicken'] = 'kyckling som ska packas', + ['s_chop_animal'] = 'tryck ~INPUT_PICKUP~ för att slakta kycklingar.', + ['s_slaughtered'] = 'slaktarhus', + ['s_package'] = 'förpackning', + ['s_packagechicken'] = 'kyckling i förpackning', + ['s_unpackaged'] = 'kyckling väntar på att förpackas', + ['s_unpackaged_button'] = 'tryck ~INPUT_PICKUP~ för att packa kycklingen.', + ['s_deliver'] = 'tryck ~INPUT_PICKUP~ för att sälja kycklingsförpackningar.', -- Dress Designer - ['dd_dress_locker'] = 'Klädesdesigners omklädningsrum', - ['dd_wool'] = 'ull', - ['dd_pickup'] = 'tryck ~INPUT_PICKUP~ för att skörda ull.', - ['dd_fabric'] = 'tyg', - ['dd_makefabric'] = 'tryck ~INPUT_PICKUP~ för att framställa tyg.', - ['dd_clothing'] = 'plagg', - ['dd_makeclothing'] = 'tryck ~INPUT_PICKUP~ för att hämta kläder.', - ['dd_deliver_clothes'] = 'tryck ~INPUT_PICKUP~ för att sälja plagg.', - } + ['dd_dress_locker'] = 'Klädesdesigners omklädningsrum', + ['dd_wool'] = 'ull', + ['dd_pickup'] = 'tryck ~INPUT_PICKUP~ för att skörda ull.', + ['dd_fabric'] = 'tyg', + ['dd_makefabric'] = 'tryck ~INPUT_PICKUP~ för att framställa tyg.', + ['dd_clothing'] = 'plagg', + ['dd_makeclothing'] = 'tryck ~INPUT_PICKUP~ för att hämta kläder.', + ['dd_deliver_clothes'] = 'tryck ~INPUT_PICKUP~ för att sälja plagg.', +} From 4889b29808cf6a1d93ec1ea91c74bfe6507b9fcd Mon Sep 17 00:00:00 2001 From: medina102 Date: Fri, 3 Jul 2020 19:00:57 +0200 Subject: [PATCH 14/17] Update to Fisherman.Lua (#109) Changed Boat caution to True to fix boat not being returned issue. --- jobs/fisherman.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jobs/fisherman.lua b/jobs/fisherman.lua index f86e332d..cbad08c0 100644 --- a/jobs/fisherman.lua +++ b/jobs/fisherman.lua @@ -18,7 +18,7 @@ Config.Jobs.fisherman = { Spawner = 2, Hash = 'tug', Trailer = 'none', - HasCaution = false + HasCaution = true } }, From d12e7339ac3dbb8dc3ec21d25149d1b45075b486 Mon Sep 17 00:00:00 2001 From: Jougito - Kheros Date: Sat, 18 Jul 2020 14:35:44 +0200 Subject: [PATCH 15/17] Create es_esx_jobs.sql (#129) --- localization/es_esx_jobs.sql | 47 ++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 localization/es_esx_jobs.sql diff --git a/localization/es_esx_jobs.sql b/localization/es_esx_jobs.sql new file mode 100644 index 00000000..f6a2b470 --- /dev/null +++ b/localization/es_esx_jobs.sql @@ -0,0 +1,47 @@ +USE `es_extended`; + +INSERT INTO `addon_account` (name, label, shared) VALUES + ('caution', 'Precaución', 0) +; + +INSERT INTO `jobs` (name, label) VALUES + ('slaughterer', 'Carnicero'), + ('fisherman', 'Pescador'), + ('miner', 'Minero'), + ('lumberjack', 'Leñador'), + ('fueler', 'Camionero'), + ('reporter', 'Repartidor'), + ('tailor', 'Sastre') +; + +INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_female) VALUES + ('lumberjack', 0, 'employee', 'Trabajador', 0, '{}', '{}'), + ('fisherman', 0, 'employee', 'Trabajador', 0, '{}', '{}'), + ('fueler', 0, 'employee', 'Trabajador', 0, '{}', '{}'), + ('reporter', 0, 'employee', 'Trabajador', 0, '{}', '{}'), + ('tailor', 0, 'employee', 'Trabajador', 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, 'employee', 'Trabajador', 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, 'employee', 'Trabajador', 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`, `weight`) VALUES + ('alive_chicken', 'Pollo vivo', 1), + ('slaughtered_chicken', 'Pollo sacrificado', 1), + ('packaged_chicken', 'Filete de pollo', 1), + ('fish', 'Pez', 1), + ('stone', 'Piedra', 1), + ('washed_stone', 'Piedra pulida', 1), + ('copper', 'Cobre', 1), + ('iron', 'Hierro', 1), + ('gold', 'Oro', 1), + ('diamond', 'Diamante', 1), + ('wood', 'Madera', 1), + ('cutted_wood', 'Madera cortada', 1), + ('packaged_plank', 'Madera empaquetada', 1), + ('petrol', 'Gasolina', 1), + ('petrol_raffin', 'Gasolina destilada', 1), + ('essence', 'Gas', 1), + ('wool', 'Lana', 1), + ('fabric', 'Tela', 1), + ('clothe', 'Paño', 1) +; From 50e6808322a4605e5a6e06d642f15a18d6d71bd3 Mon Sep 17 00:00:00 2001 From: MonoChirito <63525404+MonoChirito@users.noreply.github.com> Date: Mon, 5 Oct 2020 01:12:59 +0200 Subject: [PATCH 16/17] added de.lua (#133) * Create de.lua * Update fxmanifest.lua --- fxmanifest.lua | 1 + locales/de.lua | 115 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 locales/de.lua diff --git a/fxmanifest.lua b/fxmanifest.lua index 8f8b0317..44b23a2c 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -15,6 +15,7 @@ server_scripts { 'locales/fr.lua', 'locales/sv.lua', 'locales/cs.lua', + 'locales/de.lua', 'config.lua', 'jobs/fisherman.lua', diff --git a/locales/de.lua b/locales/de.lua new file mode 100644 index 00000000..abdb99ef --- /dev/null +++ b/locales/de.lua @@ -0,0 +1,115 @@ +Locales['de'] = { + -- Global menus + ['cloakroom'] = 'Umkleide', + ['cloak_change'] = 'Drücke ~INPUT_PICKUP~ to change clothes.', + ['citizen_wear'] = 'Zivilkleidung', + ['job_wear'] = 'Arbeitskleidung', + ['bank_deposit_returned'] = 'Ein Pfand über ~g~$%s~s~ wurde dir zurückgegeben.', + ['bank_deposit_taken'] = 'Ein Pfand über ~r~$%s~s~ wurde von dir genommen.', + ['caution_afford'] = 'Du kannst die Kaution über ~g~$%s~s~ nicht bezahlen', + ['foot_work'] = 'Du musst dafür zu Fuß sein.', + ['next_point'] = 'Gehe zum nächsten Schritt nach diesem.', + ['not_your_vehicle'] = 'Du bist nicht der Fahrer von diesem Fahrzeug.', + ['in_vehicle'] = 'Du musst in einem Fahrzeug sitzen.', + ['wrong_point'] = 'Du bist nicht am richtigen Lieferpunkt.', + ['max_limit'] = 'Du kannst nicht mehr ~y~%s~s~ tragen', + ['not_enough'] = 'Du hast nicht genug ~y~%s~s~ um diese Aufgabe weiterhin zu erledigen.', + ['spawn_veh'] = 'Fahrzeug spawnen', + ['spawn_veh_button'] = 'Drücke ~INPUT_PICKUP~ um ein Lieferfahrzeug zu holen.', + ['spawn_truck_button'] = 'Drücke ~INPUT_PICKUP~ um einen Truck zu spawnen.', + ['spawn_blocked'] = 'Ein Fahrzeug blockiert den Spawnpoint!', + ['service_vh'] = 'Service Fahrzeug', + ['return_vh'] = 'Fahrzeugrückgabe', + ['return_vh_button'] = 'Drücke ~INPUT_PICKUP~ um das Fahrzeug zurückzugeben.', + ['delivery_point'] = 'Lieferpunkt', + ['delivery'] = 'Lieferung', + ['public_enter'] = 'Drücke ~INPUT_PICKUP~ um das Gebäude zu betreten.', + ['public_leave'] = 'Drücke ~INPUT_PICKUP~ um das Gebäude zu verlassen.', + + -- Lumber Jack job + ['lj_locker_room'] = 'Umkleide', + ['lj_mapblip'] = 'Holzstapel', + ['lj_wood'] = 'Holz', + ['lj_pickup'] = 'Drücke ~INPUT_PICKUP~ um Holz zu sammeln.', + ['lj_cutwood'] = 'Holzverarbeitung', + ['lj_cutwood_button'] = 'Drücke ~INPUT_PICKUP~ um das Holz zu schneiden.', + ['lj_board'] = 'Bretter', + ['lj_planks'] = 'Holz verarbeiten', + ['lj_cutwood'] = 'Holz schneiden', + ['lj_pick_boards'] = 'Drücke ~INPUT_PICKUP~ um Bretter zu bekommen.', + ['lj_deliver_button'] = 'Drücke ~INPUT_PICKUP~ um die Bretter zu liefern.', + + -- Fisherman + ['fm_fish_locker'] = 'Umkleide', + ['fm_fish'] = 'Fisch', + ['fm_fish_area'] = 'Fischerzone', + ['fm_fish_button'] = 'Drücke ~INPUT_PICKUP~ um zu fischen.', + ['fm_spawnboat_title'] = 'Boot spawnen', + ['fm_spawnboat'] = 'Drücke ~INPUT_PICKUP~ um ein Boot auszuparken.', + ['fm_boat_title'] = 'Boot', + ['fm_boat_return_title'] = 'Bootsrückgabe', + ['fm_boat_return_button'] = 'Drücke ~INPUT_PICKUP~ um das Boot zurückzugeben.', + ['fm_deliver_fish'] = 'Drücke ~INPUT_PICKUP~ um den Fisch zu liefern.', + + -- Fuel + ['f_oil_refiner'] = 'Umkleide', + ['f_drill_oil'] = 'Nach Öl bohren', + ['f_fuel'] = 'Öl', + ['f_drillbutton'] = 'Drücke ~INPUT_PICKUP~ um nach Öl zu bohren.', + ['f_fuel_refine'] = 'Öl verarbeiten', + ['f_refine_fuel_button'] = 'Drücke ~INPUT_PICKUP~ zum verarbeiten.', + ['f_fuel_mixture'] = 'Öl mischen', + ['f_gas'] = 'Benzin', + ['f_fuel_mixture_button'] = 'Drücke ~INPUT_PICKUP~ um das Öl zu mixen.', + ['f_deliver_gas'] = 'Benzin liefern', + ['f_deliver_gas_button'] = 'Drücke ~INPUT_PICKUP~ um Benzin zu liefern.', + + -- Miner + ['m_miner_locker'] = 'Umkleide', + ['m_rock'] = 'Stein', + ['m_pickrocks'] = 'Drücke ~INPUT_PICKUP~ um Stein abzubauen.', + ['m_washrock'] = 'Steine waschen', + ['m_rock_button'] = 'Drücke ~INPUT_PICKUP~ um die Steine zu waschen.', + ['m_rock_smelting'] = 'Steine schmelzen', + ['m_copper'] = 'Kupfer', + ['m_sell_copper'] = 'Kupfer Verkäufer', + ['m_deliver_copper'] = 'Drücke ~INPUT_PICKUP~ um Kupfer zu liefern.', + ['m_iron'] = 'Eisen', + ['m_sell_iron'] = 'Eisen Verkäufer', + ['m_deliver_iron'] = 'Drücke ~INPUT_PICKUP~ um Eisen zu liefern.', + ['m_gold'] = 'Gold', + ['m_sell_gold'] = 'Gold verkaufen', + ['m_deliver_gold'] = 'Drücke ~INPUT_PICKUP~ um Gold zu verkaufen.', + ['m_diamond'] = 'Diamant', + ['m_sell_diamond'] = 'Diamanten verkaufen', + ['m_deliver_diamond'] = 'Drücke ~INPUT_PICKUP~ um die Diamanten zu verkaufen.', + ['m_melt_button'] = 'Drücke ~INPUT_PICKUP~ um die Steine zu schmelzen.', + + -- Reporter + ['reporter_name'] = 'san Andreas Times', + ['reporter_garage'] = 'Drücke ~INPUT_PICKUP~ to go down to the garage.', + + -- Slaughterer + ['s_slaughter_locker'] = 'Umkleide', + ['s_hen'] = 'Hühner', + ['s_alive_chicken'] = 'lebende Hühner', + ['s_catch_hen'] = 'Drücke ~INPUT_PICKUP~ um Hühner zu fangen.', + ['s_slaughtered_chicken'] = 'Hühner verpacken', + ['s_chop_animal'] = 'Drücke ~INPUT_PICKUP~ um die Hühner zu schneiden.', + ['s_slaughtered'] = 'SChlachthaus', + ['s_package'] = 'Verpackung', + ['s_packagechicken'] = 'Hühnchen in Verpackung', + ['s_unpackaged'] = 'Verpackbereite Hühnchen', + ['s_unpackaged_button'] = 'Drücke ~INPUT_PICKUP~ um die Hühnchen zu verpacken.', + ['s_deliver'] = 'Drücke ~INPUT_PICKUP~ um die Hühnchen zu liefern.', + + -- Dress Designer + ['dd_dress_locker'] = 'dress Designer\'s Locker Room', + ['dd_wool'] = 'wool', + ['dd_pickup'] = 'Drücke ~INPUT_PICKUP~ to retrieve wool.', + ['dd_fabric'] = 'fabric', + ['dd_makefabric'] = 'Drücke ~INPUT_PICKUP~ to make fabric.', + ['dd_clothing'] = 'clothing', + ['dd_makeclothing'] = 'Drücke ~INPUT_PICKUP~ to retrieve clothing.', + ['dd_deliver_clothes'] = 'Drücke ~INPUT_PICKUP~ to deliver the clothes.', + } From e208c3ac887286326d5ee48b13269e5229d5feda Mon Sep 17 00:00:00 2001 From: tabarra Date: Tue, 1 Dec 2020 12:56:05 -0300 Subject: [PATCH 17/17] Update config.lua --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 676570e8..a91fe606 100644 --- a/config.lua +++ b/config.lua @@ -1,6 +1,6 @@ Config = {} Config.DrawDistance = 100.0 -Config.Locale = 'fr' +Config.Locale = 'en' Config.Jobs = {} Config.MaxCaution = 10000 -- the max caution allowed