From c3aaf674214c332d9158ef99a4ab490d1688c665 Mon Sep 17 00:00:00 2001 From: Mustache Dom <123716453+Mustachedom@users.noreply.github.com> Date: Sat, 24 Jan 2026 00:50:26 -0700 Subject: [PATCH] - update consumables --- client/consumables.lua | 1 + client/cornerselling.lua | 2 +- client/functions.lua | 7 ++ client/whippit.lua | 1 - server/consumables.lua | 258 ++++++++++++++++++++++----------------- shared/config.lua | 1 + 6 files changed, 156 insertions(+), 114 deletions(-) diff --git a/client/consumables.lua b/client/consumables.lua index 675ead1..21f2e57 100644 --- a/client/consumables.lua +++ b/client/consumables.lua @@ -1,6 +1,7 @@ Bridge.Callback.Register('md-drugs:client:consumedrugs', function(time, effect, anim, progresstext, status, item) + Bridge.Anim.RequestDict(anim.dict) if not progressbar(progresstext .. Bridge.Inventory.GetItemInfo(item).label.. "!", time, anim ) then return end for k, v in pairs (status) do if k == 'health' then diff --git a/client/cornerselling.lua b/client/cornerselling.lua index 2aed95b..d6e0a53 100644 --- a/client/cornerselling.lua +++ b/client/cornerselling.lua @@ -212,7 +212,7 @@ CreateThread(function() Bridge.Point.Register( 'MDDRUGNOSELLZONE'..k, v.loc, - (v.width or 10.0 + v.length or 10.0) / 2, + ((v.width or 10.0) + (v.length or 10.0)) / 2, nil, function() inZone = true diff --git a/client/functions.lua b/client/functions.lua index d40d515..2b41f83 100644 --- a/client/functions.lua +++ b/client/functions.lua @@ -305,12 +305,19 @@ else end function progressbar(text, time, emote, cancel) + if emote.prop then + if not emote.prop.model then + emote.prop = nil + end + end + print(json.encode(emote)) local success = Bridge.ProgressBar.Open({ duration = time or 5000, label = text or 'LAZY AF DEVS', canCancel = true, disable = cancel or Config.ProgressBar.Disables, anim = emote or Config.DefaultAnimation, + prop = emote and emote.prop or nil }) return success end diff --git a/client/whippit.lua b/client/whippit.lua index 7ad7335..4adb885 100644 --- a/client/whippit.lua +++ b/client/whippit.lua @@ -53,7 +53,6 @@ local function spawnShops() local menu = {} for item, price in pairs (GlobalState.MDDrugsRecipes.Whippit.shop) do local itemInfo = Bridge.Inventory.GetItemInfo(item) - Bridge.Prints.Debug(itemInfo) menu[#menu + 1] = { title = itemInfo.label, icon = itemInfo.image, diff --git a/server/consumables.lua b/server/consumables.lua index af436cb..c163202 100644 --- a/server/consumables.lua +++ b/server/consumables.lua @@ -25,132 +25,166 @@ Consumables.defaulttime = 4000 Consumables.defaultanim = 'pflag2' Consumables.defaultprogresstext = 'Consuming ' -- it will always show the label of the item being used after what you put here, make sure to keep the space at the end :) Consumables.defaultstatval = 0 - +local emotes = { + smoke = { + dict = "amb@world_human_aa_smoke@male@idle_a", + clip = "idle_a", + flag = 49, + prop = { + model = 'ng_proc_cigarette01a', + bone = 28422, + pos = {0.0, 0.0, 0.0}, + rot = {0.0, 0.0, 0.0} + } + }, + smell = { + dict = 'move_p_m_two_idles@generic', + clip = 'fidget_sniff_fingers', + }, + shoot_up = { + dict = "rcmpaparazzo1ig_4", + clip = "miranda_shooting_up", + prop = { + model = 'prop_syringe_01', + bone = 18905, + pos = {0.11, 0.03, 0.0}, + rot = {-124.0, 0.0, 0.0} + } + }, + eat = { + dict = "mp_player_inteat@burger", + clip = "mp_player_int_eat_burger", + }, + drink = { + dict = "mp_player_intdrink", + clip = "loop_bottle", + } +} local Consume = { -- meth -methbags = { time = 4000, effect = 'meth', anim = "smoke", progressbartext = "Injesting", +methbags = { time = 4000, effect = 'meth', anim = emotes.smoke, progressbartext = "Injesting", add = {health = -20, stress = -10, speed = 40, strength = 10, thirst = -30}}, -cokebaggy = { anim = 'smell', time = 1000, effect = 'coke', add = { stress = -10 }}, -cokebaggystagetwo = { anim = 'smell', time = 1000, effect = 'coke', add = { stress = -10 }}, -cokebaggystagethree = { anim = 'smell', time = 1000, effect = 'coke', add = { stress = -10 }}, +cokebaggy = { anim = emotes.smell, time = 4000, effect = 'coke', add = { stress = -10 }}, +cokebaggystagetwo = { anim = emotes.smell, time = 1000, effect = 'coke', add = { stress = -10 }}, +cokebaggystagethree = { anim = emotes.smell, time = 1000, effect = 'coke', add = { stress = -10 }}, -- heroin -heroin_ready = { anim = 'shootup', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -heroin_readystagetwo = { anim = 'shootup', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -heroin_readystagethree = { anim = 'shootup', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +heroin_ready = { anim = emotes.shoot_up, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +heroin_readystagetwo = { anim = emotes.shoot_up, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +heroin_readystagethree = { anim = emotes.shoot_up, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -- crack -baggedcracked = { anim = 'smell', time = 1000, effect = 'coke', add = { stress = -10 }}, -baggedcrackedstagetwo = { anim = 'smell', time = 1000, effect = 'coke', add = { stress = -10 }}, -baggedcrackedstagethree = { anim = 'smell', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +baggedcracked = { anim = emotes.smell, time = 1000, effect = 'coke', add = { stress = -10 }}, +baggedcrackedstagetwo = { anim = emotes.smell, time = 1000, effect = 'coke', add = { stress = -10 }}, +baggedcrackedstagethree = { anim = emotes.smell, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -- xtc -white_playboys = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_playboys2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_playboys3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_playboys4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_playboys = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_playboys2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_playboys3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_playboys4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_playboys = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10, hunger = 10 }}, -red_playboys2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_playboys3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_playboys4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_playboys = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_playboy2s = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_playboys3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_playboys4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_aliens = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_aliens2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_aliens3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_aliens4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_aliens = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_aliens2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_aliens3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_aliens4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_aliens = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_aliens3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_aliens2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_aliens4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_aliens = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_aliens2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_aliens3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_aliens4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_pl = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_pl2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_pl3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_pl4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_pl = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_pl2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_pl3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_pl4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_pl = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_pl2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_pl3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_pl4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_pl = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_pl2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_pl3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_pl4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_trolls = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_trolls2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_trolls3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_trolls4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_trolls = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_trolls2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_trolls3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_trolls4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_trolls = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_trolls2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_trolls3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_trolls4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_trolls = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_trolls2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_trolls3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_trolls4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_cats2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_cats3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_cats4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -white_cats = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_cats = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_cats3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_cats2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -blue_cats4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_cats = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_cats2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_cats3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -red_cats4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_cats = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_cats2 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_cats3 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -orange_cats4 = { anim = 'edible', time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_playboys = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_playboys2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_playboys3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_playboys4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_playboys = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_playboys2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_playboys3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_playboys4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_playboys = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10, hunger = 10 }}, +red_playboys2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_playboys3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_playboys4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_playboys = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_playboy2s = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_playboys3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_playboys4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_aliens = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_aliens2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_aliens3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_aliens4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_aliens = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_aliens2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_aliens3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_aliens4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_aliens = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_aliens3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_aliens2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_aliens4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_aliens = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_aliens2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_aliens3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_aliens4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_pl = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_pl2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_pl3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_pl4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_pl = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_pl2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_pl3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_pl4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_pl = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_pl2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_pl3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_pl4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_pl = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_pl2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_pl3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_pl4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_trolls = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_trolls2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_trolls3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_trolls4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_trolls = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_trolls2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_trolls3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_trolls4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_trolls = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_trolls2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_trolls3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_trolls4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_trolls = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_trolls2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_trolls3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_trolls4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_cats2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_cats3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_cats4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +white_cats = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_cats = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_cats3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_cats2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +blue_cats4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_cats = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_cats2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_cats3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +red_cats4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_cats = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_cats2 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_cats3 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, +orange_cats4 = { anim = emotes.eat, time = 1000, effect = 'ecstacy', add = { stress = -10 }}, -- weed -specialbrownie = { anim = 'edible', effect = 'alien', add = { hunger = 10, stress = -10 }}, -specialcookie = { anim = 'edible', effect = 'alien', add = { hunger = 10, stress = -10 }}, -specialchocolate = { anim = 'edible', effect = 'alien', add = { hunger = 10, stress = -10 }}, -specialmuffin = { anim = 'edible', effect = 'alien', add = { hunger = 10, stress = -10 }}, -blunt = { anim = 'smokeweed', effect = 'alien', add = { stress = -10 }}, -dextroblunts = { anim = 'smokeweed', effect = 'alien', add = { stress = -10 }}, -leanblunts = { anim = 'smokeweed', effect = 'alien', add = { stress = -10 }}, -chewyblunt = { anim = 'smokeweed', effect = 'alien', add = { stress = -10 }}, +specialbrownie = { anim = emotes.eat, effect = 'alien', add = { hunger = 10, stress = -10 }}, +specialcookie = { anim = emotes.eat, effect = 'alien', add = { hunger = 10, stress = -10 }}, +specialchocolate = { anim = emotes.eat, effect = 'alien', add = { hunger = 10, stress = -10 }}, +specialmuffin = { anim = emotes.eat, effect = 'alien', add = { hunger = 10, stress = -10 }}, +blunt = { anim = emotes.smoke, effect = 'alien', add = { stress = -10 }}, +dextroblunts = { anim = emotes.smoke, effect = 'alien', add = { stress = -10 }}, +leanblunts = { anim = emotes.smoke, effect = 'alien', add = { stress = -10 }}, +chewyblunt = { anim = emotes.smoke, effect = 'alien', add = { stress = -10 }}, -- lean -cupofdextro = { anim = 'cup', effect = 'alien', add = { stress = -10 }}, -cupoflean = { anim = 'cup', effect = 'alien', add = { stress = -10 }}, +cupofdextro = { anim = emotes.drink, effect = 'alien', add = { stress = -10 }}, +cupoflean = { anim = emotes.drink, effect = 'alien', add = { stress = -10 }}, -- lsd -smiley_tabs = { anim = 'edible', effect = 'trevor', add = { stress = -10 }}, -wildcherry_tabs = { anim = 'edible', effect = 'trevor', add = { stress = -10 }}, -yinyang_tabs = { anim = 'edible', effect = 'trevor', add = { stress = -10 }}, -pineapple_tabs = { anim = 'edible', effect = 'trevor', add = { stress = -10 }}, -bart_tabs = { anim = 'edible', effect = 'trevor', add = { stress = -10 }}, -gratefuldead_tabs = { anim = 'edible', effect = 'trevor', add = { stress = -10 }}, +smiley_tabs = { anim = emotes.eat, effect = 'trevor', add = { stress = -10 }}, +wildcherry_tabs = { anim = emotes.eat, effect = 'trevor', add = { stress = -10 }}, +yinyang_tabs = { anim = emotes.eat, effect = 'trevor', add = { stress = -10 }}, +pineapple_tabs = { anim = emotes.eat, effect = 'trevor', add = { stress = -10 }}, +bart_tabs = { anim = emotes.eat, effect = 'trevor', add = { stress = -10 }}, +gratefuldead_tabs = { anim = emotes.eat, effect = 'trevor', add = { stress = -10 }}, -- pharma -vicodin = { anim = 'pill', effect = 'none', add = { health = 20 }}, -adderal = { anim = 'pill', effect = 'none', add = { stress = -20 }}, -morphine = { anim = 'pill', effect = 'none', add = { health = 40 }}, -xanax = { anim = 'pill', effect = 'none', add = { stress = -40 }}, +vicodin = { anim = emotes.eat, effect = 'none', add = { health = 20 }}, +adderal = { anim = emotes.eat, effect = 'none', add = { stress = -20 }}, +morphine = { anim = emotes.eat, effect = 'none', add = { health = 40 }}, +xanax = { anim = emotes.eat, effect = 'none', add = { stress = -40 }}, } for k, v in pairs(Consume) do - Bridge.Callback.Register(k, function(source, item) + Bridge.Framework.RegisterUsableItem(k, function(source, item) if not Bridge.Inventory.HasItem(source, k, 1) then return end local time = v.time or Consumables.defaulttime local effect = v.effect or 0 diff --git a/shared/config.lua b/shared/config.lua index 8a196a4..0ea076a 100644 --- a/shared/config.lua +++ b/shared/config.lua @@ -1,5 +1,6 @@ Config = {} --Ignore. + Bridge = exports.community_bridge:Bridge() ----------------------------------- TierSystem levels ** ONLY IN USE IF CONFIG.TIERSYTEM IS TRUE