diff --git a/fxmanifest.lua b/fxmanifest.lua index 5ab108d..5c121a1 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -3,7 +3,7 @@ author "mustache_dom" description "drugs by mustache dom" fx_version "cerulean" game "gta5" -version '4.0.2' +version '4.0.3' client_scripts { 'client/functions.lua', 'client/plantSpawns.lua', diff --git a/items_install/images/ALL/chocolate.png b/items_install/images/ALL/chocolate.png new file mode 100644 index 0000000..55ae788 Binary files /dev/null and b/items_install/images/ALL/chocolate.png differ diff --git a/items_install/images/ALL/playboy_white1.png b/items_install/images/ALL/playboy_white.png similarity index 100% rename from items_install/images/ALL/playboy_white1.png rename to items_install/images/ALL/playboy_white.png diff --git a/items_install/images/weed/chocolate.png b/items_install/images/weed/chocolate.png new file mode 100644 index 0000000..55ae788 Binary files /dev/null and b/items_install/images/weed/chocolate.png differ diff --git a/items_install/item_names/ox_inventory.md b/items_install/item_names/ox_inventory.md index d5b71df..8474d4f 100644 --- a/items_install/item_names/ox_inventory.md +++ b/items_install/item_names/ox_inventory.md @@ -4,7 +4,7 @@ label = 'Raw Cocaine', weight = 1000, stack = false, - close = false + close = false, client = { image = "coke.png" }, @@ -13,7 +13,7 @@ label = 'Cocaine leaves', weight = 1500, stack = false, - close = false + close = false, client = { image = "coca_leaf.png" }, @@ -22,7 +22,7 @@ label = 'Baking Soda', weight = 300, stack = false, - close = false + close = false, client = { image = "bakingsoda.png" }, @@ -85,7 +85,7 @@ label = 'Raw Cocaine', weight = 100, stack = false, - close = false + close = false, client = { image = "cokestagetwo.png" }, @@ -94,7 +94,7 @@ label = 'Raw Cocaine', weight = 100, stack = false, - close = false + close = false, client = { image = "cokestagethree.png" }, @@ -112,7 +112,7 @@ label = 'Baking Soda', weight = 300, stack = false, - close = false + close = false, client = { image = "bakingsoda.png" }, @@ -121,7 +121,7 @@ label = 'Bag Of Crack', weight = 250, stack = false, - close = false + close = false, client = { image = "crackbag1.png" }, @@ -130,7 +130,7 @@ label = 'Better Bag Of Crack', weight = 250, stack = false, - close = false + close = false, client = { image = "crackbag2.png" }, @@ -139,7 +139,7 @@ label = 'Best Bag Of Crack', weight = 250, stack = false, - close = false + close = false, client = { image = "crackbag3.png" }, @@ -148,7 +148,7 @@ label = 'Crack Rock', weight = 250, stack = false, - close = false + close = false, client = { image = "crackrock1.png" }, @@ -157,7 +157,7 @@ label = 'Better Crack Rock', weight = 250, stack = false, - close = false + close = false, client = { image = "crackrock2.png" }, @@ -166,7 +166,7 @@ label = 'Best Crack Rock', weight = 250, stack = false, - close = false + close = false, client = { image = "crackrock3.png" }, @@ -184,7 +184,7 @@ label = 'Baking Soda', weight = 300, stack = false, - close = false + close = false, client = { image = "bakingsoda.png" }, @@ -193,7 +193,7 @@ label = 'Poppy resin', weight = 2000, stack = false, - close = false + close = false, client = { image = "poppyresin.png" }, @@ -202,7 +202,7 @@ label = 'Heroin Powder', weight = 500, stack = false, - close = false + close = false, client = { image = "heroinpowder.png" }, @@ -211,7 +211,7 @@ label = 'Heroin Powder', weight = 250, stack = false, - close = false + close = false, client = { image = "heroinpowderstagetwo.png" }, @@ -220,7 +220,7 @@ label = 'Heroin Powder', weight = 250, stack = false, - close = false + close = false, client = { image = "heroinpowderstagethree.png" }, @@ -229,7 +229,7 @@ label = 'Cut Heroin', weight = 250, stack = false, - close = false + close = false, client = { image = "heroincut.png" }, @@ -238,7 +238,7 @@ label = 'Cut Heroin', weight = 250, stack = false, - close = false + close = false, client = { image = "heroincut2.png" }, @@ -247,7 +247,7 @@ label = 'Cut Heroin', weight = 250, stack = false, - close = false + close = false, client = { image = "heroincut3.png" }, @@ -256,7 +256,7 @@ label = 'Heroin Lab Kit', weight = 250, stack = false, - close = false + close = false, client = { image = "labkit.png" }, @@ -265,7 +265,7 @@ label = 'Vial Of Heroin', weight = 250, stack = false, - close = false + close = false, client = { image = "heroin.png" }, @@ -274,7 +274,7 @@ label = 'Vial of Heroin', weight = 250, stack = false, - close = false + close = false, client = { image = "heroinstagetwo.png" }, @@ -283,7 +283,7 @@ label = 'Vial Of Heroin', weight = 250, stack = false, - close = false + close = false, client = { image = "heroinstagethree.png" }, @@ -292,7 +292,7 @@ label = 'Heroin Syringe', weight = 250, stack = false, - close = false + close = false, client = { image = "heroin_ready.png" }, @@ -301,7 +301,7 @@ label = 'Heroin Syringe', weight = 250, stack = false, - close = false + close = false, client = { image = "heroin_readystagetwo.png" }, @@ -310,7 +310,7 @@ label = 'Heroin Syringe', weight = 250, stack = false, - close = false + close = false, client = { image = "heroin_readystagethree.png" }, @@ -328,7 +328,7 @@ label = 'Syringe', weight = 250, stack = false, - close = false + close = false, client = { image = "syringe.png" }, @@ -643,7 +643,7 @@ label = 'Prescription Pad', weight = 10, stack = false, - close = false + close = false, client = { image = 'prescriptionpad.png' }, @@ -652,7 +652,7 @@ label = 'Vicie Prescription', weight = 250, stack = false, - close = false + close = false, client = { image = "adderalprescription.png" }, @@ -661,7 +661,7 @@ label = 'Mdderal Prescription', weight = 250, stack = false, - close = false + close = false, client = { image = "adderalprescription.png" }, @@ -670,7 +670,7 @@ label = 'Morphin Prescription', weight = 250, stack = false, - close = false + close = false, client = { image = "adderalprescription.png" }, @@ -679,7 +679,7 @@ label = 'Zany Prescription', weight = 250, stack = false, - close = false + close = false, client = { image = "adderalprescription.png" }, @@ -760,7 +760,7 @@ label = 'Shrooms', weight = 250, stack = false, - close = false + close = false, client = { image = "shrooms.png" }, @@ -816,7 +816,7 @@ stack = false, close = true, client = { - image = "chocolate.png" + image = "specialbrownie.png" }, }, ['specialcookie'] = { @@ -963,15 +963,6 @@ image = "leanbluntwrap.png" }, }, - ['dextroblunt'] = { - label = 'Dextro Blunt Wrap', - weight = 100, - stack = false, - close = true, - client = { - image = "dextroblunt.png" - }, - }, ['dextrobluntwrap'] = { label = 'Dextro Blunt Wrap', weight = 100, diff --git a/items_install/item_names/qb-inventory.md b/items_install/item_names/qb-inventory.md index 75889e5..7666ce9 100644 --- a/items_install/item_names/qb-inventory.md +++ b/items_install/item_names/qb-inventory.md @@ -114,7 +114,7 @@ weedgrinder = {name = "weedgrinder", label = "Weed Grinder", weight = 100, type = "item", image = "weedgrinder.png", unique = false, useable = true, shouldClose = true, combinable = nil, description = ""}, mdbutter = {name = "mdbutter", label = "Butter", weight = 100, type = "item", image = "butter.png", unique = false, useable = true, shouldClose = true, combinable = nil, description = ""}, cannabutter = {name = "cannabutter", label = "Canna-Butter", weight = 100, type = "item", image = "cannabutter.png", unique = false, useable = true, shouldClose = true, combinable = nil, description = ""}, - specialbrownie = {name = "specialbrownie", label = "Special Brownie", weight = 100, type = "item", image = "chocolate.png", unique = false, useable = true, shouldClose = true, combinable = nil, description = ""}, + specialbrownie = {name = "specialbrownie", label = "Special Brownie", weight = 100, type = "item", image = "specialbrownie.png", unique = false, useable = true, shouldClose = true, combinable = nil, description = ""}, specialcookie = {name = "specialcookie", label = "Special Cookie", weight = 100, type = "item", image = "specialcookie.png", unique = false, useable = true, shouldClose = true, combinable = nil, description = ""}, specialmuffin = {name = "specialmuffin", label = "Special Muffin", weight = 100, type = "item", image = "specialmuffin.png", unique = false, useable = true, shouldClose = true, combinable = nil, description = ""}, specialchocolate = {name = "specialchocolate", label = "Special Chocolate", weight = 100, type = "item", image = "specialchocolate.png", unique = false, useable = true, shouldClose = true, combinable = nil, description = ""}, @@ -131,7 +131,6 @@ shatter = {name = "shatter", label = "Shatter", weight = 100, type = "item", image = "shatter.png", unique = false, useable = true, shouldClose = true, combinable = nil, description = ""}, bluntwrap = {name = "bluntwrap", label = "Blunt Wrap", weight = 100, type = "item", image = "bluntwrap.png", unique = false, useable = true, shouldClose = true, combinable = nil, description = ""}, leanbluntwrap = {name = "leanbluntwrap", label = "Lean Blunt Wrap", weight = 100, type = "item", image = "leanbluntwrap.png", unique = false, useable = true, shouldClose = true, combinable = nil, description = ""}, - dextroblunt = {name = "dextroblunt", label = "Dextro Blunt Wrap", weight = 100, type = "item", image = "dextroblunt.png", unique = false, useable = true, shouldClose = true, combinable = nil, description = ""}, dextrobluntwrap = {name = "dextrobluntwrap", label = "Dextro Blunt Wrap", weight = 100, type = "item", image = "dextrobluntwrap.png", unique = false, useable = true, shouldClose = true, combinable = nil, description = ""}, leanblunts = {name = "leanblunts", label = "Lean Blunts", weight = 100, type = "item", image = "leanblunts.png", unique = false, useable = true, shouldClose = true, combinable = nil, description = ""}, dextroblunts = {name = "dextroblunts", label = "Dextro Blunts", weight = 100, type = "item", image = "dextroblunts.png", unique = false, useable = true, shouldClose = true, combinable = nil, description = ""}, diff --git a/version.txt b/version.txt index bf5da87..7d36008 100644 --- a/version.txt +++ b/version.txt @@ -30,3 +30,18 @@ Newest Build: 4.0.2 - server/xtc.lua - version.txt - client/heroin.lua + + +Newest Build: 4.0.3 +- updated weed client +- updated ox and qb items fixing them sorry yall +- updated images +- CHANGES FROM 4.0.0 - 4.0.2 + +- updated qb items +- updated ox items +- ABOVE IS JUST LABEL CHANGES AND IMAGE CHANGES NOT NECESSARY +- fix for weed drying +- fix saving location of pill presses in xtc +- Adjust XTC item crafting +- notify after check for heroin baking soda