diff --git a/fxmanifest.lua b/fxmanifest.lua index 7f35a76..e1bef97 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -21,6 +21,7 @@ server_scripts { shared_scripts { '@ox_lib/init.lua', 'shared/config.lua', + 'shared/DrugData/*.lua', } lua54 'yes' @@ -28,6 +29,5 @@ lua54 'yes' files { 'client/**.lua', 'server/**.lua', - 'shared/**.lua', 'locales/**.json' } diff --git a/shared/DrugData/TravellingMerchant.lua b/shared/DrugData/TravellingMerchant.lua index cdba364..dbe4e2f 100644 --- a/shared/DrugData/TravellingMerchant.lua +++ b/shared/DrugData/TravellingMerchant.lua @@ -1,3 +1,4 @@ +if not Config.Drugs['TravellingMerchant'] then return end Config.Merchant = { Locations = { Travellingmerchant = { diff --git a/shared/DrugData/cocaine.lua b/shared/DrugData/cocaine.lua index 4726990..30c5c92 100644 --- a/shared/DrugData/cocaine.lua +++ b/shared/DrugData/cocaine.lua @@ -1,3 +1,4 @@ +if not Config.Drugs['cocaine'] then return end Config.Cocaine = { Locations = { MakePowder = { -- size = vector3(x,y,z) x = length, y = width, z = height diff --git a/shared/DrugData/consumables.lua b/shared/DrugData/consumables.lua index 8ba15e7..1b69018 100644 --- a/shared/DrugData/consumables.lua +++ b/shared/DrugData/consumables.lua @@ -1,3 +1,4 @@ +if not Config.Drugs['consumables'] then return end local emotes = { smoke = { dict = "amb@world_human_aa_smoke@male@idle_a", diff --git a/shared/DrugData/cornerselling.lua b/shared/DrugData/cornerselling.lua index 4642218..3fbf3a2 100644 --- a/shared/DrugData/cornerselling.lua +++ b/shared/DrugData/cornerselling.lua @@ -1,3 +1,5 @@ +if not Config.Drugs['cornerselling'] then return end + Config.Cornerselling = { noSellZones = { {loc = vector3(445.11, -991.3, 30.69), width = 10.0, length = 10.0, height = 10.0, rot = 180.0}, diff --git a/shared/DrugData/crack.lua b/shared/DrugData/crack.lua index e0b598b..26d3b5c 100644 --- a/shared/DrugData/crack.lua +++ b/shared/DrugData/crack.lua @@ -1,3 +1,4 @@ +if not Config.Drugs['crack'] then return end Config.Crack = { Recipes = { cookcrack = { diff --git a/shared/DrugData/deliveries.lua b/shared/DrugData/deliveries.lua index ba94c50..d5653f9 100644 --- a/shared/DrugData/deliveries.lua +++ b/shared/DrugData/deliveries.lua @@ -1,3 +1,4 @@ +if not Config.Drugs['deliveries'] then return end Config.Deliveries = { Locations = { dropOff = { diff --git a/shared/DrugData/heroin.lua b/shared/DrugData/heroin.lua index 97d5ccc..8994b9b 100644 --- a/shared/DrugData/heroin.lua +++ b/shared/DrugData/heroin.lua @@ -1,3 +1,4 @@ +if not Config.Drugs['heroin'] then return end Config.Heroin = { Recipes = { dryheroin = { diff --git a/shared/DrugData/lean.lua b/shared/DrugData/lean.lua index 868ac0c..bde57e7 100644 --- a/shared/DrugData/lean.lua +++ b/shared/DrugData/lean.lua @@ -1,3 +1,4 @@ +if not Config.Drugs['lean'] then return end Config.Lean = { Locations = { SyrupVendor = { diff --git a/shared/DrugData/lsd.lua b/shared/DrugData/lsd.lua index b4b558c..a54f813 100644 --- a/shared/DrugData/lsd.lua +++ b/shared/DrugData/lsd.lua @@ -1,3 +1,4 @@ +if not Config.Drugs['lsd'] then return end Config.LSD = { Recipes = { vial = { diff --git a/shared/DrugData/mescaline.lua b/shared/DrugData/mescaline.lua index df790e7..dc8e2da 100644 --- a/shared/DrugData/mescaline.lua +++ b/shared/DrugData/mescaline.lua @@ -1,3 +1,4 @@ +if not Config.Drugs['mescaline'] then return end Config.Mescaline = { Locations = { DryOutMescaline = { -- where to dry out your mescaline diff --git a/shared/DrugData/meth.lua b/shared/DrugData/meth.lua index f5e19ea..b88359c 100644 --- a/shared/DrugData/meth.lua +++ b/shared/DrugData/meth.lua @@ -1,3 +1,4 @@ +if not Config.Drugs['meth'] then return end Config.Meth = { Locations = { CookMeth = { diff --git a/shared/DrugData/oxyruns.lua b/shared/DrugData/oxyruns.lua index 1183af0..e3abe25 100644 --- a/shared/DrugData/oxyruns.lua +++ b/shared/DrugData/oxyruns.lua @@ -1,3 +1,4 @@ +if not Config.Drugs['oxyruns'] then return end Config.Oxy = { Locations = { OxyPayForTruck = { diff --git a/shared/DrugData/pharma.lua b/shared/DrugData/pharma.lua index bd47161..a95c67b 100644 --- a/shared/DrugData/pharma.lua +++ b/shared/DrugData/pharma.lua @@ -1,3 +1,4 @@ +if not Config.Drugs['pharma'] then return end Config.Pharma = { Locations = { FillPrescription = { -- where to fill out your prescription diff --git a/shared/DrugData/shrooms.lua b/shared/DrugData/shrooms.lua index 926a782..391b2df 100644 --- a/shared/DrugData/shrooms.lua +++ b/shared/DrugData/shrooms.lua @@ -1 +1,2 @@ +if not Config.Drugs['shrooms'] then return end Config.Shrooms ={} \ No newline at end of file diff --git a/shared/DrugData/weed.lua b/shared/DrugData/weed.lua index e29e6aa..5916959 100644 --- a/shared/DrugData/weed.lua +++ b/shared/DrugData/weed.lua @@ -1,3 +1,4 @@ +if not Config.Drugs['weed'] then return end Config.Weed = { Locations = { WeedTele = { -- where you tele out of weed diff --git a/shared/DrugData/whippit.lua b/shared/DrugData/whippit.lua index 098d5d0..a72a6fc 100644 --- a/shared/DrugData/whippit.lua +++ b/shared/DrugData/whippit.lua @@ -1,3 +1,4 @@ +if not Config.Drugs['whippit'] then return end Config.Whippit = { Recipes = { cracker = { diff --git a/shared/DrugData/wholesale.lua b/shared/DrugData/wholesale.lua index 8f14727..e450944 100644 --- a/shared/DrugData/wholesale.lua +++ b/shared/DrugData/wholesale.lua @@ -1,3 +1,4 @@ +if not Config.Drugs['wholesale'] then return end Config.Wholesale = { settings = { WholesaleQuantityBonus = 0.05, -- 5% bonus per 10 units sold (up to 20%) diff --git a/shared/DrugData/xtc.lua b/shared/DrugData/xtc.lua index 9d1dcb5..02d23e5 100644 --- a/shared/DrugData/xtc.lua +++ b/shared/DrugData/xtc.lua @@ -1,3 +1,4 @@ +if not Config.Drugs['xtc'] then return end Config.XTC = { Recipes = { raw = { diff --git a/shared/config.lua b/shared/config.lua index eaac61c..52b3124 100644 --- a/shared/config.lua +++ b/shared/config.lua @@ -71,27 +71,3 @@ Config.Bzz = { -- if you have BZZZ props for these turn it on if you want shrooms = false, weed = false, } - - -for k, v in pairs (Config.Drugs) do - if not v then goto continue end - local resourceName = 'md-drugs' - local filePath = 'shared/DrugData/' .. k .. '.lua' - local fullScript = LoadResourceFile(resourceName, filePath) - if not fullScript then - Bridge.Prints.Error("Error: Failed to load module '" .. filePath .. "' from resource '" .. resourceName .. "'.") - return false - end - local chunk, err = load(fullScript, filePath, "t") - if not chunk then - Bridge.Prints.Error("Error loading Lua chunk from '" .. filePath .. "': " .. tostring(err)) - return false - end - - local success, execErr = pcall(chunk) - if not success then - Bridge.Prints.Error("Error executing Lua chunk from '" .. filePath .. "': " .. tostring(execErr)) - return false - end - ::continue:: -end \ No newline at end of file