Update cocaine.lua

client/cocaine.lua

@@ -3,7 +3,8 @@ local cuttingcoke = nil
 local baggingcoke = nil
 local locations = ps.callback('md-drugs:server:GetCokeLocations')
 
-local function CutCoke(coords, offset, rotation)
+local function CutCoke(coords, offset, rotation)
+cuttingcoke = true
 	local animDict, animName = "anim@amb@business@coc@coc_unpack_cut_left@", "coke_cut_v5_coccutter"
 	ps.requestAnim(animDict, 500)
 	local animDuration = GetAnimDuration(animDict, animName) * 1000
@@ -47,10 +48,12 @@ local function CutCoke(coords, offset, rotation)
 		DeleteEntity(entitiesList[i])
 	end
 	RemoveAnimDict(animDict)
-	FreezeEntityPosition(ped, false)
+	FreezeEntityPosition(ped, false)
+cuttingcoke = nil
 end
 
-local function BagCoke(coords, offset, rotation)
+local function BagCoke(coords, offset, rotation)
+baggingcoke = true
     local ver = ""
 	local animDict, animName = "anim@amb@business@meth@meth_smash_weight_check@", "break_weigh_"..ver.."char01"
 	ps.requestAnim(animDict, 500)
@@ -108,7 +111,8 @@ local function BagCoke(coords, offset, rotation)
     	DeleteEntity(entitiesList[i])
     end
     RemoveAnimDict(animDict)
-    FreezeEntityPosition(ped, false)
+    FreezeEntityPosition(ped, false)
+baggingcoke = nil
 end
 
 for k, v in pairs (locations.MakePowder) do

client/xtc.lua

@@ -130,6 +130,7 @@ for k, v in pairs(locations.xtcpress) do
                           icon = ps.getImage(m),
                           title = ps.getLabel(m),
                           description = ps.lang('xtc.buySingle', d.cash),
+                          type = d.type,
                           action = function()
                             if not ps.progressbar(ps.lang('xtc.buyp'), 4000, 'uncuff') then return end
                             TriggerServerEvent('md-drugs:server:buypress',k, m)
@@ -141,6 +142,7 @@ for k, v in pairs(locations.xtcpress) do
                             icon = ps.getImage(m),
                             title = ps.getLabel(m),
                             description = descript,
+                            type = d.type,
                             action = function()
                                  if not ps.progressbar(ps.lang('xtc.buyp'), 4000, 'uncuff') then return end
                                 TriggerServerEvent("md-drugs:server:upgradepress", k, m)
@@ -149,6 +151,7 @@ for k, v in pairs(locations.xtcpress) do
                         }
                     end
                 end
+                table.sort(options, function(a, b) return a.type < b.type end)
                 ps.menu('XTC Presses', 'XTC Presses', options)
             end,
              canInteract = function() return handleGang(v.gang) end

fxmanifest.lua

@@ -3,7 +3,7 @@ author "mustache_dom"
 description "drugs by mustache dom"
 fx_version "cerulean"
 game "gta5"
-version  '4.0.7'
+version  '4.0.8'
 client_scripts {
 	'client/functions.lua',
 	'client/plantSpawns.lua',

server/xtc.lua

@@ -29,10 +29,10 @@ local RecipeList = {
 		blue_xtc4 = 	{give = {blue_xtc4 = 1}, take = {raw_xtc = 1, crackrock = 1},},
 	 },
 	presses = {
-		singlepress = {cash = 10000},
-		dualpress =   {give  = {dualpress = 1}, take = {white_xtc = 20, blue_xtc = 20, red_xtc = 20, orange_xtc = 20, singlepress = 1}},
-		triplepress = {give  = {triplepress = 1}, take = {white_xtc2 = 50, blue_xtc2 = 50, red_xtc2 = 50, orange_xtc2 = 50, dualpress = 1}},
-		quadpress =   {give  = {quadpress = 1}, take = {white_xtc3 = 50, blue_xtc3 = 50, red_xtc3 = 50, orange_xtc3 = 50, triplepress = 1}},
+		singlepress = {type = 1,cash = 10000},
+		dualpress =   {type = 2,give  = {dualpress = 1}, take = {white_xtc = 20, blue_xtc = 20, red_xtc = 20, orange_xtc = 20, singlepress = 1}},
+		triplepress = {type = 3,give  = {triplepress = 1}, take = {white_xtc2 = 50, blue_xtc2 = 50, red_xtc2 = 50, orange_xtc2 = 50, dualpress = 1}},
+		quadpress =   {type = 4,give  = {quadpress = 1}, take = {white_xtc3 = 50, blue_xtc3 = 50, red_xtc3 = 50, orange_xtc3 = 50, triplepress = 1}},
 	}
 }
 
@@ -143,15 +143,15 @@ RegisterServerEvent('md-drugs:server:buypress', function(loc, item)
 	end
 end)
 
-RegisterServerEvent('md-drugs:server:upgradepress', function(data)
+RegisterServerEvent('md-drugs:server:upgradepress', function(data, item)
   	local src = source
 	if timeOut(src, 'md-drugs:server:upgradepress') then return end
   	if not ps.checkDistance(src, xtcLocations.xtcpress[data].loc, 2.0) then
 		ps.notify(src, ps.lang('Catches.notIn'), "error")
 		return
   	end
-  	if not ps.craftItem(src, RecipeList.presses[data]) then
-		verifyHas(src, RecipeList.presses[data].take)
+  	if not ps.craftItem(src, RecipeList.presses[item]) then
+		verifyHas(src, RecipeList.presses[item].take)
 		return
 	end
 end)

version.txt

@@ -67,7 +67,7 @@ Build: 4.0.6
       - add the items ( located at the bottom of ox.md/qb.md) and images
       - add the server and client file named whippit.lua
 
-Newest Build: 4.0.7
+Build: 4.0.7
  - add checks in config for ps lib being installed and started before to 
    - reduce the questions i get
 
@@ -77,3 +77,5 @@ Newest Build: 4.0.7
 
 - if you are seeing this, you most likely already have ps_lib working properly
 
+Newest Build: 4.0.8
+ - fix: xtc not allowing you to upgrade a press