diff --git a/client/TravellingMerchant.lua b/client/TravellingMerchant.lua index c877c28..c33767b 100644 --- a/client/TravellingMerchant.lua +++ b/client/TravellingMerchant.lua @@ -1,19 +1,20 @@ local function spawn() - local location, menus = ps.callback('md-drugs:server:GetMerchant') + local data = ps.callback('md-drugs:server:GetMerchant') local model = 's_m_m_trucker_01' ps.requestModel(model) - local ped = CreatePed(4, model, location.x, location.y, location.z, location.w, false, true) - Freeze(ped, true, location.w) + local ped = CreatePed(4, model, data.loc.x, data.loc.y, data.loc.z, data.loc.w, false, true) + Freeze(ped, true, data.loc.w) ps.entityTarget(ped, { { label = ps.lang('merchant.targetOpen'), action = function() local options = {} - for k, v in pairs (menus) do + for k, v in pairs (data.items) do options[#options+1] = { title = ps.getLabel(k), description = '$'..v, + icon = ps.getImage(k), action = function() ps.triggerServerEvent('md-drugs:server:purchaseGoods', k) end diff --git a/client/xtc.lua b/client/xtc.lua index e180d82..33d8b7a 100644 --- a/client/xtc.lua +++ b/client/xtc.lua @@ -97,7 +97,7 @@ for k, v in pairs(locations.isosafrole) do end for k, v in pairs(locations.rawxtcloc) do - ps.boxTarget('xtc'..k, v.loc, {length = v.l, width = v.w, heading = v.rot}, { + ps.boxTarget('xtcraw'..k, v.loc, {length = v.l, width = v.w, heading = v.rot}, { { icon = 'fa-solid fa-flask', label = ps.lang('xtc.targetRaw'), @@ -157,7 +157,7 @@ for k, v in pairs(locations.xtcpress) do end for k, v in pairs (locations.stamp) do - ps.boxTarget('xtc'..k, v.loc, {length = v.l, width = v.w, heading = v.rot}, { + ps.boxTarget('xtcstamp'..k, v.loc, {length = v.l, width = v.w, heading = v.rot}, { { icon = 'fa-solid fa-flask', label = ps.lang('xtc.targetStamp'), diff --git a/locales/en.lua b/locales/en.lua index 0d94269..2c35786 100644 --- a/locales/en.lua +++ b/locales/en.lua @@ -243,6 +243,12 @@ Lang.xtc = { noPills = 'You Dont Have Any Unstamped Pills' } - +Lang.merchant = { + targetOpen = 'Open Merchant Menu', + targetClose = 'Close Merchant Menu', + notEnoughMoney = 'You Do Not Have Enough Money', + purchased = 'You Purchased %s For $%s', + canceled = 'You Canceled The Purchase' +} return Lang \ No newline at end of file diff --git a/server/TravellingMerchant.lua b/server/TravellingMerchant.lua index 8f530e3..1c84924 100644 --- a/server/TravellingMerchant.lua +++ b/server/TravellingMerchant.lua @@ -39,7 +39,7 @@ local stores = { } ps.registerCallback('md-drugs:server:GetMerchant', function(source) - return loc, stores.travel + return {loc = loc, items = stores.travel} end) diff --git a/server/cocaine.lua b/server/cocaine.lua index fd886b5..12a54d0 100644 --- a/server/cocaine.lua +++ b/server/cocaine.lua @@ -45,7 +45,7 @@ RegisterServerEvent('md-drugs:server:makepowder', function(num) end local tier = 'tier1' if Config.TierSystem then - local coke = getRep(src, 'coke') + local coke = tonumber(getRep(src, 'coke')) if coke > Config.Tier1 and coke <= Config.Tier2 then tier = 'tier2' elseif coke > Config.Tier2 then diff --git a/server/heroin.lua b/server/heroin.lua index 21c74c3..79fc087 100644 --- a/server/heroin.lua +++ b/server/heroin.lua @@ -55,8 +55,6 @@ ps.registerCallback('removeCleaningkit', function(source) return false end) - - RegisterServerEvent('md-drugs:server:dryplant', function(num) local src = source if not ps.checkDistance(src, heroinLocations.dryplant[num].loc, 3.0) then @@ -66,7 +64,7 @@ RegisterServerEvent('md-drugs:server:dryplant', function(num) local tier = 'tier1' if Config.TierSystem then - local heroin = getRep(src, 'heroin') + local heroin = tonumber(getRep(src, 'heroin')) if heroin <= Config.Tier1 then tier = 'tier1' elseif heroin >= Config.Tier1 and heroin <= Config.Tier2 then @@ -153,14 +151,15 @@ ps.createUseable('heroinlabkit', function(source, item) if not ps.hasItem(src, 'heroinlabkit', 1) then return end local placed, loc = ps.callback('md-drugs:client:setheroinlabkit', src) if placed then - ps.removeItem(src, 'heroinlabkit', 1) - table.insert(heroinLabKits, { - src = src, - ownerid = ps.getIdentifier(src), - coords = loc, - name = ps.getPlayerName(src) - }) - ps.notify(src, ps.lang('heroin.placedKit'), "success") + if ps.removeItem(src, 'heroinlabkit', 1) then + table.insert(heroinLabKits, { + src = src, + ownerid = ps.getIdentifier(src), + coords = loc, + name = ps.getPlayerName(src) + }) + ps.notify(src, ps.lang('heroin.placedKit'), "success") + end end end)