From 918577f9a3bd9c78d1c1ccac1fbcffb3a13903e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9n?= Date: Sun, 19 Nov 2017 21:17:48 +0100 Subject: [PATCH 01/30] Initial commit --- README.md | 1 + 1 file changed, 1 insertion(+) create mode 100644 README.md diff --git a/README.md b/README.md new file mode 100644 index 00000000..f81e7ca2 --- /dev/null +++ b/README.md @@ -0,0 +1 @@ +# esx_accessories \ No newline at end of file From 061bd7522b7997b0fddd9cd145b4e94354ede38f Mon Sep 17 00:00:00 2001 From: renaiku Date: Sun, 19 Nov 2017 21:25:31 +0100 Subject: [PATCH 02/30] Upload files --- README.md | 23 +++- __resource.lua | 21 ++++ client/main.lua | 280 ++++++++++++++++++++++++++++++++++++++++++++ config.lua | 105 +++++++++++++++++ esx_accessories.sql | 7 ++ locales/en.lua | 21 ++++ locales/fr.lua | 21 ++++ server/main.lua | 62 ++++++++++ 8 files changed, 539 insertions(+), 1 deletion(-) create mode 100644 __resource.lua create mode 100644 client/main.lua create mode 100644 config.lua create mode 100644 esx_accessories.sql create mode 100644 locales/en.lua create mode 100644 locales/fr.lua create mode 100644 server/main.lua diff --git a/README.md b/README.md index f81e7ca2..c3696694 100644 --- a/README.md +++ b/README.md @@ -1 +1,22 @@ -# esx_accessories \ No newline at end of file +# fxserver-esx_accessories +FXServer ESX Accessories + +[REQUIREMENTS] + +- esx_skin => https://github.com/FXServer-ESX/fxserver-esx_skin +- esx_datastore => https://github.com/FXServer-ESX/fxserver-esx_datastore + +[INSTALLATION] + +1) CD in your resources/[esx] folder +2) Clone the repository +``` +git clone https://github.com/FXServer-ESX/fxserver-esx_accessories esx_accessories +``` +3) Import esx_accessories.sql in your database +4) Add this in your server.cfg : + +``` +start baseevents +start esx_accessories +``` diff --git a/__resource.lua b/__resource.lua new file mode 100644 index 00000000..179878e9 --- /dev/null +++ b/__resource.lua @@ -0,0 +1,21 @@ +resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' + +description 'ESX Accessories' + +version '1.0.0' + +server_scripts { + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.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 new file mode 100644 index 00000000..fb40f0f0 --- /dev/null +++ b/client/main.lua @@ -0,0 +1,280 @@ +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 HasAlreadyEnteredMarker = false +local LastZone = nil +local CurrentAction = nil +local CurrentActionMsg = '' +local CurrentActionData = {} +local IsDead = false + +Citizen.CreateThread(function() + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end +end) + +function OpenAccessoryMenu() + + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), 'set_unset_accessory', + { + title = _U('set_unset'), + align = 'top-left', + elements = { + {label = _U('helmet'), value = 'Helmet'}, + {label = _U('ears'), value = 'Ears'}, + {label = _U('mask'), value = 'Mask'}, + {label = _U('glasses'), value = 'Glasses'}, + } + }, + function(data, menu) + menu.close() + SetUnsetAccessory(data.current.value) + + end, + function(data, menu) + menu.close() + end + ) +end + +function SetUnsetAccessory(accessory) + + ESX.TriggerServerCallback('esx_accessories:get', function(hasAccessory, accessorySkin) + local _accessory = string.lower(accessory) + + if hasAccessory then + TriggerEvent('skinchanger:getSkin', function(skin) + local mAccessory = -1 + local mColor = 0 + if _accessory == "mask" then + mAccessory = 0 + end + if skin[_accessory .. '_1'] == mAccessory then + mAccessory = accessorySkin[_accessory .. '_1'] + mColor = accessorySkin[_accessory .. '_2'] + end + local accessorySkin = {} + accessorySkin[_accessory .. '_1'] = mAccessory + accessorySkin[_accessory .. '_2'] = mColor + TriggerEvent('skinchanger:loadClothes', skin, accessorySkin) + end) + else + ESX.ShowNotification(_U('no_' .. _accessory)) + end + + end, accessory) + +end + +function OpenShopMenu(accessory) + + local restrict = {} + + restrict = { string.lower(accessory) .. '_1', string.lower(accessory) .. '_2' } + + 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('yes'), value = 'yes'}, + {label = _U('no'), value = 'no'}, + } + }, + function(data, menu) + menu.close() + if data.current.value == 'yes' then + ESX.TriggerServerCallback('esx_accessories:checkMoney', function(hasEnoughMoney) + if hasEnoughMoney then + TriggerServerEvent('esx_accessories:pay') + TriggerEvent('skinchanger:getSkin', function(skin) + TriggerServerEvent('esx_accessories:save', skin, accessory) + end) + else + TriggerEvent('esx_skin:getLastSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + ESX.ShowNotification(_U('not_enough_money')) + end + end) + end + + if data.current.value == 'no' then + local player = GetPlayerPed(-1) + TriggerEvent('esx_skin:getLastSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + if accessory == "Ears" then + ClearPedProp(Player, 2) + elseif accessory == "Mask" then + SetPedComponentVariation(player, 1, 0 ,0 ,2) + elseif accessory == "Helmet" then + ClearPedProp(Player, 0) + elseif accessory == "Glasses" then + SetPedPropIndex(player, 1, -1, 0, 0) + 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) + menu.close() + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('press_access') + CurrentActionData = {} + end, restrict) + +end + +AddEventHandler('playerSpawned', function() + IsDead = false +end) + +AddEventHandler('baseevents:onPlayerDied', function(killerType, coords) + TriggerEvent('esx_ambulancejob:onPlayerDeath') +end) + +AddEventHandler('baseevents:onPlayerKilled', function(killerId, data) + TriggerEvent('esx_ambulancejob:onPlayerDeath') +end) + +AddEventHandler('esx_ambulancejob:onPlayerDeath', function() + IsDead = true +end) + +AddEventHandler('esx_accessories:hasEnteredMarker', function(zone) + + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('press_access') + CurrentActionData = { accessory = zone } + +end) + +AddEventHandler('esx_accessories:hasExitedMarker', function(zone) + ESX.UI.Menu.CloseAll() + CurrentAction = nil +end) + +-- Create Blips -- +Citizen.CreateThread(function() + for k,v in pairs(Config.ShopsBlips) do + if v.Pos ~= nil then + for i=1, #v.Pos, 1 do + local blip = AddBlipForCoord(v.Pos[i].x, v.Pos[i].y, v.Pos[i].z) + + SetBlipSprite (blip, v.Blip.sprite) + SetBlipDisplay(blip, 4) + SetBlipScale (blip, 1.0) + SetBlipColour (blip, v.Blip.color) + SetBlipAsShortRange(blip, true) + + BeginTextCommandSetBlipName("STRING") + AddTextComponentString(_U('store') .. ' ' .. _U(string.lower(k))) + EndTextCommandSetBlipName(blip) + end + end + 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 + for i = 1, #v.Pos, 1 do + if(Config.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.DrawDistance) then + DrawMarker(Config.Type, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.Size.x, Config.Size.y, Config.Size.z, Config.Color.r, Config.Color.g, Config.Color.b, 100, false, true, 2, false, false, false, false) + end + end + end + end +end) + + +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 + for i = 1, #v.Pos, 1 do + if(GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.Size.x) then + isInMarker = true + currentZone = k + end + end + end + + if (isInMarker and not HasAlreadyEnteredMarker) or (isInMarker and LastZone ~= currentZone) then + HasAlreadyEnteredMarker = true + LastZone = currentZone + TriggerEvent('esx_accessories:hasEnteredMarker', currentZone) + end + + if not isInMarker and HasAlreadyEnteredMarker then + HasAlreadyEnteredMarker = false + TriggerEvent('esx_accessories: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 IsControlJustReleased(0, 38) then + OpenShopMenu(CurrentActionData.accessory) + CurrentAction = nil + end + end + + if Config.EnableControls then + if IsControlJustReleased(0, Keys['K']) and not IsDead then + OpenAccessoryMenu() + end + end + + end +end) diff --git a/config.lua b/config.lua new file mode 100644 index 00000000..3b721a9b --- /dev/null +++ b/config.lua @@ -0,0 +1,105 @@ +Config = {} + +Config.Locale = 'fr' + +Config.Price = 100 + +Config.EnableControls = true + + +Config.DrawDistance = 100.0 +Config.Size = {x = 1.5, y = 1.5, z = 1.0} +Config.Color = {r = 102, g = 102, b = 204} +Config.Type = 1 + + +-- Fill this if you want to see the blips, +-- If you have esx_clothesshop you should not fill this +-- more than it's already filled. +Config.ShopsBlips = { + Ears = { + Pos = nil, + Blip = nil + }, + Mask = { + Pos = { + { x = -1338.129, y = -1278.200, z = 3.872 }, + }, + Blip = { sprite = 362, color = 2 } + }, + Helmet = { + Pos = nil, + Blip = nil + }, + Glasses = { + Pos = nil, + Blip = nil + } +} + +Config.Zones = { + Ears = { + Pos = { + {x= 80.374, y= -1389.493, z= 28.406}, + {x= -709.426, y= -153.829, z= 36.535}, + {x= -163.093, y= -302.038, z= 38.853}, + {x= 420.787, y= -809.654, z= 28.611}, + {x= -817.070, y= -1075.965, z= 10.448}, + {x= -1451.300, y= -238.254, z= 48.929}, + {x= -0.756, y= 6513.685, z= 30.997}, + {x= 123.431, y= -208.060, z= 53.677}, + {x= 1687.318, y= 4827.685, z= 41.183}, + {x= 622.806, y= 2749.221, z= 41.208}, + {x= 1200.085, y= 2705.428, z= 37.342}, + {x= -1199.959, y= -782.534, z= 16.452}, + {x= -3171.867, y= 1059.632, z= 19.983}, + {x= -1095.670, y= 2709.245, z= 18.227}, + } + + }, + + Mask = { + Pos = { + {x = -1338.129, y = -1278.200, z = 3.872}, + } + }, + + Helmet = { + Pos = { + {x= 81.576, y= -1400.602, z= 28.406}, + {x= -705.845, y= -159.015, z= 36.535}, + {x= -161.349, y= -295.774, z= 38.853}, + {x= 419.319, y= -800.647, z= 28.611}, + {x= -824.362, y= -1081.741, z= 10.448}, + {x= -1454.888, y= -242.911, z= 48.931}, + {x= 4.770, y= 6520.935, z= 30.997}, + {x= 121.071, y= -223.266, z= 53.377}, + {x= 1689.648, y= 4818.805, z= 41.183}, + {x= 613.971, y= 2749.978, z= 41.208}, + {x= 1189.513, y= 2703.947, z= 37.342}, + {x= -1204.025, y= -774.439, z= 16.452}, + {x= -3164.280, y= 1054.705, z= 19.983}, + {x= -1103.125, y= 2700.599, z= 18.227}, + } + }, + + Glasses = { + Pos = { + {x= 75.287, y= -1391.131, z= 28.406}, + {x= -713.102, y= -160.116, z= 36.535}, + {x= -156.171, y= -300.547, z= 38.853}, + {x= 425.478, y= -807.866, z= 28.611}, + {x= -820.853, y= -1072.940, z= 10.448}, + {x= -1458.052, y= -236.783, z= 48.918}, + {x= 3.587, y= 6511.585, z= 30.997}, + {x= 131.335, y= -212.336, z= 53.677}, + {x= 1694.936, y= 4820.837, z= 41.183}, + {x= 613.972, y= 2768.814, z= 41.208}, + {x= 1198.678, y= 2711.011, z= 37.342}, + {x= -1188.227, y= -764.594, z= 16.452}, + {x= -3173.192, y= 1038.228, z= 19.983}, + {x= -1100.494, y= 2712.481, z= 18.227}, + } + } + +} diff --git a/esx_accessories.sql b/esx_accessories.sql new file mode 100644 index 00000000..92c65768 --- /dev/null +++ b/esx_accessories.sql @@ -0,0 +1,7 @@ + +INSERT INTO `datastore` (name, label, shared) VALUES + ('user_ears','Ears',0), + ('user_glasses','Glasses',0), + ('user_helmet','Helmet',0), + ('user_mask','Mask',0) +; diff --git a/locales/en.lua b/locales/en.lua new file mode 100644 index 00000000..d83a0b26 --- /dev/null +++ b/locales/en.lua @@ -0,0 +1,21 @@ +Locales ['en'] = { + + ['valid_purchase'] = 'validate this purchase?', + ['yes'] = 'yes', + ['no'] = 'no', + ['helmet'] = 'Helmet / Hat', + ['glasses'] = 'glasses', + ['mask'] = 'mask', + ['ears'] = 'ears accessories', + ['shop'] = 'shop', + ['set_unset'] = 'put on / Take off', + ['not_enough_money'] = 'you do not have enough money', + ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu', + ['accessories_blip'] = 'accessories', + ['no_ears'] = 'you do not have ears accessories', + ['no_glasses'] = 'you do not have glasses', + ['no_helmet'] = 'you do not have a helmet', + ['no_mask'] = 'you do not have a mask', + ['you_paid'] = 'you paid ', + +} diff --git a/locales/fr.lua b/locales/fr.lua new file mode 100644 index 00000000..ec20317c --- /dev/null +++ b/locales/fr.lua @@ -0,0 +1,21 @@ +Locales ['fr'] = { + + ['valid_purchase'] = 'valider cet achat ?', + ['yes'] = 'oui', + ['no'] = 'non', + ['helmet'] = 'Casque / Chapeau', + ['glasses'] = 'lunettes', + ['mask'] = 'masque', + ['ears'] = 'accessoires d\'oreilles', + ['shop'] = 'magasin', + ['set_unset'] = 'mettre / Enlever', + ['not_enough_money'] = 'vous n\'avez pas assez d\'argent', + ['press_access'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au menu', + ['accessories_blip'] = 'accessoires', + ['no_ears'] = 'vous n\'avez pas d\'accessoires d\'oreilles', + ['no_glasses'] = 'vous n\'avez pas de lunettes', + ['no_helmet'] = 'vous n\'avez pas de casque / chapeau', + ['no_mask'] = 'vous n\'avez pas de masque', + ['you_paid'] = 'vous avez payé ', + +} diff --git a/server/main.lua b/server/main.lua new file mode 100644 index 00000000..1e496a79 --- /dev/null +++ b/server/main.lua @@ -0,0 +1,62 @@ +ESX = nil + +TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + +RegisterServerEvent('esx_accessories:pay') +AddEventHandler('esx_accessories:pay', function() + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + xPlayer.removeMoney(Config.Price) + TriggerClientEvent('esx:showNotification', _source, _U('you_paid') .. '$' .. Config.Price) + +end) + +RegisterServerEvent('esx_accessories:save') +AddEventHandler('esx_accessories:save', function(skin, accessory) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + + TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) + + store.set('has' .. accessory, true) + + local itemSkin = {} + local item1 = string.lower(accessory) .. '_1' + local item2 = string.lower(accessory) .. '_2' + itemSkin[item1] = skin[item1] + itemSkin[item2] = skin[item2] + store.set('skin', itemSkin) + + end) + +end) + +ESX.RegisterServerCallback('esx_accessories:get', function(source, cb, accessory) + + local xPlayer = ESX.GetPlayerFromId(source) + + TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) + + local hasAccessory = (store.get('has' .. accessory) and store.get('has' .. accessory) or false) + local skin = (store.get('skin') and store.get('skin') or {}) + + cb(hasAccessory, skin) + + end) + +end) + +--=================================================================== +--=================================================================== + +ESX.RegisterServerCallback('esx_accessories:checkMoney', function(source, cb) + + local xPlayer = ESX.GetPlayerFromId(source) + + if xPlayer.get('money') >= Config.Price then + cb(true) + else + cb(false) + end + +end) From b8ef1abd8aaf497277a3aa88902244cc125d9efb Mon Sep 17 00:00:00 2001 From: LuaDeldu Date: Tue, 21 Nov 2017 18:21:45 +0100 Subject: [PATCH 03/30] Add fixes --- .gitattributes | 2 + LICENSE.txt | 674 ++++++++++++++++++++++++++++++++++++++++++++++++ README.md | 17 +- client/main.lua | 9 +- locales/en.lua | 4 +- locales/fr.lua | 4 +- 6 files changed, 694 insertions(+), 16 deletions(-) create mode 100644 .gitattributes create mode 100644 LICENSE.txt diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..eba1110b --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Auto detect text files and perform LF normalization +* text=auto \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 00000000..e7d94eab --- /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_mask + 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_mask 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 diff --git a/README.md b/README.md index c3696694..84a349d2 100644 --- a/README.md +++ b/README.md @@ -1,22 +1,23 @@ # fxserver-esx_accessories FXServer ESX Accessories -[REQUIREMENTS] +Shops with accessories (hat/helmet, glasses, masks, ears accessories). You can put on or take off the accessories with a menu. Accessories saved in database. -- esx_skin => https://github.com/FXServer-ESX/fxserver-esx_skin -- esx_datastore => https://github.com/FXServer-ESX/fxserver-esx_datastore +/!\ Works only with accessories purchased in the special areas of the clothing store, not via the esx_clotheshop script. -[INSTALLATION] + +## REQUIREMENTS + +- esx_skin => https://github.com/ESX-Org/esx_skin +- esx_datastore => https://github.com/ESX-Org/esx_datastore + +## INSTALLATION 1) CD in your resources/[esx] folder 2) Clone the repository -``` -git clone https://github.com/FXServer-ESX/fxserver-esx_accessories esx_accessories -``` 3) Import esx_accessories.sql in your database 4) Add this in your server.cfg : ``` -start baseevents start esx_accessories ``` diff --git a/client/main.lua b/client/main.lua index fb40f0f0..d6fa1bc7 100644 --- a/client/main.lua +++ b/client/main.lua @@ -81,9 +81,10 @@ end function OpenShopMenu(accessory) + local _accessory = string.lower(accessory) local restrict = {} - restrict = { string.lower(accessory) .. '_1', string.lower(accessory) .. '_2' } + restrict = { _accessory .. '_1', _accessory .. '_2' } TriggerEvent('esx_skin:openRestrictedMenu', function(data, menu) @@ -123,11 +124,11 @@ function OpenShopMenu(accessory) TriggerEvent('skinchanger:loadSkin', skin) end) if accessory == "Ears" then - ClearPedProp(Player, 2) + ClearPedProp(player, 2) elseif accessory == "Mask" then SetPedComponentVariation(player, 1, 0 ,0 ,2) elseif accessory == "Helmet" then - ClearPedProp(Player, 0) + ClearPedProp(player, 0) elseif accessory == "Glasses" then SetPedPropIndex(player, 1, -1, 0, 0) end @@ -198,7 +199,7 @@ Citizen.CreateThread(function() SetBlipAsShortRange(blip, true) BeginTextCommandSetBlipName("STRING") - AddTextComponentString(_U('store') .. ' ' .. _U(string.lower(k))) + AddTextComponentString(_U('shop') .. ' ' .. _U(string.lower(k))) EndTextCommandSetBlipName(blip) end end diff --git a/locales/en.lua b/locales/en.lua index d83a0b26..b4c886f7 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -3,11 +3,11 @@ Locales ['en'] = { ['valid_purchase'] = 'validate this purchase?', ['yes'] = 'yes', ['no'] = 'no', - ['helmet'] = 'Helmet / Hat', + ['helmet'] = 'helmet / Hat', ['glasses'] = 'glasses', ['mask'] = 'mask', ['ears'] = 'ears accessories', - ['shop'] = 'shop', + ['shop'] = 'shop of', ['set_unset'] = 'put on / Take off', ['not_enough_money'] = 'you do not have enough money', ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu', diff --git a/locales/fr.lua b/locales/fr.lua index ec20317c..c486909c 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -3,11 +3,11 @@ Locales ['fr'] = { ['valid_purchase'] = 'valider cet achat ?', ['yes'] = 'oui', ['no'] = 'non', - ['helmet'] = 'Casque / Chapeau', + ['helmet'] = 'casque / Chapeau', ['glasses'] = 'lunettes', ['mask'] = 'masque', ['ears'] = 'accessoires d\'oreilles', - ['shop'] = 'magasin', + ['shop'] = 'magasin de', ['set_unset'] = 'mettre / Enlever', ['not_enough_money'] = 'vous n\'avez pas assez d\'argent', ['press_access'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au menu', From 14d4b2cedcb9f5d431e68cba8545e53445f02117 Mon Sep 17 00:00:00 2001 From: LuaDeldu Date: Tue, 21 Nov 2017 18:25:27 +0100 Subject: [PATCH 04/30] Bump version --- __resource.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/__resource.lua b/__resource.lua index 179878e9..6320ae0a 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,7 +2,7 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Accessories' -version '1.0.0' +version '1.0.1' server_scripts { '@es_extended/locale.lua', From 16d99e12f3a261ba124615de4baa7d1d48bdd767 Mon Sep 17 00:00:00 2001 From: Unknown Date: Thu, 22 Feb 2018 01:44:13 +0100 Subject: [PATCH 05/30] Fix message pack Errors --- server/main.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/server/main.lua b/server/main.lua index 1e496a79..cf4f22de 100644 --- a/server/main.lua +++ b/server/main.lua @@ -32,8 +32,8 @@ AddEventHandler('esx_accessories:save', function(skin, accessory) end) ESX.RegisterServerCallback('esx_accessories:get', function(source, cb, accessory) - - local xPlayer = ESX.GetPlayerFromId(source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) @@ -50,8 +50,8 @@ end) --=================================================================== ESX.RegisterServerCallback('esx_accessories: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 066bce056131266afd9c073d7a5f6c4a0223f851 Mon Sep 17 00:00:00 2001 From: LuaDeldu Date: Sun, 15 Apr 2018 02:06:35 +0200 Subject: [PATCH 06/30] Code cleanup + Tabs indents (new try), + Correct Citizen.Wait(), + esx:onPlayerDeath used, + Fix nil value when player press E again without leaving the marker. --- __resource.lua | 20 +-- client/main.lua | 420 ++++++++++++++++++++++++------------------------ config.lua | 162 +++++++++---------- locales/en.lua | 34 ++-- locales/fr.lua | 34 ++-- server/main.lua | 58 +++---- 6 files changed, 360 insertions(+), 368 deletions(-) diff --git a/__resource.lua b/__resource.lua index 6320ae0a..2dd1af28 100644 --- a/__resource.lua +++ b/__resource.lua @@ -5,17 +5,17 @@ description 'ESX Accessories' version '1.0.1' server_scripts { - '@es_extended/locale.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'config.lua', - 'server/main.lua' + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/fr.lua', + 'config.lua', + 'server/main.lua' } client_scripts { - '@es_extended/locale.lua', - 'locales/en.lua', - 'locales/fr.lua', - 'config.lua', - 'client/main.lua' + '@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 d6fa1bc7..fc3500a7 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,281 +1,273 @@ local Keys = { - ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, - ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, - ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, - ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, - ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, - ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, - ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, - ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, - ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 + ["ESC"] = 322, ["F1"] = 288, ["F2"] = 289, ["F3"] = 170, ["F5"] = 166, ["F6"] = 167, ["F7"] = 168, ["F8"] = 169, ["F9"] = 56, ["F10"] = 57, + ["~"] = 243, ["1"] = 157, ["2"] = 158, ["3"] = 160, ["4"] = 164, ["5"] = 165, ["6"] = 159, ["7"] = 161, ["8"] = 162, ["9"] = 163, ["-"] = 84, ["="] = 83, ["BACKSPACE"] = 177, + ["TAB"] = 37, ["Q"] = 44, ["W"] = 32, ["E"] = 38, ["R"] = 45, ["T"] = 245, ["Y"] = 246, ["U"] = 303, ["P"] = 199, ["["] = 39, ["]"] = 40, ["ENTER"] = 18, + ["CAPS"] = 137, ["A"] = 34, ["S"] = 8, ["D"] = 9, ["F"] = 23, ["G"] = 47, ["H"] = 74, ["K"] = 311, ["L"] = 182, + ["LEFTSHIFT"] = 21, ["Z"] = 20, ["X"] = 73, ["C"] = 26, ["V"] = 0, ["B"] = 29, ["N"] = 249, ["M"] = 244, [","] = 82, ["."] = 81, + ["LEFTCTRL"] = 36, ["LEFTALT"] = 19, ["SPACE"] = 22, ["RIGHTCTRL"] = 70, + ["HOME"] = 213, ["PAGEUP"] = 10, ["PAGEDOWN"] = 11, ["DELETE"] = 178, + ["LEFT"] = 174, ["RIGHT"] = 175, ["TOP"] = 27, ["DOWN"] = 173, + ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 } - -ESX = nil + +ESX = nil local HasAlreadyEnteredMarker = false -local LastZone = nil -local CurrentAction = nil -local CurrentActionMsg = '' -local CurrentActionData = {} -local IsDead = false +local LastZone = nil +local CurrentAction = nil +local CurrentActionMsg = '' +local CurrentActionData = {} +local isDead = false Citizen.CreateThread(function() - while ESX == nil do - TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) - Citizen.Wait(0) - end + while ESX == nil do + TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) + Citizen.Wait(0) + end end) function OpenAccessoryMenu() - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'set_unset_accessory', - { - title = _U('set_unset'), - align = 'top-left', - elements = { - {label = _U('helmet'), value = 'Helmet'}, - {label = _U('ears'), value = 'Ears'}, - {label = _U('mask'), value = 'Mask'}, - {label = _U('glasses'), value = 'Glasses'}, - } - }, - function(data, menu) - menu.close() - SetUnsetAccessory(data.current.value) + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), 'set_unset_accessory', + { + title = _U('set_unset'), + align = 'top-left', + elements = { + {label = _U('helmet'), value = 'Helmet'}, + {label = _U('ears'), value = 'Ears'}, + {label = _U('mask'), value = 'Mask'}, + {label = _U('glasses'), value = 'Glasses'}, + } + }, + function(data, menu) + menu.close() + SetUnsetAccessory(data.current.value) - end, - function(data, menu) - menu.close() - end - ) + end, + function(data, menu) + menu.close() + end + ) end function SetUnsetAccessory(accessory) - - ESX.TriggerServerCallback('esx_accessories:get', function(hasAccessory, accessorySkin) - local _accessory = string.lower(accessory) + + ESX.TriggerServerCallback('esx_accessories:get', function(hasAccessory, accessorySkin) + local _accessory = string.lower(accessory) - if hasAccessory then - TriggerEvent('skinchanger:getSkin', function(skin) - local mAccessory = -1 - local mColor = 0 - if _accessory == "mask" then - mAccessory = 0 - end - if skin[_accessory .. '_1'] == mAccessory then - mAccessory = accessorySkin[_accessory .. '_1'] - mColor = accessorySkin[_accessory .. '_2'] - end - local accessorySkin = {} - accessorySkin[_accessory .. '_1'] = mAccessory - accessorySkin[_accessory .. '_2'] = mColor - TriggerEvent('skinchanger:loadClothes', skin, accessorySkin) - end) - else - ESX.ShowNotification(_U('no_' .. _accessory)) - end + if hasAccessory then + TriggerEvent('skinchanger:getSkin', function(skin) + local mAccessory = -1 + local mColor = 0 + if _accessory == "mask" then + mAccessory = 0 + end + if skin[_accessory .. '_1'] == mAccessory then + mAccessory = accessorySkin[_accessory .. '_1'] + mColor = accessorySkin[_accessory .. '_2'] + end + local accessorySkin = {} + accessorySkin[_accessory .. '_1'] = mAccessory + accessorySkin[_accessory .. '_2'] = mColor + TriggerEvent('skinchanger:loadClothes', skin, accessorySkin) + end) + else + ESX.ShowNotification(_U('no_' .. _accessory)) + end - end, accessory) - + end, accessory) + end function OpenShopMenu(accessory) - local _accessory = string.lower(accessory) - local restrict = {} + local _accessory = string.lower(accessory) + local restrict = {} - restrict = { _accessory .. '_1', _accessory .. '_2' } - - TriggerEvent('esx_skin:openRestrictedMenu', function(data, menu) + restrict = { _accessory .. '_1', _accessory .. '_2' } + + TriggerEvent('esx_skin:openRestrictedMenu', function(data, menu) - menu.close() + menu.close() - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'shop_confirm', - { - title = _U('valid_purchase'), - align = 'top-left', - elements = { - {label = _U('yes'), value = 'yes'}, - {label = _U('no'), value = 'no'}, - } - }, - function(data, menu) - menu.close() - if data.current.value == 'yes' then - ESX.TriggerServerCallback('esx_accessories:checkMoney', function(hasEnoughMoney) - if hasEnoughMoney then - TriggerServerEvent('esx_accessories:pay') - TriggerEvent('skinchanger:getSkin', function(skin) - TriggerServerEvent('esx_accessories:save', skin, accessory) - end) - else - TriggerEvent('esx_skin:getLastSkin', function(skin) - TriggerEvent('skinchanger:loadSkin', skin) - end) - ESX.ShowNotification(_U('not_enough_money')) - end - end) - end + ESX.UI.Menu.Open( + 'default', GetCurrentResourceName(), 'shop_confirm', + { + title = _U('valid_purchase'), + align = 'top-left', + elements = { + {label = _U('yes'), value = 'yes'}, + {label = _U('no'), value = 'no'}, + } + }, + function(data, menu) + menu.close() + if data.current.value == 'yes' then + ESX.TriggerServerCallback('esx_accessories:checkMoney', function(hasEnoughMoney) + if hasEnoughMoney then + TriggerServerEvent('esx_accessories:pay') + TriggerEvent('skinchanger:getSkin', function(skin) + TriggerServerEvent('esx_accessories:save', skin, accessory) + end) + else + TriggerEvent('esx_skin:getLastSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + ESX.ShowNotification(_U('not_enough_money')) + end + end) + end - if data.current.value == 'no' then - local player = GetPlayerPed(-1) - TriggerEvent('esx_skin:getLastSkin', function(skin) - TriggerEvent('skinchanger:loadSkin', skin) - end) - if accessory == "Ears" then - ClearPedProp(player, 2) - elseif accessory == "Mask" then - SetPedComponentVariation(player, 1, 0 ,0 ,2) - elseif accessory == "Helmet" then - ClearPedProp(player, 0) - elseif accessory == "Glasses" then - SetPedPropIndex(player, 1, -1, 0, 0) - end - end - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('press_access') - CurrentActionData = {} - end, - function(data, menu) - menu.close() - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('press_access') - CurrentActionData = {} + if data.current.value == 'no' then + local player = GetPlayerPed(-1) + TriggerEvent('esx_skin:getLastSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + if accessory == "Ears" then + ClearPedProp(player, 2) + elseif accessory == "Mask" then + SetPedComponentVariation(player, 1, 0 ,0 ,2) + elseif accessory == "Helmet" then + ClearPedProp(player, 0) + elseif accessory == "Glasses" then + SetPedPropIndex(player, 1, -1, 0, 0) + 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 + ) - end, - function(data, menu) - menu.close() - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('press_access') - CurrentActionData = {} - end, restrict) + end, + function(data, menu) + menu.close() + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('press_access') + CurrentActionData = {} + end, restrict) end AddEventHandler('playerSpawned', function() - IsDead = false + isDead = false end) -AddEventHandler('baseevents:onPlayerDied', function(killerType, coords) - TriggerEvent('esx_ambulancejob:onPlayerDeath') -end) - -AddEventHandler('baseevents:onPlayerKilled', function(killerId, data) - TriggerEvent('esx_ambulancejob:onPlayerDeath') -end) - -AddEventHandler('esx_ambulancejob:onPlayerDeath', function() - IsDead = true +AddEventHandler('esx:onPlayerDeath', function() + isDead = true end) AddEventHandler('esx_accessories:hasEnteredMarker', function(zone) - CurrentAction = 'shop_menu' - CurrentActionMsg = _U('press_access') - CurrentActionData = { accessory = zone } + CurrentAction = 'shop_menu' + CurrentActionMsg = _U('press_access') + CurrentActionData = { accessory = zone } end) AddEventHandler('esx_accessories:hasExitedMarker', function(zone) - ESX.UI.Menu.CloseAll() - CurrentAction = nil + ESX.UI.Menu.CloseAll() + CurrentAction = nil end) -- Create Blips -- Citizen.CreateThread(function() - for k,v in pairs(Config.ShopsBlips) do - if v.Pos ~= nil then - for i=1, #v.Pos, 1 do - local blip = AddBlipForCoord(v.Pos[i].x, v.Pos[i].y, v.Pos[i].z) + for k,v in pairs(Config.ShopsBlips) do + if v.Pos ~= nil then + for i=1, #v.Pos, 1 do + local blip = AddBlipForCoord(v.Pos[i].x, v.Pos[i].y, v.Pos[i].z) - SetBlipSprite (blip, v.Blip.sprite) - SetBlipDisplay(blip, 4) - SetBlipScale (blip, 1.0) - SetBlipColour (blip, v.Blip.color) - SetBlipAsShortRange(blip, true) + SetBlipSprite (blip, v.Blip.sprite) + SetBlipDisplay(blip, 4) + SetBlipScale (blip, 1.0) + SetBlipColour (blip, v.Blip.color) + SetBlipAsShortRange(blip, true) - BeginTextCommandSetBlipName("STRING") - AddTextComponentString(_U('shop') .. ' ' .. _U(string.lower(k))) - EndTextCommandSetBlipName(blip) - end - end - end + BeginTextCommandSetBlipName("STRING") + AddTextComponentString(_U('shop') .. ' ' .. _U(string.lower(k))) + EndTextCommandSetBlipName(blip) + end + end + 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 - for i = 1, #v.Pos, 1 do - if(Config.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.DrawDistance) then - DrawMarker(Config.Type, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.Size.x, Config.Size.y, Config.Size.z, Config.Color.r, Config.Color.g, Config.Color.b, 100, false, true, 2, false, false, false, false) - end - end - end - end + while true do + Citizen.Wait(0) + local coords = GetEntityCoords(GetPlayerPed(-1)) + for k,v in pairs(Config.Zones) do + for i = 1, #v.Pos, 1 do + if(Config.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.DrawDistance) then + DrawMarker(Config.Type, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.Size.x, Config.Size.y, Config.Size.z, Config.Color.r, Config.Color.g, Config.Color.b, 100, false, true, 2, false, false, false, false) + end + end + end + end end) 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 - for i = 1, #v.Pos, 1 do - if(GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.Size.x) then - isInMarker = true - currentZone = k - end - end - end + while true do + + Citizen.Wait(10) + + local coords = GetEntityCoords(GetPlayerPed(-1)) + local isInMarker = false + local currentZone = nil + for k,v in pairs(Config.Zones) do + for i = 1, #v.Pos, 1 do + if(GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.Size.x) then + isInMarker = true + currentZone = k + end + end + end - if (isInMarker and not HasAlreadyEnteredMarker) or (isInMarker and LastZone ~= currentZone) then - HasAlreadyEnteredMarker = true - LastZone = currentZone - TriggerEvent('esx_accessories:hasEnteredMarker', currentZone) - end + if (isInMarker and not HasAlreadyEnteredMarker) or (isInMarker and LastZone ~= currentZone) then + HasAlreadyEnteredMarker = true + LastZone = currentZone + TriggerEvent('esx_accessories:hasEnteredMarker', currentZone) + end - if not isInMarker and HasAlreadyEnteredMarker then - HasAlreadyEnteredMarker = false - TriggerEvent('esx_accessories:hasExitedMarker', LastZone) - end + if not isInMarker and HasAlreadyEnteredMarker then + HasAlreadyEnteredMarker = false + TriggerEvent('esx_accessories:hasExitedMarker', LastZone) + end - end + end end) -- Key controls Citizen.CreateThread(function() - while true do + while true do - Citizen.Wait(0) + Citizen.Wait(10) - if CurrentAction ~= nil then - SetTextComponentFormat('STRING') - AddTextComponentString(CurrentActionMsg) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) + if CurrentAction ~= nil then + SetTextComponentFormat('STRING') + AddTextComponentString(CurrentActionMsg) + DisplayHelpTextFromStringLabel(0, 0, 1, -1) - if IsControlJustReleased(0, 38) then - OpenShopMenu(CurrentActionData.accessory) - CurrentAction = nil - end - end + if IsControlJustReleased(0, 38) and CurrentActionData.accessory ~= nil then + OpenShopMenu(CurrentActionData.accessory) + CurrentAction = nil + end + end - if Config.EnableControls then - if IsControlJustReleased(0, Keys['K']) and not IsDead then - OpenAccessoryMenu() - end - end + if Config.EnableControls then + if IsControlJustReleased(0, Keys['K']) and not isDead then + OpenAccessoryMenu() + end + end - end + end end) diff --git a/config.lua b/config.lua index 3b721a9b..58c0b852 100644 --- a/config.lua +++ b/config.lua @@ -17,89 +17,89 @@ Config.Type = 1 -- If you have esx_clothesshop you should not fill this -- more than it's already filled. Config.ShopsBlips = { - Ears = { - Pos = nil, - Blip = nil - }, - Mask = { - Pos = { - { x = -1338.129, y = -1278.200, z = 3.872 }, - }, - Blip = { sprite = 362, color = 2 } - }, - Helmet = { - Pos = nil, - Blip = nil - }, - Glasses = { - Pos = nil, - Blip = nil - } + Ears = { + Pos = nil, + Blip = nil + }, + Mask = { + Pos = { + { x = -1338.129, y = -1278.200, z = 3.872 }, + }, + Blip = { sprite = 362, color = 2 } + }, + Helmet = { + Pos = nil, + Blip = nil + }, + Glasses = { + Pos = nil, + Blip = nil + } } Config.Zones = { - Ears = { - Pos = { - {x= 80.374, y= -1389.493, z= 28.406}, - {x= -709.426, y= -153.829, z= 36.535}, - {x= -163.093, y= -302.038, z= 38.853}, - {x= 420.787, y= -809.654, z= 28.611}, - {x= -817.070, y= -1075.965, z= 10.448}, - {x= -1451.300, y= -238.254, z= 48.929}, - {x= -0.756, y= 6513.685, z= 30.997}, - {x= 123.431, y= -208.060, z= 53.677}, - {x= 1687.318, y= 4827.685, z= 41.183}, - {x= 622.806, y= 2749.221, z= 41.208}, - {x= 1200.085, y= 2705.428, z= 37.342}, - {x= -1199.959, y= -782.534, z= 16.452}, - {x= -3171.867, y= 1059.632, z= 19.983}, - {x= -1095.670, y= 2709.245, z= 18.227}, - } - - }, - - Mask = { - Pos = { - {x = -1338.129, y = -1278.200, z = 3.872}, - } - }, - - Helmet = { - Pos = { - {x= 81.576, y= -1400.602, z= 28.406}, - {x= -705.845, y= -159.015, z= 36.535}, - {x= -161.349, y= -295.774, z= 38.853}, - {x= 419.319, y= -800.647, z= 28.611}, - {x= -824.362, y= -1081.741, z= 10.448}, - {x= -1454.888, y= -242.911, z= 48.931}, - {x= 4.770, y= 6520.935, z= 30.997}, - {x= 121.071, y= -223.266, z= 53.377}, - {x= 1689.648, y= 4818.805, z= 41.183}, - {x= 613.971, y= 2749.978, z= 41.208}, - {x= 1189.513, y= 2703.947, z= 37.342}, - {x= -1204.025, y= -774.439, z= 16.452}, - {x= -3164.280, y= 1054.705, z= 19.983}, - {x= -1103.125, y= 2700.599, z= 18.227}, - } - }, - - Glasses = { - Pos = { - {x= 75.287, y= -1391.131, z= 28.406}, - {x= -713.102, y= -160.116, z= 36.535}, - {x= -156.171, y= -300.547, z= 38.853}, - {x= 425.478, y= -807.866, z= 28.611}, - {x= -820.853, y= -1072.940, z= 10.448}, - {x= -1458.052, y= -236.783, z= 48.918}, - {x= 3.587, y= 6511.585, z= 30.997}, - {x= 131.335, y= -212.336, z= 53.677}, - {x= 1694.936, y= 4820.837, z= 41.183}, - {x= 613.972, y= 2768.814, z= 41.208}, - {x= 1198.678, y= 2711.011, z= 37.342}, - {x= -1188.227, y= -764.594, z= 16.452}, - {x= -3173.192, y= 1038.228, z= 19.983}, - {x= -1100.494, y= 2712.481, z= 18.227}, - } - } + Ears = { + Pos = { + {x= 80.374, y= -1389.493, z= 28.406}, + {x= -709.426, y= -153.829, z= 36.535}, + {x= -163.093, y= -302.038, z= 38.853}, + {x= 420.787, y= -809.654, z= 28.611}, + {x= -817.070, y= -1075.965, z= 10.448}, + {x= -1451.300, y= -238.254, z= 48.929}, + {x= -0.756, y= 6513.685, z= 30.997}, + {x= 123.431, y= -208.060, z= 53.677}, + {x= 1687.318, y= 4827.685, z= 41.183}, + {x= 622.806, y= 2749.221, z= 41.208}, + {x= 1200.085, y= 2705.428, z= 37.342}, + {x= -1199.959, y= -782.534, z= 16.452}, + {x= -3171.867, y= 1059.632, z= 19.983}, + {x= -1095.670, y= 2709.245, z= 18.227}, + } + + }, + + Mask = { + Pos = { + {x = -1338.129, y = -1278.200, z = 3.872}, + } + }, + + Helmet = { + Pos = { + {x= 81.576, y= -1400.602, z= 28.406}, + {x= -705.845, y= -159.015, z= 36.535}, + {x= -161.349, y= -295.774, z= 38.853}, + {x= 419.319, y= -800.647, z= 28.611}, + {x= -824.362, y= -1081.741, z= 10.448}, + {x= -1454.888, y= -242.911, z= 48.931}, + {x= 4.770, y= 6520.935, z= 30.997}, + {x= 121.071, y= -223.266, z= 53.377}, + {x= 1689.648, y= 4818.805, z= 41.183}, + {x= 613.971, y= 2749.978, z= 41.208}, + {x= 1189.513, y= 2703.947, z= 37.342}, + {x= -1204.025, y= -774.439, z= 16.452}, + {x= -3164.280, y= 1054.705, z= 19.983}, + {x= -1103.125, y= 2700.599, z= 18.227}, + } + }, + + Glasses = { + Pos = { + {x= 75.287, y= -1391.131, z= 28.406}, + {x= -713.102, y= -160.116, z= 36.535}, + {x= -156.171, y= -300.547, z= 38.853}, + {x= 425.478, y= -807.866, z= 28.611}, + {x= -820.853, y= -1072.940, z= 10.448}, + {x= -1458.052, y= -236.783, z= 48.918}, + {x= 3.587, y= 6511.585, z= 30.997}, + {x= 131.335, y= -212.336, z= 53.677}, + {x= 1694.936, y= 4820.837, z= 41.183}, + {x= 613.972, y= 2768.814, z= 41.208}, + {x= 1198.678, y= 2711.011, z= 37.342}, + {x= -1188.227, y= -764.594, z= 16.452}, + {x= -3173.192, y= 1038.228, z= 19.983}, + {x= -1100.494, y= 2712.481, z= 18.227}, + } + } } diff --git a/locales/en.lua b/locales/en.lua index b4c886f7..b85a3473 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,21 +1,21 @@ Locales ['en'] = { - ['valid_purchase'] = 'validate this purchase?', - ['yes'] = 'yes', - ['no'] = 'no', - ['helmet'] = 'helmet / Hat', - ['glasses'] = 'glasses', - ['mask'] = 'mask', - ['ears'] = 'ears accessories', - ['shop'] = 'shop of', - ['set_unset'] = 'put on / Take off', - ['not_enough_money'] = 'you do not have enough money', - ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu', - ['accessories_blip'] = 'accessories', - ['no_ears'] = 'you do not have ears accessories', - ['no_glasses'] = 'you do not have glasses', - ['no_helmet'] = 'you do not have a helmet', - ['no_mask'] = 'you do not have a mask', - ['you_paid'] = 'you paid ', + ['valid_purchase'] = 'validate this purchase?', + ['yes'] = 'yes', + ['no'] = 'no', + ['helmet'] = 'helmet / Hat', + ['glasses'] = 'glasses', + ['mask'] = 'mask', + ['ears'] = 'ears accessories', + ['shop'] = 'shop of', + ['set_unset'] = 'put on / Take off', + ['not_enough_money'] = 'you do not have enough money', + ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu', + ['accessories_blip'] = 'accessories', + ['no_ears'] = 'you do not have ears accessories', + ['no_glasses'] = 'you do not have glasses', + ['no_helmet'] = 'you do not have a helmet', + ['no_mask'] = 'you do not have a mask', + ['you_paid'] = 'you paid ', } diff --git a/locales/fr.lua b/locales/fr.lua index c486909c..665c4eed 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,21 +1,21 @@ Locales ['fr'] = { - ['valid_purchase'] = 'valider cet achat ?', - ['yes'] = 'oui', - ['no'] = 'non', - ['helmet'] = 'casque / Chapeau', - ['glasses'] = 'lunettes', - ['mask'] = 'masque', - ['ears'] = 'accessoires d\'oreilles', - ['shop'] = 'magasin de', - ['set_unset'] = 'mettre / Enlever', - ['not_enough_money'] = 'vous n\'avez pas assez d\'argent', - ['press_access'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au menu', - ['accessories_blip'] = 'accessoires', - ['no_ears'] = 'vous n\'avez pas d\'accessoires d\'oreilles', - ['no_glasses'] = 'vous n\'avez pas de lunettes', - ['no_helmet'] = 'vous n\'avez pas de casque / chapeau', - ['no_mask'] = 'vous n\'avez pas de masque', - ['you_paid'] = 'vous avez payé ', + ['valid_purchase'] = 'valider cet achat ?', + ['yes'] = 'oui', + ['no'] = 'non', + ['helmet'] = 'casque / Chapeau', + ['glasses'] = 'lunettes', + ['mask'] = 'masque', + ['ears'] = 'accessoires d\'oreilles', + ['shop'] = 'magasin de', + ['set_unset'] = 'mettre / Enlever', + ['not_enough_money'] = 'vous n\'avez pas assez d\'argent', + ['press_access'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au menu', + ['accessories_blip'] = 'accessoires', + ['no_ears'] = 'vous n\'avez pas d\'accessoires d\'oreilles', + ['no_glasses'] = 'vous n\'avez pas de lunettes', + ['no_helmet'] = 'vous n\'avez pas de casque / chapeau', + ['no_mask'] = 'vous n\'avez pas de masque', + ['you_paid'] = 'vous avez payé ', } diff --git a/server/main.lua b/server/main.lua index cf4f22de..b2d0887c 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,45 +4,45 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_accessories:pay') AddEventHandler('esx_accessories:pay', function() - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) - xPlayer.removeMoney(Config.Price) - TriggerClientEvent('esx:showNotification', _source, _U('you_paid') .. '$' .. Config.Price) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) + xPlayer.removeMoney(Config.Price) + TriggerClientEvent('esx:showNotification', _source, _U('you_paid') .. '$' .. Config.Price) end) RegisterServerEvent('esx_accessories:save') AddEventHandler('esx_accessories:save', function(skin, accessory) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local _source = source + local xPlayer = ESX.GetPlayerFromId(_source) - TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) - - store.set('has' .. accessory, true) + TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) + + store.set('has' .. accessory, true) - local itemSkin = {} - local item1 = string.lower(accessory) .. '_1' - local item2 = string.lower(accessory) .. '_2' - itemSkin[item1] = skin[item1] - itemSkin[item2] = skin[item2] - store.set('skin', itemSkin) + local itemSkin = {} + local item1 = string.lower(accessory) .. '_1' + local item2 = string.lower(accessory) .. '_2' + itemSkin[item1] = skin[item1] + itemSkin[item2] = skin[item2] + store.set('skin', itemSkin) - end) + end) end) ESX.RegisterServerCallback('esx_accessories:get', function(source, cb, accessory) local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(_source) - TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) - - local hasAccessory = (store.get('has' .. accessory) and store.get('has' .. accessory) or false) - local skin = (store.get('skin') and store.get('skin') or {}) + TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) + + local hasAccessory = (store.get('has' .. accessory) and store.get('has' .. accessory) or false) + local skin = (store.get('skin') and store.get('skin') or {}) - cb(hasAccessory, skin) + cb(hasAccessory, skin) - end) + end) end) @@ -51,12 +51,12 @@ end) ESX.RegisterServerCallback('esx_accessories:checkMoney', function(source, cb) local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(_source) - if xPlayer.get('money') >= Config.Price then - cb(true) - else - cb(false) - end + if xPlayer.get('money') >= Config.Price then + cb(true) + else + cb(false) + end end) From e0baebf083377c59c755ec0384d619fcf065a622 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 15 Apr 2018 11:20:10 +0200 Subject: [PATCH 07/30] Only keyboard input, minor fixes --- README.md | 7 +++---- client/main.lua | 28 +++++++++++----------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 84a349d2..8bef861b 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,4 @@ -# fxserver-esx_accessories -FXServer ESX Accessories +# esx_accessories Shops with accessories (hat/helmet, glasses, masks, ears accessories). You can put on or take off the accessories with a menu. Accessories saved in database. @@ -8,8 +7,8 @@ Shops with accessories (hat/helmet, glasses, masks, ears accessories). You can p ## REQUIREMENTS -- esx_skin => https://github.com/ESX-Org/esx_skin -- esx_datastore => https://github.com/ESX-Org/esx_datastore +- [esx_skin](https://github.com/ESX-Org/esx_skin) +- [esx_datastore](https://github.com/ESX-Org/esx_datastore) ## INSTALLATION diff --git a/client/main.lua b/client/main.lua index fc3500a7..ea1b2813 100644 --- a/client/main.lua +++ b/client/main.lua @@ -10,13 +10,13 @@ local Keys = { ["NENTER"] = 201, ["N4"] = 108, ["N5"] = 60, ["N6"] = 107, ["N+"] = 96, ["N-"] = 97, ["N7"] = 117, ["N8"] = 61, ["N9"] = 118 } -ESX = nil -local HasAlreadyEnteredMarker = false -local LastZone = nil -local CurrentAction = nil +ESX = nil +local HasAlreadyEnteredMarker = false +local LastZone = nil +local CurrentAction = nil local CurrentActionMsg = '' local CurrentActionData = {} -local isDead = false +local isDead = false Citizen.CreateThread(function() while ESX == nil do @@ -76,7 +76,6 @@ function SetUnsetAccessory(accessory) end end, accessory) - end function OpenShopMenu(accessory) @@ -149,7 +148,7 @@ function OpenShopMenu(accessory) end, function(data, menu) menu.close() - CurrentAction = 'shop_menu' + CurrentAction = 'shop_menu' CurrentActionMsg = _U('press_access') CurrentActionData = {} end, restrict) @@ -165,11 +164,9 @@ AddEventHandler('esx:onPlayerDeath', function() end) AddEventHandler('esx_accessories:hasEnteredMarker', function(zone) - - CurrentAction = 'shop_menu' + CurrentAction = 'shop_menu' CurrentActionMsg = _U('press_access') CurrentActionData = { accessory = zone } - end) AddEventHandler('esx_accessories:hasExitedMarker', function(zone) @@ -216,10 +213,8 @@ end) Citizen.CreateThread(function() while true do - Citizen.Wait(10) - - local coords = GetEntityCoords(GetPlayerPed(-1)) + local coords = GetEntityCoords(GetPlayerPed(-1)) local isInMarker = false local currentZone = nil for k,v in pairs(Config.Zones) do @@ -233,7 +228,7 @@ Citizen.CreateThread(function() if (isInMarker and not HasAlreadyEnteredMarker) or (isInMarker and LastZone ~= currentZone) then HasAlreadyEnteredMarker = true - LastZone = currentZone + LastZone = currentZone TriggerEvent('esx_accessories:hasEnteredMarker', currentZone) end @@ -249,9 +244,8 @@ end) -- Key controls Citizen.CreateThread(function() while true do - Citizen.Wait(10) - + if CurrentAction ~= nil then SetTextComponentFormat('STRING') AddTextComponentString(CurrentActionMsg) @@ -264,7 +258,7 @@ Citizen.CreateThread(function() end if Config.EnableControls then - if IsControlJustReleased(0, Keys['K']) and not isDead then + if IsControlJustReleased(0, Keys['K']) and GetLastInputMethod(2) and not isDead then OpenAccessoryMenu() end end From 990800d7fd45e1c351dfd609bbe28dc5fd16b4c8 Mon Sep 17 00:00:00 2001 From: AdrineX Date: Wed, 13 Jun 2018 00:15:18 +0300 Subject: [PATCH 08/30] Add Finnish lang... --- __resource.lua | 2 ++ locales/fi.lua | 21 +++++++++++++++++++++ localization/esx_accessories_fi.sql | 7 +++++++ 3 files changed, 30 insertions(+) create mode 100644 locales/fi.lua create mode 100644 localization/esx_accessories_fi.sql diff --git a/__resource.lua b/__resource.lua index 2dd1af28..503cad78 100644 --- a/__resource.lua +++ b/__resource.lua @@ -7,6 +7,7 @@ version '1.0.1' server_scripts { '@es_extended/locale.lua', 'locales/en.lua', + 'locales/fi.lua', 'locales/fr.lua', 'config.lua', 'server/main.lua' @@ -15,6 +16,7 @@ server_scripts { client_scripts { '@es_extended/locale.lua', 'locales/en.lua', + 'locales/fi.lua', 'locales/fr.lua', 'config.lua', 'client/main.lua' diff --git a/locales/fi.lua b/locales/fi.lua new file mode 100644 index 00000000..55b84afb --- /dev/null +++ b/locales/fi.lua @@ -0,0 +1,21 @@ +Locales ['fi'] = { + + ['valid_purchase'] = 'varmista ostos?', + ['yes'] = 'kyllä', + ['no'] = 'ei', + ['helmet'] = 'kypärä / Hattu', + ['glasses'] = 'lasit', + ['mask'] = 'maskit', + ['ears'] = 'korva asusteet', + ['shop'] = 'asustekauppa', + ['set_unset'] = 'laita päälle / Ota pois', + ['not_enough_money'] = 'sinulla ei ole tarpeeksi rahaa', + ['press_access'] = 'paina ~INPUT_CONTEXT~ avataksesi menu', + ['accessories_blip'] = 'asusteet', + ['no_ears'] = 'sinulla ei ole korva asusteita', + ['no_glasses'] = 'sinulla ei ole laseja', + ['no_helmet'] = 'sinulla ei ole kypäriä', + ['no_mask'] = 'sinulla ei ole maskeja', + ['you_paid'] = 'sinä maksoit ', + +} diff --git a/localization/esx_accessories_fi.sql b/localization/esx_accessories_fi.sql new file mode 100644 index 00000000..74b2dd57 --- /dev/null +++ b/localization/esx_accessories_fi.sql @@ -0,0 +1,7 @@ + +INSERT INTO `datastore` (name, label, shared) VALUES + ('user_ears','Korvat',0), + ('user_glasses','Lasit',0), + ('user_helmet','Kypärät',0), + ('user_mask','Maskit',0) +; From 69b43baab7d1e265ed04daaffa5949e432868698 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Wed, 8 Aug 2018 20:24:14 -0400 Subject: [PATCH 09/30] Fixed File Name --- localization/{esx_accessories_fi.sql => fi_esx_accessories.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename localization/{esx_accessories_fi.sql => fi_esx_accessories.sql} (100%) diff --git a/localization/esx_accessories_fi.sql b/localization/fi_esx_accessories.sql similarity index 100% rename from localization/esx_accessories_fi.sql rename to localization/fi_esx_accessories.sql From a00fc831c579ab8acb5ba4bbea3d7261bbb0cc38 Mon Sep 17 00:00:00 2001 From: nearbyplayer Date: Fri, 10 Aug 2018 00:49:31 -0400 Subject: [PATCH 10/30] 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 ad2a4d6b7ca4a6471596a0eb5ae26892efa853f8 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Aug 2018 13:01:43 +0200 Subject: [PATCH 11/30] Locale improvements, Swedish locale --- README.md | 40 +++++-- __resource.lua | 10 +- client/main.lua | 177 +++++++++++++--------------- config.lua | 38 +++--- esx_accessories.sql | 9 +- locales/en.lua | 8 +- locales/fi.lua | 8 +- locales/fr.lua | 10 +- locales/sv.lua | 19 +++ localization/fi_esx_accessories.sql | 9 +- localization/sv_esx_accessories.sql | 8 ++ server/main.lua | 11 +- 12 files changed, 191 insertions(+), 156 deletions(-) create mode 100644 locales/sv.lua create mode 100644 localization/sv_esx_accessories.sql diff --git a/README.md b/README.md index 8bef861b..6af3efba 100644 --- a/README.md +++ b/README.md @@ -4,19 +4,43 @@ Shops with accessories (hat/helmet, glasses, masks, ears accessories). You can p /!\ Works only with accessories purchased in the special areas of the clothing store, not via the esx_clotheshop script. - -## REQUIREMENTS - +## Requirements - [esx_skin](https://github.com/ESX-Org/esx_skin) - [esx_datastore](https://github.com/ESX-Org/esx_datastore) -## INSTALLATION +## Download & Installation -1) CD in your resources/[esx] folder -2) Clone the repository -3) Import esx_accessories.sql in your database -4) Add this in your server.cfg : +### Using [fvm](https://github.com/qlaffont/fvm-installer) +``` +fvm install --save --folder=esx esx-org/esx_accessories +``` + +### Using Git +``` +cd resources +git clone https://github.com/ESX-Org/esx_accessories [esx]/esx_accessories +``` + +### Manually +- Download https://github.com/ESX-Org/esx_accessories/archive/master.zip +- Put it in the `[esx]` directory + +## Installation +- Import `esx_accessories.sql` in your database +- Add this in your `server.cfg`: ``` start esx_accessories ``` + +# Legal +### License +esx_accessories - buy some shiny stuff! + +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/. diff --git a/__resource.lua b/__resource.lua index 503cad78..8e0c1769 100644 --- a/__resource.lua +++ b/__resource.lua @@ -2,13 +2,14 @@ resource_manifest_version '44febabe-d386-4d18-afbe-5e627f4af937' description 'ESX Accessories' -version '1.0.1' +version '1.1.0' server_scripts { '@es_extended/locale.lua', 'locales/en.lua', 'locales/fi.lua', 'locales/fr.lua', + 'locales/sv.lua', 'config.lua', 'server/main.lua' } @@ -18,6 +19,13 @@ client_scripts { 'locales/en.lua', 'locales/fi.lua', 'locales/fr.lua', + 'locales/sv.lua', 'config.lua', 'client/main.lua' } + +dependencies { + 'es_extended', + 'esx_skin', + 'esx_datastore' +} \ No newline at end of file diff --git a/client/main.lua b/client/main.lua index ea1b2813..03901014 100644 --- a/client/main.lua +++ b/client/main.lua @@ -9,14 +9,14 @@ local Keys = { ["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 HasAlreadyEnteredMarker = false -local LastZone = nil -local CurrentAction = nil -local CurrentActionMsg = '' -local CurrentActionData = {} -local isDead = false + +ESX = nil +local HasAlreadyEnteredMarker = false +local LastZone = nil +local CurrentAction = nil +local CurrentActionMsg = '' +local CurrentActionData = {} +local isDead = false Citizen.CreateThread(function() while ESX == nil do @@ -26,39 +26,33 @@ Citizen.CreateThread(function() end) function OpenAccessoryMenu() + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'set_unset_accessory', + { + title = _U('set_unset'), + align = 'top-left', + elements = { + {label = _U('helmet'), value = 'Helmet'}, + {label = _U('ears'), value = 'Ears'}, + {label = _U('mask'), value = 'Mask'}, + {label = _U('glasses'), value = 'Glasses'}, + } + }, function(data, menu) + menu.close() + SetUnsetAccessory(data.current.value) - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'set_unset_accessory', - { - title = _U('set_unset'), - align = 'top-left', - elements = { - {label = _U('helmet'), value = 'Helmet'}, - {label = _U('ears'), value = 'Ears'}, - {label = _U('mask'), value = 'Mask'}, - {label = _U('glasses'), value = 'Glasses'}, - } - }, - function(data, menu) - menu.close() - SetUnsetAccessory(data.current.value) - - end, - function(data, menu) - menu.close() - end - ) + end, function(data, menu) + menu.close() + end) end function SetUnsetAccessory(accessory) - ESX.TriggerServerCallback('esx_accessories:get', function(hasAccessory, accessorySkin) local _accessory = string.lower(accessory) if hasAccessory then TriggerEvent('skinchanger:getSkin', function(skin) local mAccessory = -1 - local mColor = 0 + local mColor = 0 if _accessory == "mask" then mAccessory = 0 end @@ -79,7 +73,6 @@ function SetUnsetAccessory(accessory) end function OpenShopMenu(accessory) - local _accessory = string.lower(accessory) local restrict = {} @@ -89,70 +82,63 @@ function OpenShopMenu(accessory) menu.close() - ESX.UI.Menu.Open( - 'default', GetCurrentResourceName(), 'shop_confirm', - { - title = _U('valid_purchase'), - align = 'top-left', - elements = { - {label = _U('yes'), value = 'yes'}, - {label = _U('no'), value = 'no'}, - } - }, - function(data, menu) - menu.close() - if data.current.value == 'yes' then - ESX.TriggerServerCallback('esx_accessories:checkMoney', function(hasEnoughMoney) - if hasEnoughMoney then - TriggerServerEvent('esx_accessories:pay') - TriggerEvent('skinchanger:getSkin', function(skin) - TriggerServerEvent('esx_accessories:save', skin, accessory) - end) - else - TriggerEvent('esx_skin:getLastSkin', function(skin) - TriggerEvent('skinchanger:loadSkin', skin) - end) - ESX.ShowNotification(_U('not_enough_money')) - end - end) - end - - if data.current.value == 'no' then - local player = GetPlayerPed(-1) - TriggerEvent('esx_skin:getLastSkin', function(skin) - TriggerEvent('skinchanger:loadSkin', skin) - end) - if accessory == "Ears" then - ClearPedProp(player, 2) - elseif accessory == "Mask" then - SetPedComponentVariation(player, 1, 0 ,0 ,2) - elseif accessory == "Helmet" then - ClearPedProp(player, 0) - elseif accessory == "Glasses" then - SetPedPropIndex(player, 1, -1, 0, 0) + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop_confirm', + { + title = _U('valid_purchase'), + align = 'top-left', + elements = { + {label = _U('no'), value = 'no'}, + {label = _U('yes', Config.Price), value = 'yes'} + } + }, function(data, menu) + menu.close() + if data.current.value == 'yes' then + ESX.TriggerServerCallback('esx_accessories:checkMoney', function(hasEnoughMoney) + if hasEnoughMoney then + TriggerServerEvent('esx_accessories:pay') + TriggerEvent('skinchanger:getSkin', function(skin) + TriggerServerEvent('esx_accessories:save', skin, accessory) + end) + else + TriggerEvent('esx_skin:getLastSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + ESX.ShowNotification(_U('not_enough_money')) 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 - ) - end, - function(data, menu) + if data.current.value == 'no' then + local player = GetPlayerPed(-1) + TriggerEvent('esx_skin:getLastSkin', function(skin) + TriggerEvent('skinchanger:loadSkin', skin) + end) + if accessory == "Ears" then + ClearPedProp(player, 2) + elseif accessory == "Mask" then + SetPedComponentVariation(player, 1, 0 ,0 ,2) + elseif accessory == "Helmet" then + ClearPedProp(player, 0) + elseif accessory == "Glasses" then + SetPedPropIndex(player, 1, -1, 0, 0) + 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) menu.close() CurrentAction = 'shop_menu' CurrentActionMsg = _U('press_access') CurrentActionData = {} end, restrict) - end AddEventHandler('playerSpawned', function() @@ -188,7 +174,7 @@ Citizen.CreateThread(function() SetBlipAsShortRange(blip, true) BeginTextCommandSetBlipName("STRING") - AddTextComponentString(_U('shop') .. ' ' .. _U(string.lower(k))) + AddTextComponentString(_U('shop', _U(string.lower(k)))) EndTextCommandSetBlipName(blip) end end @@ -240,21 +226,22 @@ Citizen.CreateThread(function() end end) - -- Key controls Citizen.CreateThread(function() while true do Citizen.Wait(10) if CurrentAction ~= nil then - SetTextComponentFormat('STRING') - AddTextComponentString(CurrentActionMsg) - DisplayHelpTextFromStringLabel(0, 0, 1, -1) - if IsControlJustReleased(0, 38) and CurrentActionData.accessory ~= nil then + ESX.ShowHelpNotification(CurrentActionMsg) + + if IsControlJustReleased(0, Keys['E']) and CurrentActionData.accessory then OpenShopMenu(CurrentActionData.accessory) CurrentAction = nil end + + elseif CurrentAction == nil and not Config.EnableControls then + Citizen.Wait(500) end if Config.EnableControls then @@ -264,4 +251,4 @@ Citizen.CreateThread(function() end end -end) +end) \ No newline at end of file diff --git a/config.lua b/config.lua index 58c0b852..ea21f3af 100644 --- a/config.lua +++ b/config.lua @@ -6,13 +6,11 @@ Config.Price = 100 Config.EnableControls = true - Config.DrawDistance = 100.0 Config.Size = {x = 1.5, y = 1.5, z = 1.0} Config.Color = {r = 102, g = 102, b = 204} Config.Type = 1 - -- Fill this if you want to see the blips, -- If you have esx_clothesshop you should not fill this -- more than it's already filled. @@ -40,20 +38,20 @@ Config.ShopsBlips = { Config.Zones = { Ears = { Pos = { - {x= 80.374, y= -1389.493, z= 28.406}, - {x= -709.426, y= -153.829, z= 36.535}, - {x= -163.093, y= -302.038, z= 38.853}, - {x= 420.787, y= -809.654, z= 28.611}, - {x= -817.070, y= -1075.965, z= 10.448}, - {x= -1451.300, y= -238.254, z= 48.929}, - {x= -0.756, y= 6513.685, z= 30.997}, - {x= 123.431, y= -208.060, z= 53.677}, - {x= 1687.318, y= 4827.685, z= 41.183}, - {x= 622.806, y= 2749.221, z= 41.208}, - {x= 1200.085, y= 2705.428, z= 37.342}, - {x= -1199.959, y= -782.534, z= 16.452}, - {x= -3171.867, y= 1059.632, z= 19.983}, - {x= -1095.670, y= 2709.245, z= 18.227}, + {x= 80.374, y= -1389.493, z= 28.406}, + {x= -709.426, y= -153.829, z= 36.535}, + {x= -163.093, y= -302.038, z= 38.853}, + {x= 420.787, y= -809.654, z= 28.611}, + {x= -817.070, y= -1075.96, z= 10.448}, + {x= -1451.300, y= -238.254, z= 48.929}, + {x= -0.756, y= 6513.685, z= 30.997}, + {x= 123.431, y= -208.060, z= 53.677}, + {x= 1687.318, y= 4827.685, z= 41.183}, + {x= 622.806, y= 2749.221, z= 41.208}, + {x= 1200.085, y= 2705.428, z= 37.342}, + {x= -1199.959, y= -782.534, z= 16.452}, + {x= -3171.867, y= 1059.632, z= 19.983}, + {x= -1095.670, y= 2709.245, z= 18.227}, } }, @@ -66,13 +64,13 @@ Config.Zones = { Helmet = { Pos = { - {x= 81.576, y= -1400.602, z= 28.406}, + {x= 81.576, y= -1400.602, z= 28.406}, {x= -705.845, y= -159.015, z= 36.535}, {x= -161.349, y= -295.774, z= 38.853}, {x= 419.319, y= -800.647, z= 28.611}, {x= -824.362, y= -1081.741, z= 10.448}, {x= -1454.888, y= -242.911, z= 48.931}, - {x= 4.770, y= 6520.935, z= 30.997}, + {x= 4.770, y= 6520.935, z= 30.997}, {x= 121.071, y= -223.266, z= 53.377}, {x= 1689.648, y= 4818.805, z= 41.183}, {x= 613.971, y= 2749.978, z= 41.208}, @@ -85,13 +83,13 @@ Config.Zones = { Glasses = { Pos = { - {x= 75.287, y= -1391.131, z= 28.406}, + {x= 75.287, y= -1391.131, z= 28.406}, {x= -713.102, y= -160.116, z= 36.535}, {x= -156.171, y= -300.547, z= 38.853}, {x= 425.478, y= -807.866, z= 28.611}, {x= -820.853, y= -1072.940, z= 10.448}, {x= -1458.052, y= -236.783, z= 48.918}, - {x= 3.587, y= 6511.585, z= 30.997}, + {x= 3.587, y= 6511.585, z= 30.997}, {x= 131.335, y= -212.336, z= 53.677}, {x= 1694.936, y= 4820.837, z= 41.183}, {x= 613.972, y= 2768.814, z= 41.208}, diff --git a/esx_accessories.sql b/esx_accessories.sql index 92c65768..d10b2e1b 100644 --- a/esx_accessories.sql +++ b/esx_accessories.sql @@ -1,7 +1,8 @@ +USE `essentialmode`; INSERT INTO `datastore` (name, label, shared) VALUES - ('user_ears','Ears',0), - ('user_glasses','Glasses',0), - ('user_helmet','Helmet',0), - ('user_mask','Mask',0) + ('user_ears', 'Ears', 0), + ('user_glasses', 'Glasses', 0), + ('user_helmet', 'Helmet', 0), + ('user_mask', 'Mask', 0) ; diff --git a/locales/en.lua b/locales/en.lua index b85a3473..2cb77f7d 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,13 +1,12 @@ Locales ['en'] = { - ['valid_purchase'] = 'validate this purchase?', - ['yes'] = 'yes', + ['yes'] = 'yes ($%s)', ['no'] = 'no', ['helmet'] = 'helmet / Hat', ['glasses'] = 'glasses', ['mask'] = 'mask', ['ears'] = 'ears accessories', - ['shop'] = 'shop of', + ['shop'] = '%s shop', ['set_unset'] = 'put on / Take off', ['not_enough_money'] = 'you do not have enough money', ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu', @@ -16,6 +15,5 @@ Locales ['en'] = { ['no_glasses'] = 'you do not have glasses', ['no_helmet'] = 'you do not have a helmet', ['no_mask'] = 'you do not have a mask', - ['you_paid'] = 'you paid ', - + ['you_paid'] = 'you paid ~g~$%s~s~', } diff --git a/locales/fi.lua b/locales/fi.lua index 55b84afb..4b8748bc 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,13 +1,12 @@ Locales ['fi'] = { - ['valid_purchase'] = 'varmista ostos?', - ['yes'] = 'kyllä', + ['yes'] = 'kyllä ($%s)', ['no'] = 'ei', ['helmet'] = 'kypärä / Hattu', ['glasses'] = 'lasit', ['mask'] = 'maskit', ['ears'] = 'korva asusteet', - ['shop'] = 'asustekauppa', + ['shop'] = '%s asustekauppa', ['set_unset'] = 'laita päälle / Ota pois', ['not_enough_money'] = 'sinulla ei ole tarpeeksi rahaa', ['press_access'] = 'paina ~INPUT_CONTEXT~ avataksesi menu', @@ -16,6 +15,5 @@ Locales ['fi'] = { ['no_glasses'] = 'sinulla ei ole laseja', ['no_helmet'] = 'sinulla ei ole kypäriä', ['no_mask'] = 'sinulla ei ole maskeja', - ['you_paid'] = 'sinä maksoit ', - + ['you_paid'] = 'sinä maksoit ~g~$%s~s~', } diff --git a/locales/fr.lua b/locales/fr.lua index 665c4eed..c6a02037 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,13 +1,12 @@ Locales ['fr'] = { - - ['valid_purchase'] = 'valider cet achat ?', - ['yes'] = 'oui', + ['valid_purchase'] = 'valider cet achat?', + ['yes'] = 'oui ($%s)', ['no'] = 'non', ['helmet'] = 'casque / Chapeau', ['glasses'] = 'lunettes', ['mask'] = 'masque', ['ears'] = 'accessoires d\'oreilles', - ['shop'] = 'magasin de', + ['shop'] = '%s magasin de', ['set_unset'] = 'mettre / Enlever', ['not_enough_money'] = 'vous n\'avez pas assez d\'argent', ['press_access'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au menu', @@ -16,6 +15,5 @@ Locales ['fr'] = { ['no_glasses'] = 'vous n\'avez pas de lunettes', ['no_helmet'] = 'vous n\'avez pas de casque / chapeau', ['no_mask'] = 'vous n\'avez pas de masque', - ['you_paid'] = 'vous avez payé ', - + ['you_paid'] = 'vous avez payé ~g~$%s~s~', } diff --git a/locales/sv.lua b/locales/sv.lua new file mode 100644 index 00000000..54f99179 --- /dev/null +++ b/locales/sv.lua @@ -0,0 +1,19 @@ +Locales ['sv'] = { + ['valid_purchase'] = 'bekräfta köp?', + ['yes'] = 'ja (%s SEK)', + ['no'] = 'nej', + ['helmet'] = 'hjälm / hat', + ['glasses'] = 'glasögon', + ['mask'] = 'ansiktsmask', + ['ears'] = 'örontillbehör', + ['shop'] = '%s affär', + ['set_unset'] = 'ta på / av', + ['not_enough_money'] = 'du har inte råd!', + ['press_access'] = 'tryck ~INPUT_CONTEXT~ för att öppna menyn.', + ['accessories_blip'] = 'extrautröstning', + ['no_ears'] = 'du har inga öron tillbehör', + ['no_glasses'] = 'du har inga glasögon', + ['no_helmet'] = 'du har ingen hjälm', + ['no_mask'] = 'du har inte någon mask', + ['you_paid'] = 'du har betalat ~g~%s SEK~s~', +} diff --git a/localization/fi_esx_accessories.sql b/localization/fi_esx_accessories.sql index 74b2dd57..81defba5 100644 --- a/localization/fi_esx_accessories.sql +++ b/localization/fi_esx_accessories.sql @@ -1,7 +1,8 @@ +USE `essentialmode`; INSERT INTO `datastore` (name, label, shared) VALUES - ('user_ears','Korvat',0), - ('user_glasses','Lasit',0), - ('user_helmet','Kypärät',0), - ('user_mask','Maskit',0) + ('user_ears', 'Örontilbb', 0), + ('user_glasses', 'Lasit', 0), + ('user_helmet', 'Kypärät', 0), + ('user_mask', 'Maskit', 0) ; diff --git a/localization/sv_esx_accessories.sql b/localization/sv_esx_accessories.sql new file mode 100644 index 00000000..b947b632 --- /dev/null +++ b/localization/sv_esx_accessories.sql @@ -0,0 +1,8 @@ +USE `essentialmode`; + +INSERT INTO `datastore` (name, label, shared) VALUES + ('user_ears', 'Örontillbehör', 0), + ('user_glasses', 'Glasögon', 0), + ('user_helmet', 'Hjälm', 0), + ('user_mask', 'Mask', 0) +; diff --git a/server/main.lua b/server/main.lua index b2d0887c..1b614f92 100644 --- a/server/main.lua +++ b/server/main.lua @@ -7,7 +7,7 @@ AddEventHandler('esx_accessories:pay', function() local _source = 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', Config.Price)) end) @@ -32,8 +32,7 @@ AddEventHandler('esx_accessories:save', function(skin, accessory) end) ESX.RegisterServerCallback('esx_accessories:get', function(source, cb, accessory) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(source) TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) @@ -46,12 +45,8 @@ ESX.RegisterServerCallback('esx_accessories:get', function(source, cb, accessory end) ---=================================================================== ---=================================================================== - ESX.RegisterServerCallback('esx_accessories:checkMoney', function(source, cb) - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) + local xPlayer = ESX.GetPlayerFromId(source) if xPlayer.get('money') >= Config.Price then cb(true) From d70d4af99606219e83d5d7356ddf030dd3389df4 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 4 Nov 2018 22:50:01 +0100 Subject: [PATCH 12/30] Minor changes --- client/main.lua | 3 +++ server/main.lua | 20 +++++--------------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/client/main.lua b/client/main.lua index 03901014..2d9b5f9f 100644 --- a/client/main.lua +++ b/client/main.lua @@ -53,13 +53,16 @@ function SetUnsetAccessory(accessory) TriggerEvent('skinchanger:getSkin', function(skin) local mAccessory = -1 local mColor = 0 + if _accessory == "mask" then mAccessory = 0 end + if skin[_accessory .. '_1'] == mAccessory then mAccessory = accessorySkin[_accessory .. '_1'] mColor = accessorySkin[_accessory .. '_2'] end + local accessorySkin = {} accessorySkin[_accessory .. '_1'] = mAccessory accessorySkin[_accessory .. '_2'] = mColor diff --git a/server/main.lua b/server/main.lua index 1b614f92..6c674ae2 100644 --- a/server/main.lua +++ b/server/main.lua @@ -4,11 +4,10 @@ TriggerEvent('esx:getSharedObject', function(obj) ESX = obj end) RegisterServerEvent('esx_accessories:pay') AddEventHandler('esx_accessories:pay', function() - local _source = source - local xPlayer = ESX.GetPlayerFromId(_source) - xPlayer.removeMoney(Config.Price) - TriggerClientEvent('esx:showNotification', _source, _U('you_paid', Config.Price)) + local xPlayer = ESX.GetPlayerFromId(source) + xPlayer.removeMoney(Config.Price) + TriggerClientEvent('esx:showNotification', source, _U('you_paid', Config.Price)) end) RegisterServerEvent('esx_accessories:save') @@ -17,7 +16,6 @@ AddEventHandler('esx_accessories:save', function(skin, accessory) local xPlayer = ESX.GetPlayerFromId(_source) TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) - store.set('has' .. accessory, true) local itemSkin = {} @@ -25,22 +23,19 @@ AddEventHandler('esx_accessories:save', function(skin, accessory) local item2 = string.lower(accessory) .. '_2' itemSkin[item1] = skin[item1] itemSkin[item2] = skin[item2] + store.set('skin', itemSkin) - end) - end) ESX.RegisterServerCallback('esx_accessories:get', function(source, cb, accessory) local xPlayer = ESX.GetPlayerFromId(source) TriggerEvent('esx_datastore:getDataStore', 'user_' .. string.lower(accessory), xPlayer.identifier, function(store) - local hasAccessory = (store.get('has' .. accessory) and store.get('has' .. accessory) or false) local skin = (store.get('skin') and store.get('skin') or {}) cb(hasAccessory, skin) - end) end) @@ -48,10 +43,5 @@ end) ESX.RegisterServerCallback('esx_accessories:checkMoney', function(source, cb) 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 2028350a9593c7b7acea1ace34653d6301691b25 Mon Sep 17 00:00:00 2001 From: April <39036878+aprilkae@users.noreply.github.com> Date: Sun, 4 Nov 2018 16:52:17 -0500 Subject: [PATCH 13/30] fix for removing glasses (#11) * fixed issue where you couldn't remove glasses (or incorrect glasses were put on) --- client/main.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/client/main.lua b/client/main.lua index 2d9b5f9f..8530f9ea 100644 --- a/client/main.lua +++ b/client/main.lua @@ -56,6 +56,8 @@ function SetUnsetAccessory(accessory) if _accessory == "mask" then mAccessory = 0 + elseif _accessory == "glasses" then + mAccessory = 5 end if skin[_accessory .. '_1'] == mAccessory then From bef16c09b680937712e414040c68dc92b349fd59 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 4 Nov 2018 22:56:19 +0100 Subject: [PATCH 14/30] Enforce 2 space indent on locale files --- client/main.lua | 16 +++++++--------- locales/en.lua | 34 +++++++++++++++++----------------- locales/fi.lua | 34 +++++++++++++++++----------------- locales/fr.lua | 34 +++++++++++++++++----------------- locales/sv.lua | 34 +++++++++++++++++----------------- server/main.lua | 2 +- 6 files changed, 76 insertions(+), 78 deletions(-) diff --git a/client/main.lua b/client/main.lua index 2d9b5f9f..aa0ff237 100644 --- a/client/main.lua +++ b/client/main.lua @@ -34,7 +34,7 @@ function OpenAccessoryMenu() {label = _U('helmet'), value = 'Helmet'}, {label = _U('ears'), value = 'Ears'}, {label = _U('mask'), value = 'Mask'}, - {label = _U('glasses'), value = 'Glasses'}, + {label = _U('glasses'), value = 'Glasses'} } }, function(data, menu) menu.close() @@ -91,7 +91,7 @@ function OpenShopMenu(accessory) align = 'top-left', elements = { {label = _U('no'), value = 'no'}, - {label = _U('yes', Config.Price), value = 'yes'} + {label = _U('yes', ESX.Math.GroupDigits(Config.Price)), value = 'yes'} } }, function(data, menu) menu.close() @@ -112,14 +112,14 @@ function OpenShopMenu(accessory) end if data.current.value == 'no' then - local player = GetPlayerPed(-1) + local player = PlayerPedId() TriggerEvent('esx_skin:getLastSkin', function(skin) TriggerEvent('skinchanger:loadSkin', skin) end) if accessory == "Ears" then ClearPedProp(player, 2) elseif accessory == "Mask" then - SetPedComponentVariation(player, 1, 0 ,0 ,2) + SetPedComponentVariation(player, 1, 0 ,0, 2) elseif accessory == "Helmet" then ClearPedProp(player, 0) elseif accessory == "Glasses" then @@ -188,7 +188,7 @@ end) Citizen.CreateThread(function() while true do Citizen.Wait(0) - local coords = GetEntityCoords(GetPlayerPed(-1)) + local coords = GetEntityCoords(PlayerPedId()) for k,v in pairs(Config.Zones) do for i = 1, #v.Pos, 1 do if(Config.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.DrawDistance) then @@ -203,12 +203,12 @@ end) Citizen.CreateThread(function() while true do Citizen.Wait(10) - local coords = GetEntityCoords(GetPlayerPed(-1)) + local coords = GetEntityCoords(PlayerPedId()) local isInMarker = false local currentZone = nil for k,v in pairs(Config.Zones) do for i = 1, #v.Pos, 1 do - if(GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.Size.x) then + if GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.Size.x then isInMarker = true currentZone = k end @@ -235,14 +235,12 @@ Citizen.CreateThread(function() Citizen.Wait(10) if CurrentAction ~= nil then - ESX.ShowHelpNotification(CurrentActionMsg) if IsControlJustReleased(0, Keys['E']) and CurrentActionData.accessory then OpenShopMenu(CurrentActionData.accessory) CurrentAction = nil end - elseif CurrentAction == nil and not Config.EnableControls then Citizen.Wait(500) end diff --git a/locales/en.lua b/locales/en.lua index 2cb77f7d..0ea2f75f 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -1,19 +1,19 @@ Locales ['en'] = { - ['valid_purchase'] = 'validate this purchase?', - ['yes'] = 'yes ($%s)', - ['no'] = 'no', - ['helmet'] = 'helmet / Hat', - ['glasses'] = 'glasses', - ['mask'] = 'mask', - ['ears'] = 'ears accessories', - ['shop'] = '%s shop', - ['set_unset'] = 'put on / Take off', - ['not_enough_money'] = 'you do not have enough money', - ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu', - ['accessories_blip'] = 'accessories', - ['no_ears'] = 'you do not have ears accessories', - ['no_glasses'] = 'you do not have glasses', - ['no_helmet'] = 'you do not have a helmet', - ['no_mask'] = 'you do not have a mask', - ['you_paid'] = 'you paid ~g~$%s~s~', + ['valid_purchase'] = 'validate this purchase?', + ['yes'] = 'yes ($%s)', + ['no'] = 'no', + ['helmet'] = 'helmet / Hat', + ['glasses'] = 'glasses', + ['mask'] = 'mask', + ['ears'] = 'ears accessories', + ['shop'] = '%s shop', + ['set_unset'] = 'put on / Take off', + ['not_enough_money'] = 'you do not have enough money', + ['press_access'] = 'press ~INPUT_CONTEXT~ to access the menu', + ['accessories_blip'] = 'accessories', + ['no_ears'] = 'you do not have ears accessories', + ['no_glasses'] = 'you do not have glasses', + ['no_helmet'] = 'you do not have a helmet', + ['no_mask'] = 'you do not have a mask', + ['you_paid'] = 'you paid ~g~$%s~s~', } diff --git a/locales/fi.lua b/locales/fi.lua index 4b8748bc..d5c5cfe9 100644 --- a/locales/fi.lua +++ b/locales/fi.lua @@ -1,19 +1,19 @@ Locales ['fi'] = { - ['valid_purchase'] = 'varmista ostos?', - ['yes'] = 'kyllä ($%s)', - ['no'] = 'ei', - ['helmet'] = 'kypärä / Hattu', - ['glasses'] = 'lasit', - ['mask'] = 'maskit', - ['ears'] = 'korva asusteet', - ['shop'] = '%s asustekauppa', - ['set_unset'] = 'laita päälle / Ota pois', - ['not_enough_money'] = 'sinulla ei ole tarpeeksi rahaa', - ['press_access'] = 'paina ~INPUT_CONTEXT~ avataksesi menu', - ['accessories_blip'] = 'asusteet', - ['no_ears'] = 'sinulla ei ole korva asusteita', - ['no_glasses'] = 'sinulla ei ole laseja', - ['no_helmet'] = 'sinulla ei ole kypäriä', - ['no_mask'] = 'sinulla ei ole maskeja', - ['you_paid'] = 'sinä maksoit ~g~$%s~s~', + ['valid_purchase'] = 'varmista ostos?', + ['yes'] = 'kyllä ($%s)', + ['no'] = 'ei', + ['helmet'] = 'kypärä / Hattu', + ['glasses'] = 'lasit', + ['mask'] = 'maskit', + ['ears'] = 'korva asusteet', + ['shop'] = '%s asustekauppa', + ['set_unset'] = 'laita päälle / Ota pois', + ['not_enough_money'] = 'sinulla ei ole tarpeeksi rahaa', + ['press_access'] = 'paina ~INPUT_CONTEXT~ avataksesi menu', + ['accessories_blip'] = 'asusteet', + ['no_ears'] = 'sinulla ei ole korva asusteita', + ['no_glasses'] = 'sinulla ei ole laseja', + ['no_helmet'] = 'sinulla ei ole kypäriä', + ['no_mask'] = 'sinulla ei ole maskeja', + ['you_paid'] = 'sinä maksoit ~g~$%s~s~', } diff --git a/locales/fr.lua b/locales/fr.lua index c6a02037..4e324f2c 100644 --- a/locales/fr.lua +++ b/locales/fr.lua @@ -1,19 +1,19 @@ Locales ['fr'] = { - ['valid_purchase'] = 'valider cet achat?', - ['yes'] = 'oui ($%s)', - ['no'] = 'non', - ['helmet'] = 'casque / Chapeau', - ['glasses'] = 'lunettes', - ['mask'] = 'masque', - ['ears'] = 'accessoires d\'oreilles', - ['shop'] = '%s magasin de', - ['set_unset'] = 'mettre / Enlever', - ['not_enough_money'] = 'vous n\'avez pas assez d\'argent', - ['press_access'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au menu', - ['accessories_blip'] = 'accessoires', - ['no_ears'] = 'vous n\'avez pas d\'accessoires d\'oreilles', - ['no_glasses'] = 'vous n\'avez pas de lunettes', - ['no_helmet'] = 'vous n\'avez pas de casque / chapeau', - ['no_mask'] = 'vous n\'avez pas de masque', - ['you_paid'] = 'vous avez payé ~g~$%s~s~', + ['valid_purchase'] = 'valider cet achat?', + ['yes'] = 'oui ($%s)', + ['no'] = 'non', + ['helmet'] = 'casque / Chapeau', + ['glasses'] = 'lunettes', + ['mask'] = 'masque', + ['ears'] = 'accessoires d\'oreilles', + ['shop'] = '%s magasin de', + ['set_unset'] = 'mettre / Enlever', + ['not_enough_money'] = 'vous n\'avez pas assez d\'argent', + ['press_access'] = 'appuyez sur ~INPUT_CONTEXT~ pour accéder au menu', + ['accessories_blip'] = 'accessoires', + ['no_ears'] = 'vous n\'avez pas d\'accessoires d\'oreilles', + ['no_glasses'] = 'vous n\'avez pas de lunettes', + ['no_helmet'] = 'vous n\'avez pas de casque / chapeau', + ['no_mask'] = 'vous n\'avez pas de masque', + ['you_paid'] = 'vous avez payé ~g~$%s~s~', } diff --git a/locales/sv.lua b/locales/sv.lua index 54f99179..7d033564 100644 --- a/locales/sv.lua +++ b/locales/sv.lua @@ -1,19 +1,19 @@ Locales ['sv'] = { - ['valid_purchase'] = 'bekräfta köp?', - ['yes'] = 'ja (%s SEK)', - ['no'] = 'nej', - ['helmet'] = 'hjälm / hat', - ['glasses'] = 'glasögon', - ['mask'] = 'ansiktsmask', - ['ears'] = 'örontillbehör', - ['shop'] = '%s affär', - ['set_unset'] = 'ta på / av', - ['not_enough_money'] = 'du har inte råd!', - ['press_access'] = 'tryck ~INPUT_CONTEXT~ för att öppna menyn.', - ['accessories_blip'] = 'extrautröstning', - ['no_ears'] = 'du har inga öron tillbehör', - ['no_glasses'] = 'du har inga glasögon', - ['no_helmet'] = 'du har ingen hjälm', - ['no_mask'] = 'du har inte någon mask', - ['you_paid'] = 'du har betalat ~g~%s SEK~s~', + ['valid_purchase'] = 'bekräfta köp?', + ['yes'] = 'ja (%s SEK)', + ['no'] = 'nej', + ['helmet'] = 'hjälm / hat', + ['glasses'] = 'glasögon', + ['mask'] = 'ansiktsmask', + ['ears'] = 'örontillbehör', + ['shop'] = '%s affär', + ['set_unset'] = 'ta på / av', + ['not_enough_money'] = 'du har inte råd!', + ['press_access'] = 'tryck ~INPUT_CONTEXT~ för att öppna menyn.', + ['accessories_blip'] = 'extrautröstning', + ['no_ears'] = 'du har inga öron tillbehör', + ['no_glasses'] = 'du har inga glasögon', + ['no_helmet'] = 'du har ingen hjälm', + ['no_mask'] = 'du har inte någon mask', + ['you_paid'] = 'du har betalat ~g~%s SEK~s~', } diff --git a/server/main.lua b/server/main.lua index 6c674ae2..83d1d255 100644 --- a/server/main.lua +++ b/server/main.lua @@ -7,7 +7,7 @@ AddEventHandler('esx_accessories:pay', function() 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) RegisterServerEvent('esx_accessories:save') From c54723289adc5b9aecc240992da4fef6ecd5a692 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Mon, 5 Nov 2018 13:57:04 +0100 Subject: [PATCH 15/30] Revert "fix for removing glasses (#11)" This reverts commit 2028350a9593c7b7acea1ace34653d6301691b25. --- client/main.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index a2cd0716..aa0ff237 100644 --- a/client/main.lua +++ b/client/main.lua @@ -56,8 +56,6 @@ function SetUnsetAccessory(accessory) if _accessory == "mask" then mAccessory = 0 - elseif _accessory == "glasses" then - mAccessory = 5 end if skin[_accessory .. '_1'] == mAccessory then From 23653f0cc9dc2fdcc1c16e940aef544c45afc5cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Rychl=C3=BD?= Date: Sat, 1 Dec 2018 12:19:16 +0100 Subject: [PATCH 16/30] Add of Czech translate (#13) * Add of Czech translate * Czech translate 2 space intent fix Fixed intent to 2 spaces to match the source repository style --- __resource.lua | 2 ++ locales/cs.lua | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 locales/cs.lua diff --git a/__resource.lua b/__resource.lua index 8e0c1769..d09b6d2b 100644 --- a/__resource.lua +++ b/__resource.lua @@ -10,6 +10,7 @@ server_scripts { 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', + 'locales/cs.lua', 'config.lua', 'server/main.lua' } @@ -20,6 +21,7 @@ client_scripts { 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.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..a44eb670 --- /dev/null +++ b/locales/cs.lua @@ -0,0 +1,19 @@ +Locales ['cs'] = { + ['valid_purchase'] = 'ověřit nákup?', + ['yes'] = 'ano ($%s)', + ['no'] = 'ne', + ['helmet'] = 'helma / Čepice', + ['glasses'] = 'brýle', + ['mask'] = 'maska', + ['ears'] = 'doplňky na uši', + ['shop'] = '%s obchod', + ['set_unset'] = 'nasadit / Sundat', + ['not_enough_money'] = 'nemáte dostatek peněz', + ['press_access'] = 'zmáčkněte ~INPUT_CONTEXT~ pro otevření menu', + ['accessories_blip'] = 'doplňky', + ['no_ears'] = 'nemáte doplňky na uši', + ['no_glasses'] = 'nemáte brýle', + ['no_helmet'] = 'nemáte helmu', + ['no_mask'] = 'nemáte masku', + ['you_paid'] = 'zaplatili jste ~g~$%s~s~', +} From c42a6824c70eb4fe17d7230c00f058d3b27fa5e9 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sun, 30 Dec 2018 21:52:30 +0100 Subject: [PATCH 17/30] Check IsControlJustReleased() every frame --- client/main.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/client/main.lua b/client/main.lua index aa0ff237..828521f7 100644 --- a/client/main.lua +++ b/client/main.lua @@ -202,7 +202,8 @@ end) Citizen.CreateThread(function() while true do - Citizen.Wait(10) + Citizen.Wait(200) + local coords = GetEntityCoords(PlayerPedId()) local isInMarker = false local currentZone = nil @@ -232,7 +233,7 @@ end) -- Key controls Citizen.CreateThread(function() while true do - Citizen.Wait(10) + Citizen.Wait(0) if CurrentAction ~= nil then ESX.ShowHelpNotification(CurrentActionMsg) From 5c8bd984b9ded960222e2bcd886aba6911f5e4f6 Mon Sep 17 00:00:00 2001 From: MajorMarcin Date: Mon, 7 Jan 2019 12:17:41 +0100 Subject: [PATCH 18/30] add pl the missing Polish translation was added --- __resource.lua | 2 ++ locales/pl.lua | 19 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 locales/pl.lua diff --git a/__resource.lua b/__resource.lua index d09b6d2b..d2f35714 100644 --- a/__resource.lua +++ b/__resource.lua @@ -11,6 +11,7 @@ server_scripts { 'locales/fr.lua', 'locales/sv.lua', 'locales/cs.lua', + 'locales/pl.lua', 'config.lua', 'server/main.lua' } @@ -22,6 +23,7 @@ client_scripts { 'locales/fr.lua', 'locales/sv.lua', 'locales/cs.lua', + 'locales/pl.lua', 'config.lua', 'client/main.lua' } diff --git a/locales/pl.lua b/locales/pl.lua new file mode 100644 index 00000000..facf48aa --- /dev/null +++ b/locales/pl.lua @@ -0,0 +1,19 @@ +Locales ['pl'] = { + ['valid_purchase'] = 'czy napewno chcesz to zakupić?', + ['yes'] = 'tak (%s $)', + ['no'] = 'nie', + ['helmet'] = 'hełm / Czapka', + ['glasses'] = 'okulary', + ['mask'] = 'maska', + ['ears'] = 'akcesoria uszu', + ['shop'] = 'sklep %s ', + ['set_unset'] = 'załóż / Zdejmij', + ['not_enough_money'] = 'nie masz wystarczająco pieniędzy', + ['press_access'] = 'wciśnij ~INPUT_CONTEXT~ aby otworzyć menu', + ['accessories_blip'] = 'akcesoria', + ['no_ears'] = 'nie posiadasz akcesorii uszu', + ['no_glasses'] = 'nie posiadasz okularów', + ['no_helmet'] = 'nie posiadasz nakrycia głowy', + ['no_mask'] = 'nie posiadasz maski', + ['you_paid'] = 'płacisz ~g~%s $~s~', +} From f36be997c631532a93f96dc521f4d42c1229e1a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9mie=20N=27gadi?= Date: Wed, 13 Feb 2019 14:10:14 +0100 Subject: [PATCH 19/30] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 6af3efba..fe41849e 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ start esx_accessories ### License esx_accessories - buy some shiny stuff! -Copyright (C) 2015-2018 Jérémie N'gadi +Copyright (C) 2015-2018 Lenaic Corbeau 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 f8039eff14e5e9441eb80ec99bb9d4cc6ef8591a Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Fri, 15 Mar 2019 12:30:05 +0100 Subject: [PATCH 20/30] Updated native name --- client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/main.lua b/client/main.lua index 828521f7..a10c2e4a 100644 --- a/client/main.lua +++ b/client/main.lua @@ -247,7 +247,7 @@ Citizen.CreateThread(function() end if Config.EnableControls then - if IsControlJustReleased(0, Keys['K']) and GetLastInputMethod(2) and not isDead then + if IsControlJustReleased(0, Keys['K']) and IsInputDisabled(0) and not isDead then OpenAccessoryMenu() end end From 134d24aea1faf448d150e5c5b3b2d3f4c2baae79 Mon Sep 17 00:00:00 2001 From: RikoDEV <18230443+RikoDEV@users.noreply.github.com> Date: Sat, 20 Jul 2019 14:32:40 +0200 Subject: [PATCH 21/30] Remove keys table --- client/main.lua | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/client/main.lua b/client/main.lua index a10c2e4a..93a982c4 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,15 +1,3 @@ -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 HasAlreadyEnteredMarker = false local LastZone = nil @@ -238,7 +226,7 @@ Citizen.CreateThread(function() if CurrentAction ~= nil then ESX.ShowHelpNotification(CurrentActionMsg) - if IsControlJustReleased(0, Keys['E']) and CurrentActionData.accessory then + if IsControlJustReleased(0, 38) and CurrentActionData.accessory then OpenShopMenu(CurrentActionData.accessory) CurrentAction = nil end @@ -247,10 +235,10 @@ Citizen.CreateThread(function() end if Config.EnableControls then - if IsControlJustReleased(0, Keys['K']) and IsInputDisabled(0) and not isDead then + if IsControlJustReleased(0, 311) and IsInputDisabled(0) and not isDead then OpenAccessoryMenu() end end end -end) \ No newline at end of file +end) From ee007077a9c98d41250ac211793218036590fce9 Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Sat, 3 Aug 2019 10:28:05 +0200 Subject: [PATCH 22/30] Enforced 2 space locale indent --- locales/pl.lua | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/locales/pl.lua b/locales/pl.lua index facf48aa..db81b639 100644 --- a/locales/pl.lua +++ b/locales/pl.lua @@ -1,19 +1,19 @@ Locales ['pl'] = { - ['valid_purchase'] = 'czy napewno chcesz to zakupić?', - ['yes'] = 'tak (%s $)', - ['no'] = 'nie', - ['helmet'] = 'hełm / Czapka', - ['glasses'] = 'okulary', - ['mask'] = 'maska', - ['ears'] = 'akcesoria uszu', - ['shop'] = 'sklep %s ', - ['set_unset'] = 'załóż / Zdejmij', - ['not_enough_money'] = 'nie masz wystarczająco pieniędzy', - ['press_access'] = 'wciśnij ~INPUT_CONTEXT~ aby otworzyć menu', - ['accessories_blip'] = 'akcesoria', - ['no_ears'] = 'nie posiadasz akcesorii uszu', - ['no_glasses'] = 'nie posiadasz okularów', - ['no_helmet'] = 'nie posiadasz nakrycia głowy', - ['no_mask'] = 'nie posiadasz maski', - ['you_paid'] = 'płacisz ~g~%s $~s~', + ['valid_purchase'] = 'czy napewno chcesz to zakupić?', + ['yes'] = 'tak (%s $)', + ['no'] = 'nie', + ['helmet'] = 'hełm / Czapka', + ['glasses'] = 'okulary', + ['mask'] = 'maska', + ['ears'] = 'akcesoria uszu', + ['shop'] = 'sklep %s ', + ['set_unset'] = 'załóż / Zdejmij', + ['not_enough_money'] = 'nie masz wystarczająco pieniędzy', + ['press_access'] = 'wciśnij ~INPUT_CONTEXT~ aby otworzyć menu', + ['accessories_blip'] = 'akcesoria', + ['no_ears'] = 'nie posiadasz akcesorii uszu', + ['no_glasses'] = 'nie posiadasz okularów', + ['no_helmet'] = 'nie posiadasz nakrycia głowy', + ['no_mask'] = 'nie posiadasz maski', + ['you_paid'] = 'płacisz ~g~%s $~s~', } From b73f9502279c04ea7840ab6da4757acf50c69915 Mon Sep 17 00:00:00 2001 From: criminalist Date: Sun, 19 Jan 2020 22:18:03 +0700 Subject: [PATCH 23/30] Added Russian translation (#23) * RU local * Add RU local * add RU local --- __resource.lua | 4 +++- locales/ru.lua | 19 +++++++++++++++++++ localization/ru_esx_accessories.sql | 8 ++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 locales/ru.lua create mode 100644 localization/ru_esx_accessories.sql diff --git a/__resource.lua b/__resource.lua index d2f35714..e5b31921 100644 --- a/__resource.lua +++ b/__resource.lua @@ -7,6 +7,7 @@ version '1.1.0' server_scripts { '@es_extended/locale.lua', 'locales/en.lua', + 'locales/ru.lua', 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', @@ -19,6 +20,7 @@ server_scripts { client_scripts { '@es_extended/locale.lua', 'locales/en.lua', + 'locales/ru.lua', 'locales/fi.lua', 'locales/fr.lua', 'locales/sv.lua', @@ -32,4 +34,4 @@ dependencies { 'es_extended', 'esx_skin', 'esx_datastore' -} \ No newline at end of file +} diff --git a/locales/ru.lua b/locales/ru.lua new file mode 100644 index 00000000..125bd36c --- /dev/null +++ b/locales/ru.lua @@ -0,0 +1,19 @@ +Locales ['ru'] = { + ['valid_purchase'] = 'Подтверждаете покупку', + ['yes'] = 'Да ($%s)', + ['no'] = 'Нет', + ['helmet'] = 'Шлем / Шапка', + ['glasses'] = 'Очки', + ['mask'] = 'Маска', + ['ears'] = 'Аксессуары для ушей', + ['shop'] = 'Магазин %s', + ['set_unset'] = 'Положить / Снять', + ['not_enough_money'] = 'У вас не достаточно денег', + ['press_access'] = 'Нажмите ~INPUT_CONTEXT~ для доступа к меню', + ['accessories_blip'] = 'Аксессуары', + ['no_ears'] = 'У вас нет аксессуаров для ушей', + ['no_glasses'] = 'У вас нет очков', + ['no_helmet'] = 'У вас нет шлема', + ['no_mask'] = 'У вас нет маски', + ['you_paid'] = 'Вы заплатили ~g~$%s~s~', +} diff --git a/localization/ru_esx_accessories.sql b/localization/ru_esx_accessories.sql new file mode 100644 index 00000000..cd2139f5 --- /dev/null +++ b/localization/ru_esx_accessories.sql @@ -0,0 +1,8 @@ +USE `essentialmode`; + +INSERT INTO `datastore` (name, label, shared) VALUES + ('user_ears', 'Аксессуары для ушей', 0), + ('user_glasses', 'Очки', 0), + ('user_helmet', 'Шлем', 0), + ('user_mask', 'Маски', 0) +; From 29714df92a36ea79a4e3e19db6349adf4a212b47 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Sun, 19 Jan 2020 16:51:07 +0100 Subject: [PATCH 24/30] Replace __resource.lua with fxmanifest.lua --- __resource.lua => fxmanifest.lua | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) rename __resource.lua => fxmanifest.lua (89%) diff --git a/__resource.lua b/fxmanifest.lua similarity index 89% rename from __resource.lua rename to fxmanifest.lua index e5b31921..bf837fae 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 Accessories' From 3e52e7ece0fbc1b9c756371f26d0138bbe89bc7c Mon Sep 17 00:00:00 2001 From: rex2630 Date: Thu, 23 Jan 2020 16:51:34 +0100 Subject: [PATCH 25/30] Create cs_esx_accessories.sql --- localization/cs_esx_accessories.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 localization/cs_esx_accessories.sql diff --git a/localization/cs_esx_accessories.sql b/localization/cs_esx_accessories.sql new file mode 100644 index 00000000..d3319986 --- /dev/null +++ b/localization/cs_esx_accessories.sql @@ -0,0 +1,8 @@ +USE `essentialmode`; + +INSERT INTO `datastore` (name, label, shared) VALUES + ('user_ears', 'Usi', 0), + ('user_glasses', 'Bryle', 0), + ('user_helmet', 'Helma', 0), + ('user_mask', 'Maska', 0) +; From 6a0e69e9a1708174f4e66566cdfc5c7098018cb2 Mon Sep 17 00:00:00 2001 From: rex2630 Date: Wed, 26 Feb 2020 13:46:39 +0100 Subject: [PATCH 26/30] Support for newest ESX + Minor cleanup (#29) * Support for newest ESX * Minor cleanup * Moved all coords to vector3 types * Moved all coords to vector3 types --- client/main.lua | 47 ++++++++-------------- config.lua | 104 +++++++++++++++++++++++------------------------- server/main.lua | 2 +- 3 files changed, 67 insertions(+), 86 deletions(-) diff --git a/client/main.lua b/client/main.lua index 93a982c4..46759861 100644 --- a/client/main.lua +++ b/client/main.lua @@ -1,10 +1,7 @@ -ESX = nil -local HasAlreadyEnteredMarker = false -local LastZone = nil -local CurrentAction = nil -local CurrentActionMsg = '' -local CurrentActionData = {} -local isDead = false +ESX = nil +local HasAlreadyEnteredMarker, isDead = false, false +local LastZone, CurrentAction, CurrentActionMsg +local CurrentActionData = {} Citizen.CreateThread(function() while ESX == nil do @@ -14,8 +11,7 @@ Citizen.CreateThread(function() end) function OpenAccessoryMenu() - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'set_unset_accessory', - { + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'set_unset_accessory', { title = _U('set_unset'), align = 'top-left', elements = { @@ -23,11 +19,9 @@ function OpenAccessoryMenu() {label = _U('ears'), value = 'Ears'}, {label = _U('mask'), value = 'Mask'}, {label = _U('glasses'), value = 'Glasses'} - } - }, function(data, menu) + }}, function(data, menu) menu.close() SetUnsetAccessory(data.current.value) - end, function(data, menu) menu.close() end) @@ -59,7 +53,6 @@ function SetUnsetAccessory(accessory) else ESX.ShowNotification(_U('no_' .. _accessory)) end - end, accessory) end @@ -68,20 +61,18 @@ function OpenShopMenu(accessory) local restrict = {} restrict = { _accessory .. '_1', _accessory .. '_2' } - + TriggerEvent('esx_skin:openRestrictedMenu', function(data, menu) menu.close() - ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop_confirm', - { + ESX.UI.Menu.Open('default', GetCurrentResourceName(), 'shop_confirm', { title = _U('valid_purchase'), align = 'top-left', elements = { {label = _U('no'), value = 'no'}, {label = _U('yes', ESX.Math.GroupDigits(Config.Price)), value = 'yes'} - } - }, function(data, menu) + }}, function(data, menu) menu.close() if data.current.value == 'yes' then ESX.TriggerServerCallback('esx_accessories:checkMoney', function(hasEnoughMoney) @@ -122,7 +113,6 @@ function OpenShopMenu(accessory) CurrentAction = 'shop_menu' CurrentActionMsg = _U('press_access') CurrentActionData = {} - end) end, function(data, menu) menu.close() @@ -156,7 +146,7 @@ Citizen.CreateThread(function() for k,v in pairs(Config.ShopsBlips) do if v.Pos ~= nil then for i=1, #v.Pos, 1 do - local blip = AddBlipForCoord(v.Pos[i].x, v.Pos[i].y, v.Pos[i].z) + local blip = AddBlipForCoord(v.Pos[i]) SetBlipSprite (blip, v.Blip.sprite) SetBlipDisplay(blip, 4) @@ -179,25 +169,24 @@ Citizen.CreateThread(function() local coords = GetEntityCoords(PlayerPedId()) for k,v in pairs(Config.Zones) do for i = 1, #v.Pos, 1 do - if(Config.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.DrawDistance) then - DrawMarker(Config.Type, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.Size.x, Config.Size.y, Config.Size.z, Config.Color.r, Config.Color.g, Config.Color.b, 100, false, true, 2, false, false, false, false) + if(Config.Type ~= -1 and GetDistanceBetweenCoords(coords, v.Pos[i], true) < Config.DrawDistance) then + DrawMarker(Config.Type, v.Pos[i], 0.0, 0.0, 0.0, 0, 0.0, 0.0, Config.Size.x, Config.Size.y, Config.Size.z, Config.Color.r, Config.Color.g, Config.Color.b, 100, false, true, 2, false, false, false, false) end end end end end) - Citizen.CreateThread(function() while true do Citizen.Wait(200) - local coords = GetEntityCoords(PlayerPedId()) - local isInMarker = false + local coords = GetEntityCoords(PlayerPedId()) + local isInMarker = false local currentZone = nil for k,v in pairs(Config.Zones) do for i = 1, #v.Pos, 1 do - if GetDistanceBetweenCoords(coords, v.Pos[i].x, v.Pos[i].y, v.Pos[i].z, true) < Config.Size.x then + if GetDistanceBetweenCoords(coords, v.Pos[i], true) < Config.Size.x then isInMarker = true currentZone = k end @@ -214,7 +203,6 @@ Citizen.CreateThread(function() HasAlreadyEnteredMarker = false TriggerEvent('esx_accessories:hasExitedMarker', LastZone) end - end end) @@ -223,14 +211,14 @@ Citizen.CreateThread(function() while true do Citizen.Wait(0) - if CurrentAction ~= nil then + if CurrentAction then ESX.ShowHelpNotification(CurrentActionMsg) if IsControlJustReleased(0, 38) and CurrentActionData.accessory then OpenShopMenu(CurrentActionData.accessory) CurrentAction = nil end - elseif CurrentAction == nil and not Config.EnableControls then + elseif CurrentAction and not Config.EnableControls then Citizen.Wait(500) end @@ -239,6 +227,5 @@ Citizen.CreateThread(function() OpenAccessoryMenu() end end - end end) diff --git a/config.lua b/config.lua index ea21f3af..3a9ecdd3 100644 --- a/config.lua +++ b/config.lua @@ -21,9 +21,9 @@ Config.ShopsBlips = { }, Mask = { Pos = { - { x = -1338.129, y = -1278.200, z = 3.872 }, + vector3(-1338.1, -1278.2, 3.8), }, - Blip = { sprite = 362, color = 2 } + Blip = {sprite = 362, color = 2} }, Helmet = { Pos = nil, @@ -38,66 +38,60 @@ Config.ShopsBlips = { Config.Zones = { Ears = { Pos = { - {x= 80.374, y= -1389.493, z= 28.406}, - {x= -709.426, y= -153.829, z= 36.535}, - {x= -163.093, y= -302.038, z= 38.853}, - {x= 420.787, y= -809.654, z= 28.611}, - {x= -817.070, y= -1075.96, z= 10.448}, - {x= -1451.300, y= -238.254, z= 48.929}, - {x= -0.756, y= 6513.685, z= 30.997}, - {x= 123.431, y= -208.060, z= 53.677}, - {x= 1687.318, y= 4827.685, z= 41.183}, - {x= 622.806, y= 2749.221, z= 41.208}, - {x= 1200.085, y= 2705.428, z= 37.342}, - {x= -1199.959, y= -782.534, z= 16.452}, - {x= -3171.867, y= 1059.632, z= 19.983}, - {x= -1095.670, y= 2709.245, z= 18.227}, - } - - }, + vector3(80.3, -1389.4, 28.4), + vector3(-163.0, -302.0, 38.8), + vector3(-163.0,-302.0, 38.8), + vector3(420.7, -809.6, 28.6), + vector3(-817.0, -1075.9, 10.4), + vector3(-1451.3, -238.2, 48.9), + vector3(-0.7, 6513.6, 30.9), + vector3(123.4, -208.0, 53.6), + vector3(1687.3, 4827.6, 41.1), + vector3(622.8, 2749.2, 41.2), + vector3(1200.0, 2705.4, 37.3), + vector3(-1199.9, -782.5, 16.4), + vector3(-3171.8, 1059.6, 19.9), + vector3(-1095.6, 2709.2, 18.2), + }}, Mask = { Pos = { - {x = -1338.129, y = -1278.200, z = 3.872}, - } - }, + vector3(-1338.1, -1278.2, 3.8), + }}, Helmet = { Pos = { - {x= 81.576, y= -1400.602, z= 28.406}, - {x= -705.845, y= -159.015, z= 36.535}, - {x= -161.349, y= -295.774, z= 38.853}, - {x= 419.319, y= -800.647, z= 28.611}, - {x= -824.362, y= -1081.741, z= 10.448}, - {x= -1454.888, y= -242.911, z= 48.931}, - {x= 4.770, y= 6520.935, z= 30.997}, - {x= 121.071, y= -223.266, z= 53.377}, - {x= 1689.648, y= 4818.805, z= 41.183}, - {x= 613.971, y= 2749.978, z= 41.208}, - {x= 1189.513, y= 2703.947, z= 37.342}, - {x= -1204.025, y= -774.439, z= 16.452}, - {x= -3164.280, y= 1054.705, z= 19.983}, - {x= -1103.125, y= 2700.599, z= 18.227}, - } - }, + vector3(81.5, -1400.6, 28.4), + vector3(-705.8, -159.0, 36.5), + vector3(-161.3, -295.7, 38.8), + vector3(419.3, -800.6, 28.6), + vector3(-824.3, -1081.7, 10.4), + vector3(-1454.8, -242.9, 48.9), + vector3(4.7, 6520.9, 30.9), + vector3(121.0, -223.2, 53.3), + vector3(1689.6, 4818.8, 41.1), + vector3(613.9, 2749.9, 41.2), + vector3(1189.5, 2703.9, 37.3), + vector3(-1204.0, -774.4, 16.4), + vector3(-3164.2, 1054.7, 19.9), + vector3(-1103.1, 2700.5, 18.2), + }}, Glasses = { Pos = { - {x= 75.287, y= -1391.131, z= 28.406}, - {x= -713.102, y= -160.116, z= 36.535}, - {x= -156.171, y= -300.547, z= 38.853}, - {x= 425.478, y= -807.866, z= 28.611}, - {x= -820.853, y= -1072.940, z= 10.448}, - {x= -1458.052, y= -236.783, z= 48.918}, - {x= 3.587, y= 6511.585, z= 30.997}, - {x= 131.335, y= -212.336, z= 53.677}, - {x= 1694.936, y= 4820.837, z= 41.183}, - {x= 613.972, y= 2768.814, z= 41.208}, - {x= 1198.678, y= 2711.011, z= 37.342}, - {x= -1188.227, y= -764.594, z= 16.452}, - {x= -3173.192, y= 1038.228, z= 19.983}, - {x= -1100.494, y= 2712.481, z= 18.227}, - } - } - + vector3(75.2, -1391.1, 28.4), + vector3(-713.1, -160.1, 36.5), + vector3(-156.1, -300.5, 38.8), + vector3(425.4, -807.8, 28.6), + vector3(-820.8, -1072.9, 10.4), + vector3(-1458.0, -236.7, 48.9), + vector3(3.5, 6511.5, 30.9), + vector3(131.3, -212.3, 53.6), + vector3(1694.9, 4820.8, 41.1), + vector3(613.9, 2768.8, 41.2), + vector3(1198.6, 2711.0, 37.3), + vector3(-1188.2, -764.5, 16.4), + vector3(-3173.1, 1038.2, 19.9), + vector3(-1100.4, 2712.4, 18.2), + }} } diff --git a/server/main.lua b/server/main.lua index 83d1d255..74446a04 100644 --- a/server/main.lua +++ b/server/main.lua @@ -43,5 +43,5 @@ end) ESX.RegisterServerCallback('esx_accessories:checkMoney', function(source, cb) local xPlayer = ESX.GetPlayerFromId(source) - cb(xPlayer.get('money') >= Config.Price) + cb(xPlayer.getMoney() >= Config.Price) end) From 1049049579c09d60c1fc34fd7c7b7ae37c0abd8e Mon Sep 17 00:00:00 2001 From: ElPumpo Date: Tue, 14 Apr 2020 16:46:56 +0200 Subject: [PATCH 27/30] Latest ESX code --- client/main.lua | 9 ++------- esx_accessories.sql | 2 +- localization/cs_esx_accessories.sql | 2 +- localization/fi_esx_accessories.sql | 2 +- localization/ru_esx_accessories.sql | 2 +- localization/sv_esx_accessories.sql | 2 +- 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/client/main.lua b/client/main.lua index 46759861..7e8d71e9 100644 --- a/client/main.lua +++ b/client/main.lua @@ -122,13 +122,8 @@ function OpenShopMenu(accessory) end, restrict) end -AddEventHandler('playerSpawned', function() - isDead = false -end) - -AddEventHandler('esx:onPlayerDeath', function() - isDead = true -end) +AddEventHandler('esx:onPlayerSpawn', function() isDead = false end) +AddEventHandler('esx:onPlayerDeath', function() isDead = true end) AddEventHandler('esx_accessories:hasEnteredMarker', function(zone) CurrentAction = 'shop_menu' diff --git a/esx_accessories.sql b/esx_accessories.sql index d10b2e1b..01567e98 100644 --- a/esx_accessories.sql +++ b/esx_accessories.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `datastore` (name, label, shared) VALUES ('user_ears', 'Ears', 0), diff --git a/localization/cs_esx_accessories.sql b/localization/cs_esx_accessories.sql index d3319986..33d99a31 100644 --- a/localization/cs_esx_accessories.sql +++ b/localization/cs_esx_accessories.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `datastore` (name, label, shared) VALUES ('user_ears', 'Usi', 0), diff --git a/localization/fi_esx_accessories.sql b/localization/fi_esx_accessories.sql index 81defba5..6a145374 100644 --- a/localization/fi_esx_accessories.sql +++ b/localization/fi_esx_accessories.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `datastore` (name, label, shared) VALUES ('user_ears', 'Örontilbb', 0), diff --git a/localization/ru_esx_accessories.sql b/localization/ru_esx_accessories.sql index cd2139f5..106d4ff1 100644 --- a/localization/ru_esx_accessories.sql +++ b/localization/ru_esx_accessories.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `datastore` (name, label, shared) VALUES ('user_ears', 'Аксессуары для ушей', 0), diff --git a/localization/sv_esx_accessories.sql b/localization/sv_esx_accessories.sql index b947b632..245e0028 100644 --- a/localization/sv_esx_accessories.sql +++ b/localization/sv_esx_accessories.sql @@ -1,4 +1,4 @@ -USE `essentialmode`; +USE `es_extended`; INSERT INTO `datastore` (name, label, shared) VALUES ('user_ears', 'Örontillbehör', 0), From ecebbc74e560569dae88ff7d0f140c3e3a5ac3df Mon Sep 17 00:00:00 2001 From: Jougito - Kheros Date: Fri, 17 Jul 2020 18:36:00 +0200 Subject: [PATCH 28/30] Create es_esx_accessories.sql --- localization/es_esx_accessories.sql | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 localization/es_esx_accessories.sql diff --git a/localization/es_esx_accessories.sql b/localization/es_esx_accessories.sql new file mode 100644 index 00000000..0df9535f --- /dev/null +++ b/localization/es_esx_accessories.sql @@ -0,0 +1,8 @@ +USE `es_extended`; + +INSERT INTO `datastore` (name, label, shared) VALUES + ('user_ears', 'Accesorio de oreja', 0), + ('user_glasses', 'Gafas', 0), + ('user_helmet', 'Casco', 0), + ('user_mask', 'Máscara', 0) +; From ef3a1990fd0bd32f2cdab8c68556608e6d0cef40 Mon Sep 17 00:00:00 2001 From: Jougito - Kheros Date: Fri, 17 Jul 2020 18:43:08 +0200 Subject: [PATCH 29/30] Spanish translation implemented --- fxmanifest.lua | 48 +++++++++++++++++++++++++----------------------- locales/es.lua | 19 +++++++++++++++++++ 2 files changed, 44 insertions(+), 23 deletions(-) create mode 100644 locales/es.lua diff --git a/fxmanifest.lua b/fxmanifest.lua index bf837fae..bdd4121b 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -7,33 +7,35 @@ description 'ESX Accessories' version '1.1.0' server_scripts { - '@es_extended/locale.lua', - 'locales/en.lua', - 'locales/ru.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/cs.lua', - 'locales/pl.lua', - 'config.lua', - 'server/main.lua' + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/es.lua', + 'locales/ru.lua', + 'locales/fi.lua', + 'locales/fr.lua', + 'locales/sv.lua', + 'locales/cs.lua', + 'locales/pl.lua', + 'config.lua', + 'server/main.lua' } client_scripts { - '@es_extended/locale.lua', - 'locales/en.lua', - 'locales/ru.lua', - 'locales/fi.lua', - 'locales/fr.lua', - 'locales/sv.lua', - 'locales/cs.lua', - 'locales/pl.lua', - 'config.lua', - 'client/main.lua' + '@es_extended/locale.lua', + 'locales/en.lua', + 'locales/es.lua', + 'locales/ru.lua', + 'locales/fi.lua', + 'locales/fr.lua', + 'locales/sv.lua', + 'locales/cs.lua', + 'locales/pl.lua', + 'config.lua', + 'client/main.lua' } dependencies { - 'es_extended', - 'esx_skin', - 'esx_datastore' + 'es_extended', + 'esx_skin', + 'esx_datastore' } diff --git a/locales/es.lua b/locales/es.lua new file mode 100644 index 00000000..510a485e --- /dev/null +++ b/locales/es.lua @@ -0,0 +1,19 @@ +Locales ['es'] = { + ['valid_purchase'] = '¿Validar la compra?', + ['yes'] = 'Si (%s$)', + ['no'] = 'No', + ['helmet'] = 'Casco / Gorra', + ['glasses'] = 'Gafas', + ['mask'] = 'Máscara', + ['ears'] = 'Accesorio de oreja', + ['shop'] = 'Tienda %s', + ['set_unset'] = 'Ponerse / Quitarse', + ['not_enough_money'] = '~r~No tienes~s~ suficiente dinero', + ['press_access'] = 'Pulsa ~INPUT_CONTEXT~ para acceder al menú', + ['accessories_blip'] = 'Accesorios', + ['no_ears'] = 'No tienes ningún accesorio de oreja', + ['no_glasses'] = 'No tienes ningunas gafas', + ['no_helmet'] = 'No tienes ningún casco', + ['no_mask'] = 'No tienes ninguna máscara', + ['you_paid'] = 'Pagaste ~g~%s$~s~', +} From 59bb6e93e34340cb8c3991bd1f06b833fd8ad506 Mon Sep 17 00:00:00 2001 From: HypeLevels <61633775+HypeLevels@users.noreply.github.com> Date: Tue, 1 Dec 2020 21:40:00 +0000 Subject: [PATCH 30/30] Update config.lua Changed default language to english as its the universal language --- config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.lua b/config.lua index 3a9ecdd3..1a65f153 100644 --- a/config.lua +++ b/config.lua @@ -1,6 +1,6 @@ Config = {} -Config.Locale = 'fr' +Config.Locale = 'en' Config.Price = 100