diff --git a/resources/[carscripts]/sn_vehicleKey/client.lua b/resources/[carscripts]/sn_vehicleKey/client.lua index c10b46073..cab3a9cfc 100644 --- a/resources/[carscripts]/sn_vehicleKey/client.lua +++ b/resources/[carscripts]/sn_vehicleKey/client.lua @@ -510,7 +510,7 @@ submenuTransferVehicle.OnItemSelect = function(menu, item, index) model = GetDisplayNameFromVehicleModel(selectedVehicle[2]) end - -- Menü schließen und Spielerauswahl anzeigen + -- Menü schließen menuPoolNativeUI:CloseAllMenus() menuOpen = false @@ -528,82 +528,50 @@ submenuTransferVehicle.OnItemSelect = function(menu, item, index) return end - -- Spielerauswahl-Menü erstellen - local playerOptions = {} - for _, player in ipairs(nearbyPlayers) do - table.insert(playerOptions, { - title = player.name, - description = "Entfernung: " .. math.floor(player.distance * 10) / 10 .. "m", - metadata = { - ["Spieler ID"] = player.serverId - }, - args = { - serverId = player.serverId, - name = player.name - } - }) + -- Erstelle eine Liste von Spielern für den Dialog + local playerList = {} + for i, player in ipairs(nearbyPlayers) do + playerList[i] = player.name .. " (ID: " .. player.serverId .. ", Entfernung: " .. math.floor(player.distance * 10) / 10 .. "m)" end - -- Stelle sicher, dass wir mindestens eine Option haben - if #playerOptions == 0 then - lib.notify({ - title = "Fahrzeug übergeben", - description = "Keine Spieler in der Nähe gefunden", - position = "top", - type = "error", - icon = "car" - }) - return - end - - lib.registerMenu({ - id = 'transfer_vehicle_menu', - title = 'Fahrzeug übergeben', - position = 'top-right', - options = playerOptions, - onClose = function() - -- Optional: Öffne das Hauptmenü wieder - GenerateKeyInventoryNativeUI() - keyInvMenuNativeUI:Visible(true) - menuOpen = true - end, - onSelect = function(selected, scrollIndex, args) - if args and args.serverId then - local targetPlayer = args.serverId - local success = CB:Trigger("VKC:transferVehicleOwnership", plate, targetPlayer) - - if success then - lib.notify({ - title = "Fahrzeug übergeben", - description = "Du hast dein " .. model .. " an " .. args.name .. " übergeben", - position = "top", - type = "success", - icon = "car" - }) - else - lib.notify({ - title = "Fahrzeug übergeben", - description = "Übergabe fehlgeschlagen", - position = "top", - type = "error", - icon = "car" - }) - end - else - lib.notify({ - title = "Fahrzeug übergeben", - description = "Fehler bei der Spielerauswahl", - position = "top", - type = "error", - icon = "car" - }) - end - end + -- Zeige einen Dialog mit Spielerauswahl + local input = lib.callback.await('ox_lib:inputDialog', false, { + { + type = 'select', + label = 'Wähle einen Spieler', + description = 'Wähle einen Spieler, an den du dein ' .. model .. ' übergeben möchtest', + options = playerList, + required = true + } }) - lib.showMenu('transfer_vehicle_menu') + if input and input[1] then + local selectedIndex = input[1] + local targetPlayer = nearbyPlayers[selectedIndex].serverId + + local success = CB:Trigger("VKC:transferVehicleOwnership", plate, targetPlayer) + + if success then + lib.notify({ + title = "Fahrzeug übergeben", + description = "Du hast dein " .. model .. " an " .. nearbyPlayers[selectedIndex].name .. " übergeben", + position = "top", + type = "success", + icon = "car" + }) + else + lib.notify({ + title = "Fahrzeug übergeben", + description = "Übergabe fehlgeschlagen", + position = "top", + type = "error", + icon = "car" + }) + end + end end + local submenuShowKeys = menuPoolNativeUI:AddSubMenu(keyInvMenuNativeUI, Config.Strings.NUI.keysTitle, Config.Strings.NUI.keysDesc) submenuShowKeys.ParentItem:RightLabel(">") diff --git a/resources/[standalone]/rpemotes-reborn/animals.lua b/resources/[standalone]/rpemotes-reborn/animals.lua index 00024ea2c..fbccc2400 100644 --- a/resources/[standalone]/rpemotes-reborn/animals.lua +++ b/resources/[standalone]/rpemotes-reborn/animals.lua @@ -12,4 +12,5 @@ SmallDogs = { "a_c_poodle", "a_c_pug", "a_c_westy", + "ft-pandags", }