forked from Simnation/Main
ed
This commit is contained in:
parent
ec9ff993e4
commit
a0b81a2e66
2 changed files with 61 additions and 16 deletions
|
@ -140,3 +140,17 @@ function redeemPfand(selectedItems)
|
||||||
ShowNotification(_L('processing'))
|
ShowNotification(_L('processing'))
|
||||||
TriggerServerEvent('pickle_consumables:server:redeemPfand', selectedItems)
|
TriggerServerEvent('pickle_consumables:server:redeemPfand', selectedItems)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
-- modules/pfandsystem/client.lua (zusätzlicher Code)
|
||||||
|
|
||||||
|
-- Überwache Item-Nutzung
|
||||||
|
RegisterNetEvent('inventory:client:UseItem')
|
||||||
|
AddEventHandler('inventory:client:UseItem', function(item)
|
||||||
|
local itemName = type(item) == "table" and item.name or item
|
||||||
|
TriggerServerEvent('pickle_consumables:server:useItem', itemName)
|
||||||
|
end)
|
||||||
|
|
||||||
|
-- Überwache Pickle Consumables Item-Nutzung
|
||||||
|
AddEventHandler('pickle_consumables:useItem', function(itemName, slot)
|
||||||
|
TriggerServerEvent('pickle_consumables:server:useItem', itemName)
|
||||||
|
end)
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
-- modules/pfandsystem/server.lua (mit direkten tgiann-inventory Funktionen)
|
-- modules/pfandsystem/server.lua (vereinfacht mit QBCore)
|
||||||
|
|
||||||
local QBCore = exports['qb-core']:GetCoreObject()
|
local QBCore = exports['qb-core']:GetCoreObject()
|
||||||
|
|
||||||
|
@ -16,9 +16,8 @@ RegisterNetEvent('pickle_consumables:server:redeemPfand', function(selectedItems
|
||||||
-- Prüfe ob alle Items verfügbar sind
|
-- Prüfe ob alle Items verfügbar sind
|
||||||
for itemName, quantity in pairs(selectedItems) do
|
for itemName, quantity in pairs(selectedItems) do
|
||||||
if Config.PfandItems[itemName] then
|
if Config.PfandItems[itemName] then
|
||||||
-- Verwende tgiann-inventory Export
|
local item = Player.Functions.GetItemByName(itemName)
|
||||||
local item = exports['tgiann-inventory']:GetItem(src, itemName)
|
if not item or item.amount < quantity then
|
||||||
if not item or item.count < quantity then
|
|
||||||
canRedeem = false
|
canRedeem = false
|
||||||
TriggerClientEvent('QBCore:Notify', src, 'Du hast nicht genug ' .. (Config.PfandItems[itemName].label or itemName), "error")
|
TriggerClientEvent('QBCore:Notify', src, 'Du hast nicht genug ' .. (Config.PfandItems[itemName].label or itemName), "error")
|
||||||
return
|
return
|
||||||
|
@ -30,9 +29,10 @@ RegisterNetEvent('pickle_consumables:server:redeemPfand', function(selectedItems
|
||||||
-- Entferne Items und berechne Pfand
|
-- Entferne Items und berechne Pfand
|
||||||
for itemName, quantity in pairs(selectedItems) do
|
for itemName, quantity in pairs(selectedItems) do
|
||||||
if Config.PfandItems[itemName] then
|
if Config.PfandItems[itemName] then
|
||||||
-- Verwende tgiann-inventory Export
|
local removed = Player.Functions.RemoveItem(itemName, quantity)
|
||||||
local removed = exports['tgiann-inventory']:RemoveItem(src, itemName, quantity)
|
|
||||||
if removed then
|
if removed then
|
||||||
|
TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items[itemName], "remove", quantity)
|
||||||
|
|
||||||
local pfandWert = Config.PfandItems[itemName].pfandwert * quantity
|
local pfandWert = Config.PfandItems[itemName].pfandwert * quantity
|
||||||
totalPfand = totalPfand + pfandWert
|
totalPfand = totalPfand + pfandWert
|
||||||
totalItems = totalItems + quantity
|
totalItems = totalItems + quantity
|
||||||
|
@ -59,18 +59,20 @@ end)
|
||||||
-- Hole verfügbare Pfand Items des Spielers
|
-- Hole verfügbare Pfand Items des Spielers
|
||||||
lib.callback.register('pickle_consumables:server:getPfandItems', function(source)
|
lib.callback.register('pickle_consumables:server:getPfandItems', function(source)
|
||||||
local src = source
|
local src = source
|
||||||
|
local Player = QBCore.Functions.GetPlayer(src)
|
||||||
local pfandItems = {}
|
local pfandItems = {}
|
||||||
|
|
||||||
|
if not Player then return pfandItems end
|
||||||
|
|
||||||
for itemName, itemConfig in pairs(Config.PfandItems) do
|
for itemName, itemConfig in pairs(Config.PfandItems) do
|
||||||
-- Verwende tgiann-inventory Export
|
local item = Player.Functions.GetItemByName(itemName)
|
||||||
local item = exports['tgiann-inventory']:GetItem(src, itemName)
|
|
||||||
|
|
||||||
if item and item.count > 0 then
|
if item and item.amount > 0 then
|
||||||
pfandItems[itemName] = {
|
pfandItems[itemName] = {
|
||||||
count = item.count,
|
count = item.amount,
|
||||||
label = itemConfig.label,
|
label = itemConfig.label,
|
||||||
pfandwert = itemConfig.pfandwert,
|
pfandwert = itemConfig.pfandwert,
|
||||||
totalWert = itemConfig.pfandwert * item.count
|
totalWert = itemConfig.pfandwert * item.amount
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
@ -78,17 +80,46 @@ lib.callback.register('pickle_consumables:server:getPfandItems', function(source
|
||||||
return pfandItems
|
return pfandItems
|
||||||
end)
|
end)
|
||||||
|
|
||||||
-- Hook für Item-Nutzung
|
-- Füge einen direkten Event-Handler für die Item-Nutzung hinzu
|
||||||
AddEventHandler('pickle_consumables:itemUsed', function(source, itemName, itemData, slot)
|
RegisterNetEvent('pickle_consumables:server:useItem')
|
||||||
|
AddEventHandler('pickle_consumables:server:useItem', function(itemName)
|
||||||
|
local src = source
|
||||||
|
local Player = QBCore.Functions.GetPlayer(src)
|
||||||
|
|
||||||
|
if not Player then return end
|
||||||
|
|
||||||
-- Prüfe ob das Item ein Pfand-Item generiert
|
-- Prüfe ob das Item ein Pfand-Item generiert
|
||||||
local itemConfig = Config.Items[itemName]
|
local itemConfig = Config.Items[itemName]
|
||||||
if itemConfig and itemConfig.pfandItem and Config.PfandItems[itemConfig.pfandItem] then
|
if itemConfig and itemConfig.pfandItem and Config.PfandItems[itemConfig.pfandItem] then
|
||||||
-- Gebe Pfand-Item mit tgiann-inventory
|
-- Warte kurz, damit das Item erst konsumiert wird
|
||||||
exports['tgiann-inventory']:AddItem(source, itemConfig.pfandItem, 1)
|
Wait(500)
|
||||||
|
|
||||||
|
-- Gebe Pfand-Item
|
||||||
|
Player.Functions.AddItem(itemConfig.pfandItem, 1)
|
||||||
|
TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items[itemConfig.pfandItem], "add", 1)
|
||||||
|
|
||||||
if Config.PfandSystem.showNotification then
|
if Config.PfandSystem.showNotification then
|
||||||
local pfandLabel = Config.PfandItems[itemConfig.pfandItem].label
|
local pfandLabel = Config.PfandItems[itemConfig.pfandItem].label
|
||||||
TriggerClientEvent('QBCore:Notify', source, string.format(_L('pfand_received'), pfandLabel), "success")
|
TriggerClientEvent('QBCore:Notify', src, string.format(_L('pfand_received'), pfandLabel), "success")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
|
-- Überwache alle möglichen Events für Item-Nutzung
|
||||||
|
RegisterNetEvent('QBCore:Server:UseItem')
|
||||||
|
AddEventHandler('QBCore:Server:UseItem', function(item)
|
||||||
|
local src = source
|
||||||
|
local itemName = type(item) == "table" and item.name or item
|
||||||
|
TriggerEvent('pickle_consumables:server:useItem', itemName)
|
||||||
|
end)
|
||||||
|
|
||||||
|
RegisterNetEvent('inventory:server:UseItem')
|
||||||
|
AddEventHandler('inventory:server:UseItem', function(source, item)
|
||||||
|
local itemName = type(item) == "table" and item.name or item
|
||||||
|
TriggerEvent('pickle_consumables:server:useItem', itemName)
|
||||||
|
end)
|
||||||
|
|
||||||
|
-- Hook für Pickle Consumables Item-Nutzung
|
||||||
|
AddEventHandler('pickle_consumables:itemUsed', function(source, itemName, itemData, slot)
|
||||||
|
TriggerEvent('pickle_consumables:server:useItem', itemName)
|
||||||
|
end)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue