From 6e0769ed9eaf9f774d00738408e7cd919a466c69 Mon Sep 17 00:00:00 2001 From: Romain Lanz Date: Sun, 17 Sep 2017 18:19:07 +0200 Subject: [PATCH] chore(coding-style): fix indentation --- .editorconfig | 9 + __resource.lua | 44 +- client/esx_jobs_cl.lua | 874 +++++++++++++++++------------------ config.lua | 66 +-- esx_jobs.sql | 42 +- jobs/fisherman.lua | 312 ++++++------- jobs/fuel.lua | 318 ++++++------- jobs/lumberjack.lua | 304 ++++++------ jobs/miner.lua | 510 ++++++++++---------- jobs/reporter.lua | 100 ++-- jobs/slaughterer.lua | 304 ++++++------ jobs/textil.lua | 318 ++++++------- locales/br.lua | 218 ++++----- locales/de.lua | 72 +-- locales/en.lua | 218 ++++----- locales/fr.lua | 214 ++++----- localization/br_config.lua | 66 +-- localization/br_esx_jobs.sql | 42 +- localization/de_config.lua | 66 +-- localization/de_esx_jobs.sql | 40 +- localization/en_config.lua | 66 +-- server/esx_jobs_sv.lua | 164 +++---- 22 files changed, 2188 insertions(+), 2179 deletions(-) create mode 100644 .editorconfig diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..41c2aaf2 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +root = true + +[*] +indent_size = 2 +indent_style = space +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true \ No newline at end of file diff --git a/__resource.lua b/__resource.lua index 3a4a408f..ae13e359 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,29 +1,29 @@ version '1.0.0' server_scripts { - '@mysql-async/lib/MySQL.lua', - '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/de.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'config.lua', - 'server/esx_jobs_sv.lua' + '@mysql-async/lib/MySQL.lua', + '@es_extended/locale.lua', + 'locales/br.lua', + 'locales/de.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'config.lua', + 'server/esx_jobs_sv.lua' } client_scripts { - '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/de.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'config.lua', - 'jobs/fisherman.lua', - 'jobs/fuel.lua', - 'jobs/lumberjack.lua', - 'jobs/miner.lua', - 'jobs/reporter.lua', - 'jobs/slaughterer.lua', - 'jobs/textil.lua', - 'client/esx_jobs_cl.lua' + '@es_extended/locale.lua', + 'locales/br.lua', + 'locales/de.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'config.lua', + 'jobs/fisherman.lua', + 'jobs/fuel.lua', + 'jobs/lumberjack.lua', + 'jobs/miner.lua', + 'jobs/reporter.lua', + 'jobs/slaughterer.lua', + 'jobs/textil.lua', + 'client/esx_jobs_cl.lua' } diff --git a/client/esx_jobs_cl.lua b/client/esx_jobs_cl.lua index 7f65f096..00d55a58 100644 --- a/client/esx_jobs_cl.lua +++ b/client/esx_jobs_cl.lua @@ -1,18 +1,18 @@ 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 + ["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 menuIsShowed = false +local hintIsShowed = false local hasAlreadyEnteredMarker = false @@ -20,39 +20,39 @@ local Blips = {} local JobBlips = {} local collectedItem = nil -local collectedQtty = 0 +local collectedQtty = 0 local collectedQttyUpToDate = false local previousCollectedItem = nil -local previousCollectedQtty = 0 +local previousCollectedQtty = 0 local isInMarker = false local isInPublicMarker = false local newTask = false local hintToDisplay = "no hint to display" local jobDone = false -local onDuty = false -local moneyInBank = 0 +local onDuty = false +local moneyInBank = 0 -local spawner = 0 +local spawner = 0 local myPlate = {} local isJobVehicleDestroyed = false -local cautionVehicleInCaseofDrop = 0 +local cautionVehicleInCaseofDrop = 0 local maxCautionVehicleInCaseofDrop = 0 -local vehicleObjInCaseofDrop = nil -local vehicleInCaseofDrop = nil -local vehicleHashInCaseofDrop = nil -local vehicleMaxHealthInCaseofDrop = nil -local vehicleOldHealthInCaseofDrop = nil +local vehicleObjInCaseofDrop = nil +local vehicleInCaseofDrop = nil +local vehicleHashInCaseofDrop = nil +local vehicleMaxHealthInCaseofDrop = nil +local vehicleOldHealthInCaseofDrop = nil ESX = nil Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end end) RegisterNetEvent('esx:playerLoaded') @@ -63,508 +63,508 @@ AddEventHandler('esx:playerLoaded', function(xPlayer) end) AddEventHandler('esx_jobs:publicTeleports', function(position) - SetEntityCoords(GetPlayerPed(-1), position.x, position.y, position.z) + SetEntityCoords(GetPlayerPed(-1), position.x, position.y, position.z) end) function OpenMenu() - ESX.UI.Menu.CloseAll() + ESX.UI.Menu.CloseAll() - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'cloakroom', - { - title = _U('cloakroom'), - elements = { - {label = _U('job_wear'), value = 'job_wear'}, - {label = _U('citizen_wear'), value = 'citizen_wear'} - } - }, - function(data, menu) - if data.current.value == 'citizen_wear' then - onDuty = false - ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin) - TriggerEvent('skinchanger:loadSkin', skin) - end) - end - if data.current.value == 'job_wear' then - onDuty = true - ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) - if skin.sex == 0 then - TriggerEvent('skinchanger:loadClothes', skin, jobSkin.skin_male) - else - TriggerEvent('skinchanger:loadClothes', skin, jobSkin.skin_female) - end - end) - end - menu.close() - end, - function(data, menu) - menu.close() - end - ) + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), 'cloakroom', + { + title = _U('cloakroom'), + elements = { + {label = _U('job_wear'), value = 'job_wear'}, + {label = _U('citizen_wear'), value = 'citizen_wear'} + } + }, + function(data, menu) + if data.current.value == 'citizen_wear' then + onDuty = false + ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + end + if data.current.value == 'job_wear' then + onDuty = true + ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin, jobSkin) + if skin.sex == 0 then + TriggerEvent('skinchanger:loadClothes', skin, jobSkin.skin_male) + else + TriggerEvent('skinchanger:loadClothes', skin, jobSkin.skin_female) + end + end) + end + menu.close() + end, + function(data, menu) + menu.close() + end + ) end AddEventHandler('esx_jobs:action', function(job, zone) - menuIsShowed = true - if zone.Type == "cloakroom" then - OpenMenu() - elseif zone.Type == "work" then - hintToDisplay = "no hint to display" - hintIsShowed = false - local playerPed = GetPlayerPed(-1) - if IsPedInAnyVehicle(playerPed, 0) then - TriggerEvent('esx:showNotification', _U('foot_work')) - else - TriggerServerEvent('esx_jobs:startWork', zone.Item) - end - elseif zone.Type == "vehspawner" then - TriggerServerEvent('esx_jobs:requestPlayerData', 'refresh_bank_account') - local spawnpt = nil - local deliverypt = nil - local vehicle = nil + menuIsShowed = true + if zone.Type == "cloakroom" then + OpenMenu() + elseif zone.Type == "work" then + hintToDisplay = "no hint to display" + hintIsShowed = false + local playerPed = GetPlayerPed(-1) + if IsPedInAnyVehicle(playerPed, 0) then + TriggerEvent('esx:showNotification', _U('foot_work')) + else + TriggerServerEvent('esx_jobs:startWork', zone.Item) + end + elseif zone.Type == "vehspawner" then + TriggerServerEvent('esx_jobs:requestPlayerData', 'refresh_bank_account') + local spawnpt = nil + local deliverypt = nil + local vehicle = nil - 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 - spawnpt = w - spawner = w.Spawner - end - end - for m,x in pairs(v.Vehicles) do - if (x.Spawner == zone.Spawner) then - vehicle = x - end - end - end - end + 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 + spawnpt = w + spawner = w.Spawner + end + end + for m,x in pairs(v.Vehicles) do + if (x.Spawner == zone.Spawner) then + vehicle = x + end + end + end + end - local caution = zone.Caution + local caution = zone.Caution - if deliverypt == nil then - deliverypt = 0 - end + if deliverypt == nil then + deliverypt = 0 + end - TriggerServerEvent('esx_jobs:setCautionInCaseOfDrop', caution) - cautionVehicleInCaseofDrop = caution - maxCautionVehicleInCaseofDrop = cautionVehicleInCaseofDrop + TriggerServerEvent('esx_jobs:setCautionInCaseOfDrop', caution) + cautionVehicleInCaseofDrop = caution + maxCautionVehicleInCaseofDrop = cautionVehicleInCaseofDrop - spawncar(spawnpt, vehicle) + spawncar(spawnpt, vehicle) - elseif zone.Type == "vehdelete" then - local looping = true - 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 = GetPlayerPed(-1) - if IsPedInAnyVehicle(playerPed, 0) then - local vehicle = GetVehiclePedIsIn(playerPed, 0) - local plate = GetVehicleNumberPlateText(vehicle) - plate = string.gsub(plate, " ", "") - local driverPed = GetPedInVehicleSeat(vehicle, -1) - for i=1, #myPlate, 1 do - if (myPlate[i] == plate) and (playerPed == driverPed) then - TriggerServerEvent('esx_jobs:caution', "give_back", cautionVehicleInCaseofDrop, 0, 0) - DeleteVehicle(GetVehiclePedIsIn(playerPed, 0)) + elseif zone.Type == "vehdelete" then + local looping = true + 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 = GetPlayerPed(-1) + if IsPedInAnyVehicle(playerPed, 0) then + local vehicle = GetVehiclePedIsIn(playerPed, 0) + local plate = GetVehicleNumberPlateText(vehicle) + plate = string.gsub(plate, " ", "") + local driverPed = GetPedInVehicleSeat(vehicle, -1) + for i=1, #myPlate, 1 do + if (myPlate[i] == plate) and (playerPed == driverPed) then + TriggerServerEvent('esx_jobs:caution', "give_back", cautionVehicleInCaseofDrop, 0, 0) + DeleteVehicle(GetVehiclePedIsIn(playerPed, 0)) - if w.Teleport ~= 0 then - SetEntityCoords(GetPlayerPed(-1), w.Teleport.x, w.Teleport.y, w.Teleport.z) - end + if w.Teleport ~= 0 then + SetEntityCoords(GetPlayerPed(-1), w.Teleport.x, w.Teleport.y, w.Teleport.z) + end - TriggerEvent('esx_vehiclelock:updatePlayerCars', "remove", myPlate[i]) - table.remove(myPlate, i) + TriggerEvent('esx_vehiclelock:updatePlayerCars', "remove", myPlate[i]) + table.remove(myPlate, i) - if vehicleObjInCaseofDrop.HasCaution then - cautionVehicleInCaseofDrop = 0 - maxCautionVehicleInCaseofDrop = 0 - vehicleInCaseofDrop = nil - vehicleHashInCaseofDrop = nil - vehicleMaxHealthInCaseofDrop = nil - vehicleOldHealthInCaseofDrop = nil - vehicleObjInCaseofDrop = nil - TriggerServerEvent('esx_jobs:setCautionInCaseOfDrop', 0) - end + if vehicleObjInCaseofDrop.HasCaution then + cautionVehicleInCaseofDrop = 0 + maxCautionVehicleInCaseofDrop = 0 + vehicleInCaseofDrop = nil + vehicleHashInCaseofDrop = nil + vehicleMaxHealthInCaseofDrop = nil + vehicleOldHealthInCaseofDrop = nil + vehicleObjInCaseofDrop = nil + TriggerServerEvent('esx_jobs:setCautionInCaseOfDrop', 0) + end - break - end - end - end - looping = false - break - end - if looping == false then - break - end - 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 - end - hintToDisplay = "no hint to display" - hintIsShowed = false - TriggerServerEvent('esx_jobs:startWork', zone.Item) - end - --nextStep(zone.GPS) + break + end + end + end + looping = false + break + end + if looping == false then + break + end + 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 + end + hintToDisplay = "no hint to display" + 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 - end - Blips['delivery'] = AddBlipForCoord(gps.x, gps.y, gps.z) - SetBlipRoute(Blips['delivery'], true) - TriggerEvent('esx:showNotification', _U('next_point')) - end + if gps ~= 0 then + if Blips['delivery'] ~= nil then + RemoveBlip(Blips['delivery']) + Blips['delivery'] = nil + end + Blips['delivery'] = AddBlipForCoord(gps.x, gps.y, gps.z) + SetBlipRoute(Blips['delivery'], true) + TriggerEvent('esx:showNotification', _U('next_point')) + end end -- ######################### AddEventHandler('esx_jobs:hasExitedMarker', function(zone) - TriggerServerEvent('esx_jobs:stopWork') - hintToDisplay = "no hint to display" - menuIsShowed = false - hintIsShowed = false - isInMarker = false + TriggerServerEvent('esx_jobs:stopWork') + hintToDisplay = "no hint to display" + menuIsShowed = false + hintIsShowed = false + isInMarker = false end) RegisterNetEvent('esx:setJob') AddEventHandler('esx:setJob', function(job) - PlayerData.job = job - onDuty = false - myPlate = {} -- loosing vehicle caution in case player changes job. - isJobVehicleDestroyed = false - spawner = 0 - deleteBlips() - refreshBlips() + PlayerData.job = job + onDuty = false + myPlate = {} -- loosing vehicle caution in case player changes job. + isJobVehicleDestroyed = false + spawner = 0 + deleteBlips() + refreshBlips() end) function deleteBlips() - if JobBlips[1] ~= nil then - for i=1, #JobBlips, 1 do - RemoveBlip(JobBlips[i]) - JobBlips[i] = nil - end - end + if JobBlips[1] ~= nil then + for i=1, #JobBlips, 1 do + RemoveBlip(JobBlips[i]) + JobBlips[i] = nil + end + end end function refreshBlips() - local zones = {} - local blipInfo = {} - - if PlayerData.job ~= nil then - for jobKey,jobValues in pairs(Config.Jobs) do - - if jobKey == PlayerData.job.name then - for zoneKey,zoneValues in pairs(jobValues.Zones) do - 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) - SetBlipColour (blip, jobValues.BlipInfos.Color) - SetBlipAsShortRange(blip, true) - BeginTextCommandSetBlipName("STRING") - AddTextComponentString(zoneValues.Name) - EndTextCommandSetBlipName(blip) - table.insert(JobBlips, blip) - end - end - end + local zones = {} + local blipInfo = {} - end - end + if PlayerData.job ~= nil then + for jobKey,jobValues in pairs(Config.Jobs) do + + if jobKey == PlayerData.job.name then + for zoneKey,zoneValues in pairs(jobValues.Zones) do + 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) + SetBlipColour (blip, jobValues.BlipInfos.Color) + SetBlipAsShortRange(blip, true) + BeginTextCommandSetBlipName("STRING") + AddTextComponentString(zoneValues.Name) + EndTextCommandSetBlipName(blip) + table.insert(JobBlips, blip) + end + end + end + + end + end end function spawncar(spawnPoint, vehicle) - hintToDisplay = "no hint to display" - hintIsShowed = false - TriggerServerEvent('esx_jobs:caution', "take", cautionVehicleInCaseofDrop, spawnPoint, vehicle) + hintToDisplay = "no hint to display" + hintIsShowed = false + TriggerServerEvent('esx_jobs:caution', "take", cautionVehicleInCaseofDrop, spawnPoint, vehicle) end RegisterNetEvent('esx_jobs:spawnJobVehicle') AddEventHandler('esx_jobs:spawnJobVehicle', function(spawnPoint, vehicle) - local playerPed = GetPlayerPed(-1) - local coords = spawnPoint.Pos - local vehicleModel = GetHashKey(vehicle.Hash) + local playerPed = GetPlayerPed(-1) + local coords = spawnPoint.Pos + local vehicleModel = GetHashKey(vehicle.Hash) - RequestModel(vehicleModel) - while not HasModelLoaded(vehicleModel) do - Citizen.Wait(0) - end + RequestModel(vehicleModel) + while not HasModelLoaded(vehicleModel) do + Citizen.Wait(0) + end - local plate = math.random(100, 900) - if not IsAnyVehicleNearPoint(coords.x, coords.y, coords.z, 5.0) then - local veh = CreateVehicle(vehicleModel, coords.x, coords.y, coords.z, spawnPoint.Heading, true, false) + local plate = math.random(100, 900) + if not IsAnyVehicleNearPoint(coords.x, coords.y, coords.z, 5.0) then + local veh = CreateVehicle(vehicleModel, coords.x, coords.y, coords.z, spawnPoint.Heading, true, false) - if vehicle.Trailer ~= "none" then - RequestModel(vehicle.Trailer) + if vehicle.Trailer ~= "none" then + RequestModel(vehicle.Trailer) - while not HasModelLoaded(vehicle.Trailer) do - Citizen.Wait(0) - end + while not HasModelLoaded(vehicle.Trailer) do + Citizen.Wait(0) + end - local trailer = CreateVehicle(vehicle.Trailer, coords.x, coords.y, coords.z, spawnPoint.Heading, true, false) - AttachVehicleToTrailer(veh, trailer, 1.1) - end + local trailer = CreateVehicle(vehicle.Trailer, coords.x, coords.y, coords.z, spawnPoint.Heading, true, false) + AttachVehicleToTrailer(veh, trailer, 1.1) + end - SetVehicleHasBeenOwnedByPlayer(veh, true) - SetEntityAsMissionEntity(veh, true, true) - local id = NetworkGetNetworkIdFromEntity(veh) - SetNetworkIdCanMigrate(id, true) + SetVehicleHasBeenOwnedByPlayer(veh, true) + SetEntityAsMissionEntity(veh, true, true) + local id = NetworkGetNetworkIdFromEntity(veh) + SetNetworkIdCanMigrate(id, true) - local platePrefix = "WORK" - for k,v in pairs(Config.Plates) do - if PlayerData.job.name == k then - platePrefix = v - end - end + local platePrefix = "WORK" + for k,v in pairs(Config.Plates) do + if PlayerData.job.name == k then + platePrefix = v + end + end - plate = platePrefix .. plate - SetVehicleNumberPlateText(veh, plate) - table.insert(myPlate, plate) - plate = string.gsub(plate, " ", "") - TriggerEvent('esx_vehiclelock:updatePlayerCars', "add", plate) - SetVehRadioStation(veh, "OFF") - TaskWarpPedIntoVehicle(playerPed, veh, -1) - isJobVehicleDestroyed = false + plate = platePrefix .. plate + SetVehicleNumberPlateText(veh, plate) + table.insert(myPlate, plate) + plate = string.gsub(plate, " ", "") + TriggerEvent('esx_vehiclelock:updatePlayerCars', "add", plate) + SetVehRadioStation(veh, "OFF") + TaskWarpPedIntoVehicle(playerPed, veh, -1) + isJobVehicleDestroyed = false - if vehicle.HasCaution then - vehicleInCaseofDrop = veh - vehicleHashInCaseofDrop = vehicle.Hash - vehicleObjInCaseofDrop = vehicle - vehicleMaxHealthInCaseofDrop = GetEntityMaxHealth(veh) - vehicleOldHealthInCaseofDrop = vehicleMaxHealthInCaseofDrop - end - end + if vehicle.HasCaution then + vehicleInCaseofDrop = veh + vehicleHashInCaseofDrop = vehicle.Hash + vehicleObjInCaseofDrop = vehicle + vehicleMaxHealthInCaseofDrop = GetEntityMaxHealth(veh) + vehicleOldHealthInCaseofDrop = vehicleMaxHealthInCaseofDrop + end + end end) -- Show top left hint Citizen.CreateThread(function() - while true do - Wait(0) - if hintIsShowed == true then - SetTextComponentFormat("STRING") - AddTextComponentString(hintToDisplay) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) - end - end + while true do + Wait(0) + if hintIsShowed == true then + SetTextComponentFormat("STRING") + AddTextComponentString(hintToDisplay) + DisplayHelpTextFromStringLabel(0, 0, 1, -1) + end + end end) -- Display markers (only if on duty and the player's job ones) Citizen.CreateThread(function() - while true do - Wait(0) - local zones = {} - if PlayerData.job ~= nil then - for k,v in pairs(Config.Jobs) do - if PlayerData.job.name == k then - zones = v.Zones - end - end + while true do + Wait(0) + local zones = {} + if PlayerData.job ~= nil then + for k,v in pairs(Config.Jobs) do + if PlayerData.job.name == k then + zones = v.Zones + end + end - local coords = GetEntityCoords(GetPlayerPed(-1)) - 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 + local coords = GetEntityCoords(GetPlayerPed(-1)) + 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) -- Display public markers Citizen.CreateThread(function() - while true do - Wait(0) - local coords = GetEntityCoords(GetPlayerPed(-1)) - 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 + while true do + Wait(0) + local coords = GetEntityCoords(GetPlayerPed(-1)) + 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 - Wait(0) - local coords = GetEntityCoords(GetPlayerPed(-1)) - local position = nil - local zone = nil + while true do + Wait(0) + local coords = GetEntityCoords(GetPlayerPed(-1)) + 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) then - isInPublicMarker = true - position = v.Teleport - zone = v - break - else - isInPublicMarker = false - end - end + for k,v in pairs(Config.PublicZones) do + if(GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x) then + isInPublicMarker = true + position = v.Teleport + zone = v + break + else + isInPublicMarker = false + end + end - if IsControlJustReleased(0, Keys["E"]) and isInPublicMarker then - TriggerEvent('esx_jobs:publicTeleports', position) - end + if IsControlJustReleased(0, Keys["E"]) and isInPublicMarker then + TriggerEvent('esx_jobs:publicTeleports', position) + 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 + -- 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 - Wait(0) + while true do + Wait(0) - if PlayerData.job ~= nil and PlayerData.job.name ~= 'unemployed' then - local zones = nil - local job = nil + 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 + 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(GetPlayerPed(-1)) - local currentZone = nil - local zone = nil - local lastZone = nil + if zones ~= nil then + local coords = GetEntityCoords(GetPlayerPed(-1)) + 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 - end - end + 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 + 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 - 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 + end - -- hide or show top left zone hints - if isInMarker and not menuIsShowed then - 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 = GetPlayerPed(-1) - if IsPedInAnyVehicle(playerPed, 0) then - local vehicle = GetVehiclePedIsIn(playerPed) - local driverPed = GetPedInVehicleSeat(vehicle, -1) - local isVehicleOwner = false - local plate = GetVehicleNumberPlateText(vehicle) - plate = string.gsub(plate, " ", "") - for i=1, #myPlate, 1 do - Citizen.Trace(myPlate[i]) - if (myPlate[i] == plate) and (playerPed == driverPed) then - hintToDisplay = zone.Hint .. "\n" .. _U('security_deposit') .. cautionVehicleInCaseofDrop .. "~s~." - isVehicleOwner = true - break - end - end - if not isVehicleOwner then - hintToDisplay = _U('not_your_vehicle') - end - else - hintToDisplay = _U('in_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 - end - end + -- hide or show top left zone hints + if isInMarker and not menuIsShowed then + 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 = GetPlayerPed(-1) + if IsPedInAnyVehicle(playerPed, 0) then + local vehicle = GetVehiclePedIsIn(playerPed) + local driverPed = GetPedInVehicleSeat(vehicle, -1) + local isVehicleOwner = false + local plate = GetVehicleNumberPlateText(vehicle) + plate = string.gsub(plate, " ", "") + for i=1, #myPlate, 1 do + Citizen.Trace(myPlate[i]) + if (myPlate[i] == plate) and (playerPed == driverPed) then + hintToDisplay = zone.Hint .. "\n" .. _U('security_deposit') .. cautionVehicleInCaseofDrop .. "~s~." + isVehicleOwner = true + break + end + end + if not isVehicleOwner then + hintToDisplay = _U('not_your_vehicle') + end + else + hintToDisplay = _U('in_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 + end + end - if isInMarker and not hasAlreadyEnteredMarker then - hasAlreadyEnteredMarker = true - end + if isInMarker and not hasAlreadyEnteredMarker then + hasAlreadyEnteredMarker = true + end - if not isInMarker and hasAlreadyEnteredMarker then - hasAlreadyEnteredMarker = false - TriggerEvent('esx_jobs:hasExitedMarker', zone) - end - end - end - end + if not isInMarker and hasAlreadyEnteredMarker then + hasAlreadyEnteredMarker = false + TriggerEvent('esx_jobs:hasExitedMarker', zone) + end + end + end + end end) -- VEHICLE CAUTION Citizen.CreateThread(function() - while true do - Wait(0) - if vehicleInCaseofDrop ~= nil then - if onDuty and IsVehicleModel(vehicleInCaseofDrop, vehicleHashInCaseofDrop) then - local vehicleHealth = GetEntityHealth(vehicleInCaseofDrop) - if vehicleOldHealthInCaseofDrop ~= vehicleHealth then - local cautionValue = 0 - vehicleOldHealthInCaseofDrop = vehicleHealth - if vehicleHealth == vehicleMaxHealthInCaseofDrop then - cautionValue = maxCautionVehicleInCaseofDrop - cautionVehicleInCaseofDrop = cautionValue - else - local healthPct = (vehicleHealth * 100) / vehicleMaxHealthInCaseofDrop - local damagePct = 100 - healthPct - cautionValue = math.ceil(cautionVehicleInCaseofDrop - cautionVehicleInCaseofDrop * damagePct * 2.5 / 100) - if cautionValue < 0 then - cautionValue = 0 - elseif cautionValue >= cautionVehicleInCaseofDrop then - cautionValue = cautionVehicleInCaseofDrop - end - cautionVehicleInCaseofDrop = cautionValue - end - TriggerServerEvent('esx_jobs:setCautionInCaseOfDrop', cautionValue) - end - end - end - end + while true do + Wait(0) + if vehicleInCaseofDrop ~= nil then + if onDuty and IsVehicleModel(vehicleInCaseofDrop, vehicleHashInCaseofDrop) then + local vehicleHealth = GetEntityHealth(vehicleInCaseofDrop) + if vehicleOldHealthInCaseofDrop ~= vehicleHealth then + local cautionValue = 0 + vehicleOldHealthInCaseofDrop = vehicleHealth + if vehicleHealth == vehicleMaxHealthInCaseofDrop then + cautionValue = maxCautionVehicleInCaseofDrop + cautionVehicleInCaseofDrop = cautionValue + else + local healthPct = (vehicleHealth * 100) / vehicleMaxHealthInCaseofDrop + local damagePct = 100 - healthPct + cautionValue = math.ceil(cautionVehicleInCaseofDrop - cautionVehicleInCaseofDrop * damagePct * 2.5 / 100) + if cautionValue < 0 then + cautionValue = 0 + elseif cautionValue >= cautionVehicleInCaseofDrop then + cautionValue = cautionVehicleInCaseofDrop + end + cautionVehicleInCaseofDrop = cautionValue + end + TriggerServerEvent('esx_jobs:setCautionInCaseOfDrop', cautionValue) + end + end + 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") + -- 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") - -- Textil - RequestIpl("id2_14_during_door") - RequestIpl("id2_14_during1") + -- Textil + RequestIpl("id2_14_during_door") + RequestIpl("id2_14_during1") -end) \ No newline at end of file +end) diff --git a/config.lua b/config.lua index 89682111..dedeabca 100644 --- a/config.lua +++ b/config.lua @@ -3,43 +3,43 @@ Config.DrawDistance = 1000.0 Config.Locale = 'fr' Config.Plates = { - taxi = "TAXI", - fisherman = "FISH", - cop = "LSPD", - ambulance = "EMS", - depanneur = "MECA", - fuel = "FUEL", - lumberjack = "BUCH", - miner = "MINE", - reporter = "JOUR", - slaughterer = "ABAT", - textil = "COUT" + taxi = "TAXI", + fisherman = "FISH", + cop = "LSPD", + ambulance = "EMS", + depanneur = "MECA", + fuel = "FUEL", + lumberjack = "BUCH", + miner = "MINE", + reporter = "JOUR", + slaughterer = "ABAT", + textil = "COUT", } Config.Jobs = {} Config.PublicZones = { - EnterBuilding = { - Pos = { x = -118.21381378174, y = -607.14227294922, z = 35.280723571777 }, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = "Le Maclerait Libéré", - Type = "teleport", - Hint = "Appuyez sur ~INPUT_PICKUP~ pour entrer dans l'immeuble.", - Teleport = { x = -139.09838867188, y = -620.74865722656, z = 167.82052612305 } - }, + EnterBuilding = { + Pos = { x = -118.213, y = -607.142, z = 35.280 }, + Size = { x = 3.0, y = 3.0, z = 0.2 }, + Color = { r = 204, g = 204, b = 0 }, + Marker = 1, + Blip = false, + Name = "Le Maclerait Libéré", + Type = "teleport", + Hint = "Appuyez sur ~INPUT_PICKUP~ pour entrer dans l'immeuble.", + Teleport = { x = -139.098, y = -620.748, z = 167.820 } + }, - ExitBuilding = { - Pos = { x = -139.45831298828, y = -617.32312011719, z = 167.82052612305 }, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = "Le Maclerait Libéré", - Type = "teleport", - Hint = "Appuyez sur ~INPUT_PICKUP~ pour aller à l'entrée de l'immeuble.", - Teleport = { x = -113.07, y = -604.93, z = 35.28 }, - }, + ExitBuilding = { + Pos = { x = -139.458, y = -617.323, z = 167.820 }, + Size = { x = 3.0, y = 3.0, z = 0.2 }, + Color = { r = 204, g = 204, b = 0 }, + Marker = 1, + Blip = false, + Name = "Le Maclerait Libéré", + Type = "teleport", + Hint = "Appuyez sur ~INPUT_PICKUP~ pour aller à l'entrée de l'immeuble.", + Teleport = { x = -113.07, y = -604.93, z = 35.28 }, + }, } diff --git a/esx_jobs.sql b/esx_jobs.sql index f07bbb1f..8b7bc137 100644 --- a/esx_jobs.sql +++ b/esx_jobs.sql @@ -21,29 +21,29 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_ ('fisherman', 0, 'interim', 'Intérimaire', 0, '{}', '{}'), ('fuel', 0, 'interim', 'Intérimaire', 0, '{}', '{}'), ('reporter', 0, 'employee', 'Intérimaire', 0, '{}', '{}'), - ('textil',0,'interim','Intérimaire',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}'), + ('textil',0,'interim','Intérimaire',0,'{\"mask_1\":0,\"arms\":1,\"glasses_1\":0,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":0,\"torso_1\":24,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":0,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":0,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":36,\"tshirt_2\":0,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":48,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}','{\"mask_1\":0,\"arms\":5,\"glasses_1\":5,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":1,\"torso_1\":52,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":1,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":23,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":42,\"tshirt_2\":4,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":36,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}'), ('miner', 0, 'interim', 'Intérimaire', 0, '{"tshirt_2":1,"ears_1":8,"glasses_1":15,"torso_2":0,"ears_2":2,"glasses_2":3,"shoes_2":1,"pants_1":75,"shoes_1":51,"bags_1":0,"helmet_2":0,"pants_2":7,"torso_1":71,"tshirt_1":59,"arms":2,"bags_2":0,"helmet_1":0}', '{}'), - ('slaughterer',0,'interim','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}') + ('slaughterer',0,'interim','Intérimaire',0,'{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":67,\"pants_1\":36,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":0,\"torso_1\":56,\"beard_2\":6,\"shoes_1\":12,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":15,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":0,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}','{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":72,\"pants_1\":45,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":1,\"torso_1\":49,\"beard_2\":6,\"shoes_1\":24,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":9,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":5,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}') ; INSERT INTO `items` (`name`, `label`) VALUES - ('alive_chicken', 'Poulet vivant'), - ('slaughtered_chicken', 'Poulet abattu'), - ('packaged_chicken', 'Poulet en barquette'), - ('fish', 'Poisson'), - ('stone', 'Pierre'), - ('washed_stone', 'Pierre Lavée'), - ('copper', 'Cuivre'), - ('iron', 'Fer'), - ('gold', 'Or'), - ('diamond', 'Diamant'), - ('wood', 'Bois'), - ('cutted_wood', 'Bois coupé'), - ('packaged_plank', 'Paquet de planches'), - ('petrol', 'Pétrole'), - ('petrol_raffin', 'Pétrole Raffiné'), - ('essence', 'Essence'), - ('whool', 'Laine'), - ('fabric', 'Tissu'), - ('clothe', 'Vêtement') + ('alive_chicken', 'Poulet vivant'), + ('slaughtered_chicken', 'Poulet abattu'), + ('packaged_chicken', 'Poulet en barquette'), + ('fish', 'Poisson'), + ('stone', 'Pierre'), + ('washed_stone', 'Pierre Lavée'), + ('copper', 'Cuivre'), + ('iron', 'Fer'), + ('gold', 'Or'), + ('diamond', 'Diamant'), + ('wood', 'Bois'), + ('cutted_wood', 'Bois coupé'), + ('packaged_plank', 'Paquet de planches'), + ('petrol', 'Pétrole'), + ('petrol_raffin', 'Pétrole Raffiné'), + ('essence', 'Essence'), + ('whool', 'Laine'), + ('fabric', 'Tissu'), + ('clothe', 'Vêtement') ; diff --git a/jobs/fisherman.lua b/jobs/fisherman.lua index d28a858c..2a298cb1 100644 --- a/jobs/fisherman.lua +++ b/jobs/fisherman.lua @@ -1,167 +1,167 @@ Config.Jobs.fisherman = { - BlipInfos = { - Sprite = 68, - Color = 38 - }, - Vehicles = { - Truck = { - Spawner = 1, - Hash = "benson", - Trailer = "none", - HasCaution = true - }, - Boat = { - Spawner = 2, - Hash = "tug", - Trailer = "none", - HasCaution = false - } - }, - Zones = { - CloakRoom = { - Pos = {x = 868.39929199219, y = -1639.7556152344, z = 29.339252471924}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('fm_fish_locker'), - Type = "cloakroom", - Hint = _U('cloak_change'), - GPS = {x = 880.74462890625, y = -1663.9635009766, z = 29.370491027832} - }, + BlipInfos = { + Sprite = 68, + Color = 38 + }, + Vehicles = { + Truck = { + Spawner = 1, + Hash = "benson", + Trailer = "none", + HasCaution = true + }, + Boat = { + Spawner = 2, + Hash = "tug", + Trailer = "none", + HasCaution = false + } + }, + Zones = { + CloakRoom = { + Pos = {x = 868.39929199219, y = -1639.7556152344, z = 29.339252471924}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = true, + Name = _U('fm_fish_locker'), + Type = "cloakroom", + Hint = _U('cloak_change'), + GPS = {x = 880.74462890625, y = -1663.9635009766, z = 29.370491027832} + }, - FishingSpot = { - Pos = {x = 4435.21, y = 4829.6, z = 0.3439}, - Color = {r = 204, g = 204, b = 0}, - Size = {x = 110.0, y = 110.0, z = 10.0}, - Marker= 1, - Blip = true, - Name = _U('fm_fish_area'), - Type = "work", - Item = { - { - name = _U('fm_fish'), - db_name= "fish", - time = 2000, - max = 100, - add = 1, - remove = 1, - requires = "nothing", - requires_name = "Nothing", - drop = 100 - } - }, - Hint = _U('fm_fish_button'), - GPS = {x = 3859.43, y = 4448.83, z = 0.39994} - }, + FishingSpot = { + Pos = {x = 4435.21, y = 4829.6, z = 0.3439}, + Color = {r = 204, g = 204, b = 0}, + Size = {x = 110.0, y = 110.0, z = 10.0}, + Marker= 1, + Blip = true, + Name = _U('fm_fish_area'), + Type = "work", + Item = { + { + name = _U('fm_fish'), + db_name= "fish", + time = 2000, + max = 100, + add = 1, + remove = 1, + requires = "nothing", + requires_name = "Nothing", + drop = 100 + } + }, + Hint = _U('fm_fish_button'), + GPS = {x = 3859.43, y = 4448.83, z = 0.39994} + }, - BoatSpawner = { - Pos = {x = 3867.44, y = 4463.62, z = 1.72386}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('fm_spawnboat_title'), - Type = "vehspawner", - Spawner = 2, - Hint = _U('fm_spawnboat'), - Caution = 0, - GPS = {x = 4435.21, y = 4829.6, z = 0.3439} - }, + BoatSpawner = { + Pos = {x = 3867.44, y = 4463.62, z = 1.72386}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = true, + Name = _U('fm_spawnboat_title'), + Type = "vehspawner", + Spawner = 2, + Hint = _U('fm_spawnboat'), + Caution = 0, + GPS = {x = 4435.21, y = 4829.6, z = 0.3439} + }, - BoatSpawnPoint = { - Pos = {x = 3888.3, y = 4468.09, z = 0.0}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Marker= -1, - Blip = false, - Name = _U('fm_boat_title'), - Type = "vehspawnpt", - Spawner = 2, - GPS = 0, - Heading = 270.1 - }, + BoatSpawnPoint = { + Pos = {x = 3888.3, y = 4468.09, z = 0.0}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Marker= -1, + Blip = false, + Name = _U('fm_boat_title'), + Type = "vehspawnpt", + Spawner = 2, + GPS = 0, + Heading = 270.1 + }, - BoatDeletePoint = { - Pos = {x = 3859.43, y = 4448.83, z = 0.39994}, - Size = {x = 10.0, y = 10.0, z = 1.0}, - Color = {r = 255, g = 0, b = 0}, - Marker= 1, - Blip = false, - Name = _U('fm_boat_return_title'), - Type = "vehdelete", - Hint = _U('fm_boat_return_button'), - Spawner = 2, - Caution = 0, - GPS = {x = -1012.64758300781, y = -1354.62634277344, z = 5.54292726516724}, - Teleport = {x = 3867.44, y = 4463.62, z = 1.72386} - }, + BoatDeletePoint = { + Pos = {x = 3859.43, y = 4448.83, z = 0.39994}, + Size = {x = 10.0, y = 10.0, z = 1.0}, + Color = {r = 255, g = 0, b = 0}, + Marker= 1, + Blip = false, + Name = _U('fm_boat_return_title'), + Type = "vehdelete", + Hint = _U('fm_boat_return_button'), + Spawner = 2, + Caution = 0, + GPS = {x = -1012.64758300781, y = -1354.62634277344, z = 5.54292726516724}, + Teleport = {x = 3867.44, y = 4463.62, z = 1.72386} + }, - VehicleSpawner = { - Pos = {x = 880.74462890625, y = -1663.9635009766, z = 29.370491027832}, - Size = {x = 3.0, y = 3.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 = 3867.44, y = 4463.62, z = 1.72386} - }, + VehicleSpawner = { + Pos = {x = 880.74462890625, y = -1663.9635009766, z = 29.370491027832}, + Size = {x = 3.0, y = 3.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 = 3867.44, y = 4463.62, z = 1.72386} + }, - VehicleSpawnPoint = { - Pos = {x = 859.354, y = -1656.21, z = 29.5697}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Marker= -1, - Blip = false, - Name = _U('service_vh'), - Type = "vehspawnpt", - Spawner = 1, - GPS = 0, - Heading = 70.1 - }, + VehicleSpawnPoint = { + Pos = {x = 859.354, y = -1656.21, z = 29.5697}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Marker= -1, + Blip = false, + Name = _U('service_vh'), + Type = "vehspawnpt", + Spawner = 1, + GPS = 0, + Heading = 70.1 + }, - VehicleDeletePoint = { - Pos = {x = 863.23254394531, y = -1718.2849121094, z = 28.631998062134}, - 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 - }, + VehicleDeletePoint = { + Pos = {x = 863.23254394531, y = -1718.2849121094, z = 28.631998062134}, + 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 + }, - Delivery = { - Pos = {x = -1012.64758300781, y = -1354.62634277344, z = 5.54292726516724}, - 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('delivery_point'), - Type = "delivery", - Spawner = 2, - Item = { - { - 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 = 11, - requires = "fish", - requires_name = _U('fm_fish'), - drop = 100 - } - }, - Hint = _U('fm_deliver_fish'), - GPS = {x = 3867.44, y = 4463.62, z = 1.72386} - } - } + Delivery = { + Pos = {x = -1012.64758300781, y = -1354.62634277344, z = 5.54292726516724}, + 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('delivery_point'), + Type = "delivery", + Spawner = 2, + Item = { + { + 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 = 11, + requires = "fish", + requires_name = _U('fm_fish'), + drop = 100 + } + }, + Hint = _U('fm_deliver_fish'), + GPS = {x = 3867.44, y = 4463.62, z = 1.72386} + } + } } diff --git a/jobs/fuel.lua b/jobs/fuel.lua index 83d52372..680d30d2 100644 --- a/jobs/fuel.lua +++ b/jobs/fuel.lua @@ -1,168 +1,168 @@ Config.Jobs.fuel = { - BlipInfos = { - Sprite = 436, - Color = 5 - }, - Vehicles = { - Truck = { - Spawner = 1, - Hash = "phantom", - Trailer = "tanker", - HasCaution = true - } - }, - Zones = { - CloakRoom = { -- 1 - Pos = {x = 557.933, y = -2327.9, z = 4.82896}, - Size = {x = 3.0, y = 3.0, z = 2.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('f_oil_refiner'), - Type = "cloakroom", - Hint = _U('cloak_change'), - GPS = {x = 554.597, y = -2314.43, z = 4.86293} - }, + BlipInfos = { + Sprite = 436, + Color = 5 + }, + Vehicles = { + Truck = { + Spawner = 1, + Hash = "phantom", + Trailer = "tanker", + HasCaution = true + } + }, + Zones = { + CloakRoom = { -- 1 + Pos = {x = 557.933, y = -2327.9, z = 4.82896}, + Size = {x = 3.0, y = 3.0, z = 2.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = true, + Name = _U('f_oil_refiner'), + Type = "cloakroom", + Hint = _U('cloak_change'), + GPS = {x = 554.597, y = -2314.43, z = 4.86293} + }, - ChampPetrol = { -- 4 -- 8 - Pos = {x = 609.589, y = 2856.74, z = 39.4958}, - Size = {x = 20.0, y = 20.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('f_drill_oil'), - Type = "work", - Item = { - { - name = _U('f_fuel'), - db_name= "petrol", - time = 5000, - max = 24, - add = 1, - remove = 1, - requires = "nothing", - requires_name = "Nothing", - drop = 100 - } - }, - Hint = _U('f_drillbutton'), - GPS = {x = 2736.94, y = 1417.99, z = 23.4888} - }, + ChampPetrol = { -- 4 -- 8 + Pos = {x = 609.589, y = 2856.74, z = 39.4958}, + Size = {x = 20.0, y = 20.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = true, + Name = _U('f_drill_oil'), + Type = "work", + Item = { + { + name = _U('f_fuel'), + db_name= "petrol", + time = 5000, + max = 24, + add = 1, + remove = 1, + requires = "nothing", + requires_name = "Nothing", + drop = 100 + } + }, + Hint = _U('f_drillbutton'), + GPS = {x = 2736.94, y = 1417.99, z = 23.4888} + }, - Raffinerie = { -- 5 - Pos = {x = 2736.94, y = 1417.99, z = 23.4888}, - Size = {x = 10.0, y = 10.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('f_fuel_refine'), - Type = "work", - Item = { - { - name = _U('f_fuel_refine'), - db_name= "petrol_raffin", - time = 5000, - max = 20, - add = 1, - remove = 2, - requires = "petrol", - requires_name = _U('f_fuel'), - drop = 100 - } - }, - Hint = _U('f_refine_fuel_button'), - GPS = {x = 265.752, y = -3013.39, z = 4.73275} - }, + Raffinerie = { -- 5 + Pos = {x = 2736.94, y = 1417.99, z = 23.4888}, + Size = {x = 10.0, y = 10.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = true, + Name = _U('f_fuel_refine'), + Type = "work", + Item = { + { + name = _U('f_fuel_refine'), + db_name= "petrol_raffin", + time = 5000, + max = 20, + add = 1, + remove = 2, + requires = "petrol", + requires_name = _U('f_fuel'), + drop = 100 + } + }, + Hint = _U('f_refine_fuel_button'), + GPS = {x = 265.752, y = -3013.39, z = 4.73275} + }, - Melange = { -- 6 - Pos = {x = 265.752, y = -3013.39, z = 4.73275}, - Size = {x = 10.0, y = 10.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('f_fuel_mixture'), - Type = "work", - Item = { - { - name = _U('f_gas'), - db_name= "essence", - time = 5000, - max = 20, - add = 2, - remove = 1, - requires = "petrol_raffin", - requires_name = _U('f_fuel_refine'), - drop = 100 - } - }, - Hint = _U('f_fuel_mixture_button'), - GPS = {x = 491.406, y = -2163.37, z = 4.91827} - }, + Melange = { -- 6 + Pos = {x = 265.752, y = -3013.39, z = 4.73275}, + Size = {x = 10.0, y = 10.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = true, + Name = _U('f_fuel_mixture'), + Type = "work", + Item = { + { + name = _U('f_gas'), + db_name= "essence", + time = 5000, + max = 20, + add = 2, + remove = 1, + requires = "petrol_raffin", + requires_name = _U('f_fuel_refine'), + drop = 100 + } + }, + Hint = _U('f_fuel_mixture_button'), + GPS = {x = 491.406, y = -2163.37, z = 4.91827} + }, - VehicleSpawner = { -- 2 - Pos = {x = 554.597, y = -2314.43, z = 4.86293}, - Size = {x = 3.0, y = 3.0, z = 2.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = _U('spawn_veh'), - Type = "vehspawner", - Spawner = 1, - Hint = _U('spawn_truck_button'), - Caution = 2000, - GPS = {x = 602.254, y = 2926.62, z = 39.6898} - }, + VehicleSpawner = { -- 2 + Pos = {x = 554.597, y = -2314.43, z = 4.86293}, + Size = {x = 3.0, y = 3.0, z = 2.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = false, + Name = _U('spawn_veh'), + Type = "vehspawner", + Spawner = 1, + Hint = _U('spawn_truck_button'), + Caution = 2000, + GPS = {x = 602.254, y = 2926.62, z = 39.6898} + }, - VehicleSpawnPoint = { - Pos = {x = 580.541, y = -2309.7, z = 4.90915}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Marker= -1, - Blip = false, - Name = _U('service_vh'), - Type = "vehspawnpt", - Spawner = 1, - GPS = 0, - Heading = 0 - }, + VehicleSpawnPoint = { + Pos = {x = 580.541, y = -2309.7, z = 4.90915}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Marker= -1, + Blip = false, + Name = _U('service_vh'), + Type = "vehspawnpt", + Spawner = 1, + GPS = 0, + Heading = 0 + }, - VehicleDeletePoint = { - Pos = {x = 520.684, y = -2124.21, z = 4.98635}, - 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 - }, + VehicleDeletePoint = { + Pos = {x = 520.684, y = -2124.21, z = 4.98635}, + 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 + }, - Delivery = { -- 7 - Pos = {x = 491.406, y = -2163.37, z = 4.91827}, - Color = {r = 204, g = 204, b = 0}, - Size = {x = 10.0, y = 10.0, z = 1.0}, - Marker= 1, - Blip = true, - Name = _U('f_deliver_gas'), - Type = "delivery", - Spawner = 1, - Item = { - { - 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'), - drop = 100 - } - }, - Hint = _U('f_deliver_gas'), - GPS = {x = 609.589, y = 2856.74, z = 39.4958} - } - } + Delivery = { -- 7 + Pos = {x = 491.406, y = -2163.37, z = 4.91827}, + Color = {r = 204, g = 204, b = 0}, + Size = {x = 10.0, y = 10.0, z = 1.0}, + Marker= 1, + Blip = true, + Name = _U('f_deliver_gas'), + Type = "delivery", + Spawner = 1, + Item = { + { + 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'), + drop = 100 + } + }, + Hint = _U('f_deliver_gas'), + GPS = {x = 609.589, y = 2856.74, z = 39.4958} + } + } } diff --git a/jobs/lumberjack.lua b/jobs/lumberjack.lua index 5c5a8f9e..90139e47 100644 --- a/jobs/lumberjack.lua +++ b/jobs/lumberjack.lua @@ -1,161 +1,161 @@ Config.Jobs.lumberjack = { - BlipInfos = { - Sprite = 237, - Color = 4 - }, - Vehicles = { - Truck = { - Spawner = 1, - Hash = "phantom", - Trailer = "trailers", - HasCaution = true - } - }, - Zones = { - CloakRoom = { - Pos = {x = 1200.63, y = -1276.875, z = 34.38}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('lj_locker_room'), - Type = "cloakroom", - Hint = _U('cloak_change'), - }, + BlipInfos = { + Sprite = 237, + Color = 4 + }, + Vehicles = { + Truck = { + Spawner = 1, + Hash = "phantom", + Trailer = "trailers", + HasCaution = true + } + }, + Zones = { + CloakRoom = { + Pos = {x = 1200.63, y = -1276.875, z = 34.38}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = true, + Name = _U('lj_locker_room'), + Type = "cloakroom", + Hint = _U('cloak_change'), + }, - Wood = { - Pos = {x = -534.323669433594, y = 5373.794921875, z = 69.503059387207}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('lj_mapblip'), - Type = "work", - Item = { - { - name = _U('lj_wood'), - db_name= "wood", - time = 3000, - max = 20, - add = 1, - remove = 1, - requires = "nothing", - requires_name = "Nothing", - drop = 100 - } - }, - Hint = _U('lj_pickup') - }, + Wood = { + Pos = {x = -534.323669433594, y = 5373.794921875, z = 69.503059387207}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = true, + Name = _U('lj_mapblip'), + Type = "work", + Item = { + { + name = _U('lj_wood'), + db_name= "wood", + time = 3000, + max = 20, + add = 1, + remove = 1, + requires = "nothing", + requires_name = "Nothing", + drop = 100 + } + }, + Hint = _U('lj_pickup') + }, - CuttedWood = { - Pos = {x = -552.214660644531, y = 5326.90966796875, z = 72.5996017456055}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = _U('lj_cutwood'), - Type = "work", - Item = { - { - name = _U('lj_cutwood'), - db_name= "cutted_wood", - time = 5000, - max = 20, - add = 1, - remove = 1, - requires = "wood", - requires_name = _U('lj_wood'), - drop = 100 - } - }, - Hint = _U('lj_cutwood_button') - }, + CuttedWood = { + Pos = {x = -552.214660644531, y = 5326.90966796875, z = 72.5996017456055}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = false, + Name = _U('lj_cutwood'), + Type = "work", + Item = { + { + name = _U('lj_cutwood'), + db_name= "cutted_wood", + time = 5000, + max = 20, + add = 1, + remove = 1, + requires = "wood", + requires_name = _U('lj_wood'), + drop = 100 + } + }, + Hint = _U('lj_cutwood_button') + }, - Planks = { - Pos = {x = -501.386596679688, y = 5280.53076171875, z = 79.6187744140625}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = _U('lj_board'), - Type = "work", - Item = { - { - name = _U('lj_planks'), - db_name= "packaged_plank", - time = 4000, - max = 100, - add = 5, - remove = 1, - requires = "cutted_wood", - requires_name = _U('lj_cutwood'), - drop = 100 - } - }, - Hint = _U('lj_pick_boards') - }, + Planks = { + Pos = {x = -501.386596679688, y = 5280.53076171875, z = 79.6187744140625}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = false, + Name = _U('lj_board'), + Type = "work", + Item = { + { + name = _U('lj_planks'), + db_name= "packaged_plank", + time = 4000, + max = 100, + add = 5, + remove = 1, + requires = "cutted_wood", + requires_name = _U('lj_cutwood'), + drop = 100 + } + }, + Hint = _U('lj_pick_boards') + }, - VehicleSpawner = { - Pos = {x = 1191.9681396484, y = -1261.7775878906, z = 34.170627593994}, - Size = {x = 3.0, y = 3.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 - }, + VehicleSpawner = { + Pos = {x = 1191.9681396484, y = -1261.7775878906, z = 34.170627593994}, + Size = {x = 3.0, y = 3.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 + }, - VehicleSpawnPoint = { - Pos = {x = 1194.6257324219, y = -1286.955078125, z = 34.121524810791}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Marker= -1, - Blip = false, - Name = _U('service_vh'), - Type = "vehspawnpt", - Spawner = 1, - Heading = 285.1 - }, + VehicleSpawnPoint = { + Pos = {x = 1194.6257324219, y = -1286.955078125, z = 34.121524810791}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Marker= -1, + Blip = false, + Name = _U('service_vh'), + Type = "vehspawnpt", + Spawner = 1, + Heading = 285.1 + }, - VehicleDeletePoint = { - Pos = {x = 1216.8983154297, y = -1229.2396240234, z = 34.403507232666}, - 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 - }, + VehicleDeletePoint = { + Pos = {x = 1216.8983154297, y = -1229.2396240234, z = 34.403507232666}, + 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 + }, - Delivery = { - Pos = {x = 1201.3558349609, y = -1327.5159912109, z = 34.226093292236}, - Color = {r = 204, g = 204, b = 0}, - Size = {x = 5.0, y = 5.0, z = 3.0}, - Marker= 1, - Blip = true, - Name = _U('delivery_point'), - Type = "delivery", - Spawner = 1, - Item = { - { - 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'), - drop = 100 - } - }, - Hint = _U('lj_deliver_button') - } - } + Delivery = { + Pos = {x = 1201.3558349609, y = -1327.5159912109, z = 34.226093292236}, + Color = {r = 204, g = 204, b = 0}, + Size = {x = 5.0, y = 5.0, z = 3.0}, + Marker= 1, + Blip = true, + Name = _U('delivery_point'), + Type = "delivery", + Spawner = 1, + Item = { + { + 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'), + drop = 100 + } + }, + Hint = _U('lj_deliver_button') + } + } } diff --git a/jobs/miner.lua b/jobs/miner.lua index b11ad769..7548b20b 100644 --- a/jobs/miner.lua +++ b/jobs/miner.lua @@ -1,267 +1,267 @@ 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} - }, + 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} - }, + 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} + }, - 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} - }, + 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} + }, - 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} - }, + 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} + }, - 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} - }, + 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 - }, + 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 + }, - 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 - }, + 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 + }, - 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} - }, + 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} + }, - 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} - }, + 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} + }, - 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} - }, + 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} + }, - 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} - } - } + 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} + } + } } diff --git a/jobs/reporter.lua b/jobs/reporter.lua index 1a3b98d2..3aadb881 100644 --- a/jobs/reporter.lua +++ b/jobs/reporter.lua @@ -1,54 +1,54 @@ 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 - }, + 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 - }, + 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 + }, - 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 } - } - } + 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 } + } + } } diff --git a/jobs/slaughterer.lua b/jobs/slaughterer.lua index b49bd3cb..1d800722 100644 --- a/jobs/slaughterer.lua +++ b/jobs/slaughterer.lua @@ -1,161 +1,161 @@ Config.Jobs.slaughterer = { - BlipInfos = { - Sprite = 256, - Color = 5 - }, - Vehicles = { - Truck = { - Spawner = 1, - Hash = "benson", - Trailer = "none", - HasCaution = true - } - }, - Zones = { - CloakRoom = { - Pos = {x = -1071.1319580078, y = -2003.7891845703, z = 14.78551197052}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('s_slaughter_locker'), - Type = "cloakroom", - Hint = _U('cloak_change'), - }, + BlipInfos = { + Sprite = 256, + Color = 5 + }, + Vehicles = { + Truck = { + Spawner = 1, + Hash = "benson", + Trailer = "none", + HasCaution = true + } + }, + Zones = { + CloakRoom = { + Pos = {x = -1071.1319580078, y = -2003.7891845703, z = 14.78551197052}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = true, + Name = _U('s_slaughter_locker'), + Type = "cloakroom", + Hint = _U('cloak_change'), + }, - AliveChicken = { - Pos = {x = -62.9018, y = 6241.46, z = 30.0901}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('s_hen'), - Type = "work", - Item = { - { - name = _U('s_alive_chicken'), - db_name= "alive_chicken", - time = 3000, - max = 20, - add = 1, - remove = 1, - requires = "nothing", - requires_name = "Nothing", - drop = 100 - } - }, - Hint = _U('s_catch_hen') - }, + AliveChicken = { + Pos = {x = -62.9018, y = 6241.46, z = 30.0901}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = true, + Name = _U('s_hen'), + Type = "work", + Item = { + { + name = _U('s_alive_chicken'), + db_name= "alive_chicken", + time = 3000, + max = 20, + add = 1, + remove = 1, + requires = "nothing", + requires_name = "Nothing", + drop = 100 + } + }, + Hint = _U('s_catch_hen') + }, - SlaughterHouse = { - Pos = {x = -77.991, y = 6229.063, z = 30.091}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = _U('s_slaughtered'), - Type = "work", - Item = { - { - 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'), - drop = 100 - } - }, - Hint = _U('s_chop_animal') - }, + SlaughterHouse = { + Pos = {x = -77.991, y = 6229.063, z = 30.091}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = false, + Name = _U('s_slaughtered'), + Type = "work", + Item = { + { + 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'), + drop = 100 + } + }, + Hint = _U('s_chop_animal') + }, - Packaging = { - Pos = {x = -101.978, y = 6208.799, z = 30.025}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = _U('s_package'), - Type = "work", - Item = { - { - name = _U('s_packagechicken'), - db_name= "packaged_chicken", - time = 4000, - max = 100, - add = 5, - remove = 1, - requires = "slaughtered_chicken", - requires_name = _U('s_unpackaged'), - drop = 100 - } - }, - Hint = _U('s_unpackaged_button') - }, + Packaging = { + Pos = {x = -101.978, y = 6208.799, z = 30.025}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = false, + Name = _U('s_package'), + Type = "work", + Item = { + { + name = _U('s_packagechicken'), + db_name= "packaged_chicken", + time = 4000, + max = 100, + add = 5, + remove = 1, + requires = "slaughtered_chicken", + requires_name = _U('s_unpackaged'), + drop = 100 + } + }, + Hint = _U('s_unpackaged_button') + }, - VehicleSpawner = { - Pos = {x = -1042.9444580078, y = -2023.2551269531, z = 12.161581993103}, - Size = {x = 3.0, y = 3.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 - }, + VehicleSpawner = { + Pos = {x = -1042.9444580078, y = -2023.2551269531, z = 12.161581993103}, + Size = {x = 3.0, y = 3.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 + }, - VehicleSpawnPoint = { - Pos = {x = -1048.8568115234, y = -2025.322265625, z = 12.161581993103}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Marker= -1, - Blip = false, - Name = _U('service_vh'), - Type = "vehspawnpt", - Spawner = 1, - Heading = 130.1 - }, + VehicleSpawnPoint = { + Pos = {x = -1048.8568115234, y = -2025.322265625, z = 12.161581993103}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Marker= -1, + Blip = false, + Name = _U('service_vh'), + Type = "vehspawnpt", + Spawner = 1, + Heading = 130.1 + }, - VehicleDeletePoint = { - Pos = {x = -1061.5164794922, y = -2008.3552246094, z = 12.161584854126}, - 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 - }, + VehicleDeletePoint = { + Pos = {x = -1061.5164794922, y = -2008.3552246094, z = 12.161584854126}, + 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 + }, - Delivery = { - Pos = {x = -596.158, y = -889.324, z = 24.5073}, - Color = {r = 204, g = 204, b = 0}, - Size = {x = 5.0, y = 5.0, z = 1.0}, - Marker= 1, - Blip = true, - Name = _U('delivery_point'), - Type = "delivery", - Spawner = 1, - Item = { - { - 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 = 11, - requires = "packaged_chicken", - requires_name = _U('s_packagechicken'), - drop = 100 - } - }, - Hint = _U('s_deliver') - } - } + Delivery = { + Pos = {x = -596.158, y = -889.324, z = 24.5073}, + Color = {r = 204, g = 204, b = 0}, + Size = {x = 5.0, y = 5.0, z = 1.0}, + Marker= 1, + Blip = true, + Name = _U('delivery_point'), + Type = "delivery", + Spawner = 1, + Item = { + { + 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 = 11, + requires = "packaged_chicken", + requires_name = _U('s_packagechicken'), + drop = 100 + } + }, + Hint = _U('s_deliver') + } + } } diff --git a/jobs/textil.lua b/jobs/textil.lua index 2c26b81e..b58e7aa3 100644 --- a/jobs/textil.lua +++ b/jobs/textil.lua @@ -1,168 +1,168 @@ Config.Jobs.textil = { - BlipInfos = { - Sprite = 366, - Color = 4 - }, - Vehicles = { - Truck = { - Spawner = 1, - Hash = "youga2", - Trailer = "none", - HasCaution = true - } - }, - Zones = { - CloakRoom = { - Pos = {x = 706.735412597656, y = -960.902893066406, z = 29.3953247070313}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('dd_dress_locker'), - Type = "cloakroom", - Hint = _U('cloak_change'), - GPS = {x = 740.808776855469, y = -970.066650390625, z = 23.4693908691406} - }, + BlipInfos = { + Sprite = 366, + Color = 4 + }, + Vehicles = { + Truck = { + Spawner = 1, + Hash = "youga2", + Trailer = "none", + HasCaution = true + } + }, + Zones = { + CloakRoom = { + Pos = {x = 706.735412597656, y = -960.902893066406, z = 29.3953247070313}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = true, + Name = _U('dd_dress_locker'), + Type = "cloakroom", + Hint = _U('cloak_change'), + GPS = {x = 740.808776855469, y = -970.066650390625, z = 23.4693908691406} + }, - Whool = { - Pos = {x = 1978.92407226563, y = 5171.70166015625, z = 46.6391181945801}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = true, - Name = _U('dd_wool'), - Type = "work", - Item = { - { - name = _U('dd_wool'), - db_name= "whool", - time = 3000, - max = 40, - add = 1, - remove = 1, - requires = "nothing", - requires_name = "Nothing", - drop = 100 - } - }, - Hint = _U('dd_pickup'), - GPS = {x = 715.954650878906, y = -959.639587402344, z = 29.3953247070313} - }, + Whool = { + Pos = {x = 1978.92407226563, y = 5171.70166015625, z = 46.6391181945801}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = true, + Name = _U('dd_wool'), + Type = "work", + Item = { + { + name = _U('dd_wool'), + db_name= "whool", + time = 3000, + max = 40, + add = 1, + remove = 1, + requires = "nothing", + requires_name = "Nothing", + drop = 100 + } + }, + Hint = _U('dd_pickup'), + GPS = {x = 715.954650878906, y = -959.639587402344, z = 29.3953247070313} + }, - Fabric = { - Pos = {x = 715.954650878906, y = -959.639587402344, z = 29.3953247070313}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = _U('dd_fabric'), - Type = "work", - Item = { - { - name = _U('dd_fabric'), - db_name= "fabric", - time = 5000, - max = 80, - add = 2, - remove = 1, - requires = "whool", - requires_name = _U('dd_wool'), - drop = 100 - } - }, - Hint = _U('dd_makefabric'), - GPS = {x = 712.928283691406, y = -970.5869140625, z = 29.3953247070313} - }, + Fabric = { + Pos = {x = 715.954650878906, y = -959.639587402344, z = 29.3953247070313}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = false, + Name = _U('dd_fabric'), + Type = "work", + Item = { + { + name = _U('dd_fabric'), + db_name= "fabric", + time = 5000, + max = 80, + add = 2, + remove = 1, + requires = "whool", + requires_name = _U('dd_wool'), + drop = 100 + } + }, + Hint = _U('dd_makefabric'), + GPS = {x = 712.928283691406, y = -970.5869140625, z = 29.3953247070313} + }, - Clothe = { - Pos = {x = 712.928283691406, y = -970.5869140625, z = 29.3953247070313}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = _U('dd_clothing'), - Type = "work", - Item = { - { - name = _U('dd_clothing'), - db_name= "clothe", - time = 4000, - max = 40, - add = 1, - remove = 2, - requires = "fabric", - requires_name = _U('dd_fabric'), - drop = 100 - } - }, - Hint = _U('dd_makeclothing'), - GPS = {x = 429.595855712891, y = -807.341613769531, z = 28.4911441802979} - }, + Clothe = { + Pos = {x = 712.928283691406, y = -970.5869140625, z = 29.3953247070313}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = false, + Name = _U('dd_clothing'), + Type = "work", + Item = { + { + name = _U('dd_clothing'), + db_name= "clothe", + time = 4000, + max = 40, + add = 1, + remove = 2, + requires = "fabric", + requires_name = _U('dd_fabric'), + drop = 100 + } + }, + Hint = _U('dd_makeclothing'), + GPS = {x = 429.595855712891, y = -807.341613769531, z = 28.4911441802979} + }, - VehicleSpawner = { - Pos = {x = 740.808776855469, y = -970.066650390625, z = 23.4693908691406}, - Size = {x = 3.0, y = 3.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 = 1978.92407226563, y = 5171.70166015625, z = 46.6391181945801} - }, + VehicleSpawner = { + Pos = {x = 740.808776855469, y = -970.066650390625, z = 23.4693908691406}, + Size = {x = 3.0, y = 3.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 = 1978.92407226563, y = 5171.70166015625, z = 46.6391181945801} + }, - VehicleSpawnPoint = { - Pos = {x = 747.31396484375, y = -966.235778808594, z = 23.705005645752}, - Size = {x = 3.0, y = 3.0, z = 1.0}, - Marker= -1, - Blip = false, - Name = _U('service_vh'), - Type = "vehspawnpt", - Spawner = 1, - Heading = 270.1, - GPS = 0 - }, + VehicleSpawnPoint = { + Pos = {x = 747.31396484375, y = -966.235778808594, z = 23.705005645752}, + Size = {x = 3.0, y = 3.0, z = 1.0}, + Marker= -1, + Blip = false, + Name = _U('service_vh'), + Type = "vehspawnpt", + Spawner = 1, + Heading = 270.1, + GPS = 0 + }, - VehicleDeletePoint = { - Pos = {x = 693.796325683594, y = -963.010498046875, z = 22.8247337341309}, - Size = {x = 3.0, y = 3.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 - }, + VehicleDeletePoint = { + Pos = {x = 693.796325683594, y = -963.010498046875, z = 22.8247337341309}, + Size = {x = 3.0, y = 3.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 + }, - Delivery = { - Pos = {x = 429.595855712891, y = -807.341613769531, z = 28.4911441802979}, - Color = {r = 204, g = 204, b = 0}, - Size = {x = 5.0, y = 5.0, z = 3.0}, - Marker= 1, - Blip = true, - Name = _U('delivery_point'), - Type = "delivery", - Spawner = 1, - Item = { - { - 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'), - drop = 100 - } - }, - Hint = _U('dd_deliver_clothes'), - GPS = {x = 1978.92407226563, y = 5171.70166015625, z = 46.6391181945801} - } - } + Delivery = { + Pos = {x = 429.595855712891, y = -807.341613769531, z = 28.4911441802979}, + Color = {r = 204, g = 204, b = 0}, + Size = {x = 5.0, y = 5.0, z = 3.0}, + Marker= 1, + Blip = true, + Name = _U('delivery_point'), + Type = "delivery", + Spawner = 1, + Item = { + { + 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'), + drop = 100 + } + }, + Hint = _U('dd_deliver_clothes'), + GPS = {x = 1978.92407226563, y = 5171.70166015625, z = 46.6391181945801} + } + } } diff --git a/locales/br.lua b/locales/br.lua index 6e1772af..09073293 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,117 +1,117 @@ Locales['br'] = { - --Menus Geral - ['cloakroom'] = 'Vestiário', - ['cloak_change'] = 'pressione ~INPUT_PICKUP~ mudar de roupa.', - ['citizen_wear'] = 'retirar uniforme', - ['job_wear'] = 'colocar uniforme', - ['bank_deposit'] = 'um depósito de segurança de ~g~', - ['bank_deposit_r'] = 'um depósito de segurança de ~g~$', - ['bank_deposit2'] = '$ ~s~foi feito para você depois do seu desmaio.', - ['bank_nodeposit'] = "você não tinha um depósito de segurança", - ['foot_work'] = 'você deve estar a pé para poder trabalhar.', - ['next_point'] = 'vá para o próximo passo depois de completar este.', - ['security_deposit'] = 'a segurança dada será ~g~$', - ['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: ', - ['not_enough'] = "você não tem o suficiente", - ['not_enough2'] = ' Para continuar esta tarefa.', - ['caution_taken'] = ' ~s~foi tirado de você.', - ['caution_returned'] = ' ~s~foi devolvido a você.', - ['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.', - ['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', + -- Menus Geral + ['cloakroom'] = 'Vestiário', + ['cloak_change'] = 'pressione ~INPUT_PICKUP~ mudar de roupa.', + ['citizen_wear'] = 'retirar uniforme', + ['job_wear'] = 'colocar uniforme', + ['bank_deposit'] = 'um depósito de segurança de ~g~', + ['bank_deposit_r'] = 'um depósito de segurança de ~g~$', + ['bank_deposit2'] = '$ ~s~foi feito para você depois do seu desmaio.', + ['bank_nodeposit'] = "você não tinha um depósito de segurança", + ['foot_work'] = 'você deve estar a pé para poder trabalhar.', + ['next_point'] = 'vá para o próximo passo depois de completar este.', + ['security_deposit'] = 'a segurança dada será ~g~$', + ['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: ', + ['not_enough'] = "você não tem o suficiente", + ['not_enough2'] = ' Para continuar esta tarefa.', + ['caution_taken'] = ' ~s~foi tirado de você.', + ['caution_returned'] = ' ~s~foi devolvido a você.', + ['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.', + ['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', - --Trabalho de Lenhador - ['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.', + -- Trabalho de Lenhador + ['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.', - --Pescador - ['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.', + -- Pescador + ['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.', - --Refinador - ['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.", + -- Refinador + ['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.", - --Minerador - ['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.', + -- Minerador + ['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.', - --Jornalista - ['reporter_name'] = 'Globo News', - ['reporter_garage'] = 'Pressione ~INPUT_PICKUP~ para descer à garagem.', + -- Jornalista + ['reporter_name'] = 'Globo News', + ['reporter_garage'] = 'Pressione ~INPUT_PICKUP~ para descer à garagem.', - --Abatedor - ['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.', + -- Abatedor + ['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.', - --Costureiro - ['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.', - } + -- Costureiro + ['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/de.lua b/locales/de.lua index f0979b94..dfb9d428 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,39 +1,39 @@ Locales['de'] = { - --Global menus - ['bank_deposit'] = 'eine Kaution von ~g~', - ['bank_deposit_r'] = 'eine Kaution von ~g~$', - ['bank_deposit2'] = '$ ~s~wurde nach deiner Ohmacht getätigt.', - ['bank_nodeposit'] = "du hast keine Sicherheiten", - ['foot_work'] = 'du musst zu Fuß sein um arbeiten zu können.', - ['next_point'] = 'gehe zum nächsten Schritt wenn du hier fertig bist.', - ['security_deposit'] = 'die Kaution beträgt ~g~$', - ['not_your_vehicle'] = "Das ist nicht dein Fahrzeug oder du musst der Fahrer sein.", - ['in_vehicle'] = 'du musst in einem Fahrzeug sein.', - ['wrong_point'] = "Du bist nicht am richtigen Punkt zum liefern.", - ['max_limit'] = 'Du hast das Maximum: ', - ['not_enough'] = "du hast nicht genug", - ['not_enough2'] = ' umd die Aktion fortzuführen.', - ['caution_taken'] = ' ~s~wurde von dir abgezogen.', - ['caution_returned'] = ' ~s~wurde dir zurück gegeben.', + -- Global menus + ['bank_deposit'] = 'eine Kaution von ~g~', + ['bank_deposit_r'] = 'eine Kaution von ~g~$', + ['bank_deposit2'] = '$ ~s~wurde nach deiner Ohmacht getätigt.', + ['bank_nodeposit'] = "du hast keine Sicherheiten", + ['foot_work'] = 'du musst zu Fuß sein um arbeiten zu können.', + ['next_point'] = 'gehe zum nächsten Schritt wenn du hier fertig bist.', + ['security_deposit'] = 'die Kaution beträgt ~g~$', + ['not_your_vehicle'] = "Das ist nicht dein Fahrzeug oder du musst der Fahrer sein.", + ['in_vehicle'] = 'du musst in einem Fahrzeug sein.', + ['wrong_point'] = "Du bist nicht am richtigen Punkt zum liefern.", + ['max_limit'] = 'Du hast das Maximum: ', + ['not_enough'] = "du hast nicht genug", + ['not_enough2'] = ' umd die Aktion fortzuführen.', + ['caution_taken'] = ' ~s~wurde von dir abgezogen.', + ['caution_returned'] = ' ~s~wurde dir zurück gegeben.', - --Lumber Jack job - ['lj_cr_title'] = 'Garderobe', - ['lj_cloakroom'] = 'Drücke ~INPUT_PICKUP~ um dich umzuziehen.', - ['lj_mapblip'] = 'Holzstappel', - ['lj_wood'] = 'Holz', - ['lj_pickup'] = 'Drücke ~INPUT_PICKUP~ um Holz zu bekommen.', - ['lj_cutwood'] = 'schlage Holz', - ['lj_cutwood_button'] = 'Drücke ~INPUT_PICKUP~ um Bäume zu fällen.', - ['lj_board'] = 'Bretter', - ['lj_planks'] = 'Bretterpaket', - ['lj_delivery'] = 'liefern', - ['lj_cutwood'] = 'Holz schneiden', - ['lj_pick_boards'] = 'Drücke ~INPUT_PICKUP~ um Bretter zu erhalten.', - ['lj_spawn_veh'] = 'Fahrzeug spawnen', - ['lj_spawn_veh_button'] = 'Drücke ~INPUT_PICKUP~ um das Lieferfahrzeug zu rufen.', - ['lj_service_vh'] = 'Service Fahrzeug', - ['lj_return_vh'] = 'Fahrzeug parken', - ['lj_delivery_point'] = 'Lieferpunkt', - ['lj_return_vh_button'] = 'Drücke ~INPUT_PICKUP~ um das Fahrzeug zu parken.', - ['lj_deliver_button'] = 'Drücke ~INPUT_PICKUP~ um die Bretter zu liefern.' + -- Lumber Jack job + ['lj_cr_title'] = 'Garderobe', + ['lj_cloakroom'] = 'Drücke ~INPUT_PICKUP~ um dich umzuziehen.', + ['lj_mapblip'] = 'Holzstappel', + ['lj_wood'] = 'Holz', + ['lj_pickup'] = 'Drücke ~INPUT_PICKUP~ um Holz zu bekommen.', + ['lj_cutwood'] = 'schlage Holz', + ['lj_cutwood_button'] = 'Drücke ~INPUT_PICKUP~ um Bäume zu fällen.', + ['lj_board'] = 'Bretter', + ['lj_planks'] = 'Bretterpaket', + ['lj_delivery'] = 'liefern', + ['lj_cutwood'] = 'Holz schneiden', + ['lj_pick_boards'] = 'Drücke ~INPUT_PICKUP~ um Bretter zu erhalten.', + ['lj_spawn_veh'] = 'Fahrzeug spawnen', + ['lj_spawn_veh_button'] = 'Drücke ~INPUT_PICKUP~ um das Lieferfahrzeug zu rufen.', + ['lj_service_vh'] = 'Service Fahrzeug', + ['lj_return_vh'] = 'Fahrzeug parken', + ['lj_delivery_point'] = 'Lieferpunkt', + ['lj_return_vh_button'] = 'Drücke ~INPUT_PICKUP~ um das Fahrzeug zu parken.', + ['lj_deliver_button'] = 'Drücke ~INPUT_PICKUP~ um die Bretter zu liefern.' } diff --git a/locales/en.lua b/locales/en.lua index adfc5c21..ef8b34e8 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,117 +1,117 @@ 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'] = 'a security deposit of ~g~', - ['bank_deposit_r'] = 'a security deposit of ~g~$', - ['bank_deposit2'] = '$ ~s~was made to you after your fainting.', - ['bank_nodeposit'] = "you did not have a security deposit", - ['foot_work'] = 'you have to be on foot to be able to work.', - ['next_point'] = 'go to the next step after completing this one.', - ['security_deposit'] = 'the security given will be ~g~$', - ['not_your_vehicle'] = "this is not your vehicle or you must be a driver.", - ['in_vehicle'] = 'you must be in a vehicle.', - ['wrong_point'] = "you are not at the right point of delivery.", - ['max_limit'] = 'you have the maximum: ', - ['not_enough'] = "you do not have enough", - ['not_enough2'] = ' to continue this task.', - ['caution_taken'] = ' ~s~was taken from you.', - ['caution_returned'] = ' ~s~was returned to you.', - ['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.', - ['service_vh'] = 'service vehicle', - ['return_vh'] = 'vehicle return', - ['return_vh_button'] = 'press ~INPUT_PICKUP~ to return the vehicle.', - ['delivery_point'] = 'delivery point', - ['delivery'] = 'delivery', + -- Global menus + ['cloakroom'] = 'Locker Room', + ['cloak_change'] = 'press ~INPUT_PICKUP~ to change clothes.', + ['citizen_wear'] = 'civilian clothes', + ['job_wear'] = 'workers clothes', + ['bank_deposit'] = 'a security deposit of ~g~', + ['bank_deposit_r'] = 'a security deposit of ~g~$', + ['bank_deposit2'] = '$ ~s~was made to you after your fainting.', + ['bank_nodeposit'] = "you did not have a security deposit", + ['foot_work'] = 'you have to be on foot to be able to work.', + ['next_point'] = 'go to the next step after completing this one.', + ['security_deposit'] = 'the security given will be ~g~$', + ['not_your_vehicle'] = "this is not your vehicle or you must be a driver.", + ['in_vehicle'] = 'you must be in a vehicle.', + ['wrong_point'] = "you are not at the right point of delivery.", + ['max_limit'] = 'you have the maximum: ', + ['not_enough'] = "you do not have enough", + ['not_enough2'] = ' to continue this task.', + ['caution_taken'] = ' ~s~was taken from you.', + ['caution_returned'] = ' ~s~was returned to you.', + ['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.', + ['service_vh'] = 'service vehicle', + ['return_vh'] = 'vehicle return', + ['return_vh_button'] = 'press ~INPUT_PICKUP~ to return the vehicle.', + ['delivery_point'] = 'delivery point', + ['delivery'] = 'delivery', - --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.', + -- 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.', - --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.', + -- 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.', - --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.', - ['f_deliver_gas'] = 'deliver Gas', - ['f_deliver_gas_button'] = "press ~INPUT_PICKUP~ to deliver gasoline.", + -- 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.', + ['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'] = ' washed rocks ', - ['m_rock_button'] = 'press ~INPUT_PICKUP~ to wash the rocks.', - ['m_rock_smelting'] = 'smelthing', - ['m_copper'] = ' copper', - ['m_sell_copper'] = 'sell copper', - ['m_deliver_copper'] = 'Press ~INPUT_PICKUP~ to deliver the copper.', - ['m_iron'] = ' iron', - ['m_sell_iron'] = 'sell iron', - ['m_deliver_iron'] = 'press ~INPUT_PICKUP~ to deliver the iron.', - ['m_gold'] = ' gold', - ['m_sell_gold'] = "sell gold", - ['m_deliver_gold'] = 'press ~INPUT_PICKUP~ to deliver the gold.', - ['m_diamond'] = ' diamond', - ['m_sell_diamond'] = 'sell diamond', - ['m_deliver_diamond'] = 'press ~INPUT_PICKUP~ to deliver the diamonds.', - ['m_melt_button'] = 'press ~INPUT_PICKUP~ to melt the rocks.', + -- Miner + ['m_miner_locker'] = "miner's Locker Room", + ['m_rock'] = ' rock', + ['m_pickrocks'] = 'press ~INPUT_PICKUP~ to retrieve rocks.', + ['m_washrock'] = ' washed rocks ', + ['m_rock_button'] = 'press ~INPUT_PICKUP~ to wash the rocks.', + ['m_rock_smelting'] = 'smelthing', + ['m_copper'] = ' copper', + ['m_sell_copper'] = 'sell copper', + ['m_deliver_copper'] = 'Press ~INPUT_PICKUP~ to deliver the copper.', + ['m_iron'] = ' iron', + ['m_sell_iron'] = 'sell iron', + ['m_deliver_iron'] = 'press ~INPUT_PICKUP~ to deliver the iron.', + ['m_gold'] = ' gold', + ['m_sell_gold'] = "sell gold", + ['m_deliver_gold'] = 'press ~INPUT_PICKUP~ to deliver the gold.', + ['m_diamond'] = ' diamond', + ['m_sell_diamond'] = 'sell diamond', + ['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 + ['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.', + -- 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.', - --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.', - } + -- 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.', + } diff --git a/locales/fr.lua b/locales/fr.lua index d21b56db..17b1464e 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,116 +1,116 @@ 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'] = 'une caution de ~g~', - ['bank_deposit_r'] = 'une caution de ~g~$', - ['bank_deposit2'] = '$ ~s~vous a été rendue suite à votre évanouissment.', - ['bank_nodeposit'] = "vous n'aviez pas de caution", - ['foot_work'] = 'vous devez être à pied pour pouvoir travailler.', - ['next_point'] = 'rendez-vous à la prochaine étape après avoir complété celle-ci.', - ['security_deposit'] = 'la caution rendue sera de ~g~$', - ['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: ', - ['not_enough'] = "vous n'avez plus assez de", - ['not_enough2'] = ' pour continuer cette tâche.', - ['caution_taken'] = ' ~s~vous a été prélevée.', - ['caution_returned'] = ' ~s~vous a été rendue.', - ['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.', - ['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', + -- Global menus + ['cloakroom'] = 'vestiaire', + ['cloak_change'] = 'appuyez sur ~INPUT_PICKUP~ pour vous changer.', + ['citizen_wear'] = 'tenue civile', + ['job_wear'] = 'tenue de travail', + ['bank_deposit'] = 'une caution de ~g~', + ['bank_deposit_r'] = 'une caution de ~g~$', + ['bank_deposit2'] = '$ ~s~vous a été rendue suite à votre évanouissment.', + ['bank_nodeposit'] = "vous n'aviez pas de caution", + ['foot_work'] = 'vous devez être à pied pour pouvoir travailler.', + ['next_point'] = 'rendez-vous à la prochaine étape après avoir complété celle-ci.', + ['security_deposit'] = 'la caution rendue sera de ~g~$', + ['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: ', + ['not_enough'] = "vous n'avez plus assez de", + ['not_enough2'] = ' pour continuer cette tâche.', + ['caution_taken'] = ' ~s~vous a été prélevée.', + ['caution_returned'] = ' ~s~vous a été rendue.', + ['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.', + ['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', - --Lumber Jack job - ['lj_locker_room'] = "lumberjack's Locker Room", - ['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.', + -- Lumber Jack job + ['lj_locker_room'] = "lumberjack's Locker Room", + ['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'] = "fishermen's Locker Room", - ['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.', + -- Fisherman + ['fm_fish_locker'] = "fishermen's Locker Room", + ['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'] = 'oil Refiner Locker Room', - ['f_drill_oil'] = 'drill for oil', - ['f_fuel'] = 'pétrol', - ['f_drillbutton'] = 'appuyez sur ~INPUT_PICKUP~ pour forer.', - ['f_fuel_refine'] = 'pétrol raffiné', - ['f_refine_fuel_button'] = 'press ~ INPUT_PICKUP ~ to refine.', - ['f_fuel_mixture'] = 'mélange', - ['f_gas'] = 'essence', - ['f_fuel_mixture_button'] = 'appuyez sur ~INPUT_PICKUP~ pour mélanger.', - ['f_deliver_gas'] = "appuyez sur ~INPUT_PICKUP~ pour livrer l'essence.", + -- Fuel + ['f_oil_refiner'] = 'oil Refiner Locker Room', + ['f_drill_oil'] = 'drill for oil', + ['f_fuel'] = 'pétrol', + ['f_drillbutton'] = 'appuyez sur ~INPUT_PICKUP~ pour forer.', + ['f_fuel_refine'] = 'pétrol raffiné', + ['f_refine_fuel_button'] = 'press ~ INPUT_PICKUP ~ to refine.', + ['f_fuel_mixture'] = 'mélange', + ['f_gas'] = 'essence', + ['f_fuel_mixture_button'] = 'appuyez sur ~INPUT_PICKUP~ pour mélanger.', + ['f_deliver_gas'] = "appuyez sur ~INPUT_PICKUP~ pour livrer l'essence.", - --miner - ['m_miner_locker'] = "miner's Locker Room", - ['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.', + -- Miner + ['m_miner_locker'] = "miner's Locker Room", + ['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 + ['reporter_name'] = 'le Maclerait Libéré', + ['reporter_garage'] = 'appuyez sur ~INPUT_PICKUP~ pour descendre au garage.', - --slaughterer - ['s_slaughter_locker'] = "butcher's Locker Room", - ['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.', + -- Slaughterer + ['s_slaughter_locker'] = "butcher's Locker Room", + ['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'] = "dress Designer's Locker Room", - ['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.', + -- Dress Designer + ['dd_dress_locker'] = "dress Designer's Locker Room", + ['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/localization/br_config.lua b/localization/br_config.lua index 5425e477..ba5432d5 100644 --- a/localization/br_config.lua +++ b/localization/br_config.lua @@ -3,43 +3,43 @@ Config.DrawDistance = 1000.0 Config.Locale = 'br' Config.Plates = { - taxi = "TAXI", - fisherman = "PESCA", - cop = "LSPD", - ambulance = "SAMU", - depanneur = "MECA", - fuel = "REFINA", - lumberjack = "LENHA", - miner = "MINE", - reporter = "JORN", - slaughterer = "ABAT", - textil = "COST" + taxi = "TAXI", + fisherman = "PESCA", + cop = "LSPD", + ambulance = "SAMU", + depanneur = "MECA", + fuel = "REFINA", + lumberjack = "LENHA", + miner = "MINE", + reporter = "JORN", + slaughterer = "ABAT", + textil = "COST" } Config.Jobs = {} Config.PublicZones = { - EnterBuilding = { - Pos = { x = -118.21381378174, y = -607.14227294922, z = 35.280723571777 }, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = "Globo News", - Type = "teleport", - Hint = "Pressione ~INPUT_PICKUP~ para entrar no prédio.", - Teleport = { x = -139.09838867188, y = -620.74865722656, z = 167.82052612305 } - }, + EnterBuilding = { + Pos = { x = -118.21381378174, y = -607.14227294922, z = 35.280723571777 }, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = false, + Name = "Globo News", + Type = "teleport", + Hint = "Pressione ~INPUT_PICKUP~ para entrar no prédio.", + Teleport = { x = -139.09838867188, y = -620.74865722656, z = 167.82052612305 } + }, - ExitBuilding = { - Pos = { x = -139.45831298828, y = -617.32312011719, z = 167.82052612305 }, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = "Globo News", - Type = "teleport", - Hint = "pressione ~INPUT_PICKUP~ para ir à entrada do edifício.", - Teleport = { x = -113.07, y = -604.93, z = 35.28 }, - }, + ExitBuilding = { + Pos = { x = -139.45831298828, y = -617.32312011719, z = 167.82052612305 }, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = false, + Name = "Globo News", + Type = "teleport", + Hint = "pressione ~INPUT_PICKUP~ para ir à entrada do edifício.", + Teleport = { x = -113.07, y = -604.93, z = 35.28 }, + }, } diff --git a/localization/br_esx_jobs.sql b/localization/br_esx_jobs.sql index b56b96f9..8133a63b 100644 --- a/localization/br_esx_jobs.sql +++ b/localization/br_esx_jobs.sql @@ -21,29 +21,29 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_ ('fisherman', 0, 'interim', 'Temporario', 0, '{}', '{}'), ('fuel', 0, 'interim', 'Temporario', 0, '{}', '{}'), ('reporter', 0, 'employee', 'Temporario', 0, '{}', '{}'), - ('textil',0,'interim','Temporario',0,'{\"mask_1\":0,\"arms\":1,\"glasses_1\":0,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":0,\"torso_1\":24,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":0,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":0,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":36,\"tshirt_2\":0,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":48,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}','{\"mask_1\":0,\"arms\":5,\"glasses_1\":5,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":1,\"torso_1\":52,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":1,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":23,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":42,\"tshirt_2\":4,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":36,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}'), + ('textil',0,'interim','Temporario',0,'{\"mask_1\":0,\"arms\":1,\"glasses_1\":0,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":0,\"torso_1\":24,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":0,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":0,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":36,\"tshirt_2\":0,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":48,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}','{\"mask_1\":0,\"arms\":5,\"glasses_1\":5,\"hair_color_2\":4,\"makeup_1\":0,\"face\":19,\"glasses\":0,\"mask_2\":0,\"makeup_3\":0,\"skin\":29,\"helmet_2\":0,\"lipstick_4\":0,\"sex\":1,\"torso_1\":52,\"makeup_2\":0,\"bags_2\":0,\"chain_2\":0,\"ears_1\":-1,\"bags_1\":0,\"bproof_1\":0,\"shoes_2\":1,\"lipstick_2\":0,\"chain_1\":0,\"tshirt_1\":23,\"eyebrows_3\":0,\"pants_2\":0,\"beard_4\":0,\"torso_2\":0,\"beard_2\":6,\"ears_2\":0,\"hair_2\":0,\"shoes_1\":42,\"tshirt_2\":4,\"beard_3\":0,\"hair_1\":2,\"hair_color_1\":0,\"pants_1\":36,\"helmet_1\":-1,\"bproof_2\":0,\"eyebrows_4\":0,\"eyebrows_2\":0,\"decals_1\":0,\"age_2\":0,\"beard_1\":5,\"shoes\":10,\"lipstick_1\":0,\"eyebrows_1\":0,\"glasses_2\":0,\"makeup_4\":0,\"decals_2\":0,\"lipstick_3\":0,\"age_1\":0}'), ('miner', 0, 'interim', 'Temporario', 0, '{"tshirt_2":1,"ears_1":8,"glasses_1":15,"torso_2":0,"ears_2":2,"glasses_2":3,"shoes_2":1,"pants_1":75,"shoes_1":51,"bags_1":0,"helmet_2":0,"pants_2":7,"torso_1":71,"tshirt_1":59,"arms":2,"bags_2":0,"helmet_1":0}', '{}'), - ('slaughterer',0,'interim','Temporario',0,'{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":67,\"pants_1\":36,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":0,\"torso_1\":56,\"beard_2\":6,\"shoes_1\":12,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":15,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":0,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}','{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":72,\"pants_1\":45,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":1,\"torso_1\":49,\"beard_2\":6,\"shoes_1\":24,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":9,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":5,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}') + ('slaughterer',0,'interim','Temporario',0,'{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":67,\"pants_1\":36,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":0,\"torso_1\":56,\"beard_2\":6,\"shoes_1\":12,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":15,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":0,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}','{\"age_1\":0,\"glasses_2\":0,\"beard_1\":5,\"decals_2\":0,\"beard_4\":0,\"shoes_2\":0,\"tshirt_2\":0,\"lipstick_2\":0,\"hair_2\":0,\"arms\":72,\"pants_1\":45,\"skin\":29,\"eyebrows_2\":0,\"shoes\":10,\"helmet_1\":-1,\"lipstick_1\":0,\"helmet_2\":0,\"hair_color_1\":0,\"glasses\":0,\"makeup_4\":0,\"makeup_1\":0,\"hair_1\":2,\"bproof_1\":0,\"bags_1\":0,\"mask_1\":0,\"lipstick_3\":0,\"chain_1\":0,\"eyebrows_4\":0,\"sex\":1,\"torso_1\":49,\"beard_2\":6,\"shoes_1\":24,\"decals_1\":0,\"face\":19,\"lipstick_4\":0,\"tshirt_1\":9,\"mask_2\":0,\"age_2\":0,\"eyebrows_3\":0,\"chain_2\":0,\"glasses_1\":5,\"ears_1\":-1,\"bags_2\":0,\"ears_2\":0,\"torso_2\":0,\"bproof_2\":0,\"makeup_2\":0,\"eyebrows_1\":0,\"makeup_3\":0,\"pants_2\":0,\"beard_3\":0,\"hair_color_2\":4}') ; INSERT INTO `items` (`name`, `label`) VALUES - ('alive_chicken', 'Frango Vivo'), - ('slaughtered_chicken', 'Frango Abatido'), - ('packaged_chicken', 'Frango na Bandeja'), - ('fish', 'Peixe'), - ('stone', 'Pedra'), - ('washed_stone', 'Pedra Limpa'), - ('copper', 'Cobre'), - ('iron', 'Ferro'), - ('gold', 'Ouro'), - ('diamond', 'Diamante'), - ('wood', 'Madeira'), - ('cutted_wood', 'Madeira Cortada'), - ('packaged_plank', 'Tábua Embalada'), - ('petrol', 'Petroleo'), - ('petrol_raffin', 'Petroleo Refinado'), - ('essence', 'Gasolina'), - ('whool', 'Lã'), - ('fabric', 'Tecido'), - ('clothe', 'Roupa') + ('alive_chicken', 'Frango Vivo'), + ('slaughtered_chicken', 'Frango Abatido'), + ('packaged_chicken', 'Frango na Bandeja'), + ('fish', 'Peixe'), + ('stone', 'Pedra'), + ('washed_stone', 'Pedra Limpa'), + ('copper', 'Cobre'), + ('iron', 'Ferro'), + ('gold', 'Ouro'), + ('diamond', 'Diamante'), + ('wood', 'Madeira'), + ('cutted_wood', 'Madeira Cortada'), + ('packaged_plank', 'Tábua Embalada'), + ('petrol', 'Petroleo'), + ('petrol_raffin', 'Petroleo Refinado'), + ('essence', 'Gasolina'), + ('whool', 'Lã'), + ('fabric', 'Tecido'), + ('clothe', 'Roupa') ; diff --git a/localization/de_config.lua b/localization/de_config.lua index aa13284a..18bae48b 100644 --- a/localization/de_config.lua +++ b/localization/de_config.lua @@ -3,43 +3,43 @@ Config.DrawDistance = 1000.0 Config.Locale = 'de' Config.Plates = { - taxi = "TAXI", - fisherman = "FISH", - cop = "LSPD", - ambulance = "EMS", - depanneur = "MECA", - fuel = "FUEL", - lumberjack = "BUCH", - miner = "MINE", - reporter = "JOUR", - slaughterer = "ABAT", - textil = "COUT" + taxi = "TAXI", + fisherman = "FISH", + cop = "LSPD", + ambulance = "EMS", + depanneur = "MECA", + fuel = "FUEL", + lumberjack = "BUCH", + miner = "MINE", + reporter = "JOUR", + slaughterer = "ABAT", + textil = "COUT" } Config.Jobs = {} Config.PublicZones = { - EnterBuilding = { - Pos = { x = -118.21381378174, y = -607.14227294922, z = 35.280723571777 }, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = "Arbeitsamt", - Type = "teleport", - Hint = "Drücke ~INPUT_PICKUP~ um das Gebäude zu betreten.", - Teleport = { x = -139.09838867188, y = -620.74865722656, z = 167.82052612305 } - }, + EnterBuilding = { + Pos = { x = -118.21381378174, y = -607.14227294922, z = 35.280723571777 }, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = false, + Name = "Arbeitsamt", + Type = "teleport", + Hint = "Drücke ~INPUT_PICKUP~ um das Gebäude zu betreten.", + Teleport = { x = -139.09838867188, y = -620.74865722656, z = 167.82052612305 } + }, - ExitBuilding = { - Pos = { x = -139.45831298828, y = -617.32312011719, z = 167.82052612305 }, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = "Arbeitsamt", - Type = "teleport", - Hint = "Drücke ~INPUT_PICKUP~ um das Gebäude zu verlassen.", - Teleport = { x = -113.07, y = -604.93, z = 35.28 }, - }, + ExitBuilding = { + Pos = { x = -139.45831298828, y = -617.32312011719, z = 167.82052612305 }, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = false, + Name = "Arbeitsamt", + Type = "teleport", + Hint = "Drücke ~INPUT_PICKUP~ um das Gebäude zu verlassen.", + Teleport = { x = -113.07, y = -604.93, z = 35.28 }, + }, } diff --git a/localization/de_esx_jobs.sql b/localization/de_esx_jobs.sql index 5796899c..6cf907a3 100644 --- a/localization/de_esx_jobs.sql +++ b/localization/de_esx_jobs.sql @@ -27,23 +27,23 @@ INSERT INTO `job_grades` (job_name, grade, name, label, salary, skin_male, skin_ ; INSERT INTO `items` (`name`, `label`) VALUES - ('alive_chicken', 'lebendes Huhn'), - ('slaughtered_chicken', 'geschlachtetes Huhn'), - ('packaged_chicken', 'Hähnchenfilet'), - ('fish', 'Fisch'), - ('stone', 'Felsbrocken'), - ('washed_stone', 'gewaschener Felsbrocken'), - ('copper', 'Kupfer'), - ('iron', 'Eisen'), - ('gold', 'Gold'), - ('diamond', 'Diamant'), - ('wood', 'Holz'), - ('cutted_wood', 'Holzstämme'), - ('packaged_plank', 'Bretterpaket'), - ('petrol', 'Öl'), - ('petrol_raffin', 'bearbeitetes Öl'), - ('essence', 'Benzin'), - ('whool', 'Wolle'), - ('fabric', 'Tuch'), - ('clothe', 'Kleidung') -; \ No newline at end of file + ('alive_chicken', 'lebendes Huhn'), + ('slaughtered_chicken', 'geschlachtetes Huhn'), + ('packaged_chicken', 'Hähnchenfilet'), + ('fish', 'Fisch'), + ('stone', 'Felsbrocken'), + ('washed_stone', 'gewaschener Felsbrocken'), + ('copper', 'Kupfer'), + ('iron', 'Eisen'), + ('gold', 'Gold'), + ('diamond', 'Diamant'), + ('wood', 'Holz'), + ('cutted_wood', 'Holzstämme'), + ('packaged_plank', 'Bretterpaket'), + ('petrol', 'Öl'), + ('petrol_raffin', 'bearbeitetes Öl'), + ('essence', 'Benzin'), + ('whool', 'Wolle'), + ('fabric', 'Tuch'), + ('clothe', 'Kleidung') +; diff --git a/localization/en_config.lua b/localization/en_config.lua index 0c0109ba..d75e9e69 100644 --- a/localization/en_config.lua +++ b/localization/en_config.lua @@ -3,43 +3,43 @@ Config.DrawDistance = 1000.0 Config.Locale = 'en' Config.Plates = { - taxi = "TAXI", - fisherman = "FISH", - cop = "LSPD", - ambulance = "EMS", - depanneur = "MECA", - fuel = "FUEL", - lumberjack = "BUCH", - miner = "MINE", - reporter = "JOUR", - slaughterer = "ABAT", - textil = "COUT" + taxi = "TAXI", + fisherman = "FISH", + cop = "LSPD", + ambulance = "EMS", + depanneur = "MECA", + fuel = "FUEL", + lumberjack = "BUCH", + miner = "MINE", + reporter = "JOUR", + slaughterer = "ABAT", + textil = "COUT" } Config.Jobs = {} Config.PublicZones = { - EnterBuilding = { - Pos = { x = -118.21381378174, y = -607.14227294922, z = 35.280723571777 }, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = "San Andreas Times", - Type = "teleport", - Hint = "Press ~INPUT_PICKUP~ to enter the building.", - Teleport = { x = -139.09838867188, y = -620.74865722656, z = 167.82052612305 } - }, + EnterBuilding = { + Pos = { x = -118.21381378174, y = -607.14227294922, z = 35.280723571777 }, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = false, + Name = "San Andreas Times", + Type = "teleport", + Hint = "Press ~INPUT_PICKUP~ to enter the building.", + Teleport = { x = -139.09838867188, y = -620.74865722656, z = 167.82052612305 } + }, - ExitBuilding = { - Pos = { x = -139.45831298828, y = -617.32312011719, z = 167.82052612305 }, - Size = {x = 3.0, y = 3.0, z = 0.2}, - Color = {r = 204, g = 204, b = 0}, - Marker= 1, - Blip = false, - Name = "San Andreas Times", - Type = "teleport", - Hint = "Press ~INPUT_PICKUP~ to go to the entrance of the building.", - Teleport = { x = -113.07, y = -604.93, z = 35.28 }, - }, + ExitBuilding = { + Pos = { x = -139.45831298828, y = -617.32312011719, z = 167.82052612305 }, + Size = {x = 3.0, y = 3.0, z = 0.2}, + Color = {r = 204, g = 204, b = 0}, + Marker= 1, + Blip = false, + Name = "San Andreas Times", + Type = "teleport", + Hint = "Press ~INPUT_PICKUP~ to go to the entrance of the building.", + Teleport = { x = -113.07, y = -604.93, z = 35.28 }, + }, } diff --git a/server/esx_jobs_sv.lua b/server/esx_jobs_sv.lua index 30d25704..bc5a8360 100644 --- a/server/esx_jobs_sv.lua +++ b/server/esx_jobs_sv.lua @@ -5,121 +5,121 @@ ESX = nil TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) AddEventHandler('esx:playerLoaded', function(source) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) - xPlayer.set('caution', 0) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + xPlayer.set('caution', 0) end) AddEventHandler('esx:playerDropped', function(source) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) - local caution = xPlayer.get('caution') - TriggerEvent('esx_addonaccount:getAccount', 'caution', xPlayer.identifier, function(account) - account.addMoney(caution) - end) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + local caution = xPlayer.get('caution') + TriggerEvent('esx_addonaccount:getAccount', 'caution', xPlayer.identifier, function(account) + account.addMoney(caution) + end) end) RegisterServerEvent('esx_jobs:setCautionInCaseOfDrop') AddEventHandler('esx_jobs:setCautionInCaseOfDrop', function(caution) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) - xPlayer.set('caution', caution) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + xPlayer.set('caution', caution) end) RegisterServerEvent('esx_jobs:giveBackCautionInCaseOfDrop') AddEventHandler('esx_jobs:giveBackCautionInCaseOfDrop', function() - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) - TriggerEvent('esx_addonaccount:getAccount', 'caution', xPlayer.identifier, function(account) - local caution = account.money - account.removeMoney(caution) - if caution > 0 then - xPlayer.addAccountMoney('bank', caution) - TriggerClientEvent('esx:showNotification', _source, _U('bank_deposit_g').. caution .. _U('bank_deposit2')) - else - TriggerClientEvent('esx:showNotification', _source, _U('bank_nodeposit')) - end - end) + TriggerEvent('esx_addonaccount:getAccount', 'caution', xPlayer.identifier, function(account) + local caution = account.money + account.removeMoney(caution) + if caution > 0 then + xPlayer.addAccountMoney('bank', caution) + TriggerClientEvent('esx:showNotification', _source, _U('bank_deposit_g').. caution .. _U('bank_deposit2')) + else + TriggerClientEvent('esx:showNotification', _source, _U('bank_nodeposit')) + end + end) end) local function Work(source, item) - SetTimeout(item[1].time, function() + SetTimeout(item[1].time, function() - if PlayersWorking[source] == true then + if PlayersWorking[source] == true then - local xPlayer = ESX.GetPlayerFromId(source) + local xPlayer = ESX.GetPlayerFromId(source) - 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 + 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 - local requiredItemQtty = 0 - if item[1].requires ~= "nothing" then - requiredItemQtty = xPlayer.getInventoryItem(item[1].requires).count - end + local requiredItemQtty = 0 + 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 - TriggerClientEvent('esx:showNotification', source, _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 .. _U('not_enough2')) - 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) - end - end - else - xPlayer.addMoney(item[i].price) - end + if item[i].name ~= _U('delivery') and itemQtty >= item[i].max then + TriggerClientEvent('esx:showNotification', source, _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 .. _U('not_enough2')) + 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) + end + end + else + xPlayer.addMoney(item[i].price) + end - end - end + end + 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) + 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) - local source = source - PlayersWorking[source] = true - Work(source, item) + local source = source + PlayersWorking[source] = true + Work(source, item) end) RegisterServerEvent('esx_jobs:stopWork') AddEventHandler('esx_jobs:stopWork', function() - local source = source - PlayersWorking[source] = false + local source = source + PlayersWorking[source] = false end) RegisterServerEvent('esx_jobs:caution') AddEventHandler('esx_jobs:caution', function(cautionType, cautionAmount, spawnPoint, vehicle) - local source = source - local xPlayer = ESX.GetPlayerFromId(source) - if cautionType == "take" then - xPlayer.removeAccountMoney('bank', cautionAmount) - xPlayer.set('caution', cautionAmount) - TriggerClientEvent('esx:showNotification', source, _U('bank_deposit_r') .. cautionAmount .. _U('caution_taken')) - TriggerClientEvent('esx_jobs:spawnJobVehicle', source, spawnPoint, vehicle) - elseif cautionType == "give_back" then - xPlayer.addAccountMoney('bank', cautionAmount) - xPlayer.set('caution', 0) - TriggerClientEvent('esx:showNotification', source, _U('bank_deposit_g') .. cautionAmount .. _U('caution_returned')) - end + local source = source + local xPlayer = ESX.GetPlayerFromId(source) + if cautionType == "take" then + xPlayer.removeAccountMoney('bank', cautionAmount) + xPlayer.set('caution', cautionAmount) + TriggerClientEvent('esx:showNotification', source, _U('bank_deposit_r') .. cautionAmount .. _U('caution_taken')) + TriggerClientEvent('esx_jobs:spawnJobVehicle', source, spawnPoint, vehicle) + elseif cautionType == "give_back" then + xPlayer.addAccountMoney('bank', cautionAmount) + xPlayer.set('caution', 0) + TriggerClientEvent('esx:showNotification', source, _U('bank_deposit_g') .. cautionAmount .. _U('caution_returned')) + end end)