starred/esx_core
1
0
Fork 0
mirror of https://github.com/esx-framework/esx_core.git synced 2026-08-29 01:08:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix esx_jobs

Browse Source
This commit is contained in:
Benzo
2022-04-28 02:21:33 +02:00
committed by GitHub
parent 6a9847fb43
commit 098488c685
12 changed files with 190 additions and 182 deletions
Download Patch File Download Diff File Expand all files Collapse all files
[esx_addons]/esx_jobs/README.md
+1 -1
View File
@@ -21,7 +21,7 @@ This addon is an easy way to have farming jobs on your server, there is no playe
CloakRoom = {
Zone = "miner_room", -- HERE
Size = {x = 3.0, y = 3.0, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = true,
Name = _U("m_miner_locker"),
[esx_addons]/esx_jobs/client/main.lua
+50 -46
View File
@@ -11,11 +11,21 @@ local vehicleInCaseofDrop = nil
local vehicleMaxHealth = nil
RegisterNetEvent('esx:playerLoaded')
AddEventHandler('esx:playerLoaded', function(xPlayer)
RegisterNetEvent('esx:playerLoaded', function(xPlayer)
ESX.PlayerData = xPlayer
ESX.PlayerLoaded = true
refreshBlips()
end)
RegisterNetEvent('esx:onPlayerLogout',function()
ESX.PlayerLoaded = false
ESX.PlayerData = {}
end)
RegisterNetEvent('esx:setJob',function(job)
ESX.PlayerData.job = job
end)
function OpenMenu()
ESX.UI.Menu.CloseAll()
@@ -29,6 +39,7 @@ function OpenMenu()
}, function(data, menu)
if data.current.value == 'citizen_wear' then
onDuty = false
ESX.ShowNotification(_U('offduty'),"success")
ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin)
local isMale = skin.sex == 0
@@ -40,11 +51,20 @@ function OpenMenu()
end)
elseif data.current.value == 'job_wear' then
onDuty = true
ESX.ShowNotification(_U('onduty'), "success")
ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin)
if skin.sex == 0 then
TriggerEvent('skinchanger:loadClothes', skin, jobSkin.skin_male)
if #(jobSkin.skin_male) >= 1 then
TriggerEvent('skinchanger:loadClothes', skin, jobSkin.skin_male)
else
ESX.ShowNotification(_U('no_male_clothing'), "error")
end
else
TriggerEvent('skinchanger:loadClothes', skin, jobSkin.skin_female)
if #(jobSkin.skin_female) >= 1 then
TriggerEvent('skinchanger:loadClothes', skin, jobSkin.skin_female)
else
ESX.ShowNotification(_U('no_female_clothing'), "error")
end
end
end)
end
@@ -60,8 +80,6 @@ AddEventHandler('esx_jobs:action', function(job, zone, zoneKey)
if zone.Type == "cloakroom" then
OpenMenu()
elseif zone.Type == "work" then
hintToDisplay = "no hint to display"
hintIsShowed = false
local playerPed = PlayerPedId()
if IsPedInAnyVehicle(playerPed, false) then
@@ -74,7 +92,7 @@ AddEventHandler('esx_jobs:action', function(job, zone, zoneKey)
local vehicle = nil
for k,v in pairs(Config.Jobs) do
if ESX.GetPlayerData().job.name == k then
if ESX.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
@@ -100,7 +118,7 @@ AddEventHandler('esx_jobs:action', function(job, zone, zoneKey)
local looping = true
for k,v in pairs(Config.Jobs) do
if ESX.GetPlayerData().job.name == k then
if ESX.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()
@@ -164,9 +182,6 @@ AddEventHandler('esx_jobs:action', function(job, zone, zoneKey)
RemoveBlip(Blips['delivery'])
Blips['delivery'] = nil
end
hintToDisplay = "no hint to display"
hintIsShowed = false
TriggerServerEvent('esx_jobs:startWork', zone.Item, zoneKey)
end
--nextStep(zone.GPS)
@@ -187,14 +202,11 @@ end
AddEventHandler('esx_jobs:hasExitedMarker', function(zone)
TriggerServerEvent('esx_jobs:stopWork')
hintToDisplay = "no hint to display"
menuIsShowed = false
hintIsShowed = false
isInMarker = false
end)
RegisterNetEvent('esx:setJob')
AddEventHandler('esx:setJob', function(job)
RegisterNetEvent('esx:setJob', function(job)
onDuty = false
myPlate = {} -- loosing vehicle caution in case player changes job.
spawner = 0
@@ -215,9 +227,9 @@ function refreshBlips()
local zones = {}
local blipInfo = {}
if ESX.GetPlayerData().job ~= nil then
if ESX.PlayerData.job ~= nil then
for jobKey,jobValues in pairs(Config.Jobs) do
if jobKey == ESX.GetPlayerData().job.name then
if jobKey == ESX.PlayerData.job.name then
for zoneKey,zoneValues in pairs(jobValues.Zones) do
if zoneValues.Blip then
@@ -251,13 +263,11 @@ function refreshBlips()
end
function spawnVehicle(spawnPoint, vehicle, vehicleCaution)
hintToDisplay = 'no hint to display'
hintIsShowed = false
TriggerServerEvent('esx_jobs:caution', 'take', vehicleCaution, spawnPoint, vehicle)
end
RegisterNetEvent('esx_jobs:spawnJobVehicle')
AddEventHandler('esx_jobs:spawnJobVehicle', function(spawnPoint, vehicle)
RegisterNetEvent('esx_jobs:spawnJobVehicle',function(spawnPoint, vehicle)
local playerPed = PlayerPedId()
ESX.Game.SpawnVehicle(vehicle.Hash, spawnPoint.Pos, spawnPoint.Heading, function(spawnedVehicle)
@@ -284,30 +294,23 @@ AddEventHandler('esx_jobs:spawnJobVehicle', function(spawnPoint, vehicle)
end)
end)
-- Show top left hint
CreateThread(function()
while hintIsShowed do
Wait(0)
ESX.ShowHelpNotification(hintToDisplay)
end
end)
-- Display markers (only if on duty and the player's job ones)
CreateThread(function()
while true do
local Sleep = 1500
local zones = {}
if ESX.GetPlayerData().job ~= nil then
if ESX.PlayerData.job then
for k,v in pairs(Config.Jobs) do
if ESX.GetPlayerData().job.name == k then
if ESX.PlayerData.job.name == k then
Sleep = 0
zones = v.Zones
end
end
local coords = GetEntityCoords(PlayerPedId())
for k,v in pairs(zones) do
if onDuty or v.Type == "cloakroom" or ESX.GetPlayerData().job.name == "reporter" then
if onDuty or v.Type == "cloakroom" then
if (v.Zone) then
TriggerEvent("izone:getZoneCenter", v.Zone, function(center)
if (not(center == nil)) then
@@ -334,13 +337,15 @@ end)
-- Display public markers
CreateThread(function()
while true do
Wait(0)
local Sleep = 1500
local coords = GetEntityCoords(PlayerPedId())
for k,v in pairs(Config.PublicZones) do
if(v.Marker ~= -1 and #(coords - v.Pos) < Config.DrawDistance) then
Sleep = 0
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
Wait(Sleep)
end
end)
@@ -353,14 +358,11 @@ CreateThread(function()
for k,v in pairs(Config.PublicZones) do
if #(coords - v.Pos) < v.Size.x/2 then
Sleep = 0
hintToDisplay = v.Hint
ESX.ShowHelpNotification(v.Hint)
hintIsShowed = true
if IsControlJustReleased(0, 38) then
ESX.Game.Teleport(PlayerPedId(), position)
end
else
hintToDisplay = "no hint to display"
hintIsShowed = false
end
end
@@ -372,15 +374,15 @@ end)
CreateThread(function()
while true do
local Sleep = 1500
local Sleep = 500
if ESX.GetPlayerData().job ~= nil and ESX.GetPlayerData().job.name ~= 'unemployed' then
if ESX.PlayerData.job and ESX.PlayerData.job.name ~= 'unemployed' then
local zones = nil
local job = nil
for k,v in pairs(Config.Jobs) do
if ESX.GetPlayerData().job.name == k then
Sleep = 50
if ESX.PlayerData.job.name == k then
Sleep = 0
job = v
zones = v.Zones
end
@@ -427,7 +429,7 @@ CreateThread(function()
end
if IsControlJustReleased(0, 38) and not menuIsShowed and isInMarker then
if onDuty or zone.Type == "cloakroom" or ESX.GetPlayerData().job.name == "reporter" then
if onDuty or zone.Type == "cloakroom" then
TriggerEvent('esx_jobs:action', job, zone, currentZone)
end
end
@@ -435,10 +437,10 @@ CreateThread(function()
-- hide or show top left zone hints
if isInMarker and not menuIsShowed then
hintIsShowed = true
if (onDuty or zone.Type == "cloakroom" or ESX.GetPlayerData().job.name == "reporter") and zone.Type ~= "vehdelete" then
if (onDuty or zone.Type == "cloakroom") and zone.Type ~= "vehdelete" then
hintToDisplay = zone.Hint
hintIsShowed = true
elseif zone.Type == "vehdelete" and (onDuty or ESX.GetPlayerData().job.name == "reporter") then
ESX.ShowHelpNotification(hintToDisplay)
elseif zone.Type == "vehdelete" and (onDuty) then
local playerPed = PlayerPedId()
if IsPedInAnyVehicle(playerPed, false) then
@@ -458,14 +460,16 @@ CreateThread(function()
else
hintToDisplay = _U('not_your_vehicle')
ESX.ShowHelpNotification(hintToDisplay)
end
else
hintToDisplay = _U('in_vehicle')
ESX.ShowHelpNotification(hintToDisplay)
end
hintIsShowed = true
elseif onDuty and zone.Spawner ~= spawner then
hintToDisplay = _U('wrong_point')
hintIsShowed = true
ESX.ShowHelpNotification(hintToDisplay)
end
end
[esx_addons]/esx_jobs/config.lua
+3 -3
View File
@@ -1,6 +1,6 @@
Config = {}
Config.DrawDistance = 10.0
Config.Locale = 'en'
Config.Locale = 'en'
Config.Jobs = {}
Config.MaxCaution = 10000 -- the max caution allowed
@@ -11,7 +11,7 @@ Config.PublicZones = {
EnterBuilding = {
Pos = vector3(-118.21, -607.14, 35.28),
Size = {x = 3.0, y = 3.0, z = 0.2},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Marker= 1,
Blip = false,
Name = _U('reporter_name'),
@@ -23,7 +23,7 @@ Config.PublicZones = {
ExitBuilding = {
Pos = vector3( -139.45, -617.32, 167.82),
Size = {x = 3.0, y = 3.0, z = 0.2},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Marker= 1,
Blip = false,
Name = _U('reporter_name'),
[esx_addons]/esx_jobs/fxmanifest.lua
+4 -4
View File
@@ -9,17 +9,17 @@ version '1.6.5'
shared_scripts {
'@es_extended/imports.lua',
'@es_extended/locale.lua',
'locales/*.lua',
'locales/en.lua',
'config.lua',
'jobs/*.lua'
'jobs/*.lua',
}
server_scripts {
'@oxmysql/lib/MySQL.lua',
'server/main.lua'
'server/main.lua',
}
client_scripts {
'client/main.lua'
'client/main.lua',
}
dependency 'es_extended'
[esx_addons]/esx_jobs/jobs/fisherman.lua
+30 -28
View File
@@ -26,10 +26,10 @@ Config.Jobs.fisherman = {
Zones = {
CloakRoom = {
Pos = {x = 868.39, y = -1639.75, z = 29.33},
Size = {x = 3.0, y = 3.0, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Marker= 1,
Pos = {x = 868.39, y = -1639.75, z = 30.33},
Size = {x = 0.8, y = 0.5, z = 1.0},
Color = {r = 50, g = 200, b = 50},
Marker= 20,
Blip = true,
Name = _U('fm_fish_locker'),
Type = 'cloakroom',
@@ -39,8 +39,8 @@ Config.Jobs.fisherman = {
FishingSpot = {
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},
Size = {x = 100.0, y = 100.0, z = 50.0},
Color = {r = 50, g = 200, b = 50},
Marker= 1,
Blip = true,
Name = _U('fm_fish_area'),
@@ -51,10 +51,10 @@ Config.Jobs.fisherman = {
{
name = _U('fm_fish'),
db_name= 'fish',
time = 2,
time = 10,
max = 100,
add = 1,
remove = 1,
remove = 0,
requires = 'nothing',
requires_name = 'Nothing',
drop = 100
@@ -64,10 +64,10 @@ Config.Jobs.fisherman = {
},
BoatSpawner = {
Pos = {x = 3867.44, y = 4463.62, z = 1.72},
Size = {x = 3.0, y = 3.0, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Marker= 1,
Pos = {x = 3866.268, y = 4463.868, z = 2.72},
Size = {x = 0.8, y = 0.5, z = 1.0},
Color = {r = 50, g = 200, b = 50},
Marker= 20,
Blip = true,
Name = _U('fm_spawnboat_title'),
Type = 'vehspawner',
@@ -79,7 +79,8 @@ Config.Jobs.fisherman = {
BoatSpawnPoint = {
Pos = {x = 3888.3, y = 4468.09, z = 0.0},
Size = {x = 3.0, y = 3.0, z = 1.0},
Size = {x = 0.8, y = 0.5, z = 1.0},
Color = {r = 50, g = 200, b = 50},
Marker= -1,
Blip = false,
Name = _U('fm_boat_title'),
@@ -91,9 +92,9 @@ Config.Jobs.fisherman = {
BoatDeletePoint = {
Pos = {x = 3859.43, y = 4448.83, z = 0.39},
Size = {x = 10.0, y = 10.0, z = 1.0},
Color = {r = 255, g = 0, b = 0},
Marker= 1,
Size = {x = 0.8, y = 0.5, z = 1.0},
Color = {r = 50, g = 200, b = 50},
Marker= 20,
Blip = false,
Name = _U('fm_boat_return_title'),
Type = 'vehdelete',
@@ -106,9 +107,9 @@ Config.Jobs.fisherman = {
VehicleSpawner = {
Pos = {x = 880.74, y = -1663.96, z = 29.37},
Size = {x = 3.0, y = 3.0, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Marker= 1,
Size = {x = 0.8, y = 0.5, z = 1.0},
Color = {r = 50, g = 200, b = 50},
Marker= 20,
Blip = false,
Name = _U('spawn_veh'),
Type = 'vehspawner',
@@ -120,8 +121,9 @@ Config.Jobs.fisherman = {
VehicleSpawnPoint = {
Pos = {x = 859.35, y = -1656.21, z = 29.56},
Size = {x = 3.0, y = 3.0, z = 1.0},
Marker= -1,
Size = {x = 0.8, y = 0.5, z = 1.0},
Color = {r = 50, g = 200, b = 50},
Marker= 20,
Blip = false,
Name = _U('service_vh'),
Type = 'vehspawnpt',
@@ -132,9 +134,9 @@ Config.Jobs.fisherman = {
VehicleDeletePoint = {
Pos = {x = 863.23, y = -1718.28, z = 28.63},
Size = {x = 5.0, y = 5.0, z = 1.0},
Color = {r = 255, g = 0, b = 0},
Marker= 1,
Size = {x = 0.8, y = 0.5, z = 1.0},
Color = {r = 50, g = 200, b = 50},
Marker= 20,
Blip = false,
Name = _U('return_vh'),
Type = 'vehdelete',
@@ -146,10 +148,10 @@ Config.Jobs.fisherman = {
},
Delivery = {
Pos = {x = -1012.64, y = -1354.62, z = 5.54},
Color = {r = 204, g = 204, b = 0},
Size = {x = 5.0, y = 5.0, z = 3.0},
Marker= 1,
Pos = {x = -1037.96, y = -1397.09, z = 5.54},
Size = {x = 0.8, y = 0.5, z = 1.0},
Color = {r = 50, g = 200, b = 50},
Marker= 20,
Blip = true,
Name = _U('delivery_point'),
Type = 'delivery',
[esx_addons]/esx_jobs/jobs/fueler.lua
+12 -11
View File
@@ -19,10 +19,10 @@ Config.Jobs.fueler = {
Zones = {
CloakRoom = {
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,
Pos = {x = 557.93, y = -2327.90, z = 5.82},
Size = {x = 0.5, y = 0.5, z = 0.8},
Color = {r = 50, g = 200, b = 50},
Marker = 20,
Blip = true,
Name = _U('f_oil_refiner'),
Type = 'cloakroom',
@@ -33,7 +33,7 @@ Config.Jobs.fueler = {
OilFarm = {
Pos = {x = 609.58, y = 2856.74, z = 38.90},
Size = {x = 20.0, y = 20.0, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = true,
Name = _U('f_drill_oil'),
@@ -45,7 +45,7 @@ Config.Jobs.fueler = {
time = 5,
max = 24,
add = 1,
remove = 1,
remove = 0,
requires = 'nothing',
requires_name = 'Nothing',
drop = 100
@@ -58,7 +58,7 @@ Config.Jobs.fueler = {
OilRefinement = {
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},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = true,
Name = _U('f_fuel_refine'),
@@ -83,7 +83,7 @@ Config.Jobs.fueler = {
OilMix = {
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},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = true,
Name = _U('f_fuel_mixture'),
@@ -108,7 +108,7 @@ Config.Jobs.fueler = {
VehicleSpawner = {
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},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = false,
Name = _U('spawn_veh'),
@@ -122,6 +122,7 @@ Config.Jobs.fueler = {
VehicleSpawnPoint = {
Pos = {x = 570.54, y = -2309.70, z = 4.90},
Size = {x = 3.0, y = 3.0, z = 1.0},
Color = {r = 50, g = 200, b = 50},
Marker = -1,
Blip = false,
Name = _U('service_vh'),
@@ -134,7 +135,7 @@ Config.Jobs.fueler = {
VehicleDeletePoint = {
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},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = false,
Name = _U('return_vh'),
@@ -148,7 +149,7 @@ Config.Jobs.fueler = {
Delivery = {
Pos = {x = 491.40, y = -2163.37, z = 4.91},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Size = {x = 10.0, y = 10.0, z = 1.0},
Marker = 1,
Blip = true,
[esx_addons]/esx_jobs/jobs/lumberjack.lua
+9 -9
View File
@@ -20,9 +20,9 @@ Config.Jobs.lumberjack = {
CloakRoom = {
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,
Size = {x = 0.8, y = 0.5, z = 1.0},
Color = {r = 50, g = 200, b = 50},
Marker= 20,
Blip = true,
Name = _U('lj_locker_room'),
Type = 'cloakroom',
@@ -32,7 +32,7 @@ Config.Jobs.lumberjack = {
Wood = {
Pos = {x = -534.32, y = 5373.79, z = 69.50},
Size = {x = 3.0, y = 3.0, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = true,
Name = _U('lj_mapblip'),
@@ -44,7 +44,7 @@ Config.Jobs.lumberjack = {
time = 3,
max = 20,
add = 1,
remove = 1,
remove = 0,
requires = 'nothing',
requires_name = 'Nothing',
drop = 100
@@ -56,7 +56,7 @@ Config.Jobs.lumberjack = {
CuttedWood = {
Pos = {x = -552.21, y = 5326.90, z = 72.59},
Size = {x = 3.0, y = 3.0, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = false,
Name = _U('lj_woodcutting'),
@@ -80,7 +80,7 @@ Config.Jobs.lumberjack = {
Planks = {
Pos = {x = -501.38, y = 5280.53, z = 79.61},
Size = {x = 3.0, y = 3.0, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = false,
Name = _U('lj_board'),
@@ -104,7 +104,7 @@ Config.Jobs.lumberjack = {
VehicleSpawner = {
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},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = false,
Name = _U('spawn_veh'),
@@ -142,7 +142,7 @@ Config.Jobs.lumberjack = {
Delivery = {
Pos = {x = 1201.35, y = -1327.51, z = 34.22},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Size = {x = 5.0, y = 5.0, z = 3.0},
Marker = 1,
Blip = true,
[esx_addons]/esx_jobs/jobs/miner.lua
+14 -14
View File
@@ -1,7 +1,7 @@
Config.Jobs.miner = {
BlipInfos = {
Sprite = 318,
Sprite = 68,
Color = 5
},
@@ -20,9 +20,9 @@ Config.Jobs.miner = {
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,
Size = {x = 0.8, y = 0.5, z = 1.0},
Color = {r = 50, g = 200, b = 50},
Marker= 20,
Blip = true,
Name = _U('m_miner_locker'),
Type = 'cloakroom',
@@ -33,7 +33,7 @@ Config.Jobs.miner = {
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},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = true,
Name = _U('m_rock'),
@@ -45,7 +45,7 @@ Config.Jobs.miner = {
time = 3,
max = 7,
add = 1,
remove = 1,
remove = 0,
requires = 'nothing',
requires_name = 'Nothing',
drop = 100
@@ -58,7 +58,7 @@ Config.Jobs.miner = {
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},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = true,
Name = _U('m_washrock'),
@@ -83,12 +83,12 @@ Config.Jobs.miner = {
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},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = true,
Name = _U('m_rock_smelting'),
Type = 'work',
Item = {
Item = {
{
name = _U('m_copper'),
db_name = 'copper',
@@ -129,7 +129,7 @@ Config.Jobs.miner = {
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},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = false,
Name = _U('spawn_veh'),
@@ -169,7 +169,7 @@ Config.Jobs.miner = {
CopperDelivery = {
Pos = {x = -169.481, y = -2659.16, z = 5.00103},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Size = {x = 5.0, y = 5.0, z = 3.0},
Marker = 1,
Blip = true,
@@ -194,7 +194,7 @@ Config.Jobs.miner = {
IronDelivery = {
Pos = {x = -148.78, y = -1040.38, z = 26.27},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Size = {x = 5.0, y = 5.0, z = 3.0},
Marker = 1,
Blip = true,
@@ -219,7 +219,7 @@ Config.Jobs.miner = {
GoldDelivery = {
Pos = {x = 261.48, y = 207.35, z = 109.28},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Size = {x = 5.0, y = 5.0, z = 3.0},
Marker = 1,
Blip = true,
@@ -244,7 +244,7 @@ Config.Jobs.miner = {
DiamondDelivery = {
Pos = {x = -621.04, y = -228.53, z = 37.05},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Size = {x = 5.0, y = 5.0, z = 3.0},
Marker = 1,
Blip = true,
[esx_addons]/esx_jobs/jobs/slaughterer.lua
+10 -10
View File
@@ -18,10 +18,10 @@ Config.Jobs.slaughterer = {
Zones = {
CloakRoom = {
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,
Pos = {x = -1071.13, y = -2003.78, z = 15.78},
Size = {x = 0.8, y = 0.5, z = 1.0},
Color = {r = 50, g = 200, b = 50},
Marker= 20,
Blip = true,
Name = _U('s_slaughter_locker'),
Type = 'cloakroom',
@@ -31,7 +31,7 @@ Config.Jobs.slaughterer = {
AliveChicken = {
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},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = true,
Name = _U('s_hen'),
@@ -43,7 +43,7 @@ Config.Jobs.slaughterer = {
time = 3,
max = 20,
add = 1,
remove = 1,
remove = 0,
requires = 'nothing',
requires_name = 'Nothing',
drop = 100
@@ -55,7 +55,7 @@ Config.Jobs.slaughterer = {
SlaughterHouse = {
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},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = false,
Name = _U('s_slaughtered'),
@@ -79,7 +79,7 @@ Config.Jobs.slaughterer = {
Packaging = {
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},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = false,
Name = _U('s_package'),
@@ -103,7 +103,7 @@ Config.Jobs.slaughterer = {
VehicleSpawner = {
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},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = false,
Name = _U('spawn_veh'),
@@ -141,7 +141,7 @@ Config.Jobs.slaughterer = {
Delivery = {
Pos = {x = -596.15, y = -889.32, z = 24.50},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Size = {x = 5.0, y = 5.0, z = 1.0},
Marker = 1,
Blip = true,
[esx_addons]/esx_jobs/jobs/tailor.lua
+10 -10
View File
@@ -19,10 +19,10 @@ Config.Jobs.tailor = {
Zones = {
CloakRoom = {
Pos = {x = 706.73, y = -960.90, z = 29.39},
Size = {x = 3.0, y = 3.0, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Marker = 1,
Pos = {x = 706.73, y = -960.90, z = 30.39},
Size = {x = 0.8, y = 0.5, z = 1.0},
Color = {r = 50, g = 200, b = 50},
Marker= 20,
Blip = true,
Name = _U('dd_dress_locker'),
Type = 'cloakroom',
@@ -33,7 +33,7 @@ Config.Jobs.tailor = {
Wool = {
Pos = {x = 1978.92, y = 5171.70, z = 46.63},
Size = {x = 3.0, y = 3.0, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = true,
Name = _U('dd_wool'),
@@ -45,7 +45,7 @@ Config.Jobs.tailor = {
time = 3,
max = 40,
add = 1,
remove = 1,
remove = 0,
requires = 'nothing',
requires_name = 'Nothing',
drop = 100
@@ -58,7 +58,7 @@ Config.Jobs.tailor = {
Fabric = {
Pos = {x = 715.95, y = -959.63, z = 29.39},
Size = {x = 3.0, y = 3.0, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = false,
Name = _U('dd_fabric'),
@@ -83,7 +83,7 @@ Config.Jobs.tailor = {
Clothe = {
Pos = {x = 712.92, y = -970.58, z = 29.39},
Size = {x = 3.0, y = 3.0, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = false,
Name = _U('dd_clothing'),
@@ -108,7 +108,7 @@ Config.Jobs.tailor = {
VehicleSpawner = {
Pos = {x = 740.80, y = -970.06, z = 23.46},
Size = {x = 3.0, y = 3.0, z = 1.0},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Marker = 1,
Blip = false,
Name = _U('spawn_veh'),
@@ -148,7 +148,7 @@ Config.Jobs.tailor = {
Delivery = {
Pos = {x = 429.59, y = -807.34, z = 28.49},
Color = {r = 204, g = 204, b = 0},
Color = {r = 50, g = 200, b = 50},
Size = {x = 5.0, y = 5.0, z = 3.0},
Marker = 1,
Blip = true,
[esx_addons]/esx_jobs/locales/en.lua
+44 -40
View File
@@ -1,115 +1,119 @@
Locales['en'] = {
-- Global menus
['cloakroom'] = 'locker Room',
['cloak_change'] = 'press ~INPUT_PICKUP~ to change clothes.',
['cloak_change'] = 'press [E] 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~',
['bank_deposit_returned'] = 'a security deposit of $%s was returned to you.',
['bank_deposit_taken'] = 'a security deposit of $%s was taken from you.',
['caution_afford'] = 'you cannot afford the caution of $%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.',
['onduty'] = "You are On-Duty!",
['offduty'] = "You are Off-Duty!",
['no_male_clothing'] = "Warning: Job has no male clothing!",
['no_female_clothing'] = "Warning: Job has no female clothing!",
['max_limit'] = 'you cannot carry more %s',
['not_enough'] = 'you do not have enough %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_veh_button'] = 'press [E] to call the delivery vehicle.',
['spawn_truck_button'] = 'press [E] 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.',
['return_vh_button'] = 'press [E] 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.',
['public_enter'] = 'press [E] to enter the building.',
['public_leave'] = 'press [E] to go to the entrance of the building.',
-- Lumber Jack job
['lj_locker_room'] = 'lumberjack\'s Locker Room',
['lj_locker_room'] = "lumberjack's Locker Room",
['lj_mapblip'] = 'wood pile',
['lj_wood'] = 'wood',
['lj_pickup'] = 'press ~INPUT_PICKUP~ to retrieve wood.',
['lj_pickup'] = 'press [E] to retrieve wood.',
['lj_woodcutting'] = 'wood cutting',
['lj_cutwood_button'] = 'press ~INPUT_PICKUP~ to cut wood.',
['lj_cutwood_button'] = 'press [E] 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_pick_boards'] = 'press [E] to retrieve boards.',
['lj_deliver_button'] = 'press [E] 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_fish_button'] = 'press [E] to fish.',
['fm_spawnboat_title'] = 'spawn boat',
['fm_spawnboat'] = 'press ~INPUT_PICKUP~ to call the boat.',
['fm_spawnboat'] = 'press [E] 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_boat_return_button'] = 'press [E] to return the boat.',
['fm_deliver_fish'] = 'press [E] 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_drillbutton'] = 'press [E] to drill.',
['f_fuel_refine'] = 'refine oil',
['f_refine_fuel_button'] = 'press ~INPUT_PICKUP~ to refine.',
['f_refine_fuel_button'] = 'press [E] to refine.',
['f_fuel_mixture'] = 'mix refined oil',
['f_gas'] = 'gas',
['f_fuel_mixture_button'] = 'press ~INPUT_PICKUP~ to mix oil.',
['f_fuel_mixture_button'] = 'press [E] to mix oil.',
['f_deliver_gas'] = 'deliver Gas',
['f_deliver_gas_button'] = 'press ~INPUT_PICKUP~ to deliver gasoline.',
['f_deliver_gas_button'] = 'press [E] to deliver gasoline.',
-- Miner
['m_miner_locker'] = 'miner\'s Locker Room',
['m_rock'] = 'rock',
['m_pickrocks'] = 'press ~INPUT_PICKUP~ to retrieve rocks.',
['m_pickrocks'] = 'press [E] to retrieve rocks.',
['m_washrock'] = 'rock Washing',
['m_rock_button'] = 'press ~INPUT_PICKUP~ to wash the rocks.',
['m_rock_button'] = 'press [E] 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_deliver_copper'] = 'press [E] to deliver the copper.',
['m_iron'] = 'iron',
['m_sell_iron'] = 'iron Seller',
['m_deliver_iron'] = 'press ~INPUT_PICKUP~ to deliver the iron.',
['m_deliver_iron'] = 'press [E] to deliver the iron.',
['m_gold'] = 'gold',
['m_sell_gold'] = 'gold Seller',
['m_deliver_gold'] = 'press ~INPUT_PICKUP~ to deliver the gold.',
['m_deliver_gold'] = 'press [E] 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_deliver_diamond'] = 'press [E] to deliver the diamonds.',
['m_melt_button'] = 'press [E] to melt the rocks.',
-- Reporter
['reporter_name'] = 'san Andreas Times',
['reporter_garage'] = 'press ~INPUT_PICKUP~ to go down to the garage.',
['reporter_garage'] = 'press [E] 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_catch_hen'] = 'press [E] to catch live chickens.',
['s_slaughtered_chicken'] = 'chicken to be packed',
['s_chop_animal'] = 'press ~INPUT_PICKUP~ to chop the chickens.',
['s_chop_animal'] = 'press [E] 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_unpackaged_button'] = 'press [E] to set the chicken in a tray.',
['s_deliver'] = 'press [E] 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_pickup'] = 'press [E] to retrieve wool.',
['dd_fabric'] = 'fabric',
['dd_makefabric'] = 'press ~INPUT_PICKUP~ to make fabric.',
['dd_makefabric'] = 'press [E] 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_makeclothing'] = 'press [E] to retrieve clothing.',
['dd_deliver_clothes'] = 'press [E] to deliver the clothes.',
}
[esx_addons]/esx_jobs/server/main.lua
+3 -6
View File
@@ -72,8 +72,7 @@ CreateThread(function()
end
end)
RegisterServerEvent('esx_jobs:startWork')
AddEventHandler('esx_jobs:startWork', function(zoneIndex, zoneKey)
RegisterServerEvent('esx_jobs:startWork', function(zoneIndex, zoneKey)
if not playersWorking[source] then
local xPlayer = ESX.GetPlayerFromId(source)
@@ -96,15 +95,13 @@ AddEventHandler('esx_jobs:startWork', function(zoneIndex, zoneKey)
end
end)
RegisterServerEvent('esx_jobs:stopWork')
AddEventHandler('esx_jobs:stopWork', function()
RegisterServerEvent('esx_jobs:stopWork', function()
if playersWorking[source] then
playersWorking[source] = nil
end
end)
RegisterNetEvent('esx_jobs:caution')
AddEventHandler('esx_jobs:caution', function(cautionType, cautionAmount, spawnPoint, vehicle)
RegisterNetEvent('esx_jobs:caution', function(cautionType, cautionAmount, spawnPoint, vehicle)
local xPlayer = ESX.GetPlayerFromId(source)
if cautionType == 'take' then