From 6df098327397b07830bbc3a0d78db90258efe394 Mon Sep 17 00:00:00 2001 From: Mustache Dom <123716453+Mustachedom@users.noreply.github.com> Date: Fri, 22 Nov 2024 00:27:30 -0800 Subject: [PATCH] patch --- client/target.lua | 4 +- server/locations.lua | 8 +- server/recipes.lua | 252 +++++++++++++++++++++---------------------- 3 files changed, 132 insertions(+), 132 deletions(-) diff --git a/client/target.lua b/client/target.lua index bfaede9..e185b0f 100644 --- a/client/target.lua +++ b/client/target.lua @@ -4,8 +4,8 @@ local icon = "fa solid fa-eye" CreateThread(function() local config = lib.callback.await('md-drugs:server:getLocs', false) if not config then return end - AddBoxZoneSingle('telecokein', config.singleSpot.CokeTeleIn, {action = function()tele(config.singelSpot.CokeTeleOut)end, icon = 'fa-solid fa-door-open', label = Lang.targets.coke.enter}) -- coke - AddBoxZoneSingle('telecokeout', config.singleSpot.CokeTeleOut, {action = function()tele(config.singelSpot.CokeTeleIn) end, icon = "fa-solid fa-door-closed", label = Lang.targets.coke.exit}) -- coke + AddBoxZoneSingle('telecokein', config.singleSpot.CokeTeleIn, {action = function()tele(config.singleSpot.CokeTeleOut)end, icon = 'fa-solid fa-door-open', label = Lang.targets.coke.enter}) -- coke + AddBoxZoneSingle('telecokeout', config.singleSpot.CokeTeleOut, {action = function()tele(config.singleSpot.CokeTeleIn) end, icon = "fa-solid fa-door-closed", label = Lang.targets.coke.exit}) -- coke AddBoxZoneMulti('makepowder', config.MakePowder, {event = "md-drugs:client:makepowder", icon = "fa-solid fa-scissors", label = Lang.targets.coke.chop}) -- coke AddBoxZoneMulti('steallysergic', config.lysergicacid, {event = "md-drugs:client:getlysergic", icon = icon, label = Lang.targets.lsd.lys}) -- lsd AddBoxZoneMulti('stealdiethylamide', config.diethylamide, {event = "md-drugs:client:getdiethylamide", icon = icon, label = Lang.targets.lsd.die}) -- lsd diff --git a/server/locations.lua b/server/locations.lua index 0311975..89adb4e 100644 --- a/server/locations.lua +++ b/server/locations.lua @@ -11,7 +11,7 @@ local Target = { {loc = vector3(1093.16, -3195.78, -39.19), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, }, makecrack = { -- make crack with baking soda with cut coke 1-3 - {loc = vector3(2434.07, 4969.39, 42.35), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, + {loc = vector3(2433.47, 4970.02, 42.18), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, }, bagcrack = { --- bag crack 1-3 stages {loc = vector3(2436.55, 4964.96, 42.18), l = 1.0, w = 1.0, rot = 45.0, gang = ""}, @@ -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), @@ -135,4 +135,4 @@ lib.callback.register('md-drugs:server:getLocs', function() end) lib.callback.register('md-drugs:server:GetMerchant', function(source) return loc -end) +end) \ No newline at end of file diff --git a/server/recipes.lua b/server/recipes.lua index 42ba93a..361ba0b 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 = 8}, give = {coke = 1}}, - tier2 = {take = {coca_leaf = 8}, give = {cokestagetwo = 1}}, - tier3 = {take = {coca_leaf = 8}, give = {cokestagethree = 1}}, + 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}}, }, - 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}}, + 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}}, } }, - 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} } - } + 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}}, + } }, - lean = { - cups = { - cupoflean = {take = {leancup = 1, sprunk = 1, mdlean = 1}, give = {cupoflean = 2}}, - cupofdextro = {take = {leancup = 1, sprunk = 1, mdreddextro = 1}, give = {cupofdextro = 2}}, - } + lsd = { + vial = { + heat = {take = {lysergic_acid = 1, diethylamide = 1,}, give = {lsd_one_vial = 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}} - } - } + 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}} + } + } } function GetRecipe(source, type, method, tier)