- fix :Meth
- fix bug of box not being targetable - fix minigame forced for ps_circle - fix items.lua
This commit is contained in:
1 parent
52c6eaec91
commit
d21e71e00a
4 files changed
+25
-14
No files matched your search
+9
-5
@@ -3,6 +3,7 @@ local tray = false
|
||||
local heated = false
|
||||
local active = false
|
||||
local trays = nil
|
||||
local smashing = false
|
||||
local locations = ps.callback('md-drugs:server:GetMethLocs')
|
||||
--- meth heist
|
||||
local startedmeth = false
|
||||
@@ -126,6 +127,7 @@ end
|
||||
|
||||
|
||||
local function SmashMeth(coords, offset, rotation)
|
||||
smashing = true
|
||||
local ver = ""
|
||||
local animDict, animName = "anim@amb@business@meth@meth_smash_weight_check@", "break_weigh_"..ver.."char02"
|
||||
ps.requestAnim(animDict, 500)
|
||||
@@ -158,6 +160,7 @@ local function SmashMeth(coords, offset, rotation)
|
||||
end
|
||||
RemoveAnimDict(animDict)
|
||||
FreezeEntityPosition(ped, false)
|
||||
smashing = false
|
||||
end
|
||||
|
||||
local function BagMeth(coords, offset, rotation)
|
||||
@@ -246,7 +249,7 @@ end
|
||||
|
||||
local function dials(coords)
|
||||
if amonia == true then
|
||||
if not ps.minigame('ps-circle', {amount = 2, speed = 8}) then
|
||||
if not minigame() then
|
||||
AddExplosion(coords.x, coords.y,coords.z, 49, 10, true, false, true)
|
||||
amonia = false
|
||||
active = false
|
||||
@@ -262,13 +265,17 @@ local function smash(coords, offset, rotation, buckets, k)
|
||||
DeleteObject(trays)
|
||||
local bucket = CreateObject("bkr_prop_meth_bigbag_03a", buckets.x, buckets.y, buckets.z, true, true, true)
|
||||
Freeze(bucket, true, buckets.w)
|
||||
SmashMeth(coords, offset, rotation)
|
||||
Wait(100)
|
||||
ps.entityTarget(bucket, {
|
||||
{
|
||||
name = 'bucket',
|
||||
icon = "fa-solid fa-sack-xmark",
|
||||
label = ps.lang('meth.targetBag'),
|
||||
canInteract = function()
|
||||
if active == false then return false end
|
||||
if not active then return false end
|
||||
if not smashing then return false end
|
||||
return true
|
||||
end,
|
||||
action = function()
|
||||
DeleteObject(bucket)
|
||||
@@ -281,8 +288,6 @@ local function smash(coords, offset, rotation, buckets, k)
|
||||
end,
|
||||
}
|
||||
})
|
||||
SmashMeth(coords, offset, rotation)
|
||||
Wait(100)
|
||||
end
|
||||
end
|
||||
|
||||
@@ -319,7 +324,6 @@ for k, v in pairs (locations.CookMeth) do
|
||||
if not amonia and not active then
|
||||
return true
|
||||
end
|
||||
|
||||
end,
|
||||
},
|
||||
{
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ author "mustache_dom"
|
||||
description "drugs by mustache dom"
|
||||
fx_version "cerulean"
|
||||
game "gta5"
|
||||
version '4.0.3'
|
||||
version '4.0.4'
|
||||
client_scripts {
|
||||
'client/functions.lua',
|
||||
'client/plantSpawns.lua',
|
||||
|
||||
@@ -1,5 +1,4 @@
|
||||
--md-drugs copy and paste below items to ox_inventory/data/items.lua
|
||||
```lua
|
||||
```
|
||||
['weed_skunk_seed'] = {
|
||||
label = 'Skunk Seed',
|
||||
weight = 200,
|
||||
@@ -82,7 +81,7 @@
|
||||
},
|
||||
},
|
||||
['weed_ogkush'] = {
|
||||
label = 'OG Kush 2g'
|
||||
label = 'OG Kush 2g',
|
||||
weight = 200,
|
||||
stack = true,
|
||||
close = false,
|
||||
@@ -91,7 +90,7 @@
|
||||
},
|
||||
},
|
||||
['weed_amnesia'] = {
|
||||
label = 'Amnesia 2g'
|
||||
label = 'Amnesia 2g',
|
||||
weight = 200,
|
||||
stack = true,
|
||||
close = false,
|
||||
@@ -100,14 +99,14 @@
|
||||
},
|
||||
},
|
||||
['weed_ak47'] = {
|
||||
label = 'AK47 2g'
|
||||
label = 'AK47 2g',
|
||||
weight = 200,
|
||||
stack = true,
|
||||
close = false,
|
||||
client = {
|
||||
image = "weed_baggy.png"
|
||||
},
|
||||
}
|
||||
},
|
||||
['coke'] = {
|
||||
label = 'Raw Cocaine',
|
||||
weight = 1000,
|
||||
|
||||
+10
-2
@@ -13,7 +13,7 @@ Build: 4.0.1
|
||||
- version.txt
|
||||
- client/heroin.lua
|
||||
|
||||
Newest Build: 4.0.2
|
||||
Build: 4.0.2
|
||||
- updated qb items
|
||||
- updated ox items
|
||||
- ABOVE IS JUST LABEL CHANGES AND IMAGE CHANGES NOT NECESSARY
|
||||
@@ -32,7 +32,7 @@ Newest Build: 4.0.2
|
||||
- client/heroin.lua
|
||||
|
||||
|
||||
Newest Build: 4.0.3
|
||||
Build: 4.0.3
|
||||
- updated weed client
|
||||
- updated ox and qb items fixing them sorry yall
|
||||
- updated images
|
||||
@@ -45,3 +45,11 @@ Newest Build: 4.0.3
|
||||
- fix saving location of pill presses in xtc
|
||||
- Adjust XTC item crafting
|
||||
- notify after check for heroin baking soda
|
||||
|
||||
Newest Build: 4.0.4
|
||||
- fix meth
|
||||
- `to update`
|
||||
- update version.txt
|
||||
- update version in fxmanifest to 4.0.4
|
||||
- update client/meth.lua
|
||||
|
||||
Reference in new issue
Block a user