diff --git a/client/functions.lua b/client/functions.lua index a0e826f..42f6cb4 100644 --- a/client/functions.lua +++ b/client/functions.lua @@ -180,6 +180,7 @@ function minigame() function GetImage(img) if GetResourceState('ox_inventory') == 'started' then local Items = exports['ox_inventory']:Items() + if not Items[img] then print(' You Are Missing: ' .. img .. ' From Your ox items.lua') return end local itemClient = Items[img] and Items[img]['client'] if itemClient and itemClient['image'] then return itemClient['image'] @@ -196,6 +197,7 @@ function GetImage(img) ['core_inventory'] = "nui://core_inventory/html/img/" } for k, v in pairs(invs) do + if not QBCore.Shared.Items[img] then print(' You Are Missing: ' .. img .. ' From Your QB items.lua') return end if GetResourceState(k) == 'started' then return v .. QBCore.Shared.Items[img].image end @@ -205,8 +207,10 @@ end function GetLabel(label) if GetResourceState('ox_inventory') == 'started' then local Items = exports['ox_inventory']:Items() + if not Items[img] then print(' You Are Missing: ' .. img .. ' From Your ox items.lua') return end return Items[label]['label'] else + if QBCore.Shared.Items[label] == nil then print("There Is No " .. label .. " In Your QB Items.lua") return end return QBCore.Shared.Items[label]['label'] end end diff --git a/server/heroin.lua b/server/heroin.lua index 4363447..a4bf794 100644 --- a/server/heroin.lua +++ b/server/heroin.lua @@ -1,5 +1,7 @@ local QBCore = exports['qb-core']:GetCoreObject() - +local prices = { + heroinlabkitprice = 10000 +} local h = { { location = vector3(-2251.3, -99.18, 100.11), heading = 334.49, model = "prop_plant_01b"}, { location = vector3(-2249.63, -92.97, 101.8), heading = 329.56, model = "prop_plant_01b"}, @@ -64,17 +66,17 @@ RegisterServerEvent('md-drugs:server:dryplant', function(num) local heroin = getRep(src, 'heroin') if heroin <= Config.Tier1 then if not GetRecipe(src, 'heroin', 'dryheroin', 'tier1') then return end - Log(GetName(src) ..' Made Heroin Powder With a distance of ' .. dist(source, Config.dryplant[num]['loc']) .. ' vectors', 'heroin') + Log(GetName(src) ..' Made Heroin Powder', 'heroin') elseif heroin >= Config.Tier1 and heroin <= Config.Tier2 then if not GetRecipe(src, 'heroin', 'dryheroin', 'tier2') then return end - Log(GetName(src) ..' Made Heroin Powder Tier 2 With a distance of ' .. dist(source, Config.dryplant[num]['loc']) .. ' vectors', 'heroin') + Log(GetName(src) ..' Made Heroin Powder Tier 2', 'heroin') else if not GetRecipe(src, 'heroin', 'dryheroin', 'tier3') then return end - Log(GetName(src) ..' Made Heroin Powder Tier 3 With a distance of ' .. dist(source, Config.dryplant[num]['loc']) .. ' vectors', 'heroin') + Log(GetName(src) ..' Made Heroin Powder Tier 3', 'heroin') end else if not GetRecipe(src, 'heroin', 'dryheroin', 'tier1') then return end - Log(GetName(src) ..' Made Heroin Powder With a distance of ' .. dist(source, Config.dryplant[num]['loc']) .. ' vectors', 'heroin') + Log(GetName(src) ..' Made Heroin Powder With a distance of', 'heroin') end end) @@ -90,19 +92,19 @@ RegisterServerEvent('md-drugs:server:cutheroin', function(num) local rawh3 = Player.Functions.GetItemByName('heroinstagethree') if rawh then if not GetRecipe(src, 'heroin', 'cutheroin', 'tier1') then return end - Log(GetName(src) ..' Cut Heroin With a distance of ' .. dist(source, Config.cutheroinone[num]['loc']) .. ' vectors', 'heroin') + Log(GetName(src) ..' Cut Heroin With a distance of', 'heroin') elseif rawh2 then if not GetRecipe(src, 'heroin', 'cutheroin', 'tier2') then return end - Log(GetName(src) ..' Cut Heroin Tier 2 With a distance of ' .. dist(source, Config.cutheroinone[num]['loc']) .. ' vectors', 'heroin') + Log(GetName(src) ..' Cut Heroin Tier 2 With a distance of', 'heroin') elseif rawh3 then if not GetRecipe(src, 'heroin', 'cutheroin', 'tier3') then return end - Log(GetName(src) .. ' Cut Heroin Tier 3 With a distance of ' .. dist(source, Config.cutheroinone[num]['loc']) .. ' vectors', 'heroin') + Log(GetName(src) .. ' Cut Heroin Tier 3 With a distance of', 'heroin') else Notifys(src, Lang.Heroin.noheroin, "error") end else if not GetRecipe(src, 'heroin', 'cutheroin', 'tier1') then return end - Log(GetName(src) ..' Cut Heroin With a distance of ' .. dist(source, Config.cutheroinone[num]['loc']) .. ' vectors', 'heroin') + Log(GetName(src) ..' Cut Heroin With a distance of', 'heroin') end end) @@ -110,11 +112,11 @@ RegisterServerEvent('md-drugs:server:getheroinlabkit', function() local src = source local Player = getPlayer(src) if not checkLoc(source, 'singleSpot', 'buyheroinlabkit') then return end - if Player.Functions.RemoveMoney('cash', Config.heroinlabkitprice) then + if Player.Functions.RemoveMoney('cash', prices.heroinlabkitprice) then AddItem(src, 'heroinlabkit', 1) - Log(GetName(src) ..' Bought A Heroin lab Kit ' .. dist(source, vector3(Config.buyheroinlabkit.x,Config.buyheroinlabkit.y,Config.buyheroinlabkit.z)) .. ' vectors', 'heroin') + Log(GetName(src) ..' Bought A Heroin lab Kit', 'heroin') else - Notifys(src, 'You Need '.. Config.heroinlabkitprice .. ' In Cash For This', 'error') + Notifys(src, 'You Need '.. prices.heroinlabkitprice .. ' In Cash For This', 'error') end end) diff --git a/server/locations.lua b/server/locations.lua index 01826cf..0311975 100644 --- a/server/locations.lua +++ b/server/locations.lua @@ -92,8 +92,8 @@ local Target = { }, Travellingmerchant = { -- where the travelling merchant can spawn vector4(-119.66, -977.43, 304.25, 88.21), - vector4(-1522.93, 1476.01, 111.45, 41.25), - vector4(-3278.98, 973.38, 5.35, 101.53), + vector4(-1522.93, 1476.01, 111.45, 41.25), + vector4(-3278.98, 973.38, 5.35, 101.53), }, oxylocations = { vector4(-2352.32, 266.78, 165.3, 23.46), diff --git a/server/lsd.lua b/server/lsd.lua index 3650e27..a2d1b72 100644 --- a/server/lsd.lua +++ b/server/lsd.lua @@ -1,10 +1,13 @@ local QBCore = exports['qb-core']:GetCoreObject() - +local prices = { + tabcost = 100, -- price per piece of tab paper event does 10 at a time + lsdlabkitcost = 10000 -- price of the lsd lab kit +} RegisterServerEvent('md-drugs:server:getlysergic', function(num) local src = source if not checkLoc(src, 'lysergicacid', num) then return end if AddItem(src,'lysergic_acid', 2) then - Log(GetName(src) ..' Got Lysergic acid with a distance of ' .. dist(source, Config.lysergicacid[num]['loc']) .. '!', 'lsd') + Log(GetName(src) ..' Got Lysergic acid!', 'lsd') end end) @@ -12,7 +15,7 @@ RegisterServerEvent('md-drugs:server:getdiethylamide', function(num) local src = source if not checkLoc(src, 'diethylamide', num) then return end if AddItem(src,'diethylamide', 2) then - Log(GetName(src) ..' Got Diethylamide with a distance of ' .. dist(source, Config.diethylamide[num]['loc']) .. '!', 'lsd') + Log(GetName(src) ..' Got diethylamide!', 'lsd') end end) @@ -106,7 +109,7 @@ RegisterServerEvent('md-drugs:server:gettabpaper', function(num) local src = source local Player = getPlayer(src) if not checkLoc(src, 'gettabs', num) then return end - if Player.Functions.RemoveMoney('cash', Config.tabcost * 10) then + if Player.Functions.RemoveMoney('cash', prices.tabcost * 10) then AddItem(src,'tab_paper', 10) Log(GetName(src) ..' Bought Tab Paper!', 'lsd') else @@ -118,7 +121,7 @@ RegisterServerEvent('md-drugs:server:getlabkit', function() local src = source local Player = getPlayer(src) if not checkLoc(src,'singleSpot', 'buylsdlabkit') then return end - if Player.Functions.RemoveMoney('cash', Config.lsdlabkitcost) then + if Player.Functions.RemoveMoney('cash', prices.lsdlabkitcost) then AddItem(src,'lsdlabkit', 1) Log(GetName(src) ..' Bought A LSD Lab Kit!', 'lsd') else diff --git a/server/oxyruns.lua b/server/oxyruns.lua index 4dbff99..cf2cc77 100644 --- a/server/oxyruns.lua +++ b/server/oxyruns.lua @@ -1,9 +1,13 @@ QBCore = exports['qb-core']:GetCoreObject() - +local prices = { + payfortruck = 500, + hotchance = 30, + itemChance = 20, +} lib.callback.register('md-drugs:server:payfortruck', function() local src = source local Player = getPlayer(src) - if Player.Functions.RemoveMoney('cash', 500) or Player.Functions.RemoveMoney('bank', 500) then + if Player.Functions.RemoveMoney('cash', prices.payfortruck) or Player.Functions.RemoveMoney('bank', prices.payfortruck) then Log(GetName(src) .. ' Rented A Van For OxyRuns', 'oxy') return true else @@ -21,21 +25,20 @@ RegisterServerEvent('md-drugs:server:giveoxybox', function() local itemchance = math.random(1,100) local itemList = { {item = 'oxy', amount = 2}, - {item = 'lockpick', amount = 1}, - {item = 'cryptostick', amount = 1}, + {item = 'houselockpick', amount = 1}, } local item = itemList[math.random(1, #itemList)] - if chance <= 30 then + if chance <= prices.hotchance then Notifys(src, Lang.oxy.hot, "error") Player.Functions.AddMoney("cash", cash * 0.5) - if itemchance <= 30 then + if itemchance <= prices.itemChance then AddItem(src, item.item, item.amount) end else Notifys(Lang.oxy.next, "success") TriggerClientEvent("md-drugs:client:getoxylocationroute", src) Player.Functions.AddMoney("cash", cash) - if itemchance <= 30 then + if itemchance <= prices.itemChance then AddItem(src, item.item, item.amount) end end diff --git a/server/recipes.lua b/server/recipes.lua index 361ba0b..42ba93a 100644 --- a/server/recipes.lua +++ b/server/recipes.lua @@ -2,137 +2,137 @@ local QBCore = exports['qb-core']:GetCoreObject() local recipe = { cocaine = { - cokepowder = { - tier1 = {take = {coca_leaf = 1}, give = {coke = 1}}, - tier2 = {take = {coca_leaf = 1}, give = {cokestagetwo = 1}}, - tier3 = {take = {coca_leaf = 1}, give = {cokestagethree = 1}}, - }, - cutcoke = { - tier1 = {take = {coke = 1, bakingsoda = 1}, give = {loosecoke = 1}}, - tier2 = {take = {cokestagetwo = 1, bakingsoda = 1}, give = {loosecokestagetwo = 1}}, - tier3 = {take = {cokestagethree = 1, bakingsoda = 1}, give = {loosecokestagethree = 1}}, - }, - bagcoke = { - tier1 = {take = {loosecoke = 1, empty_weed_bag = 1}, give = {cokebaggy = 1}}, - tier2 = {take = {loosecokestagetwo = 1, empty_weed_bag = 1}, give = {cokebaggystagetwo = 1}}, - tier3 = {take = {loosecokestagethree = 1, empty_weed_bag = 1}, give = {cokebaggystagethree = 1}}, - } - }, - crack = { - cookcrack = { - tier1 = {take = {loosecoke = 1, bakingsoda = 1}, give = {crackrock = 1}}, - tier2 = {take = {loosecokestagetwo = 1, bakingsoda = 1}, give = {crackrockstagetwo = 1}}, - tier3 = {take = {loosecokestagethree = 1,bakingsoda = 1}, give = {crackrockstagethree = 1}}, + cokepowder = { + tier1 = {take = {coca_leaf = 8}, give = {coke = 1}}, + tier2 = {take = {coca_leaf = 8}, give = {cokestagetwo = 1}}, + tier3 = {take = {coca_leaf = 8}, give = {cokestagethree = 1}}, }, - bagcrack = { - tier1 = {take = {crackrock = 1, empty_weed_bag = 1}, give = {baggedcracked = 1}}, - tier2 = {take = {crackrockstagetwo = 1, empty_weed_bag = 1}, give = {baggedcrackedstagetwo = 1}}, - tier3 = {take = {crackrockstagethree = 1, empty_weed_bag = 1}, give = {baggedcrackedstagethree = 1}}, + cutcoke = { + tier1 = {take = {coke = 1, bakingsoda = 1}, give = {loosecoke = 7}}, + tier2 = {take = {cokestagetwo = 1, bakingsoda = 1}, give = {loosecokestagetwo = 7}}, + tier3 = {take = {cokestagethree = 1, bakingsoda = 1}, give = {loosecokestagethree = 7}}, + }, + bagcoke = { + tier1 = {take = {loosecoke = 7, empty_bag = 7}, give = {cokebaggy = 7}}, + tier2 = {take = {loosecokestagetwo = 7, empty_bag = 7}, give = {cokebaggystagetwo = 7}}, + tier3 = {take = {loosecokestagethree = 7, empty_bag = 7}, give = {cokebaggystagethree = 7}}, } }, - heroin = { - dryheroin = { - tier1 = {take = {poppyresin = 1}, give = {heroin = 1}}, - tier2 = {take = {poppyresin = 1}, give = {heroinstagetwo = 1}}, - tier3 = {take = {poppyresin = 1}, give = {heroinstagethree = 1}}, - }, - cutheroin = { - tier1 = {take = {heroin = 1, bakingsoda = 1}, give = {heroincut = 1}}, - tier2 = {take = {heroinstagetwo = 1, bakingsoda = 1}, give = {heroincutstagetwo = 1}}, - tier3 = {take = {heroinstagethree = 1, bakingsoda = 1}, give = {heroincutstagethree = 1}}, - }, - fillvial = { - tier1 = {take = {heroincut = 1, emptyvial = 1}, give = {heroinvial = 1}}, - tier2 = {take = {heroincutstagetwo = 1, emptyvial = 1}, give = {heroinvialstagetwo = 1}}, - tier3 = {take = {heroincutstagethree = 1, emptyvial = 1}, give = {heroinvialstagethree = 1}}, - }, - fillneedle = { - tier1 = {take = {heroinvial = 1, needle = 1}, give = {heroin_ready = 1}}, - tier2 = {take = {heroin_readystagetwo = 1, needle = 1}, give = {heroin_readystagetwo = 1}}, - tier3 = {take = {heroinvialstagethree = 1, needle = 1}, give = {heroin_readystagethree = 1}}, - } + crack = { + cookcrack = { + tier1 = {take = {loosecoke = 7, bakingsoda = 1}, give = {crackrock = 1}}, + tier2 = {take = {loosecokestagetwo = 7, bakingsoda = 1}, give = {crackrockstagetwo = 1}}, + tier3 = {take = {loosecokestagethree = 7,bakingsoda = 1}, give = {crackrockstagethree = 1}}, + }, + bagcrack = { + tier1 = {take = {crackrock = 1, empty_bag = 9}, give = {baggedcracked = 10}}, + tier2 = {take = {crackrockstagetwo = 1, empty_bag = 9}, give = {baggedcrackedstagetwo = 10}}, + tier3 = {take = {crackrockstagethree = 1, empty_bag = 9}, give = {baggedcrackedstagethree = 10}}, + } + }, + heroin = { + dryheroin = { + tier1 = {take = {poppyresin = 6}, give = {heroin = 1}}, + tier2 = {take = {poppyresin = 6}, give = {heroinstagetwo = 1}}, + tier3 = {take = {poppyresin = 6}, give = {heroinstagethree = 1}}, + }, + cutheroin = { + tier1 = {take = {heroin = 1, bakingsoda = 1}, give = {heroincut = 1}}, + tier2 = {take = {heroinstagetwo = 1, bakingsoda = 1}, give = {heroincutstagetwo = 1}}, + tier3 = {take = {heroinstagethree = 1, bakingsoda = 1}, give = {heroincutstagethree = 1}}, + }, + fillvial = { + tier1 = {take = {heroincut = 1, emptyvial = 1}, give = {heroinvial = 1}}, + tier2 = {take = {heroincutstagetwo = 1, emptyvial = 1}, give = {heroinvialstagetwo = 1}}, + tier3 = {take = {heroincutstagethree = 1, emptyvial = 1}, give = {heroinvialstagethree = 1}}, + }, + fillneedle = { + tier1 = {take = {heroinvial = 1, needle = 14}, give = {heroin_ready = 14}}, + tier2 = {take = {heroin_readystagetwo = 1, needle = 14}, give = {heroin_readystagetwo = 14}}, + tier3 = {take = {heroinvialstagethree = 1, needle = 14}, give = {heroin_readystagethree = 14}}, + } + }, + lsd = { + vial = { + heat = {take = {lysergic_acid = 1, diethylamide = 1,}, give = {lsd_one_vial = 2}} + }, + + }, + mescaline = { + dry = { + dried = {take = {cactusbulb = 1}, give = {driedmescaline = 2} } + } }, - lsd = { - vial = { - heat = {take = {lysergic_acid = 1, diethylamide = 1,}, give = {lsd_one_vial = 1}} - }, - + lean = { + cups = { + cupoflean = {take = {leancup = 1, sprunk = 1, mdlean = 1}, give = {cupoflean = 2}}, + cupofdextro = {take = {leancup = 1, sprunk = 1, mdreddextro = 1}, give = {cupofdextro = 2}}, + } }, - mescaline = { - dry = { - dried = {take = {cactusbulb = 1}, give = {driedmescaline = 1} } - } - }, - lean = { - cups = { - cupoflean = {take = {leancup = 1, sprunk = 1, mdlean = 1}, give = {cupoflean = 1}}, - cupofdextro = {take = {leancup = 1, sprunk = 1, mdreddextro = 1}, give = {cupofdextro = 1}}, - } - }, - meth = { - cook = { - heat = {take = {ephedrine = 1, acetone = 1}, give = {}} - }, - bag = { - bags = {take = {empty_weed_bag = 5}, give = {methbags = 5} } - } - }, - weed = { - edibles = { - cannabutter = {take = { mdbutter = 1, grindedweed = 1}, give = {cannabutter = 1}}, - specialbrownie = {take = { cannabutter = 1, flour = 1, chocolate = 1}, give = {specialbrownie = 1}}, - specialcookie = { take = { cannabutter = 1, flour = 1}, give = {specialcookie = 1}}, - specialchocolate = { take = { cannabutter = 1, chocolate = 1}, give = {specialchocolate = 1}}, - specialmuffin = { take = { cannabutter = 1, flour = 1}, give = {specialmuffin = 1}}, - }, - oil = { - shatter = {take = {butane = 1, grindedweed = 1}, give = {shatter = 1}} - }, - blunts = { - blunt = {take = {bluntwrap = 1, grindedweed = 1}, give = {blunt = 1}}, - chewyblunt = {take = {bluntwrap = 1, grindedweed = 1, loosecoke = 1}, give = {chewyblunt = 1}}, - leanblunts = {take = {leanbluntwrap = 1, grindedweed = 1}, give = {leanblunts = 1}}, - dextroblunts = {take = {dextrobluntwrap = 1, grindedweed = 1}, give = {dextroblunts = 1}} - }, - bluntwrap = { - leanbluntwrap = {take = {bluntwrap = 5, mdlean = 1}, give = {leanbluntwrap = 5}}, - dextrobluntwrap = {take = {bluntwrap = 5, mdreddextro = 1}, give = {dextrobluntwrap = 5}}, - } - }, - xtc = { - raw = { - raw_xtc = {take = {mdp2p = 1, isosafrole = 1}, give = {raw_xtc = 1}} - }, - singlestack = { - white = {take = {raw_xtc = 1}, give = {white_xtc = 1}}, - red = {take = {raw_xtc = 1, loosecoke = 1 }, give = {red_xtc = 1}}, - orange = {take = {raw_xtc = 1, heroinvial = 1}, give = {orange_xtc = 1}}, - blue = {take = {raw_xtc = 1, crackrock = 1 }, give = {blue_xtc = 1}}, - }, - dualstack = { - white = {take = {raw_xtc = 1}, give = {white_xtc2 = 1}}, - red = {take = {raw_xtc = 1, loosecoke = 1}, give = {red_xtc2 = 1}}, - orange = {take = {raw_xtc = 1, heroinvial = 1}, give = {orange_xtc2 = 1}}, - blue = {take = {raw_xtc = 1, crackrock = 1}, give = {blue_xtc2 = 1}}, - }, - triplestack = { - white = {take = {raw_xtc = 1}, give = {white_xtc3 = 1}}, - red = {take = {raw_xtc = 1, loosecoke = 1}, give = {red_xtc3 = 1}}, - orange = {take = {raw_xtc = 1, heroinvial = 1}, give = {orange_xtc3 = 1}}, - blue = {take = {raw_xtc = 1, crackrock = 1}, give = {blue_xtc3 = 1}}, - }, - quadstack = { - white = {take = {raw_xtc = 1}, give = {white_xtc4 = 1}}, - red = {take = {raw_xtc = 1, loosecoke = 1}, give = {red_xtc4 = 1}}, - orange = {take = {raw_xtc = 1, heroinvial = 1}, give = {orange_xtc4 = 1}}, - blue = {take = {raw_xtc = 1, crackrock = 1}, give = {blue_xtc4 = 1}}, - }, - press = { - dual = {take = {white_xtc = 20, blue_xtc = 20, red_xtc = 20, orange_xtc = 20, singlepress = 1}, give = {dualpress = 1}}, - triple = {take = {white_xtc2 = 50, blue_xtc2 = 50, red_xtc2 = 50, orange_xtc2 = 50, dualpress = 1}, give = {triplepres = 1}}, - quad = { take = {white_xtc3 = 50, blue_xtc3 = 50, red_xtc3 = 50, orange_xtc3 = 50, triplepress = 1}, give = {quadpress = 1}} - } - } + meth = { + cook = { + heat = {take = {ephedrine = 1, acetone = 1}, give = {}} + }, + bag = { + bags = {take = {empty_bag = 15}, give = {methbags = 15} } + } + }, + weed = { + edibles = { + cannabutter = {take = { mdbutter = 1, grindedweed = 5}, give = {cannabutter = 2}}, + specialbrownie = {take = { cannabutter = 1, flour = 1, chocolate = 1}, give = {specialbrownie = 5}}, + specialcookie = { take = { cannabutter = 1, flour = 1}, give = {specialcookie = 3}}, + specialchocolate = { take = { cannabutter = 1, chocolate = 1}, give = {specialchocolate = 2}}, + specialmuffin = { take = { cannabutter = 1, flour = 1}, give = {specialmuffin = 3}}, + }, + oil = { + shatter = {take = {butane = 1, grindedweed = 20}, give = {shatter = 10}} + }, + blunts = { + blunt = {take = {bluntwrap = 2, grindedweed = 1}, give = {blunt = 2}}, + chewyblunt = {take = {bluntwrap = 2, grindedweed = 1, loosecoke = 1}, give = {chewyblunt = 2}}, + leanblunts = {take = {leanbluntwrap = 2, grindedweed = 1}, give = {leanblunts = 2}}, + dextroblunts = {take = {dextrobluntwrap = 2, grindedweed = 1}, give = {dextroblunts = 2}} + }, + bluntwrap = { + leanbluntwrap = {take = {bluntwrap = 5, mdlean = 1}, give = {leanbluntwrap = 5}}, + dextrobluntwrap = {take = {bluntwrap = 5, mdreddextro = 1}, give = {dextrobluntwrap = 5}}, + } + }, + xtc = { + raw = { + raw_xtc = {take = {mdp2p = 1, isosafrole = 1}, give = {raw_xtc = 1}} + }, + singlestack = { + white = {take = {raw_xtc = 1}, give = {white_xtc = 1}}, + red = {take = {raw_xtc = 1, loosecoke = 1 }, give = {red_xtc = 1}}, + orange = {take = {raw_xtc = 1, heroinvial = 1}, give = {orange_xtc = 1}}, + blue = {take = {raw_xtc = 1, crackrock = 1 }, give = {blue_xtc = 1}}, + }, + dualstack = { + white = {take = {raw_xtc = 1}, give = {white_xtc2 = 1}}, + red = {take = {raw_xtc = 1, loosecoke = 1}, give = {red_xtc2 = 1}}, + orange = {take = {raw_xtc = 1, heroinvial = 1}, give = {orange_xtc2 = 1}}, + blue = {take = {raw_xtc = 1, crackrock = 1}, give = {blue_xtc2 = 1}}, + }, + triplestack = { + white = {take = {raw_xtc = 1}, give = {white_xtc3 = 1}}, + red = {take = {raw_xtc = 1, loosecoke = 1}, give = {red_xtc3 = 1}}, + orange = {take = {raw_xtc = 1, heroinvial = 1}, give = {orange_xtc3 = 1}}, + blue = {take = {raw_xtc = 1, crackrock = 1}, give = {blue_xtc3 = 1}}, + }, + quadstack = { + white = {take = {raw_xtc = 1}, give = {white_xtc4 = 1}}, + red = {take = {raw_xtc = 1, loosecoke = 1}, give = {red_xtc4 = 1}}, + orange = {take = {raw_xtc = 1, heroinvial = 1}, give = {orange_xtc4 = 1}}, + blue = {take = {raw_xtc = 1, crackrock = 1}, give = {blue_xtc4 = 1}}, + }, + press = { + dual = {take = {white_xtc = 20, blue_xtc = 20, red_xtc = 20, orange_xtc = 20, singlepress = 1}, give = {dualpress = 1}}, + triple = {take = {white_xtc2 = 50, blue_xtc2 = 50, red_xtc2 = 50, orange_xtc2 = 50, dualpress = 1}, give = {triplepres = 1}}, + quad = { take = {white_xtc3 = 50, blue_xtc3 = 50, red_xtc3 = 50, orange_xtc3 = 50, triplepress = 1}, give = {quadpress = 1}} + } + } } function GetRecipe(source, type, method, tier) diff --git a/server/weed.lua b/server/weed.lua index 31b4afb..7958cb3 100644 --- a/server/weed.lua +++ b/server/weed.lua @@ -1,7 +1,7 @@ local QBCore = exports['qb-core']:GetCoreObject() local weedPlant = { - { location = vector3(1049.63, -3202.12, -39.15), heading = 334.49, model = "bkr_prop_weed_lrg_01b"}, + { location = vector3(1049.63, -3202.12, -39.15), heading = 334.49, model = "bkr_prop_weed_lrg_01b"}, { location = vector3(1050.85, -3202.15, -39.15), heading = 329.56, model = "bkr_prop_weed_lrg_01b"}, { location = vector3(1052.01, -3202.22, -39.13), heading = 25.16, model = "bkr_prop_weed_lrg_01b"}, { location = vector3(1052.99, -3202.15, -39.15), heading = 21.52, model = "bkr_prop_weed_lrg_01b"}, diff --git a/shared/config.lua b/shared/config.lua index ae87a56..143acfc 100644 --- a/shared/config.lua +++ b/shared/config.lua @@ -1,13 +1,13 @@ Config = {} --Ignore. -Config.Target = 'interact' -- qb or ox -Config.respawnTime = 10 -- Seconds -Config.Fuel = "LegacyFuel" -- type the name of script you use i.e. ps-fuel, cdn-fuel, LegacyFuel +Config.Target = 'ox' -- qb or ox +Config.respawnTime = 600 -- Seconds +Config.Fuel = "ps-fuel" -- type the name of script you use i.e. ps-fuel, cdn-fuel, LegacyFuel Config.TierSystem = true -- allows for three tiers of certain drugs ( coke, heroin, crack, lsd) Config.StupidassNewQbItemName = true -- true if you have updated your items.lua from base qb after november 2023 because changing item names this far in a framework is 3 IQ points total Config.RequestModelTime = 30000 -- if you need more time than this, uhhhh wow -Config.minigametype = 'ox' -- look above for options or choose none if you dont want any minigames -Config.FancyCokeAnims = false -- if you want multi location this needs to be false + +Config.FancyCokeAnims = true -- if you want multi location this needs to be false Config.PharmaJob = "ems" -- what TYPE role you need to be on to get the command Config.Joblock = false -- if you want weed to be a job Config.weedjob = "" -- what the job name is @@ -47,9 +47,4 @@ Config.Minigames = { glspot = {gridSize = 6, timeLimit = 999999, charSet = "alphabet", required = 10}, glmath = {timeLimit = 300000}, } - - ---- TODO: Move these to server files -Config.tabcost = 100 -- price per piece of tab paper event does 10 at a time -Config.lsdlabkitcost = 10000 -- price of the lsd lab kit -Config.heroinlabkitprice = 10000 -- price of the lsd lab kit +Config.minigametype = 'blrapidlines' -- look above for options or choose none if you dont want any minigames \ No newline at end of file