From 53d2aa56ee55537041db23c8db5bf90d1aa60f58 Mon Sep 17 00:00:00 2001 From: Amir_Lynx <60301485+AmirLynx@users.noreply.github.com> Date: Sat, 29 Oct 2022 17:26:49 +0330 Subject: [PATCH 01/58] change isControlePress to registerInput --- [esx]/esx_menu_default/client/main.lua | 124 ++++++++++++++----------- 1 file changed, 68 insertions(+), 56 deletions(-) diff --git a/[esx]/esx_menu_default/client/main.lua b/[esx]/esx_menu_default/client/main.lua index d214c153..65d62d09 100644 --- a/[esx]/esx_menu_default/client/main.lua +++ b/[esx]/esx_menu_default/client/main.lua @@ -1,7 +1,8 @@ -local GUI, MenuType, OpenedMenus = {}, 'default', 0 +local GUI, MenuType, OpenedMenus, CurrentNameSpace = {}, 'default', 0, nil GUI.Time = 0 local function openMenu(namespace, name, data) + CurrentNameSpace = namespace OpenedMenus += 1 SendNUIMessage({ action = 'openMenu', @@ -12,6 +13,7 @@ local function openMenu(namespace, name, data) end local function closeMenu(namespace, name) + CurrentNameSpace = namespace OpenedMenus -= 1 SendNUIMessage({ action = 'closeMenu', @@ -20,6 +22,14 @@ local function closeMenu(namespace, name) }) end +AddEventHandler('onResourceStop', function(resource) + if GetCurrentResourceName() == resource and OpenedMenus > 0 then + ESX.UI.Menu.CloseAll() + elseif CurrentNameSpace ~= nil and CurrentNameSpace == resource and OpenedMenus > 0 then + ESX.UI.Menu.CloseAll() + end +end) + ESX.UI.Menu.RegisterType(MenuType, openMenu, closeMenu) RegisterNUICallback('menu_submit', function(data, cb) @@ -58,60 +68,62 @@ RegisterNUICallback('menu_change', function(data, cb) cb('OK') end) -CreateThread(function() - while true do - local Sleep = 500 - - if OpenedMenus > 0 then - Sleep = 10 - if IsControlPressed(0, 18) and IsUsingKeyboard(0) and (GetGameTimer() - GUI.Time) > 200 then - SendNUIMessage({ - action = 'controlPressed', - control = 'ENTER' - }) - GUI.Time = GetGameTimer() - end - - if IsControlPressed(0, 177) and IsUsingKeyboard(0) and (GetGameTimer() - GUI.Time) > 200 then - SendNUIMessage({ - action = 'controlPressed', - control = 'BACKSPACE' - }) - GUI.Time = GetGameTimer() - end - - if IsControlPressed(0, 27) and IsUsingKeyboard(0) and (GetGameTimer() - GUI.Time) > 200 then - SendNUIMessage({ - action = 'controlPressed', - control = 'TOP' - }) - GUI.Time = GetGameTimer() - end - - if IsControlPressed(0, 173) and IsUsingKeyboard(0) and (GetGameTimer() - GUI.Time) > 200 then - SendNUIMessage({ - action = 'controlPressed', - control = 'DOWN' - }) - GUI.Time = GetGameTimer() - end - - if IsControlPressed(0, 174) and IsUsingKeyboard(0) and (GetGameTimer() - GUI.Time) > 200 then - SendNUIMessage({ - action = 'controlPressed', - control = 'LEFT' - }) - GUI.Time = GetGameTimer() - end - - if IsControlPressed(0, 175) and IsUsingKeyboard(0) and (GetGameTimer() - GUI.Time) > 200 then - SendNUIMessage({ - action = 'controlPressed', - control = 'RIGHT' - }) - GUI.Time = GetGameTimer() - end - end - Wait(Sleep) +ESX.RegisterInput('menu_default_enter', 'Submit menu item', 'keyboard', 'RETURN', function() + if OpenedMenus > 0 and (GetGameTimer() - GUI.Time) > 200 then + SendNUIMessage({ + action = 'controlPressed', + control = 'ENTER' + }) + GUI.Time = GetGameTimer() end end) + +ESX.RegisterInput('menu_default_backspace', 'Close menu', 'keyboard', 'BACK', function() + if OpenedMenus > 0 then + SendNUIMessage({ + action = 'controlPressed', + control = 'BACKSPACE' + }) + GUI.Time = GetGameTimer() + end +end) + +ESX.RegisterInput('menu_default_top', 'Change menu focus to top item', 'keyboard', 'UP', function() + if OpenedMenus > 0 then + SendNUIMessage({ + action = 'controlPressed', + control = 'TOP' + }) + GUI.Time = GetGameTimer() + end +end) + +ESX.RegisterInput('menu_default_down', 'Change menu focus to down item', 'keyboard', 'DOWN', function() + if OpenedMenus > 0 then + SendNUIMessage({ + action = 'controlPressed', + control = 'DOWN' + }) + GUI.Time = GetGameTimer() + end +end) + +ESX.RegisterInput('menu_default_left', 'Change menu slider to left', 'keyboard', 'LEFT', function() + if OpenedMenus > 0 then + SendNUIMessage({ + action = 'controlPressed', + control = 'LEFT' + }) + GUI.Time = GetGameTimer() + end +end) + +ESX.RegisterInput('menu_default_right', 'Change menu slider to right', 'keyboard', 'RIGHT', function() + if OpenedMenus > 0 then + SendNUIMessage({ + action = 'controlPressed', + control = 'RIGHT' + }) + GUI.Time = GetGameTimer() + end +end) \ No newline at end of file From 92b111cbc08b44c3ffcf1890a7f58c67b01aff07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?AL1=C6=8EN?= <72218928+johnsoul777@users.noreply.github.com> Date: Wed, 28 Dec 2022 12:44:39 +0100 Subject: [PATCH 02/58] Fix Translate Saving Fix Translate Saving --- [esx_addons]/esx_property/server/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx_addons]/esx_property/server/main.lua b/[esx_addons]/esx_property/server/main.lua index fc55b196..debf9aae 100644 --- a/[esx_addons]/esx_property/server/main.lua +++ b/[esx_addons]/esx_property/server/main.lua @@ -1125,7 +1125,7 @@ end) CreateThread(function() while true do Wait(60000 * Config.SaveInterval) - PropertySave(TranslateCap("interval_save")) + PropertySave(TranslateCap("interval_saving")) end end) From e6481e106e5771279ce442c2876842495d27f662 Mon Sep 17 00:00:00 2001 From: Cartman117 <121615906+Cartman117@users.noreply.github.com> Date: Thu, 29 Dec 2022 13:42:48 +0100 Subject: [PATCH 03/58] fix(esx_mechanicjob): Spawn vehicule from garage If Config.EnableSocietyOwnedVehicles = true, spawning vehicule from garage wasn't possible because element.value = 'vehicle_list' but we want vehicule's informations (element2.value) --- [esx_addons]/esx_mechanicjob/client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx_addons]/esx_mechanicjob/client/main.lua b/[esx_addons]/esx_mechanicjob/client/main.lua index bb085d7d..85fccc2c 100644 --- a/[esx_addons]/esx_mechanicjob/client/main.lua +++ b/[esx_addons]/esx_mechanicjob/client/main.lua @@ -88,7 +88,7 @@ function OpenMechanicActionsMenu() ESX.OpenContext("right", elements2, function(menu2,element2) ESX.CloseContext() - local vehicleProps = element.value + local vehicleProps = element2.value ESX.Game.SpawnVehicle(vehicleProps.model, Config.Zones.VehicleSpawnPoint.Pos, 270.0, function(vehicle) ESX.Game.SetVehicleProperties(vehicle, vehicleProps) From 81306d503be75907e515ceb071f12d86b92c3738 Mon Sep 17 00:00:00 2001 From: Cartman117 <121615906+Cartman117@users.noreply.github.com> Date: Thu, 29 Dec 2022 14:02:01 +0100 Subject: [PATCH 04/58] fix(esx_mechanicjob): French translation --- [esx_addons]/esx_mechanicjob/locales/fr.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/[esx_addons]/esx_mechanicjob/locales/fr.lua b/[esx_addons]/esx_mechanicjob/locales/fr.lua index eb9283bd..5327a6e7 100644 --- a/[esx_addons]/esx_mechanicjob/locales/fr.lua +++ b/[esx_addons]/esx_mechanicjob/locales/fr.lua @@ -19,7 +19,7 @@ Locales['fr'] = { ['gas_can'] = 'Bouteille de gaz', ['repair_tools'] = 'Outils réparation', ['body_work_tools'] = 'Outils carosserie', - ['blowtorch'] = 'chalumeaux', + ['blowtorch'] = 'chalumeau', ['repair_kit'] = 'kit réparation', ['body_kit'] = 'kit carosserie', ['craft'] = 'établi', @@ -47,7 +47,7 @@ Locales['fr'] = { ['no_veh_att'] = 'il n\'y a ~r~pas de véhicule à attacher', ['not_right_veh'] = 'ce n\'est pas le bon véhicule', ['veh_det_succ'] = 'vehicule détaché avec succès!', - ['imp_flatbed'] = '~r~Impossible! Vous devez avoir un Flatbed pour ça', + ['imp_flatbed'] = '~r~Impossible! Vous devez avoir un Plateau pour ça', ['objects'] = 'objets', ['roadcone'] = 'plot', ['toolbox'] = 'boîte à outils', @@ -63,7 +63,7 @@ Locales['fr'] = { ['press_remove_obj'] = 'appuyez sur [E] pour enlever l\'objet', ['please_tow'] = 'veuillez remorquer le véhicule', ['wait_five'] = 'Vous devez ~r~attendre 5 minutes', - ['must_in_flatbed'] = 'Vous devez être en flatbed pour commencer la mission', + ['must_in_flatbed'] = 'Vous devez être à bord d\'un Plateau pour commencer la mission', ['not_right_place'] = 'Vous devez être au bon endroit pour faire cela', ['mechanic_customer'] = 'client mecano', ['you_do_not_room'] = '~r~Vous n\'avez plus de place', From 43f44a052f5195b26b2dfc8618cb65390cf1ae76 Mon Sep 17 00:00:00 2001 From: Csoki Date: Fri, 30 Dec 2022 09:43:27 +0100 Subject: [PATCH 05/58] refactor(esx_vehicleshop): GeneratePlate(), IsPlateTaken() --- [esx_addons]/esx_vehicleshop/client/utils.lua | 48 +++++-------------- 1 file changed, 11 insertions(+), 37 deletions(-) diff --git a/[esx_addons]/esx_vehicleshop/client/utils.lua b/[esx_addons]/esx_vehicleshop/client/utils.lua index ef2a9f51..6d05de30 100644 --- a/[esx_addons]/esx_vehicleshop/client/utils.lua +++ b/[esx_addons]/esx_vehicleshop/client/utils.lua @@ -7,27 +7,13 @@ for i = 65, 90 do table.insert(Charset, string.char(i)) end for i = 97, 122 do table.insert(Charset, string.char(i)) end function GeneratePlate() - local generatedPlate - local doBreak = false + math.randomseed(GetGameTimer()) - while true do - Wait(0) - math.randomseed(GetGameTimer()) - if Config.PlateUseSpace then - generatedPlate = string.upper(GetRandomLetter(Config.PlateLetters) .. ' ' .. GetRandomNumber(Config.PlateNumbers)) - else - generatedPlate = string.upper(GetRandomLetter(Config.PlateLetters) .. GetRandomNumber(Config.PlateNumbers)) - end + local generatedPlate = string.upper(GetRandomLetter(Config.PlateLetters) .. (Config.PlateUseSpace and ' ' or '') .. GetRandomNumber(Config.PlateNumbers)) - ESX.TriggerServerCallback('esx_vehicleshop:isPlateTaken', function(isPlateTaken) - if not isPlateTaken then - doBreak = true - end - end, generatedPlate) - - if doBreak then - break - end + local isTaken = IsPlateTaken(generatedPlate) + if isTaken then + return GeneratePlate() end return generatedPlate @@ -35,33 +21,21 @@ end -- mixing async with sync tasks function IsPlateTaken(plate) - local callback = 'waiting' - + local p = promise.new() + ESX.TriggerServerCallback('esx_vehicleshop:isPlateTaken', function(isPlateTaken) - callback = isPlateTaken + p:resolve(isPlateTaken) end, plate) - while type(callback) == 'string' do - Wait(0) - end - - return callback + return Citizen.Await(p) end function GetRandomNumber(length) Wait(0) - if length > 0 then - return GetRandomNumber(length - 1) .. NumberCharset[math.random(1, #NumberCharset)] - else - return '' - end + return length > 0 and GetRandomNumber(length - 1) .. NumberCharset[math.random(1, #NumberCharset)] or '' end function GetRandomLetter(length) Wait(0) - if length > 0 then - return GetRandomLetter(length - 1) .. Charset[math.random(1, #Charset)] - else - return '' - end + return length > 0 and GetRandomLetter(length - 1) .. Charset[math.random(1, #Charset)] or '' end From fbbd6eb66ab58a337f31adb2f9b8f439a1ece240 Mon Sep 17 00:00:00 2001 From: Csoki Date: Fri, 30 Dec 2022 10:01:51 +0100 Subject: [PATCH 06/58] refactor(esx_vehicleshop): server/main.lua --- [esx_addons]/esx_vehicleshop/server/main.lua | 285 +++++++++---------- 1 file changed, 135 insertions(+), 150 deletions(-) diff --git a/[esx_addons]/esx_vehicleshop/server/main.lua b/[esx_addons]/esx_vehicleshop/server/main.lua index d07bbffc..81d9f0ce 100644 --- a/[esx_addons]/esx_vehicleshop/server/main.lua +++ b/[esx_addons]/esx_vehicleshop/server/main.lua @@ -1,4 +1,5 @@ local categories, vehicles = {}, {} +local vehiclesByModel = {} TriggerEvent('esx_phone:registerNumber', 'cardealer', TranslateCap('dealer_customers'), false, false) TriggerEvent('esx_society:registerSociety', 'cardealer', TranslateCap('car_dealer'), 'society_cardealer', 'society_cardealer', 'society_cardealer', {type = 'private'}) @@ -25,62 +26,50 @@ end) function SQLVehiclesAndCategories() categories = MySQL.query.await('SELECT * FROM vehicle_categories') - vehicles = MySQL.query.await('SELECT * FROM vehicles') + vehicles = MySQL.query.await('SELECT vehicles.*, vehicle_categories.label AS categoryLabel FROM vehicles JOIN vehicle_categories ON vehicles.category = vehicle_categories.name') - GetVehiclesAndCategories(categories, vehicles) -end - -function GetVehiclesAndCategories(categories, vehicles) - for i = 1, #vehicles do - local vehicle = vehicles[i] - for j = 1, #categories do - local category = categories[j] - if category.name == vehicle.category then - vehicle.categoryLabel = category.label - break - end - end + for _, vehicle in pairs(vehicles) do + vehiclesByModel[vehicle.model] = vehicle end - -- send information after db has loaded, making sure everyone gets vehicle information - TriggerClientEvent('esx_vehicleshop:sendCategories', -1, categories) - TriggerClientEvent('esx_vehicleshop:sendVehicles', -1, vehicles) + TriggerClientEvent("esx_vehicleshop:updateVehiclesAndCategories", -1, vehicles, categories, vehiclesByModel) end function getVehicleFromModel(model) - for i = 1, #vehicles do - local vehicle = vehicles[i] - if vehicle.model == model then - return vehicle - end - end - - return + return vehiclesByModel[model] end +RegisterNetEvent("esx_vehicleshop:getVehiclesAndCategories", function() + TriggerClientEvent("esx_vehicleshop:updateVehiclesAndCategories", source, vehicles, categories, vehiclesByModel) +end) + RegisterNetEvent('esx_vehicleshop:setVehicleOwnedPlayerId') AddEventHandler('esx_vehicleshop:setVehicleOwnedPlayerId', function(playerId, vehicleProps, model, label) local xPlayer, xTarget = ESX.GetPlayerFromId(source), ESX.GetPlayerFromId(playerId) - if xPlayer.job.name == 'cardealer' and xTarget then - MySQL.scalar('SELECT id FROM cardealer_vehicles WHERE vehicle = ?', {model}, - function(id) - if id then - MySQL.update('DELETE FROM cardealer_vehicles WHERE id = ?', {id}, - function(rowsChanged) - if rowsChanged == 1 then - MySQL.insert('INSERT INTO owned_vehicles (owner, plate, vehicle) VALUES (?, ?, ?)', {xTarget.identifier, vehicleProps.plate, json.encode(vehicleProps)}, - function(id) - xPlayer.showNotification(TranslateCap('vehicle_set_owned', vehicleProps.plate, xTarget.getName())) - xTarget.showNotification(TranslateCap('vehicle_belongs', vehicleProps.plate)) - end) + if xPlayer.job.name ~= 'cardealer' or not xTarget then + return + end - MySQL.insert('INSERT INTO vehicle_sold (client, model, plate, soldby, date) VALUES (?, ?, ?, ?, ?)', {xTarget.getName(), label, vehicleProps.plate, xPlayer.getName(), os.date('%Y-%m-%d %H:%M')}) - end + MySQL.scalar('SELECT id FROM cardealer_vehicles WHERE vehicle = ?', {model}, + function(id) + if not id then + return + end + + MySQL.update('DELETE FROM cardealer_vehicles WHERE id = ?', {id}, + function(rowsChanged) + if rowsChanged == 1 then + MySQL.insert('INSERT INTO owned_vehicles (owner, plate, vehicle) VALUES (?, ?, ?)', {xTarget.identifier, vehicleProps.plate, json.encode(vehicleProps)}, + function(id) + xPlayer.showNotification(TranslateCap('vehicle_set_owned', vehicleProps.plate, xTarget.getName())) + xTarget.showNotification(TranslateCap('vehicle_belongs', vehicleProps.plate)) end) + + MySQL.insert('INSERT INTO vehicle_sold (client, model, plate, soldby, date) VALUES (?, ?, ?, ?, ?)', {xTarget.getName(), label, vehicleProps.plate, xPlayer.getName(), os.date('%Y-%m-%d %H:%M')}) end end) - end + end) end) ESX.RegisterServerCallback('esx_vehicleshop:getSoldVehicles', function(source, cb) @@ -93,22 +82,28 @@ RegisterNetEvent('esx_vehicleshop:rentVehicle') AddEventHandler('esx_vehicleshop:rentVehicle', function(vehicle, plate, rentPrice, playerId) local xPlayer, xTarget = ESX.GetPlayerFromId(source), ESX.GetPlayerFromId(playerId) - if xPlayer.job.name == 'cardealer' and xTarget then - MySQL.single('SELECT id, price FROM cardealer_vehicles WHERE vehicle = ?', {vehicle}, - function(result) - if result then - MySQL.update('DELETE FROM cardealer_vehicles WHERE id = ?', {result.id}, - function(rowsChanged) - if rowsChanged == 1 then - MySQL.insert('INSERT INTO rented_vehicles (vehicle, plate, player_name, base_price, rent_price, owner) VALUES (?, ?, ?, ?, ?, ?)', {vehicle, plate, xTarget.getName(), result.price, rentPrice, xTarget.identifier}, - function(id) - xPlayer.showNotification(TranslateCap('vehicle_set_rented', plate, xTarget.getName())) - end) - end - end) - end - end) + if xPlayer.job.name ~= 'cardealer' or not xTarget then + return end + + MySQL.single('SELECT id, price FROM cardealer_vehicles WHERE vehicle = ?', {vehicle}, + function(result) + if not result then + return + end + + MySQL.update('DELETE FROM cardealer_vehicles WHERE id = ?', {result.id}, + function(rowsChanged) + if rowsChanged ~= 1 then + return + end + + MySQL.insert('INSERT INTO rented_vehicles (vehicle, plate, player_name, base_price, rent_price, owner) VALUES (?, ?, ?, ?, ?, ?)', {vehicle, plate, xTarget.getName(), result.price, rentPrice, xTarget.identifier}, + function(id) + xPlayer.showNotification(TranslateCap('vehicle_set_rented', plate, xTarget.getName())) + end) + end) + end) end) RegisterNetEvent('esx_vehicleshop:getStockItem') @@ -123,13 +118,12 @@ AddEventHandler('esx_vehicleshop:getStockItem', function(itemName, count) if count > 0 and item.count >= count then -- can the player carry the said amount of x item? - if xPlayer.canCarryItem(itemName, count) then - inventory.removeItem(itemName, count) - xPlayer.addInventoryItem(itemName, count) - xPlayer.showNotification(TranslateCap('have_withdrawn', count, item.label)) - else - xPlayer.showNotification(TranslateCap('player_cannot_hold')) + if not xPlayer.canCarryItem(itemName, count) then + return xPlayer.showNotification(TranslateCap('player_cannot_hold')) end + inventory.removeItem(itemName, count) + xPlayer.addInventoryItem(itemName, count) + xPlayer.showNotification(TranslateCap('have_withdrawn', count, item.label)) else xPlayer.showNotification(TranslateCap('not_enough_in_society')) end @@ -154,14 +148,6 @@ AddEventHandler('esx_vehicleshop:putStockItems', function(itemName, count) end) end) -ESX.RegisterServerCallback('esx_vehicleshop:getCategories', function(source, cb) - cb(categories) -end) - -ESX.RegisterServerCallback('esx_vehicleshop:getVehicles', function(source, cb) - cb(vehicles) -end) - ESX.RegisterServerCallback('esx_vehicleshop:buyVehicle', function(source, cb, model, plate) local xPlayer = ESX.GetPlayerFromId(source) local modelPrice = getVehicleFromModel(model).price @@ -194,53 +180,57 @@ end) ESX.RegisterServerCallback('esx_vehicleshop:buyCarDealerVehicle', function(source, cb, model) local xPlayer = ESX.GetPlayerFromId(source) - if xPlayer.job.name == 'cardealer' then - local modelPrice = getVehicleFromModel(model).price - - if modelPrice then - TriggerEvent('esx_addonaccount:getSharedAccount', 'society_cardealer', function(account) - if account.money >= modelPrice then - account.removeMoney(modelPrice) - - MySQL.insert('INSERT INTO cardealer_vehicles (vehicle, price) VALUES (?, ?)', {model, modelPrice}, - function(rowsChanged) - cb(true) - end) - else - cb(false) - end - end) - end + if xPlayer.job.name ~= 'cardealer' then + return cb(false) end + local modelPrice = getVehicleFromModel(model).price + + if not modelPrice then + return cb(false) + end + TriggerEvent('esx_addonaccount:getSharedAccount', 'society_cardealer', function(account) + if account.money < modelPrice then + return cb(false) + end + + account.removeMoney(modelPrice) + + MySQL.insert('INSERT INTO cardealer_vehicles (vehicle, price) VALUES (?, ?)', {model, modelPrice}, + function(rowsChanged) + cb(true) + end) + end) end) RegisterNetEvent('esx_vehicleshop:returnProvider') AddEventHandler('esx_vehicleshop:returnProvider', function(vehicleModel) local xPlayer = ESX.GetPlayerFromId(source) - if xPlayer.job.name == 'cardealer' then - MySQL.single('SELECT id, price FROM cardealer_vehicles WHERE vehicle = ?', {vehicleModel}, - function(result) - if result then - local id = result.id - - MySQL.update('DELETE FROM cardealer_vehicles WHERE id = ?', {id}, - function(rowsChanged) - if rowsChanged == 1 then - TriggerEvent('esx_addonaccount:getSharedAccount', 'society_cardealer', function(account) - local price = ESX.Math.Round(result.price * 0.75) - local vehicleLabel = getVehicleFromModel(vehicleModel).label - - account.addMoney(price) - xPlayer.showNotification(TranslateCap('vehicle_sold_for', vehicleLabel, ESX.Math.GroupDigits(price))) - end) - end - end) - else - print(('[^3WARNING^7] Player ^5%s^7 Attempted To Sell Invalid Vehicle - ^5%s^7!'):format(source, vehicleModel)) - end - end) + if xPlayer.job.name ~= 'cardealer' then + return end + MySQL.single('SELECT id, price FROM cardealer_vehicles WHERE vehicle = ?', {vehicleModel}, + function(result) + if not result then + return print(('[^3WARNING^7] Player ^5%s^7 Attempted To Sell Invalid Vehicle - ^5%s^7!'):format(source, vehicleModel)) + end + + local id = result.id + + MySQL.update('DELETE FROM cardealer_vehicles WHERE id = ?', {id}, + function(rowsChanged) + if rowsChanged ~= 1 then + return + end + TriggerEvent('esx_addonaccount:getSharedAccount', 'society_cardealer', function(account) + local price = ESX.Math.Round(result.price * 0.75) + local vehicleLabel = getVehicleFromModel(vehicleModel).label + + account.addMoney(price) + xPlayer.showNotification(TranslateCap('vehicle_sold_for', vehicleLabel, ESX.Math.GroupDigits(price))) + end) + end) + end) end) ESX.RegisterServerCallback('esx_vehicleshop:getRentedVehicles', function(source, cb) @@ -263,20 +253,17 @@ end) ESX.RegisterServerCallback('esx_vehicleshop:giveBackVehicle', function(source, cb, plate) MySQL.single('SELECT base_price, vehicle FROM rented_vehicles WHERE plate = ?', {plate}, function(result) - if result then - local vehicle = result.vehicle - local basePrice = result.base_price - - MySQL.update('DELETE FROM rented_vehicles WHERE plate = ?', {plate}, - function(rowsChanged) - MySQL.insert('INSERT INTO cardealer_vehicles (vehicle, price) VALUES (?, ?)', {result.vehicle, result.base_price}) - - RemoveOwnedVehicle(plate) - cb(true) - end) - else - cb(false) + if not result then + return cb(false) end + + MySQL.update('DELETE FROM rented_vehicles WHERE plate = ?', {plate}, + function() + MySQL.insert('INSERT INTO cardealer_vehicles (vehicle, price) VALUES (?, ?)', {result.vehicle, result.base_price}) + + RemoveOwnedVehicle(plate) + cb(true) + end) end) end) @@ -294,36 +281,34 @@ ESX.RegisterServerCallback('esx_vehicleshop:resellVehicle', function(source, cb, if not resellPrice then print(('[^3WARNING^7] Player ^5%s^7 Attempted To Resell Invalid Vehicle - ^5%s^7!'):format(source, model)) - cb(false) - else - MySQL.single('SELECT * FROM rented_vehicles WHERE plate = ?', {plate}, - function(result) - if result then -- is it a rented vehicle? - cb(false) -- it is, don't let the player sell it since he doesn't own it - else - MySQL.single('SELECT * FROM owned_vehicles WHERE owner = ? AND plate = ?', {xPlayer.identifier, plate}, - function(result) - if result then -- does the owner match? - local vehicle = json.decode(result.vehicle) - - if vehicle.model == model then - if vehicle.plate == plate then - xPlayer.addMoney(resellPrice, "Sold Vehicle") - RemoveOwnedVehicle(plate) - cb(true) - else - print(('[^3WARNING^7] Player ^5%s^7 Attempted To Resell Vehicle With Invalid Plate - ^5%s^7!'):format(source, plate)) - cb(false) - end - else - print(('[^3WARNING^7] Player ^5%s^7 Attempted To Resell Vehicle With Invalid Model - ^5%s^7!'):format(source, model)) - cb(false) - end - end - end) - end - end) + return cb(false) end + MySQL.single('SELECT * FROM rented_vehicles WHERE plate = ?', {plate}, + function(result) + if result then -- is it a rented vehicle? + return cb(false) -- it is, don't let the player sell it since he doesn't own it + end + MySQL.single('SELECT * FROM owned_vehicles WHERE owner = ? AND plate = ?', {xPlayer.identifier, plate}, + function(result) + if not result then -- does the owner match? + return + end + local vehicle = json.decode(result.vehicle) + + if vehicle.model ~= model then + print(('[^3WARNING^7] Player ^5%s^7 Attempted To Resell Vehicle With Invalid Model - ^5%s^7!'):format(source, model)) + return cb(false) + end + if vehicle.plate ~= plate then + print(('[^3WARNING^7] Player ^5%s^7 Attempted To Resell Vehicle With Invalid Plate - ^5%s^7!'):format(source, plate)) + return cb(false) + end + + xPlayer.addMoney(resellPrice, "Sold Vehicle") + RemoveOwnedVehicle(plate) + cb(true) + end) + end) end end) From 6212076bd439d355aebfc76d715a1d791b92792c Mon Sep 17 00:00:00 2001 From: Csoki Date: Fri, 30 Dec 2022 10:24:19 +0100 Subject: [PATCH 07/58] fix(esx_vehicleshop): 'hu' locales --- [esx_addons]/esx_vehicleshop/locales/hu.lua | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/[esx_addons]/esx_vehicleshop/locales/hu.lua b/[esx_addons]/esx_vehicleshop/locales/hu.lua index b25bfd37..bd681b3a 100644 --- a/[esx_addons]/esx_vehicleshop/locales/hu.lua +++ b/[esx_addons]/esx_vehicleshop/locales/hu.lua @@ -2,13 +2,13 @@ Locales['hu'] = { -- global menus ['not_enough_in_society'] = 'nincs elég ~r~tárgyad a vállalkozásban!', ['player_cannot_hold'] = '~r~nincs elég helyed a leltárban!', - ['vehicle_belongs'] = 'egy jármü engedélyel %s most már hozzád tartozik', + ['vehicle_belongs'] = '%s rendszámú jármű már a tulajdonodban van.', ['broke_company'] = 'nincs elég pénz a vállalati számlán', ['license_missing'] = 'nincs jogosítványod tedd le!', ['purchase_type'] = 'a vásárlás típusa', ['society_type'] = 'vállalkozás', ['staff_type'] = 'személyes használat', - ['buy_vehicle_shop'] = 'meg szeretnéd vásárolni %s ennyiért: %s NP-ért?', + ['buy_vehicle_shop'] = 'meg szeretnéd vásárolni %s ennyiért: %s $-ért?', ['buy_vehicle'] = 'vásárlás', ['car_dealer'] = 'Autókereskedés', ['shop_awaiting_model'] = 'az autó töltése folyamantban kérlek várj', @@ -26,23 +26,23 @@ Locales['hu'] = { ['not_enough_money'] = 'nincs elég pénzed', ['not_rental'] = 'ez nem ~r~bérelhetö autó', ['not_yours'] = 'ez az autó nem tartozik hozzád', - ['paid_rental'] = 'fizettél a kölcsönzönek: %s NP', + ['paid_rental'] = 'fizettél a kölcsönzönek: %s $', ['pop_vehicle'] = 'tedd a jármüvet eladásra', ['rent_vehicle'] = 'Autókereskedö - Jármüvek bérlése', ['return_provider_menu'] = 'Autókereskedö - Jámrü vissza adás a szollgáltatónak', ['rental_amount'] = 'bérlési költség', - ['sell_menu'] = 'nyomj [E] gombot hogy eladd a %s ennyiért %s NP', + ['sell_menu'] = 'nyomj [E] gombot hogy eladd a %s ennyiért %s $', ['set_vehicle_owner_rent'] = 'jármü kijelölése [Location]', ['set_vehicle_owner_sell'] = 'jármü eladása', ['set_vehicle_owner_sell_society'] = 'jármü kijelölése [Sale] [Society]', ['shop_menu'] = 'nyomj [E] gombot a vásárláshoz', - ['generic_shopitem'] = '%s NP', + ['generic_shopitem'] = '%s $', ['vehicle_dealer'] = 'jármü - Autókereskedö', ['vehicle_menu'] = 'nyomj [E] gombot hogy vissza add a bérelt jármüvet', ['vehicle_purchased'] = 'vásároltál egy jármüvet', ['vehicle_set_owned'] = 'jármü %s megvéve ennyiért: %s', ['vehicle_set_rented'] = 'jármü %s kibérelve ennyiért: %s', - ['vehicle_sold_for'] = 'A %s jármü eladva ennyiért %s NP', + ['vehicle_sold_for'] = 'A %s jármü eladva ennyiért %s $', ['vehicle_sold_to'] = 'a jármü rendszámmal %s eladva neki: %s', ['deposit_stock'] = 'beteszek a készletbe', ['take_stock'] = 'kiveszek a készletböl', From 2a659184d6e57a2b7d6d6e2174ed854310d5ed99 Mon Sep 17 00:00:00 2001 From: Csoki Date: Fri, 30 Dec 2022 10:41:57 +0100 Subject: [PATCH 08/58] refactor(esx_vehicleshop): main/client.lua --- [esx_addons]/esx_vehicleshop/client/main.lua | 136 ++++++++----------- 1 file changed, 57 insertions(+), 79 deletions(-) diff --git a/[esx_addons]/esx_vehicleshop/client/main.lua b/[esx_addons]/esx_vehicleshop/client/main.lua index 357869f6..e6065b83 100644 --- a/[esx_addons]/esx_vehicleshop/client/main.lua +++ b/[esx_addons]/esx_vehicleshop/client/main.lua @@ -1,42 +1,28 @@ local HasAlreadyEnteredMarker, IsInShopMenu = false, false local CurrentAction, CurrentActionMsg, LastZone, currentDisplayVehicle, CurrentVehicleData local CurrentActionData, Vehicles, Categories = {}, {}, {} +local VehiclesByModel = {} +local vehiclesByCategory = {} function getVehicleFromModel(model) - for i = 1, #Vehicles do - local vehicle = Vehicles[i] - if vehicle.model == model then - return vehicle - end - end + return VehiclesByModel[model] end -function getVehicles() - ESX.TriggerServerCallback('esx_vehicleshop:getCategories', function(categories) - Categories = categories - end) - - ESX.TriggerServerCallback('esx_vehicleshop:getVehicles', function(vehicles) - Vehicles = vehicles - end) -end - -AddEventHandler("onResourceStart", getVehicles) - function PlayerManagement() - if Config.EnablePlayerManagement then - if ESX.PlayerData.job.name == 'cardealer' then - Config.Zones.ShopEntering.Type = 1 + if not Config.EnablePlayerManagement then + return + end - if ESX.PlayerData.job.grade_name == 'boss' then - Config.Zones.BossActions.Type = 1 - end + if ESX.PlayerData.job.name ~= 'cardealer' then + Config.Zones.ShopEntering.Type = -1 + Config.Zones.BossActions.Type = -1 + Config.Zones.ResellVehicle.Type = -1 + return + end + Config.Zones.ShopEntering.Type = 1 - else - Config.Zones.ShopEntering.Type = -1 - Config.Zones.BossActions.Type = -1 - Config.Zones.ResellVehicle.Type = -1 - end + if ESX.PlayerData.job.grade_name == 'boss' then + Config.Zones.BossActions.Type = 1 end end @@ -45,21 +31,35 @@ AddEventHandler('esx:playerLoaded', function(xPlayer) ESX.PlayerData = xPlayer PlayerManagement() - getVehicles() + TriggerServerEvent("esx_vehicleshop:getVehiclesAndCategories") end) -RegisterNetEvent('esx_vehicleshop:sendCategories') -AddEventHandler('esx_vehicleshop:sendCategories', function(categories) - Categories = categories -end) - -RegisterNetEvent('esx_vehicleshop:sendVehicles') -AddEventHandler('esx_vehicleshop:sendVehicles', function(vehicles) +RegisterNetEvent('esx_vehicleshop:updateVehiclesAndCategories', function(vehicles, categories, vehiclesByModel) Vehicles = vehicles + Categories = categories + + VehiclesByModel = vehiclesByModel + + table.sort(Vehicles, function(a, b) + return a.name < b.name + end) + + for _, vehicle in ipairs(Vehicles) do + if IsModelInCdimage(joaat(vehicle.model)) then + local category = vehicle.category + + if not vehiclesByCategory[category] then + vehiclesByCategory[category] = {} + end + + table.insert(vehiclesByCategory[category], vehicle) + else + print(('[^3WARNING^7] Ignoring vehicle ^5%s^7 due to invalid Model'):format(vehicle.model)) + end + end end) - -RegisterNetEvent('esx:setJob') AddEventHandler('esx:setJob', PlayerManagement) +RegisterNetEvent('esx:setJob', PlayerManagement) function DeleteDisplayVehicleInsideShop() local attempt = 0 @@ -81,7 +81,7 @@ function ReturnVehicleProvider() ESX.TriggerServerCallback('esx_vehicleshop:getCommercialVehicles', function(vehicles) local elements = {} - for k,v in ipairs(vehicles) do + for k, v in ipairs(vehicles) do local returnPrice = ESX.Math.Round(v.price * 0.75) local vehicleLabel = getVehicleFromModel(v.vehicle).label @@ -135,28 +135,9 @@ function OpenShopMenu() SetEntityVisible(playerPed, false) SetEntityCoords(playerPed, Config.Zones.ShopInside.Pos) - local vehiclesByCategory = {} local elements = {} local firstVehicleData = nil - for i=1, #Categories, 1 do - vehiclesByCategory[Categories[i].name] = {} - end - - for i=1, #Vehicles, 1 do - if IsModelInCdimage(joaat(Vehicles[i].model)) then - table.insert(vehiclesByCategory[Vehicles[i].category], Vehicles[i]) - else - print(('[^3WARNING^7] Ignoring vehicle ^5%s^7 due to invalid Model'):format(Vehicles[i].model)) - end - end - - for k,v in pairs(vehiclesByCategory) do - table.sort(v, function(a, b) - return a.name < b.name - end) - end - for i=1, #Categories, 1 do local category = Categories[i] local categoryVehicles = vehiclesByCategory[category.name] @@ -439,7 +420,7 @@ function OpenPopVehicleMenu() local vehicleLabel = getVehicleFromModel(v.vehicle).label table.insert(elements, { - label = ('%s [MSRP %s]'):format(vehicleLabel, TranslateCap('generic_shopitem', ESX.Math.GroupDigits(v.price))), + label = ('%s [%s]'):format(vehicleLabel, TranslateCap('generic_shopitem', ESX.Math.GroupDigits(v.price))), value = v.vehicle }) end @@ -630,21 +611,18 @@ function OpenPutStocksMenu() end) end -AddEventHandler('esx_vehicleshop:hasEnteredMarker', function(zone) +function hasEnteredMarker(zone) if zone == 'ShopEntering' then - - if Config.EnablePlayerManagement then - if ESX.PlayerData.job ~= nil and ESX.PlayerData.job.name == 'cardealer' then - CurrentAction = 'reseller_menu' - CurrentActionMsg = TranslateCap('shop_menu') - CurrentActionData = {} - end - else + if not Config.EnablePlayerManagement then CurrentAction = 'shop_menu' CurrentActionMsg = TranslateCap('shop_menu') CurrentActionData = {} end - + if ESX.PlayerData.job ~= nil and ESX.PlayerData.job.name == 'cardealer' then + CurrentAction = 'reseller_menu' + CurrentActionMsg = TranslateCap('shop_menu') + CurrentActionData = {} + end elseif zone == 'GiveBackVehicle' and Config.EnablePlayerManagement then local playerPed = PlayerPedId() @@ -696,15 +674,15 @@ AddEventHandler('esx_vehicleshop:hasEnteredMarker', function(zone) CurrentActionMsg = TranslateCap('shop_menu') CurrentActionData = {} end -end) +end -AddEventHandler('esx_vehicleshop:hasExitedMarker', function(zone) +function hasExitedMarker(zone) if not IsInShopMenu then ESX.UI.Menu.CloseAll() end ESX.HideUI() CurrentAction = nil -end) +end AddEventHandler('onResourceStop', function(resource) if resource == GetCurrentResourceName() then @@ -736,8 +714,8 @@ if Config.EnablePlayerManagement then end -- Create Blips -CreateThread(function() - if Config.Blip.show then +if Config.Blip.show then + CreateThread(function() local blip = AddBlipForCoord(Config.Zones.ShopEntering.Pos) SetBlipSprite (blip, Config.Blip.Sprite) @@ -748,8 +726,8 @@ CreateThread(function() BeginTextCommandSetBlipName('STRING') AddTextComponentSubstringPlayerName(TranslateCap('car_dealer')) EndTextCommandSetBlipName(blip) - end -end) + end) +end -- Enter / Exit marker events & Draw Markers CreateThread(function() @@ -777,12 +755,12 @@ CreateThread(function() if (isInMarker and not HasAlreadyEnteredMarker) or (isInMarker and LastZone ~= currentZone) then HasAlreadyEnteredMarker, LastZone = true, currentZone LastZone = currentZone - TriggerEvent('esx_vehicleshop:hasEnteredMarker', currentZone) + hasEnteredMarker(currentZone) end if not isInMarker and HasAlreadyEnteredMarker then HasAlreadyEnteredMarker = false - TriggerEvent('esx_vehicleshop:hasExitedMarker', LastZone) + hasExitedMarker(LastZone) end if letSleep then From d572f1acb075aa9ca7b88f888d12a5ad2511898e Mon Sep 17 00:00:00 2001 From: Csoki Date: Fri, 30 Dec 2022 11:15:36 +0100 Subject: [PATCH 09/58] feat(esx_society): add missing locales --- [esx_addons]/esx_society/locales/hu.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/[esx_addons]/esx_society/locales/hu.lua b/[esx_addons]/esx_society/locales/hu.lua index 1b060793..2721c9cd 100644 --- a/[esx_addons]/esx_society/locales/hu.lua +++ b/[esx_addons]/esx_society/locales/hu.lua @@ -12,10 +12,11 @@ Locales['hu'] = { ['grade'] = 'Fokozat', ['have_deposited'] = 'Sikeresen beraktál ~r~%s $', ['have_withdrawn'] = 'Sikeresen kivettél %s $', + ['check_balance'] = 'egyenleg ~g~%s$', ['invalid_amount'] = 'Érvénytelen mennyiség', ['invalid_amount_max'] = 'Ez az összeg több mint a megengedett', - ['invalid_value'] = 'invalid value', - ['invalid_value_nochanges']= 'invalid value, no changes applied', + ['invalid_value'] = 'érvénytelen érték', + ['invalid_value_nochanges']= 'érvénytelen érték, nem történt változtatás', ['no'] = 'Nem', ['promote'] = 'Elöléptetés', ['promote_employee'] = 'Elöléptetés %s', @@ -23,6 +24,9 @@ Locales['hu'] = { ['recruiting'] = 'Felvétel', ['salary_amount'] = 'Fizetés', ['salary_management'] = 'Fizetések kezelése', + ['grade_management'] = 'Rangok nevének kezelése', + ['grade_label'] = 'Rang név', + ['check_society_balance'] = 'Egyenleg megtekintése', ['wash_money'] = 'Pénz mosás', ['wash_money_amount'] = 'Piszkos pénz mennyiség', ['withdraw_amount'] = 'Pénz mennyiség', From 88bbaa1282eb16d658698c9cb600dbad10f5b185 Mon Sep 17 00:00:00 2001 From: Csoki Date: Fri, 30 Dec 2022 11:27:10 +0100 Subject: [PATCH 10/58] fix(esx_society): fix invalid job bug --- [esx_addons]/esx_society/client/main.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/[esx_addons]/esx_society/client/main.lua b/[esx_addons]/esx_society/client/main.lua index aa735108..2af03b20 100644 --- a/[esx_addons]/esx_society/client/main.lua +++ b/[esx_addons]/esx_society/client/main.lua @@ -276,6 +276,10 @@ end function OpenPromoteMenu(society, employee, options) ESX.TriggerServerCallback('esx_society:getJob', function(job) + if not job then + return + end + local elements = { {unselectable = true, icon = "fas fa-user", title = TranslateCap('promote_employee', employee.name)} } @@ -354,6 +358,10 @@ end function OpenManageGradesMenu(society, options) ESX.TriggerServerCallback('esx_society:getJob', function(job) + if not job then + return + end + local elements = { {unselectable = true, icon = "fas fa-wallet", title = TranslateCap('grade_management')} } From 93d8a11aaf5d50d3afb49dfbf7781a5f95911903 Mon Sep 17 00:00:00 2001 From: Csoki Date: Fri, 30 Dec 2022 11:28:11 +0100 Subject: [PATCH 11/58] feat(esx_policejob): add esx_proprty dependency --- [esx_addons]/esx_policejob/fxmanifest.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/[esx_addons]/esx_policejob/fxmanifest.lua b/[esx_addons]/esx_policejob/fxmanifest.lua index 9a3355d2..86f8ea7c 100644 --- a/[esx_addons]/esx_policejob/fxmanifest.lua +++ b/[esx_addons]/esx_policejob/fxmanifest.lua @@ -27,5 +27,6 @@ client_scripts { dependencies { 'es_extended', 'esx_billing', - 'esx_vehicleshop' + 'esx_vehicleshop', + 'esx_society' } From a759b4d74bc96e5c7db55b901b25e0e8bb1f1c34 Mon Sep 17 00:00:00 2001 From: Csoki Date: Fri, 30 Dec 2022 12:06:00 +0100 Subject: [PATCH 12/58] fix(esx_society): invalid job bug --- [esx_addons]/esx_society/client/main.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/[esx_addons]/esx_society/client/main.lua b/[esx_addons]/esx_society/client/main.lua index 2af03b20..f0797518 100644 --- a/[esx_addons]/esx_society/client/main.lua +++ b/[esx_addons]/esx_society/client/main.lua @@ -310,6 +310,10 @@ end function OpenManageSalaryMenu(society, options) ESX.TriggerServerCallback('esx_society:getJob', function(job) + if not job then + return + end + local elements = { {unselectable = true, icon = "fas fa-wallet", title = TranslateCap('salary_management')} } From 25016e8b4d400b3983ae76d3352ca14399a201cf Mon Sep 17 00:00:00 2001 From: Csoki Date: Fri, 30 Dec 2022 12:06:18 +0100 Subject: [PATCH 13/58] refactor(esx_society): main/server.lua --- [esx_addons]/esx_society/server/main.lua | 181 ++++++++++------------- 1 file changed, 79 insertions(+), 102 deletions(-) diff --git a/[esx_addons]/esx_society/server/main.lua b/[esx_addons]/esx_society/server/main.lua index be5e0d3d..82c084ec 100644 --- a/[esx_addons]/esx_society/server/main.lua +++ b/[esx_addons]/esx_society/server/main.lua @@ -1,33 +1,19 @@ -local Jobs = {} +local Jobs = setmetatable({}, {__index = function(_, key) + return ESX.GetJobs()[key] +end +}) local RegisteredSocieties = {} +local SocietiesByName = {} function GetSociety(name) - for i=1, #RegisteredSocieties, 1 do - if RegisteredSocieties[i].name == name then - return RegisteredSocieties[i] - end - end + return SocietiesByName[name] end -AddEventHandler('onResourceStart', function(resourceName) - if resourceName == GetCurrentResourceName() then - local result = MySQL.query.await('SELECT * FROM jobs') - - for i = 1, #result, 1 do - Jobs[result[i].name] = result[i] - Jobs[result[i].name].grades = {} - end - - local result2 = MySQL.query.await('SELECT * FROM job_grades') - - for i = 1, #result2, 1 do - Jobs[result2[i].job_name].grades[tostring(result2[i].grade)] = result2[i] - end - end -end) - AddEventHandler('esx_society:registerSociety', function(name, label, account, datastore, inventory, data) - local found = false + if SocietiesByName[name] then + print(('[^3WARNING^7] society already registered, name: ^5%s^7'):format(name)) + return + end local society = { name = name, @@ -38,16 +24,8 @@ AddEventHandler('esx_society:registerSociety', function(name, label, account, da data = data } - for i=1, #RegisteredSocieties, 1 do - if RegisteredSocieties[i].name == name then - found, RegisteredSocieties[i] = true, society - break - end - end - - if not found then - table.insert(RegisteredSocieties, society) - end + SocietiesByName[name] = society + table.insert(RegisteredSocieties, society) end) AddEventHandler('esx_society:getSocieties', function(cb) @@ -83,19 +61,19 @@ AddEventHandler('esx_society:withdrawMoney', function(societyName, amount) end local xPlayer = ESX.GetPlayerFromId(source) amount = ESX.Math.Round(tonumber(amount)) - if xPlayer.job.name == society.name then - TriggerEvent('esx_addonaccount:getSharedAccount', society.account, function(account) - if amount > 0 and account.money >= amount then - account.removeMoney(amount) - xPlayer.addMoney(amount, "Society Withdraw") - xPlayer.showNotification(TranslateCap('have_withdrawn', ESX.Math.GroupDigits(amount))) - else - xPlayer.showNotification(TranslateCap('invalid_amount')) - end - end) - else - print(('[^3WARNING^7] Player ^5%s^7 attempted to withdraw from society - ^5%s^7!'):format(source, society.name)) + if xPlayer.job.name ~= society.name then + return print(('[^3WARNING^7] Player ^5%s^7 attempted to withdraw from society - ^5%s^7!'):format(source, society.name)) end + + TriggerEvent('esx_addonaccount:getSharedAccount', society.account, function(account) + if amount > 0 and account.money >= amount then + account.removeMoney(amount) + xPlayer.addMoney(amount, "Society Withdraw") + xPlayer.showNotification(TranslateCap('have_withdrawn', ESX.Math.GroupDigits(amount))) + else + xPlayer.showNotification(TranslateCap('invalid_amount')) + end + end) end) RegisterServerEvent('esx_society:depositMoney') @@ -109,18 +87,17 @@ AddEventHandler('esx_society:depositMoney', function(societyName, amount) end amount = ESX.Math.Round(tonumber(amount)) - if xPlayer.job.name == society.name then - if amount > 0 and xPlayer.getMoney() >= amount then - TriggerEvent('esx_addonaccount:getSharedAccount', society.account, function(account) - xPlayer.removeMoney(amount, "Society Deposit") - xPlayer.showNotification(TranslateCap('have_deposited', ESX.Math.GroupDigits(amount))) - account.addMoney(amount) - end) - else - xPlayer.showNotification(TranslateCap('invalid_amount')) - end + if xPlayer.job.name ~= society.name then + return print(('[^3WARNING^7] Player ^5%s^7 attempted to deposit to society - ^5%s^7!'):format(source, society.name)) + end + if amount > 0 and xPlayer.getMoney() >= amount then + TriggerEvent('esx_addonaccount:getSharedAccount', society.account, function(account) + xPlayer.removeMoney(amount, "Society Deposit") + xPlayer.showNotification(TranslateCap('have_deposited', ESX.Math.GroupDigits(amount))) + account.addMoney(amount) + end) else - print(('[^3WARNING^7] Player ^5%s^7 attempted to deposit to society - ^5%s^7!'):format(source, society.name)) + xPlayer.showNotification(TranslateCap('invalid_amount')) end end) @@ -131,26 +108,24 @@ AddEventHandler('esx_society:washMoney', function(society, amount) local account = xPlayer.getAccount('black_money') amount = ESX.Math.Round(tonumber(amount)) - if xPlayer.job.name == society then - if amount and amount > 0 and account.money >= amount then - xPlayer.removeAccountMoney('black_money', amount, "Washing") + if xPlayer.job.name ~= society then + return print(('[^3WARNING^7] Player ^5%s^7 attempted to wash money in society - ^5%s^7!'):format(source, society)) + end + if amount and amount > 0 and account.money >= amount then + xPlayer.removeAccountMoney('black_money', amount, "Washing") - MySQL.insert('INSERT INTO society_moneywash (identifier, society, amount) VALUES (?, ?, ?)', {xPlayer.identifier, society, amount}, - function(rowsChanged) - xPlayer.showNotification(TranslateCap('you_have', ESX.Math.GroupDigits(amount))) - end) - else - xPlayer.showNotification(TranslateCap('invalid_amount')) - end + MySQL.insert('INSERT INTO society_moneywash (identifier, society, amount) VALUES (?, ?, ?)', {xPlayer.identifier, society, amount}, + function(rowsChanged) + xPlayer.showNotification(TranslateCap('you_have', ESX.Math.GroupDigits(amount))) + end) else - print(('[^3WARNING^7] Player ^5%s^7 attempted to wash money in society - ^5%s^7!'):format(source, society)) + xPlayer.showNotification(TranslateCap('invalid_amount')) end end) RegisterServerEvent('esx_society:putVehicleInGarage') AddEventHandler('esx_society:putVehicleInGarage', function(societyName, vehicle) local source = source - local xPlayer = ESX.GetPlayerFromId(source) local society = GetSociety(societyName) if not society then print(('[^3WARNING^7] Player ^5%s^7 attempted to put vehicle in non-existing society garage - ^5%s^7!'):format(source, societyName)) @@ -166,7 +141,6 @@ end) RegisterServerEvent('esx_society:removeVehicleFromGarage') AddEventHandler('esx_society:removeVehicleFromGarage', function(societyName, vehicle) local source = source - local xPlayer = ESX.GetPlayerFromId(source) local society = GetSociety(societyName) if not society then print(('[^3WARNING^7] Player ^5%s^7 attempted to remove vehicle from non-existing society garage - ^5%s^7!'):format(source, societyName)) @@ -190,15 +164,14 @@ ESX.RegisterServerCallback('esx_society:getSocietyMoney', function(source, cb, s local society = GetSociety(societyName) if not society then print(('[^3WARNING^7] Player ^5%s^7 attempted to get money from non-existing society - ^5%s^7!'):format(source, societyName)) - return + return cb(0) end - if society then - TriggerEvent('esx_addonaccount:getSharedAccount', society.account, function(account) - cb(account.money) - end) - else - cb(0) + if not society then + return cb(0) end + TriggerEvent('esx_addonaccount:getSharedAccount', society.account, function(account) + cb(account.money or 0) + end) end) ESX.RegisterServerCallback('esx_society:getEmployees', function(source, cb, society) @@ -271,6 +244,10 @@ ESX.RegisterServerCallback('esx_society:getEmployees', function(source, cb, soci end) ESX.RegisterServerCallback('esx_society:getJob', function(source, cb, society) + if not Jobs[society] then + return cb(false) + end + local job = json.decode(json.encode(Jobs[society])) local grades = {} @@ -292,33 +269,33 @@ ESX.RegisterServerCallback('esx_society:setJob', function(source, cb, identifier local isBoss = xPlayer.job.grade_name == 'boss' local xTarget = ESX.GetPlayerFromIdentifier(identifier) - if isBoss then - - if xTarget then - xTarget.setJob(job, grade) - - if actionType == 'hire' then - xTarget.showNotification(TranslateCap('you_have_been_hired', job)) - xPlayer.showNotification(TranslateCap("you_have_hired", xTarget.getName())) - elseif actionType == 'promote' then - xTarget.showNotification(TranslateCap('you_have_been_promoted')) - xPlayer.showNotification(TranslateCap("you_have_promoted", xTarget.getName(), xTarget.getJob().label)) - elseif actionType == 'fire' then - xTarget.showNotification(TranslateCap('you_have_been_fired', xTarget.getJob().label)) - xPlayer.showNotification(TranslateCap("you_have_fired", xTarget.getName())) - end - - cb() - else - MySQL.update('UPDATE users SET job = ?, job_grade = ? WHERE identifier = ?', {job, grade, identifier}, - function(rowsChanged) - cb() - end) - end - else + if not isBoss then print(('[^3WARNING^7] Player ^5%s^7 attempted to setJob for Player ^5%s^7!'):format(source, xTarget.source)) - cb() + return cb() end + + if not xTarget then + MySQL.update('UPDATE users SET job = ?, job_grade = ? WHERE identifier = ?', {job, grade, identifier}, + function() + cb() + end) + return + end + + xTarget.setJob(job, grade) + + if actionType == 'hire' then + xTarget.showNotification(TranslateCap('you_have_been_hired', job)) + xPlayer.showNotification(TranslateCap("you_have_hired", xTarget.getName())) + elseif actionType == 'promote' then + xTarget.showNotification(TranslateCap('you_have_been_promoted')) + xPlayer.showNotification(TranslateCap("you_have_promoted", xTarget.getName(), xTarget.getJob().label)) + elseif actionType == 'fire' then + xTarget.showNotification(TranslateCap('you_have_been_fired', xTarget.getJob().label)) + xPlayer.showNotification(TranslateCap("you_have_fired", xTarget.getName())) + end + + cb() end) From effd985898a373fbee6f9d1e353aee2c7c48e50f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?AL1=C6=8EN?= <72218928+johnsoul777@users.noreply.github.com> Date: Fri, 30 Dec 2022 15:56:21 +0100 Subject: [PATCH 14/58] Create es.js --- [esx]/esx_multicharacter/html/locales/es.js | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 [esx]/esx_multicharacter/html/locales/es.js diff --git a/[esx]/esx_multicharacter/html/locales/es.js b/[esx]/esx_multicharacter/html/locales/es.js new file mode 100644 index 00000000..b0791792 --- /dev/null +++ b/[esx]/esx_multicharacter/html/locales/es.js @@ -0,0 +1,8 @@ +const translate = new Object(); + +translate.name = "Nombre"; +translate.job = "Trabajo"; +translate.bank = "Banco"; +translate.money = "Dinero"; +translate.gender = "Género"; +translate.dob = "Fecha de nacimiento"; From 842f221b34930171ff5b70224db309dbb40ddd2f Mon Sep 17 00:00:00 2001 From: Liam Dormon <66041893+Mojito-Fivem@users.noreply.github.com> Date: Mon, 2 Jan 2023 17:06:59 +0000 Subject: [PATCH 15/58] Update readme.md --- readme.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/readme.md b/readme.md index 190c33e8..ec43d2de 100644 --- a/readme.md +++ b/readme.md @@ -22,7 +22,7 @@ Interested in helping us? [Take a look at our patreon](https://www.patreon.com/e ESX-legacy - ESX framework for FiveM -Copyright (C) 2015-2022 ESX-Framework +Copyright (C) 2015-2023 ESX-Framework This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. From 25441de8b35ffbb4e1bdf3b2a19b3c588f8b012d Mon Sep 17 00:00:00 2001 From: TheFarFantomas Date: Mon, 2 Jan 2023 18:57:43 +0100 Subject: [PATCH 16/58] New year licenses --- LICENSE | 4 ++-- [esx]/async/LICENSE | 4 ++-- [esx]/async/README.md | 2 +- [esx]/cron/LICENSE | 4 ++-- [esx]/cron/README.md | 2 +- [esx]/es_extended/LICENSE | 4 ++-- [esx]/esx_context/LICENSE | 4 ++-- [esx]/esx_identity/LICENSE | 4 ++-- [esx]/esx_identity/README.md | 2 +- [esx]/esx_loadingscreen/LICENSE | 4 ++-- [esx]/esx_loadingscreen/README.md | 2 +- [esx]/esx_menu_default/LICENSE | 4 ++-- [esx]/esx_menu_default/README.md | 2 +- [esx]/esx_menu_dialog/LICENSE | 4 ++-- [esx]/esx_menu_dialog/README.md | 2 +- [esx]/esx_menu_list/LICENSE | 4 ++-- [esx]/esx_menu_list/README.md | 2 +- [esx]/esx_multicharacter/readme.md | 2 +- [esx]/esx_notify/LICENSE | 4 ++-- [esx]/esx_notify/readme.md | 2 +- [esx]/esx_skin/LICENSE | 4 ++-- [esx]/esx_skin/README.md | 2 +- [esx]/esx_textui/LICENSE | 4 ++-- [esx]/esx_textui/readme.md | 2 +- [esx]/skinchanger/LICENSE | 4 ++-- [esx]/skinchanger/README.md | 2 +- [esx_addons]/esx_accessories/LICENSE | 4 ++-- [esx_addons]/esx_accessories/README.md | 2 +- [esx_addons]/esx_addonaccount/LICENSE | 4 ++-- [esx_addons]/esx_addonaccount/README.md | 2 +- [esx_addons]/esx_addoninventory/LICENSE | 4 ++-- [esx_addons]/esx_addoninventory/README.md | 2 +- [esx_addons]/esx_allowlist/LICENSE | 4 ++-- [esx_addons]/esx_allowlist/README.md | 2 +- [esx_addons]/esx_ambulancejob/LICENSE | 4 ++-- [esx_addons]/esx_ambulancejob/README.md | 2 +- [esx_addons]/esx_animations/LICENSE | 4 ++-- [esx_addons]/esx_animations/README.md | 2 +- [esx_addons]/esx_bankerjob/LICENSE | 4 ++-- [esx_addons]/esx_bankerjob/README.md | 2 +- [esx_addons]/esx_banking/LICENSE | 4 ++-- [esx_addons]/esx_banking/README.md | 2 +- [esx_addons]/esx_barbershop/LICENSE | 4 ++-- [esx_addons]/esx_barbershop/README.md | 2 +- [esx_addons]/esx_basicneeds/LICENSE | 4 ++-- [esx_addons]/esx_basicneeds/README.md | 2 +- [esx_addons]/esx_billing/LICENSE | 4 ++-- [esx_addons]/esx_billing/README.md | 2 +- [esx_addons]/esx_boat/LICENSE | 4 ++-- [esx_addons]/esx_boat/README.md | 2 +- [esx_addons]/esx_clotheshop/LICENSE | 4 ++-- [esx_addons]/esx_clotheshop/README.md | 2 +- [esx_addons]/esx_cruisecontrol/LICENSE | 4 ++-- [esx_addons]/esx_cruisecontrol/README.md | 2 +- [esx_addons]/esx_datastore/LICENSE | 4 ++-- [esx_addons]/esx_datastore/README.md | 2 +- [esx_addons]/esx_dmvschool/LICENSE | 4 ++-- [esx_addons]/esx_dmvschool/README.md | 2 +- [esx_addons]/esx_drugs/LICENSE | 4 ++-- [esx_addons]/esx_drugs/README.md | 2 +- [esx_addons]/esx_garage/LICENSE | 4 ++-- [esx_addons]/esx_holdup/LICENSE | 4 ++-- [esx_addons]/esx_holdup/README.md | 2 +- [esx_addons]/esx_joblisting/LICENSE | 4 ++-- [esx_addons]/esx_joblisting/README.md | 2 +- [esx_addons]/esx_jobs/LICENSE | 4 ++-- [esx_addons]/esx_jobs/README.md | 2 +- [esx_addons]/esx_license/LICENSE | 4 ++-- [esx_addons]/esx_lscustom/LICENSE | 4 ++-- [esx_addons]/esx_lscustom/README.md | 2 +- [esx_addons]/esx_mechanicjob/LICENSE | 4 ++-- [esx_addons]/esx_mechanicjob/README.md | 2 +- [esx_addons]/esx_optionalneeds/LICENSE | 4 ++-- [esx_addons]/esx_phone/LICENSE | 4 ++-- [esx_addons]/esx_phone/README.md | 2 +- [esx_addons]/esx_policejob/LICENSE | 4 ++-- [esx_addons]/esx_policejob/README.md | 2 +- [esx_addons]/esx_property/LICENSE | 4 ++-- [esx_addons]/esx_property/README.md | 2 +- [esx_addons]/esx_property/client/cctv.lua | 2 +- [esx_addons]/esx_property/client/furniture.lua | 2 +- [esx_addons]/esx_property/client/main.lua | 2 +- [esx_addons]/esx_property/config.lua | 2 +- [esx_addons]/esx_property/fxmanifest.lua | 2 +- [esx_addons]/esx_property/server/main.lua | 2 +- [esx_addons]/esx_rpchat/LICENSE | 4 ++-- [esx_addons]/esx_rpchat/README.md | 2 +- [esx_addons]/esx_service/LICENSE | 4 ++-- [esx_addons]/esx_service/README.md | 2 +- [esx_addons]/esx_shops/LICENSE | 4 ++-- [esx_addons]/esx_shops/README.md | 2 +- [esx_addons]/esx_sit/LICENSE | 4 ++-- [esx_addons]/esx_sit/README.md | 2 +- [esx_addons]/esx_society/LICENSE | 4 ++-- [esx_addons]/esx_society/README.md | 2 +- [esx_addons]/esx_status/LICENSE | 4 ++-- [esx_addons]/esx_taxijob/LICENSE | 4 ++-- [esx_addons]/esx_taxijob/README.md | 2 +- [esx_addons]/esx_vehicleshop/LICENSE | 4 ++-- [esx_addons]/esx_vehicleshop/README.md | 2 +- [esx_addons]/esx_weaponshop/LICENSE | 4 ++-- [esx_addons]/esx_weaponshop/README.md | 2 +- esx_example/LICENSE | 4 ++-- readme.md | 2 +- 104 files changed, 156 insertions(+), 156 deletions(-) diff --git a/LICENSE b/LICENSE index 506b94b4..c99ad3e4 100644 --- a/LICENSE +++ b/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx-legacy - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx-legacy Copyright (C) 2015-2022 Jérémie N'gadi + esx-legacy Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/async/LICENSE b/[esx]/async/LICENSE index 4c37e893..bde4f52b 100644 --- a/[esx]/async/LICENSE +++ b/[esx]/async/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. async - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - async Copyright (C) 2015-2022 Jérémie N'gadi + async Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/async/README.md b/[esx]/async/README.md index 9c76d28d..90afcc36 100644 --- a/[esx]/async/README.md +++ b/[esx]/async/README.md @@ -6,7 +6,7 @@ A very Simple resource that allows resources to run tasks asynchronously. async - asynchronous tasks. -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx]/cron/LICENSE b/[esx]/cron/LICENSE index 0f8d5811..e3b0b61c 100644 --- a/[esx]/cron/LICENSE +++ b/[esx]/cron/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. cron - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - cron Copyright (C) 2015-2022 Jérémie N'gadi + cron Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/cron/README.md b/[esx]/cron/README.md index 6dfe285b..e5291b69 100644 --- a/[esx]/cron/README.md +++ b/[esx]/cron/README.md @@ -28,7 +28,7 @@ TriggerEvent('cron:runAt', 18, 30, CronTask) cron - run tasks at specific intervals! -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx]/es_extended/LICENSE b/[esx]/es_extended/LICENSE index 53bf50d0..a10f2d96 100644 --- a/[esx]/es_extended/LICENSE +++ b/[esx]/es_extended/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. es_extended - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - es_extended Copyright (C) 2015-2022 Jérémie N'gadi + es_extended Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/esx_context/LICENSE b/[esx]/esx_context/LICENSE index 357d9c56..4b046bd2 100644 --- a/[esx]/esx_context/LICENSE +++ b/[esx]/esx_context/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_boat - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_boat Copyright (C) 2015-2022 Jérémie N'gadi + esx_boat Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/esx_identity/LICENSE b/[esx]/esx_identity/LICENSE index 9cba2328..4dc529f0 100644 --- a/[esx]/esx_identity/LICENSE +++ b/[esx]/esx_identity/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_identity - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_identity Copyright (C) 2015-2022 Jérémie N'gadi + esx_identity Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/esx_identity/README.md b/[esx]/esx_identity/README.md index f4053cad..404bba66 100644 --- a/[esx]/esx_identity/README.md +++ b/[esx]/esx_identity/README.md @@ -21,7 +21,7 @@ A Core Resource that Allows the player to Pick their characters, Name, Gender, H esx_identity - Make your Character a Person! -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx]/esx_loadingscreen/LICENSE b/[esx]/esx_loadingscreen/LICENSE index 1e4d06cf..85ce0959 100644 --- a/[esx]/esx_loadingscreen/LICENSE +++ b/[esx]/esx_loadingscreen/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_menu_default - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_menu_default Copyright (C) 2015-2022 Jérémie N'gadi + esx_menu_default Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/esx_loadingscreen/README.md b/[esx]/esx_loadingscreen/README.md index 887a000d..d5925203 100644 --- a/[esx]/esx_loadingscreen/README.md +++ b/[esx]/esx_loadingscreen/README.md @@ -6,7 +6,7 @@ A simple but beautiful Loading Screen for your server! esx_loadingscreen - Loading in style! -Copyright (C) 2022 ESX-Framework +Copyright (C) 2023 ESX-Framework This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx]/esx_menu_default/LICENSE b/[esx]/esx_menu_default/LICENSE index 1e4d06cf..85ce0959 100644 --- a/[esx]/esx_menu_default/LICENSE +++ b/[esx]/esx_menu_default/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_menu_default - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_menu_default Copyright (C) 2015-2022 Jérémie N'gadi + esx_menu_default Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/esx_menu_default/README.md b/[esx]/esx_menu_default/README.md index 698365da..83584ce1 100644 --- a/[esx]/esx_menu_default/README.md +++ b/[esx]/esx_menu_default/README.md @@ -9,7 +9,7 @@ A defualt List type menu for ESX. esx_menu_defualt - Default Menu! -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx]/esx_menu_dialog/LICENSE b/[esx]/esx_menu_dialog/LICENSE index 5d570bfa..2a78c4ae 100644 --- a/[esx]/esx_menu_dialog/LICENSE +++ b/[esx]/esx_menu_dialog/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_menu_dialog - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_menu_dialog Copyright (C) 2015-2022 Jérémie N'gadi + esx_menu_dialog Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/esx_menu_dialog/README.md b/[esx]/esx_menu_dialog/README.md index a6af27e7..e1d9c85a 100644 --- a/[esx]/esx_menu_dialog/README.md +++ b/[esx]/esx_menu_dialog/README.md @@ -29,7 +29,7 @@ start esx_menu_dialog ### License esx_menu_dialog - input dialog for ESX -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx]/esx_menu_list/LICENSE b/[esx]/esx_menu_list/LICENSE index 65d7dded..4b6f6d2e 100644 --- a/[esx]/esx_menu_list/LICENSE +++ b/[esx]/esx_menu_list/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_menu_list - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_menu_list Copyright (C) 2015-2022 Jérémie N'gadi + esx_menu_list Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/esx_menu_list/README.md b/[esx]/esx_menu_list/README.md index 7f8d2802..173045d2 100644 --- a/[esx]/esx_menu_list/README.md +++ b/[esx]/esx_menu_list/README.md @@ -29,7 +29,7 @@ start esx_menu_list ### License esx_menu_list - advanced menu inputs for ESX -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx]/esx_multicharacter/readme.md b/[esx]/esx_multicharacter/readme.md index f308c2c8..da200fb6 100644 --- a/[esx]/esx_multicharacter/readme.md +++ b/[esx]/esx_multicharacter/readme.md @@ -23,7 +23,7 @@ A Simple, Easy to Use resource, that allows Players to have multiple Characters, ## Notice -Copyright © 2022 [Linden](https://github.com/thelindat/), ESX-Framework (fournier Brice & Jérémie N'gadi) and KASH +Copyright © 2023 [Linden](https://github.com/thelindat/), ESX-Framework (fournier Brice & Jérémie N'gadi) and KASH This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/[esx]/esx_notify/LICENSE b/[esx]/esx_notify/LICENSE index 1e4d06cf..85ce0959 100644 --- a/[esx]/esx_notify/LICENSE +++ b/[esx]/esx_notify/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_menu_default - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_menu_default Copyright (C) 2015-2022 Jérémie N'gadi + esx_menu_default Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/esx_notify/readme.md b/[esx]/esx_notify/readme.md index b41801d5..b5499924 100644 --- a/[esx]/esx_notify/readme.md +++ b/[esx]/esx_notify/readme.md @@ -55,7 +55,7 @@ ESX.ShowNotification("I i ~r~love~s~ donuts", "success", 3000) esx_notify- Notify! -Copyright (C) 2022 ESX-Framework +Copyright (C) 2023 ESX-Framework This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx]/esx_skin/LICENSE b/[esx]/esx_skin/LICENSE index a8eb3e5f..f8a9de97 100644 --- a/[esx]/esx_skin/LICENSE +++ b/[esx]/esx_skin/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_skin - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_skin Copyright (C) 2015-2022 Jérémie N'gadi + esx_skin Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/esx_skin/README.md b/[esx]/esx_skin/README.md index 6b73bdac..d66db978 100644 --- a/[esx]/esx_skin/README.md +++ b/[esx]/esx_skin/README.md @@ -32,7 +32,7 @@ start esx_skin ### License esx_skin - skin selector for ESX -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx]/esx_textui/LICENSE b/[esx]/esx_textui/LICENSE index 1e4d06cf..85ce0959 100644 --- a/[esx]/esx_textui/LICENSE +++ b/[esx]/esx_textui/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_menu_default - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_menu_default Copyright (C) 2015-2022 Jérémie N'gadi + esx_menu_default Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/esx_textui/readme.md b/[esx]/esx_textui/readme.md index f5070555..b9197d6c 100644 --- a/[esx]/esx_textui/readme.md +++ b/[esx]/esx_textui/readme.md @@ -43,7 +43,7 @@ ESX.TextUI("i ~r~love~s~ donuts", "error") esx_textui - Persistant Notifications! -Copyright (C) 2022 ESX-Framework +Copyright (C) 2023 ESX-Framework This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx]/skinchanger/LICENSE b/[esx]/skinchanger/LICENSE index 22b3a7be..79cea11b 100644 --- a/[esx]/skinchanger/LICENSE +++ b/[esx]/skinchanger/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. skinchanger - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - skinchanger Copyright (C) 2015-2022 Jérémie N'gadi + skinchanger Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx]/skinchanger/README.md b/[esx]/skinchanger/README.md index fd03c3cf..525a62f1 100644 --- a/[esx]/skinchanger/README.md +++ b/[esx]/skinchanger/README.md @@ -73,7 +73,7 @@ end) skinchanger - Own your skin! -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_accessories/LICENSE b/[esx_addons]/esx_accessories/LICENSE index c990bf6d..08caf3c7 100644 --- a/[esx_addons]/esx_accessories/LICENSE +++ b/[esx_addons]/esx_accessories/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_accessories - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-20202322 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_accessories Copyright (C) 2015-2022 Jérémie N'gadi + esx_accessories Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_accessories/README.md b/[esx_addons]/esx_accessories/README.md index 3aa5d99a..2ed2e25f 100644 --- a/[esx_addons]/esx_accessories/README.md +++ b/[esx_addons]/esx_accessories/README.md @@ -13,7 +13,7 @@ Shops with accessories (hat/helmet, glasses, masks, ears accessories). You can p esx_accessories - accessories 4 you! -Copyright (C) 2015-2022 ESX-Framework +Copyright (C) 2015-2023 ESX-Framework This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_addonaccount/LICENSE b/[esx_addons]/esx_addonaccount/LICENSE index 84e62eb2..b7ae27ce 100644 --- a/[esx_addons]/esx_addonaccount/LICENSE +++ b/[esx_addons]/esx_addonaccount/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_addonaccount - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_addonaccount Copyright (C) 2015-2022 Jérémie N'gadi + esx_addonaccount Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_addonaccount/README.md b/[esx_addons]/esx_addonaccount/README.md index 34242b98..c11c2243 100644 --- a/[esx_addons]/esx_addonaccount/README.md +++ b/[esx_addons]/esx_addonaccount/README.md @@ -31,7 +31,7 @@ end) esx_addonaccount - addon account for ESX -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_addoninventory/LICENSE b/[esx_addons]/esx_addoninventory/LICENSE index b13054b5..20f597d2 100644 --- a/[esx_addons]/esx_addoninventory/LICENSE +++ b/[esx_addons]/esx_addoninventory/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_addoninventory - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_addoninventory Copyright (C) 2015-2022 Jérémie N'gadi + esx_addoninventory Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_addoninventory/README.md b/[esx_addons]/esx_addoninventory/README.md index ecf72bc5..f3ecab51 100644 --- a/[esx_addons]/esx_addoninventory/README.md +++ b/[esx_addons]/esx_addoninventory/README.md @@ -52,7 +52,7 @@ end) ### License esx_addoninventory - inventories! -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_allowlist/LICENSE b/[esx_addons]/esx_allowlist/LICENSE index ba3b7265..22da85db 100644 --- a/[esx_addons]/esx_allowlist/LICENSE +++ b/[esx_addons]/esx_allowlist/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_whitelist - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_whitelist Copyright (C) 2015-2022 Jérémie N'gadi + esx_whitelist Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_allowlist/README.md b/[esx_addons]/esx_allowlist/README.md index 010ba7e4..c8dc7c27 100644 --- a/[esx_addons]/esx_allowlist/README.md +++ b/[esx_addons]/esx_allowlist/README.md @@ -7,7 +7,7 @@ This Script allows you to block all players from joining and specify the only pl esx_allowlist- block those evil intruders! -Copyright (C) 2022 ESX-Framework +Copyright (C) 2023 ESX-Framework This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_ambulancejob/LICENSE b/[esx_addons]/esx_ambulancejob/LICENSE index 5b386246..e80d4d2d 100644 --- a/[esx_addons]/esx_ambulancejob/LICENSE +++ b/[esx_addons]/esx_ambulancejob/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_ambulancejob - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_ambulancejob Copyright (C) 2015-2022 Jérémie N'gadi + esx_ambulancejob Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_ambulancejob/README.md b/[esx_addons]/esx_ambulancejob/README.md index 485f70df..05cce532 100644 --- a/[esx_addons]/esx_ambulancejob/README.md +++ b/[esx_addons]/esx_ambulancejob/README.md @@ -22,7 +22,7 @@ ESX Ambulance Job is an plugin for ESX with features: esx_ambulancejob - ambulance script for fivem -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_animations/LICENSE b/[esx_addons]/esx_animations/LICENSE index caf36e98..b96291b4 100644 --- a/[esx_addons]/esx_animations/LICENSE +++ b/[esx_addons]/esx_animations/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_animations - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_animations Copyright (C) 2015-2022 Jérémie N'gadi + esx_animations Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_animations/README.md b/[esx_addons]/esx_animations/README.md index 55451cd6..2aa85189 100644 --- a/[esx_addons]/esx_animations/README.md +++ b/[esx_addons]/esx_animations/README.md @@ -28,7 +28,7 @@ start esx_animations ### License esx_animations - play anims! -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_bankerjob/LICENSE b/[esx_addons]/esx_bankerjob/LICENSE index 86ecbcaf..4410e5f1 100644 --- a/[esx_addons]/esx_bankerjob/LICENSE +++ b/[esx_addons]/esx_bankerjob/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_bankerjob - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_bankerjob Copyright (C) 2015-2022 Jérémie N'gadi + esx_bankerjob Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_bankerjob/README.md b/[esx_addons]/esx_bankerjob/README.md index 545fdb0e..68250d5d 100644 --- a/[esx_addons]/esx_bankerjob/README.md +++ b/[esx_addons]/esx_bankerjob/README.md @@ -35,7 +35,7 @@ start esx_bankerjob ### License esx_bankerjob - bank script -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_banking/LICENSE b/[esx_addons]/esx_banking/LICENSE index 5b3771ae..7c2c49f9 100644 --- a/[esx_addons]/esx_banking/LICENSE +++ b/[esx_addons]/esx_banking/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_banking - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_banking Copyright (C) 2015-2022 Jérémie N'gadi + esx_banking Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_banking/README.md b/[esx_addons]/esx_banking/README.md index bbe28230..2966a97a 100644 --- a/[esx_addons]/esx_banking/README.md +++ b/[esx_addons]/esx_banking/README.md @@ -44,7 +44,7 @@ For example: exports["esx_banking"]:logTransaction(source,"WITHDRAW",200) ### License esx_banking - banking script for ESX -Copyright (C) 2022 ESX-Framework +Copyright (C) 2023 ESX-Framework This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_barbershop/LICENSE b/[esx_addons]/esx_barbershop/LICENSE index 5575ab2c..8dbb3010 100644 --- a/[esx_addons]/esx_barbershop/LICENSE +++ b/[esx_addons]/esx_barbershop/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_barbershop - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_barbershop Copyright (C) 2015-2022 Jérémie N'gadi + esx_barbershop Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_barbershop/README.md b/[esx_addons]/esx_barbershop/README.md index dbd5cd6e..7a097fa5 100644 --- a/[esx_addons]/esx_barbershop/README.md +++ b/[esx_addons]/esx_barbershop/README.md @@ -31,7 +31,7 @@ start esx_barbershop ### License esx_barbershop - barber shop! -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_basicneeds/LICENSE b/[esx_addons]/esx_basicneeds/LICENSE index e315a449..9cb95752 100644 --- a/[esx_addons]/esx_basicneeds/LICENSE +++ b/[esx_addons]/esx_basicneeds/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_basicneeds - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_basicneeds Copyright (C) 2015-2022 Jérémie N'gadi + esx_basicneeds Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_basicneeds/README.md b/[esx_addons]/esx_basicneeds/README.md index 0a3bfe24..b089eeb3 100644 --- a/[esx_addons]/esx_basicneeds/README.md +++ b/[esx_addons]/esx_basicneeds/README.md @@ -34,7 +34,7 @@ start esx_basicneeds ### License esx_basicneeds - thirst and hunger system -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_billing/LICENSE b/[esx_addons]/esx_billing/LICENSE index b2029366..65dd8c53 100644 --- a/[esx_addons]/esx_billing/LICENSE +++ b/[esx_addons]/esx_billing/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_billing - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_billing Copyright (C) 2015-2022 Jérémie N'gadi + esx_billing Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_billing/README.md b/[esx_addons]/esx_billing/README.md index dc399931..cf498c85 100644 --- a/[esx_addons]/esx_billing/README.md +++ b/[esx_addons]/esx_billing/README.md @@ -48,7 +48,7 @@ end ### License esx_billing - billing for ESX -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_boat/LICENSE b/[esx_addons]/esx_boat/LICENSE index 357d9c56..4b046bd2 100644 --- a/[esx_addons]/esx_boat/LICENSE +++ b/[esx_addons]/esx_boat/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_boat - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_boat Copyright (C) 2015-2022 Jérémie N'gadi + esx_boat Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_boat/README.md b/[esx_addons]/esx_boat/README.md index 4edd6200..683d7473 100644 --- a/[esx_addons]/esx_boat/README.md +++ b/[esx_addons]/esx_boat/README.md @@ -33,7 +33,7 @@ start esx_boat ### License esx_boat - Boat shop and garage for ESX -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_clotheshop/LICENSE b/[esx_addons]/esx_clotheshop/LICENSE index fce3a988..2aa46e29 100644 --- a/[esx_addons]/esx_clotheshop/LICENSE +++ b/[esx_addons]/esx_clotheshop/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_clotheshop - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_clotheshop Copyright (C) 2015-2022 Jérémie N'gadi + esx_clotheshop Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_clotheshop/README.md b/[esx_addons]/esx_clotheshop/README.md index 670003b2..7abeed76 100644 --- a/[esx_addons]/esx_clotheshop/README.md +++ b/[esx_addons]/esx_clotheshop/README.md @@ -6,7 +6,7 @@ It`s time to shine! Head over to the variety of stores this resource adds - to G esx_clotheshop - clothing store -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_cruisecontrol/LICENSE b/[esx_addons]/esx_cruisecontrol/LICENSE index 4c37e893..bde4f52b 100644 --- a/[esx_addons]/esx_cruisecontrol/LICENSE +++ b/[esx_addons]/esx_cruisecontrol/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. async - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - async Copyright (C) 2015-2022 Jérémie N'gadi + async Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_cruisecontrol/README.md b/[esx_addons]/esx_cruisecontrol/README.md index 83851a35..6dc3ccd4 100644 --- a/[esx_addons]/esx_cruisecontrol/README.md +++ b/[esx_addons]/esx_cruisecontrol/README.md @@ -4,7 +4,7 @@ esx_cruisecontrol - relaxing driving -Copyright (C) 2015-2022 ESX-Framework +Copyright (C) 2015-2023 ESX-Framework This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_datastore/LICENSE b/[esx_addons]/esx_datastore/LICENSE index 52fcac84..2c5acd2b 100644 --- a/[esx_addons]/esx_datastore/LICENSE +++ b/[esx_addons]/esx_datastore/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_datastore - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_datastore Copyright (C) 2015-2022 Jérémie N'gadi + esx_datastore Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_datastore/README.md b/[esx_addons]/esx_datastore/README.md index 8f38d289..0ffe8a85 100644 --- a/[esx_addons]/esx_datastore/README.md +++ b/[esx_addons]/esx_datastore/README.md @@ -34,7 +34,7 @@ end) esx_datastore - Datastore for ESX-Framework -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_dmvschool/LICENSE b/[esx_addons]/esx_dmvschool/LICENSE index 943cff70..15cc6189 100644 --- a/[esx_addons]/esx_dmvschool/LICENSE +++ b/[esx_addons]/esx_dmvschool/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_dmvschool - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_dmvschool Copyright (C) 2015-2022 Jérémie N'gadi + esx_dmvschool Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_dmvschool/README.md b/[esx_addons]/esx_dmvschool/README.md index 315cdcfa..785f2f58 100644 --- a/[esx_addons]/esx_dmvschool/README.md +++ b/[esx_addons]/esx_dmvschool/README.md @@ -6,7 +6,7 @@ Tired of waiting for your local DMV to be free so you can get your driving licen esx_dmvschool - realistic DMV school for ESX -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_drugs/LICENSE b/[esx_addons]/esx_drugs/LICENSE index 394fc45a..c52fbcb5 100644 --- a/[esx_addons]/esx_drugs/LICENSE +++ b/[esx_addons]/esx_drugs/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_drugs - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_drugs Copyright (C) 2015-2022 Jérémie N'gadi + esx_drugs Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_drugs/README.md b/[esx_addons]/esx_drugs/README.md index 95f0481e..07a675db 100644 --- a/[esx_addons]/esx_drugs/README.md +++ b/[esx_addons]/esx_drugs/README.md @@ -6,7 +6,7 @@ Who loves some good old Marijuana? I hope you do! Cause this resource lets you g esx_drugs - Drugs Job -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_garage/LICENSE b/[esx_addons]/esx_garage/LICENSE index 81473243..4b0e8316 100644 --- a/[esx_addons]/esx_garage/LICENSE +++ b/[esx_addons]/esx_garage/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_garage - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_garage Copyright (C) 2015-2022 Jérémie N'gadi + esx_garage Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_holdup/LICENSE b/[esx_addons]/esx_holdup/LICENSE index 288b1eee..a65d7691 100644 --- a/[esx_addons]/esx_holdup/LICENSE +++ b/[esx_addons]/esx_holdup/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_holdup - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_holdup Copyright (C) 2015-2022 Jérémie N'gadi + esx_holdup Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_holdup/README.md b/[esx_addons]/esx_holdup/README.md index 251f1999..141e02da 100644 --- a/[esx_addons]/esx_holdup/README.md +++ b/[esx_addons]/esx_holdup/README.md @@ -6,7 +6,7 @@ esx_holdup - rob stores! -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_joblisting/LICENSE b/[esx_addons]/esx_joblisting/LICENSE index 428c413b..505256b5 100644 --- a/[esx_addons]/esx_joblisting/LICENSE +++ b/[esx_addons]/esx_joblisting/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_joblisting - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_joblisting Copyright (C) 2015-2022 Jérémie N'gadi + esx_joblisting Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_joblisting/README.md b/[esx_addons]/esx_joblisting/README.md index a8e4cfd5..66cf64d2 100644 --- a/[esx_addons]/esx_joblisting/README.md +++ b/[esx_addons]/esx_joblisting/README.md @@ -6,7 +6,7 @@ This Simple resource lets you finally contribute to Society and make a differenc esx_joblisting - virtual Job Center! -Copyright (C) 2015-2022 Jérémie N'gadi, ESX-Framework +Copyright (C) 2015-2023 Jérémie N'gadi, ESX-Framework This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_jobs/LICENSE b/[esx_addons]/esx_jobs/LICENSE index 2f5a7768..e5461dfb 100644 --- a/[esx_addons]/esx_jobs/LICENSE +++ b/[esx_addons]/esx_jobs/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_jobs - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_jobs Copyright (C) 2015-2022 Jérémie N'gadi + esx_jobs Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_jobs/README.md b/[esx_addons]/esx_jobs/README.md index dc17072b..71762a83 100644 --- a/[esx_addons]/esx_jobs/README.md +++ b/[esx_addons]/esx_jobs/README.md @@ -39,7 +39,7 @@ CloakRoom = { esx_jobs - jobs -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_license/LICENSE b/[esx_addons]/esx_license/LICENSE index 12aff000..6a52769c 100644 --- a/[esx_addons]/esx_license/LICENSE +++ b/[esx_addons]/esx_license/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_license - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_license Copyright (C) 2015-2022 Jérémie N'gadi + esx_license Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_lscustom/LICENSE b/[esx_addons]/esx_lscustom/LICENSE index 3d886edd..da132c68 100644 --- a/[esx_addons]/esx_lscustom/LICENSE +++ b/[esx_addons]/esx_lscustom/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_lscustom - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_lscustom Copyright (C) 2015-2022 Jérémie N'gadi + esx_lscustom Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_lscustom/README.md b/[esx_addons]/esx_lscustom/README.md index dd0044de..26aea734 100644 --- a/[esx_addons]/esx_lscustom/README.md +++ b/[esx_addons]/esx_lscustom/README.md @@ -8,7 +8,7 @@ esx_lscustoms - The best LS Custom out there for FX -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_mechanicjob/LICENSE b/[esx_addons]/esx_mechanicjob/LICENSE index e345d8e8..6bcf52f9 100644 --- a/[esx_addons]/esx_mechanicjob/LICENSE +++ b/[esx_addons]/esx_mechanicjob/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_mechanicjob - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_mechanicjob Copyright (C) 2015-2022 Jérémie N'gadi + esx_mechanicjob Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_mechanicjob/README.md b/[esx_addons]/esx_mechanicjob/README.md index 9e3cbbbc..803a3eed 100644 --- a/[esx_addons]/esx_mechanicjob/README.md +++ b/[esx_addons]/esx_mechanicjob/README.md @@ -39,7 +39,7 @@ start esx_mechanicjob ### License esx_mechanicjob - mechanic job for ESX -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_optionalneeds/LICENSE b/[esx_addons]/esx_optionalneeds/LICENSE index d287dfac..a88e7c97 100644 --- a/[esx_addons]/esx_optionalneeds/LICENSE +++ b/[esx_addons]/esx_optionalneeds/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_optionalneeds - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_optionalneeds Copyright (C) 2015-2022 Jérémie N'gadi + esx_optionalneeds Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_phone/LICENSE b/[esx_addons]/esx_phone/LICENSE index b949e529..8c137bd7 100644 --- a/[esx_addons]/esx_phone/LICENSE +++ b/[esx_addons]/esx_phone/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_phone - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_phone Copyright (C) 2015-2022 Jérémie N'gadi + esx_phone Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_phone/README.md b/[esx_addons]/esx_phone/README.md index 3aa9b510..9701790c 100644 --- a/[esx_addons]/esx_phone/README.md +++ b/[esx_addons]/esx_phone/README.md @@ -60,7 +60,7 @@ last two booleans are optional ### License esx_phone - phone script for fivem -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_policejob/LICENSE b/[esx_addons]/esx_policejob/LICENSE index 8bdc134d..0c07e1b1 100644 --- a/[esx_addons]/esx_policejob/LICENSE +++ b/[esx_addons]/esx_policejob/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_policejob - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_policejob Copyright (C) 2015-2022 Jérémie N'gadi + esx_policejob Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_policejob/README.md b/[esx_addons]/esx_policejob/README.md index 94be092a..64463d85 100644 --- a/[esx_addons]/esx_policejob/README.md +++ b/[esx_addons]/esx_policejob/README.md @@ -59,7 +59,7 @@ start esx_policejob ### License esx_policejob - police script for ESX -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_property/LICENSE b/[esx_addons]/esx_property/LICENSE index 5c0cc627..359e1a62 100644 --- a/[esx_addons]/esx_property/LICENSE +++ b/[esx_addons]/esx_property/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. ESX Property - Properties Made Right! - Copyright (C) 2022 ESX-Framework + Copyright (C) 2023 ESX-Framework This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx-legacy Copyright (C) 2015-2022 Jérémie N'gadi + esx-legacy Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_property/README.md b/[esx_addons]/esx_property/README.md index b83c47e1..4ebc3d9a 100644 --- a/[esx_addons]/esx_property/README.md +++ b/[esx_addons]/esx_property/README.md @@ -78,7 +78,7 @@ # Copyright ESX Property - Properties Made Right! - Copyright (C) 2022 ESX-Framework + Copyright (C) 2023 ESX-Framework This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/[esx_addons]/esx_property/client/cctv.lua b/[esx_addons]/esx_property/client/cctv.lua index 05b46c25..3ef2f663 100644 --- a/[esx_addons]/esx_property/client/cctv.lua +++ b/[esx_addons]/esx_property/client/cctv.lua @@ -1,6 +1,6 @@ --[[ ESX Property - Properties Made Right! - Copyright (C) 2022 ESX-Framework + Copyright (C) 2023 ESX-Framework This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/[esx_addons]/esx_property/client/furniture.lua b/[esx_addons]/esx_property/client/furniture.lua index 52314fc2..c7bcc370 100644 --- a/[esx_addons]/esx_property/client/furniture.lua +++ b/[esx_addons]/esx_property/client/furniture.lua @@ -1,6 +1,6 @@ --[[ ESX Property - Properties Made Right! - Copyright (C) 2022 ESX-Framework + Copyright (C) 2023 ESX-Framework This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/[esx_addons]/esx_property/client/main.lua b/[esx_addons]/esx_property/client/main.lua index 9c2fd4f2..df7b2a60 100644 --- a/[esx_addons]/esx_property/client/main.lua +++ b/[esx_addons]/esx_property/client/main.lua @@ -1,6 +1,6 @@ --[[ ESX Property - Properties Made Right! - Copyright (C) 2022 ESX-Framework + Copyright (C) 2023 ESX-Framework This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/[esx_addons]/esx_property/config.lua b/[esx_addons]/esx_property/config.lua index 814a18c8..68ed348b 100644 --- a/[esx_addons]/esx_property/config.lua +++ b/[esx_addons]/esx_property/config.lua @@ -648,7 +648,7 @@ end -- --[[ ESX Property - Properties Made Right! - Copyright (C) 2022 ESX-Framework + Copyright (C) 2023 ESX-Framework This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/[esx_addons]/esx_property/fxmanifest.lua b/[esx_addons]/esx_property/fxmanifest.lua index e14af88a..dd288d2a 100644 --- a/[esx_addons]/esx_property/fxmanifest.lua +++ b/[esx_addons]/esx_property/fxmanifest.lua @@ -1,6 +1,6 @@ --[[ ESX Property - Properties Made Right! - Copyright (C) 2022 ESX-Framework + Copyright (C) 2023 ESX-Framework This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/[esx_addons]/esx_property/server/main.lua b/[esx_addons]/esx_property/server/main.lua index fc55b196..b774e2c2 100644 --- a/[esx_addons]/esx_property/server/main.lua +++ b/[esx_addons]/esx_property/server/main.lua @@ -1,6 +1,6 @@ --[[ ESX Property - Properties Made Right! - Copyright (C) 2022 ESX-Framework + Copyright (C) 2023 ESX-Framework This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff --git a/[esx_addons]/esx_rpchat/LICENSE b/[esx_addons]/esx_rpchat/LICENSE index ad893f36..44dad71d 100644 --- a/[esx_addons]/esx_rpchat/LICENSE +++ b/[esx_addons]/esx_rpchat/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_rpchat - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_rpchat Copyright (C) 2015-2022 Jérémie N'gadi + esx_rpchat Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_rpchat/README.md b/[esx_addons]/esx_rpchat/README.md index af0a838d..93c6f10d 100644 --- a/[esx_addons]/esx_rpchat/README.md +++ b/[esx_addons]/esx_rpchat/README.md @@ -8,7 +8,7 @@ This Resource adds a proximity chat along with a few cool commands such as `/me` esx_rpchat - Chat closely with your friends. -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_service/LICENSE b/[esx_addons]/esx_service/LICENSE index eac4b489..85b9ebc1 100644 --- a/[esx_addons]/esx_service/LICENSE +++ b/[esx_addons]/esx_service/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_service - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_service Copyright (C) 2015-2022 Jérémie N'gadi + esx_service Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_service/README.md b/[esx_addons]/esx_service/README.md index ffab4b99..5011ad8e 100644 --- a/[esx_addons]/esx_service/README.md +++ b/[esx_addons]/esx_service/README.md @@ -45,7 +45,7 @@ TriggerServerEvent('esx_service:disableService', 'taxi') ### License esx_service - be in service -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_shops/LICENSE b/[esx_addons]/esx_shops/LICENSE index 94ce5fde..2eb0d447 100644 --- a/[esx_addons]/esx_shops/LICENSE +++ b/[esx_addons]/esx_shops/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_shops - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_shops Copyright (C) 2015-2022 Jérémie N'gadi + esx_shops Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_shops/README.md b/[esx_addons]/esx_shops/README.md index cc3f64c4..e3663f76 100644 --- a/[esx_addons]/esx_shops/README.md +++ b/[esx_addons]/esx_shops/README.md @@ -6,7 +6,7 @@ This Resource allows Players to shop til they Drop! You Configure *everything* w esx_shops - shop til you drop! -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_sit/LICENSE b/[esx_addons]/esx_sit/LICENSE index abd995da..815cf569 100644 --- a/[esx_addons]/esx_sit/LICENSE +++ b/[esx_addons]/esx_sit/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_sit - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_sit Copyright (C) 2015-2022 Jérémie N'gadi + esx_sit Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_sit/README.md b/[esx_addons]/esx_sit/README.md index ab959e15..8c2394ea 100644 --- a/[esx_addons]/esx_sit/README.md +++ b/[esx_addons]/esx_sit/README.md @@ -40,7 +40,7 @@ start esx_sit esx_sit -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_society/LICENSE b/[esx_addons]/esx_society/LICENSE index 7df46759..7e48fa64 100644 --- a/[esx_addons]/esx_society/LICENSE +++ b/[esx_addons]/esx_society/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_society - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_society Copyright (C) 2015-2022 Jérémie N'gadi + esx_society Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_society/README.md b/[esx_addons]/esx_society/README.md index 444a73eb..faf73f4a 100644 --- a/[esx_addons]/esx_society/README.md +++ b/[esx_addons]/esx_society/README.md @@ -53,7 +53,7 @@ end, {wash = false}) -- set custom options, e.g disable washing ### License esx_society - societies for ESX -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_status/LICENSE b/[esx_addons]/esx_status/LICENSE index 465e6237..94ab435b 100644 --- a/[esx_addons]/esx_status/LICENSE +++ b/[esx_addons]/esx_status/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_status - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_status Copyright (C) 2015-2022 Jérémie N'gadi + esx_status Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_taxijob/LICENSE b/[esx_addons]/esx_taxijob/LICENSE index 81cfaa77..fc21cd6d 100644 --- a/[esx_addons]/esx_taxijob/LICENSE +++ b/[esx_addons]/esx_taxijob/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_taxijob - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_taxijob Copyright (C) 2015-2022 Jérémie N'gadi + esx_taxijob Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_taxijob/README.md b/[esx_addons]/esx_taxijob/README.md index b565b943..5dd6555f 100644 --- a/[esx_addons]/esx_taxijob/README.md +++ b/[esx_addons]/esx_taxijob/README.md @@ -6,7 +6,7 @@ This Resource allows you to drive a fancy Taxi to pickup players , charge them p esx_taxijob: Taxi Service - Anyone Need a Taxi?! -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_vehicleshop/LICENSE b/[esx_addons]/esx_vehicleshop/LICENSE index f3e09b14..6e19af18 100644 --- a/[esx_addons]/esx_vehicleshop/LICENSE +++ b/[esx_addons]/esx_vehicleshop/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_vehicleshop - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_vehicleshop Copyright (C) 2015-2022 Jérémie N'gadi + esx_vehicleshop Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_vehicleshop/README.md b/[esx_addons]/esx_vehicleshop/README.md index bfcbad27..6a29ca24 100644 --- a/[esx_addons]/esx_vehicleshop/README.md +++ b/[esx_addons]/esx_vehicleshop/README.md @@ -50,7 +50,7 @@ start esx_vehicleshop esx_vehicleshop - vehicle shop for ESX -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/[esx_addons]/esx_weaponshop/LICENSE b/[esx_addons]/esx_weaponshop/LICENSE index c774b8ff..1c4d0127 100644 --- a/[esx_addons]/esx_weaponshop/LICENSE +++ b/[esx_addons]/esx_weaponshop/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_weaponshop - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_weaponshop Copyright (C) 2015-2022 Jérémie N'gadi + esx_weaponshop Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/[esx_addons]/esx_weaponshop/README.md b/[esx_addons]/esx_weaponshop/README.md index fd7b5af5..c19b7e43 100644 --- a/[esx_addons]/esx_weaponshop/README.md +++ b/[esx_addons]/esx_weaponshop/README.md @@ -6,7 +6,7 @@ Would it be Los-Santos Without some weapons? No! This resource lets Players spen esx_weaponshop - America Simulator! -Copyright (C) 2015-2022 Jérémie N'gadi +Copyright (C) 2015-2023 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. diff --git a/esx_example/LICENSE b/esx_example/LICENSE index 204368d4..9f54b358 100644 --- a/esx_example/LICENSE +++ b/esx_example/LICENSE @@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. esx_example - Copyright (C) 2015-2022 Jérémie N'gadi + Copyright (C) 2015-2023 Jérémie N'gadi This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail. If the program does terminal interaction, make it output a short notice like this when it starts in an interactive mode: - esx_example Copyright (C) 2015-2022 Jérémie N'gadi + esx_example Copyright (C) 2015-2023 Jérémie N'gadi This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. diff --git a/readme.md b/readme.md index 190c33e8..ec43d2de 100644 --- a/readme.md +++ b/readme.md @@ -22,7 +22,7 @@ Interested in helping us? [Take a look at our patreon](https://www.patreon.com/e ESX-legacy - ESX framework for FiveM -Copyright (C) 2015-2022 ESX-Framework +Copyright (C) 2015-2023 ESX-Framework This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. From 63215f7e2d66676dc6c06c7592e6a8ce48264f00 Mon Sep 17 00:00:00 2001 From: TheFarFantomas Date: Mon, 2 Jan 2023 19:00:01 +0100 Subject: [PATCH 17/58] Edit date in esx_identity --- [esx]/esx_identity/config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx]/esx_identity/config.lua b/[esx]/esx_identity/config.lua index 8cdd9bb7..8eeb007c 100644 --- a/[esx]/esx_identity/config.lua +++ b/[esx]/esx_identity/config.lua @@ -17,7 +17,7 @@ Config.MaxNameLength = 20 -- Max Name Length. Config.MinHeight = 120 -- 120 cm lowest height Config.MaxHeight = 220 -- 220 cm max height. Config.LowestYear = 1900 -- 112 years old is the oldest you can be. -Config.HighestYear = 2003 -- 18 years old is the youngest you can be. +Config.HighestYear = 2005 -- 18 years old is the youngest you can be. Config.FullCharDelete = true -- Delete all reference to character. Config.EnableDebugging = ESX.GetConfig().EnableDebug -- prints for debugging :) From 5b2509b2fa278948d2ebaa1ffdb8510f56d895b2 Mon Sep 17 00:00:00 2001 From: Mycroft Date: Tue, 3 Jan 2023 23:14:27 +0000 Subject: [PATCH 18/58] feat(es_extended): add message to event --- [esx]/es_extended/client/common.lua | 5 +++++ [esx]/es_extended/server/common.lua | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/[esx]/es_extended/client/common.lua b/[esx]/es_extended/client/common.lua index 26020ace..c088fb90 100644 --- a/[esx]/es_extended/client/common.lua +++ b/[esx]/es_extended/client/common.lua @@ -5,3 +5,8 @@ end) if GetResourceState('ox_inventory') ~= 'missing' then Config.OxInventory = true end + +AddEventHandler("esx:getSharedObject", function() + local Invoke = GetInvokingResource() + print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/sharedevent for how to fix!"):format(Invoke)) +end) diff --git a/[esx]/es_extended/server/common.lua b/[esx]/es_extended/server/common.lua index c8d004b4..75a9bc34 100644 --- a/[esx]/es_extended/server/common.lua +++ b/[esx]/es_extended/server/common.lua @@ -14,6 +14,10 @@ Core.Pickups = {} Core.PickupId = 0 Core.PlayerFunctionOverrides = {} +AddEventHandler("esx:getSharedObject", function() + local Invoke = GetInvokingResource() + print(("[ERROR] Resource %s Used the getSharedObject Event, this event no longer exists! Visit https://documentation.esx-framework.org/tutorials/sharedevent for how to fix!"):format(Invoke)) +end) exports('getSharedObject', function() return ESX From e9e4fa0205722273f79dfc9c6d64128f790c45ae Mon Sep 17 00:00:00 2001 From: Mycroft Date: Wed, 4 Jan 2023 00:17:51 +0000 Subject: [PATCH 19/58] fix(es_extended): print formatting --- [esx]/es_extended/server/common.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx]/es_extended/server/common.lua b/[esx]/es_extended/server/common.lua index 75a9bc34..6aaf87c8 100644 --- a/[esx]/es_extended/server/common.lua +++ b/[esx]/es_extended/server/common.lua @@ -16,7 +16,7 @@ Core.PlayerFunctionOverrides = {} AddEventHandler("esx:getSharedObject", function() local Invoke = GetInvokingResource() - print(("[ERROR] Resource %s Used the getSharedObject Event, this event no longer exists! Visit https://documentation.esx-framework.org/tutorials/sharedevent for how to fix!"):format(Invoke)) + print(("[^1ERROR^7] Resource ^5%s^7 Used the ^5getSharedObject^7 Event, this event ^1no longer exists!^7 Visit https://documentation.esx-framework.org/tutorials/sharedevent for how to fix!"):format(Invoke)) end) exports('getSharedObject', function() From c732d7926326cfef5cbba70a223a7f9b42bcfc77 Mon Sep 17 00:00:00 2001 From: Mycroft Date: Wed, 4 Jan 2023 18:50:34 +0000 Subject: [PATCH 20/58] tweak(esx_society): better readme --- [esx_addons]/esx_society/README.md | 31 +----------------------------- 1 file changed, 1 insertion(+), 30 deletions(-) diff --git a/[esx_addons]/esx_society/README.md b/[esx_addons]/esx_society/README.md index 444a73eb..6ca83c1a 100644 --- a/[esx_addons]/esx_society/README.md +++ b/[esx_addons]/esx_society/README.md @@ -1,36 +1,7 @@ -# esx_society +

[ESX] Society

Discord - Website - Documentation Society management for ESX. Adds employee management (hire, fire, promote / demote, change salary), society bank accounts and money washing. It's crucial that this script gets started before all resources that utilize societies do, or else many things will go wrong. -## Requirements -- [cron](https://github.com/esx-framework/esx-legacy/tree/main/%5Besx%5D/cron) -- [esx_addonaccount](https://github.com/esx-framework/esx-legacy/tree/main/%5Besx_addons%5D/esx_addonaccount) - -## Download & Installation - -### Using [fvm](https://github.com/qlaffont/fvm-installer) -``` -fvm install --save --folder=esx esx-org/esx_society -``` - -### Using Git -``` -cd resources -git clone https://github.com/ESX-Org/esx_society [esx]/esx_society -``` - -### Manually -- Download https://github.com/ESX-Org/esx_society/archive/master.zip -- Put it in the `[esx]` directory - -## Installation -- Import `esx_society.sql` in your database -- Add this in your `server.cfg`: - -``` -start esx_society -``` - ## Explanation ESX Society works with addon accounts named 'society_xxx', for example 'society_taxi' or 'society_realestateagent'. If you job grade is 'boss' the society money will be displayed in your hud. From 43fe788a2bc82a02aa5664064ba2a4b60e31e78b Mon Sep 17 00:00:00 2001 From: Mycroft Date: Wed, 4 Jan 2023 18:52:48 +0000 Subject: [PATCH 21/58] refactor(esx_society): allow registering society with exports --- [esx_addons]/esx_society/server/main.lua | 32 +++++++++++++----------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/[esx_addons]/esx_society/server/main.lua b/[esx_addons]/esx_society/server/main.lua index be5e0d3d..0630695a 100644 --- a/[esx_addons]/esx_society/server/main.lua +++ b/[esx_addons]/esx_society/server/main.lua @@ -9,24 +9,24 @@ function GetSociety(name) end end -AddEventHandler('onResourceStart', function(resourceName) - if resourceName == GetCurrentResourceName() then - local result = MySQL.query.await('SELECT * FROM jobs') +exports("GetSociety", GetSociety) - for i = 1, #result, 1 do - Jobs[result[i].name] = result[i] - Jobs[result[i].name].grades = {} - end +CreateThread(function() + local result = MySQL.query.await('SELECT * FROM jobs') - local result2 = MySQL.query.await('SELECT * FROM job_grades') + for i = 1, #result, 1 do + Jobs[result[i].name] = result[i] + Jobs[result[i].name].grades = {} + end - for i = 1, #result2, 1 do - Jobs[result2[i].job_name].grades[tostring(result2[i].grade)] = result2[i] - end + local result2 = MySQL.query.await('SELECT * FROM job_grades') + + for i = 1, #result2, 1 do + Jobs[result2[i].job_name].grades[tostring(result2[i].grade)] = result2[i] end end) -AddEventHandler('esx_society:registerSociety', function(name, label, account, datastore, inventory, data) +function registerSociety(name, label, account, datastore, inventory, data) local found = false local society = { @@ -46,9 +46,13 @@ AddEventHandler('esx_society:registerSociety', function(name, label, account, da end if not found then - table.insert(RegisteredSocieties, society) + RegisteredSocieties[#RegisteredSocieties + 1] = society + print(("[^2INFO^7] Registered Society ^5%s^7"):format(label)) end -end) +end + +AddEventHandler('esx_society:registerSociety',registerSociety) +exports("registerSociety", registerSociety) AddEventHandler('esx_society:getSocieties', function(cb) cb(RegisteredSocieties) From 3892aa9b8f7aab1faa731e6b2ece0dac85eafb07 Mon Sep 17 00:00:00 2001 From: Mycroft Date: Wed, 4 Jan 2023 18:59:30 +0000 Subject: [PATCH 22/58] fix: society race conditions --- [esx_addons]/esx_ambulancejob/fxmanifest.lua | 1 + [esx_addons]/esx_ambulancejob/server/main.lua | 6 +++--- [esx_addons]/esx_bankerjob/fxmanifest.lua | 5 ++++- [esx_addons]/esx_mechanicjob/server/main.lua | 5 ++++- [esx_addons]/esx_policejob/fxmanifest.lua | 1 + [esx_addons]/esx_policejob/server/main.lua | 4 +++- [esx_addons]/esx_property/fxmanifest.lua | 3 ++- [esx_addons]/esx_property/server/main.lua | 2 +- [esx_addons]/esx_taxijob/fxmanifest.lua | 5 ++++- [esx_addons]/esx_taxijob/server/main.lua | 8 +++++--- [esx_addons]/esx_vehicleshop/server/main.lua | 4 +++- 11 files changed, 31 insertions(+), 13 deletions(-) diff --git a/[esx_addons]/esx_ambulancejob/fxmanifest.lua b/[esx_addons]/esx_ambulancejob/fxmanifest.lua index 4b2c33a1..9800bf24 100644 --- a/[esx_addons]/esx_ambulancejob/fxmanifest.lua +++ b/[esx_addons]/esx_ambulancejob/fxmanifest.lua @@ -29,5 +29,6 @@ client_scripts { dependencies { 'es_extended', 'esx_skin', + 'esx_society', 'esx_vehicleshop' } diff --git a/[esx_addons]/esx_ambulancejob/server/main.lua b/[esx_addons]/esx_ambulancejob/server/main.lua index 6b22684a..c5265ab2 100644 --- a/[esx_addons]/esx_ambulancejob/server/main.lua +++ b/[esx_addons]/esx_ambulancejob/server/main.lua @@ -4,9 +4,9 @@ if GetResourceState("esx_phone") ~= 'missing' then TriggerEvent('esx_phone:registerNumber', 'ambulance', TranslateCap('alert_ambulance'), true, true) end -if GetResourceState("esx_society") ~= 'missing' then -TriggerEvent('esx_society:registerSociety', 'ambulance', 'Ambulance', 'society_ambulance', 'society_ambulance', 'society_ambulance', {type = 'public'}) -end +CreateThread(function() + exports["esx_society"]:registerSociety('ambulance', 'Ambulance', 'society_ambulance', 'society_ambulance', 'society_ambulance', {type = 'public'}) +end) RegisterNetEvent('esx_ambulancejob:revive') AddEventHandler('esx_ambulancejob:revive', function(playerId) diff --git a/[esx_addons]/esx_bankerjob/fxmanifest.lua b/[esx_addons]/esx_bankerjob/fxmanifest.lua index 664018c5..47eb4d5f 100644 --- a/[esx_addons]/esx_bankerjob/fxmanifest.lua +++ b/[esx_addons]/esx_bankerjob/fxmanifest.lua @@ -24,4 +24,7 @@ client_scripts { 'client/main.lua' } -dependency 'es_extended' +dependencies { + 'es_extended', + 'esx_society' +} diff --git a/[esx_addons]/esx_mechanicjob/server/main.lua b/[esx_addons]/esx_mechanicjob/server/main.lua index 4f8db966..0727d680 100644 --- a/[esx_addons]/esx_mechanicjob/server/main.lua +++ b/[esx_addons]/esx_mechanicjob/server/main.lua @@ -5,7 +5,10 @@ if Config.MaxInService ~= -1 then end TriggerEvent('esx_phone:registerNumber', 'mechanic', TranslateCap('mechanic_customer'), true, true) -TriggerEvent('esx_society:registerSociety', 'mechanic', 'mechanic', 'society_mechanic', 'society_mechanic', 'society_mechanic', {type = 'private'}) + +CreateThread(function() + exports["esx_society"]:registerSociety('mechanic', 'mechanic', 'society_mechanic', 'society_mechanic', 'society_mechanic', {type = 'private'}) +end) local function Harvest(source) SetTimeout(4000, function() diff --git a/[esx_addons]/esx_policejob/fxmanifest.lua b/[esx_addons]/esx_policejob/fxmanifest.lua index 9a3355d2..d8070a66 100644 --- a/[esx_addons]/esx_policejob/fxmanifest.lua +++ b/[esx_addons]/esx_policejob/fxmanifest.lua @@ -27,5 +27,6 @@ client_scripts { dependencies { 'es_extended', 'esx_billing', + 'esx_society', 'esx_vehicleshop' } diff --git a/[esx_addons]/esx_policejob/server/main.lua b/[esx_addons]/esx_policejob/server/main.lua index 1bffdee9..5aa7712f 100644 --- a/[esx_addons]/esx_policejob/server/main.lua +++ b/[esx_addons]/esx_policejob/server/main.lua @@ -5,7 +5,9 @@ if Config.EnableESXService then end TriggerEvent('esx_phone:registerNumber', 'police', TranslateCap('alert_police'), true, true) -TriggerEvent('esx_society:registerSociety', 'police', 'Police', 'society_police', 'society_police', 'society_police', {type = 'public'}) +CreateThread(function() + exports["esx_society"]:registerSociety('police', 'Police', 'society_police', 'society_police', 'society_police', {type = 'public'}) +end) RegisterNetEvent('esx_policejob:confiscatePlayerItem') AddEventHandler('esx_policejob:confiscatePlayerItem', function(target, itemType, itemName, amount) diff --git a/[esx_addons]/esx_property/fxmanifest.lua b/[esx_addons]/esx_property/fxmanifest.lua index e14af88a..36c5035c 100644 --- a/[esx_addons]/esx_property/fxmanifest.lua +++ b/[esx_addons]/esx_property/fxmanifest.lua @@ -42,5 +42,6 @@ client_scripts { } dependencies { - 'es_extended' + 'es_extended', + 'esx_society' } diff --git a/[esx_addons]/esx_property/server/main.lua b/[esx_addons]/esx_property/server/main.lua index fc55b196..e1e0b3ea 100644 --- a/[esx_addons]/esx_property/server/main.lua +++ b/[esx_addons]/esx_property/server/main.lua @@ -147,7 +147,7 @@ CreateThread(function() Wait(10) ESX.RefreshJobs() - TriggerEvent('esx_society:registerSociety', 'realestateagent', 'realestateagent', 'society_realestateagent', 'society_realestateagent', 'society_realestateagent', {type = 'private'}) + exports["esx_society"]:registerSociety('realestateagent', 'realestateagent', 'society_realestateagent', 'society_realestateagent', 'society_realestateagent', {type = 'private'}) end end) diff --git a/[esx_addons]/esx_taxijob/fxmanifest.lua b/[esx_addons]/esx_taxijob/fxmanifest.lua index 36fa1f0d..bc2408b8 100644 --- a/[esx_addons]/esx_taxijob/fxmanifest.lua +++ b/[esx_addons]/esx_taxijob/fxmanifest.lua @@ -22,4 +22,7 @@ server_scripts { 'server/main.lua' } -dependency 'es_extended' +dependencies { + 'es_extended', + 'esx_society' +} diff --git a/[esx_addons]/esx_taxijob/server/main.lua b/[esx_addons]/esx_taxijob/server/main.lua index 9bfdc4f9..e84561ad 100644 --- a/[esx_addons]/esx_taxijob/server/main.lua +++ b/[esx_addons]/esx_taxijob/server/main.lua @@ -5,9 +5,11 @@ if Config.MaxInService ~= -1 then end TriggerEvent('esx_phone:registerNumber', 'taxi', TranslateCap('taxi_client'), true, true) -TriggerEvent('esx_society:registerSociety', 'taxi', 'Taxi', 'society_taxi', 'society_taxi', 'society_taxi', { - type = 'public' -}) +CreateThread(function() + exports["esx_society"]:registerSociety('taxi', 'Taxi', 'society_taxi', 'society_taxi', 'society_taxi', { + type = 'public' + }) +end) RegisterNetEvent('esx_taxijob:success') AddEventHandler('esx_taxijob:success', function() diff --git a/[esx_addons]/esx_vehicleshop/server/main.lua b/[esx_addons]/esx_vehicleshop/server/main.lua index d07bbffc..a86f65cc 100644 --- a/[esx_addons]/esx_vehicleshop/server/main.lua +++ b/[esx_addons]/esx_vehicleshop/server/main.lua @@ -1,7 +1,9 @@ local categories, vehicles = {}, {} TriggerEvent('esx_phone:registerNumber', 'cardealer', TranslateCap('dealer_customers'), false, false) -TriggerEvent('esx_society:registerSociety', 'cardealer', TranslateCap('car_dealer'), 'society_cardealer', 'society_cardealer', 'society_cardealer', {type = 'private'}) +CreateThread(function() + exports["esx_society"]:registerSociety('cardealer', TranslateCap('car_dealer'), 'society_cardealer', 'society_cardealer', 'society_cardealer', {type = 'private'}) +end) CreateThread(function() local char = Config.PlateLetters From 77de399b999060587fb6e216aaadaed44bae1d3c Mon Sep 17 00:00:00 2001 From: Mycroft Date: Wed, 4 Jan 2023 19:58:43 +0000 Subject: [PATCH 23/58] fix: more race condition fixing --- [esx_addons]/esx_bankerjob/server/main.lua | 4 +++- [esx_addons]/esx_vehicleshop/fxmanifest.lua | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[esx_addons]/esx_bankerjob/server/main.lua b/[esx_addons]/esx_bankerjob/server/main.lua index 30bb523a..33dd831c 100644 --- a/[esx_addons]/esx_bankerjob/server/main.lua +++ b/[esx_addons]/esx_bankerjob/server/main.lua @@ -1,5 +1,7 @@ TriggerEvent('esx_phone:registerNumber', 'banker', _('phone_receive'), false, false) -TriggerEvent('esx_society:registerSociety', 'banker', TranslateCap('phone_label'), 'society_banker', 'society_banker', 'society_banker', {type = 'public'}) +CreateThread(function() + exports["esx_society"]:registerSociety('banker', TranslateCap('phone_label'), 'society_banker', 'society_banker', 'society_banker', {type = 'public'}) +end) RegisterServerEvent('esx_bankerjob:customerDeposit') AddEventHandler('esx_bankerjob:customerDeposit', function (target, amount) diff --git a/[esx_addons]/esx_vehicleshop/fxmanifest.lua b/[esx_addons]/esx_vehicleshop/fxmanifest.lua index dce7743a..f9f16497 100644 --- a/[esx_addons]/esx_vehicleshop/fxmanifest.lua +++ b/[esx_addons]/esx_vehicleshop/fxmanifest.lua @@ -26,6 +26,10 @@ client_scripts { 'client/main.lua' } -dependency 'es_extended' +dependencies { + 'es_extended', + 'esx_society' +} + export 'GeneratePlate' From 56992cd8bcc5bccc750d741d8093fdc950ac25e3 Mon Sep 17 00:00:00 2001 From: BeansFL <106496863+BeansFL@users.noreply.github.com> Date: Thu, 5 Jan 2023 02:57:03 +0100 Subject: [PATCH 24/58] Update de.lua --- [esx_addons]/esx_phone/locales/de.lua | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/[esx_addons]/esx_phone/locales/de.lua b/[esx_addons]/esx_phone/locales/de.lua index 7adcb871..c5afe06d 100644 --- a/[esx_addons]/esx_phone/locales/de.lua +++ b/[esx_addons]/esx_phone/locales/de.lua @@ -2,12 +2,12 @@ Locales['de'] = { ['new_message'] = 'Neue Nachricht', ['press_take_call'] = '%s - Drücke [E] um den Anruf anzunehmen', ['taken_call'] = '%s hat den Anruf angenommen', - ['gps_position'] = 'ziel in GPS eingegeben', - ['message_sent'] = 'nachricht gesendet', - ['cannot_add_self'] = 'du kannst dich nicht selbst hinzufügen', - ['number_in_contacts'] = 'diese Nummer ist bereits in deinen Kontakten', - ['contact_added'] = 'kontakt hinzugefügt', - ['contact_removed'] = 'the contact has been removed!', - ['number_not_assigned'] = 'diese Nummer ist nicht vergeben...', - ['invalid_number'] = 'that\'s not an valid number!', + ['gps_position'] = 'Ziel im GPS eingegeben', + ['message_sent'] = 'Nachricht wurde versendet', + ['cannot_add_self'] = 'Du kannst dich nicht selbst hinzufügen', + ['number_in_contacts'] = 'Diese Nummer ist bereits in deinen Kontakten', + ['contact_added'] = 'Kontakt hinzugefügt', + ['contact_removed'] = 'Dieser Kontakt wurde entfernt!', + ['number_not_assigned'] = 'Diese Nummer ist nicht vergeben...', + ['invalid_number'] = 'Dies ist keine gültige Telefonnummer!', } From c4cc9843d5c10e909d7976d54d8a2e2ed0bcd983 Mon Sep 17 00:00:00 2001 From: BeansFL <106496863+BeansFL@users.noreply.github.com> Date: Thu, 5 Jan 2023 03:09:31 +0100 Subject: [PATCH 25/58] Update de.lua --- [esx_addons]/esx_policejob/locales/de.lua | 66 +++++++++++------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/[esx_addons]/esx_policejob/locales/de.lua b/[esx_addons]/esx_policejob/locales/de.lua index f105a044..2aebdc53 100644 --- a/[esx_addons]/esx_policejob/locales/de.lua +++ b/[esx_addons]/esx_policejob/locales/de.lua @@ -5,7 +5,7 @@ Locales['de'] = { ['police_wear'] = 'Arbeitskleidung', ['gilet_wear'] = 'orangefarbene reflektierende Jacke', ['bullet_wear'] = 'kugelsichere Weste', - ['no_outfit'] = 'Es gibt keine Uniform die dir passt.', + ['no_outfit'] = 'Es gibt keine, Uniform, die dir passt.', ['open_cloackroom'] = 'Drücke [E] um dich umzuziehen', -- Armory ['remove_object'] = 'Objekt nehmen', @@ -14,27 +14,27 @@ Locales['de'] = { ['put_weapon'] = 'Waffen bringen', ['buy_weapons'] = 'Waffen kaufen', ['armory'] = 'Waffenkammer', - ['open_armory'] = 'Drücke [E] um die Waffenkammer zu öffnen', - ['armory_owned'] = 'eigentum', + ['open_armory'] = 'Drücke [E], um die Waffenkammer zu öffnen', + ['armory_owned'] = 'Eigentum', ['armory_free'] = 'gratis', ['armory_item'] = '$%s', ['armory_weapontitle'] = 'Waffenkammer - Waffe kaufen', - ['armory_componenttitle'] = 'Waffenkammer - Waffen attatchments', + ['armory_componenttitle'] = 'Waffenkammer - Waffen Attachments', ['armory_bought'] = 'Du hast dir %s für $%s gekauft', ['armory_money'] = 'Du kannst dir die Waffe nicht leisten', - ['armory_hascomponent'] = 'Du hast das attchment bereits!', + ['armory_hascomponent'] = 'Du hast das Attachment bereits!', ['get_weapon_menu'] = 'Arsenal - Waffe auslagern', ['put_weapon_menu'] = 'Arsenal - Waffe einlagern', -- Vehicles ['vehicle_menu'] = 'Fahrzeug', ['vehicle_blocked'] = 'alle verfügbaren Spawnpunkte sind derzeit blockiert!', - ['garage_prompt'] = 'Drücke [E] um das Garagen Menü zu öffnen.', - ['garage_title'] = 'Fahrzeug aktionen', + ['garage_prompt'] = 'Drücke [E], um das Garagenmenü zu öffnen.', + ['garage_title'] = 'Fahrzeug Aktionen', ['garage_stored'] = 'eingelagert', ['garage_notstored'] = 'nicht in der Garage', ['garage_storing'] = 'Wir versuchen, das Fahrzeug zu entfernen, stelle sicher, dass sich keine Spieler in der Nähe des Fahrzeugs befinden.', ['garage_has_stored'] = 'das Fahrzeug wurde in deiner Garage abgestellt', - ['garage_has_notstored'] = 'Keine eigenen Fahrzeuge in der nähe gefunden', + ['garage_has_notstored'] = 'Keine eigenen Fahrzeuge in der Nähe gefunden', ['garage_notavailable'] = 'Dein Fahrzeug ist nicht in der Garage abgestellt.', ['garage_blocked'] = 'Es gibt keine verfügbaren Spawn-Punkte!', ['garage_empty'] = 'Du hast keine Fahrzeuge in der Garage.', @@ -62,7 +62,7 @@ Locales['de'] = { ['service_out'] = 'Du hast den Dienst verlassen.', ['service_out_announce'] = 'Operator %s hat seinen Dienst beendet.', -- Action Menu - ['citizen_interaction'] = 'Zivilistenaktionen', + ['citizen_interaction'] = 'Zivilinteraktionen', ['vehicle_interaction'] = 'Fahrzeuginteraktionen', ['object_spawner'] = 'Objekt Spawner', @@ -81,16 +81,16 @@ Locales['de'] = { ['no_players_nearby'] = 'keine Spieler in der Nähe', ['being_searched'] = 'Du wirst von der Polizei durchsucht', -- Vehicle interaction - ['vehicle_info'] = 'Fahrzeug Info', + ['vehicle_info'] = 'Fahrzeug Information', ['pick_lock'] = 'Fahrzeug öffnen', ['vehicle_unlocked'] = 'Fahrzeug offen', ['no_vehicles_nearby'] = 'Keine Fahrzeuge in der Nähe', - ['impound'] = 'beschlagnahmtes fahrzeug', + ['impound'] = 'beschlagnahmtes Fahrzeug', ['impound_prompt'] = 'Drücken Sie [E], um die Beschlagnahmung abzubrechen.', ['impound_canceled'] = 'Du hast die Beschlagnahmung abgebrochen', ['impound_canceled_moved'] = 'die Beschlagnahme wurde aufgehoben, weil das Fahrzeug bewegt wurde', ['impound_successful'] = 'Du hast das Fahrzeug beschlagnahmt', - ['search_database'] = 'Fahrzeug informationen', + ['search_database'] = 'Fahrzeug Informationen', ['search_database_title'] = 'Fahrzeuginformationen - Suche über das amtliche Kennzeichen', ['search_database_error_invalid'] = 'die keine gültige Registrierungsnummer ist', -- Traffic interaction @@ -101,51 +101,51 @@ Locales['de'] = { ['box'] = 'Box', ['cash'] = 'Box mit Geld', -- ID Card Menu - ['name'] = 'name: %s', - ['job'] = 'job: %s', - ['sex'] = 'geschlecht: %s', - ['dob'] = 'DOB: %s', - ['height'] = 'größe: %s', + ['name'] = 'Name: %s', + ['job'] = 'Job: %s', + ['sex'] = 'Geschlecht: %s', + ['dob'] = 'GEB.: %s', + ['height'] = 'Größe: %s', ['bac'] = 'BAC: %s', - ['unknown'] = 'unknown', + ['unknown'] = 'unbekannt', ['male'] = 'männlich', ['female'] = 'weiblich', -- Body Search Menu ['guns_label'] = '--- Waffen ---', ['inventory_label'] = '--- Inventar ---', ['license_label'] = ' --- Lizenzen ---', - ['confiscate'] = 'konfeszieren %s', + ['confiscate'] = 'konfiszieren %s', ['confiscate_weapon'] = 'konfisziere %s mit %s kugeln', ['confiscate_inv'] = 'konfisziere %sx %s', - ['confiscate_dirty'] = 'Schwarzgeld konfesziert: $%s', + ['confiscate_dirty'] = 'Schwarzgeld konfisziert: $%s', ['you_confiscated'] = 'Du konfiszierst %sx %s von %s', ['got_confiscated'] = '%sx %s wurde konfisziert von %s', ['you_confiscated_account'] = 'du konfiszierst $%s (%s) von %s', ['got_confiscated_account'] = '$%s (%s) wurde konfisziert von %s', ['you_confiscated_weapon'] = 'Du konfiszierst %s von %s mit %s kugeln', ['got_confiscated_weapon'] = 'Deine %s mit %s kugeln wurde konfisziert von %s', - ['traffic_offense'] = 'Verkehrs vergehen', - ['minor_offense'] = 'Geringes vergehen', - ['average_offense'] = 'Normales vergehen', - ['major_offense'] = 'Hohes vergehen', - ['fine_total'] = 'strafe: %s', + ['traffic_offense'] = 'Verkehrsvergehen', + ['minor_offense'] = 'Geringes Vergehen', + ['average_offense'] = 'Normales Vergehen', + ['major_offense'] = 'Hohes Vergehen', + ['fine_total'] = 'Strafe: %s', -- Vehicle Info Menu - ['plate'] = 'kennzeichen: %s', - ['owner_unknown'] = 'besitzer: Unbekannt', - ['owner'] = 'besitzer: %s', + ['plate'] = 'Kennzeichen: %s', + ['owner_unknown'] = 'Besitzer: Unbekannt', + ['owner'] = 'Besitzer: %s', -- Boss Menu - ['open_bossmenu'] = 'Drücke [E] um das Menü zu öffnen', + ['open_bossmenu'] = 'Drücke [E], um das Menü zu öffnen', ['quantity_invalid'] = 'ungültige Menge', ['have_withdrawn'] = 'Du hast abgehoben %sx %s', ['have_deposited'] = 'Sie haben eingezahlt %sx %s', - ['quantity'] = 'qualität', - ['inventory'] = 'inventar', + ['quantity'] = 'Qualität', + ['inventory'] = 'Inventar', ['police_stock'] = 'Polizeibestand', -- Misc - ['remove_prop'] = 'Drücke [E] um das Objekt zu entfernen', + ['remove_prop'] = 'Drücke [E], um das Objekt zu entfernen', ['map_blip'] = 'Polizeistation', ['unrestrained_timer'] = 'Du spürst, wie die Handschellen langsam ihren Halt verlieren und sich auflösen.', -- Notifications - ['alert_police'] = 'Polizei alamieren', + ['alert_police'] = 'Polizei alarmieren', ['phone_police'] = 'Polizei', } From 36d05607eb7748a824cd4793f81e8f5f4f6dba53 Mon Sep 17 00:00:00 2001 From: BeansFL <106496863+BeansFL@users.noreply.github.com> Date: Thu, 5 Jan 2023 03:26:47 +0100 Subject: [PATCH 26/58] Update de.lua --- [esx]/es_extended/locales/de.lua | 174 +++++++++++++++---------------- 1 file changed, 87 insertions(+), 87 deletions(-) diff --git a/[esx]/es_extended/locales/de.lua b/[esx]/es_extended/locales/de.lua index 944c00ce..1401ce14 100644 --- a/[esx]/es_extended/locales/de.lua +++ b/[esx]/es_extended/locales/de.lua @@ -1,15 +1,15 @@ Locales['de'] = { -- Inventory - ['inventory'] = 'inventar %s / %s', + ['inventory'] = 'Inventar %s / %s', ['use'] = 'benutzen', ['give'] = 'geben', ['remove'] = 'entfernen', ['return'] = 'zurück', ['give_to'] = 'geben an', - ['amount'] = 'betrag', - ['giveammo'] = 'munition geben', - ['amountammo'] = 'anzahl der munition', - ['noammo'] = 'du hast keine munition!', + ['amount'] = 'Betrag', + ['giveammo'] = 'Munition geben', + ['amountammo'] = 'Anzahl der Munition', + ['noammo'] = 'du hast keine Munition!', ['gave_item'] = 'du gibst %sx %s an %s', ['received_item'] = 'du empfängst %sx %s von %s', ['gave_weapon'] = 'du gibst %s an %s', @@ -26,9 +26,9 @@ Locales['de'] = { ['received_account_money'] = 'du empfängst $%s (%s) von %s', ['amount_invalid'] = 'ungültiger Betrag', ['players_nearby'] = 'keine Spieler in der Nähe', - ['ex_inv_lim'] = 'aktion nicht möglich, Inventarlimit überschritten für %s', - ['imp_invalid_quantity'] = 'aktion nicht möglich, ungültige Anzahl', - ['imp_invalid_amount'] = 'aktion nicht möglich, ungültiger Betrag', + ['ex_inv_lim'] = 'Aktion nicht möglich, Inventarlimit überschritten für %s', + ['imp_invalid_quantity'] = 'Aktion nicht möglich, ungültige Anzahl', + ['imp_invalid_amount'] = 'Aktion nicht möglich, ungültiger Betrag', ['threw_standard'] = 'du wirfst %sx %s', ['threw_account'] = 'du wirfst $%s %s weg', ['threw_weapon'] = 'du wirfst %s weg', @@ -38,71 +38,71 @@ Locales['de'] = { ['threw_pickup_prompt'] = 'drücke E um aufzuheben', -- Key mapping - ['keymap_showinventory'] = 'inventar anzeigen', + ['keymap_showinventory'] = 'Inventar anzeigen', -- Salary related ['received_salary'] = 'du hast dein Gehalt erhalten: $%s', ['received_help'] = 'du hast deine Sozialhilfe erhalten: $%s', - ['company_nomoney'] = 'die Firma in der du angestellt bist, ist zu arm um dein Gehalt zu zahlen', + ['company_nomoney'] = 'die Firma in der du angestellt bist, ist zu arm um dir dein Gehalt zu zahlen', ['received_paycheck'] = 'erhaltener Gehaltsscheck', - ['bank'] = 'bank', - ['account_bank'] = 'bank', - ['account_black_money'] = 'schwarzgeld', - ['account_money'] = 'geld', + ['bank'] = 'Bank', + ['account_bank'] = 'Bank', + ['account_black_money'] = 'Schwarzgeld', + ['account_money'] = 'Geld', ['act_imp'] = 'Aktion nicht möglich', ['in_vehicle'] = 'du kannst keine Items in einem Fahrzeug weitergeben', -- Commands - ['command_car'] = 'fahrzeug spawnen', - ['command_car_car'] = 'fahrzeug spawn name oder hash', - ['command_cardel'] = 'fahrzeuge in der nähe löschen', - ['command_cardel_radius'] = 'optional, jedes fahrzeug innerhalb des angegebenen radius löschen', - ['command_clear'] = 'chat leeren', - ['command_clearall'] = 'chat leeren für alle spieler', - ['command_clearinventory'] = 'spieler inventar leeren', - ['command_clearloadout'] = 'spieler ausstattung löschen', - ['command_giveaccountmoney'] = 'gebe guthaben', - ['command_giveaccountmoney_account'] = 'gültiger account name', - ['command_giveaccountmoney_amount'] = 'anzahl zum hinzufügen', - ['command_giveaccountmoney_invalid'] = 'ungültiger account name', - ['command_giveitem'] = 'gebe ein item zu einem spieler', - ['command_giveitem_item'] = 'item name', - ['command_giveitem_count'] = 'item anzahl', - ['command_giveweapon'] = 'gebe waffe zu einem spieler', - ['command_giveweapon_weapon'] = 'waffen name', - ['command_giveweapon_ammo'] = 'munition anzahl', - ['command_giveweapon_hasalready'] = 'spieler hat bereits diese waffe', - ['command_giveweaponcomponent'] = 'gebe waffen component', - ['command_giveweaponcomponent_component'] = 'component name', - ['command_giveweaponcomponent_invalid'] = 'ungültiges waffen component', - ['command_giveweaponcomponent_hasalready'] = 'spieler hat bereits dieses waffen komponent', - ['command_giveweaponcomponent_missingweapon'] = 'spieler hat diese waffe nicht', - ['command_save'] = 'spieler in die datenbank sichern', - ['command_saveall'] = 'alle spieler in die datenbank sichern', - ['command_setaccountmoney'] = 'guthaben für den spieler setzen', - ['command_setaccountmoney_amount'] = 'guthaben zum setzen', - ['command_setcoords'] = 'teleportieren zu koordinaten', - ['command_setcoords_x'] = 'x axis', - ['command_setcoords_y'] = 'y axis', - ['command_setcoords_z'] = 'z axis', - ['command_setjob'] = 'job für einen spieler setzen', - ['command_setjob_job'] = 'job name', - ['command_setjob_grade'] = 'job rang', - ['command_setjob_invalid'] = 'der job, rang oder beides ist ungültig', - ['command_setgroup'] = 'setze spieler gruppe', - ['command_setgroup_group'] = 'gruppen name', - ['commanderror_argumentmismatch'] = 'argumentanzahl stimmt nicht überein (übergeben %s, gesucht %s)', + ['command_car'] = 'Fahrzeug spawnen', + ['command_car_car'] = 'Fahrzeug spawnname oder hash', + ['command_cardel'] = 'Fahrzeuge in der nähe löschen', + ['command_cardel_radius'] = 'Optional, jedes Fahrzeug innerhalb des angegebenen Radius löschen', + ['command_clear'] = 'Chat leeren', + ['command_clearall'] = 'Chat leeren für alle spieler', + ['command_clearinventory'] = 'Spielerinventar leeren', + ['command_clearloadout'] = 'Spielerausstattung löschen', + ['command_giveaccountmoney'] = 'Geld aufs Konto laden', + ['command_giveaccountmoney_account'] = 'gültiger Kontoname', + ['command_giveaccountmoney_amount'] = 'Anzahl zum hinzufügen', + ['command_giveaccountmoney_invalid'] = 'Ungültiger Kontoname', + ['command_giveitem'] = 'Item an Spieler geben', + ['command_giveitem_item'] = 'Itemname', + ['command_giveitem_count'] = 'item Anzahl', + ['command_giveweapon'] = 'Spieler eine Waffe geben', + ['command_giveweapon_weapon'] = 'Waffenname', + ['command_giveweapon_ammo'] = 'Munitionsanzahl', + ['command_giveweapon_hasalready'] = 'Spieler bereits im Besitz dieser Waffe', + ['command_giveweaponcomponent'] = 'Spieler Waffenaufsatz geben', + ['command_giveweaponcomponent_component'] = 'Waffenaufsatz Name', + ['command_giveweaponcomponent_invalid'] = 'ungültiger Waffenaufsatz', + ['command_giveweaponcomponent_hasalready'] = 'Spieler hat bereits diesen Waffenaufsatz', + ['command_giveweaponcomponent_missingweapon'] = 'Der Spieler besitzt diese Waffe nicht', + ['command_save'] = 'Spieler in der Datenbank sichern', + ['command_saveall'] = 'Sichern von allen Spielern auf der Datenbank', + ['command_setaccountmoney'] = 'Kontosumme des Spielers setzen', + ['command_setaccountmoney_amount'] = 'Summe', + ['command_setcoords'] = 'Zu den Koordinaten Teleportieren', + ['command_setcoords_x'] = 'x Position', + ['command_setcoords_y'] = 'y Position', + ['command_setcoords_z'] = 'z Position', + ['command_setjob'] = 'Dem Spieler einen Job setzen', + ['command_setjob_job'] = 'Name des Jobs', + ['command_setjob_grade'] = 'Rang des Jobs', + ['command_setjob_invalid'] = 'Der Rang oder der Job ist nicht gültigt.', + ['command_setgroup'] = 'Spielergruppe setzen', + ['command_setgroup_group'] = 'Gruppenname', + ['commanderror_argumentmismatch'] = 'Die Anzahl der Argumente stimmen nicht überein (übergeben %s, gesucht %s)', ['commanderror_argumentmismatch_number'] = 'argument #%s typ stimmt nicht überein (übergeben string, gewünscht zahl)', - ['commanderror_invaliditem'] = 'falscher item name', - ['commanderror_invalidweapon'] = 'ungültige waffe', - ['commanderror_console'] = 'der command kann nicht von der konsole ausgeführt werden', - ['commanderror_invalidcommand'] = '/%s ist kein verfügbarer command!', - ['commanderror_invalidplayerid'] = 'kein spieler ist online mit dieser id', - ['commandgeneric_playerid'] = 'spieler id', - ['command_giveammo_noweapon_found'] = '%s does not have that weapon', - ['command_giveammo_weapon'] = 'Weapon name', - ['command_giveammo_ammo'] = 'Ammo Quantity', + ['commanderror_invaliditem'] = 'falscher Itemname', + ['commanderror_invalidweapon'] = 'ungültige Waffe', + ['commanderror_console'] = 'Der Befehl kann nicht in der Konsole genutzt werden', + ['commanderror_invalidcommand'] = '/%s ist kein verfügbarer Befehl!', + ['commanderror_invalidplayerid'] = 'Kein Spieler mit dieser ID scheint online zu sein', + ['commandgeneric_playerid'] = 'Spieler ID', + ['command_giveammo_noweapon_found'] = '%s besitzt diese Waffe nicht', + ['command_giveammo_weapon'] = 'Waffenname', + ['command_giveammo_ammo'] = 'Munitionsanzahl', -- Locale settings ['locale_digit_grouping_symbol'] = ' ', @@ -187,34 +187,34 @@ Locales['de'] = { -- Weapon Components ['component_clip_default'] = 'standart Griff', ['component_clip_extended'] = 'erweiterter Griff', - ['component_clip_drum'] = 'trommelmagazin', - ['component_clip_box'] = 'kastenmagazin', - ['component_flashlight'] = 'taschenlampe', - ['component_scope'] = 'zielfernrohr', + ['component_clip_drum'] = 'Trommelmagazin', + ['component_clip_box'] = 'Kastenmagazin', + ['component_flashlight'] = 'Taschenlampe', + ['component_scope'] = 'Zielfernrohr', ['component_scope_advanced'] = 'erweitertes Zielfernrohr', - ['component_suppressor'] = 'schalldämpfer', - ['component_grip'] = 'griff', - ['component_luxary_finish'] = 'luxus Waffen Design', + ['component_suppressor'] = 'Schalldämpfer', + ['component_grip'] = 'Griff', + ['component_luxary_finish'] = 'luxus Waffendesign', -- Weapon Ammo - ['ammo_rounds'] = 'kugel(n)', - ['ammo_shells'] = 'schrotpatrone(n)', - ['ammo_charge'] = 'ladung', - ['ammo_petrol'] = 'liter Benzin', - ['ammo_firework'] = 'feuerwerksrakete(n)', - ['ammo_rockets'] = 'rakete(n)', - ['ammo_grenadelauncher'] = 'granate(n)', - ['ammo_grenade'] = 'granate(n)', - ['ammo_stickybomb'] = 'bombe(n)', - ['ammo_pipebomb'] = 'bombe(n)', - ['ammo_smokebomb'] = 'bombe(n)', - ['ammo_molotov'] = 'cocktail(s)', - ['ammo_proxmine'] = 'mine(n)', - ['ammo_bzgas'] = 'can(n)', - ['ammo_ball'] = 'ball', - ['ammo_snowball'] = 'schneebälle', - ['ammo_flare'] = 'signalfackel(n)', - ['ammo_flaregun'] = 'signalfackeln(munition)', + ['ammo_rounds'] = 'Kugel(n)', + ['ammo_shells'] = 'Schrotpatrone(n)', + ['ammo_charge'] = 'Ladung', + ['ammo_petrol'] = 'Benzinkanister', + ['ammo_firework'] = 'Feuerwerksrakete(n)', + ['ammo_rockets'] = 'Rakete(n)', + ['ammo_grenadelauncher'] = 'Granate(n)', + ['ammo_grenade'] = 'Granate(n)', + ['ammo_stickybomb'] = 'C4(s)', + ['ammo_pipebomb'] = 'Rohrbombe(n)', + ['ammo_smokebomb'] = 'Rauchgranate(n)', + ['ammo_molotov'] = 'Molotovcocktail(s)', + ['ammo_proxmine'] = 'Annäherungsmine(n)', + ['ammo_bzgas'] = 'Bzgas', + ['ammo_ball'] = 'Ball', + ['ammo_snowball'] = 'Schneebälle', + ['ammo_flare'] = 'Signalfackel(n)', + ['ammo_flaregun'] = 'Signalfackeln(munition)', -- Weapon Tints ['tint_default'] = 'standard', From 3ce03968db4b1f3557d7b100111ad6036482d31d Mon Sep 17 00:00:00 2001 From: Zinzin92 Date: Thu, 5 Jan 2023 12:16:02 +0100 Subject: [PATCH 27/58] Create fr.lua --- [esx_addons]/esx_property/locales/fr.lua | 218 +++++++++++++++++++++++ 1 file changed, 218 insertions(+) create mode 100644 [esx_addons]/esx_property/locales/fr.lua diff --git a/[esx_addons]/esx_property/locales/fr.lua b/[esx_addons]/esx_property/locales/fr.lua new file mode 100644 index 00000000..d2eee5e4 --- /dev/null +++ b/[esx_addons]/esx_property/locales/fr.lua @@ -0,0 +1,218 @@ +Locales[ fr ] = { + --- CCTV Strings ------ + + ["take_picture"] = "Prendre une photo", + ["rot_left_right"] = "Gauche/Droite", + ["rot_up_down"] = "Haut/Bas", + ["zoom"] = "Zoom avant/ arrière", + ["zoom_level"] = "Niveau de zoom : %s %%", + ["night_vision"] = "Basculer la vision nocturne", + ["clipboard"] = "Lien copié vers ~b~Cipboard", + ["picture_taken"] = "Photo prise !", + ["please_wait"] = "Veuillez patienter avant de prendre une autre ~b~photo", + ["exit"] = "Quitter", + + -- - Cordes de meubles ------ + + ["hauteur"] = "Hauteur", + ["tourner"] = "Rotation", + ["place"] = "Placer les meubles", + ["delete_furni"] = "Supprimer", + ["confirm_buy"] = "Voulez-vous acheter %s ?", + ["prix"] = "Prix : $%s", + ["yes"] = "Oui", + ["no"] = "Non", + ["action"] = "Vous %s ~b~%s~s~ !", + ["buyer_furni"] = "Vous avez ~g~acheté~s~ A ~b~%s~s~ !", + ["edited_furni"] = "Vous avez modifié ~b~%s~s~ !", + ["cant_buy"] = "Vous ~r~ne pouvez pas~s~ acheter ceci !", + ["cant_edit"] = "Vous ~r~ne pouvez pas~s~ modifier ceci !", + ["store_title"] = "Magasin - %s", + ["retour"] = "Retour", + ["edit_title"] = "Modification - %s", + ["move_title"] = "Déplacer", + ["delete_confirm"] = "Suppression de ~b~%s~s~ !", + ["delete_error"] = "Impossible de supprimer ~b~%s~s~ !", + ["Own_furni"] = "Meubles possédés", + ["menu_stores"] = "Magasins de meubles", + ["menu_stores_desc"] = "Acheter des meubles", + ["menu_reset"] = "Réinitialiser", + ["menu_reset_desc"] = "Efface tous les meubles", + ["menu_edit"] = "Modifier", + ["menu_edit_desc"] = "Déplacer et/ou supprimer des meubles", + ["furni_command"] = "meubles", + ["furni_command_desc"] = "(Propriété ESX) Ouvrir le menu des meubles", + ["furni_command_permission"] = "Vous ~r~ne pouvez pas~s~ accéder à ce menu !", + ["furni_reset_success"] = "Réinitialiser les meubles !", + ["furni_cannot_afford"] = "Vous ne pouvez pas vous permettre de faire ça !", + ["furni_reset_error"] = "Vous ~r~ne pouvez pas~s~ réinitialiser cette propriété !", + ["furni_management"] = "Gérer les meubles", + + -- ------- Chaînes de clés --------------- + + ["you_granted"] = "Vous avez reçu les clés de ~b~%s~s~.", + ["exists_has"] = "Ce joueur a déjà des clés !", + ["do_not_own"] = "Vous ne possédez ~r~pas~s~ cette propriété.", + ["key_revoked"] = "Votre clé d accès à ~b~%s~s~. A été ~r~révoqué~s~", + ["no_keys"] = "Ce joueur n a pas de clés !", + ["à proximité"] = "Joueurs à proximité", + ["gave_key"] = "Donner les clés à %s !", + ["key_cannot_give"] = "Vous ne pouvez pas donner une ~r~clé à ce joueur", + ["remove_title"] = "Supprimer les clés du lecteur", + ["key_revoke_success"] = "Révocation des clés de ~b~%s~s~.", + ["key_revoke_error"] = "Vous ne pouvez pas ~b~supprimer~s~ une ~r~clé~s~ de cette personne", + ["key_management"] = "Gestion des clés", + ["key_management_desc"] = "Contrôler l accès à la propriété.", + ["give_keys"] = "Donner des clés", + ["remove_keys"] = "Supprimer les clés", + + + -- ------- Chaînes immobilières --------------- + ["office_blip"] = "%s Bureau", + ["actions"] = "Actions immobilières", + ["property_create"] = "Créer une propriété", + ["property_manage"] = "Gérer les propriétés", + ["realestate_command"] = "realestatequickmenu", + ["realestate_command_desc"] = "(Propriété ESX) Ouvrir les actions rapides de l immobilier", + ["enter_office"] = "~b~Entrée~s~ Bureau.", + ["enter_office_error"] = "Vous ~r~ne pouvez pas~s~ entrer dans le bureau !", + ["exit_office"] = "~b~Sortie~s~ du bureau.", + ["exit_office_error"] = "Vous ~r~ne pouvez pas~s~ quitter le bureau !", + ["realestate_textui"] = "Appuyez sur ~b~[E]~s~ pour accéder à ~b~%s", + + -- ----------Chaînes de commande----------------------- + ["refresh_name"] = "propriété:refresh", + ["refresh_desc"] = "Actualiser à l état de démarrage du serveur", + ["save_name"] = "propriété:save", + ["save_desc"] = "Forcer l enregistrement des propriétés", + ["nom_création"] = "propriété:créer", + ["create_desc"] = "Créer une nouvelle propriété", + ["nom_admin"] = "propriété:admin", + ["admin_desc"] = "Gérer/afficher toutes les propriétés", + + + -- -------- Menu Actions propriété ------------------------- + + ["knocking"] = "Quelqu un ~b~frappe~s~ à la porte.", + ["name_edit"] = "Modifier le nom de la propriété", + ["nom"] = "Nom", + ["confirmer"] = "Confirmer", + ["name_edit_success"] = "Vous avez défini le nom de la propriété sur ~b~%s~s~.", + ["name_edit_error"] = "Vous ne pouvez pas définir le nom de la propriété sur ~r~%s~s~.", + ["door_locked"] = "Porte : verrouillée", + ["door_unlocked"] = "Porte : Déverrouillée", + ["name_manage"] = "Gérer le nom", + ["name_manage_desc"] = "Définir le nom de la propriété.", + ["sell_title"] = "Vendre", + ["sell_desc"] = "Vendre cette propriété pour $%s", + ["raid_title"] = "Raid", + ["raid_desc"] = "Forcer l entrée dans la propriété.", + ["titre_cctv"] = "CCTV", + ["cctv_desc"] = "Vérifiez la caméra CCTV.", + ["Inventory_title"] = "Inventaire", + ["Inventory_desc"] = "Modifier la position du stockage des propriétés.", + ["garde -robe_title"] = "Garde- robe", + ["armoire_desc"] = "Modifier la position de l armoire de propriété.", + ["meuble_titre"] = "Meuble", + ["furniture_desc"] = "Modifier la position des meubles de la propriété.", + ["enter_title"] = "Entrez", + ["knock_title"] = "Frappez à la porte", + ["buy_title"] = "Acheter", + ["buy_desc"] = "Acheter cette propriété pour $%s", + ["sellplayer_title"] = "Vendre au joueur", + ["sellplayer_desc"] = "Vendre cette propriété pour $%s", + ["view_title"] = "Aperçu de l intérieur", + ["exit_title"] = "Quitter", + ["property_editing_error"] = "Vous modifiez actuellement la propriété.", + ["unlock_error"] = "Vous ne pouvez pas ~b~déverrouiller~s~ cette propriété", + ["lock_error"] = "Vous ne pouvez pas ~b~verrouiller~s~ cette propriété", + ["prep_raid"] = "~b~Préparation~s~ Raid !", + ["raiding"] = "Raidage...", + ["cancel_raiding"] = "~r~Annulé~s~ Raid !", + ["cant_raid"] = "Vous ne pouvez pas ~b~Raid~s~ cette propriété.", + ["storage_pos_textui"] = "Appuyez sur ~b~[G]~s~ pour définir la position de stockage", + ["storage_pos_success"] = "~b~Stockage~s~ Position définie.", + ["storage_pos_error"] = "~r~Impossible~s~ de définir la position de ~b~stockage~s~.", + ["armoire_pos_textui"] = "Appuyez sur ~b~[G]~s~ pour définir la position de la garde -robe", + ["armoire_pos_success"] = "~b~Armoire~s~ Définir la position.", + ["armoire_pos_error"] = "~r~Impossible~s~ de définir la position de ~b~armoire~s~.", + ["please_finish"] = "Veuillez finir de définir la position ~b~%s~s~", + ["cant_afford"] = "Vous ne pouvez pas acheter cette propriété !", + ["select_player"] = "Sélectionner un joueur", + ["cant_sell"] = "Impossible de vendre à ce joueur !", + ["knock_on_door"] = "Frapper à la porte...", + ["nobody_home"] = "Il semble que personne n est à la maison...", + + -- -------- Chaînes générales ---------------- + + ["enabled"] = "Activé", + ["disabled"] = "Désactivé", + ["exiting"] = "Sortie de la propriété...", + ["entering"] = "Saisie de la propriété...", + ["shell_disabled"] ="Cet intérieur utilise des coques, qui sont désactivées !", + ["access_textui"] = "Appuyez sur ~b~[E]~s~ pour accéder à ~b~%s", + ["raid_notify_error"] = "Vous avez besoin de ~b~ %sx %s~s~ pour pouvoir effectuer un raid !", + ["raid_notify_success"] = "Votre propriété fait actuellement l objet d un ~b~raid !", + + -------------- Cordes de garage -------------- + + ["store_success"] = "Véhicule ~b~stocké !", + ["store_error"] = "Vous ne pouvez pas stocker ce véhicule !", + ["property_garage"] = "Propriété Garage", + ["retriving_notify"] = "Récupération de ~b~%s~s~ ...", + ["cant_access"] = "Vous ne pouvez pas accéder à ce garage !", + ["store_textui"] = "Appuyez sur ~b~[E]~s~ pour stocker ~b~%s", + ["garage_not_enabled"] = "Garage non activé sur cette propriété.", + ["cannot_access_property"] = "Vous ~r~ne pouvez pas~s~ accéder à cette propriété.", + + + -- --------------- Chaînes de menu de création ---------------- + + ["menu_title"] = "Création de propriété", + ["element_title1"] = "Numéro de rue", + ["element_description1"] = "Définissez le numéro de rue de la propriété.", + ["element_title2"] = "Prix", + ["element_description2"] = "Définir le prix de la propriété.", + ["element_title3"] = "Intérieur", + ["element_description3"] = "Sélectionnez un intérieur pour la propriété", + ["element_title4"] = "Garage", + ["element_description4"] = "(Facultatif) Gérer les paramètres du garage", + ["element_title5"] = "CCTV", + ["element_description5"] = "(Facultatif) Gérer les paramètres CCTV", + ["element_title6"] = "Entrée", + ["element_description6"] = "Définir l emplacement de l entrée de la propriété.", + ["element_create_title"] = "Créer une propriété", + ["element_create_desc_1"] = "Veuillez remplir toutes les entrées requises !", + ["entry_set_title"] = "Ensemble d entrée.", + ["entry_set_description"] = "Entrée : %s, %s, %s", + ["interior_set_title"] = "Intérieur sélectionné.", + ["interior_set_description"] = "Sélectionné : %s", + ["ipl_title"] = "Intérieurs IPL", + ["types_title"] = "Types intérieurs", + ["ipl_description"] = "Intérieurs GTA natifs, fabriqués par R*", + ["shell_title"] = "Intérieurs personnalisés", + ["shell_description"] = "Intérieurs personnalisés, faits par vous", + ["cctv_settings"] = "Paramètres CCTV", + ["garage_settings"] = "Paramètres du garage", + ["toggle_title"] = "Basculer l utilisation", + ["toggle_description"] = "État actuel : %s", + ["cctv_set_title"] = "Définir l angle CCTV", + ["cctv_set_description"] = "Règle l angle de la caméra sur la direction de vos caméras", + ["back_description"] = "retour à la création de la propriété.", + ["garage_set_title"] = "Définir la position du garage", + ["garage_set_description"] = "Définir la position du garage de la propriété.", + ["garage_textui"] = "Appuyez sur ~b~[E]~s~ pour définir la position", + ["cctv_textui_1"] = "Appuyez sur ~b~[E]~s~ pour régler l angle", + ["cctv_textui_2"] = "Appuyez sur ~b~[E]~s~ pour définir la rotation maximale à droite", + ["cctv_textui_3"] = "Appuyez sur ~b~[E]~s~ pour définir la rotation maximale à gauche", + ["create_success"] = "Propriété créée !", + ["missing_data"] = "Veuillez remplir toutes les entrées requises !", + + -- Enregistrement des traductions + ["server_restart"] = "Redémarrage du serveur", + ["server_shutdown"] = "Arrêt du serveur", + ["manual_save"] = "Enregistrement manuel (demandé par %s)", + ["resource_stop"] = "Arrêt de la ressource", + ["force_save"] = "Forcer l enregistrement (demandé par %s)", + ["interval_saving"] = "Enregistrement d intervalle" + } From ba4820c0a294458a73e50cefef8ebce6808620ac Mon Sep 17 00:00:00 2001 From: Zan <62830223+Zan1456@users.noreply.github.com> Date: Fri, 6 Jan 2023 11:42:08 +0100 Subject: [PATCH 28/58] Update hu.lua --- [esx_addons]/esx_ambulancejob/locales/hu.lua | 68 ++++++++++---------- 1 file changed, 34 insertions(+), 34 deletions(-) diff --git a/[esx_addons]/esx_ambulancejob/locales/hu.lua b/[esx_addons]/esx_ambulancejob/locales/hu.lua index 0c1a057d..b0996bf6 100644 --- a/[esx_addons]/esx_ambulancejob/locales/hu.lua +++ b/[esx_addons]/esx_ambulancejob/locales/hu.lua @@ -5,54 +5,54 @@ Locales['hu'] = { ['ems_clothes_ems'] = 'Munkaruha', -- Vehicles ['ambulance'] = 'Mentőautó', - ['helicopter_prompt'] = ' [Információ]:omd meg az [E] gombot a helikopter listához.', - ['garage_prompt'] = ' [Információ]:omd meg az [E] gombot a kocsi listához.', + ['helicopter_prompt'] = 'Nyomd meg az [E] gombot a helikopter listához.', + ['garage_prompt'] = 'Nyomd meg az [E] gombot a kocsi listához.', ['garage_title'] = 'Autó funkciók', ['garage_stored'] = 'Garázsba', ['garage_notstored'] = 'Ismeretlen helyen', ['garage_storing'] = 'Próbáljuk betteni a kocsid a garázsodba, de előtte nézz körül, hogy biztos nincs melletted senki', - ['garage_has_stored'] = ' [Információ]:keresen tároltad a garázsba!', - ['garage_has_notstored'] = ' máció]:ncs a közeledben semmi!', - ['garage_notavailable'] = ' máció]:m tárolhatod a garázsba!', - ['garage_blocked'] = ' máció]:lami gátolja a kocsi lehívását!', - ['garage_empty'] = ' máció]:m teheted a garázsba!', - ['garage_released'] = ' [Információ]:keresen kivetted!', - ['garage_store_nearby'] = ' máció]:ncs a közeledben semmi!', + ['garage_has_stored'] = ' Sikeresen tároltad a garázsba!', + ['garage_has_notstored'] = 'Nincs a közeledben semmi!', + ['garage_notavailable'] = 'Nemm tárolhatod a garázsba!', + ['garage_blocked'] = 'Valami gátolja a kocsi lehívását!', + ['garage_empty'] = 'Nem teheted a garázsba!', + ['garage_released'] = 'Sikeresen kivetted!', + ['garage_store_nearby'] = 'Nincs a közeledben semmi!', ['garage_storeditem'] = 'Garázs megnyitása', ['garage_storeitem'] = 'Kocsi berakása a garázsba', ['garage_buyitem'] = 'Kocsi igénylés', ['shop_item'] = '$%s', ['vehicleshop_title'] = 'Autókereskedés', ['vehicleshop_confirm'] = 'Megszeretnéd venni ezt a járművet?', - ['vehicleshop_bought'] = ' [Információ]:keresen igényeltél egy %s enért: ', - ['vehicleshop_money'] = ' máció]:t most nem tudod megtenni!', + ['vehicleshop_bought'] = 'Sikeresen igényeltél egy %s ennyiért: ', + ['vehicleshop_money'] = 'Ezt most nem tudod megtenni!', ['vehicleshop_awaiting_model'] = 'Betöltés..', ['confirm_no'] = 'Vissza', ['confirm_yes'] = 'Igényel', -- Action Menu - ['revive_inprogress'] = ' [Információ]:kezdted az újraélesztést!', - ['revive_complete'] = ' [Információ]:raélesztetted: %s', - ['revive_complete_award'] = ' [Információ]:raélesztetted: %s jáost.', + ['revive_inprogress'] = 'Elkezdted az újraélesztést!', + ['revive_complete'] = 'Újraélesztetted: %s', + ['revive_complete_award'] = 'Újraélesztetted: %s játékost.', ['revive_fail_offline'] = 'A játékos nem elérhető', - ['heal_inprogress'] = ' [Információ]:kezdted a gyógyítást!', - ['heal_complete'] = ' [Információ]:ggyógyítottad: %s jáost.', - ['no_players'] = ' máció]:ncs a közeledben senki!', - ['player_not_unconscious'] = ' [Információ]:játékos nincs öntudatánál!', - ['player_not_conscious'] = ' [Információ]:játékos nincs öntudatánál!', + ['heal_inprogress'] = 'Elkezdted a gyógyítást!', + ['heal_complete'] = 'Meggyógyítottad: %s játékost.', + ['no_players'] = 'Nincs a közeledben senki!', + ['player_not_unconscious'] = 'A játékos nincs öntudatánál!', + ['player_not_conscious'] = 'A játékos nincs öntudatánál!', -- Boss Menu ['boss_actions'] = 'Leader panel', -- Misc - ['invalid_amount'] = ' telen mennyiség', - ['actions_prompt'] = ' [Információ]:omd meg az [E] gombot a panel megnyitásához.', + ['invalid_amount'] = 'Érvénytelen mennyiség', + ['actions_prompt'] = 'Nyomd meg az [E] gombot a panel megnyitásához.', ['deposit_amount'] = 'Összeg betétele', ['money_withdraw'] = 'Összeg kivétele', ['fast_travel'] = 'Nyomj [E] hogy használd a liftet', - ['open_pharmacy'] = ' [Információ]:omd meg az [E] gombot a gyógyszer kivételéhez.', + ['open_pharmacy'] = 'Nyomd meg az [E] gombot a gyógyszer kivételéhez.', ['pharmacy_menu_title'] = 'Kellékek', ['pharmacy_take'] = 'Kivétel: %s', ['medikit'] = 'Elsősegély készlet', ['bandage'] = 'Kötszer', - ['max_item'] = ' máció]:m fér már el nálad!', + ['max_item'] = 'Nem fér már el nálad!', -- F6 Menu ['ems_menu'] = 'EMS menü', ['ems_menu_title'] = 'EMS Menu', @@ -65,20 +65,20 @@ Locales['hu'] = { ['alert_ambulance'] = 'EMS értesités', -- Death ['respawn_available_in'] = 'Újraéledés: %s', - ['respawn_bleedout_in'] = 'Elfogsz vérezni %s perc %s másodperclva...\n', - ['respawn_bleedout_prompt'] = 'Nyomd meg az [E]mbot az újraéledéshez', + ['respawn_bleedout_in'] = 'Elfogsz vérezni %s perc %s másodperc múlva...\n', + ['respawn_bleedout_prompt'] = 'Nyomd meg az [E] gombot az újraéledéshez', ['respawn_bleedout_fine'] = 'Újraéledéshez: [E]', - ['respawn_bleedout_fine_msg'] = '[Információ]:Ennyit fizettél, hogy újraéledj', - ['distress_send'] = 'Nyomd meg a gombot a segítségkéréshez', - ['distress_sent'] = ' [Információ]:y civil értesítette az illetékes szervezetet!', + ['respawn_bleedout_fine_msg'] = 'Ennyit fizettél, hogy újraéledj', + ['distress_send'] = 'Nyomd meg a G gombot a segítségkéréshez', + ['distress_sent'] = 'Egy civil értesítette az illetékes szervezetet!', -- Revive - ['revive_help'] = 'újraéleszteni egy játékos', + ['revive_help'] = 'újraéleszteni egy játékost', -- Item - ['used_medikit'] = ' [Információ]:használtál 1x segélytáskát.', - ['used_bandage'] = ' [Információ]:használtál 1x kötszert.', - ['not_enough_medikit'] = '[Információ]:ncs nálad: Defibrillátor.', - ['not_enough_bandage'] = '[Információ]:ncs nálad: Kötszer.', - ['healed'] = ' [Információ]:ggyógyítottak!', + ['used_medikit'] = 'Elhasználtál 1x segélytáskát.', + ['used_bandage'] = 'Elhasználtál 1x kötszert.', + ['not_enough_medikit'] = 'Nincs nálad: Defibrillátor.', + ['not_enough_bandage'] = 'Nincs nálad: Kötszer.', + ['healed'] = 'Meggyógyítottak!', -- Blips ['blip_hospital'] = 'Korház', ['blip_dead'] = 'Eszméletlen játékos', From de666f1b922937e563db11353d7fa16100ffc0de Mon Sep 17 00:00:00 2001 From: Zan <62830223+Zan1456@users.noreply.github.com> Date: Fri, 6 Jan 2023 11:46:02 +0100 Subject: [PATCH 29/58] Create questions_hu.js --- .../esx_dmvschool/html/questions_hu.js | 81 +++++++++++++++++++ 1 file changed, 81 insertions(+) create mode 100644 [esx_addons]/esx_dmvschool/html/questions_hu.js diff --git a/[esx_addons]/esx_dmvschool/html/questions_hu.js b/[esx_addons]/esx_dmvschool/html/questions_hu.js new file mode 100644 index 00000000..bb6f44ec --- /dev/null +++ b/[esx_addons]/esx_dmvschool/html/questions_hu.js @@ -0,0 +1,81 @@ +var tableauQuestion = [ + { + question: "Mit jelent a közlekedésben a bizalmi elv?", + propositionA: "Számíthat arra, hogy a KRESZ minden helyzetben és helyen szabályozza a közlekedésben résztvevők jogait és kötelességeit.", + propositionB: "Számíthat arra, hogy a közlekedési szabályokat mások is megtartják.", + propositionC: "Számíthat arra, hogy a szabálysértők mindig megkapják a megérdemelt büntetésüket.", + reponse: "B" + }, + + { + question: "Haladhat-e a villamospályán, ha az út vonalvezetése vagy a látási viszonyok akadályozzák a villamos kellő távolságból való észlelését?", + propositionA: "Igen", + propositionB: "Nem", + propositionC: "Nem tudom", + reponse: "B" + }, + + { + question: "Balra kíván bekanyarodni. Általában hová kell besorolni kétirányú forgalmú úton?", + propositionA: "Az úttest felezővonala mellé.", + propositionB: "Az úttest bal szélére.", + propositionC: "Az úttest jobb szélére.", + reponse: "B" + }, + + { + question: "Lakott területen kívül elsöbbséget kell adnia az autóbuszöblöt elhagyó autóbusz részére?", + propositionA: "Igen", + propositionB: "Nem", + propositionC: "Ha féktávon kivül vagyok, akkor nem", + reponse: "B" + }, + + { + question: "Miként befolyásolja a vezetõ reakcióidejét az alkohol és a fáradtság hatása?", + propositionA: "A reakcióideje többszörösére növekedhet.", + propositionB: "A reakcióideje kismértékben csökken.", + propositionC: "A reakcióideje csak kismértékben növekszik.", + reponse: "A" + }, + + { + question: "Mikor szabad hirtelen fékezni?", + propositionA: "Csak akkor, ha ezt a személy- és vagyonbiztonság megóvása szükségessé teszi.", + propositionB: "Csak akkor, ha Ön mögött haladó jármû helyes követési távolságot tart.", + propositionC: "Csak akkor, ha a jármü gumija nem kopik el fékezés közben.", + reponse: "A" + }, + + { + question: "Hogyan változik a látása a sebesség növekedésével?", + propositionA: "Nagy sebességgel haladva csak a közeli tárgyakat látja élesen; távolra csak homályosan lát.", + propositionB: "Nagy sebességgel haladva csak a távoli tárgyak képe éles; a közeli tárgyak képe elmosódik.", + propositionC: "Nagy sebességgel haladva, olyan mintha belennék állva.", + reponse: "A" + }, + + { + question: "A megkülönböztetõ jelzéseket használó gépjármû részére", + propositionA: "Minden helyzetben elsõbbséget kell adnia.", + propositionB: "Csak akkor kell elsõbbséget adnia, ha azzal más közlekedõt nem akadályoz jelentõsen.", + propositionC: "Csak akkor ha rámdudál.", + reponse: "A" + }, + + { + question: "Az előzés megkezdése előtt miként ellenőrízzük a mögöttes forgalmat?", + propositionA: "Oldalra-hátranézve.", + propositionB: "A belső, valamint a külső visszapillantó tükrök segítségével, és ha szükséges, akkor hátratekintéssel is.", + propositionC: "A külső visszapillantó tükör segítségével.", + reponse: "B" + }, + + { + question: "Be kell-e sorolni a járművel az úttest jobb szélén lévő autóbusz forgalmi sávba jobbra kanyarodáskor?", + propositionA: "Igen", + propositionB: "Nem", + propositionC: "Néha", + reponse: "B" + }, +] From e9e761b0651414851cfa8ade44a4408d4f3f2587 Mon Sep 17 00:00:00 2001 From: Zan <62830223+Zan1456@users.noreply.github.com> Date: Fri, 6 Jan 2023 11:46:26 +0100 Subject: [PATCH 30/58] Create ui_hu.html --- [esx_addons]/esx_dmvschool/html/ui_hu.html | 118 +++++++++++++++++++++ 1 file changed, 118 insertions(+) create mode 100644 [esx_addons]/esx_dmvschool/html/ui_hu.html diff --git a/[esx_addons]/esx_dmvschool/html/ui_hu.html b/[esx_addons]/esx_dmvschool/html/ui_hu.html new file mode 100644 index 00000000..fffdf27a --- /dev/null +++ b/[esx_addons]/esx_dmvschool/html/ui_hu.html @@ -0,0 +1,118 @@ + + + + + + +

+
+ +
+

Autós Iskola

+
+ +
+
+ +
+ +
+

Üdvözöljük a Los Santos Autosiskolánál! +

+
+
Los Santos összes polgárának meg kell csinálni a KRESZ vizsgát a forgalmi vizsa elött +
A válaszoknál ne kapkodjon, használja ki a teljes idöt, gondolkodjon jozan ésszel. +
+
+
+ KRESZ Vizsga +
- A KRESZ vizsga 1.000$-ba kerül, ami nem visszatéritendö! +
- Az autosiskola elfogadja a bankkártyás fizetést is de vigyázz, ne kerülj adosságba! +
- Ha nem sikerülne a teszt, ne aggodjon, ismét megprobálhatja! +
+
Forgalmi Vizsga +
- A Forgalmi vizsga 1.500$-ba kerül, ami szintén nem visszatéritendö összeg! +
- A Forgalmi vizsgánál figyelj oda, hogy ne okozz balesetet! +

+ +
+
+ Kezdés +
+ +
+ +
+
+

+

+
+
+ + +
+
+ + +
+
+ + +
+ +
+
+
+

Folyamat

+ +
+
+ +
+
+
+

Sikeres KRESZ Vizsga!

+
+
Gratulálok a sikeres KRESZ vizsgához! +
+
Most már elkezdheted a vezetést! +
+
+
+ Bezár +
+ +
+
+
+
+

Sajnos nem sikerült a vizsga!

+
+
Sajnálattal közlöm, de nem sikerült a KRESZ vizsga, kérlek probáld ujra késöbb... +
+
+
+
+
+ Bezár +
+ +
+
+
+ + + + + + + From 1abd1fb5b451fd8239adba584414329ccc761ff2 Mon Sep 17 00:00:00 2001 From: Kuuzoo <81863846+Kuuzoo@users.noreply.github.com> Date: Fri, 6 Jan 2023 23:01:10 +0100 Subject: [PATCH 31/58] Only show Default Inventory if Config enabled. On Itme Remove/Add the Default Inventory will now only show if enabled in the es_extended Config! --- [esx]/es_extended/client/main.lua | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/[esx]/es_extended/client/main.lua b/[esx]/es_extended/client/main.lua index a10df217..1ce5d165 100644 --- a/[esx]/es_extended/client/main.lua +++ b/[esx]/es_extended/client/main.lua @@ -250,7 +250,9 @@ if not Config.OxInventory then ESX.UI.ShowInventoryItemNotification(true, item, count) end - ESX.ShowInventory() + if Config.EnableDefaultInventory then + ESX.ShowInventory() + end end) RegisterNetEvent('esx:removeInventoryItem') @@ -267,7 +269,9 @@ if not Config.OxInventory then ESX.UI.ShowInventoryItemNotification(false, item, count) end - ESX.ShowInventory() + if Config.EnableDefaultInventory then + ESX.ShowInventory() + end end) RegisterNetEvent('esx:addWeapon') From 15d8a337a917dfd2ccb1cc624692b284106bbf70 Mon Sep 17 00:00:00 2001 From: TheFarFantomas Date: Sun, 8 Jan 2023 17:50:40 +0100 Subject: [PATCH 32/58] Feature request --- .github/ISSUE_TEMPLATE/feature_request.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..a9c9299d --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,17 @@ +--- +name: Feature Request +about: Help us improve esx with your ideas +title: "[Feature Request] - esx_script - Add better configuration" +labels: feature +assignees: Benzo00 + +--- + +**Describe the Feature** +A simple description of the new feature. + +**Screenshots** +You can also add some screenshots. + +**Additional context** +If you want to add something more. From 8b9fb47eb04cfaf3306f2fe749eb9eb489dab0b3 Mon Sep 17 00:00:00 2001 From: TheFarFantomas Date: Sun, 8 Jan 2023 17:53:29 +0100 Subject: [PATCH 33/58] Support --- .github/ISSUE_TEMPLATE/config.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/config.yml diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml new file mode 100644 index 00000000..8dd3e89f --- /dev/null +++ b/.github/ISSUE_TEMPLATE/config.yml @@ -0,0 +1,5 @@ +blank_issues_enabled: false +contact_links: + - name: General Support + url: http://discord.esx-framework.org/ + about: Please ask general questions on our Discord! \ No newline at end of file From f5e0115e1e1f07910c6fc1761f3a424551a93ca8 Mon Sep 17 00:00:00 2001 From: TheFarFantomas Date: Sun, 8 Jan 2023 17:55:09 +0100 Subject: [PATCH 34/58] Add tag --- .github/ISSUE_TEMPLATE/feature_request.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md index a9c9299d..235933f2 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -2,7 +2,7 @@ name: Feature Request about: Help us improve esx with your ideas title: "[Feature Request] - esx_script - Add better configuration" -labels: feature +labels: enhancement assignees: Benzo00 --- From dd634b66cc27e3a80437f6a2681609c7dcd47cbe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=20Gerg=C5=91?= <69343477+Rav3n95@users.noreply.github.com> Date: Sun, 8 Jan 2023 18:30:58 +0100 Subject: [PATCH 35/58] Fixes --- [esx_addons]/esx_banking/client/main.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/[esx_addons]/esx_banking/client/main.lua b/[esx_addons]/esx_banking/client/main.lua index bcaeb811..f250d735 100644 --- a/[esx_addons]/esx_banking/client/main.lua +++ b/[esx_addons]/esx_banking/client/main.lua @@ -105,11 +105,12 @@ local function StartThread() CreateBlips() while PlayerLoaded do + print('isInMarker', isInMarker, 'isInAtmMarker', isInAtmMarker) _PlayerPedId = PlayerPedId() _GetEntityCoords = GetEntityCoords(_PlayerPedId) + local closestBank = {} if IsPedOnFoot(PlayerPedId()) then - local closestBank = {} for i = 1, #Config.AtmModels do local atm = GetClosestObjectOfType(_GetEntityCoords, 8.0, Config.AtmModels[i], false) @@ -151,6 +152,9 @@ local function StartThread() isInMarker = false ESX.HideUI() end + elseif not next(closestBank) and isInMarker then + isInMarker = false + ESX.HideUI() end end @@ -247,6 +251,7 @@ end) AddEventHandler('onResourceStop', function(resource) if resource ~= GetCurrentResourceName() then return end RemoveBlips() + ESX.HideUI() if isInMenu then CloseUi() end From 23705a135f028ba111e7723921b5a45feecd9710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=20Gerg=C5=91?= <69343477+Rav3n95@users.noreply.github.com> Date: Sun, 8 Jan 2023 18:31:48 +0100 Subject: [PATCH 36/58] Forgotten print --- [esx_addons]/esx_banking/client/main.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/[esx_addons]/esx_banking/client/main.lua b/[esx_addons]/esx_banking/client/main.lua index f250d735..e88b622b 100644 --- a/[esx_addons]/esx_banking/client/main.lua +++ b/[esx_addons]/esx_banking/client/main.lua @@ -105,7 +105,6 @@ local function StartThread() CreateBlips() while PlayerLoaded do - print('isInMarker', isInMarker, 'isInAtmMarker', isInAtmMarker) _PlayerPedId = PlayerPedId() _GetEntityCoords = GetEntityCoords(_PlayerPedId) local closestBank = {} From c75e3a14002f3e93d0d4e02dd44ded46cd7fb52c Mon Sep 17 00:00:00 2001 From: iSentrie Date: Mon, 9 Jan 2023 11:29:25 +0200 Subject: [PATCH 37/58] Added 5th engine level Fix for vehicles that has 5 engine upgrades, example `shinobi` Prevents errors --- [esx_addons]/esx_lscustom/config.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/[esx_addons]/esx_lscustom/config.lua b/[esx_addons]/esx_lscustom/config.lua index b8477198..d3e6f83e 100644 --- a/[esx_addons]/esx_lscustom/config.lua +++ b/[esx_addons]/esx_lscustom/config.lua @@ -483,13 +483,13 @@ Config.Menus = { label = TranslateCap('engine'), parent = 'upgrades', modType = 11, - price = {13.95, 32.56, 65.12, 139.53} + price = {13.95, 27.9, 55.8, 111.6, 139.53} }, modBrakes = { label = TranslateCap('brakes'), parent = 'upgrades', modType = 12, - price = {4.65, 9.3, 18.6, 13.95} + price = {4.65, 9.3, 13.95, 18.6} }, modTransmission = { label = TranslateCap('transmission'), From 58e48df5142f2e7b430f849a1d832ce10653f77a Mon Sep 17 00:00:00 2001 From: Benzo <102178921+Benzo00@users.noreply.github.com> Date: Mon, 9 Jan 2023 11:25:42 +0100 Subject: [PATCH 38/58] Revert "Only show Default Inventory if Config enabled." This reverts commit 1abd1fb5b451fd8239adba584414329ccc761ff2. --- [esx]/es_extended/client/main.lua | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/[esx]/es_extended/client/main.lua b/[esx]/es_extended/client/main.lua index 1ce5d165..a10df217 100644 --- a/[esx]/es_extended/client/main.lua +++ b/[esx]/es_extended/client/main.lua @@ -250,9 +250,7 @@ if not Config.OxInventory then ESX.UI.ShowInventoryItemNotification(true, item, count) end - if Config.EnableDefaultInventory then - ESX.ShowInventory() - end + ESX.ShowInventory() end) RegisterNetEvent('esx:removeInventoryItem') @@ -269,9 +267,7 @@ if not Config.OxInventory then ESX.UI.ShowInventoryItemNotification(false, item, count) end - if Config.EnableDefaultInventory then - ESX.ShowInventory() - end + ESX.ShowInventory() end) RegisterNetEvent('esx:addWeapon') From 78200cee9ffcae7cfe0420becb5e74fc7c83ae38 Mon Sep 17 00:00:00 2001 From: Gellipapa Date: Mon, 9 Jan 2023 22:47:23 +0100 Subject: [PATCH 39/58] fix nil value if change locales --- [esx]/es_extended/locale.lua | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/[esx]/es_extended/locale.lua b/[esx]/es_extended/locale.lua index ed42aa76..c093979e 100644 --- a/[esx]/es_extended/locale.lua +++ b/[esx]/es_extended/locale.lua @@ -1,11 +1,10 @@ Locales = {} function Translate(str, ...) -- Translate string - if Locales[Config.Locale] then if Locales[Config.Locale][str] then return string.format(Locales[Config.Locale][str], ...) - elseif Config.Locale ~= 'en' and Locales['en'][str] then + elseif Config.Locale ~= 'en' and Locales['en'] and Locales['en'][str] then return string.format(Locales['en'][str], ...) else return 'Translation [' .. Config.Locale .. '][' .. str .. '] does not exist' @@ -22,4 +21,4 @@ function TranslateCap(str, ...) -- Translate string first char uppercase end _ = Translate -_U = TranslateCap \ No newline at end of file +_U = TranslateCap From 99c8d116b734ca2b3894e8fa712e93710cd521eb Mon Sep 17 00:00:00 2001 From: Csoki Date: Mon, 9 Jan 2023 22:51:27 +0100 Subject: [PATCH 40/58] fix --- [esx_addons]/esx_society/server/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx_addons]/esx_society/server/main.lua b/[esx_addons]/esx_society/server/main.lua index 0439d219..90d3ccf8 100644 --- a/[esx_addons]/esx_society/server/main.lua +++ b/[esx_addons]/esx_society/server/main.lua @@ -27,7 +27,7 @@ function registerSociety(name, label, account, datastore, inventory, data) SocietiesByName[name] = society table.insert(RegisteredSocieties, society) -end) +end AddEventHandler('esx_society:registerSociety', registerSociety) exports("registerSociety", registerSociety) From d1e64919ff63cbbc855a0856a766f3385f24a74f Mon Sep 17 00:00:00 2001 From: Csoki Date: Wed, 28 Dec 2022 22:56:50 +0100 Subject: [PATCH 41/58] feat(esx_property): update native names --- [esx_addons]/esx_property/client/cctv.lua | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/[esx_addons]/esx_property/client/cctv.lua b/[esx_addons]/esx_property/client/cctv.lua index 3ef2f663..24a6dbe1 100644 --- a/[esx_addons]/esx_property/client/cctv.lua +++ b/[esx_addons]/esx_property/client/cctv.lua @@ -47,41 +47,41 @@ function CCTV(PropertyID) if Config.CCTV.PictureWebook ~= "" then PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT") PushScaleformMovieFunctionParameterInt(1) - N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Screenshot, true)) + ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Screenshot, true)) InstructionButtonMessage(TranslateCap("take_picture")) PopScaleformMovieFunctionVoid() end PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT") PushScaleformMovieFunctionParameterInt(2) - N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Right, true)) - N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Left, true)) + ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Right, true)) + ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Left, true)) InstructionButtonMessage(TranslateCap("rot_left_right")) PopScaleformMovieFunctionVoid() PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT") PushScaleformMovieFunctionParameterInt(3) - N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Down, true)) - N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Up, true)) + ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Down, true)) + ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Up, true)) InstructionButtonMessage(TranslateCap("rot_up_down")) PopScaleformMovieFunctionVoid() PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT") PushScaleformMovieFunctionParameterInt(4) - N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.ZoomOut, true)) - N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.ZoomIn, true)) + ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.ZoomOut, true)) + ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.ZoomIn, true)) InstructionButtonMessage(TranslateCap("zoom")) PopScaleformMovieFunctionVoid() PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT") PushScaleformMovieFunctionParameterInt(5) - N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.NightVision, true)) + ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.NightVision, true)) InstructionButtonMessage(TranslateCap("night_vision")) PopScaleformMovieFunctionVoid() PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT") PushScaleformMovieFunctionParameterInt(0) - N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.Exit, true)) + ScaleformMovieMethodAddParamPlayerNameString(GetControlInstructionalButton(1, Config.CCTV.Controls.Exit, true)) InstructionButtonMessage(TranslateCap("exit")) PopScaleformMovieFunctionVoid() From 5ad4c1b2c0f2452a5c8eb381bef0858e463bf6b2 Mon Sep 17 00:00:00 2001 From: Csoki Date: Wed, 28 Dec 2022 23:03:45 +0100 Subject: [PATCH 42/58] fix(esx_property): move 'es' locales to correct location --- [esx_addons]/esx_property/{ => locales}/es.lua | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename [esx_addons]/esx_property/{ => locales}/es.lua (100%) diff --git a/[esx_addons]/esx_property/es.lua b/[esx_addons]/esx_property/locales/es.lua similarity index 100% rename from [esx_addons]/esx_property/es.lua rename to [esx_addons]/esx_property/locales/es.lua From 58360836e7efe30bed62b2291b39c3caabc198ca Mon Sep 17 00:00:00 2001 From: Csoki Date: Wed, 28 Dec 2022 23:13:09 +0100 Subject: [PATCH 43/58] feat(esx_property): remove unused variables --- [esx_addons]/esx_property/client/cctv.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/[esx_addons]/esx_property/client/cctv.lua b/[esx_addons]/esx_property/client/cctv.lua index 24a6dbe1..80a9bf3d 100644 --- a/[esx_addons]/esx_property/client/cctv.lua +++ b/[esx_addons]/esx_property/client/cctv.lua @@ -18,7 +18,6 @@ function CCTV(PropertyID) DoScreenFadeOut(500) Wait(500) - local PlyCoordsBefore = GetEntityCoords(PlayerPedId()) local Property = Properties[PropertyID] local CamTakePic = true if Property.cctv.enabled then @@ -99,7 +98,6 @@ function CCTV(PropertyID) end ESX.CloseContext() local cctvcam = nil - local angleZ = 0.0 ClearFocus() local playerPed = PlayerPedId() cctvcam = CreateCamWithParams("DEFAULT_SCRIPTED_CAMERA", From d822a902730d00403412a13cca4b65d2b36a2ec3 Mon Sep 17 00:00:00 2001 From: Csoki Date: Wed, 28 Dec 2022 23:27:40 +0100 Subject: [PATCH 44/58] fix(esx_multicharacter): update 'hu' locales # add missing locales # add new locales PR #777 --- [esx]/esx_multicharacter/locales/hu.lua | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/[esx]/esx_multicharacter/locales/hu.lua b/[esx]/esx_multicharacter/locales/hu.lua index a5266064..f6d45163 100644 --- a/[esx]/esx_multicharacter/locales/hu.lua +++ b/[esx]/esx_multicharacter/locales/hu.lua @@ -1,15 +1,22 @@ Locales["hu"] = { ["male"] = "Férfi", ["female"] = "Nő", - ["delete_label"] = "Törlés %s %s?", ["select_char"] = "Karakter kiválasztása", - ["select_char_description"] = "Select a character to play as.", + ["select_char_description"] = "Karakter kiválasztása a játékhoz.", ["create_char"] = "Új karakter létrehozása", ["char_play"] = "Karakter kiválasztása", + ["char_play_description"] = "Visszatérés a városba.", ["char_disabled"] = "Karakter le van tiltva", + ["char_disabled_description"] = "Ez a karakter nem használható.", ["char_delete"] = "Karakter törlése", - ["cancel"] = "Mégsem", - ["confirm"] = "Megerősítés", + ["char_delete_description"] = "Karakter végleges törlése.", + ["char_delete_confirmation"] = "Törlés megerősítés", + ["char_delete_confirmation_description"] = "Biztosan törölni szeretnéd a kiválasztott karaktert?", + ["char_delete_yes_description"] = "Igen, törölni szeretném", + ["char_delete_no_description"] = "Nem, vissza a karakter opciókhoz", + ["character"] = "Karakter: %s", + ["return"] = "Vissza", + ["return_description"] = "Vissza a karakter választáshoz.", ["command_setslots"] = "Játékos karakter slotok számának beállítása", ["command_remslots"] = "Játékos karakter slotok számának eltávolítása", ["command_enablechar"] = "Játékos karakterének engedélyezése", From d300c1f09a38a4925de9ca427793452cfdb5af57 Mon Sep 17 00:00:00 2001 From: Flamba Date: Thu, 12 Jan 2023 23:06:46 +1100 Subject: [PATCH 45/58] feat(esx_accsessories): Add tr locales/translation --- [esx_addons]/esx_accessories/locales/tr.lua | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 [esx_addons]/esx_accessories/locales/tr.lua diff --git a/[esx_addons]/esx_accessories/locales/tr.lua b/[esx_addons]/esx_accessories/locales/tr.lua new file mode 100644 index 00000000..d8331070 --- /dev/null +++ b/[esx_addons]/esx_accessories/locales/tr.lua @@ -0,0 +1,19 @@ +Locales ['tr'] = { + ['valid_purchase'] = 'Bunu satın almak istiyor musun?', + ['yes'] = 'evet ($%s)', + ['no'] = 'hayır', + ['helmet'] = 'kask / şapka', + ['glasses'] = 'gözlük', + ['mask'] = 'maske', + ['ears'] = 'kulak aksesuarları', + ['shop'] = '%s Dükkan', + ['set_unset'] = 'Giy / çıkar', + ['not_enough_money'] = 'yeterli paran yok', + ['press_access'] = 'menüye erişmek için [E] tuşuna basın', + ['accessories_blip'] = 'Aksesuarlar', + ['no_ears'] = 'kulak aksesuarların yok', + ['no_glasses'] = 'senin gözlüğün yok', + ['no_helmet'] = 'senin kaskın yok', + ['no_mask'] = 'senin masken yok', + ['you_paid'] = 'sen $%s ödedin', +} From 1d06e246abcfea94570feffb208390903bf61357 Mon Sep 17 00:00:00 2001 From: Alessandro Alterno <28725795+lexinor@users.noreply.github.com> Date: Fri, 13 Jan 2023 22:47:26 +0100 Subject: [PATCH 46/58] Added some new globalstate stuff and fixed stuff - esx:playerDropped event was not working properly, source was not working, changed it to playerId - Added GlobalState[name] to make it easier to track onduty counters --- [esx_addons]/esx_service/server/main.lua | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/[esx_addons]/esx_service/server/main.lua b/[esx_addons]/esx_service/server/main.lua index a5569e83..4b62e369 100644 --- a/[esx_addons]/esx_service/server/main.lua +++ b/[esx_addons]/esx_service/server/main.lua @@ -17,11 +17,13 @@ RegisterServerEvent('esx_service:activateService') AddEventHandler('esx_service:activateService', function(name, max) InService[name] = {} MaxInService[name] = max + GlobalState[name] = GetInServiceCount(name) end) RegisterServerEvent('esx_service:disableService') AddEventHandler('esx_service:disableService', function(name) InService[name][source] = nil + GlobalState[name] = GetInServiceCount(name) end) RegisterServerEvent('esx_service:notifyAllInService') @@ -35,12 +37,13 @@ end) ESX.RegisterServerCallback('esx_service:enableService', function(source, cb, name) local inServiceCount = GetInServiceCount(name) - + if inServiceCount >= MaxInService[name] then cb(false, MaxInService[name], inServiceCount) else InService[name][source] = true - cb(true, MaxInService[name], inServiceCount) + GlobalState[name] = GetInServiceCount(name) + cb(true, MaxInService[name], inServiceCount) end end) @@ -75,8 +78,10 @@ end) AddEventHandler('esx:playerDropped', function(playerId, reason) for k,v in pairs(InService) do - if v[source] == true then - v[source] = nil + if v[playerId] == true then + v[playerId] = nil + GlobalState[k] = GetInServiceCount(k) end end end) + From c503b07805ed91eb1b9c8b152a8c20cc3df97d67 Mon Sep 17 00:00:00 2001 From: Tony Stark <76168122+tony-stark-17@users.noreply.github.com> Date: Sat, 14 Jan 2023 13:24:55 +0530 Subject: [PATCH 47/58] Send lastJob data to client --- [esx]/es_extended/server/classes/player.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx]/es_extended/server/classes/player.lua b/[esx]/es_extended/server/classes/player.lua index 39e303cf..0af5ad6b 100644 --- a/[esx]/es_extended/server/classes/player.lua +++ b/[esx]/es_extended/server/classes/player.lua @@ -386,7 +386,7 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, end TriggerEvent('esx:setJob', self.source, self.job, lastJob) - self.triggerEvent('esx:setJob', self.job) + self.triggerEvent('esx:setJob', self.job, lastJob) Player(self.source).state:set("job", self.job, true) else print(('[es_extended] [^3WARNING^7] Ignoring invalid ^5.setJob()^7 usage for ID: ^5%s^7, Job: ^5%s^7'):format(self.source, job)) From 18c4d704e132be1c3731e2d4b71282745dea07d9 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Devic Date: Sat, 14 Jan 2023 13:52:41 +0100 Subject: [PATCH 48/58] build: remove esx_phone --- [SQL]/legacy.sql | 20 +- [esx_addons]/esx_ambulancejob/client/main.lua | 8 - [esx_addons]/esx_ambulancejob/locales/br.lua | 2 - [esx_addons]/esx_ambulancejob/locales/cs.lua | 2 - [esx_addons]/esx_ambulancejob/locales/de.lua | 2 - [esx_addons]/esx_ambulancejob/locales/en.lua | 2 - [esx_addons]/esx_ambulancejob/locales/es.lua | 2 - [esx_addons]/esx_ambulancejob/locales/et.lua | 2 - [esx_addons]/esx_ambulancejob/locales/fi.lua | 2 - [esx_addons]/esx_ambulancejob/locales/fr.lua | 2 - [esx_addons]/esx_ambulancejob/locales/hu.lua | 2 - [esx_addons]/esx_ambulancejob/locales/nl.lua | 2 - [esx_addons]/esx_ambulancejob/locales/pl.lua | 2 - [esx_addons]/esx_ambulancejob/locales/si.lua | 2 - [esx_addons]/esx_ambulancejob/locales/sv.lua | 2 - [esx_addons]/esx_ambulancejob/locales/tr.lua | 2 - [esx_addons]/esx_ambulancejob/server/main.lua | 4 - [esx_addons]/esx_bankerjob/client/main.lua | 11 - [esx_addons]/esx_bankerjob/locales/br.lua | 2 - [esx_addons]/esx_bankerjob/locales/de.lua | 2 - [esx_addons]/esx_bankerjob/locales/en.lua | 2 - [esx_addons]/esx_bankerjob/locales/es.lua | 2 - [esx_addons]/esx_bankerjob/locales/et.lua | 2 - [esx_addons]/esx_bankerjob/locales/fi.lua | 2 - [esx_addons]/esx_bankerjob/locales/fr.lua | 2 - [esx_addons]/esx_bankerjob/locales/hu.lua | 2 - [esx_addons]/esx_bankerjob/locales/it.lua | 2 - [esx_addons]/esx_bankerjob/locales/nl.lua | 2 - [esx_addons]/esx_bankerjob/locales/si.lua | 2 - [esx_addons]/esx_bankerjob/locales/sv.lua | 2 - [esx_addons]/esx_bankerjob/locales/tr.lua | 2 - [esx_addons]/esx_bankerjob/server/main.lua | 3 +- [esx_addons]/esx_mechanicjob/client/main.lua | 11 - [esx_addons]/esx_mechanicjob/server/main.lua | 2 - [esx_addons]/esx_phone/.editorconfig | 9 - [esx_addons]/esx_phone/LICENSE | 674 ------------------ [esx_addons]/esx_phone/README.md | 69 -- [esx_addons]/esx_phone/client/main.lua | 282 -------- [esx_addons]/esx_phone/config.lua | 2 - [esx_addons]/esx_phone/esx_phone.sql | 16 - [esx_addons]/esx_phone/fxmanifest.lua | 50 -- [esx_addons]/esx_phone/html/css/app.css | 392 ---------- [esx_addons]/esx_phone/html/img/icons/add.png | Bin 995 -> 0 bytes .../esx_phone/html/img/icons/back.png | Bin 1105 -> 0 bytes .../esx_phone/html/img/icons/edit.png | Bin 236 -> 0 bytes .../esx_phone/html/img/icons/location.png | Bin 345 -> 0 bytes [esx_addons]/esx_phone/html/img/icons/msg.png | Bin 1205 -> 0 bytes .../esx_phone/html/img/icons/new-msg.png | Bin 1196 -> 0 bytes [esx_addons]/esx_phone/html/img/icons/ok.png | Bin 241 -> 0 bytes [esx_addons]/esx_phone/html/img/icons/rep.png | Bin 1504 -> 0 bytes .../esx_phone/html/img/icons/reply.png | Bin 260 -> 0 bytes .../esx_phone/html/img/icons/signal.png | Bin 1102 -> 0 bytes .../esx_phone/html/img/icons/write.png | Bin 250 -> 0 bytes [esx_addons]/esx_phone/html/img/phone.png | Bin 19471 -> 0 bytes [esx_addons]/esx_phone/html/scripts/app.js | 512 ------------- [esx_addons]/esx_phone/html/scripts/app_de.js | 512 ------------- [esx_addons]/esx_phone/html/scripts/app_en.js | 516 -------------- [esx_addons]/esx_phone/html/scripts/app_es.js | 512 ------------- [esx_addons]/esx_phone/html/scripts/app_pl.js | 512 ------------- .../esx_phone/html/scripts/mustache.min.js | 1 - [esx_addons]/esx_phone/html/ui.html | 90 --- [esx_addons]/esx_phone/html/ui_br.html | 90 --- [esx_addons]/esx_phone/html/ui_de.html | 90 --- [esx_addons]/esx_phone/html/ui_en.html | 90 --- [esx_addons]/esx_phone/html/ui_es.html | 87 --- [esx_addons]/esx_phone/html/ui_hu.html | 84 --- [esx_addons]/esx_phone/html/ui_pl.html | 91 --- [esx_addons]/esx_phone/locales/br.lua | 13 - [esx_addons]/esx_phone/locales/de.lua | 13 - [esx_addons]/esx_phone/locales/en.lua | 13 - [esx_addons]/esx_phone/locales/es.lua | 14 - [esx_addons]/esx_phone/locales/fr.lua | 13 - [esx_addons]/esx_phone/locales/hu.lua | 13 - [esx_addons]/esx_phone/locales/it.lua | 13 - [esx_addons]/esx_phone/locales/nl.lua | 13 - [esx_addons]/esx_phone/locales/pl.lua | 13 - [esx_addons]/esx_phone/locales/si.lua | 13 - [esx_addons]/esx_phone/locales/sv.lua | 13 - [esx_addons]/esx_phone/server/main.lua | 293 -------- [esx_addons]/esx_policejob/client/main.lua | 22 - [esx_addons]/esx_policejob/locales/br.lua | 3 - [esx_addons]/esx_policejob/locales/cs.lua | 3 - [esx_addons]/esx_policejob/locales/de.lua | 3 - [esx_addons]/esx_policejob/locales/en.lua | 3 - [esx_addons]/esx_policejob/locales/es.lua | 3 - [esx_addons]/esx_policejob/locales/et.lua | 3 - [esx_addons]/esx_policejob/locales/fi.lua | 3 - [esx_addons]/esx_policejob/locales/fr.lua | 3 - [esx_addons]/esx_policejob/locales/hu.lua | 3 - [esx_addons]/esx_policejob/locales/ko.lua | 3 - [esx_addons]/esx_policejob/locales/nl.lua | 3 - [esx_addons]/esx_policejob/locales/pl.lua | 3 - [esx_addons]/esx_policejob/locales/si.lua | 3 - [esx_addons]/esx_policejob/locales/sv.lua | 3 - [esx_addons]/esx_policejob/locales/tr.lua | 3 - [esx_addons]/esx_policejob/server/main.lua | 7 - [esx_addons]/esx_taxijob/client/main.lua | 11 - [esx_addons]/esx_taxijob/locales/br.lua | 1 - [esx_addons]/esx_taxijob/locales/de.lua | 1 - [esx_addons]/esx_taxijob/locales/en.lua | 1 - [esx_addons]/esx_taxijob/locales/es.lua | 1 - [esx_addons]/esx_taxijob/locales/fi.lua | 1 - [esx_addons]/esx_taxijob/locales/fr.lua | 1 - [esx_addons]/esx_taxijob/locales/hu.lua | 1 - [esx_addons]/esx_taxijob/locales/it.lua | 1 - [esx_addons]/esx_taxijob/locales/pl.lua | 1 - [esx_addons]/esx_taxijob/locales/si.lua | 1 - [esx_addons]/esx_taxijob/locales/sv.lua | 1 - [esx_addons]/esx_taxijob/server/main.lua | 7 - [esx_addons]/esx_vehicleshop/server/main.lua | 1 - 110 files changed, 2 insertions(+), 5333 deletions(-) delete mode 100644 [esx_addons]/esx_phone/.editorconfig delete mode 100644 [esx_addons]/esx_phone/LICENSE delete mode 100644 [esx_addons]/esx_phone/README.md delete mode 100644 [esx_addons]/esx_phone/client/main.lua delete mode 100644 [esx_addons]/esx_phone/config.lua delete mode 100644 [esx_addons]/esx_phone/esx_phone.sql delete mode 100644 [esx_addons]/esx_phone/fxmanifest.lua delete mode 100644 [esx_addons]/esx_phone/html/css/app.css delete mode 100644 [esx_addons]/esx_phone/html/img/icons/add.png delete mode 100644 [esx_addons]/esx_phone/html/img/icons/back.png delete mode 100644 [esx_addons]/esx_phone/html/img/icons/edit.png delete mode 100644 [esx_addons]/esx_phone/html/img/icons/location.png delete mode 100644 [esx_addons]/esx_phone/html/img/icons/msg.png delete mode 100644 [esx_addons]/esx_phone/html/img/icons/new-msg.png delete mode 100644 [esx_addons]/esx_phone/html/img/icons/ok.png delete mode 100644 [esx_addons]/esx_phone/html/img/icons/rep.png delete mode 100644 [esx_addons]/esx_phone/html/img/icons/reply.png delete mode 100644 [esx_addons]/esx_phone/html/img/icons/signal.png delete mode 100644 [esx_addons]/esx_phone/html/img/icons/write.png delete mode 100644 [esx_addons]/esx_phone/html/img/phone.png delete mode 100644 [esx_addons]/esx_phone/html/scripts/app.js delete mode 100644 [esx_addons]/esx_phone/html/scripts/app_de.js delete mode 100644 [esx_addons]/esx_phone/html/scripts/app_en.js delete mode 100644 [esx_addons]/esx_phone/html/scripts/app_es.js delete mode 100644 [esx_addons]/esx_phone/html/scripts/app_pl.js delete mode 100644 [esx_addons]/esx_phone/html/scripts/mustache.min.js delete mode 100644 [esx_addons]/esx_phone/html/ui.html delete mode 100644 [esx_addons]/esx_phone/html/ui_br.html delete mode 100644 [esx_addons]/esx_phone/html/ui_de.html delete mode 100644 [esx_addons]/esx_phone/html/ui_en.html delete mode 100644 [esx_addons]/esx_phone/html/ui_es.html delete mode 100644 [esx_addons]/esx_phone/html/ui_hu.html delete mode 100644 [esx_addons]/esx_phone/html/ui_pl.html delete mode 100644 [esx_addons]/esx_phone/locales/br.lua delete mode 100644 [esx_addons]/esx_phone/locales/de.lua delete mode 100644 [esx_addons]/esx_phone/locales/en.lua delete mode 100644 [esx_addons]/esx_phone/locales/es.lua delete mode 100644 [esx_addons]/esx_phone/locales/fr.lua delete mode 100644 [esx_addons]/esx_phone/locales/hu.lua delete mode 100644 [esx_addons]/esx_phone/locales/it.lua delete mode 100644 [esx_addons]/esx_phone/locales/nl.lua delete mode 100644 [esx_addons]/esx_phone/locales/pl.lua delete mode 100644 [esx_addons]/esx_phone/locales/si.lua delete mode 100644 [esx_addons]/esx_phone/locales/sv.lua delete mode 100644 [esx_addons]/esx_phone/server/main.lua diff --git a/[SQL]/legacy.sql b/[SQL]/legacy.sql index 15e49771..39e24040 100644 --- a/[SQL]/legacy.sql +++ b/[SQL]/legacy.sql @@ -907,25 +907,7 @@ ALTER TABLE `users` -- ALTER TABLE `user_licenses` MODIFY `id` int(11) NOT NULL AUTO_INCREMENT; - --- --- ESX Phone --- -CREATE TABLE `user_contacts` ( - `id` INT(11) NOT NULL AUTO_INCREMENT, - `identifier` VARCHAR(60) NOT NULL, - `name` VARCHAR(100) NOT NULL, - `number` INT(11) NOT NULL, - - PRIMARY KEY (`id`), - INDEX `index_user_contacts_identifier_name_number` (`identifier`, `name`, `number`) -) ENGINE=InnoDB; - - -ALTER TABLE `users` - ADD COLUMN `phone_number` INT(11) NULL, - ADD UNIQUE INDEX `index_users_phone_number` (`phone_number`); - + -- -- Fine Types -- diff --git a/[esx_addons]/esx_ambulancejob/client/main.lua b/[esx_addons]/esx_ambulancejob/client/main.lua index a9a46264..95e90c9f 100644 --- a/[esx_addons]/esx_ambulancejob/client/main.lua +++ b/[esx_addons]/esx_ambulancejob/client/main.lua @@ -344,14 +344,6 @@ function RespawnPed(ped, coords, heading) TriggerEvent('playerSpawned') -- compatibility with old scripts, will be removed soon end -RegisterNetEvent('esx_phone:loaded') -AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts) - local specialContact = {name = 'Ambulance', number = 'ambulance', - base64Icon = 'data:image/png;base64,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'} - - TriggerEvent('esx_phone:addSpecialContact', specialContact.name, specialContact.number, specialContact.base64Icon) -end) - AddEventHandler('esx:onPlayerDeath', function(data) OnPlayerDeath() end) diff --git a/[esx_addons]/esx_ambulancejob/locales/br.lua b/[esx_addons]/esx_ambulancejob/locales/br.lua index 36c698ad..efa6a58c 100644 --- a/[esx_addons]/esx_ambulancejob/locales/br.lua +++ b/[esx_addons]/esx_ambulancejob/locales/br.lua @@ -61,8 +61,6 @@ Locales['br'] = { ['ems_menu_small'] = 'curar pequenas feridas', ['ems_menu_big'] = 'tratando lesões graves', ['ems_menu_search'] = 'paciente não encontrado', - -- Phone - ['alert_ambulance'] = 'alerta socorrista', -- Death ['respawn_available_in'] = 'você irar reviver em %s minutos %s segundos', ['respawn_bleedout_in'] = 'você vai sangrar %s minutos %s segundos\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/cs.lua b/[esx_addons]/esx_ambulancejob/locales/cs.lua index 0f295494..fcebdcfd 100644 --- a/[esx_addons]/esx_ambulancejob/locales/cs.lua +++ b/[esx_addons]/esx_ambulancejob/locales/cs.lua @@ -61,8 +61,6 @@ Locales['cs'] = { ['ems_menu_small'] = 'ošetřit malé zranění', ['ems_menu_big'] = 'ošetřit vážné zranění', ['ems_menu_search'] = 'pacient nebyl nalezen', - -- Phone - ['alert_ambulance'] = 'zdravotnický poplach', -- Death ['respawn_available_in'] = 'oživení dostupné za %s minut a %s sekund\n', ['respawn_bleedout_in'] = 'vykrvácíte za %s minut a %s sekund\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/de.lua b/[esx_addons]/esx_ambulancejob/locales/de.lua index cc708e82..c05028ba 100644 --- a/[esx_addons]/esx_ambulancejob/locales/de.lua +++ b/[esx_addons]/esx_ambulancejob/locales/de.lua @@ -60,8 +60,6 @@ Locales['de'] = { ['ems_menu_putincar'] = 'In Fahrzeug stecken', ['ems_menu_small'] = 'Kleine Wunden behandeln', ['ems_menu_big'] = 'Ernsthafte Verletzungen behandeln', - -- Phone - ['alert_ambulance'] = 'Rettungsdienst alarmieren', -- Death ['respawn_available_in'] = 'Respawn in %s Minuten %s Sekundenrfügbar', ['respawn_bleedout_in'] = 'Du wirst in %s Minuten %s Sekundensbluten\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/en.lua b/[esx_addons]/esx_ambulancejob/locales/en.lua index c54b7f21..4f7831d9 100644 --- a/[esx_addons]/esx_ambulancejob/locales/en.lua +++ b/[esx_addons]/esx_ambulancejob/locales/en.lua @@ -61,8 +61,6 @@ Locales['en'] = { ['ems_menu_small'] = 'Heal small wounds', ['ems_menu_big'] = 'Treat serious injuries', ['ems_menu_search'] = 'Patient not found', - -- Phone - ['alert_ambulance'] = 'Alert Ambulance', -- Death ['respawn_available_in'] = 'Respawn available in %s minutes %s seconds', ['respawn_bleedout_in'] = 'You will bleed out in %s minutes %s seconds\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/es.lua b/[esx_addons]/esx_ambulancejob/locales/es.lua index 17f7a240..5e3d3235 100644 --- a/[esx_addons]/esx_ambulancejob/locales/es.lua +++ b/[esx_addons]/esx_ambulancejob/locales/es.lua @@ -63,8 +63,6 @@ Locales['es'] = { ['ems_menu_small'] = 'Curar pequeñas heridas', ['ems_menu_big'] = 'Tratar lesiones graves', ['ems_menu_search'] = 'Paciente no encontrado', - -- Phone - ['alert_ambulance'] = 'Alerta de ambulancia', -- Death ['respawn_available_in'] = 'Reaparición disponible en %s minutes %s seconds', ['respawn_bleedout_in'] = 'te desangrarás en %s minutes %s seconds\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/et.lua b/[esx_addons]/esx_ambulancejob/locales/et.lua index ea0b825c..a596173f 100644 --- a/[esx_addons]/esx_ambulancejob/locales/et.lua +++ b/[esx_addons]/esx_ambulancejob/locales/et.lua @@ -61,8 +61,6 @@ Locales['et'] = { ['ems_menu_small'] = 'Ravi väikseid haavi', ['ems_menu_big'] = 'Ravi tõsiseid haavu', ['ems_menu_search'] = 'Patsienti ei leitud', - -- Phone - ['alert_ambulance'] = 'Kiirabi teadaanded', -- Death ['respawn_available_in'] = 'Sul on võimalik haiglas ärgata %s minuti ka %s sekundi pärast', ['respawn_bleedout_in'] = 'Sa jooksed verest tühjak %s minuti ja %s sekundi pärast\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/fi.lua b/[esx_addons]/esx_ambulancejob/locales/fi.lua index 783b1aff..b7b20d3a 100644 --- a/[esx_addons]/esx_ambulancejob/locales/fi.lua +++ b/[esx_addons]/esx_ambulancejob/locales/fi.lua @@ -61,8 +61,6 @@ Locales['fi'] = { ['ems_menu_small'] = 'hoida pieniä haavoja', ['ems_menu_big'] = 'hoida isoja haavoja', ['ems_menu_search'] = 'potilasta ei löydy', - -- Phone - ['alert_ambulance'] = 'hälyytys Ensihoidolle', -- Death ['respawn_available_in'] = 'respawn available in %s minutes %s seconds', ['respawn_bleedout_in'] = 'you will bleed out in %s minutes %s seconds\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/fr.lua b/[esx_addons]/esx_ambulancejob/locales/fr.lua index 9f7102e8..08a741ab 100644 --- a/[esx_addons]/esx_ambulancejob/locales/fr.lua +++ b/[esx_addons]/esx_ambulancejob/locales/fr.lua @@ -61,8 +61,6 @@ Locales['fr'] = { ['ems_menu_small'] = 'soigner petites blessures', ['ems_menu_big'] = 'soigner blessures graves', ['ems_menu_search'] = 'patient introuvable', - -- Phone - ['alert_ambulance'] = 'alerte Ambulance', -- Death ['respawn_available_in'] = 'réanimation possible dans %s minutes %s secondes', ['respawn_bleedout_in'] = 'vous allez souffrir d\'une hémorragie dans %s minutes %s secondes\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/hu.lua b/[esx_addons]/esx_ambulancejob/locales/hu.lua index b0996bf6..558097cf 100644 --- a/[esx_addons]/esx_ambulancejob/locales/hu.lua +++ b/[esx_addons]/esx_ambulancejob/locales/hu.lua @@ -61,8 +61,6 @@ Locales['hu'] = { ['ems_menu_small'] = 'Kis sebek meggyógyítása', ['ems_menu_big'] = 'Súlyos sérülések kezelése', ['ems_menu_search'] = 'Civil megkeresése', - -- Phone - ['alert_ambulance'] = 'EMS értesités', -- Death ['respawn_available_in'] = 'Újraéledés: %s', ['respawn_bleedout_in'] = 'Elfogsz vérezni %s perc %s másodperc múlva...\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/nl.lua b/[esx_addons]/esx_ambulancejob/locales/nl.lua index 93383888..01c40aff 100644 --- a/[esx_addons]/esx_ambulancejob/locales/nl.lua +++ b/[esx_addons]/esx_ambulancejob/locales/nl.lua @@ -60,8 +60,6 @@ Locales['nl'] = { ['ems_menu_putincar'] = 'Zet in voertuig', ['ems_menu_small'] = 'Behandel kleine verwondingen', ['ems_menu_big'] = 'Behandel grote verwondingen', - -- Phone - ['alert_ambulance'] = 'alert Ambulance', -- Death ['respawn_available_in'] = 'Respawn beschikbaar in %s minuten en %s seconden', ['respawn_bleedout_in'] = 'Je zal doodbloeden in %s minuten %s seconden\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/pl.lua b/[esx_addons]/esx_ambulancejob/locales/pl.lua index b1cb2035..a9b9df68 100644 --- a/[esx_addons]/esx_ambulancejob/locales/pl.lua +++ b/[esx_addons]/esx_ambulancejob/locales/pl.lua @@ -61,8 +61,6 @@ Locales['pl'] = { ['ems_menu_small'] = 'ulecz małe rany', ['ems_menu_big'] = 'ulecz poważne obrażenia', ['ems_menu_search'] = 'nie znaleziono pacjenta', - -- Phone - ['alert_ambulance'] = 'wezwij ambulans', -- Death ['respawn_available_in'] = 'respawn available in %s minutes %s seconds', ['respawn_bleedout_in'] = 'you will bleed out in %s minutes %s seconds\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/si.lua b/[esx_addons]/esx_ambulancejob/locales/si.lua index 06b4a507..95687b48 100644 --- a/[esx_addons]/esx_ambulancejob/locales/si.lua +++ b/[esx_addons]/esx_ambulancejob/locales/si.lua @@ -61,8 +61,6 @@ Locales['si'] = { ['ems_menu_small'] = 'Heal small wounds', ['ems_menu_big'] = 'Treat serious injuries', ['ems_menu_search'] = 'Patient not found', - -- Telefon - ['alert_ambulance'] = 'Alert Ambulance', -- Smrt ['respawn_available_in'] = 'Ponovna obnova je na voljo čez %s minut %s sekund', ['respawn_bleedout_in'] = 'Izkrvavel boš v %s minutah %s sekundah\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/sv.lua b/[esx_addons]/esx_ambulancejob/locales/sv.lua index 44be806e..cb1f4958 100644 --- a/[esx_addons]/esx_ambulancejob/locales/sv.lua +++ b/[esx_addons]/esx_ambulancejob/locales/sv.lua @@ -61,8 +61,6 @@ Locales['sv'] = { ['ems_menu_small'] = 'behandla mindre skador', ['ems_menu_big'] = 'behandla svåra skador', ['ems_menu_search'] = 'patienten hittades inte', - -- Phone - ['alert_ambulance'] = 'ambulanssamtal', -- Death ['respawn_available_in'] = 'respawn tillgänglig om %s:%s', ['respawn_bleedout_in'] = 'du kommer att förblöda om %s:%s\n', diff --git a/[esx_addons]/esx_ambulancejob/locales/tr.lua b/[esx_addons]/esx_ambulancejob/locales/tr.lua index 052b2974..9137daee 100644 --- a/[esx_addons]/esx_ambulancejob/locales/tr.lua +++ b/[esx_addons]/esx_ambulancejob/locales/tr.lua @@ -60,8 +60,6 @@ Locales['tr'] = { ['ems_menu_putincar'] = 'araca koy', ['ems_menu_small'] = 'küçük yaraları tedavi et', ['ems_menu_big'] = 'ciddi yaraları tedavi et', - -- Phone - ['alert_ambulance'] = 'hastane Acil Durum', -- Death ['respawn_available_in'] = 'yeniden canlanmana %s dakika %s saniye kaldı', ['respawn_bleedout_in'] = 'kanama %s dakika %s saniye boyunca devam edecek\n', diff --git a/[esx_addons]/esx_ambulancejob/server/main.lua b/[esx_addons]/esx_ambulancejob/server/main.lua index c5265ab2..8fb273f9 100644 --- a/[esx_addons]/esx_ambulancejob/server/main.lua +++ b/[esx_addons]/esx_ambulancejob/server/main.lua @@ -1,9 +1,5 @@ local playersHealing, deadPlayers = {}, {} -if GetResourceState("esx_phone") ~= 'missing' then -TriggerEvent('esx_phone:registerNumber', 'ambulance', TranslateCap('alert_ambulance'), true, true) -end - CreateThread(function() exports["esx_society"]:registerSociety('ambulance', 'Ambulance', 'society_ambulance', 'society_ambulance', 'society_ambulance', {type = 'public'}) end) diff --git a/[esx_addons]/esx_bankerjob/client/main.lua b/[esx_addons]/esx_bankerjob/client/main.lua index a4d8a732..eab4b623 100644 --- a/[esx_addons]/esx_bankerjob/client/main.lua +++ b/[esx_addons]/esx_bankerjob/client/main.lua @@ -254,14 +254,3 @@ CreateThread(function() end end end) - -RegisterNetEvent('esx_phone:loaded') -AddEventHandler('esx_phone:loaded', function (phoneNumber, contacts) - local specialContact = { - name = TranslateCap('phone_label'), - number = 'banker', - base64Icon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIAAAACACAMAAAD04JH5AAAABGdBTUEAALGPC/xhBQAAAwBQTFRFAAAAJUO2JUS4JkW7Jka+L0y5M0+7O1e9J0fBKEjEKEnHKUrJKUvMKk3PK07SK0/VLFHaLVLeLVPgLlTjOl7kO1/lQFu/RmDBTmbEU2vHXHLIR2jmSGnnVHPoVXToaX7NYX7pYn/qbIHPd4rReYzTbojre5PtfZTuhZbWh5jYiJ7vkqHblqnwl6rxoK3fpLXzsb/1u8Xovsr2ydHty9X419zy5Oj25ur88vT78vT88/X9////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAATuU7PwAAAQB0Uk5T////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////AFP3ByUAAAAJcEhZcwAADsIAAA7CARUoSoAAAAAYdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjEuNv1OCegAAAUoSURBVHhe5ZvrdtQ2FEZjoCmFltsQ2gYCA4VA06GUhktK3v+5ppK8bUu2jnTk26zV7l+JbH1nR7Y0QglH+zHstpsBb7hWSLHAjnpxttylp0zgKXWSXHCzjgKBxxRQcE4XBVqBc6LV0C+LTqDgh+/Y0TmNRoDAcjRPIi8w6qdvyI9CTiAy4csgRyQjQMoUHhMlkBSYNPodpMVJCdB/OqlBkAXO6D0LZEYQBeg5F+L6LAnQbz7OCO4jCNBrVojuERUoXvh1kB4SE1ioftwgIjDr6x9CBZ+hwGI/v4UaHgOBRetHDAYC3LgYlGnpC3DbcvSX5Z4Ady1Jb+McCnDPslALAoEFJ6AP1WoCAW5YHMo5fAEuL4//GngCM+1/NFDR4glwcRUoaegEuFTEp+vr6298XUS3P2kFRuy/X5rylvd8XwJVPQEu6Dn5Rn3Dc9r0PKVsK1D8BtrR7yh/DtRtBWjWckHhjr+5oobCCNCo5BlFQ95yVUldeJTAVyoOOOEGFXws1gIlb8AHqsX4yj0qXGUEaFLQTD2JgilZTwQnoN6G+VNP4iX35ukEaMgSTj0J9ZQsFRhOPYlP9MjRCKhewfjUk9BNyUaAb5OIU0/iGR1T2EMsncBfpJagmZK1QPb8NTf1JD7QX6YW4BuJE+LGkJuSGgHd1JP4hxQJK5A+f1esPGkeEBTHCvClADHjOb5HUpQVBE6rH4iKsYJAVVU3yIpwlhV4Tg58NnnwhCbLFW0WmuCjayMswv4o/Q5agvfQ5TmuaHHQZvhIi+MJjdUjsgbsj/LbccJqCDQElWgzvKPFcUpjVUmTYX/EFwn8legX8izeEPxGk+UzbYZLmix3SeuhEbC4PKJ8CppvERWyokB8MuxWFIhOhu2qAtVD4jrO1hWohuvyygLVHQJb1haobpLYsLpA/1U8gEC4Lh9CIFiXDyJQ/USs4TAC1W1yDybQrssrr4Q+dfD54QTqybDuh1GP+yZ4zY/jIWZd3h+9oUQamzi/gNmkZHfFYBMXEKiq/73Aq0ML2H+aqc7pbeJSAqohsIn/RYFfDy1QH9FcUCSFTVxMQDMENnF+ge8OLWBqOwHFYblNXE5AMQQ2cXaB77UC3hGJ/y/+L7QZvtBkuaTN4J/cRLCla4G0QXBU2Z1Q/EGL4x2NVXVKi6M+IZJwpRUC70lz0NcQVGoPg6pjWhwvaIziKiOQOKl6O+ms9PKYahFcZQTkISBoPOIgvK4rIyDORGImQL0BdeFGQBwCUiZAvT6/U7gRkN4CUsbjz1Af6rYC0hBMPq4X3kKqegKSATlj+ZOCfSjqC0i/vBvzC6uGq259CKGmoROQp+I9es2H2Qk1eAKywSP6zQYFLb5A4jeoN+g5D9Rz+ALyEGw2d+g7B6yBNYFAyuABvadjN2IdoUByf0r/yVALQoH0H/TdImEaVGroCaQewmbzIxlToE5LXyBt8JCU8TSfQS0DgbTB1BfhFUU6hgIZg9tEjcJbARsiAhmD+4SN4GcK+MQEMgajF+bh+BuiAhmDkQvz4P1zxAVyf1hzl8wSSO4jCOQObsoXZnIHSALZx0CuknD995EFcgYlC3Pw+ReSEMg9Bv1GibwoKYGZ5mNk9fFIC+TOjzTzkSSJjEDu76yyGyVSZLICmeeQno/xtSdAIZBZlqgVQVFeKZB+EMJ8pGcOpYCBchEiGyV3/qRCL5A4ROhtlORlL0KJgIWSfShtSM/6IaUCltjW2W2Uoh/4GcYI1Oy2rcj2XPe/rIfs9/8CuOBqaLBm2ZcAAAAASUVORK5CYII=' - } - - TriggerEvent('esx_phone:addSpecialContact', specialContact.name, specialContact.number, specialContact.base64Icon) -end) diff --git a/[esx_addons]/esx_bankerjob/locales/br.lua b/[esx_addons]/esx_bankerjob/locales/br.lua index ea237504..6bc9341c 100644 --- a/[esx_addons]/esx_bankerjob/locales/br.lua +++ b/[esx_addons]/esx_bankerjob/locales/br.lua @@ -13,6 +13,4 @@ Locales['br'] = { ['press_input_context_to_open_menu'] = 'pressione [E] para abrir o menu', ['withdraw'] = 'sacar', ['boss_actions'] = 'boss Actions', - ['phone_receive'] = 'bank Customer', - ['phone_label'] = 'bank', } diff --git a/[esx_addons]/esx_bankerjob/locales/de.lua b/[esx_addons]/esx_bankerjob/locales/de.lua index 791d973e..dfd68f42 100644 --- a/[esx_addons]/esx_bankerjob/locales/de.lua +++ b/[esx_addons]/esx_bankerjob/locales/de.lua @@ -13,6 +13,4 @@ Locales['de'] = { ['press_input_context_to_open_menu'] = 'Drücke [E] um das Bank Menü zu öffnen', ['withdraw'] = 'Abheben', ['boss_actions'] = 'boss Actions', - ['phone_receive'] = 'Bankkunde', - ['phone_label'] = 'bank', } diff --git a/[esx_addons]/esx_bankerjob/locales/en.lua b/[esx_addons]/esx_bankerjob/locales/en.lua index 43243733..66fae148 100644 --- a/[esx_addons]/esx_bankerjob/locales/en.lua +++ b/[esx_addons]/esx_bankerjob/locales/en.lua @@ -13,6 +13,4 @@ Locales['en'] = { ['press_input_context_to_open_menu'] = 'press [E] to open the Bank Menu.', ['withdraw'] = 'withdraw', ['boss_actions'] = 'boss Actions', - ['phone_receive'] = 'bank Customer', - ['phone_label'] = 'bank', } diff --git a/[esx_addons]/esx_bankerjob/locales/es.lua b/[esx_addons]/esx_bankerjob/locales/es.lua index 8b04a1b0..f108ffe0 100644 --- a/[esx_addons]/esx_bankerjob/locales/es.lua +++ b/[esx_addons]/esx_bankerjob/locales/es.lua @@ -13,6 +13,4 @@ Locales['es'] = { ['press_input_context_to_open_menu'] = 'presione [E] para abrir el Menú del banc .', ['withdraw'] = 'retirar', ['boss_actions'] = 'Acciones del jefe', - ['phone_receive'] = 'Cliente bancario', - ['phone_label'] = 'banco', } \ No newline at end of file diff --git a/[esx_addons]/esx_bankerjob/locales/et.lua b/[esx_addons]/esx_bankerjob/locales/et.lua index 182b4602..474ede2a 100644 --- a/[esx_addons]/esx_bankerjob/locales/et.lua +++ b/[esx_addons]/esx_bankerjob/locales/et.lua @@ -13,6 +13,4 @@ Locales['et'] = { ['press_input_context_to_open_menu'] = 'Vajuta [E], et avada panga menüü.', ['withdraw'] = 'Võta välja', ['boss_actions'] = 'Bossi tegevused', - ['phone_receive'] = 'Panga klient', - ['phone_label'] = 'Pank', } diff --git a/[esx_addons]/esx_bankerjob/locales/fi.lua b/[esx_addons]/esx_bankerjob/locales/fi.lua index 12b95adc..27941be9 100644 --- a/[esx_addons]/esx_bankerjob/locales/fi.lua +++ b/[esx_addons]/esx_bankerjob/locales/fi.lua @@ -13,6 +13,4 @@ Locales['fi'] = { ['press_input_context_to_open_menu'] = 'Paina [E] avataksesi valikon', ['withdraw'] = 'nosta', ['boss_actions'] = 'pomo valinnat', - ['phone_receive'] = 'pankin asiakas', - ['phone_label'] = 'bank', } diff --git a/[esx_addons]/esx_bankerjob/locales/fr.lua b/[esx_addons]/esx_bankerjob/locales/fr.lua index c836a0c2..ceb3efed 100644 --- a/[esx_addons]/esx_bankerjob/locales/fr.lua +++ b/[esx_addons]/esx_bankerjob/locales/fr.lua @@ -13,6 +13,4 @@ Locales['fr'] = { ['press_input_context_to_open_menu'] = 'appuyez sur [E] pour ouvrir le menu', ['withdraw'] = 'retrait', ['boss_actions'] = 'action Patron', - ['phone_receive'] = 'client Banque', - ['phone_label'] = 'banque', } diff --git a/[esx_addons]/esx_bankerjob/locales/hu.lua b/[esx_addons]/esx_bankerjob/locales/hu.lua index 74fd85b0..79570d88 100644 --- a/[esx_addons]/esx_bankerjob/locales/hu.lua +++ b/[esx_addons]/esx_bankerjob/locales/hu.lua @@ -13,6 +13,4 @@ Locales['hu'] = { ['press_input_context_to_open_menu'] = 'Nyomj [E] hogy megnyisd a bankot.', ['withdraw'] = 'Kivétel', ['boss_actions'] = 'Főnöki menü', - ['phone_receive'] = 'banki ügyfél', - ['phone_label'] = 'bank', } diff --git a/[esx_addons]/esx_bankerjob/locales/it.lua b/[esx_addons]/esx_bankerjob/locales/it.lua index 2d3b50a2..47ac737d 100644 --- a/[esx_addons]/esx_bankerjob/locales/it.lua +++ b/[esx_addons]/esx_bankerjob/locales/it.lua @@ -13,6 +13,4 @@ Locales['it'] = { ['press_input_context_to_open_menu'] = 'premi [E] per aprire il menu della banca.', ['withdraw'] = 'ritira', ['boss_actions'] = 'azioni boss', - ['phone_receive'] = 'cliente bancario', - ['phone_label'] = 'banca', } diff --git a/[esx_addons]/esx_bankerjob/locales/nl.lua b/[esx_addons]/esx_bankerjob/locales/nl.lua index 824df3ab..c797c8f3 100644 --- a/[esx_addons]/esx_bankerjob/locales/nl.lua +++ b/[esx_addons]/esx_bankerjob/locales/nl.lua @@ -13,6 +13,4 @@ Locales['nl'] = { ['press_input_context_to_open_menu'] = 'druk op [E] om het Bank Menute openen.', ['withdraw'] = 'opnemen', ['boss_actions'] = 'baas acties', - ['phone_receive'] = 'bank klant', - ['phone_label'] = 'bank', } diff --git a/[esx_addons]/esx_bankerjob/locales/si.lua b/[esx_addons]/esx_bankerjob/locales/si.lua index 1cf1de71..a3d5071c 100644 --- a/[esx_addons]/esx_bankerjob/locales/si.lua +++ b/[esx_addons]/esx_bankerjob/locales/si.lua @@ -13,6 +13,4 @@ Locales['si'] = { ['press_input_context_to_open_menu'] = 'pritisnite [E] za odprtje menija banke Bank.', ['withdraw'] = 'umakni', ['boss_actions'] = 'boss Actions', - ['phone_receive'] = 'bančna stranka', - ['phone_label'] = 'bank', } \ No newline at end of file diff --git a/[esx_addons]/esx_bankerjob/locales/sv.lua b/[esx_addons]/esx_bankerjob/locales/sv.lua index da67d2d3..aa76049c 100644 --- a/[esx_addons]/esx_bankerjob/locales/sv.lua +++ b/[esx_addons]/esx_bankerjob/locales/sv.lua @@ -13,6 +13,4 @@ Locales['sv'] = { ['press_input_context_to_open_menu'] = 'Tryck [E] för att öppna Bankmenyn.', ['withdraw'] = 'Ta ut', ['boss_actions'] = 'Chef handlingar', - ['phone_receive'] = 'Bank meddelande mottaget', - ['phone_label'] = 'Bank', } diff --git a/[esx_addons]/esx_bankerjob/locales/tr.lua b/[esx_addons]/esx_bankerjob/locales/tr.lua index 73067996..e7f76b64 100644 --- a/[esx_addons]/esx_bankerjob/locales/tr.lua +++ b/[esx_addons]/esx_bankerjob/locales/tr.lua @@ -13,7 +13,5 @@ Locales['tr'] = { ['press_input_context_to_open_menu'] = 'Banka Menüsünü açmak için [E] tuşuna basın.', ['withdraw'] = 'para çek', ['boss_actions'] = 'patron Hareketleri', - ['phone_receive'] = 'banka Müşterisi', - ['phone_label'] = 'banka', } \ No newline at end of file diff --git a/[esx_addons]/esx_bankerjob/server/main.lua b/[esx_addons]/esx_bankerjob/server/main.lua index 33dd831c..93fa459b 100644 --- a/[esx_addons]/esx_bankerjob/server/main.lua +++ b/[esx_addons]/esx_bankerjob/server/main.lua @@ -1,6 +1,5 @@ -TriggerEvent('esx_phone:registerNumber', 'banker', _('phone_receive'), false, false) CreateThread(function() - exports["esx_society"]:registerSociety('banker', TranslateCap('phone_label'), 'society_banker', 'society_banker', 'society_banker', {type = 'public'}) + exports["esx_society"]:registerSociety('banker', TranslateCap('bank'), 'society_banker', 'society_banker', 'society_banker', {type = 'public'}) end) RegisterServerEvent('esx_bankerjob:customerDeposit') diff --git a/[esx_addons]/esx_mechanicjob/client/main.lua b/[esx_addons]/esx_mechanicjob/client/main.lua index 85fccc2c..a97a9270 100644 --- a/[esx_addons]/esx_mechanicjob/client/main.lua +++ b/[esx_addons]/esx_mechanicjob/client/main.lua @@ -717,17 +717,6 @@ AddEventHandler('esx_mechanicjob:hasExitedEntityZone', function(entity) end end) -RegisterNetEvent('esx_phone:loaded') -AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts) - local specialContact = { - name = TranslateCap('mechanic'), - number = 'mechanic', - base64Icon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABHNCSVQICAgIfAhkiAAAAAlwSFlzAAALEwAACxMBAJqcGAAAA4BJREFUWIXtll9oU3cUx7/nJA02aSSlFouWMnXVB0ejU3wcRteHjv1puoc9rA978cUi2IqgRYWIZkMwrahUGfgkFMEZUdg6C+u21z1o3fbgqigVi7NzUtNcmsac40Npltz7S3rvUHzxQODec87vfD+/e0/O/QFv7Q0beV3QeXqmgV74/7H7fZJvuLwv8q/Xeux1gUrNBpN/nmtavdaqDqBK8VT2RDyV2VHmF1lvLERSBtCVynzYmcp+A9WqT9kcVKX4gHUehF0CEVY+1jYTTIwvt7YSIQnCTvsSUYz6gX5uDt7MP7KOKuQAgxmqQ+neUA+I1B1AiXi5X6ZAvKrabirmVYFwAMRT2RMg7F9SyKspvk73hfrtbkMPyIhA5FVqi0iBiEZMMQdAui/8E4GPv0oAJkpc6Q3+6goAAGpWBxNQmTLFmgL3jSJNgQdGv4pMts2EKm7ICJB/aG0xNdz74VEk13UYCx1/twPR8JjDT8wttyLZtkoAxSb8ZDCz0gdfKxWkFURf2v9qTYH7SK7rQIDn0P3nA0ehixvfwZwE0X9vBE/mW8piohhl1WH18UQBhYnre8N/L8b8xQvlx4ACbB4NnzaeRYDnKm0EALCMLXy84hwuTCXL/ExoB1E7qcK/8NCLIq5HcTT0i6u8TYbXUM1cAyyveVq8Xls7XhYrvY/4n3gC8C+dsmAzL1YUiyfWxvHzsy/w/dNd+KjhW2yvv/RfXr7x9QDcmo1he2RBiCCI1Q8jVj9szPNixVfgz+UiIGyDSrcoRu2J16d3I6e1VYvNSQjXpnucAcEPUOkGYZs/l4uUhowt/3kqu1UIv9n90fAY9jT3YBlbRvFTD4fw++wHjhiTRL/bG75t0jI2ITcHb5om4Xgmhv57xpGOg3d/NIqryOR7z+r+MC6qBJB/ZB2t9Om1D5lFm843G/3E3HI7Yh1xDRAfzLQr5EClBf/HBHK462TG2J0OABXeyWDPZ8VqxmBWYscpyghwtTd4EKpDTjCZdCNmzFM9k+4LHXIFACJN94Z6FiFEpKDQw9HndWsEuhnADVMhAUaYJBp9XrcGQKJ4qFE9k+6r2+MG3k5N8VQ22TVglbX2ZwOzX2VvNKr91zmY6S7N6zqZicVT2WNLyVSehESaBhxnOALfMeYX+K/S2yv7wmMAlvwyuR7FxQUyf0fgc/jztfkJr7XeGgC8BJJgWNV8ImT+AAAAAElFTkSuQmCC' - } - - TriggerEvent('esx_phone:addSpecialContact', specialContact.name, specialContact.number, specialContact.base64Icon) -end) - -- Pop NPC mission vehicle when inside area CreateThread(function() while true do diff --git a/[esx_addons]/esx_mechanicjob/server/main.lua b/[esx_addons]/esx_mechanicjob/server/main.lua index 0727d680..9d8e2103 100644 --- a/[esx_addons]/esx_mechanicjob/server/main.lua +++ b/[esx_addons]/esx_mechanicjob/server/main.lua @@ -4,8 +4,6 @@ if Config.MaxInService ~= -1 then TriggerEvent('esx_service:activateService', 'mechanic', Config.MaxInService) end -TriggerEvent('esx_phone:registerNumber', 'mechanic', TranslateCap('mechanic_customer'), true, true) - CreateThread(function() exports["esx_society"]:registerSociety('mechanic', 'mechanic', 'society_mechanic', 'society_mechanic', 'society_mechanic', {type = 'private'}) end) diff --git a/[esx_addons]/esx_phone/.editorconfig b/[esx_addons]/esx_phone/.editorconfig deleted file mode 100644 index 9b425256..00000000 --- a/[esx_addons]/esx_phone/.editorconfig +++ /dev/null @@ -1,9 +0,0 @@ -root = true - -[*] -indent_size = 4 -indent_style = tab -end_of_line = crlf -charset = utf-8 -trim_trailing_whitespace = true -insert_final_newline = true \ No newline at end of file diff --git a/[esx_addons]/esx_phone/LICENSE b/[esx_addons]/esx_phone/LICENSE deleted file mode 100644 index 8c137bd7..00000000 --- a/[esx_addons]/esx_phone/LICENSE +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - esx_phone - Copyright (C) 2015-2023 Jérémie N'gadi - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - esx_phone Copyright (C) 2015-2023 Jérémie N'gadi - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. \ No newline at end of file diff --git a/[esx_addons]/esx_phone/README.md b/[esx_addons]/esx_phone/README.md deleted file mode 100644 index 9701790c..00000000 --- a/[esx_addons]/esx_phone/README.md +++ /dev/null @@ -1,69 +0,0 @@ -# esx_phone - -### Note -- All scripts that implement the usage of esx phone must be started **after** this script, or else they won't register and no messages will be received. - -## Download & Installation - -### Using [fvm](https://github.com/qlaffont/fvm-installer) -``` -fvm install --save --folder=esx esx-org/esx_phone -``` - -### Using Git -``` -cd resources -git clone https://github.com/ESX-Org/esx_phone [esx]/esx_phone -``` - -### Manually -- Download https://github.com/ESX-Org/esx_phone/archive/master.zip -- Put it in the `[esx]` directory - -- Import `esx_phone.sql` in your database -- Add this in your `server.cfg`: - -``` -start esx_phone -``` - -### Add custom contacts - -Client side - -```lua -RegisterNetEvent('esx_phone:loaded') -AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts) - local specialContact = { - name = 'societyName', - number = 'societyNumber', - base64Icon = 'insert base 64 icon' - } - - TriggerEvent('esx_phone:addSpecialContact', specialContact.name, specialContact.number, specialContact.base64Icon) -end) -``` - -Server side - -```lua -TriggerServerEvent('esx_phone:registerNumber', number, type, sharePos, hasDispatch, hideNumber, hidePosIfAnon) - -example - -TriggerEvent('esx_phone:registerNumber', 'ambulance', TranslateCap('alert_ambulance'), true, true) - -last two booleans are optional -``` - -# Legal -### License -esx_phone - phone script for fivem - -Copyright (C) 2015-2023 Jérémie N'gadi - -This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. - -This program Is distributed In the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty Of MERCHANTABILITY Or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License For more details. - -You should have received a copy Of the GNU General Public License along with this program. If Not, see http://www.gnu.org/licenses/. diff --git a/[esx_addons]/esx_phone/client/main.lua b/[esx_addons]/esx_phone/client/main.lua deleted file mode 100644 index a0b0ce4f..00000000 --- a/[esx_addons]/esx_phone/client/main.lua +++ /dev/null @@ -1,282 +0,0 @@ -local GUI, PhoneData, CurrentActionData, PhoneNumberSources, CurrentDispatchRequestId = {}, {phoneNumber = 0, contacts = {}}, {}, {}, -1 -local CurrentAction, CurrentActionMsg -GUI.PhoneIsShowed = false -GUI.MessagesIsShowed = false -GUI.AddContactIsShowed = false - -function OpenPhone() - local playerPed = PlayerPedId() - TriggerServerEvent('esx_phone:reload', PhoneData.phoneNumber) - - SendNUIMessage({ - showPhone = true, - phoneData = PhoneData - }) - - GUI.PhoneIsShowed = true - - ESX.SetTimeout(250, function() - SetNuiFocus(true, true) - end) - - if not IsPedInAnyVehicle(playerPed, false) then - TaskStartScenarioInPlace(playerPed, 'WORLD_HUMAN_STAND_MOBILE', 0, true) - end -end - -function ClosePhone() - local playerPed = PlayerPedId() - - SendNUIMessage({ - showPhone = false - }) - - SetNuiFocus(false) - GUI.PhoneIsShowed = false - ClearPedTasks(playerPed) -end - -RegisterNetEvent('esx_phone:loaded') -AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts) - PhoneData.phoneNumber = phoneNumber - PhoneData.contacts = {} - - for i=1, #contacts, 1 do - contacts[i].online = (PhoneNumberSources[contacts[i].number] == nil and false or NetworkIsPlayerActive(GetPlayerFromServerId(PhoneNumberSources[contacts[i].number]))) - table.insert(PhoneData.contacts, contacts[i]) - end - - SendNUIMessage({ - reloadPhone = true, - phoneData = PhoneData - }) - ESX.UI.Menu.RegisterType('phone', OpenPhone, ClosePhone) -end) - -RegisterNetEvent('esx_phone:addContact') -AddEventHandler('esx_phone:addContact', function(name, phoneNumber, playerOnline) - table.insert(PhoneData.contacts, { - name = name, - number = phoneNumber, - online = playerOnline - }) - - SendNUIMessage({ - contactAdded = true, - phoneData = PhoneData - }) -end) - -RegisterNetEvent('esx_phone:removeContact') -AddEventHandler('esx_phone:removeContact', function(name, phoneNumber) - for key, value in pairs(PhoneData.contacts) do - if value.name == name and value.number == phoneNumber then - table.remove(PhoneData.contacts, key) - break - end - end - - SendNUIMessage({ - contactRemoved = true, - phoneData = PhoneData - }) -end) - -RegisterNetEvent('esx_phone:addSpecialContact') -AddEventHandler('esx_phone:addSpecialContact', function(name, phoneNumber, base64Icon) - SendNUIMessage({ - addSpecialContact = true, - name = name, - number = phoneNumber, - base64Icon = base64Icon - }) -end) - -RegisterNetEvent('esx_phone:removeSpecialContact') -AddEventHandler('esx_phone:removeSpecialContact', function(phoneNumber) - SendNUIMessage({ - removeSpecialContact = true, - number = phoneNumber - }) -end) - -RegisterNUICallback('add_contact', function(data, cb) - local phoneNumber = tonumber(data.phoneNumber) - local contactName = tostring(data.contactName) - - if phoneNumber then - TriggerServerEvent('esx_phone:addPlayerContact', phoneNumber, contactName) - else - ESX.ShowNotification(TranslateCap('invalid_number')) - end -end) - -RegisterNUICallback('remove_contact', function(data, cb) - local phoneNumber = tonumber(data.phoneNumber) - local contactName = tostring(data.contactName) - - if phoneNumber then - TriggerServerEvent('esx_phone:removePlayerContact', phoneNumber, contactName) - end -end) - -RegisterNetEvent('esx_phone:onMessage') -AddEventHandler('esx_phone:onMessage', function(phoneNumber, message, position, anon, job, dispatchRequestId, dispatchNumber) - if dispatchNumber and phoneNumber == PhoneData.phoneNumber then - TriggerEvent('esx_phone:cancelMessage', dispatchNumber) - - if WasEventCanceled() then - return - end - end - - if job == 'player' then - ESX.ShowNotification(TranslateCap('new_message', message)) - else - ESX.ShowNotification(('%s: %s'):format(job, message)) - end - - PlaySound(-1, 'Menu_Accept', 'Phone_SoundSet_Default', false, 0, true) - - SendNUIMessage({ - newMessage = true, - phoneNumber = phoneNumber, - message = message, - position = position, - anonyme = anon, - job = job - }) - - if dispatchRequestId then - CurrentAction = 'dispatch' - CurrentActionMsg = TranslateCap('press_take_call', job) - CurrentDispatchRequestId = dispatchRequestId - - CurrentActionData = { - phoneNumber = phoneNumber, - message = message, - position = position, - actions = actions, - anonyme = anon, - job = job - } - - ESX.SetTimeout(15000, function() - CurrentAction = nil - end) - end -end) - -RegisterNetEvent('esx_phone:stopDispatch') -AddEventHandler('esx_phone:stopDispatch', function(dispatchRequestId, playerName) - if CurrentDispatchRequestId == dispatchRequestId and CurrentAction == 'dispatch' then - CurrentAction = nil - ESX.ShowNotification(TranslateCap('taken_call', playerName)) - end -end) - -RegisterNetEvent('esx_phone:setPhoneNumberSource') -AddEventHandler('esx_phone:setPhoneNumberSource', function(phoneNumber, source) - if source == -1 then - PhoneNumberSources[phoneNumber] = nil - else - PhoneNumberSources[phoneNumber] = source - end -end) - -RegisterNUICallback('setGPS', function(data) - SetNewWaypoint(data.x, data.y) - ESX.ShowNotification(TranslateCap('gps_position')) -end) - -RegisterNUICallback('send', function(data) - local phoneNumber = data.number - local playerPed = PlayerPedId() - local coords = GetEntityCoords(playerPed) - - if tonumber(phoneNumber) then - phoneNumber = tonumber(phoneNumber) - end - - TriggerServerEvent('esx_phone:send', phoneNumber, data.message, data.anonyme, { - x = coords.x, - y = coords.y, - z = coords.z - }) - - SendNUIMessage({ - showMessageEditor = false - }) - - ESX.ShowNotification(TranslateCap('message_sent')) -end) - -RegisterNUICallback('escape', function() - ESX.UI.Menu.Close('phone', GetCurrentResourceName(), 'main') -end) - -CreateThread(function() - while true do - Wait(0) - - if GUI.PhoneIsShowed then -- codes here: https://pastebin.com/guYd0ht4 - DisableControlAction(0, 1, true) -- LookLeftRight - DisableControlAction(0, 2, true) -- LookUpDown - DisableControlAction(0, 25, true) -- Input Aim - DisableControlAction(0, 106, true) -- Vehicle Mouse Control Override - - DisableControlAction(0, 24, true) -- Input Attack - DisableControlAction(0, 140, true) -- Melee Attack Alternate - DisableControlAction(0, 141, true) -- Melee Attack Alternate - DisableControlAction(0, 142, true) -- Melee Attack Alternate - DisableControlAction(0, 257, true) -- Input Attack 2 - DisableControlAction(0, 263, true) -- Input Melee Attack - DisableControlAction(0, 264, true) -- Input Melee Attack 2 - - DisableControlAction(0, 12, true) -- Weapon Wheel Up Down - DisableControlAction(0, 14, true) -- Weapon Wheel Next - DisableControlAction(0, 15, true) -- Weapon Wheel Prev - DisableControlAction(0, 16, true) -- Select Next Weapon - DisableControlAction(0, 17, true) -- Select Prev Weapon - else - -- open phone - -- todo: is player busy (handcuffed, etc) - if IsControlJustReleased(0, 288) and IsUsingKeyboard(0) then - if not ESX.UI.Menu.IsOpen('phone', GetCurrentResourceName(), 'main') then - ESX.UI.Menu.CloseAll() - ESX.UI.Menu.Open('phone', GetCurrentResourceName(), 'main') - end - end - end - end -end) - -AddEventHandler('onResourceStop', function(resource) - if resource == GetCurrentResourceName() then - if GUI.PhoneIsShowed then - ESX.UI.Menu.CloseAll() - end - end -end) - --- Key controls -CreateThread(function() - while true do - Wait(0) - - if CurrentAction then - ESX.ShowHelpNotification(CurrentActionMsg) - - if IsControlJustReleased(0, 38) and IsUsingKeyboard(0) then - if CurrentAction == 'dispatch' then - TriggerServerEvent('esx_phone:stopDispatch', CurrentDispatchRequestId) - SetNewWaypoint(CurrentActionData.position.x, CurrentActionData.position.y) - end - - CurrentAction = nil - end - else - Wait(500) - end - end -end) \ No newline at end of file diff --git a/[esx_addons]/esx_phone/config.lua b/[esx_addons]/esx_phone/config.lua deleted file mode 100644 index f6c6c4d9..00000000 --- a/[esx_addons]/esx_phone/config.lua +++ /dev/null @@ -1,2 +0,0 @@ -Config = {} -Config.Locale = GetConvar('esx:locale', 'en') diff --git a/[esx_addons]/esx_phone/esx_phone.sql b/[esx_addons]/esx_phone/esx_phone.sql deleted file mode 100644 index 1b56aea9..00000000 --- a/[esx_addons]/esx_phone/esx_phone.sql +++ /dev/null @@ -1,16 +0,0 @@ - - -CREATE TABLE `user_contacts` ( - `id` INT(11) NOT NULL AUTO_INCREMENT, - `identifier` VARCHAR(60) NOT NULL, - `name` VARCHAR(100) NOT NULL, - `number` INT(11) NOT NULL, - - PRIMARY KEY (`id`), - INDEX `index_user_contacts_identifier_name_number` (`identifier`, `name`, `number`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci; - - -ALTER TABLE `users` - ADD COLUMN `phone_number` INT(11) NULL, - ADD UNIQUE INDEX `index_users_phone_number` (`phone_number`); \ No newline at end of file diff --git a/[esx_addons]/esx_phone/fxmanifest.lua b/[esx_addons]/esx_phone/fxmanifest.lua deleted file mode 100644 index 252e0ce9..00000000 --- a/[esx_addons]/esx_phone/fxmanifest.lua +++ /dev/null @@ -1,50 +0,0 @@ -fx_version 'adamant' - -game 'gta5' - -description 'ESX Phone' -lua54 'yes' -version '1.9.0' - -shared_script '@es_extended/imports.lua' - -server_scripts { - '@oxmysql/lib/MySQL.lua', - 'config.lua', - '@es_extended/locale.lua', - 'locales/*.lua', - 'server/main.lua' -} - -client_scripts { - '@es_extended/locale.lua', - 'config.lua', - 'locales/*.lua', - 'client/main.lua' -} - -ui_page 'html/ui.html' - -files { - 'html/ui.html', - - 'html/css/app.css', - - 'html/scripts/mustache.min.js', - 'html/scripts/app.js', - - 'html/img/phone.png', - - 'html/img/icons/signal.png', - 'html/img/icons/rep.png', - 'html/img/icons/msg.png', - 'html/img/icons/add.png', - 'html/img/icons/back.png', - 'html/img/icons/new-msg.png', - 'html/img/icons/reply.png', - 'html/img/icons/write.png', - 'html/img/icons/edit.png', - 'html/img/icons/location.png' -} - -dependency 'es_extended' diff --git a/[esx_addons]/esx_phone/html/css/app.css b/[esx_addons]/esx_phone/html/css/app.css deleted file mode 100644 index 9540a640..00000000 --- a/[esx_addons]/esx_phone/html/css/app.css +++ /dev/null @@ -1,392 +0,0 @@ -html, body { - width: 100%; - height: 100%; - overflow: hidden; -} - -#cursor { - position: absolute; - z-index: 999999; - display: none; -} - -#console { - position: absolute; - left: 0; - bottom: 0; - width: 320px; - height: 250px; - background-color: rgba(0, 0, 0, 0.8); - color: white; - padding: 5px; - overflow-y: auto; - overflow-x: hidden; -} - -#phone { - background-image: url("../img/phone.png"); - background-repeat: no-repeat; - font-family: 'Catamaran', sans-serif; - font-weight: 400; - font-size: 12px; - width: 298px; - height: 480px; - color: #212121; - position: absolute; - right: 50px; - bottom: 0; - overflow: hidden; - cursor: default; - display: none; -} - -#phone>.container { - position: absolute; - top: 59px; - left: 46px; - width: 207px; - height: 365px; - background-repeat: no-repeat; - overflow: hidden; -} - -#phone .head { - position: relative; - text-transform: uppercase; - text-align: center; - height: 20px; - line-height: 20px; - background-color: black; - z-index: 5; -} - -#phone-icon { - display: block; - position: absolute; - height: 12px; - line-height: 20px; - top: 4px; - right: 5px; -} - -#phone-number { - display: block; - position: absolute; - height: 20px; - line-height: 20px; - top: 0; - left: 5px; - color: white; -} - -#phone .menu { - max-height: 320px; - overflow-y: scroll; - z-index: 1; -} - -#phone .menu .home { - list-style: none outside none; - margin: 0; - padding: 13px; - color: white; -} - -#phone .menu .phone-icon { - position: relative; - display: block; - float: left; - text-align: center; - width: 60px; - padding-top: 50px; - padding-bottom: 5px; - background-size: 32px 32px; - background-color: transparent; - background-repeat: no-repeat; - background-position: center 10px; - cursor: pointer; -} - -#phone .menu .phone-icon::after { - position: absolute; - top: 0; - left: 0; - right: 0; - bottom: 0; - background-color: rgba(255, 255, 255, 0.01); -} - -#phone-icon-rep { - background-image: url("../img/icons/rep.png"); -} - -#phone-icon-msg { - background-image: url("../img/icons/msg.png"); -} - -#phone .menu::-webkit-scrollbar { - display: none; -} - -#phone .menu .phone-icon.selected, #phone .menu .phone-icon:hover { - background-color: rgba(255, 255, 255, 0.1); -} - -.screen { - position: absolute; - top: 0; - left: 207px; - width: 207px; - height: 365px; - background-color: #dde1e8; - z-index: 1; - transition: left 0.25s ease; - overflow: hidden; -} - -.screen.active { - left: 0; -} - -.screen>.container { - position: absolute; - top: 50px; - left: 0; - width: 224px; - height: 315px; - overflow-y: scroll; -} - -.head-screen { - position: absolute; - height: 30px; - line-height: 30px; - text-transform: uppercase; - background-color: white; - text-align: center; - color: #212121; - background-color: white; - font-weight: 600; - border-bottom: 1px solid rgba(0, 0, 0, 0.3); - font-size: 13px; - top: 20px; - left: 0; - right: 0; - z-index: 5; -} - -.btn-head { - display: block; - color: #212121; - width: 30px; - height: 30px; - font-size: 20px; - cursor: pointer; -} - -.btn-head:hover { - background-color: #f1f1f1; -} - -.btn-head-back { - float: left; - background: transparent url("../img/icons/back.png") no-repeat 50%; -} - -.btn-head-new { - float: right; - background: transparent url("../img/icons/add.png") no-repeat 50%; -} - -.message, .contact { - position: relative; - padding: 3px 35px 3px 25px; - background-color: white; - border-bottom: 1px solid rgba(0, 0, 0, 0.3); - color: #212121; - min-height: 30px; -} - -.message.no-item, .contact.no-item { - padding: 3px 5px; -} - -.contact { - opacity: 0.5; -} - -.contact.online, .contact.no-item { - opacity: 1; -} - -.contact::after { - position: absolute; - display: block; - content: ''; - width: 8px; - height: 8px; - background-color: #dcdcdc; - left: 10px; - top: 8px; - border-radius: 50%; -} - -.contact.online::after { - background-color: #6ecc49; -} - -.contact.no-item::after { - display: none; -} - -.no-item { - text-align: center; -} - -.message .sender-info, .message .body, .contact .sender-info { - margin-right: 30px; -} - -.message .phone-number { - line-height: 10px; - color: #999; -} - -.message .body { - margin-top: 5px; - line-height: 16px; -} - -.sender { - font-weight: 600; -} - -.actions { - position: absolute; - top: 0; - right: 0; - bottom: 0; - width: 24px; -} - -.actions .new-msg { - display: block; - width: 24px; - height: 24px; - background: transparent url("../img/icons/write.png") no-repeat 50%; - cursor: pointer; -} - -.actions .reply-btn { - background: transparent url("../img/icons/reply.png") no-repeat 50%; -} - -.actions .gps { - display: none; - width: 24px; - height: 24px; - background: transparent url("../img/icons/location.png") no-repeat 50%; - cursor: pointer; -} - -.actions .ok-btn { - display: none; - width: 24px; - height: 24px; - background: transparent url("../img/icons/ok.png") no-repeat 50%; - cursor: pointer; -} - -.actions .new-msg.anonyme, .contact .actions .new-msg { - display: none; -} - -.contact.online .actions .new-msg, .actions .gps.active, .actions .ok-btn.showOK { - display: block; -} - -.actions .new-msg:hover, .actions .gps:hover, .actions .ok-btn:hover, .actions .del-contact:hover { - background-color: #f1f1f1; -} - -#writer textarea { - width: 207px; - min-width: 207px; - max-width: 207px; - height: 255px; - min-height: 255px; - max-height: 255px; - background-color: #f1f1f1; - border: none; - box-shadow: 0 2px 3px 1px rgba(0, 0, 0, 0.1) inset; - padding: 5px; - outline: none; -} - -#writer label { - display: block; - width: 100%; - height: 30px; - line-height: 34px; - background-color: #f1f1f1; - border: none; - box-shadow: 0 2px 3px 1px rgba(0, 0, 0, 0.1) inset; - font-size: 14px; - font-weight: 600; - color: #6b6b6b; -} - -#writer label input { - top: 2px; - position: relative; - left: 5px; - margin-right: 10px; -} - -#writer button, #contact button { - display: block; - float: left; - width: 103px; - height: 30px; - line-height: 30px; - background-color: #dcdcdc; - border-color: rgba(0, 0, 0, 0.5); - border: none; - color: white; - font-weight: 600; - cursor: pointer; - outline: none; -} - -#writer button.marged, #contact button.marged { - margin-left: 1px; -} - -#writer #writer_cancel, #contact #contact_cancel { - background-color: #d9534f; -} - -#writer #writer_send:hover, #contact #contact_send:hover { - background-color: #74c374; -} - -#writer #writer_cancel:hover, #contact #contact_cancel:hover { - background-color: #dc6b68; -} - -#writer #writer_send, #contact #contact_send { - background-color: #5cb85c; -} - -#contact input { - display: block; - width: 100%; - height: 30px; - line-height: 30px; - padding: 2px 5px; - background-color: #f1f1f1; - border: none; - border-bottom: 1px solid rgba(0, 0, 0, 0.3); - outline: none; - box-shadow: 0 2px 3px 1px rgba(0, 0, 0, 0.1) inset; -} \ No newline at end of file diff --git a/[esx_addons]/esx_phone/html/img/icons/add.png b/[esx_addons]/esx_phone/html/img/icons/add.png deleted file mode 100644 index ad5a13101a1e5748e06d1f79eb5278e9d95c765f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 995 zcmaJ=O;6N77%ssOWx=R12JqmdgougTkKJuy8wx_Zg(eosvI%=KcH4oi&`zBWZkLP7 z%_Dd*@nE8!{R0{$5fe>3>5YSlzkmZbL$Xen-Nl1z({?`cJkR^i`#$q@X>oqAf25yb zm_c(vFVgWs@}2FY|7%ALn-0UIP$tW0mDFqunOPTAATWJ<4Hlv8)*pO@Qw-C~dZjWc zTelSl`JA0#xY!RVn_;GA;?Q>1ApsS*<^?Ky`0gVMJXd8`BulVD4OYE{Eew~p7E8|7 zx|4U=nQ1T;D^$RT#0Igy5kyL?vQ1ru&XaAP1x*N9SJ{)K%GMIl5QaeFvS~*UMIg(Z zn3H5#ya_UbnBfKb%4spDNV1Zd0Ii3m(XhL!6m_E&i>_3*N=T^ie63dFYFQ59HD1i; z^NB_#lctDtR1b(9r-Nv;t)Rom!Cpu_6o5q0uAoh#vNY3^BluxQHi%kfq6On)JLE-9 zNRHG7TGs!ezTZJdqzF&*{ikqLs)vv-!U%0*hc<3?Gzk?d8iqDOxP;I~yNXLyL{L;k zA<&j(FuvjiE~-U0nt01n%pf9m;6PJXS*pN!o~vk@AZv!9N!eUp6bloRhDBE4ux$Y@f@5)WA;Dy|l&B(W@kCL<|}unwS_58VSLRQ4Ef^MIQ&gz6U@7V##2^d%bTiC+xp$udx)x@70!cn;MPa|* zF=oT=vCgzQHmHgk)7k<;1&Ih45G$Zy44IBp2s6vN5}CW(90QgicreVYB$Y{afhe*e z2(V3Fl@|mM46=eh5DW_YfsYq_98cb$SMW=LpyX=?s}Dn>*;-CY$??@#WEE!mF}5U* z%jffKzKKP4A18>S=xX?UUV`vCqb61gUenoCQjnpe+PZ~xWCB-F$)XV)W=N(hM=-24 zS<_i96Db&1P%KVhdG|;qU^4lCs9~(39h`!H^8Kfs~=(H^dk#IyMthFk8Wxx?=&vslSwIII#@APn2^H^QDAjllVnntW-%TQ zH2FnAh&8uI+9NSp6!`Wi&j(`%N?aMKBL*~aiK~^k5uPv0b**4nB(e-`{TS5ZHZs8S zktMx+E^=ADRjyVp7cm|y%jHNioZHyH8eQ5V?s2DUwk3--<3p3U-6po4I=-!nT#3gC zIg&2C&Hh+gYNhM17mL$X#oW5#>gw9}wCD29trxC-q=&bpf7WTEyBYrrdOibwt)Kqf z_N;C*q%JNVXn4M7?zQmYW$4mm?$$=2pWjogc|_e<6sHGf7Crkw=ZU*b75Yr>K_hra z!#sVoc4nJ za0`PlBg3pY54nJ za0`PlBg3pY5bl#(9bc}m zbiMn>T0vd4hW-fgq_vZxcAY7=aQdyB^=FMQ&+N42_V0sp{;(|g_dmDcVg93Idd81F@9#?F pyx#dktLXoxeZO+=9J9-wANnh{{*XonJ1`g+JYD@<);T3K0RY4!kemPj diff --git a/[esx_addons]/esx_phone/html/img/icons/msg.png b/[esx_addons]/esx_phone/html/img/icons/msg.png deleted file mode 100644 index aec485a33fdf4c58bbd15c7a6a56c7ca5d9ca9f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1205 zcmV;m1WNmfP)`cT+qKTTAST_m8v(5aP)yt+F|l?Ck->~Fdv3IAbKHwxsbtVPFy5+Yk5~?)1iZ;LDbPNvPVdP6 z=WeV@z{_XjWIb@cWbn}Y19Q!vSA*} zz)_9-I2IPm;o@Xw^46-z0p=!Ro^6fgNbA5ztpm;P)*V*FcDk>)o@bTFdDlIj(2zP7t+awy#Q&W44>)CgfMZ@xTKt6nk>r_4sHViqaLyLE`5;HmEPpf9GOHF@aCvLDzlyj^18gz!77qP3#omh( z{4t&8)`J{f7boeyG|6-(&-bwe2QE$W+0gyvoe1OZ!!~MHaV*sGBF}%YgIxR`e}8uz zCs<4Uo_7c|HUr=U*8^azC21@cNaQSGpC$Y7J!gePw(#Y}-*T|l4!MX70`D#mrVi>0 z5O}7AhP_8|LgA9h!a@2}=kE9;ME^W6BiU}K?or2F~L0p=5TQ2obKCbI{T?JGGl7KUds z49{fvb2`nbolg>-%@CcjFg&k25Z9m;^!I~?D-pv~Vj^I}zo;4M1jbXy) zlaAqio5sru0BGxv?L_3)YD9Q}F-$nFdE@&2$WZC{k}!`RXugVQN8!)J8j)Lud_L(| zOkP$1K(xDQG(P9N0``>G+fkMnvKD$%VY|C@+e=Zg5h%n(uE$u8sOmaT#Kt5=<+SGY zF=|ZGaMB1@Lj1Y!GRYMrJ)(#;$DCxlY=%I#$7r*}jvs090 T#=h3V00000NkvXXu0mjf&_6@S diff --git a/[esx_addons]/esx_phone/html/img/icons/new-msg.png b/[esx_addons]/esx_phone/html/img/icons/new-msg.png deleted file mode 100644 index a597048117ec2c2d4b0534f8502f8ed70e2db8b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1196 zcmeAS@N?(olHy`uVBq!ia0vp^A|TAc1|)ksWqE;=WQl7;NpOBzNqJ&XDuZK6ep0G} zXKrG8YEWuoN@d~6R2v2cW~I!Kh>{3jAFJg2T)jk)8oi3#0-$aN1{?c|g2d$P)DnfH z)bz|eTc!8A_bVx6rr0WloBA5~7C5J7WO`H;r3P2|g(O#HCtIc{+1n}DR9FEG$W1Lt zRH(?!$t$+1uvG$^YXxM3g!Ppaz)DK8ZIvL7itr6kaLzAERWQ{v)=f4rG*mD%(=#+N zH8V5RQ7|$vG}1Q!A~Rh>6Dw0QDv55FG|-pw6wGYnPFt43sj+7T$xvrSfQI&tPC^3CAB!YD6^m>Ge1uOWMX1cerbuV z640d(FXR@$jm;~D1`{yA^eYkz^bPe4Kwg3=^!3HBG&dKny0|1L72#g21{a4^7NqJ2 zr55Lx79|5CE=?I^Re_arQEFmIeo;t%ehw@Y12XbU@{2R_3lyA#%@j1kGxJjN%ZoL^ z>V18!JoAc667!N%JzZ>-fF|f=W~NxVnmD^z8W>ud8k<-e8oHW0IvKcG7#q4;S{j)f znwlEG^t$9Hm*%GCmB93-AoM!o)C)=qxdlL*T~doO%TiO^it=+6z+Se>#O)SyoaRCG zrr>sq1x~&CK*#8VA{Hs4VM4&v17gCHEsz6G_^Elo)LsNk)*q@2ZZj}2DtNj$hE&{2 z`t$$4J+mpJF!NN##fugx_2}{(dFF7&ZIR^uh95`vR)4>zC@sNxq_|;5w@-U5>m!u~ z3s*a^c`;j-H_n*rbia;0NmWcCu|4I6pTa%oMUL+r-Y^}RDi{e4mPbW%r_UX zH8H4j&q@&&naq2EcMs2z=N=}9MLM9og!fCaqz7f6vxcsG#z!GcZGTy$zQ~0yX;2As z=H0_~Brrh!0gJ<74zUfZ7kVD=pO6^A9g!8z$iT?PAkgM$x?+<3H&FTE>FVdQ&MBb@ E0A6~DB>(^b diff --git a/[esx_addons]/esx_phone/html/img/icons/ok.png b/[esx_addons]/esx_phone/html/img/icons/ok.png deleted file mode 100644 index c08a8a7ab4c85b2b6ebaca17d1b13dbfd507e158..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 241 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ za0`PlBg3pY5Zd2de zoA^$xzjyk~`^rf4_ur}ED}SSzl-Xtr#=*n z;ZeSGQ1MW=fU}q=8>8L6!+Z9n3X2}Ma8HjEUp```%OTL%$yL?~%=bYd99UdZu3W}v!8SgC8CKyyn zv06pEGDRR0$^pQ~uoN{!^*fCAj=}rpx}MIii*SI7q%AL8f?N}mk^6rBq14qG<)n}= zj-;vI>vQ+scwBX_`qojW#o04g1Jc6XYmQ`<h#i&->r^Lh|Qdf@KiXAw$5uO&Tpd3)RV9V)Ts+~>kgM+5i4ctmmxj@55?I3 z{QPXG-DGbMX+W+~r*HgXccWM-eW~KlOwjh4Pfr(7X8Ytx5YNSBZyqYI7AxgyfW)hy zSfPkrdvMEd03;KllMh$H2OEwi7G#$F=P5XOAi&KKkAz~SBAyfph1QNIS0@d~H8B}) z?B99@Jdy}jq!i1sSHB5wB;~;2p<$<~d6|e^nyBx;eZPvO7zYUe`8zkBP^Bd5f+fp^ zGF0Z5;cR;y>iXKTWqAo)UKX}_nBWm4K??aYbIYR(1fro_vO2Gv1BqZPf8Btp&U#o~ z6ubcr-?h}jkdlMUxa6Sukus?`ZyNwPk({l2o8*hc97kd*0Y0LH5|~CElh?d{4&UCn zf{ht^kUZhEnn=kPNu)_dIUD$Knad0uLJc||03N2sWda#^AQ0fD$7X}L>X(Q2uuE40 z0Vx6p5)~^};d1u_Se>qUJp&v_M8(IY5TsZl=QskPXrU-veB6n>dIJQ60B72ous$st z3!A)HJ;+IW_1M3~Iu~z{z@1q0K>qX#j15R&34I;-|ZJVRJDEj03Hf zK~!j0z{&bxbA>iB*w%50BqS19Lcz+-vl*qsGy{tDV!Kw0n5!CkdW8ca`2#DzuF;1oc?emAM_j`QI zKvUx-0&q}IZ#7oUt-rty$@i3Izaw5yp+P?OmX~zM%PmfZuohz=z8yyS{qTXmltHlm)fD4)5UGwX4^POAgffsi|sp04k&B}!2 ztht;*q!=^xbzJ|XvJij=|67^>)B4qs_gKnle^oo7XLM}1@#Nu66XL*gJ0SqD4CSyr zXuG;FuVgbRlFH_@c1@*cY;?Hk_`!9w#nSb>=CtoHJLVX&-D#*+W#+CCDP!VahWMzd zucP7E{?e)9K@Citgt6}TpGl!q7@eG@2N8T(4af07!1tu4>UirnpX~_Hv^|(s*q>8H z?Bb=#WjhaPib}Wfg%WAFd;su!-HfH7_MEZi+%d{N&^uFZSOd=xBiHD2H>j888stmT zwbHo7DSWX^2>^Z%J;vC~eNIz%$3I;yb%RaUE&*^w()C{`jrL0MY6c(x00004nJ za0`PlBg3pY5epC11AL)VX*O4C#Cln$z8afDoO;h*gD zS3&9EFIR^%4+8hw+!ZnHDRg`8>mX@-$ByTxV7X0IT7E*NpCi!444$rjF6*2UngIWO BTLS<9 diff --git a/[esx_addons]/esx_phone/html/img/icons/signal.png b/[esx_addons]/esx_phone/html/img/icons/signal.png deleted file mode 100644 index 143301f5e81cd55eed147f7cb7f12e6f2889f639..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1102 zcmaJ=O=#0l9M7zqQ!Jb4gn7_McA03Kq#r4btLsNPt=MgL#Z?$+n!K%HOBPw#9zvtIESZpsDJTy?N|VN521?50#B10?Q7&4| z=5Q{3SdfwCl^l%M)(pa?sGeTikmPZQK^~5&dW8P=@Cgl6B|;Ae(`?#Ez=C>k%7jBx z{aJZxTn;OA?|#r@3q(MJSOT_I)Gfh|&`Y`k**n(^4VEByJVGx!l}itT1TrBAdi@@m z*id2TQ8v7C=#$>2R)KnU`JF9cRTnpiWHQ6VGtt=J-`2wlL~5E!OhE_=&< zFEYm%E*uU!8a|(gAUxKjjwRcpTU~Vp5n8gT8dya-a1^CHD&YuCJY5b!Ggf7FYb8x2 zVT>&q4CiH?km|s6`u|W(TSZ$q1K0fhr?8csG$50K7Al!CDcoq6W6BT`CX_HTvj`RI zSsW}NjI07OKw^jo-NUM`pt7}l37<|2Dc!=7F2j@ABb~4j!TB( zVUZ<6bnn5g!&{R)CrO!kfSPEHC8~YMysJFsZ z8v7D#$YqE#j8oXZ3SGY<-Q#Rm+m;+w8z1VV+fCBeR{z2c@+6+8#8}q;kYD`$yVtel z-PYIAKN$7jzoX8 zz0S73X@!3J{;`?M&2vAl7585UpU-}OR-BpBqPJUWvsW)3iau((72A>;*;y@D0wdJC qCwi*08m`!TvYTH%ZmnHrCn}VSl2LqCKmJ~FUU(|mFW!ltIP(X2lVgYg diff --git a/[esx_addons]/esx_phone/html/img/icons/write.png b/[esx_addons]/esx_phone/html/img/icons/write.png deleted file mode 100644 index 28f32bebda0859685419555189e228df512f2c5a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 250 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 XPCnY@+C~`#4(+hAu!q%{UrYEmIL@=p diff --git a/[esx_addons]/esx_phone/html/scripts/app.js b/[esx_addons]/esx_phone/html/scripts/app.js deleted file mode 100644 index 151df962..00000000 --- a/[esx_addons]/esx_phone/html/scripts/app.js +++ /dev/null @@ -1,512 +0,0 @@ -(function(){ - - let ContactTpl = - '
' + - '
' + - '
' + - '{{sender}}
#{{phoneNumber}}' + - '
' + - '
' + - '
' + - 'X' + - '' + - '
' + - '
' - ; - - let MessageTpl = - '
' + - '
' + - '
' + - '{{sender}}
#{{phoneNumber}}' + - '
' + - '
' + - '
{{message}}
' + - '
' + - '
' - ; - - let SpecialContactTpl = '
  • {{name}}
    • '; - - let contacts = []; - let specialContacts = []; - let menu = []; - let currentItem = 0; - let currentVal = null; - let isMessageEditorOpen = false; - let isMessagesOpen = false; - let isPhoneShowed = false; - - let showMain = function() { - $('.screen').removeClass('active'); - $('.screen *').attr('disabled', 'disabled'); - } - - let showRepertoire = function() { - $('#repertoire').addClass('active'); - } - - let hideRepertoire = function() { - $('#repertoire').removeClass('active'); - } - - let showMessages = function(){ - $('#messages').addClass('active'); - isMessagesOpen = true; - } - - let hideMessages = function(){ - $('#messages').removeClass('active'); - isMessagesOpen = false; - } - - let showAddContact = function() { - $('#contact').addClass('active'); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideAddContact = function() { - $('#contact').removeClass('active'); - $('#contact_name').val(''); - $('#contact_number').val(''); - } - - let showNewMessage = function(cnum, cname) { - $('#writer').addClass('active'); - $('#writer_number').val(cnum); - $('#writer .header-title').html(cname); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideNewMessage = function() { - $('#writer').removeClass('active'); - $('#writer_number').val(''); - $('#writer_message').val(''); - $('#writer .header-title').html(''); - } - - let showGPS = function(xPos, yPos) { - $.post('http://esx_phone/setGPS', JSON.stringify({ - x: parseFloat(xPos), - y: parseFloat(yPos) - } - )); - } - - let renderContacts = function(){ - - let contactHTML = ''; - - if(contacts.length > 0) { - - for(let i=0; i 0) { - - for(let i=0; i { - return a.name.localeCompare(b.name); - }); - - renderSpecialContacts(); - - } - - } - - let removeSpecialContact = function(number){ - - for(let i=0; iRepertoire' + - '
  • Messages
    • ' - ); - - for(let i=0; i' + - '
    ' + - '
    ' + - '{{sender}}
    #{{phoneNumber}}' + - '
    ' + - '
    ' + - '
    ' + - 'X' + - '' + - '
    ' + - '' - ; - - let MessageTpl = - '
    ' + - '
    ' + - '
    ' + - '{{sender}}
    #{{phoneNumber}}' + - '
    ' + - '
    ' + - '
    {{message}}
    ' + - '
    ' + - '
    ' - ; - - let SpecialContactTpl = '
  • {{name}}
    • '; - - let contacts = []; - let specialContacts = []; - let menu = []; - let currentItem = 0; - let currentVal = null; - let isMessageEditorOpen = false; - let isMessagesOpen = false; - let isPhoneShowed = false; - - let showMain = function() { - $('.screen').removeClass('active'); - $('.screen *').attr('disabled', 'disabled'); - } - - let showRepertoire = function() { - $('#repertoire').addClass('active'); - } - - let hideRepertoire = function() { - $('#repertoire').removeClass('active'); - } - - let showMessages = function(){ - $('#messages').addClass('active'); - isMessagesOpen = true; - } - - let hideMessages = function(){ - $('#messages').removeClass('active'); - isMessagesOpen = false; - } - - let showAddContact = function() { - $('#contact').addClass('active'); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideAddContact = function() { - $('#contact').removeClass('active'); - $('#contact_name').val(''); - $('#contact_number').val(''); - } - - let showNewMessage = function(cnum, cname) { - $('#writer').addClass('active'); - $('#writer_number').val(cnum); - $('#writer .header-title').html(cname); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideNewMessage = function() { - $('#writer').removeClass('active'); - $('#writer_number').val(''); - $('#writer_message').val(''); - $('#writer .header-title').html(''); - } - - let showGPS = function(xPos, yPos) { - $.post('http://esx_phone/setGPS', JSON.stringify({ - x: parseFloat(xPos), - y: parseFloat(yPos) - } - )); - } - - let renderContacts = function(){ - - let contactHTML = ''; - - if(contacts.length > 0) { - - for(let i=0; i 0) { - - for(let i=0; i { - return a.name.localeCompare(b.name); - }); - - renderSpecialContacts(); - - } - - } - - let removeSpecialContact = function(number){ - - for(let i=0; iKontakte' + - '
  • Nachrichten
    • ' - ); - - for(let i=0; i' + - '
    ' + - '
    ' + - '{{sender}}
    #{{phoneNumber}}' + - '
    ' + - '
    ' + - '
    ' + - 'X' + - '' + - '
    ' + - '' - ; - - let MessageTpl = - '
    ' + - '
    ' + - '
    ' + - '{{sender}}
    #{{phoneNumber}}' + - '
    ' + - '
    ' + - '
    {{message}}
    ' + - '
    ' + - '
    ' - ; - - let SpecialContactTpl = '
  • {{name}}
    • '; - - let contacts = []; - let specialContacts = []; - let menu = []; - let currentItem = 0; - let currentVal = null; - let isMessageEditorOpen = false; - let isMessagesOpen = false; - let isPhoneShowed = false; - - let showMain = function() { - $('.screen').removeClass('active'); - $('.screen *').attr('disabled', 'disabled'); - } - - let showRepertoire = function() { - $('#repertoire').addClass('active'); - } - - let hideRepertoire = function() { - $('#repertoire').removeClass('active'); - } - - let showMessages = function(){ - $('#messages').addClass('active'); - isMessagesOpen = true; - } - - let hideMessages = function(){ - $('#messages').removeClass('active'); - isMessagesOpen = false; - } - - let showAddContact = function() { - $('#contact').addClass('active'); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideAddContact = function() { - $('#contact').removeClass('active'); - $('#contact_name').val(''); - $('#contact_number').val(''); - } - - let showNewMessage = function(cnum, cname) { - $('#writer').addClass('active'); - $('#writer_number').val(cnum); - $('#writer .header-title').html(cname); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideNewMessage = function() { - $('#writer').removeClass('active'); - $('#writer_number').val(''); - $('#writer_message').val(''); - $('#writer .header-title').html(''); - } - - let showGPS = function(xPos, yPos) { - $.post('http://esx_phone/setGPS', JSON.stringify({ - x: parseFloat(xPos), - y: parseFloat(yPos) - } - )); - } - - let renderContacts = function(){ - - let contactHTML = ''; - - if(contacts.length > 0) { - - for(let i=0; i 0) { - - for(let i=0; i { - return a.name.localeCompare(b.name); - }); - - renderSpecialContacts(); - - } - - } - - let removeSpecialContact = function(number){ - - for(let i=0; iContacts' + - '
  • Messages
    • ' - ); - - for(let i=0; i' + - '
    ' + - '
    ' + - '{{sender}}
    #{{phoneNumber}}' + - '
    ' + - '
    ' + - '
    ' + - 'X' + - '' + - '
    ' + - '' - ; - - let MessageTpl = - '
    ' + - '
    ' + - '
    ' + - '{{sender}}
    #{{phoneNumber}}' + - '
    ' + - '
    ' + - '
    {{message}}
    ' + - '
    ' + - '
    ' - ; - - let SpecialContactTpl = '
  • {{name}}
    • '; - - let contacts = []; - let specialContacts = []; - let menu = []; - let currentItem = 0; - let currentVal = null; - let isMessageEditorOpen = false; - let isMessagesOpen = false; - let isPhoneShowed = false; - - let showMain = function() { - $('.screen').removeClass('active'); - $('.screen *').attr('disabled', 'disabled'); - } - - let showRepertoire = function() { - $('#repertoire').addClass('active'); - } - - let hideRepertoire = function() { - $('#repertoire').removeClass('active'); - } - - let showMessages = function(){ - $('#messages').addClass('active'); - isMessagesOpen = true; - } - - let hideMessages = function(){ - $('#messages').removeClass('active'); - isMessagesOpen = false; - } - - let showAddContact = function() { - $('#contact').addClass('active'); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideAddContact = function() { - $('#contact').removeClass('active'); - $('#contact_name').val(''); - $('#contact_number').val(''); - } - - let showNewMessage = function(cnum, cname) { - $('#writer').addClass('active'); - $('#writer_number').val(cnum); - $('#writer .header-title').html(cname); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideNewMessage = function() { - $('#writer').removeClass('active'); - $('#writer_number').val(''); - $('#writer_message').val(''); - $('#writer .header-title').html(''); - } - - let showGPS = function(xPos, yPos) { - $.post('http://esx_phone/setGPS', JSON.stringify({ - x: parseFloat(xPos), - y: parseFloat(yPos) - } - )); - } - - let renderContacts = function(){ - - let contactHTML = ''; - - if(contacts.length > 0) { - - for(let i=0; i 0) { - - for(let i=0; i { - return a.name.localeCompare(b.name); - }); - - renderSpecialContacts(); - - } - - } - - let removeSpecialContact = function(number){ - - for(let i=0; iContactos' + - '
  • Mensajes
    • ' - ); - - for(let i=0; i' + - '
    ' + - '
    ' + - '{{sender}}
    #{{phoneNumber}}' + - '
    ' + - '
    ' + - '
    ' + - 'X' + - '' + - '
    ' + - '' - ; - - let MessageTpl = - '
    ' + - '
    ' + - '
    ' + - '{{sender}}
    #{{phoneNumber}}' + - '
    ' + - '
    ' + - '
    {{message}}
    ' + - '
    ' + - '
    ' - ; - - let SpecialContactTpl = '
  • {{name}}
    • '; - - let contacts = []; - let specialContacts = []; - let menu = []; - let currentItem = 0; - let currentVal = null; - let isMessageEditorOpen = false; - let isMessagesOpen = false; - let isPhoneShowed = false; - - let showMain = function() { - $('.screen').removeClass('active'); - $('.screen *').attr('disabled', 'disabled'); - } - - let showRepertoire = function() { - $('#repertoire').addClass('active'); - } - - let hideRepertoire = function() { - $('#repertoire').removeClass('active'); - } - - let showMessages = function(){ - $('#messages').addClass('active'); - isMessagesOpen = true; - } - - let hideMessages = function(){ - $('#messages').removeClass('active'); - isMessagesOpen = false; - } - - let showAddContact = function() { - $('#contact').addClass('active'); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideAddContact = function() { - $('#contact').removeClass('active'); - $('#contact_name').val(''); - $('#contact_number').val(''); - } - - let showNewMessage = function(cnum, cname) { - $('#writer').addClass('active'); - $('#writer_number').val(cnum); - $('#writer .header-title').html(cname); - $('.screen *').attr('disabled', 'disabled'); - $('.screen.active *').removeAttr('disabled'); - } - - let hideNewMessage = function() { - $('#writer').removeClass('active'); - $('#writer_number').val(''); - $('#writer_message').val(''); - $('#writer .header-title').html(''); - } - - let showGPS = function(xPos, yPos) { - $.post('http://esx_phone/setGPS', JSON.stringify({ - x: parseFloat(xPos), - y: parseFloat(yPos) - } - )); - } - - let renderContacts = function(){ - - let contactHTML = ''; - - if(contacts.length > 0) { - - for(let i=0; i 0) { - - for(let i=0; i { - return a.name.localeCompare(b.name); - }); - - renderSpecialContacts(); - - } - - } - - let removeSpecialContact = function(number){ - - for(let i=0; iKontakty' + - '
  • Wiadomości
    • ' - ); - - for(let i=0; i":">",'"':""","'":"'","/":"/","`":"`","=":"="};function escapeHtml(string){return String(string).replace(/[&<>"'`=\/]/g,function fromEntityMap(s){return entityMap[s]})}var whiteRe=/\s*/;var spaceRe=/\s+/;var equalsRe=/\s*=/;var curlyRe=/\s*\}/;var tagRe=/#|\^|\/|>|\{|&|=|!/;function parseTemplate(template,tags){if(!template)return[];var sections=[];var tokens=[];var spaces=[];var hasTag=false;var nonSpace=false;function stripSpace(){if(hasTag&&!nonSpace){while(spaces.length)delete tokens[spaces.pop()]}else{spaces=[]}hasTag=false;nonSpace=false}var openingTagRe,closingTagRe,closingCurlyRe;function compileTags(tagsToCompile){if(typeof tagsToCompile==="string")tagsToCompile=tagsToCompile.split(spaceRe,2);if(!isArray(tagsToCompile)||tagsToCompile.length!==2)throw new Error("Invalid tags: "+tagsToCompile);openingTagRe=new RegExp(escapeRegExp(tagsToCompile[0])+"\\s*");closingTagRe=new RegExp("\\s*"+escapeRegExp(tagsToCompile[1]));closingCurlyRe=new RegExp("\\s*"+escapeRegExp("}"+tagsToCompile[1]))}compileTags(tags||mustache.tags);var scanner=new Scanner(template);var start,type,value,chr,token,openSection;while(!scanner.eos()){start=scanner.pos;value=scanner.scanUntil(openingTagRe);if(value){for(var i=0,valueLength=value.length;i0?sections[sections.length-1][4]:nestedTokens;break;default:collector.push(token)}}return nestedTokens}function Scanner(string){this.string=string;this.tail=string;this.pos=0}Scanner.prototype.eos=function eos(){return this.tail===""};Scanner.prototype.scan=function scan(re){var match=this.tail.match(re);if(!match||match.index!==0)return"";var string=match[0];this.tail=this.tail.substring(string.length);this.pos+=string.length;return string};Scanner.prototype.scanUntil=function scanUntil(re){var index=this.tail.search(re),match;switch(index){case-1:match=this.tail;this.tail="";break;case 0:match="";break;default:match=this.tail.substring(0,index);this.tail=this.tail.substring(index)}this.pos+=match.length;return match};function Context(view,parentContext){this.view=view;this.cache={".":this.view};this.parent=parentContext}Context.prototype.push=function push(view){return new Context(view,this)};Context.prototype.lookup=function lookup(name){var cache=this.cache;var value;if(cache.hasOwnProperty(name)){value=cache[name]}else{var context=this,names,index,lookupHit=false;while(context){if(name.indexOf(".")>0){value=context.view;names=name.split(".");index=0;while(value!=null&&index")value=this.renderPartial(token,context,partials,originalTemplate);else if(symbol==="&")value=this.unescapedValue(token,context);else if(symbol==="name")value=this.escapedValue(token,context);else if(symbol==="text")value=this.rawValue(token);if(value!==undefined)buffer+=value}return buffer};Writer.prototype.renderSection=function renderSection(token,context,partials,originalTemplate){var self=this;var buffer="";var value=context.lookup(token[1]);function subRender(template){return self.render(template,context,partials)}if(!value)return;if(isArray(value)){for(var j=0,valueLength=value.length;j - - - - - - - - - -
    - -
    - -
    - - unknown -
    - -
    -
      -
    • Contacts
      • -
    • Messages
      • -
    -
    - -
    -
    - Contacts - -
    -
    -
    -
    -

    No contacts

    -
    -
    -
    -
    - -
    -
    Messages - -
    -
    -
    -
    -

    No messages

    -
    -
    -
    -
    - -
    -
    -
    -
    - - - - - -
    -
    -
    - -
    -
    Add a - contact
    -
    -
    - - - - -
    -
    -
    - -
    -
    - - - - - - - - diff --git a/[esx_addons]/esx_phone/html/ui_br.html b/[esx_addons]/esx_phone/html/ui_br.html deleted file mode 100644 index b0e2c9e3..00000000 --- a/[esx_addons]/esx_phone/html/ui_br.html +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - -
    - -
    - -
    - - unknown -
    - -
    -
      -
    • Agenda
      • -
    • Mensagens
      • -
    -
    - -
    -
    - Agenda - -
    -
    -
    -
    -

    Nenhum contato

    -
    -
    -
    -
    - -
    -
    Mensagens - -
    -
    -
    -
    -

    Nenhuma mensagem

    -
    -
    -
    -
    - -
    -
    -
    -
    - - - - - -
    -
    -
    - -
    -
    Adicionar contato
    -
    -
    - - - - -
    -
    -
    - -
    -
    - - - - - - - - \ No newline at end of file diff --git a/[esx_addons]/esx_phone/html/ui_de.html b/[esx_addons]/esx_phone/html/ui_de.html deleted file mode 100644 index e8171754..00000000 --- a/[esx_addons]/esx_phone/html/ui_de.html +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - -
    - -
    - -
    - - unknown -
    - -
    -
      -
    • Kontakte
      • -
    • Nachrichten
      • -
    -
    - -
    -
    - Kontakte - -
    -
    -
    -
    -

    Keine Kontakte

    -
    -
    -
    -
    - -
    -
    Nachrichten - -
    -
    -
    -
    -

    Keine Nachrichten

    -
    -
    -
    -
    - -
    -
    -
    -
    - - - - - -
    -
    -
    - -
    -
    Kontakt - hinzufügen
    -
    -
    - - - - -
    -
    -
    - -
    -
    - - - - - - - - \ No newline at end of file diff --git a/[esx_addons]/esx_phone/html/ui_en.html b/[esx_addons]/esx_phone/html/ui_en.html deleted file mode 100644 index 18375822..00000000 --- a/[esx_addons]/esx_phone/html/ui_en.html +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - -
    - -
    - -
    - - unknown -
    - -
    -
      -
    • Contacts
      • -
    • Messages
      • -
    -
    - -
    -
    - Contacts - -
    -
    -
    -
    -

    No contacts

    -
    -
    -
    -
    - -
    -
    Messages - -
    -
    -
    -
    -

    No messages

    -
    -
    -
    -
    - -
    -
    -
    -
    - - - - - -
    -
    -
    - -
    -
    Add a - contact
    -
    -
    - - - - -
    -
    -
    - -
    -
    - - - - - - - - \ No newline at end of file diff --git a/[esx_addons]/esx_phone/html/ui_es.html b/[esx_addons]/esx_phone/html/ui_es.html deleted file mode 100644 index 9b730801..00000000 --- a/[esx_addons]/esx_phone/html/ui_es.html +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - -
    - -
    - -
    - - unknown -
    - -
    -
      -
    • Contactos
      • -
    • Mensajes
      • -
    -
    - -
    - -
    Contactos
    -
    -
    -
    -

    No hay contactos

    -
    -
    -
    -
    - -
    -
    Mensajes - -
    -
    -
    -
    -

    No hay mensajes

    -
    -
    -
    -
    - -
    -
    -
    -
    - - - - - -
    -
    -
    - -
    -
    Añadir contacto
    -
    -
    - - - - -
    -
    -
    - -
    -
    - - - - - - - - diff --git a/[esx_addons]/esx_phone/html/ui_hu.html b/[esx_addons]/esx_phone/html/ui_hu.html deleted file mode 100644 index 99dc892a..00000000 --- a/[esx_addons]/esx_phone/html/ui_hu.html +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - -
    -
    -
    - - ismeretlen -
    - -
    -
      -
    • Kapcsolatok
      • -
    • Üzenetek
      • -
    -
    - -
    -
    - Kapcsolatok - -
    -
    -
    -
    -

    Nincsenek kapcsolatok

    -
    -
    -
    -
    - -
    -
    - Üzenetek - -
    -
    -
    -
    -

    Nincs üzenet

    -
    -
    -
    -
    - -
    -
    - -
    -
    -
    - - - - - -
    -
    -
    - -
    -
    Kapcsolat hozzáadása
    -
    -
    - - - - -
    -
    -
    -
    -
    - - - - - - diff --git a/[esx_addons]/esx_phone/html/ui_pl.html b/[esx_addons]/esx_phone/html/ui_pl.html deleted file mode 100644 index 92448574..00000000 --- a/[esx_addons]/esx_phone/html/ui_pl.html +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - -
    - -
    - -
    - - #123456 -
    - -
    -
      -
    • Kontakty
      • -
    • Wiadomości
      • -
    -
    - -
    -
    - Kontakty - -
    -
    -
    -
    -

    Brak kontaktów

    -
    -
    -
    -
    - -
    -
    Wiadomości - -
    -
    -
    -
    -

    Brak wiadomości

    -
    -
    -
    -
    - -
    -
    -
    -
    - - - - - -
    -
    -
    - -
    -
    Dodaj - kontakt
    -
    -
    - - - - -
    -
    -
    - -
    -
    - - - - - - - - - \ No newline at end of file diff --git a/[esx_addons]/esx_phone/locales/br.lua b/[esx_addons]/esx_phone/locales/br.lua deleted file mode 100644 index 247c3f66..00000000 --- a/[esx_addons]/esx_phone/locales/br.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['br'] = { - ['new_message'] = 'Nova mensagem : %s', - ['press_take_call'] = '%s - Pressione [E] para aceitar a chamada', - ['taken_call'] = '%s recebeu uma chamada', - ['gps_position'] = 'destino inserido no GPS', - ['message_sent'] = 'mensagem enviada', - ['cannot_add_self'] = 'você não pode se adicionar', - ['number_in_contacts'] = 'este número já está na sua lista de contatos', - ['contact_added'] = 'contato adicionado', - ['contact_removed'] = 'the contact has been removed!', - ['number_not_assigned'] = 'este número não foi atribuído...', - ['invalid_number'] = 'that\'s not an valid number!', -} diff --git a/[esx_addons]/esx_phone/locales/de.lua b/[esx_addons]/esx_phone/locales/de.lua deleted file mode 100644 index c5afe06d..00000000 --- a/[esx_addons]/esx_phone/locales/de.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['de'] = { - ['new_message'] = 'Neue Nachricht', - ['press_take_call'] = '%s - Drücke [E] um den Anruf anzunehmen', - ['taken_call'] = '%s hat den Anruf angenommen', - ['gps_position'] = 'Ziel im GPS eingegeben', - ['message_sent'] = 'Nachricht wurde versendet', - ['cannot_add_self'] = 'Du kannst dich nicht selbst hinzufügen', - ['number_in_contacts'] = 'Diese Nummer ist bereits in deinen Kontakten', - ['contact_added'] = 'Kontakt hinzugefügt', - ['contact_removed'] = 'Dieser Kontakt wurde entfernt!', - ['number_not_assigned'] = 'Diese Nummer ist nicht vergeben...', - ['invalid_number'] = 'Dies ist keine gültige Telefonnummer!', -} diff --git a/[esx_addons]/esx_phone/locales/en.lua b/[esx_addons]/esx_phone/locales/en.lua deleted file mode 100644 index 29d878a3..00000000 --- a/[esx_addons]/esx_phone/locales/en.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['en'] = { - ['new_message'] = 'You have received a message: %s', - ['press_take_call'] = '%s - Press [E] to take the call', - ['taken_call'] = '%s has taken the call', - ['gps_position'] = 'the destination has been added to your GPS', - ['message_sent'] = 'the message has been sent', - ['cannot_add_self'] = 'you can not add yourself!', - ['number_in_contacts'] = 'this number is already in your contact list', - ['contact_added'] = 'the contact has been added!', - ['contact_removed'] = 'the contact has been removed!', - ['number_not_assigned'] = 'the number has not been assigned!', - ['invalid_number'] = 'that\'s not an valid number!', -} diff --git a/[esx_addons]/esx_phone/locales/es.lua b/[esx_addons]/esx_phone/locales/es.lua deleted file mode 100644 index c8083d22..00000000 --- a/[esx_addons]/esx_phone/locales/es.lua +++ /dev/null @@ -1,14 +0,0 @@ -Locales['es'] = { - ['new_message'] = 'Nuevo mensaje : %s', - ['press_take_call'] = '%s - Pulsar [E] para coger la llamada', - ['taken_call'] = '%s ha contestado la llamada', - ['gps_position'] = 'destino añadido al GPS', - ['message_sent'] = 'mensaje enviado', - ['cannot_add_self'] = 'no puedes agregarte a ti mismo!', - ['number_in_contacts'] = 'este número ya está en tu lista de contactos', - ['contact_added'] = 'contacto añadido!', - ['contact_removed'] = 'el contacto ha sido eliminado!', - ['number_not_assigned'] = 'el número no ha sido añadido!', - ['invalid_number'] = 'el número no es válido!', -} - diff --git a/[esx_addons]/esx_phone/locales/fr.lua b/[esx_addons]/esx_phone/locales/fr.lua deleted file mode 100644 index a50a4e4c..00000000 --- a/[esx_addons]/esx_phone/locales/fr.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['fr'] = { - ['new_message'] = 'Nouveau message : %s', - ['press_take_call'] = '%s - Appuyez sur [E] pour prendre l\'appel', - ['taken_call'] = '%s a pris l\'appel', - ['gps_position'] = 'position entrée dans le GPS', - ['message_sent'] = 'message envoyé', - ['cannot_add_self'] = 'vous ne pouvez pas vous ajouter vous-même', - ['number_in_contacts'] = 'ce numéro est déja dans votre liste de contacts', - ['contact_added'] = 'contact ajouté', - ['contact_removed'] = 'contact supprimé', - ['number_not_assigned'] = 'ce numéro n\'est pas attribué...', - ['invalid_number'] = 'that\'s not an valid number!', -} diff --git a/[esx_addons]/esx_phone/locales/hu.lua b/[esx_addons]/esx_phone/locales/hu.lua deleted file mode 100644 index dcf65f1a..00000000 --- a/[esx_addons]/esx_phone/locales/hu.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['hu'] = { - ['new_message'] = 'Kaptál egy üzenetet: %s', - ['press_take_call'] = '%s - Nyomd meg a [E] gombot a hívás fogadásához', - ['taken_call'] = '%s fogadta a hívást', - ['gps_position'] = 'az úti cél hozzáadva a GPS-hez.', - ['message_sent'] = 'az üzenet elküldve', - ['cannot_add_self'] = 'nem adhatod hozzá magad!', - ['number_in_contacts'] = 'ez a szám már szerepel a névjegyzékében', - ['contact_added'] = 'a névjegy hozzáadva!', - ['contact_removed'] = 'a névjegy eltávolítva!', - ['number_not_assigned'] = 'a szám nincs hozzárendelve!', - ['invalid_number'] = 'ez nem érvényes szám!', -} diff --git a/[esx_addons]/esx_phone/locales/it.lua b/[esx_addons]/esx_phone/locales/it.lua deleted file mode 100644 index a99c4a96..00000000 --- a/[esx_addons]/esx_phone/locales/it.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['it'] = { - ['new_message'] = 'Hai ricevuto un messaggio: %s', - ['press_take_call'] = '%s - Premi [E] per rispondere', - ['taken_call'] = '%s chiamata in corso...', - ['gps_position'] = 'La destinazione è stata aggiunta al tuo GPS', - ['message_sent'] = 'Messaggio inviato', - ['cannot_add_self'] = 'Non puoi aggiungere te stesso!', - ['number_in_contacts'] = 'Questo numero è già presente nella lista contatti', - ['contact_added'] = 'Contatto aggiunto!', - ['contact_removed'] = 'Contatto rimosso!', - ['number_not_assigned'] = 'Il numero non è stato assegnato!', - ['invalid_number'] = 'Numero inserito non valido', -} diff --git a/[esx_addons]/esx_phone/locales/nl.lua b/[esx_addons]/esx_phone/locales/nl.lua deleted file mode 100644 index 75944215..00000000 --- a/[esx_addons]/esx_phone/locales/nl.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['nl'] = { - ['new_message'] = 'Je hebt een bericht ontvangen: %s', - ['press_take_call'] = '%s - Klik op [E] om op te nemen', - ['taken_call'] = '%s heeft opgenomen', - ['gps_position'] = 'de bestemming is op je navigatie gezet', - ['message_sent'] = 'het bericht is verstuurd', - ['cannot_add_self'] = 'je kan jezelf niet toevoegen!', - ['number_in_contacts'] = 'dit nummer staat al in je contacten', - ['contact_added'] = 'je hebt een contact toegevoegd!', - ['contact_removed'] = 'je hebt een contact verwijderd!', - ['number_not_assigned'] = 'het nummer is nog niet toegewezen!', - ['invalid_number'] = 'dat is een ongeldig nummer!', -} diff --git a/[esx_addons]/esx_phone/locales/pl.lua b/[esx_addons]/esx_phone/locales/pl.lua deleted file mode 100644 index 5df9746c..00000000 --- a/[esx_addons]/esx_phone/locales/pl.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['pl'] = { - ['new_message'] = 'Masz nową wiadomość: %s', - ['press_take_call'] = '%s - wciśnij [E] aby odebrać telefon', - ['taken_call'] = '%s odebrał telefon', - ['gps_position'] = 'cel podróży został dodany do GPS\'a', - ['message_sent'] = 'wiadomość wysłana', - ['cannot_add_self'] = 'nie możesz dodać samego siebie!', - ['number_in_contacts'] = 'ten numer jest już na twojej liście kontaktów', - ['contact_added'] = 'kontakt dodany!', - ['contact_removed'] = 'kontakt usunięty!', - ['number_not_assigned'] = 'numer nie jest przypisany!', - ['invalid_number'] = 'to nie jest prawidłowy numer telefonu!', -} diff --git a/[esx_addons]/esx_phone/locales/si.lua b/[esx_addons]/esx_phone/locales/si.lua deleted file mode 100644 index d43bb5e1..00000000 --- a/[esx_addons]/esx_phone/locales/si.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['si'] = { - ['new_message'] = 'Prejeli ste sporočilo: %s', - ['press_take_call'] = '%s - Pritisnite [E] za sprejem klica', - ['taken_call'] = '%s je sprejel klic', - ['gps_position'] = 'cilj je bil dodan v vaš GPS', - ['message_sent'] = 'sporočilo je bilo poslano', - ['cannot_add_self'] = 'ne morete se dodati!', - ['number_in_contacts'] = 'ta številka je že na vašem seznamu stikov', - ['contact_added'] = 'stik je bil dodan!', - ['contact_removed'] = 'stik je bil odstranjen!', - ['number_not_assigned'] = 'številka ni bila dodeljena!', - ['invalid_number'] = 'to ni veljavna številka!', -} diff --git a/[esx_addons]/esx_phone/locales/sv.lua b/[esx_addons]/esx_phone/locales/sv.lua deleted file mode 100644 index fc23d6db..00000000 --- a/[esx_addons]/esx_phone/locales/sv.lua +++ /dev/null @@ -1,13 +0,0 @@ -Locales['sv'] = { - ['new_message'] = 'Nytt meddelande: %s', - ['press_take_call'] = '%s - tryck [E] för att svara', - ['taken_call'] = '%s har tagit emot ditt meddelande', - ['gps_position'] = 'destinationen är markerad på din GPS!', - ['message_sent'] = 'meddelandet har skickats!', - ['cannot_add_self'] = 'du kan inte lägga till dig själv!', - ['number_in_contacts'] = 'det här nummret finns redan bland dina kontakter!', - ['contact_added'] = 'kontakten har lags till!', - ['contact_removed'] = 'kontakten har tagits bort!', - ['number_not_assigned'] = 'det här nummret finns inte!', - ['invalid_number'] = 'det är inte ett giltigt nummer!', -} diff --git a/[esx_addons]/esx_phone/server/main.lua b/[esx_addons]/esx_phone/server/main.lua deleted file mode 100644 index fc865a32..00000000 --- a/[esx_addons]/esx_phone/server/main.lua +++ /dev/null @@ -1,293 +0,0 @@ - -local DisptachRequestId, PhoneNumbers = 0, {} - -AddEventHandler('onResourceStart', function(resource) - if resource == GetCurrentResourceName() then - local xPlayers = ESX.GetExtendedPlayers() - - for k, v in pairs(xPlayers) do - LoadPlayer(v) - end - end -end) - -function LoadPlayer(player) - local xPlayer = player - - for num,v in pairs(PhoneNumbers) do - if tonumber(num) == num then -- if phonenumber is a player phone number - for src,_ in pairs(v.sources) do - TriggerClientEvent('esx_phone:setPhoneNumberSource', xPlayer.source, num, tonumber(src)) - end - end - end - - MySQL.query('SELECT phone_number FROM users WHERE identifier = @identifier', { - ['@identifier'] = xPlayer.identifier - }, function(result) - local phoneNumber = result[1].phone_number - - if phoneNumber == nil then - phoneNumber = GenerateUniquePhoneNumber() - - MySQL.update('UPDATE users SET phone_number = @phone_number WHERE identifier = @identifier', { - ['@identifier'] = xPlayer.identifier, - ['@phone_number'] = phoneNumber - }) - end - TriggerClientEvent('esx_phone:setPhoneNumberSource', -1, phoneNumber, xPlayer.source) - - PhoneNumbers[phoneNumber] = { - type = 'player', - hashDispatch = false, - sharePos = false, - hideNumber = false, - hidePosIfAnon = false, - sources = {[xPlayer.source] = true} - } - - xPlayer.set('phoneNumber', phoneNumber) - local contacts = {} - - if PhoneNumbers[xPlayer.job.name] then - TriggerEvent('esx_phone:addSource', xPlayer.job.name, xPlayer.source) - end - - MySQL.query('SELECT * FROM user_contacts WHERE identifier = @identifier ORDER BY name ASC', { - ['@identifier'] = xPlayer.identifier - }, function(result2) - for i=1, #result2, 1 do - table.insert(contacts, { - name = result2[i].name, - number = result2[i].number, - }) - end - - xPlayer.set('contacts', contacts) - TriggerClientEvent('esx_phone:loaded', xPlayer.source, phoneNumber, contacts) - end) - end) -end - -function GenerateUniquePhoneNumber() - local foundNumber, phoneNumber = false, nil - - while not foundNumber do - Wait(100) - - math.randomseed(GetGameTimer()) - phoneNumber = math.random(10000, 99999) - - local result = MySQL.query.await('SELECT COUNT(*) as count FROM users WHERE phone_number = @phoneNumber', { - ['@phoneNumber'] = phoneNumber - }) - - if tonumber(result[1].count) == 0 then - foundNumber = true - end - end - - return phoneNumber -end - -function GetDistpatchRequestId() - local requestId = DisptachRequestId - - if DisptachRequestId < 65535 then - DisptachRequestId = DisptachRequestId + 1 - else - DisptachRequestId = 0 - end - - return requestId -end - -AddEventHandler('esx_phone:getDistpatchRequestId', function(cb) - cb(GetDistpatchRequestId()) -end) - -AddEventHandler('esx:playerLoaded', function(playerId, xPlayer) - LoadPlayer(xPlayer) -end) - -AddEventHandler('esx:playerDropped', function(source) - local xPlayer = ESX.GetPlayerFromId(source) - local phoneNumber = xPlayer.get('phoneNumber') - - TriggerClientEvent('esx_phone:setPhoneNumberSource', -1, phoneNumber, -1) - PhoneNumbers[phoneNumber] = nil - - if PhoneNumbers[xPlayer.job.name] then - TriggerEvent('esx_phone:removeSource', xPlayer.job.name, source) - end -end) - -AddEventHandler('esx:setJob', function(source, job, lastJob) - if PhoneNumbers[lastJob.name] then - TriggerEvent('esx_phone:removeSource', lastJob.name, source) - end - - if PhoneNumbers[job.name] then - TriggerEvent('esx_phone:addSource', job.name, source) - end -end) - -RegisterServerEvent('esx_phone:reload') -AddEventHandler('esx_phone:reload', function(phoneNumber) - local playerId = source - local xPlayer = ESX.GetPlayerFromId(playerId) - local contacts = xPlayer.get('contacts') - - TriggerClientEvent('esx_phone:loaded', playerId, phoneNumber, contacts) -end) - -RegisterServerEvent('esx_phone:send') -AddEventHandler('esx_phone:send', function(phoneNumber, message, anon, position) - local xPlayer = ESX.GetPlayerFromId(source) - print(('esx_phone: MESSAGE => %s@%s: %s'):format(xPlayer.name, phoneNumber, message)) - - if PhoneNumbers[phoneNumber] then - for k,v in pairs(PhoneNumbers[phoneNumber].sources) do - local numType = PhoneNumbers[phoneNumber].type - local numHasDispatch = PhoneNumbers[phoneNumber].hasDispatch - local numHide = PhoneNumbers[phoneNumber].hideNumber - local numHidePosIfAnon = PhoneNumbers[phoneNumber].hidePosIfAnon - local numPosition = (PhoneNumbers[phoneNumber].sharePos and position or false) - local numSource = tonumber(k) - - if numHidePosIfAnon and anon then - numPosition = false - end - - if numHasDispatch then - TriggerClientEvent('esx_phone:onMessage', numSource, xPlayer.get('phoneNumber'), message, numPosition, (numHide and true or anon), numType, GetDistpatchRequestId(), phoneNumber) - else - TriggerClientEvent('esx_phone:onMessage', numSource, xPlayer.get('phoneNumber'), message, numPosition, (numHide and true or anon), numType, false) - end - end - end -end) - -AddEventHandler('esx_phone:registerNumber', function(number, type, sharePos, hasDispatch, hideNumber, hidePosIfAnon) - local hideNumber = hideNumber or false - local hidePosIfAnon = hidePosIfAnon or false - - PhoneNumbers[number] = { - type = type, - sharePos = sharePos, - hasDispatch = (hasDispatch or false), - hideNumber = hideNumber, - hidePosIfAnon = hidePosIfAnon, - sources = {} - } -end) - -AddEventHandler('esx_phone:removeNumber', function(number) - PhoneNumbers[number] = nil -end) - -AddEventHandler('esx_phone:addSource', function(number, source) - PhoneNumbers[number].sources[tostring(source)] = true -end) - -AddEventHandler('esx_phone:removeSource', function(number, source) - PhoneNumbers[number].sources[tostring(source)] = nil -end) - -RegisterServerEvent('esx_phone:addPlayerContact') -AddEventHandler('esx_phone:addPlayerContact', function(phoneNumber, contactName) - local playerId = source - local xPlayer = ESX.GetPlayerFromId(playerId) - phoneNumber = tonumber(phoneNumber) - local playerOnline = false - - if phoneNumber == nil then - print(('esx_phone: %s parsed invalid player contact number!'):format(xPlayer.identifier)) - return - end - - MySQL.query('SELECT phone_number, identifier FROM users WHERE phone_number = @number', { - ['@number'] = phoneNumber - }, function(result) - if result[1] then - if phoneNumber == xPlayer.get('phoneNumber') then - TriggerClientEvent('esx:showNotification', playerId, TranslateCap('cannot_add_self')) - else - local contacts = xPlayer.get('contacts') - - -- already added player? - for i=1, #contacts, 1 do - if contacts[i].number == phoneNumber then - TriggerClientEvent('esx:showNotification', playerId, TranslateCap('number_in_contacts')) - return - end - end - - table.insert(contacts, { - name = contactName, - number = phoneNumber - }) - - xPlayer.set('contacts', contacts) - - -- is the player currently online? - local xTarget = ESX.GetPlayerFromIdentifier(result[1].identifier) - playerOnline = xTarget ~= nil - - MySQL.update('INSERT INTO user_contacts (identifier, name, number) VALUES (@identifier, @name, @number)', { - ['@identifier'] = xPlayer.identifier, - ['@name'] = contactName, - ['@number'] = phoneNumber - }, function(rowsChanged) - TriggerClientEvent('esx:showNotification', playerId, TranslateCap('contact_added')) - TriggerClientEvent('esx_phone:addContact', playerId, contactName, phoneNumber, playerOnline) - end) - end - else - TriggerClientEvent('esx:showNotification', playerId, TranslateCap('number_not_assigned')) - end - end) -end) - -RegisterServerEvent('esx_phone:removePlayerContact') -AddEventHandler('esx_phone:removePlayerContact', function(phoneNumber, contactName) - local playerId = source - local xPlayer = ESX.GetPlayerFromId(playerId) - local foundNumber = false - - MySQL.query('SELECT phone_number FROM users WHERE phone_number = @number', { - ['@number'] = phoneNumber - }, function(result) - if result[1] then - foundNumber = true - end - - if foundNumber then - local contacts = xPlayer.get('contacts') - - for key, value in pairs(contacts) do - if value.name == contactName and value.number == phoneNumber then - table.remove(contacts, key) - end - end - - xPlayer.set('contacts', contacts) - - MySQL.update('DELETE FROM user_contacts WHERE identifier = @identifier AND name = @name AND number = @number', { - ['@identifier'] = xPlayer.identifier, - ['@name'] = contactName, - ['@number'] = phoneNumber - }, function(rowsChanged) - TriggerClientEvent('esx:showNotification', playerId, TranslateCap('contact_removed')) - TriggerClientEvent('esx_phone:removeContact', playerId, contactName, phoneNumber) - end) - else - TriggerClientEvent('esx:showNotification', playerId, TranslateCap('number_not_assigned')) - end - end) -end) - -RegisterServerEvent('esx_phone:stopDispatch') -AddEventHandler('esx_phone:stopDispatch', function(dispatchRequestId) - TriggerClientEvent('esx_phone:stopDispatch', -1, dispatchRequestId, GetPlayerName(source)) -end) \ No newline at end of file diff --git a/[esx_addons]/esx_policejob/client/main.lua b/[esx_addons]/esx_policejob/client/main.lua index 0115ba9c..faa2ea4b 100644 --- a/[esx_addons]/esx_policejob/client/main.lua +++ b/[esx_addons]/esx_policejob/client/main.lua @@ -918,27 +918,6 @@ AddEventHandler('esx:setJob', function(job) end end) -RegisterNetEvent('esx_phone:loaded') -AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts) - local specialContact = { - name = TranslateCap('phone_police'), - number = 'police', - base64Icon = 'data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAyJpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvIiB4bWxuczp4bXBNTT0iaHR0cDovL25zLmFkb2JlLmNvbS94YXAvMS4wL21tLyIgeG1sbnM6c3RSZWY9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9zVHlwZS9SZXNvdXJjZVJlZiMiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoV2luZG93cykiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6NDFGQTJDRkI0QUJCMTFFN0JBNkQ5OENBMUI4QUEzM0YiIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6NDFGQTJDRkM0QUJCMTFFN0JBNkQ5OENBMUI4QUEzM0YiPiA8eG1wTU06RGVyaXZlZEZyb20gc3RSZWY6aW5zdGFuY2VJRD0ieG1wLmlpZDo0MUZBMkNGOTRBQkIxMUU3QkE2RDk4Q0ExQjhBQTMzRiIgc3RSZWY6ZG9jdW1lbnRJRD0ieG1wLmRpZDo0MUZBMkNGQTRBQkIxMUU3QkE2RDk4Q0ExQjhBQTMzRiIvPiA8L3JkZjpEZXNjcmlwdGlvbj4gPC9yZGY6UkRGPiA8L3g6eG1wbWV0YT4gPD94cGFja2V0IGVuZD0iciI/PoW66EYAAAjGSURBVHjapJcLcFTV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' - } - - TriggerEvent('esx_phone:addSpecialContact', specialContact.name, specialContact.number, specialContact.base64Icon) -end) - --- don't show dispatches if the player isn't in service -AddEventHandler('esx_phone:cancelMessage', function(dispatchNumber) - if ESX.PlayerData.job and ESX.PlayerData.job.name == 'police' and ESX.PlayerData.job.name == dispatchNumber then - -- if esx_service is enabled - if Config.EnableESXService and not playerInService then - CancelEvent() - end - end -end) - AddEventHandler('esx_policejob:hasEnteredMarker', function(station, part, partNum) if part == 'Cloakroom' then CurrentAction = 'menu_cloakroom' @@ -1521,7 +1500,6 @@ end) AddEventHandler('onResourceStop', function(resource) if resource == GetCurrentResourceName() then TriggerEvent('esx_policejob:unrestrain') - TriggerEvent('esx_phone:removeSpecialContact', 'police') if Config.EnableESXService then TriggerServerEvent('esx_service:disableService', 'police') diff --git a/[esx_addons]/esx_policejob/locales/br.lua b/[esx_addons]/esx_policejob/locales/br.lua index 2f430e44..c2e6e84d 100644 --- a/[esx_addons]/esx_policejob/locales/br.lua +++ b/[esx_addons]/esx_policejob/locales/br.lua @@ -145,7 +145,4 @@ Locales['br'] = { ['remove_prop'] = 'Pressione [E] para remover o objeto', ['map_blip'] = 'Departamento de Polícia', ['unrestrained_timer'] = 'you feel your handcuffs slowly losing grip and fading away.', - -- Notifications - ['alert_police'] = 'Alerta da Polícia', - ['phone_police'] = 'police', } diff --git a/[esx_addons]/esx_policejob/locales/cs.lua b/[esx_addons]/esx_policejob/locales/cs.lua index 863e361d..4d73e757 100644 --- a/[esx_addons]/esx_policejob/locales/cs.lua +++ b/[esx_addons]/esx_policejob/locales/cs.lua @@ -145,7 +145,4 @@ Locales['cs'] = { ['remove_prop'] = 'stiskni [E] pro odstranění předmětu', ['map_blip'] = 'policejní stanice', ['unrestrained_timer'] = 'cítíš, že tvé pouta pomalu ztrácejí přilnavost a padají.', - -- Notifications - ['alert_police'] = 'policejní poplach', - ['phone_police'] = 'policie', } diff --git a/[esx_addons]/esx_policejob/locales/de.lua b/[esx_addons]/esx_policejob/locales/de.lua index 2aebdc53..44c12991 100644 --- a/[esx_addons]/esx_policejob/locales/de.lua +++ b/[esx_addons]/esx_policejob/locales/de.lua @@ -145,7 +145,4 @@ Locales['de'] = { ['remove_prop'] = 'Drücke [E], um das Objekt zu entfernen', ['map_blip'] = 'Polizeistation', ['unrestrained_timer'] = 'Du spürst, wie die Handschellen langsam ihren Halt verlieren und sich auflösen.', - -- Notifications - ['alert_police'] = 'Polizei alarmieren', - ['phone_police'] = 'Polizei', } diff --git a/[esx_addons]/esx_policejob/locales/en.lua b/[esx_addons]/esx_policejob/locales/en.lua index 1e248348..6b6a12bc 100644 --- a/[esx_addons]/esx_policejob/locales/en.lua +++ b/[esx_addons]/esx_policejob/locales/en.lua @@ -145,7 +145,4 @@ Locales['en'] = { ['remove_prop'] = 'press [E] to delete the object', ['map_blip'] = 'police Station', ['unrestrained_timer'] = 'you feel your handcuffs slowly losing grip and fading away.', - -- Notifications - ['alert_police'] = 'police alert', - ['phone_police'] = 'police', } diff --git a/[esx_addons]/esx_policejob/locales/es.lua b/[esx_addons]/esx_policejob/locales/es.lua index e390020e..389f43f4 100644 --- a/[esx_addons]/esx_policejob/locales/es.lua +++ b/[esx_addons]/esx_policejob/locales/es.lua @@ -145,7 +145,4 @@ Locales['es'] = { ['remove_prop'] = 'presionar [E] para eliminar el objeto', ['map_blip'] = 'comisaría de policía', ['unrestrained_timer'] = 'you feel your handcuffs slowly losing grip and fading away.', - -- Notifications - ['alert_police'] = 'alerta policia', - ['phone_police'] = 'policia', } diff --git a/[esx_addons]/esx_policejob/locales/et.lua b/[esx_addons]/esx_policejob/locales/et.lua index e62c9738..4b1834b6 100644 --- a/[esx_addons]/esx_policejob/locales/et.lua +++ b/[esx_addons]/esx_policejob/locales/et.lua @@ -150,7 +150,4 @@ Locales['et'] = { ['remove_prop'] = 'Vajuta ~INPUT_CONTEXT~ et kustutada asi sinu ees.', ['map_blip'] = 'Politseijaoskond', ['unrestrained_timer'] = 'Sa tunned, kuidas käerauad libisevad kätelt.', - -- Notifications - ['alert_police'] = 'Politsei teavitus', - ['phone_police'] = 'Politsei', } diff --git a/[esx_addons]/esx_policejob/locales/fi.lua b/[esx_addons]/esx_policejob/locales/fi.lua index 8041f6c6..db2d037e 100644 --- a/[esx_addons]/esx_policejob/locales/fi.lua +++ b/[esx_addons]/esx_policejob/locales/fi.lua @@ -145,7 +145,4 @@ Locales['fi'] = { ['remove_prop'] = 'paina [E] poistaaksesi objektin', ['map_blip'] = 'poliisilaitos', ['unrestrained_timer'] = 'tunnet kuinka hitaasti käsiraudat alkavat löystyä ja irtoavat', - -- Notifications - ['alert_police'] = 'hälyytys Poliisi', - ['phone_police'] = 'poliisi', } \ No newline at end of file diff --git a/[esx_addons]/esx_policejob/locales/fr.lua b/[esx_addons]/esx_policejob/locales/fr.lua index 23839ca6..c3136406 100644 --- a/[esx_addons]/esx_policejob/locales/fr.lua +++ b/[esx_addons]/esx_policejob/locales/fr.lua @@ -145,7 +145,4 @@ Locales['fr'] = { ['remove_prop'] = 'appuyez sur [E] pour enlever l\'objet', ['map_blip'] = 'Commissariat', ['unrestrained_timer'] = 'vous sentez que vos menottes deviennent fragiles.', - -- Notifications - ['alert_police'] = 'alerte police', - ['phone_police'] = 'police', } diff --git a/[esx_addons]/esx_policejob/locales/hu.lua b/[esx_addons]/esx_policejob/locales/hu.lua index 08b4be92..6938493c 100644 --- a/[esx_addons]/esx_policejob/locales/hu.lua +++ b/[esx_addons]/esx_policejob/locales/hu.lua @@ -146,7 +146,4 @@ Locales['hu'] = { ['remove_prop'] = 'Nyomj [E] gombot az objektum törléséhez', ['map_blip'] = 'LSPD', ['unrestrained_timer'] = '...', - -- Notifications - ['alert_police'] = 'riasztás', - ['phone_police'] = 'rendörség', } diff --git a/[esx_addons]/esx_policejob/locales/ko.lua b/[esx_addons]/esx_policejob/locales/ko.lua index fc539dc3..f83119f3 100644 --- a/[esx_addons]/esx_policejob/locales/ko.lua +++ b/[esx_addons]/esx_policejob/locales/ko.lua @@ -145,7 +145,4 @@ Locales['ko'] = { ['remove_prop'] = '[E]를 눌러 오브젝트를 삭제하십시오.', ['map_blip'] = '경찰서', ['unrestrained_timer'] = '당신의 수갑이 천천히 풀리는 것을 느낍니다.', - -- Notifications - ['alert_police'] = '경찰 경보', - ['phone_police'] = '경찰', } diff --git a/[esx_addons]/esx_policejob/locales/nl.lua b/[esx_addons]/esx_policejob/locales/nl.lua index c8511feb..49fb3d2e 100644 --- a/[esx_addons]/esx_policejob/locales/nl.lua +++ b/[esx_addons]/esx_policejob/locales/nl.lua @@ -146,7 +146,4 @@ Locales['nl'] = { ['remove_prop'] = 'Druk op [E] om dit object te verwijderen.', ['map_blip'] = 'Politiebureau', ['unrestrained_timer'] = 'Je voelt je handboeien langzaam wegglijden.', - -- Notifications - ['alert_police'] = 'politie alert', - ['phone_police'] = 'politie', } diff --git a/[esx_addons]/esx_policejob/locales/pl.lua b/[esx_addons]/esx_policejob/locales/pl.lua index 69cf3f8c..725e67dd 100644 --- a/[esx_addons]/esx_policejob/locales/pl.lua +++ b/[esx_addons]/esx_policejob/locales/pl.lua @@ -145,7 +145,4 @@ Locales['pl'] = { ['remove_prop'] = 'naciśnij [E] aby usunąć ten obiekt', ['map_blip'] = 'komisariat Policji', ['unrestrained_timer'] = 'czujesz, że twoje kajdanki powoli tracą przyczepność i znikają.', - -- Notifications - ['alert_police'] = 'ostrzeż policję', - ['phone_police'] = 'police', } diff --git a/[esx_addons]/esx_policejob/locales/si.lua b/[esx_addons]/esx_policejob/locales/si.lua index 3625428e..c84e45db 100644 --- a/[esx_addons]/esx_policejob/locales/si.lua +++ b/[esx_addons]/esx_policejob/locales/si.lua @@ -146,7 +146,4 @@ Locales['si'] = { ['remove_prop'] = 'pritisnite [E], da izbrišete predmet', ['map_blip'] = 'policijska postaja', ['unrestrained_timer'] = 'čutiš, kako se ti izgubljaš oprijem in kako se ti razblinjajo okovi.', --- obvestila -['alert_police'] = 'policijski alarm', -['phone_police'] = 'policija', } diff --git a/[esx_addons]/esx_policejob/locales/sv.lua b/[esx_addons]/esx_policejob/locales/sv.lua index 29178bde..e6e6673f 100644 --- a/[esx_addons]/esx_policejob/locales/sv.lua +++ b/[esx_addons]/esx_policejob/locales/sv.lua @@ -145,7 +145,4 @@ Locales['sv'] = { ['remove_prop'] = 'tryck [E] för att ta bort objektet', ['map_blip'] = 'polisstation', ['unrestrained_timer'] = 'dina handklovar har försvunnit', - -- Notifications - ['alert_police'] = 'meddela polisen', - ['phone_police'] = 'polisen', } diff --git a/[esx_addons]/esx_policejob/locales/tr.lua b/[esx_addons]/esx_policejob/locales/tr.lua index 98c2a40d..d121c3e6 100644 --- a/[esx_addons]/esx_policejob/locales/tr.lua +++ b/[esx_addons]/esx_policejob/locales/tr.lua @@ -145,7 +145,4 @@ Locales['tr'] = { ['remove_prop'] = 'objeyi silmek için [E] tuşuna basın', ['map_blip'] = 'polis Karakolu', ['unrestrained_timer'] = 'ellerinin yavaşça çözüldüğünü hissediyorsun.', - -- Notifications - ['alert_police'] = 'polis Acil Durum', - ['phone_police'] = 'polis', } diff --git a/[esx_addons]/esx_policejob/server/main.lua b/[esx_addons]/esx_policejob/server/main.lua index 5aa7712f..8cc2c7a0 100644 --- a/[esx_addons]/esx_policejob/server/main.lua +++ b/[esx_addons]/esx_policejob/server/main.lua @@ -4,7 +4,6 @@ if Config.EnableESXService then end end -TriggerEvent('esx_phone:registerNumber', 'police', TranslateCap('alert_police'), true, true) CreateThread(function() exports["esx_society"]:registerSociety('police', 'Police', 'society_police', 'society_police', 'society_police', {type = 'public'}) end) @@ -458,9 +457,3 @@ AddEventHandler('onResourceStart', function(resource) end end end) - -AddEventHandler('onResourceStop', function(resource) - if resource == GetCurrentResourceName() then - TriggerEvent('esx_phone:removeNumber', 'police') - end -end) diff --git a/[esx_addons]/esx_taxijob/client/main.lua b/[esx_addons]/esx_taxijob/client/main.lua index afb3b56e..fb0c5c2a 100644 --- a/[esx_addons]/esx_taxijob/client/main.lua +++ b/[esx_addons]/esx_taxijob/client/main.lua @@ -431,17 +431,6 @@ AddEventHandler('esx_taxijob:hasExitedMarker', function(zone) CurrentAction = nil end) -RegisterNetEvent('esx_phone:loaded') -AddEventHandler('esx_phone:loaded', function(phoneNumber, contacts) - local specialContact = { - name = TranslateCap('phone_taxi'), - number = 'taxi', - base64Icon = 'data:image/png;base64,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' - } - - TriggerEvent('esx_phone:addSpecialContact', specialContact.name, specialContact.number, specialContact.base64Icon) -end) - -- Create Blips CreateThread(function() local blip = AddBlipForCoord(Config.Zones.TaxiActions.Pos.x, Config.Zones.TaxiActions.Pos.y, diff --git a/[esx_addons]/esx_taxijob/locales/br.lua b/[esx_addons]/esx_taxijob/locales/br.lua index 473505d2..7a2a5fd4 100644 --- a/[esx_addons]/esx_taxijob/locales/br.lua +++ b/[esx_addons]/esx_taxijob/locales/br.lua @@ -46,7 +46,6 @@ Locales['br'] = { ['have_deposited'] = 'você depositou x%s %s', ['player_cannot_hold'] = 'você não tem espaço suficiente em seu inventário!', ['blip_taxi'] = 'taxi', - ['phone_taxi'] = 'taxi', ['taxi'] = 'taxi', ['taxi_stock'] = 'taxi Stock' } diff --git a/[esx_addons]/esx_taxijob/locales/de.lua b/[esx_addons]/esx_taxijob/locales/de.lua index 80cb2b37..4510c1c6 100644 --- a/[esx_addons]/esx_taxijob/locales/de.lua +++ b/[esx_addons]/esx_taxijob/locales/de.lua @@ -46,7 +46,6 @@ Locales['de'] = { ['have_deposited'] = 'Du hast eingelagert x%s %s', ['player_cannot_hold'] = 'Du hast nicht genug Platz im Inventar', ['blip_taxi'] = 'taxi', - ['phone_taxi'] = 'taxi', ['taxi'] = 'taxi', ['taxi_stock'] = 'taxi lagerbestand' } diff --git a/[esx_addons]/esx_taxijob/locales/en.lua b/[esx_addons]/esx_taxijob/locales/en.lua index 9721f5e3..6982f30b 100644 --- a/[esx_addons]/esx_taxijob/locales/en.lua +++ b/[esx_addons]/esx_taxijob/locales/en.lua @@ -47,7 +47,6 @@ Locales['en'] = { ['have_deposited'] = 'you have deposited x%s %s', ['player_cannot_hold'] = 'you do ~r~not have enough free space in your inventory!', ['blip_taxi'] = 'downtown Cab Co.', - ['phone_taxi'] = 'downtown Cab Co.', ['taxi'] = 'taxi', ['taxi_stock'] = 'taxi Stock' } diff --git a/[esx_addons]/esx_taxijob/locales/es.lua b/[esx_addons]/esx_taxijob/locales/es.lua index 11059049..ff24663c 100644 --- a/[esx_addons]/esx_taxijob/locales/es.lua +++ b/[esx_addons]/esx_taxijob/locales/es.lua @@ -48,7 +48,6 @@ Locales['es'] = { ['have_deposited'] = 'Has depositado x%s %s', ['player_cannot_hold'] = '!Tu ~r~no tienes suficiente espacio libre en tu inventario!', ['blip_taxi'] = 'Downtown Cab Co.', - ['phone_taxi'] = 'Downtown Cab Co.', ['taxi'] = 'Taxi', ['taxi_stock'] = 'Taxi Stock' } diff --git a/[esx_addons]/esx_taxijob/locales/fi.lua b/[esx_addons]/esx_taxijob/locales/fi.lua index 005670cf..01c21ba6 100644 --- a/[esx_addons]/esx_taxijob/locales/fi.lua +++ b/[esx_addons]/esx_taxijob/locales/fi.lua @@ -46,7 +46,6 @@ Locales['fi'] = { ['have_deposited'] = 'sinä talletit x%s %s', ['player_cannot_hold'] = 'sinulla ~r~ei ole enempää vapaata tilaa repussasi!', ['blip_taxi'] = 'taxi', - ['phone_taxi'] = 'taxi', ['taxi'] = 'taxi', ['taxi_stock'] = 'taxi Stock' } diff --git a/[esx_addons]/esx_taxijob/locales/fr.lua b/[esx_addons]/esx_taxijob/locales/fr.lua index 3619f1c4..f331195e 100644 --- a/[esx_addons]/esx_taxijob/locales/fr.lua +++ b/[esx_addons]/esx_taxijob/locales/fr.lua @@ -46,7 +46,6 @@ Locales['fr'] = { ['have_deposited'] = 'vous avez déposé x%s %s', ['player_cannot_hold'] = 'vous n\'avez pas assez de place dans votre inventaire!', ['blip_taxi'] = 'taxi', - ['phone_taxi'] = 'taxi', ['taxi'] = 'taxi', ['taxi_stock'] = 'taxi Stock' } diff --git a/[esx_addons]/esx_taxijob/locales/hu.lua b/[esx_addons]/esx_taxijob/locales/hu.lua index 628ecd50..1efd6a19 100644 --- a/[esx_addons]/esx_taxijob/locales/hu.lua +++ b/[esx_addons]/esx_taxijob/locales/hu.lua @@ -45,7 +45,6 @@ Locales['hu'] = { ['have_deposited'] = 'betettél x%s %s', ['player_cannot_hold'] = '~r~nincs elég üres helyed a leltárban!', ['blip_taxi'] = 'Taxitársaság', - ['phone_taxi'] = 'Taxi Hívás.', ['taxi'] = 'taxi', ['taxi_stock'] = 'taxi készlet' } diff --git a/[esx_addons]/esx_taxijob/locales/it.lua b/[esx_addons]/esx_taxijob/locales/it.lua index 5d97f45c..c9a3e7f0 100644 --- a/[esx_addons]/esx_taxijob/locales/it.lua +++ b/[esx_addons]/esx_taxijob/locales/it.lua @@ -50,7 +50,6 @@ Locales['it'] = { ['have_deposited'] = 'hai depositato x%s %s', ['player_cannot_hold'] = '~r~non hai abbastanza spazio libero nel tuo inventario!', ['blip_taxi'] = 'Downtown Cab Co.', - ['phone_taxi' ] = ' downtown Cab Co.', ['taxi' ] = 'taxi', ['taxi_stock'] = 'deposito dei taxi', ['menu_return'] = 'Ritorno' diff --git a/[esx_addons]/esx_taxijob/locales/pl.lua b/[esx_addons]/esx_taxijob/locales/pl.lua index 58c48622..78e3e1ad 100644 --- a/[esx_addons]/esx_taxijob/locales/pl.lua +++ b/[esx_addons]/esx_taxijob/locales/pl.lua @@ -46,7 +46,6 @@ Locales['pl'] = { ['have_deposited'] = 'deponujesz x%s %s', ['player_cannot_hold'] = '~r~Nie masz wystarczająco wolnego miejsca w swoim ekwipunku!', ['blip_taxi'] = 'taxi', - ['phone_taxi'] = 'taxi', ['taxi'] = 'taxi', ['taxi_stock'] = 'taxi Stock' } diff --git a/[esx_addons]/esx_taxijob/locales/si.lua b/[esx_addons]/esx_taxijob/locales/si.lua index ba25f67f..2e8fd057 100644 --- a/[esx_addons]/esx_taxijob/locales/si.lua +++ b/[esx_addons]/esx_taxijob/locales/si.lua @@ -45,7 +45,6 @@ Locales['si'] = { ['have_deposited'] = 'ste deponirali x%s %s', ['player_cannot_hold'] = 'v svojem inventarju nimaš dovolj prostora!', ['blip_taxi'] = 'podjetje downtown Cab Co.', - ['phone_taxi'] = 'downtown Cab Co.', ['taxi'] = 'taxi', ['taxi_stock'] = 'taxi Stock' } diff --git a/[esx_addons]/esx_taxijob/locales/sv.lua b/[esx_addons]/esx_taxijob/locales/sv.lua index 2ae2bd11..012fa56c 100644 --- a/[esx_addons]/esx_taxijob/locales/sv.lua +++ b/[esx_addons]/esx_taxijob/locales/sv.lua @@ -46,7 +46,6 @@ Locales['sv'] = { ['have_deposited'] = 'du har lagrat x%s %s', ['player_cannot_hold'] = 'du har ~r~inte tillräckligt med utrymme för att hålla det!', ['blip_taxi'] = 'taxifirman', - ['phone_taxi'] = 'taxi', ['taxi'] = 'taxi', ['taxi_stock'] = 'taxi Stock' } diff --git a/[esx_addons]/esx_taxijob/server/main.lua b/[esx_addons]/esx_taxijob/server/main.lua index e84561ad..fcfea05d 100644 --- a/[esx_addons]/esx_taxijob/server/main.lua +++ b/[esx_addons]/esx_taxijob/server/main.lua @@ -4,13 +4,6 @@ if Config.MaxInService ~= -1 then TriggerEvent('esx_service:activateService', 'taxi', Config.MaxInService) end -TriggerEvent('esx_phone:registerNumber', 'taxi', TranslateCap('taxi_client'), true, true) -CreateThread(function() - exports["esx_society"]:registerSociety('taxi', 'Taxi', 'society_taxi', 'society_taxi', 'society_taxi', { - type = 'public' - }) -end) - RegisterNetEvent('esx_taxijob:success') AddEventHandler('esx_taxijob:success', function() local xPlayer = ESX.GetPlayerFromId(source) diff --git a/[esx_addons]/esx_vehicleshop/server/main.lua b/[esx_addons]/esx_vehicleshop/server/main.lua index e93703fe..d4628296 100644 --- a/[esx_addons]/esx_vehicleshop/server/main.lua +++ b/[esx_addons]/esx_vehicleshop/server/main.lua @@ -1,7 +1,6 @@ local categories, vehicles = {}, {} local vehiclesByModel = {} -TriggerEvent('esx_phone:registerNumber', 'cardealer', TranslateCap('dealer_customers'), false, false) CreateThread(function() exports["esx_society"]:registerSociety('cardealer', TranslateCap('car_dealer'), 'society_cardealer', 'society_cardealer', 'society_cardealer', {type = 'private'}) end) From c70cd309223d818bbe656aec178fcf33e5c98044 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=20Gerg=C5=91?= Date: Sat, 14 Jan 2023 22:39:06 +0100 Subject: [PATCH 49/58] refactor(esx_banking) --- [esx_addons]/esx_banking/client/main.lua | 512 +++++++++++------------ [esx_addons]/esx_banking/config.lua | 2 +- [esx_addons]/esx_banking/server/main.lua | 2 +- 3 files changed, 257 insertions(+), 259 deletions(-) diff --git a/[esx_addons]/esx_banking/client/main.lua b/[esx_addons]/esx_banking/client/main.lua index e88b622b..12deb3c2 100644 --- a/[esx_addons]/esx_banking/client/main.lua +++ b/[esx_addons]/esx_banking/client/main.lua @@ -1,257 +1,255 @@ -local ActivateBlips = {} -local PlayerLoaded = true -local isInMarker, isInAtmMarker, isInMenu, isMarkerShowed = false, false, false, false -local _GetEntityCoords, _PlayerPedId - --- Functions - --- Listen for keypress while player inside the marker -local function Listen4Key() - CreateThread(function() - while (isInMarker or isInAtmMarker) and not isInMenu do - if IsControlJustReleased(0, 38) then - OpenUi(isInAtmMarker) - end - Wait(0) - end - end) -end - --- Create Blips -local function CreateBlips() - local tmpActiveBlips = {} - for i = 1, #Config.Banks do - if type(Config.Banks[i].Blip) == 'table' and Config.Banks[i].Blip.Enabled then - local blip = AddBlipForCoord(Config.Banks[i].Position.xy) - SetBlipSprite(blip, Config.Banks[i].Blip.Sprite) - SetBlipScale(blip, Config.Banks[i].Blip.Scale) - SetBlipColour(blip, Config.Banks[i].Blip.Color) - SetBlipAsShortRange(blip, true) - BeginTextCommandSetBlipName('STRING') - AddTextComponentSubstringPlayerName(Config.Banks[i].Blip.Label) - EndTextCommandSetBlipName(blip) - tmpActiveBlips[#tmpActiveBlips + 1] = blip - end - end - - ActivateBlips = tmpActiveBlips -end - --- Remove blips -local function RemoveBlips() - for i = 1, #ActivateBlips do - if DoesBlipExist(ActivateBlips[i]) then - RemoveBlip(ActivateBlips[i]) - end - end - ActivateBlips = {} -end - -function OpenUi(atm) - atm = atm or false - isInMenu = true - ESX.HideUI() - ESX.TriggerServerCallback('esx_banking:getPlayerData', function(data) - SendNUIMessage({ - showMenu = true, - openATM = atm, - datas = { - your_money_panel = { - accountsData = {{ - name = "cash", - amount = data.money - }, { - name = "bank", - amount = data.bankMoney - }} - }, - bankCardData = { - bankName = TranslateCap('bank_name'), - cardNumber = "2232 2222 2222 2222", - createdDate = "08/08", - name = data.playerName - }, - transactionsData = data.transactionHistory - } - }) - end) - SetNuiFocus(true, true) -end - -local function CloseUi() - SetNuiFocus(false, false) - isInMenu = false - SendNUIMessage({ - showMenu = false - }) - - if (isInMarker or isInAtmMarker) then - ESX.TextUI(TranslateCap('press_e_banking')) - Listen4Key() - end -end - -local function ShowMarker(coord) - CreateThread(function() - while isMarkerShowed do - DrawMarker(20, coord.x, coord.y, coord.z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.3, 0.2, 0.2, 187, 255, 0, 255, false, true, 2, false, nil, nil, false) - Wait(0) - end - end) -end - -local function StartThread() - CreateThread(function() - CreateBlips() - - while PlayerLoaded do - _PlayerPedId = PlayerPedId() - _GetEntityCoords = GetEntityCoords(_PlayerPedId) - local closestBank = {} - - if IsPedOnFoot(PlayerPedId()) then - - for i = 1, #Config.AtmModels do - local atm = GetClosestObjectOfType(_GetEntityCoords, 8.0, Config.AtmModels[i], false) - if atm ~= 0 then - local atmOffset = GetOffsetFromEntityInWorldCoords(atm, 0.0, -0.7, 0.0) - local atmDistance = #(_GetEntityCoords - atmOffset) - if not isInAtmMarker and atmDistance <= 1.5 then - isInAtmMarker = true - ESX.TextUI(TranslateCap('press_e_banking')) - Listen4Key() - elseif isInAtmMarker and atmDistance > 1.5 then - isInAtmMarker = false - ESX.HideUI() - end - end - end - - for i = 1, #Config.Banks do - local bankDistance = #(_GetEntityCoords - Config.Banks[i].Position.xyz) - - if bankDistance <= Config.DrawMarker then - closestBank = {Config.Banks[i].Position, bankDistance} - end - end - - if not isMarkerShowed and next(closestBank) then - isMarkerShowed = true - ShowMarker(closestBank[1].xyz) - elseif isMarkerShowed and not next(closestBank) then - isMarkerShowed = false - end - - if next(closestBank) then - if not isInMarker and closestBank[2] <= 1.0 then - isInMarker = true - ESX.TextUI(TranslateCap('press_e_banking')) - Listen4Key() - elseif isInMarker and closestBank[2] > 1.0 then - isInMarker = false - ESX.HideUI() - end - elseif not next(closestBank) and isInMarker then - isInMarker = false - ESX.HideUI() - end - - end - Wait(1000) - end - end) -end - --- NuiCallbacks -RegisterNUICallback('close', function(data, cb) - CloseUi() - cb('ok') -end) - -RegisterNUICallback('clickButton', function(data, cb) - if data ~= nil and isInMenu then - TriggerServerEvent("esx_banking:doingType", data) - end - cb('ok') -end) - -RegisterNUICallback('checkPincode', function(data, cb) - if data ~= nil and isInMenu then - ESX.TriggerServerCallback("esx_banking:checkPincode", function(pincode) - if pincode then - cb({ - success = true - }) - ESX.ShowNotification(TranslateCap('pincode_found'), "success") - - else - cb({ - error = true - }) - ESX.ShowNotification(TranslateCap('pincode_not_found'), "error") - end - end, data) - end -end) - --- Events -RegisterNetEvent('esx_banking:closebanking', function() - CloseUi() -end) - -local function loadNPC(index, netID) - CreateThread(function() - while not NetworkDoesEntityExistWithNetworkId(netID) do - Wait(200) - end - local npc = NetworkGetEntityFromNetworkId(netID) - - TaskStartScenarioInPlace(npc, Config.Peds[index].Scenario, 0, true) - SetEntityProofs(npc, true, true, true, true, true, true, true, true) - SetBlockingOfNonTemporaryEvents(npc, true) - FreezeEntityPosition(npc, true) - SetPedCanRagdollFromPlayerImpact(npc, false) - SetPedCanRagdoll(npc, false) - SetEntityAsMissionEntity(npc, true, true) - SetEntityDynamic(npc, false) - end) -end - -RegisterNetEvent('esx_banking:PedHandler', function(netIdTable) - for i = 1, #netIdTable do - loadNPC(i, netIdTable[i]) - end -end) - -RegisterNetEvent('esx_banking:updateMoneyInUI') -AddEventHandler('esx_banking:updateMoneyInUI', function(doingType, bankMoney, money) - SendNUIMessage({ - updateData = true, - data = { - type = doingType, - bankMoney = bankMoney, - money = money - } - }) -end) - --- Resource starting -AddEventHandler('onResourceStart', function(resource) - if resource ~= GetCurrentResourceName() then return end - StartThread() -end) - --- Enables it on player loaded -RegisterNetEvent('esx:playerLoaded', function() - StartThread() -end) - --- Resource stopping -AddEventHandler('onResourceStop', function(resource) - if resource ~= GetCurrentResourceName() then return end - RemoveBlips() - ESX.HideUI() - if isInMenu then - CloseUi() - end -end) +local BANK = { + Data = {} +} + +local activeBlips, bankPoints, atmPoints, markerPoints = {}, {}, {}, {} +local playerLoaded, uiActive, inMenu = false, false, false + +--Functions + -- General data collecting thread + function BANK:Thread() + self:CreateBlips() + local data = self.Data + data.ped = PlayerPedId() + data.coord = GetEntityCoords(data.Ped) + playerLoaded = true + + CreateThread(function () + while playerLoaded do + data.coord = GetEntityCoords(data.ped) + data.ped = PlayerPedId() + bankPoints, atmPoints, markerPoints = {}, {}, {} + + if IsPedOnFoot(data.ped) and not inMenu then + for i = 1, #Config.AtmModels do + local atm = GetClosestObjectOfType(data.coord.x, data.coord.y, data.coord.z, 0.7, Config.AtmModels[i], false, false, false) + if atm ~= 0 then + atmPoints[#atmPoints+1] = GetEntityCoords(atm) + end + end + + for i = 1, #Config.Banks do + local bankDistance = #(data.coord - Config.Banks[i].Position.xyz) + if bankDistance <= 0.7 then + bankPoints[#bankPoints+1] = Config.Banks[i].Position.xyz + end + if Config.ShowMarker and bankDistance <= Config.DrawMarker then + markerPoints[#markerPoints+1] = Config.Banks[i].Position.xyz + end + end + end + + if next(bankPoints) and not uiActive then + self:TextUi(true) + end + + if next(atmPoints) and not uiActive then + self:TextUi(true, true) + end + + if not next(bankPoints) and not next(atmPoints) and uiActive then + self:TextUi(false) + end + + Wait(1000) + end + end) + + if not Config.ShowMarker then return end + + CreateThread(function() + local wait = 1000 + while playerLoaded do + if next(markerPoints) then + for i = 1, #markerPoints do + DrawMarker(20, markerPoints[i].x, markerPoints[i].y, markerPoints[i].z, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.3, 0.2, 0.2, 187, 255, 0, 255, false, true, 2, false, nil, nil, false) + end + wait = 0 + end + Wait(wait) + end + end) + end + + -- Handle text ui / Keypress + function BANK:TextUi(state, atm) + uiActive = state + if state then + ESX.TextUI(TranslateCap('press_e_banking')) + CreateThread(function() + while uiActive do + if IsControlJustReleased(0, 38) then + self:HandleUi(true, atm) + self:TextUi(false) + end + Wait(0) + end + end) + else + ESX.HideUI() + end + end + + -- Create Blips + function BANK:CreateBlips() + local tmpActiveBlips = {} + for i = 1, #Config.Banks do + if type(Config.Banks[i].Blip) == 'table' and Config.Banks[i].Blip.Enabled then + local position = Config.Banks[i].Position + local bInfo = Config.Banks[i].Blip + local blip = AddBlipForCoord(position.x, position.y, position.z) + SetBlipSprite(blip, bInfo.Sprite) + SetBlipScale(blip, bInfo.Scale) + SetBlipColour(blip, bInfo.Color) + SetBlipAsShortRange(blip, true) + BeginTextCommandSetBlipName('STRING') + AddTextComponentSubstringPlayerName(bInfo.Label) + EndTextCommandSetBlipName(blip) + tmpActiveBlips[#tmpActiveBlips + 1] = blip + end + end + + activeBlips = tmpActiveBlips + end + + -- Remove blips + function BANK:RemoveBlips() + for i = 1, #activeBlips do + if DoesBlipExist(activeBlips[i]) then + RemoveBlip(activeBlips[i]) + end + end + activeBlips = {} + end + + -- Open / Close ui + function BANK:HandleUi(state, atm) + atm = atm or false + SetNuiFocus(state, state) + inMenu = state + if state then + ESX.TriggerServerCallback('esx_banking:getPlayerData', function(data) + SendNUIMessage({ + showMenu = true, + openATM = atm, + datas = { + your_money_panel = { + accountsData = {{ + name = "cash", + amount = data.money + }, { + name = "bank", + amount = data.bankMoney + }} + }, + bankCardData = { + bankName = TranslateCap('bank_name'), + cardNumber = "2232 2222 2222 2222", + createdDate = "08/08", + name = data.playerName + }, + transactionsData = data.transactionHistory + } + }) + end) + else + SendNUIMessage({ + showMenu = false + }) + end + end + + function BANK:LoadNpc(index, netID) + CreateThread(function() + while not NetworkDoesEntityExistWithNetworkId(netID) do + Wait(200) + end + local npc = NetworkGetEntityFromNetworkId(netID) + TaskStartScenarioInPlace(npc, Config.Peds[index].Scenario, 0, true) + SetEntityProofs(npc, true, true, true, true, true, true, true, true) + SetBlockingOfNonTemporaryEvents(npc, true) + FreezeEntityPosition(npc, true) + SetPedCanRagdollFromPlayerImpact(npc, false) + SetPedCanRagdoll(npc, false) + SetEntityAsMissionEntity(npc, true, true) + SetEntityDynamic(npc, false) + end) + end + +-- Events +RegisterNetEvent('esx_banking:closebanking', function() + BANK:HandleUi(false) +end) + +RegisterNetEvent('esx_banking:pedHandler', function(netIdTable) + for i = 1, #netIdTable do + BANK:LoadNpc(i, netIdTable[i]) + end +end) + +RegisterNetEvent('esx_banking:updateMoneyInUI', function(doingType, bankMoney, money) + SendNUIMessage({ + updateData = true, + data = { + type = doingType, + bankMoney = bankMoney, + money = money + } + }) +end) + +-- Handlers + -- Resource starting + AddEventHandler('onResourceStart', function(resource) + if resource ~= GetCurrentResourceName() then return end + BANK:Thread() + end) + + -- Enable the script on player loaded + RegisterNetEvent('esx:playerLoaded', function() + BANK:Thread() + end) + + -- Disable the script on player logout + RegisterNetEvent('esx:onPlayerLogout', function() + playerLoaded = false + end) + + -- Resource stopping + AddEventHandler('onResourceStop', function(resource) + if resource ~= GetCurrentResourceName() then return end + BANK:RemoveBlips() + if uiActive then BANK:TextUi(false) end + end) + +-- Nui Callbacks +RegisterNUICallback('close', function(data, cb) + BANK:HandleUi(false) + cb('ok') +end) + +RegisterNUICallback('clickButton', function(data, cb) + if data ~= nil and inMenu then + TriggerServerEvent("esx_banking:doingType", data) + end + cb('ok') +end) + +RegisterNUICallback('checkPincode', function(data, cb) + if data ~= nil and inMenu then + ESX.TriggerServerCallback("esx_banking:checkPincode", function(pincode) + if pincode then + cb({ + success = true + }) + ESX.ShowNotification(TranslateCap('pincode_found'), "success") + + else + cb({ + error = true + }) + ESX.ShowNotification(TranslateCap('pincode_not_found'), "error") + end + end, data) + end +end) \ No newline at end of file diff --git a/[esx_addons]/esx_banking/config.lua b/[esx_addons]/esx_banking/config.lua index 045d0276..a30d5eed 100644 --- a/[esx_addons]/esx_banking/config.lua +++ b/[esx_addons]/esx_banking/config.lua @@ -1,6 +1,6 @@ Config = { - Debug = false, DrawMarker = 10, + ShowMarker = true, Locale = GetConvar('esx:locale', 'en'), EnablePeds = true, AtmModels = {`prop_fleeca_atm`, `prop_atm_01`, `prop_atm_02`, `prop_atm_03`}, diff --git a/[esx_addons]/esx_banking/server/main.lua b/[esx_addons]/esx_banking/server/main.lua index e61f7ee4..8afc5372 100644 --- a/[esx_addons]/esx_banking/server/main.lua +++ b/[esx_addons]/esx_banking/server/main.lua @@ -24,7 +24,7 @@ end) if Config.EnablePeds then AddEventHandler('esx:playerLoaded', function(playerId) - TriggerClientEvent('esx_banking:PedHandler', playerId, netIdTable) + TriggerClientEvent('esx_banking:pedHandler', playerId, netIdTable) end) end From 2e8871cc9577e43bf41854d3196c6295974692a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=20Gerg=C5=91?= Date: Sat, 14 Jan 2023 22:48:06 +0100 Subject: [PATCH 50/58] or 10 --- [esx_addons]/esx_banking/client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx_addons]/esx_banking/client/main.lua b/[esx_addons]/esx_banking/client/main.lua index 12deb3c2..d56006f7 100644 --- a/[esx_addons]/esx_banking/client/main.lua +++ b/[esx_addons]/esx_banking/client/main.lua @@ -33,7 +33,7 @@ local playerLoaded, uiActive, inMenu = false, false, false if bankDistance <= 0.7 then bankPoints[#bankPoints+1] = Config.Banks[i].Position.xyz end - if Config.ShowMarker and bankDistance <= Config.DrawMarker then + if Config.ShowMarker and bankDistance <= Config.DrawMarker or 10 then markerPoints[#markerPoints+1] = Config.Banks[i].Position.xyz end end From 8258d3fb6eeb48aa35491a409d2cab13a3bd361f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=20Gerg=C5=91?= Date: Sat, 14 Jan 2023 22:48:06 +0100 Subject: [PATCH 51/58] or 10 fix: distance condition --- [esx_addons]/esx_banking/client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx_addons]/esx_banking/client/main.lua b/[esx_addons]/esx_banking/client/main.lua index 12deb3c2..050b615e 100644 --- a/[esx_addons]/esx_banking/client/main.lua +++ b/[esx_addons]/esx_banking/client/main.lua @@ -33,7 +33,7 @@ local playerLoaded, uiActive, inMenu = false, false, false if bankDistance <= 0.7 then bankPoints[#bankPoints+1] = Config.Banks[i].Position.xyz end - if Config.ShowMarker and bankDistance <= Config.DrawMarker then + if Config.ShowMarker and bankDistance <= (Config.DrawMarker or 10) then markerPoints[#markerPoints+1] = Config.Banks[i].Position.xyz end end From 472f33bcaf85eb93ca5ab4da9b5b28e7576ed659 Mon Sep 17 00:00:00 2001 From: Csoki Date: Mon, 16 Jan 2023 13:21:31 +0100 Subject: [PATCH 52/58] refactor(esx_banking/client): refactor some if conditions --- [esx_addons]/esx_banking/client/main.lua | 115 ++++++++++++----------- 1 file changed, 59 insertions(+), 56 deletions(-) diff --git a/[esx_addons]/esx_banking/client/main.lua b/[esx_addons]/esx_banking/client/main.lua index 050b615e..2b0654b0 100644 --- a/[esx_addons]/esx_banking/client/main.lua +++ b/[esx_addons]/esx_banking/client/main.lua @@ -74,20 +74,19 @@ local playerLoaded, uiActive, inMenu = false, false, false -- Handle text ui / Keypress function BANK:TextUi(state, atm) uiActive = state - if state then - ESX.TextUI(TranslateCap('press_e_banking')) - CreateThread(function() - while uiActive do - if IsControlJustReleased(0, 38) then - self:HandleUi(true, atm) - self:TextUi(false) - end - Wait(0) - end - end) - else - ESX.HideUI() + if not state then + return ESX.HideUI() end + ESX.TextUI(TranslateCap('press_e_banking')) + CreateThread(function() + while uiActive do + if IsControlJustReleased(0, 38) then + self:HandleUi(true, atm) + self:TextUi(false) + end + Wait(0) + end + end) end -- Create Blips @@ -127,36 +126,36 @@ local playerLoaded, uiActive, inMenu = false, false, false atm = atm or false SetNuiFocus(state, state) inMenu = state - if state then - ESX.TriggerServerCallback('esx_banking:getPlayerData', function(data) - SendNUIMessage({ - showMenu = true, - openATM = atm, - datas = { - your_money_panel = { - accountsData = {{ - name = "cash", - amount = data.money - }, { - name = "bank", - amount = data.bankMoney - }} - }, - bankCardData = { - bankName = TranslateCap('bank_name'), - cardNumber = "2232 2222 2222 2222", - createdDate = "08/08", - name = data.playerName - }, - transactionsData = data.transactionHistory - } - }) - end) - else + if not state then SendNUIMessage({ showMenu = false }) + return end + ESX.TriggerServerCallback('esx_banking:getPlayerData', function(data) + SendNUIMessage({ + showMenu = true, + openATM = atm, + datas = { + your_money_panel = { + accountsData = {{ + name = "cash", + amount = data.money + }, { + name = "bank", + amount = data.bankMoney + }} + }, + bankCardData = { + bankName = TranslateCap('bank_name'), + cardNumber = "2232 2222 2222 2222", + createdDate = "08/08", + name = data.playerName + }, + transactionsData = data.transactionHistory + } + }) + end) end function BANK:LoadNpc(index, netID) @@ -229,27 +228,31 @@ RegisterNUICallback('close', function(data, cb) end) RegisterNUICallback('clickButton', function(data, cb) - if data ~= nil and inMenu then - TriggerServerEvent("esx_banking:doingType", data) + if not data or not inMenu then + return cb('ok') end + + TriggerServerEvent("esx_banking:doingType", data) cb('ok') end) RegisterNUICallback('checkPincode', function(data, cb) - if data ~= nil and inMenu then - ESX.TriggerServerCallback("esx_banking:checkPincode", function(pincode) - if pincode then - cb({ - success = true - }) - ESX.ShowNotification(TranslateCap('pincode_found'), "success") - - else - cb({ - error = true - }) - ESX.ShowNotification(TranslateCap('pincode_not_found'), "error") - end - end, data) + if not data or not inMenu then + return cb('ok') end + + ESX.TriggerServerCallback("esx_banking:checkPincode", function(pincode) + if pincode then + cb({ + success = true + }) + ESX.ShowNotification(TranslateCap('pincode_found'), "success") + + else + cb({ + error = true + }) + ESX.ShowNotification(TranslateCap('pincode_not_found'), "error") + end + end, data) end) \ No newline at end of file From 618eafc9a1d4f7629449eebe73ad736c41c6c44d Mon Sep 17 00:00:00 2001 From: Csoki Date: Mon, 16 Jan 2023 13:26:22 +0100 Subject: [PATCH 53/58] Update README.md -remove: ox target support -format --- [esx_addons]/esx_banking/README.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/[esx_addons]/esx_banking/README.md b/[esx_addons]/esx_banking/README.md index 2966a97a..46061ac0 100644 --- a/[esx_addons]/esx_banking/README.md +++ b/[esx_addons]/esx_banking/README.md @@ -1,15 +1,16 @@

    [ESX] Banking

    Discord - Website - Documentation -A beautiful and Easy-To-Use Banking & ATM system for ESX, with optional OX Target Support - +A beautiful and Easy-To-Use Banking & ATM system for ESX ## BANK UI + ![esx_banking_pic1](https://user-images.githubusercontent.com/22717950/189738189-375101ac-c86b-4ce8-8df3-19d740c3809c.png) + ## ATM UI + ![esx_banking_pic2](https://user-images.githubusercontent.com/22717950/189738199-a325092b-5f1d-4c7f-8950-d660d053ed0f.png) ![esx_banking_pic3](https://user-images.githubusercontent.com/22717950/189738210-7af2c7d5-7fa1-4f70-8460-743ee9258f88.png) - ## Special thanks: Gellipapa#9186,Rav3n95#2849,Csoki, csontvazharcos, Füsti, Pécé ## Download & Installation @@ -18,6 +19,7 @@ A beautiful and Easy-To-Use Banking & ATM system for ESX, with optional OX Targe - Put it in the `[esx-addons]` directory ## Installation + - Add this to your `server.cfg`: ``` @@ -25,11 +27,13 @@ ensure esx_banking ``` # Database + ``` Run the banking.sql into your database. Done. ``` # If you want to create a bank log in another script, you can do it this way! Only server side! + ``` exports["esx_banking"]:logTransaction(source,logType,amount) @@ -41,7 +45,9 @@ For example: exports["esx_banking"]:logTransaction(source,"WITHDRAW",200) ``` # Legal + ### License + esx_banking - banking script for ESX Copyright (C) 2023 ESX-Framework From b7e5351fcb847ea96aa1eacd0e7ddb7c0be0d1d9 Mon Sep 17 00:00:00 2001 From: Csoki Date: Mon, 16 Jan 2023 13:38:55 +0100 Subject: [PATCH 54/58] fix(esx_banking/client): cant open if player death add 'esx:onPlayerDeath' event --- [esx_addons]/esx_banking/client/main.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/[esx_addons]/esx_banking/client/main.lua b/[esx_addons]/esx_banking/client/main.lua index 2b0654b0..a4cddb14 100644 --- a/[esx_addons]/esx_banking/client/main.lua +++ b/[esx_addons]/esx_banking/client/main.lua @@ -20,7 +20,7 @@ local playerLoaded, uiActive, inMenu = false, false, false data.ped = PlayerPedId() bankPoints, atmPoints, markerPoints = {}, {}, {} - if IsPedOnFoot(data.ped) and not inMenu then + if (IsPedOnFoot(data.ped) and not ESX.PlayerData.dead) and not inMenu then for i = 1, #Config.AtmModels do local atm = GetClosestObjectOfType(data.coord.x, data.coord.y, data.coord.z, 0.7, Config.AtmModels[i], false, false, false) if atm ~= 0 then @@ -221,6 +221,8 @@ end) if uiActive then BANK:TextUi(false) end end) + RegisterNetEvent('esx:onPlayerDeath', function() BANK:TextUi(false) end) + -- Nui Callbacks RegisterNUICallback('close', function(data, cb) BANK:HandleUi(false) From 3b7e4281dc546661038d2c7c08fee676ca341bf3 Mon Sep 17 00:00:00 2001 From: PoPo <76515395+PoPoGH@users.noreply.github.com> Date: Tue, 17 Jan 2023 15:09:10 +0100 Subject: [PATCH 55/58] Create fr.lua --- [esx_addons]/esx_banking/locales/fr.lua | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 [esx_addons]/esx_banking/locales/fr.lua diff --git a/[esx_addons]/esx_banking/locales/fr.lua b/[esx_addons]/esx_banking/locales/fr.lua new file mode 100644 index 00000000..75631159 --- /dev/null +++ b/[esx_addons]/esx_banking/locales/fr.lua @@ -0,0 +1,16 @@ +Locales['fr'] = { + ['invalid_amount'] = "La somme d'argent est invalide.", + ['deposit_money'] = 'Tu as déposé $%s', + ['withdraw_money'] = 'Tu as retiré $%s', + ['pincode_money'] = 'Tu as défini un nouveau code PIN : %s', + ['transfer_money'] = 'Tu as transféré $%s à ID: %s', + ['receive_transfer'] = 'Tu as reçu $%s de ID: %s', + ['press_e_banking'] = 'Appuie sur [E] pour accéder a la banque.', + ['access_bank'] = 'Accéder à la banque', + ['banking_blip'] = 'Banque', + ['cant_do_it'] = "Tu ne peux pas faire ça!", + ['not_enough_money'] = "Tu n'as pas assez d'argent ! Tu as besoin de %s!", + ['pincode_not_found'] = "Code PIN invalide", + ['pincode_found'] = "Code PIN valide...", + ['bank_name'] = "Banque Fleeca" + } \ No newline at end of file From 811636cb58885a4158106515acc9022c69b477c2 Mon Sep 17 00:00:00 2001 From: PoPo <76515395+PoPoGH@users.noreply.github.com> Date: Tue, 17 Jan 2023 19:35:14 +0100 Subject: [PATCH 56/58] Add French Language --- [esx_addons]/esx_banking/html/config.json | 107 +++++++++++++++++++++- 1 file changed, 102 insertions(+), 5 deletions(-) diff --git a/[esx_addons]/esx_banking/html/config.json b/[esx_addons]/esx_banking/html/config.json index 565c4c9b..866aae4f 100644 --- a/[esx_addons]/esx_banking/html/config.json +++ b/[esx_addons]/esx_banking/html/config.json @@ -93,7 +93,7 @@ "amountLabel":"Amount", "timeLabel":"Time", "searchInputPlaceholder":"Search ...", - "_comment": "tableFullLanguage options: English,Hungarian you can find here all lang: https://cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/", + "_comment": "tableFullLanguage options: English, Hungarian, Italian, Spanish, French, you can find here all lang: https://cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/", "tableFullLanguage":"English" } } @@ -191,7 +191,7 @@ "amountLabel":"Összeg", "timeLabel":"Idő", "searchInputPlaceholder":"Kereső ...", - "_comment": "tableFullLanguage options: English,Hungarian you can find here all lang: https://cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/", + "_comment": "tableFullLanguage options: English, Hungarian, Italian, Spanish, French, you can find here all lang: https://cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/", "tableFullLanguage":"Hungarian" } } @@ -288,7 +288,7 @@ "amountLabel":"quantità", "timeLabel":"tempo", "searchInputPlaceholder":"Cerca ...", - "_comment": "tabella Opzioni complete della lingua: inglese, ungherese, italiana puoi trovare qui tutte le lingue: https://cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/", + "_comment": "tabella Opzioni complete della lingua: inglese, ungherese, italiana, spagnolo, francese, puoi trovare qui tutte le lingue: https://cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/", "tableFullLanguage":"Italian" } } @@ -385,9 +385,106 @@ "amountLabel":"Importe", "timeLabel":"Tiempo", "searchInputPlaceholder":"Buscar...", - "_comment": "tableFullLanguage options: English,Hungarian you can find here all lang: https://cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/", + "_comment": "tableFullLanguage options: English, Hungarian, Italiano, Spanish, French, you can find here all lang: https://cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/", "tableFullLanguage":"Spanish" } } + }, + "FR":{ + "DYNAMIC_FORM_DATA":[ + { + "componentName":"moreGraph", + "elementID":"#wrapper", + "title":"", + "closeButtonText":"Fermer", + "bankTitle":"Banque Fleeca", + "mainExitButtonText": "Déconnexion" + }, + { + "elementID":"#cpincode", + "name":"cpincode", + "buttonText":"Applique", + "inputPlaceholder": "Entrez 4 chiffres...", + "title":"CONFIGURATION DU PIN", + "description": "Ici vous pouvez définir ou changer votre code PIN.", + "type":"password" + }, + { + "elementID":"#withdraw", + "name":"withdraw", + "buttonText":"Approuver", + "inputPlaceholder": "Montant", + "title":"RETIRER", + "description": "Ici vous pouvez retirer votre argent de la banque.", + "type":"number" + }, + { + "elementID":"#deposit", + "name":"deposit", + "buttonText":"Approbation", + "inputPlaceholder": "Montant", + "title":"DEPOSIT", + "description": "Ici, vous pouvez déposer votre argent à la banque.", + "type":"number" + }, + { + "elementID":"#transfer", + "name":"transfer", + "buttonText":"Transfert", + "inputPlaceholder": "Montant", + "inputPlaceholder2": "ID du joueur", + "title":"TRANSFERT", + "description": "Ici, vous pouvez transférer votre argent à quelqu'un d'autre." + }, + { + "componentName":"trans", + "elementID":"#third-column", + "title":"HISTORIQUE DES TRANSACTIONS", + "description": "Ici, vous pouvez voir votre historique de transactions.", + "moreHistoryText": "Afficher plus d'historique", + "moreGraphText": "Afficher plus de graphique" + }, + { + "componentName":"pincodePanel", + "elementID":"#wrapper", + "title":"Entrer le code PIN", + "deleteButtonText": "", + "loginButtonText": "", + "closeButtonText": "Fermer" + }, + { + "componentName":"atmComponent", + "elementID":"#wrapper", + "title":"Banque Fleeca", + "closeButtonText":"Se déconnecter" + } + ], + "LAUNGAGE": { + "your_money_title":"Solde", + "your_money_desc":"Ici, vous pouvez voir votre solde actuel et votre argent en espèces.", + "your_money_cash_label":"Votre argent en espèces", + "your_money_bank_label":"Votre solde bancaire", + "withdraw":"RETIRER", + "deposit":"DÉPOSER", + "transfer":"TRANSFERT", + "transferReceive":"TRANSFERT REÇU", + "moneyFormat":"$__replaceData__", + "graphTitle":"Votre solde", + "moreGraphTitle": "Grand graphique", + "moreHistoryTitle":"Afficher plus d'historique", + "inputErrorTitle":"Les données sont incorrectes", + "inputErrorMessage":"Il ne peut pas être vide ou avoir une valeur inférieure à 1", + "showPincodeErrorTitle":"Code PIN incorrect", + "showPincodeErrorMessage":"Le code PIN doit avoir au moins 4 caractères!", + "tableLang":{ + "typeLabel": "Type de transaction", + "balanceLabel":"Solde", + "amountLabel":"Montant", + "timeLabel":"Temps", + "searchInputPlaceholder":"Rechercher ...", + "_comment": "Langue complète: Anglais, Hongrois, Italien, Espagnole Français, vous pouvez trouver ici toutes les langues: https://cdn.datatables.net/plug-ins/9dcbecd42ad/i18n/", + "tableFullLanguage":"French" + } + } } -} +} \ No newline at end of file From 06d17a6ddf2b2b12b3a5824b5d911ec6a9180156 Mon Sep 17 00:00:00 2001 From: PoPo <76515395+PoPoGH@users.noreply.github.com> Date: Wed, 18 Jan 2023 00:06:03 +0100 Subject: [PATCH 57/58] add french locale some improvements --- [esx_addons]/esx_banking/html/config.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/[esx_addons]/esx_banking/html/config.json b/[esx_addons]/esx_banking/html/config.json index 866aae4f..17f55416 100644 --- a/[esx_addons]/esx_banking/html/config.json +++ b/[esx_addons]/esx_banking/html/config.json @@ -403,7 +403,7 @@ { "elementID":"#cpincode", "name":"cpincode", - "buttonText":"Applique", + "buttonText":"Valider", "inputPlaceholder": "Entrez 4 chiffres...", "title":"CONFIGURATION DU PIN", "description": "Ici vous pouvez définir ou changer votre code PIN.", @@ -412,7 +412,7 @@ { "elementID":"#withdraw", "name":"withdraw", - "buttonText":"Approuver", + "buttonText":"Valider", "inputPlaceholder": "Montant", "title":"RETIRER", "description": "Ici vous pouvez retirer votre argent de la banque.", @@ -421,7 +421,7 @@ { "elementID":"#deposit", "name":"deposit", - "buttonText":"Approbation", + "buttonText":"Valider", "inputPlaceholder": "Montant", "title":"DEPOSIT", "description": "Ici, vous pouvez déposer votre argent à la banque.", @@ -430,7 +430,7 @@ { "elementID":"#transfer", "name":"transfer", - "buttonText":"Transfert", + "buttonText":"Transférer", "inputPlaceholder": "Montant", "inputPlaceholder2": "ID du joueur", "title":"TRANSFERT", @@ -471,7 +471,7 @@ "moneyFormat":"$__replaceData__", "graphTitle":"Votre solde", "moreGraphTitle": "Grand graphique", - "moreHistoryTitle":"Afficher plus d'historique", + "moreHistoryTitle":"Afficher plus", "inputErrorTitle":"Les données sont incorrectes", "inputErrorMessage":"Il ne peut pas être vide ou avoir une valeur inférieure à 1", "showPincodeErrorTitle":"Code PIN incorrect", From 935eb8f2d69915651c6d9b3cc572f4b7afc44113 Mon Sep 17 00:00:00 2001 From: PoPo <76515395+PoPoGH@users.noreply.github.com> Date: Wed, 18 Jan 2023 00:07:23 +0100 Subject: [PATCH 58/58] Update fr.lua --- [esx_addons]/esx_banking/locales/fr.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx_addons]/esx_banking/locales/fr.lua b/[esx_addons]/esx_banking/locales/fr.lua index 75631159..4e52384d 100644 --- a/[esx_addons]/esx_banking/locales/fr.lua +++ b/[esx_addons]/esx_banking/locales/fr.lua @@ -1,5 +1,5 @@ Locales['fr'] = { - ['invalid_amount'] = "La somme d'argent est invalide.", + ['invalid_amount'] = "Le montant est invalide.", ['deposit_money'] = 'Tu as déposé $%s', ['withdraw_money'] = 'Tu as retiré $%s', ['pincode_money'] = 'Tu as défini un nouveau code PIN : %s',