From 1393a3cbaf16c6b16a9316f62dfdc0b8b6601ab1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 15 Aug 2017 10:22:35 +0200 Subject: [PATCH 01/32] Initial commit --- README.md | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..540ccb46 --- /dev/null +++ b/README.md @@ -0,0 +1,2 @@ +# fxserver-esx_barbershop +FXServer ESX Barber Shop From bfb490e76cfbdf3d4c92104a04abd0225b0a2505 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 15 Aug 2017 10:24:11 +0200 Subject: [PATCH 02/32] Update README.md --- README.md | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/README.md b/README.md index 540ccb46..886ee230 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,19 @@ # fxserver-esx_barbershop FXServer ESX Barber Shop + +[REQUIREMENTS] + +- esx_skin => https://github.com/FXServer-ESX/fxserver-esx_skin + +[INSTALLATION] + +1) CD in your resources/[esx] folder +2) Clone the repository +``` +git clone https://github.com/FXServer-ESX/fxserver-esx_barbershop esx_barbershop +``` +3) Add this in your server.cfg : + +``` +start esx_barbershop +``` From 5caa2bfa934c857410dd8ae913f79e65580c7d39 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 15 Aug 2017 10:24:52 +0200 Subject: [PATCH 03/32] Add files --- __resource.lua | 14 +++ client/main.lua | 239 ++++++++++++++++++++++++++++++++++++++++++++++++ config.lua | 31 +++++++ server/main.lua | 26 ++++++ 4 files changed, 310 insertions(+) create mode 100644 __resource.lua create mode 100644 client/main.lua create mode 100644 config.lua create mode 100644 server/main.lua diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..e16934cb --- /dev/null +++ b/__resource.lua @@ -0,0 +1,14 @@ +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX BarberShop' + +server_scripts { + '@mysql-async/lib/MySQL.lua', + 'config.lua', + 'server/main.lua' +} + +client_scripts { + 'config.lua', + 'client/main.lua' +} diff --git a/client/main.lua b/client/main.lua new file mode 100644 index 00000000..150032c8 --- /dev/null +++ b/client/main.lua @@ -0,0 +1,239 @@ +local Keys = { + ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, + ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, + ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, + ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, + ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, + ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, + ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, + ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, + ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 +} + +ESX = nil +local GUI = {} +GUI.Time = 0 +local HasAlreadyEnteredMarker = false +local LastZone = nil +local CurrentAction = nil +local CurrentActionMsg = '' +local CurrentActionData = {} + +Citizen.CreateThread(function() + + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end + +end) + +function OpenShopMenu() + + TriggerEvent('esx_skin:openRestrictedMenu', function(data, menu) + + menu.close() + + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), 'shop_confirm', + { + title = 'Valider cet achat ?', + align = 'top-left', + elements = { + {label = 'Oui', value = 'yes'}, + {label = 'Non', value = 'no'}, + } + }, + function(data, menu) + + menu.close() + + if data.current.value == 'yes' then + + ESX.TriggerServerCallback('esx_barbershop:checkMoney', function(hasEnoughMoney) + + if hasEnoughMoney then + + TriggerEvent('skinchanger:getSkin', function(skin) + TriggerServerEvent('esx_skin:save', skin) + end) + + TriggerServerEvent('esx_barbershop:pay') + else + + TriggerEvent('esx_skin:getLastSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + + ESX.ShowNotification('Vous n\'avez pas assez d\'argent') + + end + + end) + + end + + if data.current.value == 'no' then + + TriggerEvent('esx_skin:getLastSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + + end + + CurrentAction = 'shop_menu' + CurrentActionMsg = 'Appuez sur ~INPUT_CONTEXT~ pour accéder au menu' + CurrentActionData = {} + + end, + function(data, menu) + + menu.close() + + CurrentAction = 'shop_menu' + CurrentActionMsg = 'Appuez sur ~INPUT_CONTEXT~ pour accéder au menu' + CurrentActionData = {} + + end + ) + + end, function(data, menu) + + menu.close() + + CurrentAction = 'shop_menu' + CurrentActionMsg = 'Appuez sur ~INPUT_CONTEXT~ pour accéder au menu' + CurrentActionData = {} + + end, { + 'beard_1', + 'beard_2', + 'beard_3', + 'beard_4', + 'hair_1', + 'hair_2', + 'hair_color_1', + 'hair_color_2', + 'eyebrows_1', + 'eyebrows_2', + 'eyebrows_3', + 'eyebrows_4', + 'makeup_1', + 'makeup_2', + 'makeup_3', + 'makeup_4', + 'lipstick_1', + 'lipstick_2', + 'lipstick_3', + 'lipstick_4', + 'ears_1', + 'ears_2', + }) + +end + +AddEventHandler('esx_barbershop:hasEnteredMarker', function(zone) + CurrentAction = 'shop_menu' + CurrentActionMsg = 'Appuez sur ~INPUT_CONTEXT~ pour accéder au menu' + CurrentActionData = {} +end) + +AddEventHandler('esx_barbershop:hasExitedMarker', function(zone) + CurrentAction = nil +end) + +-- Create Blips +Citizen.CreateThread(function() + + for i=1, #Config.Shops, 1 do + + local blip = AddBlipForCoord(Config.Shops[i].x, Config.Shops[i].y, Config.Shops[i].z) + + SetBlipSprite (blip, 71) + SetBlipDisplay(blip, 4) + SetBlipScale (blip, 1.0) + SetBlipColour (blip, 51) + SetBlipAsShortRange(blip, true) + + BeginTextCommandSetBlipName("STRING") + AddTextComponentString("Coiffeur / Barbier") + EndTextCommandSetBlipName(blip) + end + +end) + +-- Display markers +Citizen.CreateThread(function() + while true do + + Wait(0) + + local coords = GetEntityCoords(GetPlayerPed(-1)) + + for k,v in pairs(Config.Zones) do + if(v.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < Config.DrawDistance) then + DrawMarker(v.Type, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, v.Color.r, v.Color.g, v.Color.b, 100, false, true, 2, false, false, false, false) + end + end + + end +end) + +-- Enter / Exit marker events +Citizen.CreateThread(function() + while true do + + Wait(0) + + local coords = GetEntityCoords(GetPlayerPed(-1)) + local isInMarker = false + local currentZone = nil + + for k,v in pairs(Config.Zones) do + if(GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x) then + isInMarker = true + currentZone = k + end + end + + if (isInMarker and not HasAlreadyEnteredMarker) or (isInMarker and LastZone ~= currentZone) then + HasAlreadyEnteredMarker = true + LastZone = currentZone + TriggerEvent('esx_barbershop:hasEnteredMarker', currentZone) + end + + if not isInMarker and HasAlreadyEnteredMarker then + HasAlreadyEnteredMarker = false + TriggerEvent('esx_barbershop:hasExitedMarker', LastZone) + end + + end +end) + +-- Key controls +Citizen.CreateThread(function() + while true do + + Citizen.Wait(0) + + if CurrentAction ~= nil then + + SetTextComponentFormat('STRING') + AddTextComponentString(CurrentActionMsg) + DisplayHelpTextFromStringLabel(0, 0, 1, -1) + + if IsControlPressed(0, Keys['E']) and (GetGameTimer() - GUI.Time) > 300 then + + if CurrentAction == 'shop_menu' then + OpenShopMenu() + end + + CurrentAction = nil + GUI.Time = GetGameTimer() + + end + + end + + end +end) \ No newline at end of file diff --git a/config.lua b/config.lua new file mode 100644 index 00000000..290e2aec --- /dev/null +++ b/config.lua @@ -0,0 +1,31 @@ +Config = {} + +Config.Price = 100 + +Config.DrawDistance = 100.0 +Config.MarkerSize = {x = 1.5, y = 1.5, z = 1.0} +Config.MarkerColor = {r = 102, g = 102, b = 204} +Config.MarkerType = 1 + +Config.Zones = {} + +Config.Shops = { + {x = -814.308, y = -183.823, z = 36.568}, + {x = 136.826, y = -1708.373, z = 28.291}, + {x = -1282.604, y = -1116.757, z = 5.990}, + {x = 1931.513, y = 3729.671, z = 31.844}, + {x = 1212.840, y = -472.921, z = 62.208}, + {x = -32.885, y = -152.319, z = 56.076}, + {x = -278.077, y = 6228.463, z = 30.695}, +} + +for i=1, #Config.Shops, 1 do + + Config.Zones['Shop_' .. i] = { + Pos = Config.Shops[i], + Size = Config.MarkerSize, + Color = Config.MarkerColor, + Type = Config.MarkerType + } + +end \ No newline at end of file diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 00000000..ea58941f --- /dev/null +++ b/server/main.lua @@ -0,0 +1,26 @@ +ESX = nil + +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + +RegisterServerEvent('esx_barbershop:pay') +AddEventHandler('esx_barbershop:pay', function() + + local xPlayer = ESX.GetPlayerFromId(source) + + xPlayer.removeMoney(Config.Price) + + TriggerClientEvent('esx:showNotification', source, 'Vous avez payé $' .. Config.Price) + +end) + +ESX.RegisterServerCallback('esx_barbershop:checkMoney', function(source, cb) + + local xPlayer = ESX.GetPlayerFromId(source) + + if xPlayer.get('money') >= Config.Price then + cb(true) + else + cb(false) + end + +end) From 79eae03965e7b3be44103d7a9b81972db3e87a1b Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Tue, 15 Aug 2017 14:53:40 -0400 Subject: [PATCH 04/32] Multi-language support --- __resource.lua | 6 ++++++ client/main.lua | 18 +++++++++--------- config.lua | 1 + locales/en.lua | 10 ++++++++++ locales/fr.lua | 10 ++++++++++ server/main.lua | 2 +- 6 files changed, 37 insertions(+), 10 deletions(-) create mode 100644 locales/en.lua create mode 100644 locales/fr.lua diff --git a/__resource.lua b/__resource.lua index e16934cb..a04ea924 100644 --- a/__resource.lua +++ b/__resource.lua @@ -3,12 +3,18 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX BarberShop' server_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', '@mysql-async/lib/MySQL.lua', 'config.lua', 'server/main.lua' } client_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', 'config.lua', 'client/main.lua' } diff --git a/client/main.lua b/client/main.lua index 150032c8..6fbf62b9 100644 --- a/client/main.lua +++ b/client/main.lua @@ -37,11 +37,11 @@ function OpenShopMenu() ESX.UI.Menu.Open( 'default', GetCurrentResourceName(), 'shop_confirm', { - title = 'Valider cet achat ?', + title = _U('valid_purchase'), align = 'top-left', elements = { - {label = 'Oui', value = 'yes'}, - {label = 'Non', value = 'no'}, + {label = _U('yes'), value = 'yes'}, + {label = _U('no'), value = 'no'}, } }, function(data, menu) @@ -65,7 +65,7 @@ function OpenShopMenu() TriggerEvent('skinchanger:loadSkin', skin) end) - ESX.ShowNotification('Vous n\'avez pas assez d\'argent') + ESX.ShowNotification(_U('not_enough_money')) end @@ -82,7 +82,7 @@ function OpenShopMenu() end CurrentAction = 'shop_menu' - CurrentActionMsg = 'Appuez sur ~INPUT_CONTEXT~ pour accéder au menu' + CurrentActionMsg = _U('press_access') CurrentActionData = {} end, @@ -91,7 +91,7 @@ function OpenShopMenu() menu.close() CurrentAction = 'shop_menu' - CurrentActionMsg = 'Appuez sur ~INPUT_CONTEXT~ pour accéder au menu' + CurrentActionMsg = _U('press_access') CurrentActionData = {} end @@ -102,7 +102,7 @@ function OpenShopMenu() menu.close() CurrentAction = 'shop_menu' - CurrentActionMsg = 'Appuez sur ~INPUT_CONTEXT~ pour accéder au menu' + CurrentActionMsg = _U('press_access') CurrentActionData = {} end, { @@ -134,7 +134,7 @@ end AddEventHandler('esx_barbershop:hasEnteredMarker', function(zone) CurrentAction = 'shop_menu' - CurrentActionMsg = 'Appuez sur ~INPUT_CONTEXT~ pour accéder au menu' + CurrentActionMsg = _U('press_access') CurrentActionData = {} end) @@ -156,7 +156,7 @@ Citizen.CreateThread(function() SetBlipAsShortRange(blip, true) BeginTextCommandSetBlipName("STRING") - AddTextComponentString("Coiffeur / Barbier") + AddTextComponentString(_U('barber_blip')) EndTextCommandSetBlipName(blip) end diff --git a/config.lua b/config.lua index 290e2aec..07171ad3 100644 --- a/config.lua +++ b/config.lua @@ -6,6 +6,7 @@ Config.DrawDistance = 100.0 Config.MarkerSize = {x = 1.5, y = 1.5, z = 1.0} Config.MarkerColor = {r = 102, g = 102, b = 204} Config.MarkerType = 1 +Config.Locale = 'fr' Config.Zones = {} diff --git a/locales/en.lua b/locales/en.lua new file mode 100644 index 00000000..c961e3df --- /dev/null +++ b/locales/en.lua @@ -0,0 +1,10 @@ +Locales['en'] = { + + ['valid_purchase'] = 'validate this purchase?', + ['yes'] = 'yes', + ['no'] = 'no', + ['not_enough_money'] = 'you do not have enough money', + ['press_access'] = 'press ~INPUT_CONTENT~ to access the menu', + ['barber_blip'] = 'barber shop', + ['you_paid'] = 'you paid ', +} \ No newline at end of file diff --git a/locales/fr.lua b/locales/fr.lua new file mode 100644 index 00000000..22b95b74 --- /dev/null +++ b/locales/fr.lua @@ -0,0 +1,10 @@ +Locales['fr'] = { + + ['valid_purchase'] = 'valider cet achat ?', + ['yes'] = 'oui', + ['no'] = 'non', + ['not_enough_money'] = 'vous n\'avez pas assez d\'argent', + ['press_access'] = 'appuez sur ~INPUT_CONTENT~ pour accéder au menu', + ['barber_blip'] = 'barbier', + ['you_paid'] = 'vous avez payé ', +} \ No newline at end of file diff --git a/server/main.lua b/server/main.lua index ea58941f..450983d5 100644 --- a/server/main.lua +++ b/server/main.lua @@ -9,7 +9,7 @@ AddEventHandler('esx_barbershop:pay', function() xPlayer.removeMoney(Config.Price) - TriggerClientEvent('esx:showNotification', source, 'Vous avez payé $' .. Config.Price) + TriggerClientEvent('esx:showNotification', source, _U('you_paid') .. '$' .. Config.Price) end) From dd53565a9938b0de6e4400fc6b4cdafb7fddb249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 22 Aug 2017 01:22:37 +0200 Subject: [PATCH 05/32] Fix typo --- locales/en.lua | 2 +- locales/fr.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/locales/en.lua b/locales/en.lua index c961e3df..6534c364 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -4,7 +4,7 @@ Locales['en'] = { ['yes'] = 'yes', ['no'] = 'no', ['not_enough_money'] = 'you do not have enough money', - ['press_access'] = 'press ~INPUT_CONTENT~ to access the menu', + ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu', ['barber_blip'] = 'barber shop', ['you_paid'] = 'you paid ', } \ No newline at end of file diff --git a/locales/fr.lua b/locales/fr.lua index 22b95b74..ac1683a6 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -4,7 +4,7 @@ Locales['fr'] = { ['yes'] = 'oui', ['no'] = 'non', ['not_enough_money'] = 'vous n\'avez pas assez d\'argent', - ['press_access'] = 'appuez sur ~INPUT_CONTENT~ pour accéder au menu', + ['press_access'] = 'appuez sur ~INPUT_CONTEXT~ pour accéder au menu', ['barber_blip'] = 'barbier', ['you_paid'] = 'vous avez payé ', } \ No newline at end of file From 4d4b6b61ac0b63f8c97a05b8e11f994357cbaf82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 22 Aug 2017 10:41:24 +0200 Subject: [PATCH 06/32] Clsoe menus when exit marker --- client/main.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/client/main.lua b/client/main.lua index 6fbf62b9..5ef3da02 100644 --- a/client/main.lua +++ b/client/main.lua @@ -139,6 +139,7 @@ AddEventHandler('esx_barbershop:hasEnteredMarker', function(zone) end) AddEventHandler('esx_barbershop:hasExitedMarker', function(zone) + ESX.UI.Menu.CloseAll() CurrentAction = nil end) From 1400ab66b1b42b99baa81f3ddb7b568672694ac1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Tue, 22 Aug 2017 10:52:32 +0200 Subject: [PATCH 07/32] Check if user has payed when exiting marker --- client/main.lua | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/client/main.lua b/client/main.lua index 5ef3da02..188840d1 100644 --- a/client/main.lua +++ b/client/main.lua @@ -18,6 +18,7 @@ local LastZone = nil local CurrentAction = nil local CurrentActionMsg = '' local CurrentActionData = {} +local HasPayed = false Citizen.CreateThread(function() @@ -30,6 +31,8 @@ end) function OpenShopMenu() + HasPayed = false + TriggerEvent('esx_skin:openRestrictedMenu', function(data, menu) menu.close() @@ -59,6 +62,8 @@ function OpenShopMenu() end) TriggerServerEvent('esx_barbershop:pay') + + HasPayed = true else TriggerEvent('esx_skin:getLastSkin', function(skin) @@ -139,8 +144,18 @@ AddEventHandler('esx_barbershop:hasEnteredMarker', function(zone) end) AddEventHandler('esx_barbershop:hasExitedMarker', function(zone) + ESX.UI.Menu.CloseAll() CurrentAction = nil + + if not HasPayed then + + TriggerEvent('esx_skin:getLastSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + + end + end) -- Create Blips From 017a2d8733d5ae09218bbc02ffdd88e72cae9f63 Mon Sep 17 00:00:00 2001 From: ultratm Date: Sat, 26 Aug 2017 12:50:44 +0200 Subject: [PATCH 08/32] Add German Language --- __resource.lua | 2 ++ locales/de.lua | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 locales/de.lua diff --git a/__resource.lua b/__resource.lua index a04ea924..32ac26c4 100644 --- a/__resource.lua +++ b/__resource.lua @@ -4,6 +4,7 @@ description 'ESX BarberShop' server_scripts { '@es_extended/locale.lua', + 'locales/de.lua', 'locales/en.lua', 'locales/fr.lua', '@mysql-async/lib/MySQL.lua', @@ -13,6 +14,7 @@ server_scripts { client_scripts { '@es_extended/locale.lua', + 'locales/de.lua', 'locales/en.lua', 'locales/fr.lua', 'config.lua', diff --git a/locales/de.lua b/locales/de.lua new file mode 100644 index 00000000..e5c26ff2 --- /dev/null +++ b/locales/de.lua @@ -0,0 +1,10 @@ +Locales['de'] = { + + ['valid_purchase'] = 'Einkauf bestätigen?', + ['yes'] = 'ja', + ['no'] = 'nein', + ['not_enough_money'] = 'du hast nicht genug Geld', + ['press_access'] = 'Drücke ~INPUT_CONTEXT~ um das Menü zu öffnen', + ['barber_blip'] = 'Friseur', + ['you_paid'] = 'du bezahlst ', +} \ No newline at end of file From e05a0fb6b5e0fbe32c2fe492ee8af51042c3dcef Mon Sep 17 00:00:00 2001 From: Wesley Moura <14825927+wesleymoura@users.noreply.github.com> Date: Sun, 27 Aug 2017 19:06:59 -0300 Subject: [PATCH 09/32] Add Brazilian Language --- __resource.lua | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/__resource.lua b/__resource.lua index 32ac26c4..281b21ec 100644 --- a/__resource.lua +++ b/__resource.lua @@ -3,20 +3,22 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX BarberShop' server_scripts { - '@es_extended/locale.lua', - 'locales/de.lua', + '@mysql-async/lib/MySQL.lua', + '@es_extended/locale.lua', + 'locales/br.lua', + 'locales/de.lua', 'locales/en.lua', 'locales/fr.lua', - '@mysql-async/lib/MySQL.lua', - 'config.lua', - 'server/main.lua' + 'config.lua', + 'server/main.lua' } client_scripts { '@es_extended/locale.lua', - 'locales/de.lua', + 'locales/br.lua', + 'locales/de.lua', 'locales/en.lua', 'locales/fr.lua', - 'config.lua', - 'client/main.lua' + 'config.lua', + 'client/main.lua' } From 93f49924b62127e7e9bab4f459028652ff27c28e Mon Sep 17 00:00:00 2001 From: Wesley Moura <14825927+wesleymoura@users.noreply.github.com> Date: Sun, 27 Aug 2017 19:07:59 -0300 Subject: [PATCH 10/32] Add Brazilian Language --- locales/br.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 locales/br.lua diff --git a/locales/br.lua b/locales/br.lua new file mode 100644 index 00000000..0cc4e13a --- /dev/null +++ b/locales/br.lua @@ -0,0 +1,10 @@ +Locales['br'] = { + + ['valid_purchase'] = 'validar esta compra?', + ['yes'] = 'sim', + ['no'] = 'não', + ['not_enough_money'] = 'você não tem dinheiro suficiente', + ['press_access'] = 'pressione ~INPUT_CONTEXT~ para acessar o menu', + ['barber_blip'] = 'Barbearia', + ['you_paid'] = 'você pagou ', +} \ No newline at end of file From 5ce1295fbd9cf1426a9b7c68bda140e6c3f7a361 Mon Sep 17 00:00:00 2001 From: Coro Veneno Date: Tue, 12 Sep 2017 22:12:52 +0200 Subject: [PATCH 11/32] Create es.lua added spanish language Multi-language --- locales/es.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 locales/es.lua diff --git a/locales/es.lua b/locales/es.lua new file mode 100644 index 00000000..0abd39b3 --- /dev/null +++ b/locales/es.lua @@ -0,0 +1,10 @@ +Locales['es'] = { + + ['valid_purchase'] = '¿validar esta compra?', + ['yes'] = 'Si', + ['no'] = 'No', + ['not_enough_money'] = 'No tienes suficente dinero', + ['press_access'] = 'Presiona ~INPUT_CONTEXT~ para acceder al menú', + ['barber_blip'] = 'Barbero', + ['you_paid'] = 'Has pagado ', +} From 6ed2f5a95864f644595cd421d56e6355779cad39 Mon Sep 17 00:00:00 2001 From: Coro Veneno Date: Tue, 12 Sep 2017 23:00:53 +0200 Subject: [PATCH 12/32] Update Spanish language Added Spanish language --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index 281b21ec..1d9f57be 100644 --- a/__resource.lua +++ b/__resource.lua @@ -9,6 +9,7 @@ server_scripts { 'locales/de.lua', 'locales/en.lua', 'locales/fr.lua', + 'locales/es.lua', 'config.lua', 'server/main.lua' } @@ -19,6 +20,7 @@ client_scripts { 'locales/de.lua', 'locales/en.lua', 'locales/fr.lua', + 'locales/es.lua', 'config.lua', 'client/main.lua' } From 4fe94ef0b1942a3528d4fee9aad262c6747c28b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Thu, 14 Sep 2017 23:16:48 +0200 Subject: [PATCH 13/32] Update LICENSE.txt --- LICENSE.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 674 insertions(+) create mode 100644 LICENSE.txt diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..35fcddf5 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,674 @@ + 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. + + fxserver-esx_barbershop + Copyright (C) 2015 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: + + fxserver-esx_barbershop Copyright (C) 2015 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 From 0337bf1ff5c93b554df560aaff9ef6f2d118ca18 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Fri, 15 Sep 2017 15:39:10 +0200 Subject: [PATCH 14/32] chore(resource): Add version --- __resource.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/__resource.lua b/__resource.lua index 1d9f57be..021497d6 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,6 +2,8 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX BarberShop' +version '1.0.0' + server_scripts { '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', From 814dc92dae47c8f1da5b5ce73ff5d61128efdc8c Mon Sep 17 00:00:00 2001 From: Romain Lanz Date: Sat, 7 Oct 2017 16:07:02 +0200 Subject: [PATCH 15/32] fix(marker): wrong cords --- config.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.lua b/config.lua index 07171ad3..e9f30d60 100644 --- a/config.lua +++ b/config.lua @@ -15,7 +15,7 @@ Config.Shops = { {x = 136.826, y = -1708.373, z = 28.291}, {x = -1282.604, y = -1116.757, z = 5.990}, {x = 1931.513, y = 3729.671, z = 31.844}, - {x = 1212.840, y = -472.921, z = 62.208}, + {x = 1212.840, y = -472.921, z = 65.208}, {x = -32.885, y = -152.319, z = 56.076}, {x = -278.077, y = 6228.463, z = 30.695}, } @@ -29,4 +29,4 @@ for i=1, #Config.Shops, 1 do Type = Config.MarkerType } -end \ No newline at end of file +end From 7fb1c50336ab251f24c087c1cdeffa619b5319a0 Mon Sep 17 00:00:00 2001 From: Romain Lanz Date: Sat, 7 Oct 2017 17:52:14 +0200 Subject: [PATCH 16/32] chore: bump version --- __resource.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__resource.lua b/__resource.lua index 021497d6..a45822d0 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX BarberShop' -version '1.0.0' +version '1.0.1' server_scripts { '@mysql-async/lib/MySQL.lua', From 7aadbaa58ffa863ad03380fc8a281a8385d7fac9 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 22 Feb 2018 01:50:38 +0100 Subject: [PATCH 17/32] Fix message pack Error --- server/main.lua | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/server/main.lua b/server/main.lua index 450983d5..49d8b2b4 100644 --- a/server/main.lua +++ b/server/main.lua @@ -5,7 +5,8 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_barbershop:pay') AddEventHandler('esx_barbershop:pay', function() - local xPlayer = ESX.GetPlayerFromId(source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) xPlayer.removeMoney(Config.Price) @@ -15,7 +16,8 @@ end) ESX.RegisterServerCallback('esx_barbershop:checkMoney', function(source, cb) - local xPlayer = ESX.GetPlayerFromId(source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) if xPlayer.get('money') >= Config.Price then cb(true) From fad435d4cce5b8e98ee27bb862fdf620e04bb641 Mon Sep 17 00:00:00 2001 From: AdrineX Date: Tue, 12 Jun 2018 23:51:42 +0300 Subject: [PATCH 18/32] Add Finnish lang... --- __resource.lua | 2 ++ locales/fi.lua | 10 ++++++++++ 2 files changed, 12 insertions(+) create mode 100644 locales/fi.lua diff --git a/__resource.lua b/__resource.lua index a45822d0..f6487c62 100644 --- a/__resource.lua +++ b/__resource.lua @@ -10,6 +10,7 @@ server_scripts { 'locales/br.lua', 'locales/de.lua', 'locales/en.lua', + 'locales/fi.lua', 'locales/fr.lua', 'locales/es.lua', 'config.lua', @@ -21,6 +22,7 @@ client_scripts { 'locales/br.lua', 'locales/de.lua', 'locales/en.lua', + 'locales/fi.lua', 'locales/fr.lua', 'locales/es.lua', 'config.lua', diff --git a/locales/fi.lua b/locales/fi.lua new file mode 100644 index 00000000..953735ee --- /dev/null +++ b/locales/fi.lua @@ -0,0 +1,10 @@ +Locales['fi'] = { + + ['valid_purchase'] = 'varmista tämä ostos?', + ['yes'] = 'kyllä', + ['no'] = 'ei', + ['not_enough_money'] = 'sinulla ei ole tarpeeksi rahaa', + ['press_access'] = 'paina ~INPUT_CONTEXT~ avataksesi menu', + ['barber_blip'] = 'Kampaamo', + ['you_paid'] = 'sinä maksoit ', +} \ No newline at end of file From ad356352ddb173e208aeaeb65c56fffa038b08e7 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:50:38 -0400 Subject: [PATCH 19/32] Repo Update --- .editorconfig | 9 +++++++++ LICENSE.txt => LICENSE | 0 2 files changed, 9 insertions(+) create mode 100644 .editorconfig rename LICENSE.txt => LICENSE (100%) diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 00000000..9b425256 --- /dev/null +++ b/.editorconfig @@ -0,0 +1,9 @@ +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/LICENSE.txt b/LICENSE similarity index 100% rename from LICENSE.txt rename to LICENSE From 5c49d02433330a26fc80bb7d5c4f029af754b252 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 10 Nov 2018 23:47:14 +0100 Subject: [PATCH 20/32] Cleanup, fixed #6 --- __resource.lua | 42 ++++++++++++------------ client/main.lua | 85 +++++++++++++++---------------------------------- config.lua | 27 ++++++++-------- locales/br.lua | 17 +++++----- locales/de.lua | 15 ++++----- locales/en.lua | 17 +++++----- locales/es.lua | 15 ++++----- locales/fi.lua | 17 +++++----- locales/fr.lua | 17 +++++----- server/main.lua | 18 +++-------- 10 files changed, 111 insertions(+), 159 deletions(-) diff --git a/__resource.lua b/__resource.lua index f6487c62..a31bfb4d 100644 --- a/__resource.lua +++ b/__resource.lua @@ -1,30 +1,32 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' -description 'ESX BarberShop' +description 'ESX Barber Shop' version '1.0.1' server_scripts { - '@mysql-async/lib/MySQL.lua', - '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/de.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'config.lua', - 'server/main.lua' + '@mysql-async/lib/MySQL.lua', + '@es_extended/locale.lua', + 'locales/br.lua', + 'locales/de.lua', + 'locales/en.lua', + 'locales/fi.lua', + 'locales/fr.lua', + 'locales/es.lua', + 'config.lua', + 'server/main.lua' } client_scripts { - '@es_extended/locale.lua', - 'locales/br.lua', - 'locales/de.lua', - 'locales/en.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/es.lua', - 'config.lua', - 'client/main.lua' + '@es_extended/locale.lua', + 'locales/br.lua', + 'locales/de.lua', + 'locales/en.lua', + 'locales/fi.lua', + 'locales/fr.lua', + 'locales/es.lua', + 'config.lua', + 'client/main.lua' } + +dependency 'es_extended' \ No newline at end of file diff --git a/client/main.lua b/client/main.lua index 188840d1..ccc1c905 100644 --- a/client/main.lua +++ b/client/main.lua @@ -18,20 +18,18 @@ local LastZone = nil local CurrentAction = nil local CurrentActionMsg = '' local CurrentActionData = {} -local HasPayed = false +local HasPaid = false Citizen.CreateThread(function() - while ESX == nil do TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) Citizen.Wait(0) end - end) function OpenShopMenu() - HasPayed = false + HasPaid = false TriggerEvent('esx_skin:openRestrictedMenu', function(data, menu) @@ -43,45 +41,37 @@ function OpenShopMenu() title = _U('valid_purchase'), align = 'top-left', elements = { - {label = _U('yes'), value = 'yes'}, - {label = _U('no'), value = 'no'}, + {label = _U('no'), value = 'no'}, + {label = _U('yes'), value = 'yes'} } }, function(data, menu) - menu.close() if data.current.value == 'yes' then ESX.TriggerServerCallback('esx_barbershop:checkMoney', function(hasEnoughMoney) - if hasEnoughMoney then - TriggerEvent('skinchanger:getSkin', function(skin) TriggerServerEvent('esx_skin:save', skin) end) TriggerServerEvent('esx_barbershop:pay') - HasPayed = true + HasPaid = true else - - TriggerEvent('esx_skin:getLastSkin', function(skin) - TriggerEvent('skinchanger:loadSkin', skin) + ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) end) ESX.ShowNotification(_U('not_enough_money')) - end - end) - end + elseif data.current.value == 'no' then - if data.current.value == 'no' then - - TriggerEvent('esx_skin:getLastSkin', function(skin) - TriggerEvent('skinchanger:loadSkin', skin) + ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) end) end @@ -89,27 +79,20 @@ function OpenShopMenu() CurrentAction = 'shop_menu' CurrentActionMsg = _U('press_access') CurrentActionData = {} - - end, - function(data, menu) - + end, function(data, menu) menu.close() CurrentAction = 'shop_menu' CurrentActionMsg = _U('press_access') CurrentActionData = {} - - end - ) + end) end, function(data, menu) - menu.close() CurrentAction = 'shop_menu' CurrentActionMsg = _U('press_access') CurrentActionData = {} - end, { 'beard_1', 'beard_2', @@ -144,25 +127,20 @@ AddEventHandler('esx_barbershop:hasEnteredMarker', function(zone) end) AddEventHandler('esx_barbershop:hasExitedMarker', function(zone) - ESX.UI.Menu.CloseAll() CurrentAction = nil - if not HasPayed then - + if not HasPaid then TriggerEvent('esx_skin:getLastSkin', function(skin) TriggerEvent('skinchanger:loadSkin', skin) end) - end - end) -- Create Blips Citizen.CreateThread(function() - for i=1, #Config.Shops, 1 do - + local blip = AddBlipForCoord(Config.Shops[i].x, Config.Shops[i].y, Config.Shops[i].z) SetBlipSprite (blip, 71) @@ -174,39 +152,36 @@ Citizen.CreateThread(function() BeginTextCommandSetBlipName("STRING") AddTextComponentString(_U('barber_blip')) EndTextCommandSetBlipName(blip) - end + end end) -- Display markers Citizen.CreateThread(function() while true do - - Wait(0) - - local coords = GetEntityCoords(GetPlayerPed(-1)) - + Citizen.Wait(0) + + local coords = GetEntityCoords(PlayerPedId()) + for k,v in pairs(Config.Zones) do if(v.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < Config.DrawDistance) then DrawMarker(v.Type, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, v.Color.r, v.Color.g, v.Color.b, 100, false, true, 2, false, false, false, false) end end - end end) -- Enter / Exit marker events Citizen.CreateThread(function() while true do + Citizen.Wait(0) - Wait(0) - - local coords = GetEntityCoords(GetPlayerPed(-1)) + local coords = GetEntityCoords(PlayerPedId()) local isInMarker = false local currentZone = nil for k,v in pairs(Config.Zones) do - if(GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x) then + if GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x then isInMarker = true currentZone = k end @@ -222,34 +197,26 @@ Citizen.CreateThread(function() HasAlreadyEnteredMarker = false TriggerEvent('esx_barbershop:hasExitedMarker', LastZone) end - end end) -- Key controls Citizen.CreateThread(function() while true do - Citizen.Wait(0) if CurrentAction ~= nil then + ESX.ShowHelpNotification(CurrentActionMsg) - SetTextComponentFormat('STRING') - AddTextComponentString(CurrentActionMsg) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) - - if IsControlPressed(0, Keys['E']) and (GetGameTimer() - GUI.Time) > 300 then - + if IsControlJustReleased(0, Keys['E']) then if CurrentAction == 'shop_menu' then OpenShopMenu() end CurrentAction = nil - GUI.Time = GetGameTimer() - end - + else + Citizen.Wait(500) end - end end) \ No newline at end of file diff --git a/config.lua b/config.lua index e9f30d60..4ec366dc 100644 --- a/config.lua +++ b/config.lua @@ -6,27 +6,26 @@ Config.DrawDistance = 100.0 Config.MarkerSize = {x = 1.5, y = 1.5, z = 1.0} Config.MarkerColor = {r = 102, g = 102, b = 204} Config.MarkerType = 1 + Config.Locale = 'fr' Config.Zones = {} Config.Shops = { - {x = -814.308, y = -183.823, z = 36.568}, - {x = 136.826, y = -1708.373, z = 28.291}, - {x = -1282.604, y = -1116.757, z = 5.990}, - {x = 1931.513, y = 3729.671, z = 31.844}, - {x = 1212.840, y = -472.921, z = 65.208}, - {x = -32.885, y = -152.319, z = 56.076}, - {x = -278.077, y = 6228.463, z = 30.695}, + {x = -814.308, y = -183.823, z = 36.568}, + {x = 136.826, y = -1708.373, z = 28.291}, + {x = -1282.604, y = -1116.757, z = 5.990}, + {x = 1931.513, y = 3729.671, z = 31.844}, + {x = 1212.840, y = -472.921, z = 65.208}, + {x = -32.885, y = -152.319, z = 56.076}, + {x = -278.077, y = 6228.463, z = 30.695} } for i=1, #Config.Shops, 1 do - Config.Zones['Shop_' .. i] = { - Pos = Config.Shops[i], - Size = Config.MarkerSize, - Color = Config.MarkerColor, - Type = Config.MarkerType - } - + Pos = Config.Shops[i], + Size = Config.MarkerSize, + Color = Config.MarkerColor, + Type = Config.MarkerType + } end diff --git a/locales/br.lua b/locales/br.lua index 0cc4e13a..06aca5b7 100644 --- a/locales/br.lua +++ b/locales/br.lua @@ -1,10 +1,9 @@ Locales['br'] = { - - ['valid_purchase'] = 'validar esta compra?', - ['yes'] = 'sim', - ['no'] = 'não', - ['not_enough_money'] = 'você não tem dinheiro suficiente', - ['press_access'] = 'pressione ~INPUT_CONTEXT~ para acessar o menu', - ['barber_blip'] = 'Barbearia', - ['you_paid'] = 'você pagou ', -} \ No newline at end of file + ['valid_purchase'] = 'validar esta compra?', + ['yes'] = 'sim', + ['no'] = 'não', + ['not_enough_money'] = 'você não tem dinheiro suficiente', + ['press_access'] = 'pressione ~INPUT_CONTEXT~ para acessar o menu', + ['barber_blip'] = 'Barbearia', + ['you_paid'] = 'você pagou $%s', +} diff --git a/locales/de.lua b/locales/de.lua index e5c26ff2..6053408c 100644 --- a/locales/de.lua +++ b/locales/de.lua @@ -1,10 +1,9 @@ Locales['de'] = { - - ['valid_purchase'] = 'Einkauf bestätigen?', - ['yes'] = 'ja', - ['no'] = 'nein', - ['not_enough_money'] = 'du hast nicht genug Geld', - ['press_access'] = 'Drücke ~INPUT_CONTEXT~ um das Menü zu öffnen', - ['barber_blip'] = 'Friseur', - ['you_paid'] = 'du bezahlst ', + ['valid_purchase'] = 'Einkauf bestätigen?', + ['yes'] = 'ja', + ['no'] = 'nein', + ['not_enough_money'] = 'du hast nicht genug Geld', + ['press_access'] = 'Drücke ~INPUT_CONTEXT~ um das Menü zu öffnen', + ['barber_blip'] = 'Friseur', + ['you_paid'] = 'du bezahlst $%s', } \ No newline at end of file diff --git a/locales/en.lua b/locales/en.lua index 6534c364..0dc26ab0 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,10 +1,9 @@ Locales['en'] = { - - ['valid_purchase'] = 'validate this purchase?', - ['yes'] = 'yes', - ['no'] = 'no', - ['not_enough_money'] = 'you do not have enough money', - ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu', - ['barber_blip'] = 'barber shop', - ['you_paid'] = 'you paid ', -} \ No newline at end of file + ['valid_purchase'] = 'validate this purchase?', + ['yes'] = 'yes', + ['no'] = 'no', + ['not_enough_money'] = 'you do not have enough money', + ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu', + ['barber_blip'] = 'barber shop', + ['you_paid'] = 'you paid $%s', +} diff --git a/locales/es.lua b/locales/es.lua index 0abd39b3..befb6ef9 100644 --- a/locales/es.lua +++ b/locales/es.lua @@ -1,10 +1,9 @@ Locales['es'] = { - - ['valid_purchase'] = '¿validar esta compra?', - ['yes'] = 'Si', - ['no'] = 'No', - ['not_enough_money'] = 'No tienes suficente dinero', - ['press_access'] = 'Presiona ~INPUT_CONTEXT~ para acceder al menú', - ['barber_blip'] = 'Barbero', - ['you_paid'] = 'Has pagado ', + ['valid_purchase'] = '¿validar esta compra?', + ['yes'] = 'si', + ['no'] = 'no', + ['not_enough_money'] = 'no tienes suficente dinero', + ['press_access'] = 'presiona ~INPUT_CONTEXT~ para acceder al menú', + ['barber_blip'] = 'barbero', + ['you_paid'] = 'has pagado $%s', } diff --git a/locales/fi.lua b/locales/fi.lua index 953735ee..3486fce0 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,10 +1,9 @@ Locales['fi'] = { - - ['valid_purchase'] = 'varmista tämä ostos?', - ['yes'] = 'kyllä', - ['no'] = 'ei', - ['not_enough_money'] = 'sinulla ei ole tarpeeksi rahaa', - ['press_access'] = 'paina ~INPUT_CONTEXT~ avataksesi menu', - ['barber_blip'] = 'Kampaamo', - ['you_paid'] = 'sinä maksoit ', -} \ No newline at end of file + ['valid_purchase'] = 'varmista tämä ostos?', + ['yes'] = 'kyllä', + ['no'] = 'ei', + ['not_enough_money'] = 'sinulla ei ole tarpeeksi rahaa', + ['press_access'] = 'paina ~INPUT_CONTEXT~ avataksesi menu', + ['barber_blip'] = 'Kampaamo', + ['you_paid'] = 'sinä maksoit $%s', +} diff --git a/locales/fr.lua b/locales/fr.lua index ac1683a6..bfe267db 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,10 +1,9 @@ Locales['fr'] = { - - ['valid_purchase'] = 'valider cet achat ?', - ['yes'] = 'oui', - ['no'] = 'non', - ['not_enough_money'] = 'vous n\'avez pas assez d\'argent', - ['press_access'] = 'appuez sur ~INPUT_CONTEXT~ pour accéder au menu', - ['barber_blip'] = 'barbier', - ['you_paid'] = 'vous avez payé ', -} \ No newline at end of file + ['valid_purchase'] = 'valider cet achat ?', + ['yes'] = 'oui', + ['no'] = 'non', + ['not_enough_money'] = 'vous n\'avez pas assez d\'argent', + ['press_access'] = 'appuez sur ~INPUT_CONTEXT~ pour accéder au menu', + ['barber_blip'] = 'barbier', + ['you_paid'] = 'vous avez payé $%s', +} diff --git a/server/main.lua b/server/main.lua index 49d8b2b4..b6fbf525 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,25 +4,15 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_barbershop:pay') AddEventHandler('esx_barbershop:pay', function() - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(_source) xPlayer.removeMoney(Config.Price) - - TriggerClientEvent('esx:showNotification', source, _U('you_paid') .. '$' .. Config.Price) - + TriggerClientEvent('esx:showNotification', source, _U('you_paid', ESX.Math.GroupDigits(Config.Price))) end) ESX.RegisterServerCallback('esx_barbershop:checkMoney', function(source, cb) + local xPlayer = ESX.GetPlayerFromId(source) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) - - if xPlayer.get('money') >= Config.Price then - cb(true) - else - cb(false) - end - + cb(xPlayer.get('money') >= Config.Price) end) From 64e665bbae068f2261aa1d9c6bf46f531c50dea9 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 10 Nov 2018 23:52:00 +0100 Subject: [PATCH 21/32] Updated readme, final commit v1.1.0 --- README.md | 41 +++++++++++++++++++++++++++++++---------- __resource.lua | 7 +++++-- client/main.lua | 4 ++-- 3 files changed, 38 insertions(+), 14 deletions(-) diff --git a/README.md b/README.md index 886ee230..ea1dceab 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,40 @@ -# fxserver-esx_barbershop -FXServer ESX Barber Shop +# esx_barbershop -[REQUIREMENTS] +## Requirements +- [esx_skin](https://github.com/ESX-Org/esx_skin) -- esx_skin => https://github.com/FXServer-ESX/fxserver-esx_skin +## Download & Installation -[INSTALLATION] - -1) CD in your resources/[esx] folder -2) Clone the repository +### Using [fvm](https://github.com/qlaffont/fvm-installer) ``` -git clone https://github.com/FXServer-ESX/fxserver-esx_barbershop esx_barbershop +fvm install --save --folder=esx esx-org/esx_barbershop ``` -3) Add this in your server.cfg : + +### Using Git +``` +cd resources +git clone https://github.com/ESX-Org/esx_barbershop [esx]/esx_barbershop +``` + +### Manually +- Download https://github.com/ESX-Org/esx_barbershop/archive/master.zip +- Put it in the `[esx]` directory + +## Installation +- Add this in your `server.cfg`: ``` start esx_barbershop ``` + +# Legal +### License +esx_barbershop - barber shop! + +Copyright (C) 2015-2018 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/. \ No newline at end of file diff --git a/__resource.lua b/__resource.lua index a31bfb4d..243ffac2 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Barber Shop' -version '1.0.1' +version '1.1.0' server_scripts { '@mysql-async/lib/MySQL.lua', @@ -29,4 +29,7 @@ client_scripts { 'client/main.lua' } -dependency 'es_extended' \ No newline at end of file +dependencies { + 'es_extended', + 'esx_skin' +} diff --git a/client/main.lua b/client/main.lua index ccc1c905..39afd32c 100644 --- a/client/main.lua +++ b/client/main.lua @@ -174,8 +174,8 @@ end) -- Enter / Exit marker events Citizen.CreateThread(function() while true do - Citizen.Wait(0) - + Citizen.Wait(200) + local coords = GetEntityCoords(PlayerPedId()) local isInMarker = false local currentZone = nil From 29d13d81c9b972b5daf5b614952b2b6101b87fe0 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 10 Nov 2018 23:52:35 +0100 Subject: [PATCH 22/32] Very final commit v1.1.0 --- __resource.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/__resource.lua b/__resource.lua index 243ffac2..3637c8ee 100644 --- a/__resource.lua +++ b/__resource.lua @@ -5,7 +5,6 @@ description 'ESX Barber Shop' version '1.1.0' server_scripts { - '@mysql-async/lib/MySQL.lua', '@es_extended/locale.lua', 'locales/br.lua', 'locales/de.lua', From 0fff512922693921d6c2d8db5af226123f1f329c Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 10 Nov 2018 23:54:42 +0100 Subject: [PATCH 23/32] Ok very very final commit --- client/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index 39afd32c..7be8e70a 100644 --- a/client/main.lua +++ b/client/main.lua @@ -131,8 +131,8 @@ AddEventHandler('esx_barbershop:hasExitedMarker', function(zone) CurrentAction = nil if not HasPaid then - TriggerEvent('esx_skin:getLastSkin', function(skin) - TriggerEvent('skinchanger:loadSkin', skin) + ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) end) end end) From 440769caedbd1340069e3045590dd8011775011c Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 22 Sep 2019 13:00:24 +0200 Subject: [PATCH 24/32] Further cleanup --- client/main.lua | 206 ++++++++++++++++++------------------------------ config.lua | 29 +++---- locales/en.lua | 6 +- server/main.lua | 2 +- 4 files changed, 91 insertions(+), 152 deletions(-) diff --git a/client/main.lua b/client/main.lua index 7be8e70a..a6cf415c 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,24 +1,5 @@ -local Keys = { - ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, - ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, - ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, - ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, - ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, - ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, - ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, - ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, - ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 -} - -ESX = nil -local GUI = {} -GUI.Time = 0 -local HasAlreadyEnteredMarker = false -local LastZone = nil -local CurrentAction = nil -local CurrentActionMsg = '' -local CurrentActionData = {} -local HasPaid = false +ESX = nil +local hasAlreadyEnteredMarker, lastZone, currentAction, currentActionMsg, hasPaid Citizen.CreateThread(function() while ESX == nil do @@ -28,71 +9,55 @@ Citizen.CreateThread(function() end) function OpenShopMenu() - - HasPaid = false + hasPaid = false TriggerEvent('esx_skin:openRestrictedMenu', function(data, menu) - menu.close() - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'shop_confirm', - { - title = _U('valid_purchase'), - align = 'top-left', - elements = { - {label = _U('no'), value = 'no'}, - {label = _U('yes'), value = 'yes'} - } - }, - function(data, menu) - menu.close() - - if data.current.value == 'yes' then - - ESX.TriggerServerCallback('esx_barbershop:checkMoney', function(hasEnoughMoney) - if hasEnoughMoney then - TriggerEvent('skinchanger:getSkin', function(skin) - TriggerServerEvent('esx_skin:save', skin) - end) - - TriggerServerEvent('esx_barbershop:pay') - - HasPaid = true - else - ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin) - TriggerEvent('skinchanger:loadSkin', skin) - end) - - ESX.ShowNotification(_U('not_enough_money')) - end - end) - - elseif data.current.value == 'no' then - - ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin) - TriggerEvent('skinchanger:loadSkin', skin) - end) - - end - - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('press_access') - CurrentActionData = {} - end, function(data, menu) - menu.close() - - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('press_access') - CurrentActionData = {} - end) - - end, function(data, menu) + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop_confirm', { + title = _U('valid_purchase'), + align = 'top-left', + elements = { + {label = _U('no'), value = 'no'}, + {label = _U('yes'), value = 'yes'} + }}, function(data, menu) menu.close() - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('press_access') - CurrentActionData = {} + if data.current.value == 'yes' then + ESX.TriggerServerCallback('esx_barbershop:checkMoney', function(hasEnoughMoney) + if hasEnoughMoney then + TriggerEvent('skinchanger:getSkin', function(skin) + TriggerServerEvent('esx_skin:save', skin) + end) + + TriggerServerEvent('esx_barbershop:pay') + hasPaid = true + else + ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + + ESX.ShowNotification(_U('not_enough_money')) + end + end) + elseif data.current.value == 'no' then + ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + end + + currentAction = 'shop_menu' + currentActionMsg = _U('press_access') + end, function(data, menu) + menu.close() + currentAction = 'shop_menu' + currentActionMsg = _U('press_access') + end) + end, function(data, menu) + menu.close() + + currentAction = 'shop_menu' + currentActionMsg = _U('press_access') end, { 'beard_1', 'beard_2', @@ -117,85 +82,70 @@ function OpenShopMenu() 'ears_1', 'ears_2', }) - end AddEventHandler('esx_barbershop:hasEnteredMarker', function(zone) - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('press_access') - CurrentActionData = {} + currentAction = 'shop_menu' + currentActionMsg = _U('press_access') end) AddEventHandler('esx_barbershop:hasExitedMarker', function(zone) ESX.UI.Menu.CloseAll() - CurrentAction = nil + currentAction = nil - if not HasPaid then + if not hasPaid then ESX.TriggerServerCallback('esx_skin:getPlayerSkin', function(skin) - TriggerEvent('skinchanger:loadSkin', skin) + TriggerEvent('skinchanger:loadSkin', skin) end) end end) -- Create Blips Citizen.CreateThread(function() - for i=1, #Config.Shops, 1 do - - local blip = AddBlipForCoord(Config.Shops[i].x, Config.Shops[i].y, Config.Shops[i].z) + for k,v in ipairs(Config.Shops) do + local blip = AddBlipForCoord(v) SetBlipSprite (blip, 71) - SetBlipDisplay(blip, 4) - SetBlipScale (blip, 1.0) SetBlipColour (blip, 51) SetBlipAsShortRange(blip, true) - BeginTextCommandSetBlipName("STRING") - AddTextComponentString(_U('barber_blip')) + BeginTextCommandSetBlipName('STRING') + AddTextComponentSubstringPlayerName(_U('barber_blip')) EndTextCommandSetBlipName(blip) - end end) --- Display markers +-- Enter / Exit marker events and draw marker Citizen.CreateThread(function() while true do Citizen.Wait(0) + local playerCoords, isInMarker, currentZone, letSleep = GetEntityCoords(PlayerPedId()), nil, nil, true - local coords = GetEntityCoords(PlayerPedId()) + for k,v in ipairs(Config.Shops) do + local distnace = #(playerCoords - v) - for k,v in pairs(Config.Zones) do - if(v.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < Config.DrawDistance) then - DrawMarker(v.Type, v.Pos.x, v.Pos.y, v.Pos.z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, v.Size.x, v.Size.y, v.Size.z, v.Color.r, v.Color.g, v.Color.b, 100, false, true, 2, false, false, false, false) - end - end - end -end) + if distance < Config.DrawDistance then + letSleep = false + DrawMarker(Config.MarkerType, v, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.MarkerSize, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, nil, nil, false) --- Enter / Exit marker events -Citizen.CreateThread(function() - while true do - Citizen.Wait(200) - - local coords = GetEntityCoords(PlayerPedId()) - local isInMarker = false - local currentZone = nil - - for k,v in pairs(Config.Zones) do - if GetDistanceBetweenCoords(coords, v.Pos.x, v.Pos.y, v.Pos.z, true) < v.Size.x then - isInMarker = true - currentZone = k + if distnace < 1.5 then + isInMarker, currentZone = true, k + end end end - if (isInMarker and not HasAlreadyEnteredMarker) or (isInMarker and LastZone ~= currentZone) then - HasAlreadyEnteredMarker = true - LastZone = currentZone + if (isInMarker and not hasAlreadyEnteredMarker) or (isInMarker and lastZone ~= currentZone) then + hasAlreadyEnteredMarker, lastZone = true, currentZone TriggerEvent('esx_barbershop:hasEnteredMarker', currentZone) end - if not isInMarker and HasAlreadyEnteredMarker then - HasAlreadyEnteredMarker = false - TriggerEvent('esx_barbershop:hasExitedMarker', LastZone) + if not isInMarker and hasAlreadyEnteredMarker then + hasAlreadyEnteredMarker = false + TriggerEvent('esx_barbershop:hasExitedMarker', lastZone) + end + + if letSleep then + Citizen.Wait(500) end end end) @@ -205,15 +155,15 @@ Citizen.CreateThread(function() while true do Citizen.Wait(0) - if CurrentAction ~= nil then - ESX.ShowHelpNotification(CurrentActionMsg) + if currentAction then + ESX.ShowHelpNotification(currentActionMsg) - if IsControlJustReleased(0, Keys['E']) then - if CurrentAction == 'shop_menu' then + if IsControlJustReleased(0, 38) then + if currentAction == 'shop_menu' then OpenShopMenu() end - CurrentAction = nil + currentAction = nil end else Citizen.Wait(500) diff --git a/config.lua b/config.lua index 4ec366dc..2a4b6787 100644 --- a/config.lua +++ b/config.lua @@ -3,29 +3,18 @@ Config = {} Config.Price = 100 Config.DrawDistance = 100.0 -Config.MarkerSize = {x = 1.5, y = 1.5, z = 1.0} +Config.MarkerSize = vector3(1.5, 1.5, 1.0) Config.MarkerColor = {r = 102, g = 102, b = 204} Config.MarkerType = 1 Config.Locale = 'fr' -Config.Zones = {} - Config.Shops = { - {x = -814.308, y = -183.823, z = 36.568}, - {x = 136.826, y = -1708.373, z = 28.291}, - {x = -1282.604, y = -1116.757, z = 5.990}, - {x = 1931.513, y = 3729.671, z = 31.844}, - {x = 1212.840, y = -472.921, z = 65.208}, - {x = -32.885, y = -152.319, z = 56.076}, - {x = -278.077, y = 6228.463, z = 30.695} -} - -for i=1, #Config.Shops, 1 do - Config.Zones['Shop_' .. i] = { - Pos = Config.Shops[i], - Size = Config.MarkerSize, - Color = Config.MarkerColor, - Type = Config.MarkerType - } -end + vector3(-814.3, -183.8, 36.6), + vector3(136.8, -1708.4, 28.3), + vector3(-1282.6, -1116.8, 6.0), + vector3(1931.5, 3729.7, 31.8), + vector3(1212.8, -472.9, 65.2), + vector3(-32.9, -152.3, 56.1), + vector3(-278.1, 6228.5, 30.7) +} \ No newline at end of file diff --git a/locales/en.lua b/locales/en.lua index 0dc26ab0..684323e4 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -3,7 +3,7 @@ Locales['en'] = { ['yes'] = 'yes', ['no'] = 'no', ['not_enough_money'] = 'you do not have enough money', - ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu', - ['barber_blip'] = 'barber shop', - ['you_paid'] = 'you paid $%s', + ['press_access'] = 'press ~INPUT_CONTEXT~ to access the ~y~Barber Shop~s~.', + ['barber_blip'] = 'barber Shop', + ['you_paid'] = 'you paid ~g~$%s~s~', } diff --git a/server/main.lua b/server/main.lua index b6fbf525..516beaa5 100644 --- a/server/main.lua +++ b/server/main.lua @@ -14,5 +14,5 @@ end) ESX.RegisterServerCallback('esx_barbershop:checkMoney', function(source, cb) local xPlayer = ESX.GetPlayerFromId(source) - cb(xPlayer.get('money') >= Config.Price) + cb(xPlayer.getMoney() >= Config.Price) end) From 1d6cf75c6335ab0049e155fead9af52e67ec2a62 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 22 Sep 2019 13:08:17 +0200 Subject: [PATCH 25/32] Fixed typo --- client/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index a6cf415c..c2dee892 100644 --- a/client/main.lua +++ b/client/main.lua @@ -122,13 +122,13 @@ Citizen.CreateThread(function() local playerCoords, isInMarker, currentZone, letSleep = GetEntityCoords(PlayerPedId()), nil, nil, true for k,v in ipairs(Config.Shops) do - local distnace = #(playerCoords - v) + local distance = #(playerCoords - v) if distance < Config.DrawDistance then letSleep = false DrawMarker(Config.MarkerType, v, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, Config.MarkerSize, Config.MarkerColor.r, Config.MarkerColor.g, Config.MarkerColor.b, 100, false, true, 2, false, nil, nil, false) - if distnace < 1.5 then + if distance < 1.5 then isInMarker, currentZone = true, k end end From 3bc0919760dbe9b06a6c85648af19a5eced34f21 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 17:26:24 +0100 Subject: [PATCH 26/32] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename __resource.lua => fxmanifest.lua (88%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 88% rename from __resource.lua rename to fxmanifest.lua index 3637c8ee..0c6cc685 100644 --- a/__resource.lua +++ b/fxmanifest.lua @@ -1,4 +1,6 @@ -resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' +fx_version 'adamant' + +game 'gta5' description 'ESX Barber Shop' From 54bb4aa7b1257556942e2e588dcdc07860c45f82 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Thu, 23 Jan 2020 17:02:25 +0100 Subject: [PATCH 27/32] Added czech language (#11) * Create cs.lua * Update fxmanifest.lua --- fxmanifest.lua | 2 ++ locales/cs.lua | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 locales/cs.lua diff --git a/fxmanifest.lua b/fxmanifest.lua index 0c6cc685..474fbd9d 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -14,6 +14,7 @@ server_scripts { 'locales/fi.lua', 'locales/fr.lua', 'locales/es.lua', + 'locales/cs.lua', 'config.lua', 'server/main.lua' } @@ -26,6 +27,7 @@ client_scripts { 'locales/fi.lua', 'locales/fr.lua', 'locales/es.lua', + 'locales/cs.lua', 'config.lua', 'client/main.lua' } diff --git a/locales/cs.lua b/locales/cs.lua new file mode 100644 index 00000000..97c4aa84 --- /dev/null +++ b/locales/cs.lua @@ -0,0 +1,9 @@ +Locales['cs'] = { + ['valid_purchase'] = 'potvrdit nakup?', + ['yes'] = 'ano', + ['no'] = 'ne', + ['not_enough_money'] = 'nemas dostatek penez', + ['press_access'] = 'stiskni ~INPUT_CONTEXT~ pro pristup k ~y~Holici~s~.', + ['barber_blip'] = 'Holic', + ['you_paid'] = 'zaplatil jsi ~g~$%s~s~', +} From 74347293c0530ce2aaf8dd74f68ca30d15b4d5c7 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 17 Feb 2020 21:53:54 +0100 Subject: [PATCH 28/32] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index ea1dceab..a0018489 100644 --- a/README.md +++ b/README.md @@ -31,7 +31,7 @@ start esx_barbershop ### License esx_barbershop - barber shop! -Copyright (C) 2015-2018 Jérémie N'gadi +Copyright (C) 2015-2020 Jérémie N'gadi This program Is free software: you can redistribute it And/Or modify it under the terms Of the GNU General Public License As published by the Free Software Foundation, either version 3 Of the License, Or (at your option) any later version. From 7b0db1331a05be4c832b54b27b131223734a3e62 Mon Sep 17 00:00:00 2001 From: userMacieG Date: Mon, 20 Jul 2020 16:22:10 +0200 Subject: [PATCH 29/32] Create pl.lua (#13) --- locales/pl.lua | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 locales/pl.lua diff --git a/locales/pl.lua b/locales/pl.lua new file mode 100644 index 00000000..ca1c76e8 --- /dev/null +++ b/locales/pl.lua @@ -0,0 +1,9 @@ +Locales['pl'] = { + ['valid_purchase'] = 'potwierdzić ten zakup?', + ['yes'] = 'tak', + ['no'] = 'nie', + ['not_enough_money'] = 'nie posiadasz wystarczająco pieniędzy', + ['press_access'] = 'naciśnij ~INPUT_CONTEXT~ aby otworzyć ~y~Fryziera~s~.', + ['barber_blip'] = 'fryzjer', + ['you_paid'] = 'zapłaciłeś/aś ~g~$%s~s~', +} From e45385eaee3025bc3188fc1c4828650ad0f64e52 Mon Sep 17 00:00:00 2001 From: userMacieG Date: Mon, 20 Jul 2020 16:22:24 +0200 Subject: [PATCH 30/32] Add `pl.lua` into `fxmanifest.lua` (#14) --- fxmanifest.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fxmanifest.lua b/fxmanifest.lua index 474fbd9d..e8354332 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -15,6 +15,7 @@ server_scripts { 'locales/fr.lua', 'locales/es.lua', 'locales/cs.lua', + 'locales/pl.lua', 'config.lua', 'server/main.lua' } @@ -28,6 +29,7 @@ client_scripts { 'locales/fr.lua', 'locales/es.lua', 'locales/cs.lua', + 'locales/pl.lua', 'config.lua', 'client/main.lua' } From d336bf252735af547ec3f13d94b4781c299bae6c Mon Sep 17 00:00:00 2001 From: HypeLevels <61633775+HypeLevels@users.noreply.github.com> Date: Sat, 28 Nov 2020 22:30:18 +0000 Subject: [PATCH 31/32] Update config.lua Changed the default language to be English as it is the universal language. --- config.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config.lua b/config.lua index 2a4b6787..c49c9329 100644 --- a/config.lua +++ b/config.lua @@ -7,7 +7,7 @@ Config.MarkerSize = vector3(1.5, 1.5, 1.0) Config.MarkerColor = {r = 102, g = 102, b = 204} Config.MarkerType = 1 -Config.Locale = 'fr' +Config.Locale = 'en' Config.Shops = { vector3(-814.3, -183.8, 36.6), @@ -17,4 +17,4 @@ Config.Shops = { vector3(1212.8, -472.9, 65.2), vector3(-32.9, -152.3, 56.1), vector3(-278.1, 6228.5, 30.7) -} \ No newline at end of file +} From 2e4028089330716c745d748c8cd2af492cb63428 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?T=C3=BCrkay=20Tanr=C4=B1kulu?= Date: Sat, 19 Dec 2020 23:27:29 +0300 Subject: [PATCH 32/32] Turkish translation implemented --- fxmanifest.lua | 2 ++ locales/tr.lua | 9 +++++++++ 2 files changed, 11 insertions(+) create mode 100644 locales/tr.lua diff --git a/fxmanifest.lua b/fxmanifest.lua index e8354332..c58f6d49 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -16,6 +16,7 @@ server_scripts { 'locales/es.lua', 'locales/cs.lua', 'locales/pl.lua', + 'locales/tr.lua', 'config.lua', 'server/main.lua' } @@ -30,6 +31,7 @@ client_scripts { 'locales/es.lua', 'locales/cs.lua', 'locales/pl.lua', + 'locales/tr.lua', 'config.lua', 'client/main.lua' } diff --git a/locales/tr.lua b/locales/tr.lua new file mode 100644 index 00000000..69edd2f4 --- /dev/null +++ b/locales/tr.lua @@ -0,0 +1,9 @@ +Locales['tr'] = { + ['valid_purchase'] = 'bu işlemi doğruluyor musun?', + ['yes'] = 'evet', + ['no'] = 'hayır', + ['not_enough_money'] = 'yeterli miktarda paranız yok', + ['press_access'] = '~y~Berbere~s~ erişmek için ~INPUT_CONTEXT~ basın', + ['barber_blip'] = 'berber', + ['you_paid'] = '~g~$%s~s~ ödedin', + }