From 6a133bdb614efea470257b0bf2f74d5d4cfaf008 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 25 Aug 2018 11:26:18 +0200 Subject: [PATCH] Decimal rounding --- client/jobs/fisherman.lua | 9 +- client/jobs/fueler.lua | 33 ++- client/jobs/lumberjack.lua | 11 +- client/jobs/miner.lua | 517 ++++++++++++++++++------------------ client/jobs/reporter.lua | 107 ++++---- client/jobs/slaughterer.lua | 18 +- 6 files changed, 355 insertions(+), 340 deletions(-) diff --git a/client/jobs/fisherman.lua b/client/jobs/fisherman.lua index 2b743964..01cb8ca1 100644 --- a/client/jobs/fisherman.lua +++ b/client/jobs/fisherman.lua @@ -6,6 +6,7 @@ Config.Jobs.fisherman = { }, Vehicles = { + Truck = { Spawner = 1, Hash = "benson", @@ -19,6 +20,7 @@ Config.Jobs.fisherman = { Trailer = "none", HasCaution = false } + }, Zones = { @@ -36,7 +38,7 @@ Config.Jobs.fisherman = { }, FishingSpot = { - Pos = {x = 4435.21, y = 4829.6, z = 0.34}, + Pos = {x = 4435.21, y = 4829.60, z = 0.34}, Color = {r = 204, g = 204, b = 0}, Size = {x = 110.0, y = 110.0, z = 10.0}, Marker= 1, @@ -72,7 +74,7 @@ Config.Jobs.fisherman = { Spawner = 2, Hint = _U('fm_spawnboat'), Caution = 0, - GPS = {x = 4435.21, y = 4829.6, z = 0.34} + GPS = {x = 4435.21, y = 4829.60, z = 0.34} }, BoatSpawnPoint = { @@ -166,7 +168,8 @@ Config.Jobs.fisherman = { requires_name = _U('fm_fish'), drop = 100 } - }, + } } + } } diff --git a/client/jobs/fueler.lua b/client/jobs/fueler.lua index d91a5c9b..c307a813 100644 --- a/client/jobs/fueler.lua +++ b/client/jobs/fueler.lua @@ -19,8 +19,7 @@ Config.Jobs.fueler = { Zones = { CloakRoom = { - -- 1 - Pos = {x = 557.933, y = -2327.9, z = 4.82896}, + Pos = {x = 557.93, y = -2327.90, z = 4.82}, Size = {x = 3.0, y = 3.0, z = 2.0}, Color = {r = 204, g = 204, b = 0}, Marker = 1, @@ -28,11 +27,11 @@ Config.Jobs.fueler = { Name = _U("f_oil_refiner"), Type = "cloakroom", Hint = _U("cloak_change"), - GPS = {x = 554.597, y = -2314.43, z = 4.86293} + GPS = {x = 554.59, y = -2314.43, z = 4.86} }, ChampPetrol = { - Pos = {x = 609.589, y = 2856.74, z = 39.4958}, + Pos = {x = 609.58, y = 2856.74, z = 39.49}, Size = {x = 20.0, y = 20.0, z = 1.0}, Color = {r = 204, g = 204, b = 0}, Marker = 1, @@ -53,11 +52,11 @@ Config.Jobs.fueler = { } }, Hint = _U("f_drillbutton"), - GPS = {x = 2736.94, y = 1417.99, z = 23.4888} + GPS = {x = 2736.94, y = 1417.99, z = 23.48} }, Raffinerie = { - Pos = {x = 2736.94, y = 1417.99, z = 23.4888}, + Pos = {x = 2736.94, y = 1417.99, z = 23.48}, Size = {x = 10.0, y = 10.0, z = 1.0}, Color = {r = 204, g = 204, b = 0}, Marker = 1, @@ -78,12 +77,11 @@ Config.Jobs.fueler = { } }, Hint = _U("f_refine_fuel_button"), - GPS = {x = 265.752, y = -3013.39, z = 4.73275} + GPS = {x = 265.75, y = -3013.39, z = 4.73} }, Melange = { - -- 6 - Pos = {x = 265.752, y = -3013.39, z = 4.73275}, + Pos = {x = 265.75, y = -3013.39, z = 4.73}, Size = {x = 10.0, y = 10.0, z = 1.0}, Color = {r = 204, g = 204, b = 0}, Marker = 1, @@ -104,12 +102,11 @@ Config.Jobs.fueler = { } }, Hint = _U("f_fuel_mixture_button"), - GPS = {x = 491.406, y = -2163.37, z = 4.91827} + GPS = {x = 491.40, y = -2163.37, z = 4.91} }, VehicleSpawner = { - -- 2 - Pos = {x = 554.597, y = -2314.43, z = 4.86293}, + Pos = {x = 554.59, y = -2314.43, z = 4.86}, Size = {x = 3.0, y = 3.0, z = 2.0}, Color = {r = 204, g = 204, b = 0}, Marker = 1, @@ -119,11 +116,11 @@ Config.Jobs.fueler = { Spawner = 1, Hint = _U("spawn_truck_button"), Caution = 2000, - GPS = {x = 602.254, y = 2926.62, z = 39.6898} + GPS = {x = 602.25, y = 2926.62, z = 39.68} }, VehicleSpawnPoint = { - Pos = {x = 580.541, y = -2309.7, z = 4.90915}, + Pos = {x = 580.54, y = -2309.70, z = 4.90}, Size = {x = 3.0, y = 3.0, z = 1.0}, Marker = -1, Blip = false, @@ -135,7 +132,7 @@ Config.Jobs.fueler = { }, VehicleDeletePoint = { - Pos = {x = 520.684, y = -2124.21, z = 4.98635}, + Pos = {x = 520.68, y = -2124.21, z = 4.98}, Size = {x = 5.0, y = 5.0, z = 1.0}, Color = {r = 255, g = 0, b = 0}, Marker = 1, @@ -150,8 +147,7 @@ Config.Jobs.fueler = { }, Delivery = { - -- 7 - Pos = {x = 491.406, y = -2163.37, z = 4.91827}, + Pos = {x = 491.40, y = -2163.37, z = 4.91}, Color = {r = 204, g = 204, b = 0}, Size = {x = 10.0, y = 10.0, z = 1.0}, Marker = 1, @@ -173,7 +169,8 @@ Config.Jobs.fueler = { }, Hint = _U("f_deliver_gas"), - GPS = {x = 609.589, y = 2856.74, z = 39.4958} + GPS = {x = 609.58, y = 2856.74, z = 39.49} } + } } diff --git a/client/jobs/lumberjack.lua b/client/jobs/lumberjack.lua index 2d3104ff..04bf35c0 100644 --- a/client/jobs/lumberjack.lua +++ b/client/jobs/lumberjack.lua @@ -19,7 +19,7 @@ Config.Jobs.lumberjack = { Zones = { CloakRoom = { - Pos = {x = 1200.63, y = -1276.875, z = 34.38}, + Pos = {x = 1200.63, y = -1276.87, z = 34.38}, Size = {x = 3.0, y = 3.0, z = 1.0}, Color = {r = 204, g = 204, b = 0}, Marker = 1, @@ -102,7 +102,7 @@ Config.Jobs.lumberjack = { }, VehicleSpawner = { - Pos = {x = 1191.9681396484, y = -1261.7775878906, z = 34.170627593994}, + Pos = {x = 1191.96, y = -1261.77, z = 34.17}, Size = {x = 3.0, y = 3.0, z = 1.0}, Color = {r = 204, g = 204, b = 0}, Marker = 1, @@ -115,7 +115,7 @@ Config.Jobs.lumberjack = { }, VehicleSpawnPoint = { - Pos = {x = 1194.6257324219, y = -1286.955078125, z = 34.121524810791}, + Pos = {x = 1194.62, y = -1286.95, z = 34.12}, Size = {x = 3.0, y = 3.0, z = 1.0}, Marker = -1, Blip = false, @@ -126,7 +126,7 @@ Config.Jobs.lumberjack = { }, VehicleDeletePoint = { - Pos = {x = 1216.8983154297, y = -1229.2396240234, z = 34.403507232666}, + Pos = {x = 1216.89, y = -1229.23, z = 34.40}, Size = {x = 5.0, y = 5.0, z = 1.0}, Color = {r = 255, g = 0, b = 0}, Marker = 1, @@ -141,7 +141,7 @@ Config.Jobs.lumberjack = { }, Delivery = { - Pos = {x = 1201.3558349609, y = -1327.5159912109, z = 34.226093292236}, + Pos = {x = 1201.35, y = -1327.51, z = 34.22}, Color = {r = 204, g = 204, b = 0}, Size = {x = 5.0, y = 5.0, z = 3.0}, Marker = 1, @@ -163,5 +163,6 @@ Config.Jobs.lumberjack = { }, Hint = _U("lj_deliver_button") } + } } diff --git a/client/jobs/miner.lua b/client/jobs/miner.lua index 7548b20b..20e7520e 100644 --- a/client/jobs/miner.lua +++ b/client/jobs/miner.lua @@ -1,267 +1,274 @@ Config.Jobs.miner = { - BlipInfos = { - Sprite = 318, - Color = 5 - }, - Vehicles = { - Truck = { - Spawner = 1, - Hash = "rubble", - Trailer = "none", - HasCaution = true - } - }, - Zones = { - CloakRoom = { - Pos = {x = 892.35333251953, y = -2172.7705078125, z = 31.286273956299}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('m_miner_locker'), - Type = "cloakroom", - Hint = _U('cloak_change'), - GPS = {x = 884.86889648438, y = -2176.5102539063, z = 29.519346237183} - }, - Mine = { - Pos = {x = 2962.4, y = 2746.2, z = 42.398}, - Size = {x = 5.0, y = 5.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('m_rock'), - Type = "work", - Item = { - { - name = _U('m_rock'), - db_name= "stone", - time = 3000, - max = 7, - add = 1, - remove = 1, - requires = "nothing", - requires_name = "Nothing", - drop = 100 - } - }, - Hint = _U('m_pickrocks'), - GPS = {x = 289.244, y = 2862.9, z = 42.6424} - }, + BlipInfos = { + Sprite = 318, + Color = 5 + }, - StoneWash = { - Pos = {x = 289.244, y = 2862.9, z = 42.6424}, - Size = {x = 5.0, y = 5.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('m_washrock'), - Type = "work", - Item = { - { - name = _U('m_washrock'), - db_name= "washed_stone", - time = 5000, - max = 7, - add = 1, - remove = 1, - requires = "stone", - requires_name = _U('m_rock'), - drop = 100 - } - }, - Hint = _U('m_rock_button'), - GPS = {x = 1109.14, y = -2007.87, z = 30.0188} - }, + Vehicles = { - Foundry = { - Pos = {x = 1109.14, y = -2007.87, z = 30.0188}, - Size = {x = 5.0, y = 5.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('m_rock_smelting'), - Type = "work", - Item = { - { - name = _U('m_copper'), - db_name= "copper", - time = 4000, - max = 56, - add = 8, - remove = 1, - requires = "washed_stone", - requires_name = _U('m_washrock'), - drop = 100 - }, - { - name = _U('m_iron'), - db_name= "iron", - max = 42, - add = 6, - drop = 100 - }, - { - name = _U('m_gold'), - db_name= "gold", - max = 21, - add = 3, - drop = 100 - }, - { - name = _U('m_diamond'), - db_name= "diamond", - max = 50, - add = 1, - drop = 5 - } - }, - Hint = _U('m_melt_button'), - GPS = {x = -169.481, y = -2659.16, z = 5.00103} - }, + Truck = { + Spawner = 1, + Hash = "rubble", + Trailer = "none", + HasCaution = true + } - VehicleSpawner = { - Pos = {x = 884.86889648438, y = -2176.5102539063, z = 29.519346237183}, - Size = {x = 5.0, y = 5.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = _U('spawn_veh'), - Type = "vehspawner", - Spawner = 1, - Hint = _U('spawn_veh_button'), - Caution = 2000, - GPS = {x = 2962.4, y = 2746.2, z = 42.398} - }, + }, - VehicleSpawnPoint = { - Pos = {x = 879.55700683594, y = -2189.7995605469, z = 29.519348144531}, - Size = {x = 5.0, y = 5.0, z = 1.0}, - Marker= -1, - Blip = false, - Name = _U('service_vh'), - Type = "vehspawnpt", - Spawner = 1, - Heading = 90.1, - GPS = 0 - }, + Zones = { - VehicleDeletePoint = { - Pos = {x = 881.93725585938, y = -2198.0151367188, z = 29.519351959229}, - Size = {x = 5.0, y = 5.0, z = 1.0}, - Color = {r = 255, g = 0, b = 0}, - Marker= 1, - Blip = false, - Name = _U('return_vh'), - Type = "vehdelete", - Hint = _U('return_vh_button'), - Spawner = 1, - Caution = 2000, - GPS = 0, - Teleport = 0 - }, + CloakRoom = { + Pos = {x = 892.35, y = -2172.77, z = 31.28}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker = 1, + Blip = true, + Name = _U("m_miner_locker"), + Type = "cloakroom", + Hint = _U("cloak_change"), + GPS = {x = 884.86, y = -2176.51, z = 29.51} + }, - CopperDelivery = { - Pos = {x = -169.481, y = -2659.16, z = 5.00103}, - Color = {r = 204, g = 204, b = 0}, - Size = {x = 5.0, y = 5.0, z = 3.0}, - Marker= 1, - Blip = true, - Name = _U('m_sell_copper'), - Type = "delivery", - Spawner = 1, - Item = { - { - 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'), - drop = 100 - } - }, - Hint = _U('m_deliver_copper'), - GPS = {x = -148.782, y = -1040.38, z = 26.2736} - }, + Mine = { + Pos = {x = 2962.40, y = 2746.20, z = 42.39}, + Size = {x = 5.0, y = 5.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker = 1, + Blip = true, + Name = _U("m_rock"), + Type = "work", + Item = { + { + name = _U("m_rock"), + db_name = "stone", + time = 3000, + max = 7, + add = 1, + remove = 1, + requires = "nothing", + requires_name = "Nothing", + drop = 100 + } + }, + Hint = _U("m_pickrocks"), + GPS = {x = 289.24, y = 2862.90, z = 42.64} + }, - IronDelivery = { - Pos = {x = -148.782, y = -1040.38, z = 26.2736}, - Color = {r = 204, g = 204, b = 0}, - Size = {x = 5.0, y = 5.0, z = 3.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('m_sell_iron'), - Type = "delivery", - Spawner = 1, - Item = { - { - 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'), - drop = 100 - } - }, - Hint = _U('m_deliver_iron'), - GPS = {x = 261.487, y = 207.354, z = 109.287} - }, + StoneWash = { + Pos = {x = 289.24, y = 2862.90, z = 42.64}, + Size = {x = 5.0, y = 5.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker = 1, + Blip = true, + Name = _U("m_washrock"), + Type = "work", + Item = { + { + name = _U("m_washrock"), + db_name = "washed_stone", + time = 5000, + max = 7, + add = 1, + remove = 1, + requires = "stone", + requires_name = _U("m_rock"), + drop = 100 + } + }, + Hint = _U("m_rock_button"), + GPS = {x = 1109.14, y = -2007.87, z = 30.01} + }, - GoldDelivery = { - Pos = {x = 261.487, y = 207.354, z = 109.287}, - Color = {r = 204, g = 204, b = 0}, - Size = {x = 5.0, y = 5.0, z = 3.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('m_sell_gold'), - Type = "delivery", - Spawner = 1, - Item = { - { - 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'), - drop = 100 - } - }, - Hint = _U('m_deliver_gold'), - GPS = {x = -621.046, y = -228.532, z = 37.0571} - }, + Foundry = { + Pos = {x = 1109.14, y = -2007.87, z = 30.01}, + Size = {x = 5.0, y = 5.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker = 1, + Blip = true, + Name = _U("m_rock_smelting"), + Type = "work", + Item = { + { + name = _U("m_copper"), + db_name = "copper", + time = 4000, + max = 56, + add = 8, + remove = 1, + requires = "washed_stone", + requires_name = _U("m_washrock"), + drop = 100 + }, + { + name = _U("m_iron"), + db_name = "iron", + max = 42, + add = 6, + drop = 100 + }, + { + name = _U("m_gold"), + db_name = "gold", + max = 21, + add = 3, + drop = 100 + }, + { + name = _U("m_diamond"), + db_name = "diamond", + max = 50, + add = 1, + drop = 5 + } + }, + Hint = _U("m_melt_button"), + GPS = {x = -169.48, y = -2659.16, z = 5.00} + }, - DiamondDelivery = { - Pos = {x = -621.046, y = -228.532, z = 37.0571}, - Color = {r = 204, g = 204, b = 0}, - Size = {x = 5.0, y = 5.0, z = 3.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('m_sell_diamond'), - Type = "delivery", - Spawner = 1, - Item = { - { - 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'), - drop = 100 - } - }, - Hint = _U('m_deliver_diamond'), - GPS = {x = 2962.4, y = 2746.2, z = 42.398} - } - } + VehicleSpawner = { + Pos = {x = 884.86, y = -2176.51, z = 29.51}, + Size = {x = 5.0, y = 5.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker = 1, + Blip = false, + Name = _U("spawn_veh"), + Type = "vehspawner", + Spawner = 1, + Hint = _U("spawn_veh_button"), + Caution = 2000, + GPS = {x = 2962.40, y = 2746.20, z = 42.39} + }, + + VehicleSpawnPoint = { + Pos = {x = 879.55, y = -2189.79, z = 29.51}, + Size = {x = 5.0, y = 5.0, z = 1.0}, + Marker = -1, + Blip = false, + Name = _U("service_vh"), + Type = "vehspawnpt", + Spawner = 1, + Heading = 90.1, + GPS = 0 + }, + + VehicleDeletePoint = { + Pos = {x = 881.93, y = -2198.01, z = 29.51}, + Size = {x = 5.0, y = 5.0, z = 1.0}, + Color = {r = 255, g = 0, b = 0}, + Marker = 1, + Blip = false, + Name = _U("return_vh"), + Type = "vehdelete", + Hint = _U("return_vh_button"), + Spawner = 1, + Caution = 2000, + GPS = 0, + Teleport = 0 + }, + + CopperDelivery = { + Pos = {x = -169.481, y = -2659.16, z = 5.00103}, + Color = {r = 204, g = 204, b = 0}, + Size = {x = 5.0, y = 5.0, z = 3.0}, + Marker = 1, + Blip = true, + Name = _U("m_sell_copper"), + Type = "delivery", + Spawner = 1, + Item = { + { + 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"), + drop = 100 + } + }, + Hint = _U("m_deliver_copper"), + GPS = {x = -148.78, y = -1040.38, z = 26.27} + }, + + IronDelivery = { + Pos = {x = -148.78, y = -1040.38, z = 26.27}, + Color = {r = 204, g = 204, b = 0}, + Size = {x = 5.0, y = 5.0, z = 3.0}, + Color = {r = 204, g = 204, b = 0}, + Marker = 1, + Blip = true, + Name = _U("m_sell_iron"), + Type = "delivery", + Spawner = 1, + Item = { + { + 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"), + drop = 100 + } + }, + Hint = _U("m_deliver_iron"), + GPS = {x = 261.48, y = 207.35, z = 109.28} + }, + + GoldDelivery = { + Pos = {x = 261.48, y = 207.35, z = 109.28}, + Color = {r = 204, g = 204, b = 0}, + Size = {x = 5.0, y = 5.0, z = 3.0}, + Color = {r = 204, g = 204, b = 0}, + Marker = 1, + Blip = true, + Name = _U("m_sell_gold"), + Type = "delivery", + Spawner = 1, + Item = { + { + 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"), + drop = 100 + } + }, + Hint = _U("m_deliver_gold"), + GPS = {x = -621.04, y = -228.53, z = 37.05} + }, + + DiamondDelivery = { + Pos = {x = -621.04, y = -228.53, z = 37.05}, + Color = {r = 204, g = 204, b = 0}, + Size = {x = 5.0, y = 5.0, z = 3.0}, + Color = {r = 204, g = 204, b = 0}, + Marker = 1, + Blip = true, + Name = _U("m_sell_diamond"), + Type = "delivery", + Spawner = 1, + Item = { + { + 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"), + drop = 100 + } + }, + 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 3aadb881..6cc12b9a 100644 --- a/client/jobs/reporter.lua +++ b/client/jobs/reporter.lua @@ -1,54 +1,61 @@ Config.Jobs.reporter = { - BlipInfos = { - Sprite = 184, - Color = 1 - }, - Vehicles = { - Truck = { - Spawner = 1, - Hash = "rumpo", - Trailer = "none", - HasCaution = true - } - }, - Zones = { - VehicleSpawner = { - Pos = { x = -141.41, y = -620.80, z = 167.82 }, - Size = {x = 2.0, y = 2.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('reporter_name'), - Type = "vehspawner", - Spawner = 1, - Hint = _U('reporter_garage'), - Caution = 2000 - }, - VehicleSpawnPoint = { - Pos = { x = -149.32023620605, y = -592.17163085938, z = 31.42448425293 }, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Marker= -1, - Blip = false, - Name = _U('service_vh'), - Type = "vehspawnpt", - Spawner = 1, - Heading = 200.1 - }, + BlipInfos = { + Sprite = 184, + Color = 1 + }, - VehicleDeletePoint = { - Pos = { x = -144.2229309082, y = -577.02972412109, z = 31.42448425293 }, - Size = {x = 5.0, y = 5.0, z = 0.2}, - Color = {r = 255, g = 0, b = 0}, - Marker= 1, - Blip = false, - Name = _U('return_vh'), - Type = "vehdelete", - Hint = _U('return_vh_button'), - Spawner = 1, - Caution = 2000, - GPS = 0, - Teleport = { x = -139.09838867188, y = -620.74865722656, z = 167.82052612305 } - } - } + Vehicles = { + + Truck = { + Spawner = 1, + Hash = "rumpo", + Trailer = "none", + HasCaution = true + } + + }, + + Zones = { + + VehicleSpawner = { + Pos = {x = -141.41, y = -620.80, z = 167.82}, + Size = {x = 2.0, y = 2.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker = 1, + Blip = true, + Name = _U("reporter_name"), + Type = "vehspawner", + Spawner = 1, + Hint = _U("reporter_garage"), + Caution = 2000 + }, + + VehicleSpawnPoint = { + Pos = {x = -149.32, y = -592.17, z = 31.42}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Marker = -1, + Blip = false, + Name = _U("service_vh"), + Type = "vehspawnpt", + Spawner = 1, + Heading = 200.1 + }, + + VehicleDeletePoint = { + Pos = {x = -144.22, y = -577.02, z = 31.42}, + Size = {x = 5.0, y = 5.0, z = 0.2}, + Color = {r = 255, g = 0, b = 0}, + Marker = 1, + Blip = false, + Name = _U("return_vh"), + Type = "vehdelete", + Hint = _U("return_vh_button"), + Spawner = 1, + Caution = 2000, + GPS = 0, + Teleport = {x = -139.09, y = -620.74, z = 167.82} + } + + } } diff --git a/client/jobs/slaughterer.lua b/client/jobs/slaughterer.lua index f5b21f32..9de175da 100644 --- a/client/jobs/slaughterer.lua +++ b/client/jobs/slaughterer.lua @@ -18,7 +18,7 @@ Config.Jobs.slaughterer = { Zones = { CloakRoom = { - Pos = {x = -1071.1319580078, y = -2003.7891845703, z = 14.78551197052}, + Pos = {x = -1071.13, y = -2003.78, z = 14.78}, Size = {x = 3.0, y = 3.0, z = 1.0}, Color = {r = 204, g = 204, b = 0}, Marker = 1, @@ -29,7 +29,7 @@ Config.Jobs.slaughterer = { }, AliveChicken = { - Pos = {x = -62.9018, y = 6241.46, z = 30.0901}, + Pos = {x = -62.90, y = 6241.46, z = 30.09}, Size = {x = 3.0, y = 3.0, z = 1.0}, Color = {r = 204, g = 204, b = 0}, Marker = 1, @@ -53,7 +53,7 @@ Config.Jobs.slaughterer = { }, SlaughterHouse = { - Pos = {x = -77.991, y = 6229.063, z = 30.091}, + Pos = {x = -77.99, y = 6229.06, z = 30.09}, Size = {x = 3.0, y = 3.0, z = 1.0}, Color = {r = 204, g = 204, b = 0}, Marker = 1, @@ -77,7 +77,7 @@ Config.Jobs.slaughterer = { }, Packaging = { - Pos = {x = -101.978, y = 6208.799, z = 30.025}, + Pos = {x = -101.97, y = 6208.79, z = 30.02}, Size = {x = 3.0, y = 3.0, z = 1.0}, Color = {r = 204, g = 204, b = 0}, Marker = 1, @@ -101,7 +101,7 @@ Config.Jobs.slaughterer = { }, VehicleSpawner = { - Pos = {x = -1042.9444580078, y = -2023.2551269531, z = 12.161581993103}, + Pos = {x = -1042.94, y = -2023.25, z = 12.16}, Size = {x = 3.0, y = 3.0, z = 1.0}, Color = {r = 204, g = 204, b = 0}, Marker = 1, @@ -114,7 +114,7 @@ Config.Jobs.slaughterer = { }, VehicleSpawnPoint = { - Pos = {x = -1048.8568115234, y = -2025.322265625, z = 12.161581993103}, + Pos = {x = -1048.85, y = -2025.32, z = 12.16}, Size = {x = 3.0, y = 3.0, z = 1.0}, Marker = -1, Blip = false, @@ -125,7 +125,7 @@ Config.Jobs.slaughterer = { }, VehicleDeletePoint = { - Pos = {x = -1061.5164794922, y = -2008.3552246094, z = 12.161584854126}, + Pos = {x = -1061.51, y = -2008.35, z = 12.16}, Size = {x = 5.0, y = 5.0, z = 1.0}, Color = {r = 255, g = 0, b = 0}, Marker = 1, @@ -140,7 +140,7 @@ Config.Jobs.slaughterer = { }, Delivery = { - Pos = {x = -596.158, y = -889.324, z = 24.5073}, + Pos = {x = -596.15, y = -889.32, z = 24.50}, Color = {r = 204, g = 204, b = 0}, Size = {x = 5.0, y = 5.0, z = 1.0}, Marker = 1, @@ -154,7 +154,7 @@ Config.Jobs.slaughterer = { time = 500, remove = 1, max = 100, -- if not present, probably an error at itemQtty >= item.max in esx_jobs_sv.lua - price = 11, + price = 23, requires = "packaged_chicken", requires_name = _U("s_packagechicken"), drop = 100