diff --git a/server-data/resources/[bpt_addons]/bpt_menu/client/main.lua b/server-data/resources/[bpt_addons]/bpt_menu/client/main.lua index 9dccc8a03..6ecb83174 100644 --- a/server-data/resources/[bpt_addons]/bpt_menu/client/main.lua +++ b/server-data/resources/[bpt_addons]/bpt_menu/client/main.lua @@ -2,8 +2,6 @@ local PersonalMenu = { ItemSelected = {}, ItemIndex = {}, BillData = {}, - ClothesButtons = { "torso", "pants", "shoes", "bag", "bproof" }, - AccessoriesButtons = { "ears", "glasses", "helmet", "mask" }, DoorState = { FrontLeft = false, FrontRight = false, @@ -102,8 +100,6 @@ local function getPersonalMenuCategory(id) return personalMenuCategoriesById[id] end -local clothesCategory = addPersonalMenuCategory("clothes", TranslateCap("clothes_title")) -addPersonalMenuCategory("accessories", TranslateCap("accessories_title")) local animationCategory = addPersonalMenuCategory("animation", TranslateCap("animation_title")) addPersonalMenuCategory("vehicle", TranslateCap("vehicle_title"), function() @@ -221,123 +217,6 @@ function startAnimAction(animDict, animName) RemoveAnimDict(animDict) end -function setClothes(clotheId) - TriggerServerCallback("esx_skin:getPlayerSkin", function(skin) - TriggerEvent("skinchanger:getSkin", function(currentSkin) - local clothes = nil - - if clotheId == "torso" then - startAnimAction("clothingtie", "try_tie_neutral_a") - Wait(1000) - PlayerVars.handsup, PlayerVars.pointing = false, false - ClearPedTasks(plyPed) - - if skin.torso_1 ~= currentSkin.torso_1 then - clothes = { - ["torso_1"] = skin.torso_1, - ["torso_2"] = skin.torso_2, - ["tshirt_1"] = skin.tshirt_1, - ["tshirt_2"] = skin.tshirt_2, - ["arms"] = skin.arms, - } - else - clothes = { ["torso_1"] = 15, ["torso_2"] = 0, ["tshirt_1"] = 15, ["tshirt_2"] = 0, ["arms"] = 15 } - end - elseif clotheId == "pants" then - if skin.pants_1 ~= currentSkin.pants_1 then - clothes = { ["pants_1"] = skin.pants_1, ["pants_2"] = skin.pants_2 } - else - if skin.sex == 0 then - clothes = { ["pants_1"] = 61, ["pants_2"] = 1 } - else - clothes = { ["pants_1"] = 15, ["pants_2"] = 0 } - end - end - elseif clotheId == "shoes" then - if skin.shoes_1 ~= currentSkin.shoes_1 then - clothes = { ["shoes_1"] = skin.shoes_1, ["shoes_2"] = skin.shoes_2 } - else - if skin.sex == 0 then - clothes = { ["shoes_1"] = 34, ["shoes_2"] = 0 } - else - clothes = { ["shoes_1"] = 35, ["shoes_2"] = 0 } - end - end - elseif clotheId == "bag" then - if skin.bags_1 ~= currentSkin.bags_1 then - clothes = { ["bags_1"] = skin.bags_1, ["bags_2"] = skin.bags_2 } - else - clothes = { ["bags_1"] = 0, ["bags_2"] = 0 } - end - elseif clotheId == "bproof" then - startAnimAction("clothingtie", "try_tie_neutral_a") - Wait(1000) - PlayerVars.handsup, PlayerVars.pointing = false, false - ClearPedTasks(plyPed) - - if skin.bproof_1 ~= currentSkin.bproof_1 then - clothes = { ["bproof_1"] = skin.bproof_1, ["bproof_2"] = skin.bproof_2 } - else - clothes = { ["bproof_1"] = 0, ["bproof_2"] = 0 } - end - end - - TriggerEvent("skinchanger:loadClothes", currentSkin, clothes) - end) - end) -end - -function setAccessory(accessoryId) - TriggerServerCallback("esx_accessories:get", function(hasAccessory, accessorySkin) - if not hasAccessory then - local localeKey = ("accessories_no_%s"):format(accessoryId) - GameNotification(TranslateCap(localeKey)) - return - end - - TriggerEvent("skinchanger:getSkin", function(currentSkin) - local propIdx = -1 - local propTex = 0 - - if accessoryId == "ears" then - startAnimAction("mini@ears_defenders", "takeoff_earsdefenders_idle") - Wait(250) - PlayerVars.handsup, PlayerVars.pointing = false, false - ClearPedTasks(plyPed) - elseif accessoryId == "glasses" then - startAnimAction("clothingspecs", "try_glasses_positive_a") - Wait(1000) - PlayerVars.handsup, PlayerVars.pointing = false, false - ClearPedTasks(plyPed) - elseif accessoryId == "helmet" then - startAnimAction("missfbi4", "takeoff_mask") - Wait(1000) - PlayerVars.handsup, PlayerVars.pointing = false, false - ClearPedTasks(plyPed) - elseif accessoryId == "mask" then - propIdx = 0 - startAnimAction("missfbi4", "takeoff_mask") - Wait(850) - PlayerVars.handsup, PlayerVars.pointing = false, false - ClearPedTasks(plyPed) - end - - local accessoryIdxKey = ("%s_1"):format(accessoryId) - local accessoryTexKey = ("%s_2"):format(accessoryId) - - if currentSkin[accessoryIdxKey] == 0 then - propIdx = accessorySkin[accessoryIdxKey] - propTex = accessorySkin[accessoryTexKey] - end - - TriggerEvent("skinchanger:loadClothes", currentSkin, { - [accessoryIdxKey] = propIdx, - [accessoryTexKey] = propTex, - }) - end) - end, firstToUpper(accessoryId)) -end - function CheckQuantity(number) number = tonumber(number) if type(number) ~= "number" then @@ -395,44 +274,6 @@ function DrawPersonalMenu() end) end -getPersonalMenuCategory("clothes").drawer = function() - for i = 1, #PersonalMenu.ClothesButtons do - local clotheId = PersonalMenu.ClothesButtons[i] - - RageUI.Button( - TranslateCap(("clothes_%s"):format(clotheId)), - nil, - { RightBadge = RageUI.BadgeStyle.Clothes }, - true, - function(Hovered, Active, Selected) - if not Selected then - return - end - setClothes(clotheId) - end - ) - end -end - -getPersonalMenuCategory("accessories").drawer = function() - for i = 1, #PersonalMenu.AccessoriesButtons do - local accessoryId = PersonalMenu.AccessoriesButtons[i] - - RageUI.Button( - TranslateCap(("accessories_%s"):format(accessoryId)), - nil, - { RightBadge = RageUI.BadgeStyle.Clothes }, - true, - function(Hovered, Active, Selected) - if not Selected then - return - end - setAccessory(accessoryId) - end - ) - end -end - getPersonalMenuCategory("animation").drawer = function() for i = 1, #Config.Animations do local animationCfg = Config.Animations[i] diff --git a/server-data/resources/[bpt_addons]/bpt_menu/dependencies/menu/elements/ItemsBadge.lua b/server-data/resources/[bpt_addons]/bpt_menu/dependencies/menu/elements/ItemsBadge.lua index 1a2da3262..483fa18db 100644 --- a/server-data/resources/[bpt_addons]/bpt_menu/dependencies/menu/elements/ItemsBadge.lua +++ b/server-data/resources/[bpt_addons]/bpt_menu/dependencies/menu/elements/ItemsBadge.lua @@ -8,7 +8,6 @@ RageUI.BadgeStyle = { Ammo = 7, Armour = 8, Barber = 9, - Clothes = 10, Franklin = 11, Bike = 12, Car = 13, diff --git a/server-data/resources/[bpt_addons]/bpt_menu/locales/br.lua b/server-data/resources/[bpt_addons]/bpt_menu/locales/br.lua index 484c23229..c32bf8bd0 100644 --- a/server-data/resources/[bpt_addons]/bpt_menu/locales/br.lua +++ b/server-data/resources/[bpt_addons]/bpt_menu/locales/br.lua @@ -23,10 +23,6 @@ Locales["br"] = { ["gave_ammo"] = "Você deu x%s munições para %s", ["no_ammo"] = "Você não tem munição", ["not_enough_ammo"] = "Você não tem tantas munições", - ["accessories_no_ears"] = "Vous ne possédez pas d'Accessoire d'Oreilles", - ["accessories_no_glasses"] = "Você não tem um óculos", - ["accessories_no_helmet"] = "Você não tem um capacete / chapéu", - ["accessories_no_mask"] = "Você não tem uma máscara", ["admin_noclipon"] = "NoClip ~g~ativado", ["admin_noclipoff"] = "NoClip ~r~desativado", ["admin_godmodeon"] = "Godmod ~g~ativado", @@ -50,21 +46,6 @@ Locales["br"] = { ["voice_normal"] = "Normal", ["voice_cry"] = "Gritar", - -- Clothes Menu - ["clothes_title"] = "Vestuário", - ["clothes_torso"] = "Peito", - ["clothes_pants"] = "Pernas", - ["clothes_shoes"] = "Sapatos", - ["clothes_bag"] = "Sac", - ["clothes_bproof"] = "Colete", - - -- Accessories Menu - ["accessories_title"] = "Acessórios", - ["accessories_ears"] = "Accessórios para as Orelhas", - ["accessories_glasses"] = "Óculos", - ["accessories_helmet"] = "Chapeú / Capacete", - ["accessories_mask"] = "Mascará", - -- Animation Menu ["animation_title"] = "Animações", diff --git a/server-data/resources/[bpt_addons]/bpt_menu/locales/de.lua b/server-data/resources/[bpt_addons]/bpt_menu/locales/de.lua index 57bd2a2e8..1042a11c9 100644 --- a/server-data/resources/[bpt_addons]/bpt_menu/locales/de.lua +++ b/server-data/resources/[bpt_addons]/bpt_menu/locales/de.lua @@ -23,10 +23,6 @@ Locales["de"] = { ["gave_ammo"] = "Du hast x %s Munition an %s gegeben", ["no_ammo"] = "Du hast keine Munition", ["not_enough_ammo"] = "Du hast nicht so viel Munition", - ["accessories_no_ears"] = "Du hast kein Ohr Zubehör", - ["accessories_no_glasses"] = "Du hast keine Brille", - ["accessories_no_helmet"] = "Du hast keinen Helm/Hut", - ["accessories_no_mask"] = "Du hast keine Maske", ["admin_noclipon"] = "NoClip ~g~ aktiviert", ["admin_noclipoff"] = "NoClip ~r~ deaktiviert", ["admin_godmodeon"] = "Invincible ~g~ aktiviert", @@ -50,21 +46,6 @@ Locales["de"] = { ["voice_normal"] = "Normal", ["voice_cry"] = "Schreien", - -- Clothes Menu - ["clothes_title"] = "Kleidungsmenü", - ["clothes_torso"] = "Oberteil", - ["clothes_pants"] = "Hose", - ["clothes_shoes"] = "Schuhe", - ["clothes_bag"] = "Rucksack", - ["clothes_bproof"] = "Schusssichere Weste", - - -- Accessories Menu - ["accessories_title"] = "Zubehör", - ["accessories_ears"] = "Ohren Zubehör", - ["accessories_glasses"] = "Brille", - ["accessories_helmet"] = "Hut / Helm", - ["accessories_mask"] = "Maske", - -- Animation Menu ["animation_title"] = "Animationen", diff --git a/server-data/resources/[bpt_addons]/bpt_menu/locales/en.lua b/server-data/resources/[bpt_addons]/bpt_menu/locales/en.lua index 8e7be6e5a..126da8052 100644 --- a/server-data/resources/[bpt_addons]/bpt_menu/locales/en.lua +++ b/server-data/resources/[bpt_addons]/bpt_menu/locales/en.lua @@ -23,10 +23,6 @@ Locales["en"] = { ["gave_ammo"] = "You have given x %s ammo to %s", ["no_ammo"] = "You do not have any ammo", ["not_enough_ammo"] = "You do not have as many ammo", - ["accessories_no_ears"] = "You do not have an ear accessory", - ["accessories_no_glasses"] = "You do not have glasses", - ["accessories_no_helmet"] = "You do not have a helmet / hat", - ["accessories_no_mask"] = "You do not have a mask", ["admin_noclipon"] = "NoClip ~g~ enabled", ["admin_noclipoff"] = "NoClip ~r~ disabled", ["admin_godmodeon"] = "Invincible ~g~ enabled", @@ -50,21 +46,6 @@ Locales["en"] = { ["voice_normal"] = "Normal", ["voice_cry"] = "Shout", - -- Clothes Menu - ["clothes_title"] = "Clothing", - ["clothes_torso"] = "High", - ["clothes_pants"] = "Pants", - ["clothes_shoes"] = "Shoes", - ["clothes_bag"] = "Bag", - ["clothes_bproof"] = "Bullet proof vest", - - -- Accessories Menu - ["accessories_title"] = "Accessories", - ["accessories_ears"] = "Ears Accessory", - ["accessories_glasses"] = "Glasses", - ["accessories_helmet"] = "Hat / Helmet", - ["accessories_mask"] = "Mask", - -- Animation Menu ["animation_title"] = "Animations", ["animation_party_title"] = "Festivals", diff --git a/server-data/resources/[bpt_addons]/bpt_menu/locales/es.lua b/server-data/resources/[bpt_addons]/bpt_menu/locales/es.lua index e26eef086..102044eed 100644 --- a/server-data/resources/[bpt_addons]/bpt_menu/locales/es.lua +++ b/server-data/resources/[bpt_addons]/bpt_menu/locales/es.lua @@ -23,10 +23,6 @@ Locales["es"] = { ["gave_ammo"] = "Distes x %s munición a %s", ["no_ammo"] = "No tienes munición", ["not_enough_ammo"] = "No tienes suficiente munición", - ["accessories_no_ears"] = "No tienes un accesorio de oreja", - ["accessories_no_glasses"] = "No tienes gafas", - ["accessories_no_helmet"] = "No tienes casco / gorra / gorro", - ["accessories_no_mask"] = "No tienes una máscara", ["admin_noclipon"] = "NoClip ~g~ habilitado", ["admin_noclipoff"] = "NoClip ~r~ deshabilitado", ["admin_godmodeon"] = "Invencible ~g~ habilitado", @@ -50,21 +46,6 @@ Locales["es"] = { ["voice_normal"] = "Normal", ["voice_cry"] = "Gritar", - -- Clothes Menu - ["clothes_title"] = "Ropa", - ["clothes_torso"] = "Torso", - ["clothes_pants"] = "Pantalones", - ["clothes_shoes"] = "Zapatos", - ["clothes_bag"] = "Bolso/a", - ["clothes_bproof"] = "Chaleco Anti-Balas", - - -- Accessories Menu - ["accessories_title"] = "Accesorios", - ["accessories_ears"] = "Accesorios de oreja", - ["accessories_glasses"] = "Gafas", - ["accessories_helmet"] = "Gorra / Casco", - ["accessories_mask"] = "Máscara", - -- Animation Menu ["animation_title"] = "Animaciones", ["animation_party_title"] = "Festivales", diff --git a/server-data/resources/[bpt_addons]/bpt_menu/locales/fr.lua b/server-data/resources/[bpt_addons]/bpt_menu/locales/fr.lua index 69ac9af70..5dc143e62 100644 --- a/server-data/resources/[bpt_addons]/bpt_menu/locales/fr.lua +++ b/server-data/resources/[bpt_addons]/bpt_menu/locales/fr.lua @@ -23,10 +23,6 @@ Locales["fr"] = { ["gave_ammo"] = "Vous avez donné x%s munitions à %s", ["no_ammo"] = "Vous ne possédez pas de munitions", ["not_enough_ammo"] = "Vous ne possédez pas autant de munitions", - ["accessories_no_ears"] = "Vous ne possédez pas d'accessoire d'oreilles", - ["accessories_no_glasses"] = "Vous ne possédez pas de lunettes", - ["accessories_no_helmet"] = "Vous ne possédez pas de casque / chapeau", - ["accessories_no_mask"] = "Vous ne possédez pas de masque", ["admin_noclipon"] = "NoClip ~g~activé", ["admin_noclipoff"] = "NoClip ~r~désactivé", ["admin_godmodeon"] = "Mode invincible ~g~activé", @@ -50,24 +46,8 @@ Locales["fr"] = { ["voice_normal"] = "Normal", ["voice_cry"] = "Crier", - -- Clothes Menu - ["clothes_title"] = "Vêtements", - ["clothes_torso"] = "Haut", - ["clothes_pants"] = "Bas", - ["clothes_shoes"] = "Chaussures", - ["clothes_bag"] = "Sac", - ["clothes_bproof"] = "Gilet par Balle", - - -- Accessories Menu - ["accessories_title"] = "Accessoires", - ["accessories_ears"] = "Accessoire d'Oreilles", - ["accessories_glasses"] = "Lunettes", - ["accessories_helmet"] = "Chapeau/Casque", - ["accessories_mask"] = "Masque", - -- Animation Menu ["animation_title"] = "Animations", - ["animation_party_title"] = "Festives", ["animation_party_smoke"] = "Fumer une cigarette", ["animation_party_playsong"] = "Jouer de la musique", diff --git a/server-data/resources/[bpt_addons]/bpt_menu/locales/it.lua b/server-data/resources/[bpt_addons]/bpt_menu/locales/it.lua index ef3c20191..608ccea01 100644 --- a/server-data/resources/[bpt_addons]/bpt_menu/locales/it.lua +++ b/server-data/resources/[bpt_addons]/bpt_menu/locales/it.lua @@ -17,10 +17,6 @@ Locales["it"] = { ["gave_ammo"] = "Hai dato x %s munizioni per %s", ["no_ammo"] = "Non hai munizioni", ["not_enough_ammo"] = "Non hai tante munizioni", - ["accessories_no_ears"] = "Non hai un accessorio per l'orecchio", - ["accessories_no_glasses"] = "Non hai gli occhiali", - ["accessories_no_helmet"] = "Non hai un casco/cappello", - ["accessories_no_mask"] = "Non hai una maschera", ["admin_noclipon"] = "NoClip attivato", ["admin_noclipoff"] = "NoClip disattivato", ["admin_godmodeon"] = "Modalità invincibile attivata", @@ -32,17 +28,6 @@ Locales["it"] = { ["admin_nomarker"] = "Nessun indicatore sulla mappa!", ["mainmenu_subtitle"] = "MENU INTERAZIONE", ["approach"] = "Approccio: ~b~%s", - ["clothes_title"] = "Capi di abbigliamento", - ["clothes_torso"] = "Torso", - ["clothes_pants"] = "Pants", - ["clothes_shoes"] = "Scarpe", - ["clothes_bag"] = "Borsa", - ["clothes_bproof"] = "Giubbotto antiproiettile", - ["accessories_title"] = "Accessori", - ["accessories_ears"] = "Accessorio per le orecchie", - ["accessories_glasses"] = "Occhiali", - ["accessories_helmet"] = "Cappello / Casco", - ["accessories_mask"] = "Maschera", ["animation_title"] = "Animazioni", ["animation_party_title"] = "Animazioni Festive", ["animation_party_smoke"] = "Fuma una sigaretta",