From 65194a6dc7f728babe3b090cc2938a210825e46d Mon Sep 17 00:00:00 2001 From: OMikkel Date: Tue, 11 Oct 2022 16:45:47 +0200 Subject: [PATCH 01/25] xPlayer.canCarryItem - Error handling - Item not found --- [esx]/es_extended/server/classes/player.lua | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/[esx]/es_extended/server/classes/player.lua b/[esx]/es_extended/server/classes/player.lua index f086e224..e15ec671 100644 --- a/[esx]/es_extended/server/classes/player.lua +++ b/[esx]/es_extended/server/classes/player.lua @@ -300,10 +300,14 @@ function CreateExtendedPlayer(playerId, identifier, group, accounts, inventory, end function self.canCarryItem(name, count, metadata) - local currentWeight, itemWeight = self.weight, ESX.Items[name].weight - local newWeight = currentWeight + (itemWeight * count) + if ESX.Items[name] then + local currentWeight, itemWeight = self.weight, ESX.Items[name].weight + local newWeight = currentWeight + (itemWeight * count) - return newWeight <= self.maxWeight + return newWeight <= self.maxWeight + else + print(('[^3WARNING^7] Item ^5"%s"^7 was used but does not exist!'):format(name)) + end end function self.canSwapItem(firstItem, firstItemCount, testItem, testItemCount) From 2b74213b19178a39fa1fd3661384d12eb6e78b57 Mon Sep 17 00:00:00 2001 From: RoadToSix <92928205+roadtosixx@users.noreply.github.com> Date: Tue, 18 Oct 2022 15:31:33 +0200 Subject: [PATCH 02/25] fix(esx_banking): remove Target config option --- [esx_addons]/esx_banking/config.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/[esx_addons]/esx_banking/config.lua b/[esx_addons]/esx_banking/config.lua index a76209c3..b6499468 100644 --- a/[esx_addons]/esx_banking/config.lua +++ b/[esx_addons]/esx_banking/config.lua @@ -1,7 +1,6 @@ Config = { Debug = false, DrawMarker = 10, - Target = false, -- ox_target (https://github.com/overextended/ox_target) Locale = 'en', EnablePeds = true, AtmModels = {`prop_fleeca_atm`, `prop_atm_01`, `prop_atm_02`, `prop_atm_03`}, From a9d3ec7ea8b1563eb11cee09c0a255a1cbd8a41c Mon Sep 17 00:00:00 2001 From: RoadToSix <92928205+roadtosixx@users.noreply.github.com> Date: Tue, 18 Oct 2022 15:31:49 +0200 Subject: [PATCH 03/25] fix(esx_banking): remove ox_target from Code --- [esx_addons]/esx_banking/client/main.lua | 59 ++---------------------- 1 file changed, 3 insertions(+), 56 deletions(-) diff --git a/[esx_addons]/esx_banking/client/main.lua b/[esx_addons]/esx_banking/client/main.lua index 4dcec7cd..2c60fe9f 100644 --- a/[esx_addons]/esx_banking/client/main.lua +++ b/[esx_addons]/esx_banking/client/main.lua @@ -74,20 +74,6 @@ local function PedHandler(ids) SetPedCanRagdoll(npc, false) SetEntityAsMissionEntity(npc, true, true) SetEntityDynamic(npc, false) - - if Config.Target then - exports.ox_target:addGlobalPed(npc, { - options = {{ - icon = "fas fa-money-bill-wave", - label = TranslateCap('access_bank'), - action = function() - OpenUi() - end - }}, - distance = 2 - }) - end - Peds[id] = npc end end @@ -105,9 +91,6 @@ local function PedHandler(ids) if del then DeletePed(handle) - if Config.Target then - exports.ox_target:removeGlobalPed(handle, {TranslateCap('access_bank')}) - end end end @@ -117,9 +100,7 @@ end function OpenUi(atm) atm = atm or false isInMenu = true - if not Config.Target then - ESX.HideUI() - end + ESX.HideUI() ESX.TriggerServerCallback('esx_banking:getPlayerData', function(data) SendNUIMessage({ showMenu = true, @@ -154,7 +135,7 @@ local function CloseUi() showMenu = false }) - if not Config.Target and (isInMarker or isInAtmMarker) then + if (isInMarker or isInAtmMarker) then ESX.TextUI(TranslateCap('press_e_banking')) Listen4Key() end @@ -174,40 +155,6 @@ local function StartThread() CreateThread(function() CreateBlips() - if Config.Target then - exports.ox_target:addModel(Config.AtmModels, { - options = {{ - icon = 'fas fa-credit-card', - label = TranslateCap('access_bank'), - action = function() - OpenUi(true) - end - }}, - distance = 1.5 - }) - if not Config.EnablePeds then - for i = 1, #Config.Banks do - local targetInfo = Config.Banks[i].Position - exports.ox_target:addBoxZone('openBank' .. i, targetInfo.xyz, 1.5, 1.5, { - name = 'openBank' .. i, - heading = targetInfo.w, - minZ = targetInfo.z - 1.0, - maxZ = targetInfo.z + 1.5, - debugPoly = Config.Debug - }, { - options = {{ - icon = 'fas fa-money-bill-wave', - label = TranslateCap('access_bank'), - action = function() - OpenUi() - end - }}, - distance = 2.0 - }) - end - end - end - while PlayerLoaded do _PlayerPedId = PlayerPedId() _GetEntityCoords = GetEntityCoords(_PlayerPedId) @@ -225,7 +172,7 @@ local function StartThread() PedHandler(closestPed) end - if not Config.Target and not isInMenu and IsPedOnFoot(PlayerPedId()) then + if not isInMenu and IsPedOnFoot(PlayerPedId()) then local closestBank = {} for i = 1, #Config.AtmModels do From a5b53476d678830f5f71bbd9add396e29ab68721 Mon Sep 17 00:00:00 2001 From: Mycroft Date: Fri, 21 Oct 2022 10:31:58 +0100 Subject: [PATCH 04/25] fix(esx_multicharacter): slots should work now --- [esx]/esx_multicharacter/client/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx]/esx_multicharacter/client/main.lua b/[esx]/esx_multicharacter/client/main.lua index 840576b3..8dbeef6f 100644 --- a/[esx]/esx_multicharacter/client/main.lua +++ b/[esx]/esx_multicharacter/client/main.lua @@ -182,7 +182,7 @@ if ESX.GetConfig().Multichar then elements[#elements+1] = {title = label,icon = "fa-regular fa-user", value = v.id} end end - if #elements < slots then + if #elements - 1 < slots then elements[#elements+1] = {title = _('create_char'), icon = "fa-solid fa-plus", value = (#elements+1), new = true} end From e9b251d7fa6f3437c73035c45337d6f281e0d4bd Mon Sep 17 00:00:00 2001 From: JinFa Date: Sun, 23 Oct 2022 04:58:25 +0800 Subject: [PATCH 05/25] refactor(esx_property): lowercase locale keys --- [esx_addons]/esx_property/client/cctv.lua | 4 ++-- [esx_addons]/esx_property/client/furniture.lua | 2 +- [esx_addons]/esx_property/client/main.lua | 6 +++--- [esx_addons]/esx_property/locales/en.lua | 18 +++++++++--------- [esx_addons]/esx_property/locales/nl.lua | 18 +++++++++--------- [esx_addons]/esx_property/locales/tc.lua | 14 +++++++------- 6 files changed, 31 insertions(+), 31 deletions(-) diff --git a/[esx_addons]/esx_property/client/cctv.lua b/[esx_addons]/esx_property/client/cctv.lua index 6d0ec39e..05b46c25 100644 --- a/[esx_addons]/esx_property/client/cctv.lua +++ b/[esx_addons]/esx_property/client/cctv.lua @@ -14,7 +14,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . -]] +]] function CCTV(PropertyID) DoScreenFadeOut(500) Wait(500) @@ -70,7 +70,7 @@ function CCTV(PropertyID) PushScaleformMovieFunctionParameterInt(4) N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.ZoomOut, true)) N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.CCTV.Controls.ZoomIn, true)) - InstructionButtonMessage(TranslateCap("Zoom")) + InstructionButtonMessage(TranslateCap("zoom")) PopScaleformMovieFunctionVoid() PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT") diff --git a/[esx_addons]/esx_property/client/furniture.lua b/[esx_addons]/esx_property/client/furniture.lua index 7ca92e14..0903237d 100644 --- a/[esx_addons]/esx_property/client/furniture.lua +++ b/[esx_addons]/esx_property/client/furniture.lua @@ -103,7 +103,7 @@ if Config.Furniture.Enabled then PushScaleformMovieFunctionParameterInt(5) N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.Furniture.Controls.Up, true)) N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.Furniture.Controls.Down, true)) - InstructionButtonMessage(TranslateCap("Height")) + InstructionButtonMessage(TranslateCap("height")) PopScaleformMovieFunctionVoid() PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT") diff --git a/[esx_addons]/esx_property/client/main.lua b/[esx_addons]/esx_property/client/main.lua index 4aa41e29..9c2fd4f2 100644 --- a/[esx_addons]/esx_property/client/main.lua +++ b/[esx_addons]/esx_property/client/main.lua @@ -281,7 +281,7 @@ function PropertyMenuElements(PropertyId) value = 'property_wardrobe'}) end table.insert(elements, - {title = TranslateCap("Furniture_title"), description = TranslateCap("Furniture_desc"), icon = "fas fa-boxes-stacked", value = 'property_furniture'}) + {title = TranslateCap("furniture_title"), description = TranslateCap("furniture_desc"), icon = "fas fa-boxes-stacked", value = 'property_furniture'}) end end if (not Property.Locked or Config.OwnerCanAlwaysEnter and ESX.PlayerData.identifier == Property.Owner) and not InProperty then @@ -454,7 +454,7 @@ function OpenPropertyMenu(PropertyId) local eles = PropertyMenuElements(PropertyId) exports["esx_context"]:Refresh(eles) else - ESX.ShowNotification(TranslateCap("cannot_Sell"), "error") + ESX.ShowNotification(TranslateCap("cannot_sell"), "error") end end, PropertyId, element.value) end @@ -476,7 +476,7 @@ function OpenPropertyMenu(PropertyId) local eles = PropertyMenuElements(PropertyId) exports["esx_context"]:Refresh(eles) else - ESX.ShowNotification(TranslateCap("cannot_Sell"), "error") + ESX.ShowNotification(TranslateCap("cannot_sell"), "error") end end, PropertyId) end diff --git a/[esx_addons]/esx_property/locales/en.lua b/[esx_addons]/esx_property/locales/en.lua index 6cd3347b..217c1206 100644 --- a/[esx_addons]/esx_property/locales/en.lua +++ b/[esx_addons]/esx_property/locales/en.lua @@ -4,8 +4,8 @@ Locales['en'] = { ["take_picture"] = "Take Picture", ["rot_left_right"] = "Left/Right", ["rot_up_down"] = "Up/Down", - ["Zoom"] = "Zoom In/Out", - ["Zoom_level"] = "Zoom Level: %s %", + ["zoom"] = "Zoom In/Out", + ["zoom_level"] = "Zoom Level: %s %", ["night_vision"] = "Toggle Night Vision", ["clipboard"] = "Link Copied To ~b~Cipboard", ["picture_taken"] = "Picture Taken!", @@ -14,7 +14,7 @@ Locales['en'] = { --- Furniture Strings ------ - ["Height"] = "Height", + ["height"] = "Height", ["rotate"] = "Rotation", ["place"] = "Place Furniture", ["delete_furni"] = "Delete", @@ -41,7 +41,7 @@ Locales['en'] = { ["menu_edit"] = "Edit", ["menu_edit_desc"] = "Move and/or Delete furniture items", ["furni_command"] = "furniture", - ["furni_Command_desc"] = "(ESX Property) Open Furniture Menu", + ["furni_command_desc"] = "(ESX Property) Open Furniture Menu", ["furni_command_permission"] = "You ~r~Cannot~s~ Access This Menu!", ["furni_reset_success"] = "Furniture Reset!", ["furni_cannot_afford"] = "You Cannot Afford Todo this!", @@ -113,8 +113,8 @@ Locales['en'] = { ["inventory_desc"] = "Change Position of Property Storage.", ["wardrobe_title"] = "Wardrobe", ["wardrobe_desc"] = "Change Position of Property Wardrobe.", - ["Furniture_title"] = "Furniture", - ["Furniture_desc"] = "Change Position of Property Furniture.", + ["furniture_title"] = "Furniture", + ["furniture_desc"] = "Change Position of Property Furniture.", ["enter_title"] = "Enter", ["knock_title"] = "Knock On Door", ["buy_title"] = "Buy", @@ -139,11 +139,11 @@ Locales['en'] = { ["please_finish"] = "Please Finish Setting ~b~%s~s~ Position", ["cannot_afford"] = "You Cannot Purchase This Property!", ["select_player"] = "Select Player", - ["cannot_Sell"] = "Cannot Sell To This Player!", + ["cannot_sell"] = "Cannot Sell To This Player!", ["knock_on_door"] = "Knocking On Door...", ["nobody_home"] = "It Seems Nobody is home...", - ---------- General Strings ---------------- + ---------- General Strings ---------------- ["enabled"] = "Enabled", ["disabled"] = "Disabled", @@ -166,7 +166,7 @@ Locales['en'] = { ["cannot_access_property"] = 'You ~r~Cannot~s~ Access this property.', - ----------------- Creation Menu Strings ---------------- + ----------------- Creation Menu Strings ---------------- ["menu_title"] = "Property Creation", ["element_title1"] = "Street Number", diff --git a/[esx_addons]/esx_property/locales/nl.lua b/[esx_addons]/esx_property/locales/nl.lua index b2669538..aa7bc704 100644 --- a/[esx_addons]/esx_property/locales/nl.lua +++ b/[esx_addons]/esx_property/locales/nl.lua @@ -4,8 +4,8 @@ Locales['nl'] = { ["take_picture"] = "Neem foto", ["rot_left_right"] = "Links/Rechts", ["rot_up_down"] = "Omhoog/Omblaag", - ["Zoom"] = "Zoom In/Uit", - ["Zoom_level"] = "Zoom Level: %s %", + ["zoom"] = "Zoom In/Uit", + ["zoom_level"] = "Zoom Level: %s %", ["night_vision"] = "Nachtcamera aanzetten", ["clipboard"] = "Link gekopierd naar ~b~klembord", ["picture_taken"] = "Foto genomen!", @@ -14,7 +14,7 @@ Locales['nl'] = { --- Furniture Strings ------ - ["Height"] = "Hoogte", + ["height"] = "Hoogte", ["rotate"] = "Rotatie", ["place"] = "Plaats Meubel", ["delete_furni"] = "Verwijder", @@ -41,7 +41,7 @@ Locales['nl'] = { ["menu_edit"] = "Aanpassen", ["menu_edit_desc"] = "Verplaats en/of verwijder meubels", ["furni_command"] = "meubel", - ["furni_Command_desc"] = "(ESX Property) Open meubel menu", + ["furni_command_desc"] = "(ESX Property) Open meubel menu", ["furni_command_permission"] = "Je ~r~Kan dit~s~ menu niet betreden!", ["furni_reset_success"] = "Meubel Reset!", ["furni_cannot_afford"] = "Je kan dit niet betalen!", @@ -113,8 +113,8 @@ Locales['nl'] = { ["inventory_desc"] = "Verander positie van de berging.", ["wardrobe_title"] = "Kledingkast", ["wardrobe_desc"] = "Verander de positie van de kledingkast.", - ["Furniture_title"] = "Meubels", - ["Furniture_desc"] = "Verander de positie van een meubel", + ["furniture_title"] = "Meubels", + ["furniture_desc"] = "Verander de positie van een meubel", ["enter_title"] = "Ga naar binnen", ["knock_title"] = "Klop op de deur", ["buy_title"] = "Koop", @@ -139,11 +139,11 @@ Locales['nl'] = { ["please_finish"] = "Maak het plaatsen van ~b~%s~s~ eerst af.", ["cannot_afford"] = "Je kan dit gebouw niet kopen!", ["select_player"] = "Selecteer speler", - ["cannot_Sell"] = "Kan niet aan deze speler verkopen!", + ["cannot_sell"] = "Kan niet aan deze speler verkopen!", ["knock_on_door"] = "Op deur kloppen...", ["nobody_home"] = "Lijkt erop alsof niemand thuis is...", - ---------- General Strings ---------------- + ---------- General Strings ---------------- ["enabled"] = "Aan", ["disabled"] = "Uit", @@ -166,7 +166,7 @@ Locales['nl'] = { ["cannot_access_property"] = 'Je ~r~kan niet~s~ dit gebouw betreden.', - ----------------- Creation Menu Strings ---------------- + ----------------- Creation Menu Strings ---------------- ["menu_title"] = "Gebouw creatie", ["element_title1"] = "Straat nummer", diff --git a/[esx_addons]/esx_property/locales/tc.lua b/[esx_addons]/esx_property/locales/tc.lua index a9f75943..30db8f83 100644 --- a/[esx_addons]/esx_property/locales/tc.lua +++ b/[esx_addons]/esx_property/locales/tc.lua @@ -4,8 +4,8 @@ Locales['tc'] = { ["take_picture"] = "拍攝照片", ["rot_left_right"] = "左／右", ["rot_up_down"] = "上／下", - ["Zoom"] = "放大／縮小", - ["Zoom_level"] = "縮放等級： %s %", + ["zoom"] = "放大／縮小", + ["zoom_level"] = "縮放等級： %s %", ["night_vision"] = "切換夜視模式", ["clipboard"] = "圖片連結已複製至 ~b~剪貼簿", ["picture_taken"] = "已拍攝照片！", @@ -14,7 +14,7 @@ Locales['tc'] = { --- Furniture Strings ------ - ["Height"] = "高度", + ["height"] = "高度", ["rotate"] = "角度", ["place"] = "放置家具", ["delete_furni"] = "移除", @@ -41,7 +41,7 @@ Locales['tc'] = { ["menu_edit"] = "編輯", ["menu_edit_desc"] = "移動、移除家具物品", ["furni_command"] = "furniture", - ["furni_Command_desc"] = "(ESX Property) 打開家具選單", + ["furni_command_desc"] = "(ESX Property) 打開家具選單", ["furni_command_permission"] = "你 ~r~沒有~s~ 此選單的權限！", ["furni_reset_success"] = "家具已重設！", ["furni_cannot_afford"] = "你沒有足夠的金錢進行此操作！", @@ -113,8 +113,8 @@ Locales['tc'] = { ["inventory_desc"] = "移動房產儲物櫃的位置", ["wardrobe_title"] = "衣櫃", ["wardrobe_desc"] = "移動房產衣櫃的位置", - ["Furniture_title"] = "家具", - ["Furniture_desc"] = "移動房產家具的位置", + ["furniture_title"] = "家具", + ["furniture_desc"] = "移動房產家具的位置", ["enter_title"] = "進入", ["knock_title"] = "敲門", ["buy_title"] = "購買", @@ -139,7 +139,7 @@ Locales['tc'] = { ["please_finish"] = "請完成 ~b~%s~s~ 的位置設定", ["cannot_afford"] = "你無法購買這個房產！", ["select_player"] = "選擇對象", - ["cannot_Sell"] = "無法賣給對方！", + ["cannot_sell"] = "無法賣給對方！", ["knock_on_door"] = "敲門…", ["nobody_home"] = "看起來沒人在家…", From 56745d8700edb435a4fbb9c87e4bb99c16eea689 Mon Sep 17 00:00:00 2001 From: Benzo <102178921+Benzo00@users.noreply.github.com> Date: Mon, 24 Oct 2022 15:21:35 +0200 Subject: [PATCH 06/25] fix:(readme) - removed image removed the server count since its removed from the page --- readme.md | 1 - 1 file changed, 1 deletion(-) diff --git a/readme.md b/readme.md index 9a6bd291..8a75cf37 100644 --- a/readme.md +++ b/readme.md @@ -1,5 +1,4 @@

ESX Legacy

-

Discord - Website - Documentation

Want More resources? You can browse the ESX Community Github or Cfx.re Releases board for more! From 018b17e533bb049ff89be14373e6752913e9a4c2 Mon Sep 17 00:00:00 2001 From: Benzo <102178921+Benzo00@users.noreply.github.com> Date: Mon, 24 Oct 2022 19:43:32 +0200 Subject: [PATCH 07/25] fix:(es_extended) - added remove date Added remove date for the getSharedObject Event --- [esx]/es_extended/server/common.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/[esx]/es_extended/server/common.lua b/[esx]/es_extended/server/common.lua index 61286904..a1a88dbb 100644 --- a/[esx]/es_extended/server/common.lua +++ b/[esx]/es_extended/server/common.lua @@ -16,7 +16,7 @@ Core.PlayerFunctionOverrides = {} AddEventHandler('esx:getSharedObject', function(cb) local Invoke = GetInvokingResource() - print(('[^3WARNING^7] ^5%s^7 used ^5esx:getSharedObject^7, this method is deprecated and should not be used! Refer to ^5https://docs.esx-framework.org/tutorials/sharedevent^7 for more info!'):format(Invoke)) + print(('[^3WARNING^7] ^5%s^7 used ^5esx:getSharedObject^7, this method is deprecated and should not be used On 30/11/2022 esx:getSharedObject will come to EOL and be fully removed! Refer to ^5https://docs.esx-framework.org/tutorials/sharedevent^7 for more info!'):format(Invoke)) cb(ESX) end) @@ -121,4 +121,4 @@ RegisterNetEvent("esx:ReturnVehicleType", function(Type, Request) Core.ClientCallbacks[Request](Type) Core.ClientCallbacks[Request] = nil end -end) \ No newline at end of file +end) From 8ea9cb09a17faa77151bbff7c5b0f901caa7aef6 Mon Sep 17 00:00:00 2001 From: Benzo <102178921+Benzo00@users.noreply.github.com> Date: Mon, 24 Oct 2022 19:45:17 +0200 Subject: [PATCH 08/25] fix(es_extended) - typo --- [esx]/es_extended/server/common.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx]/es_extended/server/common.lua b/[esx]/es_extended/server/common.lua index a1a88dbb..199491b8 100644 --- a/[esx]/es_extended/server/common.lua +++ b/[esx]/es_extended/server/common.lua @@ -16,7 +16,7 @@ Core.PlayerFunctionOverrides = {} AddEventHandler('esx:getSharedObject', function(cb) local Invoke = GetInvokingResource() - print(('[^3WARNING^7] ^5%s^7 used ^5esx:getSharedObject^7, this method is deprecated and should not be used On 30/11/2022 esx:getSharedObject will come to EOL and be fully removed! Refer to ^5https://docs.esx-framework.org/tutorials/sharedevent^7 for more info!'):format(Invoke)) + print(('[^3WARNING^7] ^5%s^7 used ^5esx:getSharedObject^7, this method is deprecated and should not be used, On 30/11/2022 esx:getSharedObject will come to EOL and be fully removed! Refer to ^5https://docs.esx-framework.org/tutorials/sharedevent^7 for more info!'):format(Invoke)) cb(ESX) end) From f384600fdaff51822d6e7b80fc7fcbd790cc3c56 Mon Sep 17 00:00:00 2001 From: JinFa Date: Wed, 26 Oct 2022 04:12:35 +0800 Subject: [PATCH 09/25] fix(esx_property): wrong locale key --- [esx_addons]/esx_property/client/furniture.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx_addons]/esx_property/client/furniture.lua b/[esx_addons]/esx_property/client/furniture.lua index 0903237d..52314fc2 100644 --- a/[esx_addons]/esx_property/client/furniture.lua +++ b/[esx_addons]/esx_property/client/furniture.lua @@ -110,7 +110,7 @@ if Config.Furniture.Enabled then PushScaleformMovieFunctionParameterInt(7) N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.Furniture.Controls.RotateLeft, true)) N_0xe83a3e3557a56640(GetControlInstructionalButton(1, Config.Furniture.Controls.RotateRight, true)) - InstructionButtonMessage(TranslateCap("Rotation")) + InstructionButtonMessage(TranslateCap("rotate")) PopScaleformMovieFunctionVoid() PushScaleformMovieFunction(scaleform, "SET_DATA_SLOT") From 11fba8b3d0947517ca63f38346f13f3893eb9b16 Mon Sep 17 00:00:00 2001 From: Benzo <102178921+Benzo00@users.noreply.github.com> Date: Thu, 27 Oct 2022 02:50:44 +0200 Subject: [PATCH 10/25] fix:(esx_identity) - removed unused png file --- [esx]/esx_identity/html/img/esx_identity.png | Bin 14230 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 [esx]/esx_identity/html/img/esx_identity.png diff --git a/[esx]/esx_identity/html/img/esx_identity.png b/[esx]/esx_identity/html/img/esx_identity.png deleted file mode 100644 index dcfc17c43bfb7332914c1d90657eab4991947c29..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 14230 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 From a74e470a552dbb11425c6b390ed5b1eb4de0b675 Mon Sep 17 00:00:00 2001 From: Benzo <102178921+Benzo00@users.noreply.github.com> Date: Thu, 27 Oct 2022 02:51:44 +0200 Subject: [PATCH 11/25] fix:(esx_identity) - removed unused code --- [esx]/esx_identity/fxmanifest.lua | 1 - 1 file changed, 1 deletion(-) diff --git a/[esx]/esx_identity/fxmanifest.lua b/[esx]/esx_identity/fxmanifest.lua index 48f81e69..7d3db1c9 100644 --- a/[esx]/esx_identity/fxmanifest.lua +++ b/[esx]/esx_identity/fxmanifest.lua @@ -29,7 +29,6 @@ files { 'html/index.html', 'html/js/script.js', 'html/css/style.css', - 'html/img/esx_identity.png' } dependency 'es_extended' From 0f458dbd9b3e2e5f8a9ab0e3d4e4e838739fdfc7 Mon Sep 17 00:00:00 2001 From: wasabirobby <79250053+wasabirobby@users.noreply.github.com> Date: Thu, 27 Oct 2022 00:48:52 -0700 Subject: [PATCH 12/25] refactor: remove endless death check loop --- [esx]/es_extended/client/modules/death.lua | 41 +++++++--------------- 1 file changed, 13 insertions(+), 28 deletions(-) diff --git a/[esx]/es_extended/client/modules/death.lua b/[esx]/es_extended/client/modules/death.lua index 54b478fb..75361ba0 100644 --- a/[esx]/es_extended/client/modules/death.lua +++ b/[esx]/es_extended/client/modules/death.lua @@ -1,32 +1,17 @@ -CreateThread(function() - local isDead = false - - while true do - local sleep = 1500 - local player = PlayerId() - - if NetworkIsPlayerActive(player) then - local playerPed = PlayerPedId() - - if IsPedFatallyInjured(playerPed) and not isDead then - sleep = 0 - isDead = true - - local killerEntity, deathCause = GetPedSourceOfDeath(playerPed), GetPedCauseOfDeath(playerPed) - local killerClientId = NetworkGetPlayerIndexFromPed(killerEntity) - - if killerEntity ~= playerPed and killerClientId and NetworkIsPlayerActive(killerClientId) then - PlayerKilledByPlayer(GetPlayerServerId(killerClientId), killerClientId, deathCause) - else - PlayerKilled(deathCause) - end - - elseif not IsPedFatallyInjured(playerPed) and isDead then - sleep = 0 - isDead = false - end +AddEventHandler('gameEventTriggered', function(event, data) + if event ~= 'CEventNetworkEntityDamage' then return end + local victim, victimDied = data[1], data[4] + if not IsPedAPlayer(victim) then return end + local player = PlayerId() + local playerPed = PlayerPedId() + if victimDied and NetworkGetPlayerIndexFromPed(victim) == player and IsPedDeadOrDying(victim, true) then + local killerEntity, deathCause = GetPedSourceOfDeath(playerPed), GetPedCauseOfDeath(playerPed) + local killerClientId = NetworkGetPlayerIndexFromPed(killerEntity) + if killerEntity ~= playerPed and killerClientId and NetworkIsPlayerActive(killerClientId) then + PlayerKilledByPlayer(GetPlayerServerId(killerClientId), killerClientId, deathCause) + else + PlayerKilled(deathCause) end - Wait(sleep) end end) From 271b99634e87b1f98f7c8713b2bdc47a5a7c6fb9 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Fri, 28 Oct 2022 18:31:26 +0200 Subject: [PATCH 13/25] fix:(Italian language correction) --- [esx_addons]/esx_garage/locales/it.lua | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 [esx_addons]/esx_garage/locales/it.lua diff --git a/[esx_addons]/esx_garage/locales/it.lua b/[esx_addons]/esx_garage/locales/it.lua new file mode 100644 index 00000000..745de4cb --- /dev/null +++ b/[esx_addons]/esx_garage/locales/it.lua @@ -0,0 +1,25 @@ +Locales["it"] = { + ["parking_blip_name"] = 'Garage', + ["Impound_blip_name"] = 'sequestro', + ["access_parking"] = 'premi [E] per accedere al parcheggio.', + ["access_Impound"] = 'premi [E] per accedere al sequestro.', + ["park_veh"] = 'premi [E] per parcheggiare il veicolo.', + ["not_owning_veh"] = 'non possiedi questo veicolo!', + ['veh_released' ] = ' Veicolo recuperato con successo. ' , + ['veh_Impound_released'] = ' Veicolo recuperato con successo dal sequestro. ' , + ['veh_stored'] = ' Veicolo depositato con successo ' , + ['veh_impounded'] = ' Veicolo sequestrato ' , + ['no_veh_parking'] = ' Nessun veicolo immagazzinato qui. ' , + ['no_veh_impounded'] = ' Nessun veicolo sequestrato. ' , + ['no_veh_Impound'] = ' non hai veicoli sequestrati. ' , + ['veh_model'] = ' Modello ' , + ['veh_plate'] = ' targa ' , + ['veh_condition'] = ' Condizione ' , + ['veh_action ' ] = ' Azione ' , + ['impound_action' ] = ' Sequestro ' , + ['veh_exit' ] = ' Ritira veicolo ' , + ['pay_impound' ] = ' Paga sequestro ' , + ['veh_block' ] = ' Impossibile recuperare il veicolo, la posizione di spawn è bloccata. ' , + ['pay_Impound_bill' ] = 'hai pagato ~g~$%s~s~ al sequestro. ' , + ['missing_money' ] = ' Non hai abbastanza soldi. ' +} From c2afda09144dda4f51593ab40f847a4e7a102e02 Mon Sep 17 00:00:00 2001 From: RoadToSix <92928205+roadtosixx@users.noreply.github.com> Date: Sat, 29 Oct 2022 01:31:15 +0200 Subject: [PATCH 14/25] fix(esx_banking): cannot set pincode to 0000 --- [esx_addons]/esx_banking/server/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/[esx_addons]/esx_banking/server/main.lua b/[esx_addons]/esx_banking/server/main.lua index 3b9f3d76..110c19d9 100644 --- a/[esx_addons]/esx_banking/server/main.lua +++ b/[esx_addons]/esx_banking/server/main.lua @@ -48,7 +48,7 @@ AddEventHandler('esx_banking:doingType', function(typeData) end amount = ESX.Math.Round(amount) - if amount == nil or amount <= 0 then + if amount == nil or (not typeData.pincode and amount <= 0) then TriggerClientEvent("esx:showNotification", source, TranslateCap('invalid_amount'), "error") else if typeData.deposit and amount <= money then @@ -79,7 +79,7 @@ AddEventHandler('esx_banking:doingType', function(typeData) TriggerClientEvent("esx:showNotification", source, TranslateCap(string.format('%s_money', key), amount, typeData.transfer.playerId), "success") else - TriggerClientEvent("esx:showNotification", source, TranslateCap(string.format('%s_money', key), amount), "success") + TriggerClientEvent("esx:showNotification", source, TranslateCap(string.format('%s_money', key), typeData.pincode and (string.format("%04d", amount)) or amount), "success") end if not typeData.pincode then BANK.LogTransaction(source, string.upper(key), amount, bankMoney) From 67e3dd5e0039e5f7f4a4a83c20cf5740d68c3063 Mon Sep 17 00:00:00 2001 From: RoadToSix <92928205+roadtosixx@users.noreply.github.com> Date: Sat, 29 Oct 2022 01:32:24 +0200 Subject: [PATCH 15/25] fix(esx_banking): ATM could be opened everywhere --- [esx_addons]/esx_banking/client/main.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/[esx_addons]/esx_banking/client/main.lua b/[esx_addons]/esx_banking/client/main.lua index 2c60fe9f..342eefb9 100644 --- a/[esx_addons]/esx_banking/client/main.lua +++ b/[esx_addons]/esx_banking/client/main.lua @@ -172,11 +172,11 @@ local function StartThread() PedHandler(closestPed) end - if not isInMenu and IsPedOnFoot(PlayerPedId()) then + if IsPedOnFoot(PlayerPedId()) then local closestBank = {} for i = 1, #Config.AtmModels do - local atm = GetClosestObjectOfType(_GetEntityCoords, 3.0, Config.AtmModels[i], false) + local atm = GetClosestObjectOfType(_GetEntityCoords, 8.0, Config.AtmModels[i], false) if atm ~= 0 then local atmOffset = GetOffsetFromEntityInWorldCoords(atm, 0.0, -0.7, 0.0) local atmHeading = GetEntityHeading(atm) From 4d11c3fb5e7c0f7b38bcdf4b67f3f8de1b0ae133 Mon Sep 17 00:00:00 2001 From: Amir_Lynx <60301485+AmirLynx@users.noreply.github.com> Date: Mon, 31 Oct 2022 14:09:24 +0330 Subject: [PATCH 16/25] built-in NUI jquery --- [esx]/esx_context/index.html | 196 ++++++++++++++++++----------------- 1 file changed, 100 insertions(+), 96 deletions(-) diff --git a/[esx]/esx_context/index.html b/[esx]/esx_context/index.html index c44b7d3e..fa50034e 100644 --- a/[esx]/esx_context/index.html +++ b/[esx]/esx_context/index.html @@ -1,7 +1,8 @@ + - + @@ -9,7 +10,7 @@ ESX Context HUD - +

- +
Unselectable Item Testing, testing a description here.
- +
Disabled Item Testing, testing a description here.
- +
Item Testing, testing a description here. Generic words to force overflow. -
+
+ \ No newline at end of file From 710cddfbc909e4349418613be142e767e2a3d39e Mon Sep 17 00:00:00 2001 From: Amir_Lynx <60301485+AmirLynx@users.noreply.github.com> Date: Mon, 31 Oct 2022 20:27:09 +0330 Subject: [PATCH 17/25] fix lscustom free mod with quit game --- [esx_addons]/esx_lscustom/client/main.lua | 17 ++++++++-- [esx_addons]/esx_lscustom/server/main.lua | 38 ++++++++++++++++++++++- 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/[esx_addons]/esx_lscustom/client/main.lua b/[esx_addons]/esx_lscustom/client/main.lua index b598f9b8..c5c79fd6 100644 --- a/[esx_addons]/esx_lscustom/client/main.lua +++ b/[esx_addons]/esx_lscustom/client/main.lua @@ -17,6 +17,15 @@ AddEventHandler('esx_lscustom:installMod', function() TriggerServerEvent('esx_lscustom:refreshOwnedVehicle', myCar) end) +RegisterNetEvent('esx_lscustom:restoreMods', function(netId, props) + local xVehicle = NetworkGetEntityFromNetworkId(netId) + if props ~= nil then + if DoesEntityExist(xVehicle) then + ESX.Game.SetVehicleProperties(xVehicle, props) + end + end +end) + RegisterNetEvent('esx_lscustom:cancelInstallMod') AddEventHandler('esx_lscustom:cancelInstallMod', function() local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) @@ -51,7 +60,6 @@ AddEventHandler('onResourceStop', function(resource) end end) - function OpenLSMenu(elems, menuName, menuTitle, parent) ESX.UI.Menu.Open('default', GetCurrentResourceName(), menuName, { title = menuTitle, @@ -82,7 +90,7 @@ function OpenLSMenu(elems, menuName, menuTitle, parent) break end end - + if isRimMod then price = math.floor(vehiclePrice * data.current.price / 100) TriggerServerEvent('esx_lscustom:buyMod', price) @@ -120,6 +128,7 @@ function OpenLSMenu(elems, menuName, menuTitle, parent) lsMenuIsShowed = false local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) FreezeEntityPosition(vehicle, false) + TriggerServerEvent('esx_lscustom:stopModing', myCar.plate) myCar = {} end end, function(data, menu) -- on change @@ -170,7 +179,6 @@ function GetAction(data) local playerPed = PlayerPedId() local vehicle = GetVehiclePedIsIn(playerPed, false) local currentMods = ESX.Game.GetVehicleProperties(vehicle) - if data.value == 'modSpeakers' or data.value == 'modTrunk' or data.value == 'modHydrolic' or data.value == 'modEngineBlock' or data.value == 'modAirFilter' or data.value == 'modStruts' or data.value == 'modTank' then SetVehicleDoorOpen(vehicle, 4, false) @@ -503,6 +511,9 @@ CreateThread(function() local vehicle = GetVehiclePedIsIn(playerPed, false) FreezeEntityPosition(vehicle, true) myCar = ESX.Game.GetVehicleProperties(vehicle) + + local netId = NetworkGetNetworkIdFromEntity(vehicle) + TriggerServerEvent('esx_lscustom:startModing', myCar, netId) ESX.UI.Menu.CloseAll() GetAction({ diff --git a/[esx_addons]/esx_lscustom/server/main.lua b/[esx_addons]/esx_lscustom/server/main.lua index 5d95fe1f..678078c6 100644 --- a/[esx_addons]/esx_lscustom/server/main.lua +++ b/[esx_addons]/esx_lscustom/server/main.lua @@ -1,4 +1,40 @@ local Vehicles +local Customs = {} + +RegisterNetEvent('esx_lscustom:startModing', function(props, netId) + local src = tostring(source) + if Customs[src] then + Customs[src][props.plate] = {props = props, netId = netId} + else + Customs[src] = {} + Customs[src][props.plate] = {props = props, netId = netId} + end +end) + +RegisterNetEvent('esx_lscustom:stopModing', function(plate) + local src = tostring(source) + if Customs[src] then + Customs[src][tostring(plate)] = nil + end +end) + +AddEventHandler('esx:playerDropped', function(src) + src = tostring(src) + local playersCount = #ESX.GetPlayers() + if Customs[src] then + for k,v in pairs(Customs[src]) do + local entity = NetworkGetEntityFromNetworkId(v.netId) + if DoesEntityExist(entity) then + if players > 0 then + TriggerClientEvent('esx_lscustom:restoreMods', -1, v.netId, v.props) + else + DeleteEntity(entity) + end + end + end + Customs[src] = nil + end +end) RegisterServerEvent('esx_lscustom:buyMod') AddEventHandler('esx_lscustom:buyMod', function(price) @@ -41,9 +77,9 @@ AddEventHandler('esx_lscustom:refreshOwnedVehicle', function(vehicleProps) function(result) if result then local vehicle = json.decode(result.vehicle) - if vehicleProps.model == vehicle.model then MySQL.update('UPDATE owned_vehicles SET vehicle = ? WHERE plate = ?', {json.encode(vehicleProps), vehicleProps.plate}) + Customs[tostring(source)][tostring(vehicleProps.plate)].props = props else print(('[^3WARNING^7] Player ^5%s^7 Attempted To upgrade with mismatching vehicle model'):format(xPlayer.source)) end From b4fc567b04c93957cb308f7a27f7085a28111ba4 Mon Sep 17 00:00:00 2001 From: Amir_Lynx <60301485+AmirLynx@users.noreply.github.com> Date: Tue, 1 Nov 2022 00:24:42 +0330 Subject: [PATCH 18/25] fix lscustom free mod with quit game --- [esx_addons]/esx_lscustom/client/main.lua | 17 ++++++++-- [esx_addons]/esx_lscustom/server/main.lua | 38 ++++++++++++++++++++++- 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/[esx_addons]/esx_lscustom/client/main.lua b/[esx_addons]/esx_lscustom/client/main.lua index b598f9b8..c5c79fd6 100644 --- a/[esx_addons]/esx_lscustom/client/main.lua +++ b/[esx_addons]/esx_lscustom/client/main.lua @@ -17,6 +17,15 @@ AddEventHandler('esx_lscustom:installMod', function() TriggerServerEvent('esx_lscustom:refreshOwnedVehicle', myCar) end) +RegisterNetEvent('esx_lscustom:restoreMods', function(netId, props) + local xVehicle = NetworkGetEntityFromNetworkId(netId) + if props ~= nil then + if DoesEntityExist(xVehicle) then + ESX.Game.SetVehicleProperties(xVehicle, props) + end + end +end) + RegisterNetEvent('esx_lscustom:cancelInstallMod') AddEventHandler('esx_lscustom:cancelInstallMod', function() local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) @@ -51,7 +60,6 @@ AddEventHandler('onResourceStop', function(resource) end end) - function OpenLSMenu(elems, menuName, menuTitle, parent) ESX.UI.Menu.Open('default', GetCurrentResourceName(), menuName, { title = menuTitle, @@ -82,7 +90,7 @@ function OpenLSMenu(elems, menuName, menuTitle, parent) break end end - + if isRimMod then price = math.floor(vehiclePrice * data.current.price / 100) TriggerServerEvent('esx_lscustom:buyMod', price) @@ -120,6 +128,7 @@ function OpenLSMenu(elems, menuName, menuTitle, parent) lsMenuIsShowed = false local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) FreezeEntityPosition(vehicle, false) + TriggerServerEvent('esx_lscustom:stopModing', myCar.plate) myCar = {} end end, function(data, menu) -- on change @@ -170,7 +179,6 @@ function GetAction(data) local playerPed = PlayerPedId() local vehicle = GetVehiclePedIsIn(playerPed, false) local currentMods = ESX.Game.GetVehicleProperties(vehicle) - if data.value == 'modSpeakers' or data.value == 'modTrunk' or data.value == 'modHydrolic' or data.value == 'modEngineBlock' or data.value == 'modAirFilter' or data.value == 'modStruts' or data.value == 'modTank' then SetVehicleDoorOpen(vehicle, 4, false) @@ -503,6 +511,9 @@ CreateThread(function() local vehicle = GetVehiclePedIsIn(playerPed, false) FreezeEntityPosition(vehicle, true) myCar = ESX.Game.GetVehicleProperties(vehicle) + + local netId = NetworkGetNetworkIdFromEntity(vehicle) + TriggerServerEvent('esx_lscustom:startModing', myCar, netId) ESX.UI.Menu.CloseAll() GetAction({ diff --git a/[esx_addons]/esx_lscustom/server/main.lua b/[esx_addons]/esx_lscustom/server/main.lua index 5d95fe1f..678078c6 100644 --- a/[esx_addons]/esx_lscustom/server/main.lua +++ b/[esx_addons]/esx_lscustom/server/main.lua @@ -1,4 +1,40 @@ local Vehicles +local Customs = {} + +RegisterNetEvent('esx_lscustom:startModing', function(props, netId) + local src = tostring(source) + if Customs[src] then + Customs[src][props.plate] = {props = props, netId = netId} + else + Customs[src] = {} + Customs[src][props.plate] = {props = props, netId = netId} + end +end) + +RegisterNetEvent('esx_lscustom:stopModing', function(plate) + local src = tostring(source) + if Customs[src] then + Customs[src][tostring(plate)] = nil + end +end) + +AddEventHandler('esx:playerDropped', function(src) + src = tostring(src) + local playersCount = #ESX.GetPlayers() + if Customs[src] then + for k,v in pairs(Customs[src]) do + local entity = NetworkGetEntityFromNetworkId(v.netId) + if DoesEntityExist(entity) then + if players > 0 then + TriggerClientEvent('esx_lscustom:restoreMods', -1, v.netId, v.props) + else + DeleteEntity(entity) + end + end + end + Customs[src] = nil + end +end) RegisterServerEvent('esx_lscustom:buyMod') AddEventHandler('esx_lscustom:buyMod', function(price) @@ -41,9 +77,9 @@ AddEventHandler('esx_lscustom:refreshOwnedVehicle', function(vehicleProps) function(result) if result then local vehicle = json.decode(result.vehicle) - if vehicleProps.model == vehicle.model then MySQL.update('UPDATE owned_vehicles SET vehicle = ? WHERE plate = ?', {json.encode(vehicleProps), vehicleProps.plate}) + Customs[tostring(source)][tostring(vehicleProps.plate)].props = props else print(('[^3WARNING^7] Player ^5%s^7 Attempted To upgrade with mismatching vehicle model'):format(xPlayer.source)) end From f8f59a4e62b8bb9a05d0364e93a9afb1d7560c76 Mon Sep 17 00:00:00 2001 From: Amir_Lynx <60301485+AmirLynx@users.noreply.github.com> Date: Tue, 1 Nov 2022 00:25:17 +0330 Subject: [PATCH 19/25] change ESX.GetPlayers to ESX.GetExtendedPlayers --- [esx_addons]/esx_lscustom/server/main.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx_addons]/esx_lscustom/server/main.lua b/[esx_addons]/esx_lscustom/server/main.lua index 678078c6..a2f41376 100644 --- a/[esx_addons]/esx_lscustom/server/main.lua +++ b/[esx_addons]/esx_lscustom/server/main.lua @@ -20,7 +20,7 @@ end) AddEventHandler('esx:playerDropped', function(src) src = tostring(src) - local playersCount = #ESX.GetPlayers() + local playersCount = #ESX.GetExtendedPlayers() if Customs[src] then for k,v in pairs(Customs[src]) do local entity = NetworkGetEntityFromNetworkId(v.netId) From e39b2c10b2d6f77c19cb2f0f265ebf449e0a9894 Mon Sep 17 00:00:00 2001 From: Amir_Lynx <60301485+AmirLynx@users.noreply.github.com> Date: Tue, 1 Nov 2022 00:28:47 +0330 Subject: [PATCH 20/25] fix lscustom free mod with quit game --- [esx_addons]/esx_lscustom/client/main.lua | 17 ++++++++-- [esx_addons]/esx_lscustom/server/main.lua | 39 ++++++++++++++++++++++- 2 files changed, 52 insertions(+), 4 deletions(-) diff --git a/[esx_addons]/esx_lscustom/client/main.lua b/[esx_addons]/esx_lscustom/client/main.lua index b598f9b8..c5c79fd6 100644 --- a/[esx_addons]/esx_lscustom/client/main.lua +++ b/[esx_addons]/esx_lscustom/client/main.lua @@ -17,6 +17,15 @@ AddEventHandler('esx_lscustom:installMod', function() TriggerServerEvent('esx_lscustom:refreshOwnedVehicle', myCar) end) +RegisterNetEvent('esx_lscustom:restoreMods', function(netId, props) + local xVehicle = NetworkGetEntityFromNetworkId(netId) + if props ~= nil then + if DoesEntityExist(xVehicle) then + ESX.Game.SetVehicleProperties(xVehicle, props) + end + end +end) + RegisterNetEvent('esx_lscustom:cancelInstallMod') AddEventHandler('esx_lscustom:cancelInstallMod', function() local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) @@ -51,7 +60,6 @@ AddEventHandler('onResourceStop', function(resource) end end) - function OpenLSMenu(elems, menuName, menuTitle, parent) ESX.UI.Menu.Open('default', GetCurrentResourceName(), menuName, { title = menuTitle, @@ -82,7 +90,7 @@ function OpenLSMenu(elems, menuName, menuTitle, parent) break end end - + if isRimMod then price = math.floor(vehiclePrice * data.current.price / 100) TriggerServerEvent('esx_lscustom:buyMod', price) @@ -120,6 +128,7 @@ function OpenLSMenu(elems, menuName, menuTitle, parent) lsMenuIsShowed = false local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) FreezeEntityPosition(vehicle, false) + TriggerServerEvent('esx_lscustom:stopModing', myCar.plate) myCar = {} end end, function(data, menu) -- on change @@ -170,7 +179,6 @@ function GetAction(data) local playerPed = PlayerPedId() local vehicle = GetVehiclePedIsIn(playerPed, false) local currentMods = ESX.Game.GetVehicleProperties(vehicle) - if data.value == 'modSpeakers' or data.value == 'modTrunk' or data.value == 'modHydrolic' or data.value == 'modEngineBlock' or data.value == 'modAirFilter' or data.value == 'modStruts' or data.value == 'modTank' then SetVehicleDoorOpen(vehicle, 4, false) @@ -503,6 +511,9 @@ CreateThread(function() local vehicle = GetVehiclePedIsIn(playerPed, false) FreezeEntityPosition(vehicle, true) myCar = ESX.Game.GetVehicleProperties(vehicle) + + local netId = NetworkGetNetworkIdFromEntity(vehicle) + TriggerServerEvent('esx_lscustom:startModing', myCar, netId) ESX.UI.Menu.CloseAll() GetAction({ diff --git a/[esx_addons]/esx_lscustom/server/main.lua b/[esx_addons]/esx_lscustom/server/main.lua index 5d95fe1f..ff9b5bfc 100644 --- a/[esx_addons]/esx_lscustom/server/main.lua +++ b/[esx_addons]/esx_lscustom/server/main.lua @@ -1,4 +1,40 @@ local Vehicles +local Customs = {} + +RegisterNetEvent('esx_lscustom:startModing', function(props, netId) + local src = tostring(source) + if Customs[src] then + Customs[src][props.plate] = {props = props, netId = netId} + else + Customs[src] = {} + Customs[src][props.plate] = {props = props, netId = netId} + end +end) + +RegisterNetEvent('esx_lscustom:stopModing', function(plate) + local src = tostring(source) + if Customs[src] then + Customs[src][tostring(plate)] = nil + end +end) + +AddEventHandler('esx:playerDropped', function(src) + src = tostring(src) + local playersCount = #ESX.GetExtendedPlayers() + if Customs[src] then + for k,v in pairs(Customs[src]) do + local entity = NetworkGetEntityFromNetworkId(v.netId) + if DoesEntityExist(entity) then + if players > 0 then + TriggerClientEvent('esx_lscustom:restoreMods', -1, v.netId, v.props) + else + DeleteEntity(entity) + end + end + end + Customs[src] = nil + end +end) RegisterServerEvent('esx_lscustom:buyMod') AddEventHandler('esx_lscustom:buyMod', function(price) @@ -41,9 +77,10 @@ AddEventHandler('esx_lscustom:refreshOwnedVehicle', function(vehicleProps) function(result) if result then local vehicle = json.decode(result.vehicle) - if vehicleProps.model == vehicle.model then MySQL.update('UPDATE owned_vehicles SET vehicle = ? WHERE plate = ?', {json.encode(vehicleProps), vehicleProps.plate}) + Customs[tostring(source)][tostring(vehicleProps.plate)].props = props + Customs[tostring(source)][tostring(vehicleProps.plate)].props = props else print(('[^3WARNING^7] Player ^5%s^7 Attempted To upgrade with mismatching vehicle model'):format(xPlayer.source)) end From 1152b2d9a3f10d840b6b6ef6a80495ee8af3663e Mon Sep 17 00:00:00 2001 From: Amir_Lynx <60301485+AmirLynx@users.noreply.github.com> Date: Tue, 1 Nov 2022 00:29:22 +0330 Subject: [PATCH 21/25] fix lscustom free mod with quit game --- [esx_addons]/esx_lscustom/client/main.lua | 17 ++++++++-- [esx_addons]/esx_lscustom/server/main.lua | 38 ++++++++++++++++++++++- 2 files changed, 51 insertions(+), 4 deletions(-) diff --git a/[esx_addons]/esx_lscustom/client/main.lua b/[esx_addons]/esx_lscustom/client/main.lua index b598f9b8..c5c79fd6 100644 --- a/[esx_addons]/esx_lscustom/client/main.lua +++ b/[esx_addons]/esx_lscustom/client/main.lua @@ -17,6 +17,15 @@ AddEventHandler('esx_lscustom:installMod', function() TriggerServerEvent('esx_lscustom:refreshOwnedVehicle', myCar) end) +RegisterNetEvent('esx_lscustom:restoreMods', function(netId, props) + local xVehicle = NetworkGetEntityFromNetworkId(netId) + if props ~= nil then + if DoesEntityExist(xVehicle) then + ESX.Game.SetVehicleProperties(xVehicle, props) + end + end +end) + RegisterNetEvent('esx_lscustom:cancelInstallMod') AddEventHandler('esx_lscustom:cancelInstallMod', function() local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) @@ -51,7 +60,6 @@ AddEventHandler('onResourceStop', function(resource) end end) - function OpenLSMenu(elems, menuName, menuTitle, parent) ESX.UI.Menu.Open('default', GetCurrentResourceName(), menuName, { title = menuTitle, @@ -82,7 +90,7 @@ function OpenLSMenu(elems, menuName, menuTitle, parent) break end end - + if isRimMod then price = math.floor(vehiclePrice * data.current.price / 100) TriggerServerEvent('esx_lscustom:buyMod', price) @@ -120,6 +128,7 @@ function OpenLSMenu(elems, menuName, menuTitle, parent) lsMenuIsShowed = false local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) FreezeEntityPosition(vehicle, false) + TriggerServerEvent('esx_lscustom:stopModing', myCar.plate) myCar = {} end end, function(data, menu) -- on change @@ -170,7 +179,6 @@ function GetAction(data) local playerPed = PlayerPedId() local vehicle = GetVehiclePedIsIn(playerPed, false) local currentMods = ESX.Game.GetVehicleProperties(vehicle) - if data.value == 'modSpeakers' or data.value == 'modTrunk' or data.value == 'modHydrolic' or data.value == 'modEngineBlock' or data.value == 'modAirFilter' or data.value == 'modStruts' or data.value == 'modTank' then SetVehicleDoorOpen(vehicle, 4, false) @@ -503,6 +511,9 @@ CreateThread(function() local vehicle = GetVehiclePedIsIn(playerPed, false) FreezeEntityPosition(vehicle, true) myCar = ESX.Game.GetVehicleProperties(vehicle) + + local netId = NetworkGetNetworkIdFromEntity(vehicle) + TriggerServerEvent('esx_lscustom:startModing', myCar, netId) ESX.UI.Menu.CloseAll() GetAction({ diff --git a/[esx_addons]/esx_lscustom/server/main.lua b/[esx_addons]/esx_lscustom/server/main.lua index 5d95fe1f..a2f41376 100644 --- a/[esx_addons]/esx_lscustom/server/main.lua +++ b/[esx_addons]/esx_lscustom/server/main.lua @@ -1,4 +1,40 @@ local Vehicles +local Customs = {} + +RegisterNetEvent('esx_lscustom:startModing', function(props, netId) + local src = tostring(source) + if Customs[src] then + Customs[src][props.plate] = {props = props, netId = netId} + else + Customs[src] = {} + Customs[src][props.plate] = {props = props, netId = netId} + end +end) + +RegisterNetEvent('esx_lscustom:stopModing', function(plate) + local src = tostring(source) + if Customs[src] then + Customs[src][tostring(plate)] = nil + end +end) + +AddEventHandler('esx:playerDropped', function(src) + src = tostring(src) + local playersCount = #ESX.GetExtendedPlayers() + if Customs[src] then + for k,v in pairs(Customs[src]) do + local entity = NetworkGetEntityFromNetworkId(v.netId) + if DoesEntityExist(entity) then + if players > 0 then + TriggerClientEvent('esx_lscustom:restoreMods', -1, v.netId, v.props) + else + DeleteEntity(entity) + end + end + end + Customs[src] = nil + end +end) RegisterServerEvent('esx_lscustom:buyMod') AddEventHandler('esx_lscustom:buyMod', function(price) @@ -41,9 +77,9 @@ AddEventHandler('esx_lscustom:refreshOwnedVehicle', function(vehicleProps) function(result) if result then local vehicle = json.decode(result.vehicle) - if vehicleProps.model == vehicle.model then MySQL.update('UPDATE owned_vehicles SET vehicle = ? WHERE plate = ?', {json.encode(vehicleProps), vehicleProps.plate}) + Customs[tostring(source)][tostring(vehicleProps.plate)].props = props else print(('[^3WARNING^7] Player ^5%s^7 Attempted To upgrade with mismatching vehicle model'):format(xPlayer.source)) end From ad1ec3caa31c397920b41158848ea9036af97a75 Mon Sep 17 00:00:00 2001 From: Amir_Lynx <60301485+AmirLynx@users.noreply.github.com> Date: Tue, 1 Nov 2022 00:36:22 +0330 Subject: [PATCH 22/25] fix lscustom quit glitch (use ESX native) --- [esx_addons]/esx_lscustom/client/main.lua | 17 +++++- [esx_addons]/esx_lscustom/server/main.lua | 74 ++++++++++++++++++++++- 2 files changed, 87 insertions(+), 4 deletions(-) diff --git a/[esx_addons]/esx_lscustom/client/main.lua b/[esx_addons]/esx_lscustom/client/main.lua index b598f9b8..c5c79fd6 100644 --- a/[esx_addons]/esx_lscustom/client/main.lua +++ b/[esx_addons]/esx_lscustom/client/main.lua @@ -17,6 +17,15 @@ AddEventHandler('esx_lscustom:installMod', function() TriggerServerEvent('esx_lscustom:refreshOwnedVehicle', myCar) end) +RegisterNetEvent('esx_lscustom:restoreMods', function(netId, props) + local xVehicle = NetworkGetEntityFromNetworkId(netId) + if props ~= nil then + if DoesEntityExist(xVehicle) then + ESX.Game.SetVehicleProperties(xVehicle, props) + end + end +end) + RegisterNetEvent('esx_lscustom:cancelInstallMod') AddEventHandler('esx_lscustom:cancelInstallMod', function() local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) @@ -51,7 +60,6 @@ AddEventHandler('onResourceStop', function(resource) end end) - function OpenLSMenu(elems, menuName, menuTitle, parent) ESX.UI.Menu.Open('default', GetCurrentResourceName(), menuName, { title = menuTitle, @@ -82,7 +90,7 @@ function OpenLSMenu(elems, menuName, menuTitle, parent) break end end - + if isRimMod then price = math.floor(vehiclePrice * data.current.price / 100) TriggerServerEvent('esx_lscustom:buyMod', price) @@ -120,6 +128,7 @@ function OpenLSMenu(elems, menuName, menuTitle, parent) lsMenuIsShowed = false local vehicle = GetVehiclePedIsIn(PlayerPedId(), false) FreezeEntityPosition(vehicle, false) + TriggerServerEvent('esx_lscustom:stopModing', myCar.plate) myCar = {} end end, function(data, menu) -- on change @@ -170,7 +179,6 @@ function GetAction(data) local playerPed = PlayerPedId() local vehicle = GetVehiclePedIsIn(playerPed, false) local currentMods = ESX.Game.GetVehicleProperties(vehicle) - if data.value == 'modSpeakers' or data.value == 'modTrunk' or data.value == 'modHydrolic' or data.value == 'modEngineBlock' or data.value == 'modAirFilter' or data.value == 'modStruts' or data.value == 'modTank' then SetVehicleDoorOpen(vehicle, 4, false) @@ -503,6 +511,9 @@ CreateThread(function() local vehicle = GetVehiclePedIsIn(playerPed, false) FreezeEntityPosition(vehicle, true) myCar = ESX.Game.GetVehicleProperties(vehicle) + + local netId = NetworkGetNetworkIdFromEntity(vehicle) + TriggerServerEvent('esx_lscustom:startModing', myCar, netId) ESX.UI.Menu.CloseAll() GetAction({ diff --git a/[esx_addons]/esx_lscustom/server/main.lua b/[esx_addons]/esx_lscustom/server/main.lua index 5d95fe1f..c26ce64e 100644 --- a/[esx_addons]/esx_lscustom/server/main.lua +++ b/[esx_addons]/esx_lscustom/server/main.lua @@ -1,4 +1,76 @@ local Vehicles +local Customs = {} + +RegisterNetEvent('esx_lscustom:startModing', function(props, netId) + local src = tostring(source) + if Customs[src] then + Customs[src][props.plate] = {props = props, netId = netId} + else + Customs[src] = {} + Customs[src][props.plate] = {props = props, netId = netId} + end +end) + +RegisterNetEvent('esx_lscustom:stopModing', function(plate) + local src = tostring(source) + if Customs[src] then + Customs[src][tostring(plate)] = nil + end +end) + +AddEventHandler('esx:playerDropped', function(src) + src = tostring(src) + local playersCount = #ESX.GetExtendedPlayers() + if Customs[src] then + for k,v in pairs(Customs[src]) do + local entity = NetworkGetEntityFromNetworkId(v.netId) + if DoesEntityExist(entity) then + if players > 0 then + TriggerClientEvent('esx_lscustom:restoreMods', -1, v.netId, v.props) + else + DeleteEntity(entity) + end + end + end + Customs[src] = nil + end +end) +local Customs = {} + +RegisterNetEvent('esx_lscustom:startModing', function(props, netId) + local src = tostring(source) + if Customs[src] then + Customs[src][props.plate] = {props = props, netId = netId} + else + Customs[src] = {} + Customs[src][props.plate] = {props = props, netId = netId} + end +end) + +RegisterNetEvent('esx_lscustom:stopModing', function(plate) + local src = tostring(source) + if Customs[src] then + Customs[src][tostring(plate)] = nil + end +end) + +AddEventHandler('esx:playerDropped', function(src) + src = tostring(src) + local playersCount = #ESX.GetExtendedPlayers() + if Customs[src] then + for k,v in pairs(Customs[src]) do + local entity = NetworkGetEntityFromNetworkId(v.netId) + if DoesEntityExist(entity) then + if players > 0 then + TriggerClientEvent('esx_lscustom:restoreMods', -1, v.netId, v.props) + else + DeleteEntity(entity) + end + end + end + Customs[src] = nil + end +end) RegisterServerEvent('esx_lscustom:buyMod') AddEventHandler('esx_lscustom:buyMod', function(price) @@ -41,9 +113,9 @@ AddEventHandler('esx_lscustom:refreshOwnedVehicle', function(vehicleProps) function(result) if result then local vehicle = json.decode(result.vehicle) - if vehicleProps.model == vehicle.model then MySQL.update('UPDATE owned_vehicles SET vehicle = ? WHERE plate = ?', {json.encode(vehicleProps), vehicleProps.plate}) + Customs[tostring(source)][tostring(vehicleProps.plate)].props = props else print(('[^3WARNING^7] Player ^5%s^7 Attempted To upgrade with mismatching vehicle model'):format(xPlayer.source)) end From 8c181ff2ab8abb980ae61270817e299586329d1d Mon Sep 17 00:00:00 2001 From: Amir_Lynx <60301485+AmirLynx@users.noreply.github.com> Date: Tue, 1 Nov 2022 00:39:43 +0330 Subject: [PATCH 23/25] conflict --- [esx_addons]/esx_lscustom/server/main.lua | 36 ----------------------- 1 file changed, 36 deletions(-) diff --git a/[esx_addons]/esx_lscustom/server/main.lua b/[esx_addons]/esx_lscustom/server/main.lua index c26ce64e..a2f41376 100644 --- a/[esx_addons]/esx_lscustom/server/main.lua +++ b/[esx_addons]/esx_lscustom/server/main.lua @@ -18,42 +18,6 @@ RegisterNetEvent('esx_lscustom:stopModing', function(plate) end end) -AddEventHandler('esx:playerDropped', function(src) - src = tostring(src) - local playersCount = #ESX.GetExtendedPlayers() - if Customs[src] then - for k,v in pairs(Customs[src]) do - local entity = NetworkGetEntityFromNetworkId(v.netId) - if DoesEntityExist(entity) then - if players > 0 then - TriggerClientEvent('esx_lscustom:restoreMods', -1, v.netId, v.props) - else - DeleteEntity(entity) - end - end - end - Customs[src] = nil - end -end) -local Customs = {} - -RegisterNetEvent('esx_lscustom:startModing', function(props, netId) - local src = tostring(source) - if Customs[src] then - Customs[src][props.plate] = {props = props, netId = netId} - else - Customs[src] = {} - Customs[src][props.plate] = {props = props, netId = netId} - end -end) - -RegisterNetEvent('esx_lscustom:stopModing', function(plate) - local src = tostring(source) - if Customs[src] then - Customs[src][tostring(plate)] = nil - end -end) - AddEventHandler('esx:playerDropped', function(src) src = tostring(src) local playersCount = #ESX.GetExtendedPlayers() From 8f1e96e12efad2bcb84382329b679e4b7eba62d0 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Tue, 1 Nov 2022 18:10:04 +0100 Subject: [PATCH 24/25] feat:(Italian language for esx_lscustom) --- [esx_addons]/esx_lscustom/locales/it.lua | 269 +++++++++++++++++++++++ 1 file changed, 269 insertions(+) create mode 100644 [esx_addons]/esx_lscustom/locales/it.lua diff --git a/[esx_addons]/esx_lscustom/locales/it.lua b/[esx_addons]/esx_lscustom/locales/it.lua new file mode 100644 index 00000000..96477649 --- /dev/null +++ b/[esx_addons]/esx_lscustom/locales/it.lua @@ -0,0 +1,269 @@ +Locales['it'] = { + ['by_default'] = 'default', + ['installed'] = 'installato', + ['already_own'] = 'possiedi già: %s', + ['not_enough_money'] = 'non puoi permetterti questa mod!', + ['purchased'] = 'hai acquistato la mod!', + ['press_custom'] = 'premi ~b~[E]~s~ per personalizzare il tuo veicolo', + ['level'] = 'livello %s', + ['neon'] = 'neon', + ['blip_name'] = 'los Santos Customs', +-- Paint Colors + -- Black + ['black'] = 'nero', + ['graphite'] = 'grafite', + ['black_metallic'] = 'nero metallico', + ['caststeel'] = 'acciaio fuso', + ['black_anth'] = 'nero antacite', + ['matteblack'] = 'nero opaco', + ['darknight'] = 'notte oscura', + ['deepblack'] = 'nero profondo', + ['oil'] = 'olio', + ['carbon'] = 'carbonio', + -- White + ['white'] = 'bianco', + ['vanilla'] = 'vaniglia', + ['creme'] = 'crema', + ['polarwhite'] = 'bianco polare', + ['beige'] = 'beige', + ['mattewhite'] = 'bianco opaco', + ['snow'] = 'neve', + ['cotton'] = 'cotone', + ['alabaster'] = 'alabastro', + ['purewhite'] = 'bianco puro', + -- Grey + ['grey'] = 'grigio', + ['silver'] = 'argento', + ['metallicgrey'] = 'grigio metallico', + ['laminatedsteel'] = 'acciaio laminato', + ['darkgray'] = 'grigio scuro', + ['rockygray'] = 'grigio roccioso', + ['graynight'] = 'grigio notte', + ['aluminum'] = 'alluminio', + ['graymat'] = 'grigio opaco', + ['lightgrey'] = 'grigio chiaro', + ['asphaltgray'] = 'grigio asfalto', + ['grayconcrete'] = 'grigio cemento', + ['darksilver'] = 'argento scuro', + ['magnesite'] = 'magnesite', + ['nickel'] = 'nickel', + ['zinc'] = 'zinco', + ['dolomite'] = 'dolomite', + ['bluesilver'] = 'argento blu', + ['titanium'] = 'titanio', + ['steelblue'] = 'blu acciaio', + ['champagne'] = 'champagne', + ['grayhunter'] = 'grigio cacciatore', + -- Red + ['red'] = 'rosso', + ['torino_red'] = 'rosso torino', + ['poppy'] = 'papavero', + ['copper_red'] = 'rosso rame', + ['cardinal'] = 'rosso cardinale', + ['brick'] = 'rosso mattone', + ['garnet'] = 'Granato', + ['cabernet'] = 'rosso cabernet', + ['candy'] = 'caramella rossa', + ['matte_red'] = 'rosso opaco', + ['dark_red'] = 'rosso scuro', + ['red_pulp'] = 'polpa rossa', + ['bril_red'] = 'rosso brillante', + ['pale_red'] = 'rosso pallido', + ['wine_red'] = 'vino rosso', + ['volcano'] = 'vulcano', + -- Pink + ['pink'] = 'rosa', + ['electricpink'] = 'rosa elettrico', + ['brightpink'] = 'rosa brillante', + ['salmon'] = 'rosa salmone', + ['sugarplum'] = 'rosa prugna', + -- Blue + ['blue'] = 'blu', + ['topaz'] = 'blu topazio', + ['light_blue'] = 'azzurro', + ['galaxy_blue'] = 'blu galassia', + ['dark_blue'] = 'blu scuro', + ['azure'] = 'azzurro', + ['navy_blue'] = 'blu marino', + ['lapis'] = 'blu lapislazzulo', + ['blue_diamond'] = 'blu diamante', + ['surfer'] = 'surfista', + ['pastel_blue'] = 'blu pastello', + ['celeste_blue'] = 'blu celeste', + ['rally_blue'] = 'rally Blue', + ['blue_paradise'] = 'blu Paradiso', + ['blue_night'] = 'blu notte', + ['cyan_blue'] = 'blu ciano', + ['cobalt'] = 'cobalto', + ['electric_blue'] = 'blue elettrico', + ['horizon_blue'] = 'blu orizzonte', + ['metallic_blue'] = 'blu metallico', + ['aquamarine'] = 'acquamarina', + ['blue_agathe'] = 'blu agata', + ['zirconium'] = 'zirconio', + ['spinel'] = 'spinello', + ['tourmaline'] = 'tormalina', + ['paradise'] = 'paradiso', + ['bubble_gum'] = 'blu gomma', + ['midnight_blue'] = 'blu mezzanotte', + ['forbidden_blue'] = 'blu proibito', + ['glacier_blue'] = 'blu glaciale', + -- Yellow + ['yellow'] = 'giallo', + ['wheat'] = 'giallo grano', + ['raceyellow'] = 'giallo gara', + ['paleyellow'] = 'giallo pallido', + ['lightyellow'] = 'giallo chiaro', + -- Green + ['green'] = 'verde', + ['met_dark_green'] = 'verde scuro metallico', + ['rally_green'] = 'verde Rally', + ['pine_green'] = 'verde pino', + ['olive_green'] = 'verde oliva', + ['light_green'] = 'verde chiaro', + ['lime_green'] = 'verde lime', + ['forest_green'] = 'verde foresta', + ['lawn_green'] = 'verde prato', + ['imperial_green'] = 'verde imperiale', + ['green_bottle'] = 'verde bottiglia', + ['citrus_green'] = 'verde agrumi', + ['green_anis'] = 'verde anici', + ['khaki'] = 'cachi', + ['army_green'] = 'verde militare', + ['dark_green'] = 'verde scuro', + ['hunter_green'] = 'verde cacciatore', + ['matte_foilage_green'] = 'verde foglia', + -- Orange + ['orange'] = 'arancione', + ['tangerine'] = 'mandarino', + ['matteorange'] = 'arancio opaco', + ['lightorange'] = 'arancione chiaro', + ['peach'] = 'pesca', + ['pumpkin'] = 'zucca', + ['orangelambo'] = 'arancione Lambo', + -- Brown + ['brown'] = 'marrone', + ['copper'] = 'rame', + ['lightbrown'] = 'marrone chiaro', + ['darkbrown'] = 'marrone scuro', + ['bronze'] = 'Bronzo', + ['brownmetallic'] = 'marrone metallico', + ['expresso'] = 'Espresso', + ['chocolate'] = 'cioccolato', + ['terracotta'] = 'Terracotta', + ['marble'] = 'Marmo', + ['sand'] = 'Sabbia', + ['sepia'] = 'Seppia', + ['bison'] = 'Bisonte', + ['palm'] = 'Palmo', + ['caramel'] = 'Caramello', + ['rust'] = 'Ruggine', + ['chestnut'] = 'Castagna', + ['hazelnut'] = 'nocciola', + ['shell'] = 'guscio', + ['mahogany'] = 'Mogano', + ['cauldron'] = 'marrone calderone', + ['blond'] = 'marrone biondo', + ['gravel'] = 'marrone ghiaia', + ['darkearth'] = 'marrone terra scura', + ['desert'] = 'deserto', + -- Purple + ['purple'] = 'viola', + ['indigo'] = 'Indaco', + ['deeppurple'] = 'viola intenso', + ['darkviolet'] = 'viola scuro', + ['amethyst'] = 'emetista', + ['mysticalviolet'] = 'viola mistico', + ['purplemetallic'] = 'viola metallico', + ['matteviolet'] = 'viola opaco', + ['mattedeeppurple'] = 'viola intenso opaco', + -- Chrome + ['chrome'] = 'cromato', + ['brushedchrome'] = 'cromato spazzolato', + ['blackchrome'] = 'nero gromato', + ['brushedaluminum'] = 'alluminio spazzolato', + -- Metal + ['gold'] = 'oro', + ['puregold'] = 'oro puro', + ['brushedgold'] = 'oro spazzolato', + ['lightgold'] = 'oro chiaro', +-- License Plates + ['blue_on_white_1'] = 'blu su bianco 1', + ['yellow_on_black'] = 'giallo su nero', + ['yellow_blue'] = 'giallo su blu', + ['blue_on_white_2'] = 'blu su bianco 2', + ['blue_on_white_3'] = 'blu su bianco 3', +-- Upgrades + ['upgrades'] = 'aggiornamenti', + ['engine'] = 'motore', + ['brakes'] = 'freni', + ['transmission'] = 'trasmissione', + ['suspension'] = 'ssospensione', + ['armor'] = 'armatura', + ['turbo'] = 'turbo', + ['no_turbo'] = 'no turbo', +-- Cosmetics + ['cosmetics'] = 'cosmetici', + -- Body Parts + ['bodyparts'] = 'parti del corpo', + ['leftfender'] = 'parafango sinistro', + ['rightfender'] = 'parafango destro', + ['spoilers'] = 'spoiler', + ['sideskirt'] = 'gonna laterale', + ['cage'] = 'gabbia', + ['hood'] = 'cappuccio', + ['grille'] = 'griglia', + ['rearbumper'] = 'paraurti posteriore', + ['frontbumper'] = 'paraurti anteriore', + ['exhaust'] = 'scarico', + ['roof'] = 'tetto', + -- Paint + ['respray'] = 'verici', + ['primary'] = 'primaria', + ['secondary'] = 'secondaria', + ['pearlescent'] = 'perlescente', + -- Misc + ['headlights'] = 'fari', + ['licenseplates'] = 'targa', + ['windowtint'] = 'tinta finestrino', + ['horns'] = 'clacson', + -- Neon + ['neons'] = 'neons', + -- Wheels + ['wheels'] = 'ruote', + ['tiresmoke'] = 'fumo pneumatici', + ['wheel_type'] = 'tipo di ruota', + ['wheel_color'] = 'colore cerchione', + ['sport'] = 'sport', + ['muscle'] = 'muscle', + ['lowrider'] = 'lowrider', + ['suv'] = 'SUV', + ['allterrain'] = 'tutti i terreni', + ['tuning'] = 'tuning', + ['motorcycle'] = 'moto', + ['highend'] = 'fascia alta', + + ['modplateholder'] = 'targa - posteriore', + ['modvanityplate'] = 'targa - anteriore', + ['interior'] = 'interni', + ['trim'] = 'trim', + ['dashboard'] = 'cruscotto', + ['speedometer'] = 'tachimetro', + ['door_speakers'] = 'casse audio', + ['seats'] = 'sedili', + ['steering_wheel'] = 'volante', + ['gear_lever'] = 'leva del cambio', + ['quarter_deck'] = 'quarter-deck', + ['speakers'] = 'altoparlanti', + ['trunk'] = 'tronco', + ['hydraulic'] = 'idraulica', + ['engine_block'] = 'blocco motore', + ['air_filter'] = 'filtro aria', + ['struts'] = 'puntoni', + ['arch_cover'] = 'cover', + ['aerials'] = 'antenne', + ['wings'] = 'ali', + ['fuel_tank'] = 'serbatoio carburante', + ['windows'] = 'finestrini', + ['stickers'] = 'Livrea', +} From 52c70c626440fb2e425c1ff73cde352382785f79 Mon Sep 17 00:00:00 2001 From: Benzo <102178921+Benzo00@users.noreply.github.com> Date: Wed, 2 Nov 2022 06:01:05 +0100 Subject: [PATCH 25/25] refactor(es_extended) - max vehicle to false Config.MaxAdminVehicles is not false by default --- [esx]/es_extended/config.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/[esx]/es_extended/config.lua b/[esx]/es_extended/config.lua index d67b1a8f..a72b3f64 100644 --- a/[esx]/es_extended/config.lua +++ b/[esx]/es_extended/config.lua @@ -60,7 +60,7 @@ Config.RemoveHudCommonents = { [22] = false, --HUD_WEAPONS } -Config.MaxAdminVehicles = true -- admin vehicles spawn with max vehcle settings +Config.MaxAdminVehicles = false -- admin vehicles spawn with max vehcle settings Config.CustomAIPlates = 'ESX.A111' -- Custom plates for AI vehicles -- Pattern string format --1 will lead to a random number from 0-9.