Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/g drugselling #1

Merged
merged 17 commits into from
Feb 19, 2023
Prev Previous commit
Next Next commit
Split rewards into item and money & fix incorrect reward amount
  • Loading branch information
Giana committed Feb 17, 2023
commit e37fc150935ce0b948b09aac2b0498fabfb12f86
33 changes: 14 additions & 19 deletions server/main.lua
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,21 @@ RegisterNetEvent('g-drugselling:server:sell', function(sellLocation)
local bundlesToSell = math.floor(hasItem.amount / v.sell_quantity)
local quantityToSell = bundlesToSell * v.sell_quantity
if player.Functions.RemoveItem(k, quantityToSell) then
for k2, v2 in pairs(v.rewards) do
local isMoneyType = false
for k3, v3 in pairs(QBConfig.Money.MoneyTypes) do
if tostring(k3) == k2 then
isMoneyType = true
end
for k2, v2 in pairs(v.money_rewards) do
local amountOwed = v2 * bundlesToSell
if not player.Functions.AddMoney(k2, amountOwed) then
player.Functions.AddItem(k, quantityToSell)
return
end
if isMoneyType then
if not player.Functions.AddMoney(k2, v2) then
player.Functions.AddItem(k, quantityToSell)
return
end
else
if not player.Functions.AddItem(k2, v2) then
player.Functions.AddItem(k, quantityToSell)
return
end
if sellLocation.itemNotificationsEnabled then
TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items[k2], 'add', v2)
end
end
for k2, v2 in pairs(v.item_rewards) do
local amountOwed = v2 * bundlesToSell
if not player.Functions.AddItem(k2, amountOwed) then
player.Functions.AddItem(k, quantityToSell)
return
end
if sellLocation.itemNotificationsEnabled then
TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items[k2], 'add', amountOwed)
end
end
local notifyPoliceRoll = math.random(1, 100)
Expand Down