Version Bump

`2.0.08` - `2.0.09`

.gitattributes

@@ -0,0 +1,12 @@
+# VCS / CI noise
+.gitattributes     export-ignore
+.gitignore         export-ignore
+.github/**         export-ignore
+.gitmodules        export-ignore
+
+# Dev tooling/config
+.vscode/**         export-ignore
+*.code-workspace   export-ignore
+.editorconfig      export-ignore
+.eslintrc*         export-ignore
+.prettier*         export-ignore

.github/FUNDING.yml

@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: # Replace with a single Patreon username
+open_collective: # Replace with a single Open Collective username
+ko_fi: jixelpatterns
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: ['https://jimathy666.tebex.io/']

.github/workflows/notify-discord.yml

@@ -0,0 +1,18 @@
+name: Discord Commit Notifier
+
+on:
+  push:
+    branches:
+      - '*'
+
+jobs:
+  notify:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send commit payload to Discord Bot
+        env:
+          URL: http://${{ secrets.DISCORDBOT }}:3000/github-commits
+        run: |
+          curl -sS -X POST "$URL" \
+            -H 'Content-Type: application/json' \
+            --data-binary "@$GITHUB_EVENT_PATH"

.github/workflows/notify-release.yml

@@ -0,0 +1,71 @@
+name: Discord Release Notifier
+
+on:
+  # Manual or UI-published releases
+  release:
+    types: [published]
+
+  # Releases created by your tag-driven workflow
+  workflow_run:
+    workflows: ["Package & Release"]  # must match the 'name:' in release.yml
+    types: [completed]
+
+permissions:
+  contents: read
+
+jobs:
+  # 1) Handle manual / UI / non-workflow-created releases
+  notify-from-release:
+    if: github.event_name == 'release' && github.event.action == 'published'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Send release payload to Discord Bot
+        env:
+          URL: http://${{ secrets.DISCORDBOT }}:3000/github-releases
+        run: |
+          curl -sS -X POST "$URL" \
+            -H 'Content-Type: application/json' \
+            --data-binary "@$GITHUB_EVENT_PATH"
+
+  # 2) Handle releases created by your 'Package & Release' workflow
+  #    (which won’t trigger `on: release` when using GITHUB_TOKEN)
+  notify-from-workflow-run:
+    if: >
+      github.event_name == 'workflow_run' &&
+      github.event.workflow_run.conclusion == 'success'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install jq
+        run: sudo apt-get update && sudo apt-get install -y jq
+
+      - name: Fetch release JSON by tag
+        env:
+          GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run: |
+          set -euo pipefail
+          OWNER="${GITHUB_REPOSITORY%/*}"
+          REPO="${GITHUB_REPOSITORY#*/}"
+          TAG="${{ github.event.workflow_run.head_branch }}"
+          # head_branch is the tag name for a tag push workflow_run
+          curl -fsSL -H "Authorization: Bearer $GH_TOKEN" \
+               -H "Accept: application/vnd.github+json" \
+               "https://api.github.com/repos/$OWNER/$REPO/releases/tags/$TAG" \
+               > release.json
+
+      - name: Wrap as 'release' event payload & notify bot
+        env:
+          URL: http://${{ secrets.DISCORDBOT }}:3000/github-releases
+        run: |
+          set -euo pipefail
+          jq -n --slurpfile rel release.json \
+                --arg repo "$GITHUB_REPOSITORY" \
+                --arg repo_url "https://github.com/$GITHUB_REPOSITORY" \
+                --arg action "published" '
+            { action: $action,
+              repository: { full_name: $repo, html_url: $repo_url },
+              release: $rel[0],
+              sender: { login: "github-actions[bot]" } }' > payload.json
+
+          curl -sS -X POST "$URL" \
+            -H 'Content-Type: application/json' \
+            --data-binary "@payload.json"

.github/workflows/release.yml

@@ -0,0 +1,88 @@
+name: Package & Release
+
+on:
+  push:
+    tags:
+      - "v*"
+      - "*.*.*"
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout (full history)
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Derive vars
+        id: vars
+        shell: bash
+        run: |
+          echo "name=${GITHUB_REPOSITORY##*/}" >> $GITHUB_OUTPUT              # e.g. jim_bridge
+          echo "version=${GITHUB_REF_NAME#v}" >> $GITHUB_OUTPUT               # strip leading v
+
+      - name: Build zip with folder prefix
+        shell: bash
+        run: |
+          NAME='${{ steps.vars.outputs.name }}'
+          VER='${{ steps.vars.outputs.version }}'
+          git archive --format=zip --prefix="${NAME}/" -o "${NAME}-${VER}.zip" "$GITHUB_REF_NAME"
+          ls -lh "${NAME}-${VER}.zip"
+
+      # --- Patch notes generation (commit titles + links) -------------------
+      - name: Find previous tag (SemVer aware)
+        id: prev
+        shell: bash
+        run: |
+          CUR="${GITHUB_REF_NAME}"
+          # Sort tags by version desc, drop the current, take the next newest
+          PREV=$(git tag --sort=-v:refname | grep -v -x "$CUR" | head -n 1 || true)
+          echo "prev=$PREV" >> $GITHUB_OUTPUT
+          echo "Previous tag: ${PREV:-<none>}"
+
+      - name: Generate RELEASE_NOTES.md from commits
+        shell: bash
+        run: |
+          REPO="${{ github.repository }}"
+          CUR="${GITHUB_REF_NAME}"
+          PREV='${{ steps.prev.outputs.prev }}'
+
+          if [ -n "$PREV" ]; then
+            RANGE="$PREV..$CUR"
+            HEADER="## Changes in $CUR"
+          else
+            # First release: include all commits
+            ROOT=$(git rev-list --max-parents=0 HEAD | tail -n 1)
+            RANGE="$ROOT..$CUR"
+            HEADER="## Changes"
+          fi
+
+          {
+            echo "$HEADER"
+            echo
+            # Oldest → newest, subject only, skip merge commits
+            # Escape '[' and ']' so markdown doesn't break on rare titles
+            git log --reverse --no-merges --pretty=format:'- ['%h'] - %s' "$RANGE" \
+              | perl -pe 's/([\[\]])/\\$1/g'
+          } > RELEASE_NOTES.md
+
+          echo "--- RELEASE_NOTES.md ---"
+          cat RELEASE_NOTES.md
+          echo "------------------------"
+
+      - name: Create / Update GitHub Release
+        uses: softprops/action-gh-release@v2
+        with:
+          tag_name: ${{ github.ref_name }}
+          name: ${{ github.ref_name }}
+          files: |
+            *.zip
+          body_path: RELEASE_NOTES.md   # attach our generated notes
+          # If you wanted GitHub's auto notes instead, set:
+          # generate_release_notes: true
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

README.md

@@ -1,73 +1,25 @@
-# jim-consumables
+# Jim-Consumables
-Consumables script for QBCore
+
+## FiveM MultiFrameork Consumables script
 
 # What is this?
-This script is designed as a replacement/override for food and drink consumables in qb-smallresources
+This script WAS designed as a replacement/override for food and drink consumables in `qb-smallresources`
 
-It's main purpose was to make it possible to not stand up while sitting due to lazy events such as ClearPedTasks in most scripts, this one is designed to cancel the animation you have chosen, not all animations. This includes progressbar.
+It's main purpose was to make it so players did not stand up while sitting with my scripts due to lazy events such as ClearPedTasks in progressbar and dpemotes, this one is designed to cancel the animation you have chosen, not ALL animations.
 
-# Installation
+Users requested I readd the progressbar but it ended up being a config option to enable it
 
-```
+Though if your players are cancelling all animations when consuming, it's recommended to set `Config.UseProgBar` to `false` to get this effect.
-Please stop asking to how add a progressbar...PLEASE
 
-This script was designed to not need one, because of how it cancels all the player animations instantly
+# THIS DOESN'T USE DPEMOTES OR RPEMOTES OR SCULLYS EMOTEMENU
 
-You can manage without a progressbar.
+---
-```
-This script is recommended to be ran last/at the bottom of your server.cfg because this is intended to take control of items, if ran too early the original script may override this one.
 
-It already takes control of default qbcore food and drink, but you would probably want to add more.
+# Installation and Previews:
+## [JixelPatterns GitBook Documentation](https://jixelpatterns.gitbook.io/docs)
 
-To add an item, you only need to add a new item table in the Config.Consumables like this:
+### If you need support I have a discord server available, it helps me keep track of issues and give better support.
-```lua
+## [JixelPatterns Discord](https://discord.gg/9pCDHmjYwd)
-["heartstopper"] = {
-	emote = "burger",			-- Select an emote from below, it has to be in here
-	time = math.random(5000, 6000),		-- Amount of time it takes to consume the item
-	stress = math.random(1, 2),		-- Amount of stress relief, can be 0
-	heal = 0,				-- Set amount to heal by after consuming
-	armor = 5,				-- Amount of armor to add
-	type = "food",				-- Type: "alcohol" / "drink" / "food"
-	stats = {
-		screen = "rampage",		-- The screen effect to be played when after consuming the item
-		effect = "heal", 		-- The status effect given by the item, "heal" / "stamina"
-		time = 10000,			-- How long the effect should last (if not added it will default to 10000)
-		amount = 2,			-- How much the value is changed by per second
-		hunger = math.random(10,20),	-- The hunger/thirst stats of the item, if not found in the items.lua
-		thirst = math.random(10,20),	-- The hunger/thirst stats of the item, if not found in the items.lua
-	},
-},
-```
-Consuming an item can also manually activate screen effects
 
-The example above uses `rampage` as this is what the effect is named after, you can use it for any item you think best
+### If you think I did a good job here, consider donating as it keeps by lights on and my cat round:
-```lua
+## [JixelPatterns Kofi](https://ko-fi.com/jixelpatterns)
---The current list of screen effects are:
-	"turbo"
-	"focus"
-	"rampage"
-	"weed"
-	"trevor"
-	"nightvision"
-	"thermal"
-```
-
-## PS-Buffs Support
-This scripts can be expanded with ps-buffs (https://github.com/Project-Sloth/ps-buffs)
-
-If this script is enabled it will automatically try to use their system to apply buffs:
-
-```lua
---The extra buffs that can be set include:
-	"heal"			-- Health recovery buff
-	"stamina"		-- Stamina recovery buff
-	"swimming"		-- Swimming speed buff
-	"stress"		-- Stress recovery buff
-	"armor"			-- Armour recovery buff
-	"hacking"		-- Hacking effect
-	"intelligence"		-- Intelligence effect
-	"luck"			-- Luck effect
-	"strength"		-- Strength effect
-```
-
-This script supports dpemotes style emotes, so if you have some that you want to be triggered when eating or drinking drop it in the Config.Emotes section.

client/client.lua

@@ -1,54 +1,178 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+local alcoholCount, drugCount, consuming, cancelled = 0, 0, false, false
+Consumables, Emotes = {}, {}
 
-local alcoholCount = 0
+onPlayerLoaded(function()
-local drugCount = 0
+    -- Wait until statebag exists, then trigger local handler
+    CreateThread(function()
+        while not GlobalState.jimConsumableItems do Wait(100) end
+		local newConsumables = GlobalState.jimConsumableItems
+        for k in pairsByKeys(newConsumables) do
+            if not Consumables[k] then
+                debugPrint("^5Statebag^7: ^2New ^3Consumable ^2Info synced^7: ^6"..k.."^7")
+            end
+        end
+        while not GlobalState.jimConsumableEmotes do Wait(100) end
+        local newEmotes = GlobalState.jimConsumableEmotes
+        for k in pairsByKeys(newEmotes) do
+            if not Emotes[k] then
+                debugPrint("^5Statebag^7: ^2New ^3Emote ^2Info synced^7: ^6"..k.."^7")
+            end
+        end
+        Consumables = newConsumables
+        Emotes = newEmotes
+        debugPrint("^5Statebag^7: ^2Synced ^6"..countTable(Consumables).." ^2Items and ^6"..countTable(Emotes).." ^2Emotes^7")
+    end)
+end, true)
 
---Convert Prop Model Names to Model HashKeys now to be more optimized when loading later
+-- Handlers to recieve global statebag data from the server
-for k in pairs(Config.Emotes) do
+AddStateBagChangeHandler("jimConsumableItems", nil, function(bagName, key, value, _unused)
-    if Config.Emotes[k].AnimationOptions.Prop then
+    if type(value) == "table" then
-        Config.Emotes[k].AnimationOptions.Prop = GetHashKey(Config.Emotes[k].AnimationOptions.Prop)
+        local newItemCount = 0
-        if Config.Emotes[k].AnimationOptions.SecondProp then
+        for k in pairsByKeys(value) do
-            Config.Emotes[k].AnimationOptions.SecondProp = GetHashKey(Config.Emotes[k].AnimationOptions.SecondProp)
+            if not Consumables[k] then
+                newItemCount += 1
+                debugPrint("^5Statebag^7: ^2New ^3Consumable ^2Info synced^7: ^6"..k.."^7")
+            end
+        end
+        Consumables = value
+        debugPrint("^5Statebag^7: ^2Synced ^6"..newItemCount.." ^2new Consumables^7")
+    end
+end)
+
+AddStateBagChangeHandler("jimConsumableEmotes", nil, function(bagName, key, value, _unused)
+    if type(value) == "table" then
+        local newEmoteCount = 0
+        for k in pairsByKeys(value) do
+            if not Emotes[k] then
+                newEmoteCount += 1
+                debugPrint("^5Statebag^7: ^2New ^3Emote ^2Info synced^7: ^6"..k.."^7")
+            end
+        end
+        Emotes = value
+        debugPrint("^5Statebag^7: ^2Synced ^6"..newEmoteCount.." ^2new Emotes^7")
+    end
+end)
+
+RegisterNetEvent(getScript()..':Consume', function(itemName)
+    if not Consumables[itemName] then return end
+    local consumable = Consumables[itemName]
+    if not hasItem(itemName, 1) then
+        print("^5Debug^7: ^1Error^7: ^2Item not found in inventory^7, ^2stopping^7..")
+    end
+    local requiredItem = consumable and consumable.requiredItem or nil
+
+    if requiredItem then
+        if not hasItem(requiredItem, 1) then
+            triggerNotify(nil, "You need a "..getItemLabel(requiredItem), "error")
+            return
+        else
+        --    if requiredItem == "lighter" then breakTool({ item = "lighter", damage = math.random(0, 1) }) end
         end
     end
-end
 
-local consuming = false
+    debugPrint("^5Debug^7: ^3Consume^7: ^2Starting event, locking inventory and grabbing data^7..")
-local cancelled = false
+    tempLockInv(true)
+    local Player = PlayerPedId()
+    local pedCoords = GetEntityCoords(Player)
+	local emote = Emotes[consumable.emote] or Emotes["crisps"]
+    if isAnimal then        --- Animal ped adjustments
+        local presets = {
+            ["default"] = {
+                propPlacement = { 0.0, 0.25, -0.04, 0.0, 0.0, 0.0, },
+                propPlacement2 = { 0.0, 0.25, -0.02, 0.0, 0.0, 0.0, }
+            },
+            [`a_c_rabbit_01`] = {
+                propPlacement = { 0.0, 0.37, -0.15, 0.0, 0.0, 0.0, },
+                propPlacement2 = { 0.0, 0.37, -0.13, 0.0, 0.0, 0.0, }
+            },
+            [`a_c_rat`] = {
+                propPlacement = { 0.0, 0.25, -0.04, 0.0, 0.0, 0.0, },
+                propPlacement2 = { 0.0, 0.25, -0.02, 0.0, 0.0, 0.0, }
+            },
+            [`a_c_crow`] = {
+                propPlacement = { 0.0, 0.25, 0.02, 0.0, 0.0, 0.0, },
+                propPlacement2 = { 0.0, 0.25, 0.04, 0.0, 0.0, 0.0, }
+            },
+        }
 
-RegisterNetEvent('jim-consumables:Consume', function(itemName)
+        local model = GetEntityModel(Player)
-    if Config.Debug then print("^5Debug^7: ^3Consume^7: ^2Starting event, locking inventory and grabbing data^7..") end
+        local isCat = (isCat() or model == `ft-raccoon`) and (model ~= `ft-sphynx`)
-    LocalPlayer.state:set("inv_busy", true, true) TriggerEvent('inventory:client:busy:status', true) TriggerEvent('canUseInventoryAndHotbar:toggle', false)
+        local isDog, bigDog = isDog()
-	local Player = PlayerPedId()
+        if isDog and model == `a_c_coyote` then isDog = false end
-	local emote = Config.Emotes[Config.Consumables[itemName].emote]
+        local isCoyote = (model == `ft-sphynx` or model == `a_c_coyote`)
-	local animDict = tostring(emote[1])
+        if model == `ft-capmonkey2` then isDog = true end
-	local anim = tostring(emote[2])
+
+        local propPlacement, propPlacement2 = { 0.0, 0.37, -0.19, 0.0, 0.0, 0.0, }, { 0.0, 0.37, -0.17, 0.0, 0.0, 0.0, }
+        if isDog then
+            if bigDog or isCoyote then
+                propPlacement = { 0.0, 0.53, -0.39, 0.0, 0.0, 0.0, } propPlacement2 = { 0.0, 0.53, -0.37, 0.0, 0.0, 0.0, }
+            else
+                propPlacement = { 0.0, 0.33, -0.28, 0.0, 0.0, 0.0, } propPlacement2 = { 0.0, 0.33, -0.26, 0.0, 0.0, 0.0, }
+            end
+        end
+        if not isCat and not isDog then
+            propPlacement = presets[model] and presets[model].propPlacement or presets["default"].propPlacement
+            propPlacement2 = presets[model] and presets[model].propPlacement2 or  presets["default"].propPlacement
+        end
+
+        emote = {
+            "creatures@pug@move", "nill", "",
+            AnimationOptions = {
+                EmoteLoop = true,
+                Prop = "v_res_tt_bowl",
+                PropBone = 64081,
+                PropPlacement = propPlacement,
+                SecondProp = Emotes[consumable.emote].AnimationOptions.Prop or nil,
+                SecondPropBone = Emotes[consumable.emote].AnimationOptions.Prop and 64081 or nil,
+                SecondPropPlacement = Emotes[consumable.emote].AnimationOptions.Prop and propPlacement2 or nil,
+            },
+        }
+    end
+
+	local animDict, anim = tostring(emote[1]), tostring(emote[2])
 	local model, model2, bone, bone2, drugeffect, stress
 	local P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12 = table.unpack({0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}) -- Default placement coord cariable
-	if emote.AnimationOptions.Prop then
+	local type = consumable.type or ""
+    local string = "Using "
+    local canRun = consumable.canRun
+    local stats = consumable.stats
+
+    local time, heal, armor, needStats = GenerateRandomValues({
+        time = consumable.time or { 5000, 6000 },
+        heal = consumable.heal or 0,
+        armor = consumable.armor or 0,
+        hunger = consumable.stats and consumable.stats.hunger or 0,
+        thirst = consumable.stats and consumable.stats.thirst or 0,
+        stress = consumable.stress or 0,
+    })
+
+    if emote.AnimationOptions.Prop then
 		model = emote.AnimationOptions.Prop
-		bone = GetPedBoneIndex(PlayerPedId(), emote.AnimationOptions.PropBone)
+		bone = GetPedBoneIndex(Player, emote.AnimationOptions.PropBone)
 		P1, P2, P3, P4, P5, P6 = table.unpack(emote.AnimationOptions.PropPlacement)
         if emote.AnimationOptions.SecondProp then
             model2 = emote.AnimationOptions.SecondProp
-            bone2 = GetPedBoneIndex(PlayerPedId(), emote.AnimationOptions.SecondPropBone)
+            bone2 = GetPedBoneIndex(Player, emote.AnimationOptions.SecondPropBone)
             P7, P8, P9, P10, P11, P12 = table.unpack(emote.AnimationOptions.SecondPropPlacement)
         end
-	end
+    end
-	local time = Config.Consumables[itemName].time or math.random(5000, 6000)
+
-	local type = Config.Consumables[itemName].type or "food"
+    if type == "drink" or type == "alcohol" then
-	local stress = Config.Consumables[itemName].stress or 0
+        string = "Drinking "
-	local heal = Config.Consumables[itemName].heal or 0
+    elseif type == "food" then
-	local armor = Config.Consumables[itemName].armor or 0
+        string = "Eating "
-	if type == "drink" or type == "alcohol" then string = "Drinking " end
+    elseif type == "smoke" then
-	if type == "food" then string = "Eating " end
+        string = "Smoking "
-	if type == "drug" then string = "Using " end
+    elseif type == "pack" then
-	if consuming then
+        string = "Opening "
-		cancelled = true
+    end
-        if Config.Debug then print("^5Debug^7: ^3Consume^7: ^2Event already started^7, ^1Cancelling^7.") end
+
-        LocalPlayer.state:set("inv_busy", false, true)
+    if consuming then
+        cancelled = true
+        debugPrint("^5Debug^7: ^3Consume^7: ^2Event already started^7, ^1Cancelling^7.")
+        tempLockInv(false)
         if Config.UseProgbar then
-            TriggerEvent("progressbar:client:cancel")
+            stopProgressBar()
         else
             triggerNotify(nil, "Stopped "..string, "error")
         end
@@ -56,149 +180,265 @@ RegisterNetEvent('jim-consumables:Consume', function(itemName)
 		return
 	end
 	--Emote Stuff
-    if Config.Debug then print("^5Debug^7: ^3Consume^7: ^2Grabbing Emote Animation Options^7...") end
+    debugPrint("^5Debug^7: ^3Consume^7: ^2Grabbing Emote Animation Options^7...")
-	if emote.AnimationOptions then
+    local InVehicle = IsPedInAnyVehicle(Player, true)
-		if emote.AnimationOptions.EmoteLoop then MovementType = 1
+    debugPrint("^5Debug^7: ^3Consume^7: ^2Checking if player is in a vehicle^7 - ^6"..tostring(InVehicle).."^7")
-		if emote.AnimationOptions.EmoteMoving then MovementType = 51
-	end
-		elseif emote.AnimationOptions.EmoteMoving then MovementType = 51
-		elseif emote.AnimationOptions.EmoteMoving == false then	MovementType = 0
-		elseif emote.AnimationOptions.EmoteStuck then MovementType = 50
-	end
-	else MovementType = 0 end
-    if Config.Debug then print("^5Debug^7: ^3Consume^7: ^2Checking if player is in a vehicle^7...") end
-	local InVehicle = IsPedInAnyVehicle(PlayerPedId(), true)
-	if InVehicle == 1 then MovementType = 51 end
-	--Load and Start animation
-    if Config.Debug then print("^5Debug^7: ^3Consume^7: ^2Playing Animation^7...") end
-	loadAnimDict(animDict)
-	TaskPlayAnim(PlayerPedId(), animDict, anim, 1.0, 1.0, -1, MovementType, 0, 0, 0, 0)
 
-    if Config.UseProgbar then
+    MovementType = 0 -- Default movement type
-        QBCore.Functions.Progressbar('jimmy_consume_', string..QBCore.Shared.Items[itemName].label.."..", time, false, false, {disableMovement = false,disableCarMovement = false,disableMouse = false,disableCombat = true,}, {}, {}, {}, function() end, function() end, itemName)
+
+    if InVehicle == 1 then
+        MovementType = 51
+    elseif emote.AnimationOptions then
+        if emote.AnimationOptions.EmoteMoving then
+            MovementType = 51
+        elseif emote.AnimationOptions.EmoteLoop then
+            MovementType = 1
+        elseif emote.AnimationOptions.EmoteStuck then
+            MovementType = emote.AnimationOptions.EmoteMoving and 50 or 2
+        elseif emote.AnimationOptions.EmoteMoving == false then
+            MovementType = 0
+        end
+
+    end
+	--Load and Start animation
+    debugPrint("^5Debug^7: ^3Consume^7: ^2Playing Animation^7...")
+	if not (GetPedType(Player) == 28)then
+        playAnim(animDict, anim, -1, MovementType)
+    end
+    debugPrint("^5Debug^7: ^3Consume^7: ^2Player Movement Flag^7 - ^6"..json.encode(MovementType).." ^7")
+    if Config.Main.UseProgbar then
+        CreateThread(function()
+            if progressBar({
+                time = time,
+                label = string..getItemLabel(itemName).."..",
+                dead = false,
+                disableMovement = false,
+                disableCombat = true,
+                cancel = false
+            }) then
+                consuming = false
+            else
+                consuming = false
+            end
+        end)
     else
-        triggerNotify(nil, string..QBCore.Shared.Items[itemName].label.."..", "success")
+        triggerNotify(nil, string..getItemLabel(itemName).."..", "success")
     end
 
 	consuming = true
+
     CreateThread(function()
         --Prop Spawning
-        if model and IsModelValid(model) == 1 then
+        if model then
-            if Config.Debug then print("^5Debug^7: ^3PropSpawn^7: ^2Spawning consumable prop^7.") end
+            if IsModelValid(model) == 1 then
-                attachProp = makeProp({ prop = model, coords = vector4(0.0,0.0,0.0,0.0)}, 1, 1)
+                debugPrint("^5Debug^7: ^3PropSpawn^7: ^2Spawning consumable prop^7...")
-                AttachEntityToEntity(attachProp, PlayerPedId(), bone, P1, P2, P3, P4, P5, P6, true, true, false, true, 1, true)
+                attachProp = makeProp({ prop = model, coords = vec4(pedCoords.x, pedCoords.y, pedCoords.z, 0.0)}, 1, 1, true)
-                if model2 and IsModelValid(model2) == 1 then
+                AttachEntityToEntity(attachProp, Player, bone, P1, P2, P3, P4, P5, P6, true, true, false, true, 1, true)
-                    attachProp2 = makeProp({ prop = model2, coords = vector4(0.0,0.0,0.0,0.0)}, 1, 1)
+                if model2 then
-                    AttachEntityToEntity(attachProp2, PlayerPedId(), bone2, P7, P8, P9, P10, P11, P12, true, true, false, true, 1, true)
+                    if IsModelValid(model2) == 1 then
-                else print("^5Debug^7: ^3Consume^7: ^2Second prop model isn't valid/found^7.") end
+                        attachProp2 = makeProp({ prop = model2, coords = vec4(pedCoords.x, pedCoords.y, pedCoords.z, 0.0)}, 1, 1)
+                        AttachEntityToEntity(attachProp2, Player, bone2, P7, P8, P9, P10, P11, P12, true, true, false, true, 1, true)
+                    else
+                        print("^5Debug^7: ^3PropSpawn^7: ^2Second prop model isn't valid/found^7.")
+                    end
+                end
                 while consuming do Wait(50) end
-                if DoesEntityExist(attachProp) then destroyProp(attachProp) attachProp = nil end
+                if DoesEntityExist(attachProp) then
-                if DoesEntityExist(attachProp2) then destroyProp(attachProp2) attackProp = nil end
+                    destroyProp(attachProp)
-            else print("^5Debug^7: ^3PropSpawnstop^7: ^2Prop model isn't valid/found^7.") end
+                    attachProp = nil
-        end)
+                end
+                if DoesEntityExist(attachProp2) then
+                    destroyProp(attachProp2)
+                    attachProp2 = nil
+                end
+            else
+                print("^5Debug^7: ^3PropSpawn^7: ^2Prop model isn't valid/found^7.")
+            end
+        end
+    end)
+
 	while consuming do
-		if time <= 0 then consuming = false end
+        if debugMode then
-        if not Config.Consumables[itemName].canRun then
+            drawText(nil, {
-            if IsControlJustPressed(0, 21) then
+                "Time: "..tostring(time),
-                consuming = false
+                "Type: "..(type or ""),
-                cancelled = true
+                "Hunger: "..(needStats.hunger or 0).."%",
-                LocalPlayer.state:set("inv_busy", false, true)
+                "Thirst: "..(needStats.thirst or 0).."%",
-                if Config.UseProgbar then
+                "Stress: "..(needStats.stress or 0).."%",
-                    Wait(10)
+                "Heal: "..(heal or 0).."%",
-                    TriggerEvent("progressbar:client:cancel")
+                "Armour: "..(armor or 0).."%",
-                else
+            }, nil, nil)
-                    triggerNotify(nil, "Cancelled "..string, "error")
+        end
+        makeInstructionalButtons({
+            { keys = { 194 }, text = "Stop Consuming" },
+        })
+        if time <= 0 then
+            consuming = false
+        end
+        if (IsControlJustPressed(0, 21) and not canRun) or IsPedRagdoll(Player) or IsControlJustPressed(0, 177) then
+            consuming = false
+            cancelled = true
+            tempLockInv(false)
+            hideText()
+            if Config.Main.UseProgbar then
+                stopProgressBar()
+            else
+                triggerNotify(nil, "Cancelled "..string, "error")
+            end
+            TriggerServerEvent(getScript()..":server:stopConsume")
+        end
+        Wait(0)
+        time -= 12
+	end
+	StopEntityAnim(Player, anim, animDict, 1.0)
+    unloadAnimDict(animDict)
+
+	if not cancelled then
+        hideText()
+
+        TriggerServerEvent(getScript()..":server:finishConsume", needStats)
+
+		if heal and heal ~= 0 then
+            debugPrint("^5Debug^7: ^3Consume^7: ^2Healing player by^7: ^6"..heal)
+            SetEntityHealth(Player, GetEntityHealth(Player) + heal)
+        end
+		if armor and armor ~= 0 then
+            debugPrint("^5Debug^7: ^3Consume^7: ^2Adding ^6"..armor.." ^2armour^7.")
+            TriggerServerEvent('hospital:server:SetArmor', (GetPedArmour(Player) + armor)) SetPedArmour(Player, (GetPedArmour(Player) + armor))
+        end
+		if type == "alcohol" then
+            if checkExportExists("jim_bridge", "addAlcoholCount") then
+                exports.jim_bridge:addAlcoholCount(1, stats.canOD)
+            else
+                alcoholCount = alcoholCount + 1
+                debugPrint("^5Debug^7: ^3Consume^7: ^2Current ^4alcoholCount^7: ^6"..alcoholCount)
+                if alcoholCount > 1 and alcoholCount <= 4 then
+                    TriggerEvent("evidence:client:SetStatus", "alcohol", 200)
+                elseif alcoholCount >= 4 then
+                    TriggerEvent("evidence:client:SetStatus", "heavyalcohol", 200)
+                    CreateThread(function()
+                        AlienEffect()
+                    end)
+                end
+
+                if stats.canOD and alcoholCount >= 5 then
+                    SetEntityHealth(Player, GetEntityHealth(Player) - math.random(5, 10))
                 end
             end
         end
-        Wait(10)
+		if type == "drug" then
-        time -= 10
+            if checkExportExists("jim_bridge", "addDrugCount") then
-	end
+                exports.jim_bridge:addDrugCount(1, stats.canOD or false)
-	StopEntityAnim(PlayerPedId(), anim, animDict, 1.0)
+            else
-    unloadAnimDict(animDict)
+                drugCount = drugCount + 1
-	if not cancelled then
+                debugPrint("^5Debug^7: ^3Consume^7: ^2Current ^4drugCount^7: ^6"..drugCount)
-        toggleItem(false, itemName, 1)
+                if drugCount > 3 and drugCount < 7 then
-        if QBCore.Shared.Items[itemName].thirst then TriggerServerEvent("jim-consumables:server:addThirst", QBCore.Functions.GetPlayerData().metadata["thirst"] + QBCore.Shared.Items[itemName].thirst) end
+
-        if QBCore.Shared.Items[itemName].hunger then TriggerServerEvent("jim-consumables:server:addHunger", QBCore.Functions.GetPlayerData().metadata["hunger"] + QBCore.Shared.Items[itemName].hunger) end
+                elseif drugCount >= 7 then
-		if not QBCore.Shared.Items[itemName].thirst and not QBCore.Shared.Items[itemName].hunger then
+                    CreateThread(function()
-			local hunger = 0
+                        AlienEffect()
-			local thirst = 0
+                    end)
-            if Config.Consumables[itemName].stats then
+                end
-                if Config.Consumables[itemName].stats.hunger then hunger = Config.Consumables[itemName].stats.hunger end
+                if stats.canOD and drugCount >= 4 then
-                TriggerServerEvent("jim-consumables:server:addHunger", QBCore.Functions.GetPlayerData().metadata["hunger"] + hunger)
+                    SetEntityHealth(Player, GetEntityHealth(Player) - math.random(5, 10))
-                if Config.Consumables[itemName].stats.thirst then thirst = Config.Consumables[itemName].stats.thirst end
+                end
-                TriggerServerEvent("jim-consumables:server:addThirst", QBCore.Functions.GetPlayerData().metadata["thirst"] + thirst)
-            end
-		end
-        if stress and stress ~= 0 then
-            if Config.Debug then print("^5Debug^7: ^3Consume^7: ^2Reliving ^6"..stress.." ^2stress^7.") end
-            TriggerServerEvent('hud:server:RelieveStress', stress)
-        end
-		if heal and heal ~= 0 then
-            if Config.Debug then print("^5Debug^7: ^3Consume^7: ^2Healing player by^7: ^6"..heal) end
-            SetEntityHealth(PlayerPedId(), GetEntityHealth(PlayerPedId()) + heal)
-        end
-		if armor and armor ~= 0 then
-            if Config.Debug then print("^5Debug^7: ^3Consume^7: ^2Adding ^6"..armor.." ^2armour^7.") end
-            TriggerServerEvent('hospital:server:SetArmor', (GetPedArmour(PlayerPedId()) + armor)) SetPedArmour(PlayerPedId(), (GetPedArmour(PlayerPedId()) + armor))
-        end
-		if type == "alcohol" then
-            if Config.Debug then print("^5Debug^7: ^3Consume^7: ^2Current ^4alcoholCount^7: ^6"..(alcoholCount + 1)) end
-			alcoholCount = alcoholCount + 1
-			if alcoholCount > 1 and alcoholCount < 4 then
-				TriggerEvent("evidence:client:SetStatus", "alcohol", 200)
-			elseif alcoholCount >= 4 then
-				TriggerEvent("evidence:client:SetStatus", "heavyalcohol", 200)
-                CreateThread(function() AlienEffect() end) -- Used as overdosing/too drunk effect
             end
         end
-        stats = Config.Consumables[itemName].stats or nil
+        if stats then
-        if Config.Consumables[itemName].stats then
             if stats.screen then -- Screen effect activation
-                if stats.screen == "turbo" then CreateThread(function() TurboEffect() end) end
+                debugPrint(stats.screen)
-                if stats.screen == "focus" then CreateThread(function() FocusEffect() end) end
+                local statFunctions = {
-                if stats.screen == "rampage" then CreateThread(function() RampageEffect() end) end
+                    ["turbo"] = TurboEffect,
-                if stats.screen == "weed" then CreateThread(function() WeedEffect() end) end
+                    ["focus"] = FocusEffect,
-                if stats.screen == "trevor" then CreateThread(function() TrevorEffect() end) end
+                    ["rampage"] = RampageEffect,
-                if stats.screen == "nightvision" then CreateThread(function() NightVisionEffect() end) end
+                    ["weed"] = WeedEffect,
-                if stats.screen == "thermal" then CreateThread(function() ThermalEffect() end) end
+                    ["trevor"] = TrevorEffect,
+                    ["nightvision"] = NightVisionEffect,
+                    ["thermal"] = ThermalEffect,
+                }
+                if statFunctions[stats.screen] then
+                    CreateThread(function()
+                        statFunctions[stats.screen]()
+                    end)
+                end
             end
 			if stats.canOD then
-                if Config.Debug then print("^5Debug^7: ^3Consume^7: ^2Current ^4drugCount^7: ^6"..(drugCount + 1)) end
+				if drugCount >= 4 or alcoholCount >= 5 then
-				drugCount += 1
+					SetEntityHealth(Player, GetEntityHealth(Player) - math.random(5, 10))
-				if drugCount >= 4 then
-                    if Config.Debug then print("^5Debug^7: ^3Consume^7: ^2Current ^4drugCount^7: ^6"..drugCount.."^7 - ^2 removing health") end
-					SetEntityHealth(PlayerPedId(), GetEntityHealth(PlayerPedId()) - math.random(10,15))
-					if drugCount >= 7 then
-                        CreateThread(function() AlienEffect() end) -- If too many drugs, if not dead will make you stumble
-					end
 				end
 			end
-			if stats.effect == "heal" then
+            if stats.effect then
-                if GetResourceState("ps-buffs") == "started" then exports["ps-buffs"]:AddHealthBuff((stats.time or 10000), (stats.amount or 6))
+                local effectTable = {
-                else CreateThread(function() HealEffect({(stats.time or 10000), (stats.amount or 6)}) end) end
+                    ["heal"] = function(stats)
+                        if isStarted("ps-buffs") then
+                            debugPrint("^5Debug^7: ^3Consume^7: ^4PS^7-^4Buffs ^2found^7, ^2hooking in to get buffs and applying ^6Health Buff ^2for ^6"..stats.time.."^7ms")
+                            exports["ps-buffs"]:AddHealthBuff((tonumber(stats.time) or 10000), (stats.amount or 6))
+                        else
+                            CreateThread(function()
+                                HealEffect({(tonumber(stats.time) or 10000), (stats.amount or 6)})
+                            end)
+                        end
+                    end,
+                    ["stamina"] = function(stats)
+                        if isStarted("ps-buffs") then
+                            debugPrint("^5Debug^7: ^3Consume^7: ^4PS^7-^4Buffs ^2found^7, ^2hooking in to get buffs and applying ^6Stamina Buff ^2for ^6"..stats.time.."^7ms")
+                            exports["ps-buffs"]:StaminaBuffEffect((tonumber(stats.time) or 10000), (stats.amount or 6))
+                        else
+                            CreateThread(function()
+                                StaminaEffect({(tonumber(stats.time) or 10000), (stats.amount or 6)})
+                            end)
+                        end
+                    end,
+                    ["armor"] = function(stats)
+                        if isStarted("ps-buffs") then   --PS-BUFFS ONLY
+                            exports["ps-buffs"]:AddArmorBuff((tonumber(stats.time) or 10000), (stats.amount or 6))
+                        end
+                    end,
+                    ["stress"] = function(stats)
+                        if isStarted("ps-buffs") then   --PS-BUFFS ONLY
+                            exports["ps-buffs"]:AddStressBuff((tonumber(stats.time) or 10000), (stats.amount or 6))
+                        end
+                    end,
+                    ["swimming"] = function(stats)
+                        if isStarted("ps-buffs") then   --PS-BUFFS ONLY
+                            exports["ps-buffs"]:SwimmingBuffEffect((tonumber(stats.time) or 10000), (stats.amount or 6))
+                        end
+                    end,
+                    ["hacking"] = function(stats)
+                        if isStarted("ps-buffs") then   --PS-BUFFS ONLY
+                            exports["ps-buffs"]:AddBuff("hacking", (tonumber(stats.time) or 10000))
+                        end
+                    end,
+                    ["intelligence"] = function(stats)
+                        if isStarted("ps-buffs") then   --PS-BUFFS ONLY
+                            exports["ps-buffs"]:AddBuff("intelligence", (tonumber(stats.time) or 10000))
+                        end
+                    end,
+                    ["luck"] = function(stats)
+                        if isStarted("ps-buffs") then   --PS-BUFFS ONLY
+                            exports["ps-buffs"]:AddBuff("luck", (tonumber(stats.time) or 10000))
+                        end
+                    end,
+                    ["strength"] = function(stats)
+                        if isStarted("ps-buffs") then   --PS-BUFFS ONLY
+                            exports["ps-buffs"]:AddBuff("strength", (tonumber(stats.time) or 10000))
+                        end
+                    end,
+                }
+
+                if effectTable[stats.effect] then
+                    effectTable[stats.effect](stats)
+                end
             end
-			if stats.effect == "stamina" then
+            if stats.widepupils then
-                if GetResourceState("ps-buffs") == "started" then exports["ps-buffs"]:StaminaBuffEffect((stats.time or 10000), (stats.amount or 6))
+                TriggerEvent("evidence:client:SetStatus", "widepupils", 200)
-                else CreateThread(function() StaminaEffect({(stats.time or 10000), (stats.amount or 6)}) end) end
-			end
-            if GetResourceState("ps-buffs") == "started" then   --PS-BUFFS ONLY
-                if Config.Debug then print("^5Debug^7: ^3Consume^7: ^4PS^7-^4Buffs ^2found^7, ^2hooking in to get buffs") end
-                if stats.effect == "armor" then exports["ps-buffs"]:AddArmorBuff((stats.time or 10000), (stats.amount or 6)) end
-                if stats.effect == "stress" then exports["ps-buffs"]:AddStressBuff((stats.time or 10000), (stats.amount or 6)) end
-                if stats.effect == "swimming" then exports["ps-buffs"]:SwimmingBuffEffect((stats.time or 10000), (stats.amount or 6)) end
-                if stats.effect == "hacking" then exports["ps-buffs"]:AddBuff("hacking", (stats.time or 10000)) end
-                if stats.effect == "intelligence" then exports["ps-buffs"]:AddBuff("intelligence", (stats.time or 10000)) end
-                if stats.effect == "luck" then exports["ps-buffs"]:AddBuff("luck", (stats.time or 10000)) end
-                if stats.effect == "strength" then exports["ps-buffs"]:AddBuff("strength", (stats.time or 10000)) end
             end
-            if stats.widepupils then TriggerEvent("evidence:client:SetStatus", "widepupils", 200) end
 		end
 	end
 	cancelled = false
 	consuming = false
-    if Config.Debug then print("^5Debug^7: ^3Consume^7: ^2Finished, unlocking inventory^7...") end
+    debugPrint("^5Debug^7: ^3Consume^7: ^2Finished, unlocking inventory^7...")
-    LocalPlayer.state:set("inv_busy", false, true) TriggerEvent('inventory:client:busy:status', false) TriggerEvent('canUseInventoryAndHotbar:toggle', true)
+    tempLockInv(false)
 end)
 
 CreateThread(function()
@@ -219,6 +459,10 @@ CreateThread(function()
 	end
 end)
 
-AddEventHandler('onResourceStop', function(r) if r ~= GetCurrentResourceName() then return end
+onResourceStop(function()
+
+    lockInv(false)
+
     StopEffects()
-end)
+
+end, true)

client/consumableCreator.lua

@@ -0,0 +1,249 @@
+RegisterNetEvent("jim-consumables:client:consumableCreator", function()
+    local itemTable, emoteTable = {}, {}
+    for k, v in pairsByKeys(Items) do itemTable[#itemTable+1] = { value = tostring(k), label = tostring((v.label or k)) } end
+    table.sort(itemTable, function(a, b) return a.label < b.label end)
+    for k in pairsByKeys(Emotes) do emoteTable[#emoteTable+1] = { value = k, label = k } end
+    local input = lib.inputDialog("Consumable Creator", {
+        {   type = "select",
+            label = "Item List",
+            options = itemTable,
+            required = true,
+            icon = "fas fa-burger",
+            clearable = true,
+            searchable = true       -- Doesnt work as i think only ox_lib lua was updated, the web stuff doesn't support this
+        },
+        {   type = "select",
+            label = "Emote",
+            options = emoteTable,
+            required = true,
+            icon = "fas fa-user",
+            clearable = true,
+            searchable = true,       -- Doesnt work as i think only ox_lib lua was updated, the web stuff doesn't support this
+            default = "burger",
+        },
+        {   type = "select",
+            label = "Item Required for consuming",
+            options = itemTable,
+            required = false,
+            icon = "fas fa-utensils",
+            clearable = true,
+            searchable = true       -- Doesnt work as i think only ox_lib lua was updated, the web stuff doesn't support this
+        },
+        { type = 'number', label = 'Time', description = "How long it takes in ms to consume item", default = 5000, icon = "fas fa-clock", },
+        { type = 'number', label = 'Stress Relief', description = "How much stress to relieve", default = 0, icon = "fas fa-mug-hot", },
+        { type = 'number', label = 'Healing Amount', description = "How much to heal after consuming", default = 0, icon = "fas fa-notes-medical", },
+        { type = 'number', label = 'Armour', description = "How much armour to give after consuming", default = 0, icon = "fas fa-shield-halved", },
+        { type = "select", label = "Type", default = "food", icon = "fas fa-box", options = {
+            { value = "food", label = "Food" },
+            { value = "drink", label = "Drink" },
+            { value = "alcohol", label = "Alcohol" },
+            { value = "drug", label = "Drugs" },
+            { value = "smoke", label = "Cigar/Cigarette" },
+            { value = "pack", label = "Pack (Container Item)" },
+        }},
+    })
+    if not input or not input[1] then return end
+    local resultTable = {
+        item = input[1],
+        emote = input[2],
+        requireItem = input[3] or nil,
+        time = { input[4], input[4] + 1000 },
+        stress = input[5],
+        heal = input[6],
+        armor = input[7],
+        type = input[8],
+    }
+    if resultTable.type == "food" or resultTable.type == "drink" then foodInput(resultTable)
+    elseif resultTable.type == "pack" then packInput(resultTable, itemTable)
+    else
+        ExtraStatsInput(resultTable)
+    end
+end, false)
+
+function foodInput(prevInput)
+    local resultTable = prevInput
+    local input = lib.inputDialog((Items[prevInput.item].label or prevInput.item).." - Food or Drink",{
+        { type = 'number', label = 'Hunger %', default = 0, icon = "fas fa-burger", },
+        { type = 'number', label = 'Thirst %', default = 0, icon = "fas fa-mug-hot", },
+    })
+    if not input or not input[1] then return end
+    resultTable["stats"] = {
+        hunger = input[1] ~= 0 and { input[1], input[1] + 10 } or 0,
+        thirst = input[2] ~= 0 and { input[2], input[2] + 10 } or 0,
+    }
+    ExtraStatsInput(resultTable)
+end
+
+function packInput(prevInput, itemTable)
+    local resultTable = prevInput
+    local input = lib.inputDialog((Items[prevInput.item].label or prevInput.item).." - Pack", {
+        {   type = "select",
+            label = "Item List",
+            options = itemTable,
+            required = true,
+            icon = "fas fa-burger",
+        },
+        { type = 'number', label = 'Amount to give of item', default = 1, icon = "fas fa-box", },
+    })
+    resultTable["pack"] = { item = input[1], amount = input[2], }
+    getConsumableResult(resultTable)
+end
+
+function ExtraStatsInput(prevInput)
+    local resultTable = prevInput
+    local input = lib.inputDialog((Items[prevInput.item].label or prevInput.item).." - Extra Stats", {
+        { type = "select", label = "Buff Type", description = "These are 'gradual' buff effects", default = "none", options = {
+            { value = "none", label = "None" },
+            { value = "heal", label = "Healing" },
+            { value = "stamina", label = "Stamina" },
+            { value = "armor", label = "Armour" },
+            { value = "stress", label = "Stress" },
+            { value = "swimming", label = "Swimming" },
+            { value = "hacking", label = "Hacking" },
+            { value = "intelligence", label = "Intelligence" },
+            { value = "luck", label = "Luck" },
+            { value = "strength", label = "Strength" },
+        }},
+        { type = "select", label = "Screen Effect", default = "none", options = {
+            { value = "none", label = "None" },
+            { value = "rampage", label = "Rampage" },
+            { value = "turbo", label = "Turbo" },
+            { value = "focus", label = "Focus" },
+            { value = "weed", label = "Weed" },
+            { value = "trevor", label = "Trevor" },
+            { value = "nightvision", label = "Night Vision" },
+            { value = "thermal", label = "Thermal Vision" },
+        }},
+        { type = "number", label = "Total Time of 'Buff'", default = 10000, },
+        { type = "number", label = "Amount to give per second", default = 6, },
+        ((prevInput.type ~= "food" and prevInput.type ~= "drink") and { type = "select", label = "Wide Pupils", default = "false", options = {
+            { value = "true", label = "True" },
+            { value = "false", label = "False" },
+        }} or nil),
+        ((prevInput.type ~= "food" and prevInput.type ~= "drink") and { type = "select", label = "Can Over Dose", default = "false", options = {
+            { value = "true", label = "True" },
+            { value = "false", label = "False" },
+        }} or nil),
+    })
+    if not input or not input[1] then return end
+    resultTable["stats"] = {
+        hunger = resultTable["stats"] and resultTable["stats"].hunger or 0,
+        thirst = resultTable["stats"] and resultTable["stats"].thirst or 0,
+        screen = input[2] or nil,
+        effect = input[1] or nil,
+        time = input[1] ~= "none" and input[3] or nil,
+        amount = input[1] ~= "none" and input[4] or nil,
+        widepupils = input[5],
+        canOD = input[6],
+    }
+    getConsumableResult(resultTable)
+end
+
+function getConsumableResult(data)
+    local resultString = '["'..data.item..'"] = { '
+    resultString = resultString..'emote = "'..data.emote..'", '
+    resultString = resultString.."canRun = true, "
+    resultString = resultString.."time = {"..data.time[1]..", "..data.time[2].."}, "
+    resultString = (data.stress > 0 and resultString.."stress = "..data.stress..", ") or resultString..""
+    resultString = (data.heal > 0 and resultString.."heal = "..data.heal..", ") or resultString..""
+    resultString = (data.armor > 0 and resultString.."armor = "..data.armor..", ") or resultString..""
+    resultString = resultString..'type = "'..data.type..'", '
+    if data.type == "pack" then
+        resultString = resultString..'pack = { item = "'..data.pack.item..'", amount = "'..data.pack.amount..'", }, '
+    end
+    if data.stats then
+        resultString = resultString.."stats = { "
+        if data.stats.hunger and type(data.stats.hunger) == "table" then
+            resultString = resultString..'hunger = { '..data.stats.hunger[1]..', '..data.stats.hunger[2]..' }, '
+        end
+        if data.stats.thirst and type(data.stats.thirst) == "table" then
+            resultString = resultString..'thirst = { '..data.stats.thirst[1]..', '..data.stats.thirst[2]..' }, '
+        end
+        if data.stats.screen and data.stats.screen ~= "none" then
+            resultString = resultString..'screen = "'..data.stats.screen..'", '
+        end
+        if data.stats.effect and data.stats.effect ~= "none" then
+            resultString = resultString..'effect = "'..data.stats.effect..'", '
+            resultString = resultString..'time = "'..data.stats.time..'", '
+            resultString = resultString..'amount = "'..data.stats.amount..'", '
+        end
+        if data.stats.widepupils == "true" then
+            resultString = resultString..'widepupils = "'..data.stats.widepupils..'", '
+        end
+        if data.stats.canOD == "true" then
+            resultString = resultString..'canOD = "'..data.stats.canOD..'", '
+        end
+    end
+    triggerNotify(nil, "Copied new consumable info to clipboard", "success")
+    lib.setClipboard(resultString .. " },")
+end
+
+RegisterNetEvent("jim-consumables:client:testEmotes", function()
+    local Menu = {}
+    for k, v in pairsByKeys(Emotes) do
+        Menu[#Menu+1] = {
+            header = k,
+            onSelect = function()
+                testEmote(v, k)
+            end
+        }
+    end
+    openMenu(Menu, { header = "Test Consumable Emotes" })
+end)
+
+function testEmote(emote, name)
+    triggerNotify(nil, "Testing "..name, "warning")
+    triggerNotify(nil, "Anim will loop twice then return to menu", "warning")
+    local MovementType = nil
+    local Player = PlayerPedId()
+    local InVehicle = IsPedInAnyVehicle(Player, true)
+
+	local animDict, anim = tostring(emote[1]), tostring(emote[2])
+	local model, model2, bone, bone2
+	local P1, P2, P3, P4, P5, P6, P7, P8, P9, P10, P11, P12 = table.unpack({0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0}) -- Default placement coord cariable
+    if emote.AnimationOptions.Prop then
+		model = emote.AnimationOptions.Prop
+		bone = GetPedBoneIndex(Player, emote.AnimationOptions.PropBone)
+		P1, P2, P3, P4, P5, P6 = table.unpack(emote.AnimationOptions.PropPlacement)
+        if emote.AnimationOptions.SecondProp then
+            model2 = emote.AnimationOptions.SecondProp
+            bone2 = GetPedBoneIndex(Player, emote.AnimationOptions.SecondPropBone)
+            P7, P8, P9, P10, P11, P12 = table.unpack(emote.AnimationOptions.SecondPropPlacement)
+        end
+	end
+    if InVehicle == 1 then
+        MovementType = 51
+    elseif emote.AnimationOptions then
+        if emote.AnimationOptions.EmoteMoving then MovementType = 51
+        elseif emote.AnimationOptions.EmoteLoop then MovementType = 1
+        elseif emote.AnimationOptions.EmoteStuck then MovementType = emote.AnimationOptions.EmoteMoving and 50 or 2
+        elseif emote.AnimationOptions.EmoteMoving == false then	MovementType = 0 end
+    end
+
+    playAnim(animDict, anim, (GetAnimDuration(animDict, anim) * 1000 )*2, MovementType)
+    local consuming = true
+    --Prop Spawning
+    CreateThread(function()
+        if model then
+            if IsModelValid(model) == 1 then
+                triggerNotify(nil, "Debug: Spawning consumable prop")
+                attachProp = makeProp({ prop = model, coords = vector4(0.0,0.0,0.0,0.0)}, 1, 1)
+                AttachEntityToEntity(attachProp, Player, bone, P1, P2, P3, P4, P5, P6, true, true, false, true, 1, true)
+                if model2 then
+                    triggerNotify(nil, "Debug: Spawning consumable prop 2")
+                    if IsModelValid(model2) == 1 then
+                        attachProp2 = makeProp({ prop = model2, coords = vector4(0.0,0.0,0.0,0.0)}, 1, 1)
+                        AttachEntityToEntity(attachProp2, Player, bone2, P7, P8, P9, P10, P11, P12, true, true, false, true, 1, true)
+                    else triggerNotify(nil, "Debug: Second prop model isn't valid", "error") end
+                end
+                while consuming do Wait(50) end
+                if DoesEntityExist(attachProp) then destroyProp(attachProp) attachProp = nil end
+                if DoesEntityExist(attachProp2) then destroyProp(attachProp2) attachProp2 = nil end
+            else triggerNotify(nil, "Debug: Prop model isn't valid", "error") end
+        end
+    end)
+    Wait((GetAnimDuration(animDict, anim) * 1000)*2)
+    consuming = false
+    stopAnim(animDict, anim)
+    TriggerEvent("jim-consumables:client:testEmotes")
+end

config.lua

@@ -1,276 +1,19 @@
-print("^2Jim^7-^2Consumables ^7v^41^7.^43^7.^42 ^7- ^2Consumables Script by ^1Jimathy^7")
-
--- If you need support I now have a discord available, it helps me keep track of issues and give better support.
-
--- https://discord.gg/xKgQZ6wZvS
-
 Config = {
-	Debug = false,
+	System = {
-	Notify = "qb",
+		Debug = false,
-	UseProgbar = false,
+		EventDebug = false,
 
-	Consumables = {
+		Menu = "qb",				-- "qb", "ox"
-		-- Default QB food and drink item override
+		Notify = "gta",				-- "qb", "ox", "gta"
-
+		ProgressBar = "gta",		-- "qb", "ox", "gta"
-		--Effects can be applied here, like stamina on coffee for example
+		drawText = "gta",			-- "qb", "ox", "gta"
-		["vodka"] = { 			emote = "vodkab", 		canRun = false, 	time = math.random(5000, 6000), stress = 0, heal = 0, armor = 0, type = "alcohol", stats = { effect = "stress", time = 5000, amount = 2, thirst = math.random(10,20), canOD = true }},
-		["beer"] = { 			emote = "beer", 		canRun = false, 	time = math.random(5000, 6000), stress = math.random(2, 4), heal = 0, armor = 0, type = "alcohol", stats = { thirst = math.random(10,20), canOD = true }},
-		["whiskey"] = { 		emote = "whiskey",  	canRun = false, 	time = math.random(5000, 6000), stress = math.random(2, 4), heal = 0, armor = 0, type = "alcohol", stats = { thirst = math.random(10,20), canOD = true }},
-
-		["sandwich"] = { 		emote = "sandwich", 	canRun = false, 	time = math.random(5000, 6000), stress = math.random(2, 4), heal = 0, armor = 0, type = "food", stats = { hunger = math.random(10,20), }},
-		["twerks_candy"] = { 	emote = "egobar", 		canRun = true, 		time = math.random(5000, 6000), stress = math.random(2, 4), heal = 0, armor = 0, type = "food", stats = { hunger = math.random(10,20), }},
-		["snikkel_candy"] = { 	emote = "egobar", 		canRun = true, 		time = math.random(5000, 6000), stress = math.random(2, 4), heal = 0, armor = 0, type = "food", stats = { hunger = math.random(10,20), }},
-		["tosti"] = { 			emote = "sandwich", 	canRun = false, 	time = math.random(5000, 6000), stress = math.random(2, 4), heal = 0, armor = 0, type = "food", stats = { hunger = math.random(10,20), }},
-
-		["coffee"] = { 			emote = "coffee", 		canRun = false, 	time = math.random(5000, 6000), stress = math.random(2, 4), heal = 0, armor = 0, type = "drink", stats = { effect = "stamina", time = 10000, thirst = math.random(10,20), }},
-		["water_bottle"] = { 	emote = "drink", 		canRun = false, 	time = math.random(5000, 6000), stress = math.random(2, 4), heal = 0, armor = 0, type = "drink", stats = { thirst = math.random(10,20), }},
-		["kurkakola"] = { 		emote = "ecola", 		canRun = false, 	time = math.random(5000, 6000), stress = math.random(2, 4), heal = 0, armor = 0, type = "drink", stats = { thirst = math.random(10,20), }},
-
-		--[[----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-		-- Items that effect status changes, like bleeding can cause problems as they are all handled in their own scripts
-		-- Testing these but they may be best left handled by default scripts
-		["ifaks"] = { 			emote = "oxy", 		time = math.random(5000, 6000), stress = math.random(12, 24), heal = 10, armor = 0, type = "drug", stats = { effect = "heal", amount = 6, widepupils = false, canOD = false } },
-		["bandage"] = { 		emote = "oxy", 		time = math.random(5000, 6000), stress = 0, heal = 10, armor = 0, type = "drug", stats = { effect = "heal", amount = 3, widepupils = false, canOD = false } }, },
-		]]
-
-		--Testing effects & armor with small functionality to drugs - This may be another one left to default scripts
-		["joint"] = { 			emote = "smoke3",	time = math.random(5000, 6000), stress = math.random(12, 24), heal = 0, armor = 10, type = "drug", stats = { screen = "weed", effect = "armor", widepupils = false, canOD = false } },
-
-		["cokebaggy"] = { 		emote = "coke",		time = math.random(5000, 6000), stress = math.random(12, 24), heal = 0, armor = 0, type = "drug", stats = { screen = "focus", effect = "stamina", widepupils = false, canOD = true } },
-		--["crackbaggy"] = { 		emote = "coke",		time = math.random(5000, 6000), stress = math.random(12, 24), heal = 0, armor = 0, type = "drug", stats = { effect = "heal", widepupils = false, canOD = true } },
-		["xtcbaggy"] = { 		emote = "oxy",		time = math.random(5000, 6000), stress = math.random(12, 24), heal = 0, armor = 10, type = "drug", stats = { effect = "strength", widepupils = true, canOD = true } },
-		["oxy"] = { 			emote = "oxy",		time = math.random(5000, 6000), stress = math.random(12, 24), heal = 0, armor = 0, type = "drug", stats = { effect = "heal", widepupils = false, canOD = false } },
-		["meth"] = { 			emote = "coke",		time = math.random(5000, 6000), stress = math.random(12, 24), heal = 0, armor = 10, type = "drug", stats = { effect = "stamina", widepupils = false, canOD = true } },
-		----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-
-		--Example item
-		--[[ ["heartstopper"] = {
-			emote = "burger", 							-- Select an emote from below, it has to be in here
-			time = math.random(5000, 6000),				-- Amount of time it takes to consume the item
-			stress = math.random(1,2),					-- Amount of stress relief, can be 0
-			heal = 0, 									-- Set amount to heal by after consuming
-			armor = 5,									-- Amount of armor to add
-			type = "food",								-- Type: "alcohol" / "drink" / "food"
-			stats = {
-				screen = "rampage",						-- The screen effect to be played when after consuming the item
-				effect = "heal", 						-- The status effect given by the item, "heal" / "stamina"
-				time = 10000,							-- How long the effect should last (if not added it will default to 10000)
-				amount = 6,								-- How much the value is changed by per second
-				hunger = math.random(10,20),			-- The hunger/thirst stats of the item, if not found in the items.lua
-				thirst = math.random(10,20),			-- The hunger/thirst stats of the item, if not found in the items.lua
-			},
-		}, ]]
 
 	},
-	Emotes = {
+	Main = {
-		["drink"] = {"mp_player_intdrink", "loop_bottle", "Drink", AnimationOptions =
+		UseProgbar = false,		-- Recommended to disable this, progress bars stop ALL anims when complete.
-			{ Prop = "prop_ld_flow_bottle", PropBone = 18905, PropPlacement = {0.12, 0.008, 0.03, 240.0, -60.0},
+								-- This is intended to create a progressbar to show consuming but it was usually forces animations to end weirdly
-				EmoteMoving = true, EmoteLoop = true, }},
-		["whiskeyb"] = {"mp_player_intdrink", "loop_bottle", "(Don't Use) Whiskey Bottle", AnimationOptions =
-			{ Prop = "prop_cs_whiskey_bottle", PropBone = 60309, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0},
-				EmoteMoving = true, EmoteLoop = true }},
-		["rumb"] = {"mp_player_intdrink", "loop_bottle", "(Don't Use) Rum Bottle", AnimationOptions =
-			{ Prop = "prop_rum_bottle", PropBone = 18905, PropPlacement = {0.03, -0.18, 0.10, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true }},
-		["icream"] = {"mp_player_intdrink", "loop_bottle", "Irish Cream Bottle", AnimationOptions =
-			{ Prop = "prop_bottle_brandy", PropBone = 18905, PropPlacement = {0.00, -0.26, 0.10, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true }},
-		["ginb"] =  {"mp_player_intdrink", "loop_bottle", "(Don't Use) Gin Bottle", AnimationOptions =
-			{ Prop = "prop_tequila_bottle", PropBone = 18905, PropPlacement = {0.00, -0.26, 0.10, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true }},
-		["vodkab"] = {"mp_player_intdrink", "loop_bottle", "(Don't Use) Vodka Bottle", AnimationOptions =
-			{ Prop = 'prop_vodka_bottle', PropBone = 18905, PropPlacement = {0.00, -0.26, 0.10, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true }},
-		["crisps"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Chrisps", AnimationOptions =
-			{ Prop = 'v_ret_ml_chips2', PropBone = 28422, PropPlacement = {0.01, -0.05, -0.1, 0.0, 0.0, 90.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-		["beer1"] = {"mp_player_intdrink", "loop_bottle", "Dusche", AnimationOptions =
-			{ Prop = "prop_beerdusche", PropBone = 18905, PropPlacement = {0.04, -0.14, 0.10, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		["beer2"] = {"mp_player_intdrink", "loop_bottle", "Logger", AnimationOptions =
-			{ Prop = "prop_beer_logopen", PropBone = 18905, PropPlacement = {0.03, -0.18, 0.10, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		["beer3"] = {"mp_player_intdrink", "loop_bottle", "AM Beer", AnimationOptions =
-			{ Prop = "prop_beer_amopen", PropBone = 18905, PropPlacement = {0.03, -0.18, 0.10, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		["beer4"] = {"mp_player_intdrink", "loop_bottle", "Pisswasser1", AnimationOptions =
-			{ Prop = "prop_beer_pissh", PropBone = 18905, PropPlacement = {0.03, -0.18, 0.10, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		["beer5"] = {"mp_player_intdrink", "loop_bottle", "Pisswasser2", AnimationOptions =
-			{ Prop = "prop_amb_beer_bottle", PropBone = 18905, PropPlacement = {0.12, 0.008, 0.03, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		["beer6"] = {"mp_player_intdrink", "loop_bottle", "Pisswasser3", AnimationOptions =
-			{ Prop = "prop_cs_beer_bot_02", PropBone = 18905, PropPlacement = {0.12, 0.008, 0.03, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		["ecola"] = {"mp_player_intdrink", "loop_bottle", "E-cola", AnimationOptions =
-			{ Prop = "prop_ecola_can", PropBone = 18905, PropPlacement = {0.12, 0.008, 0.03, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		["sprunk"] = {"mp_player_intdrink", "loop_bottle", "Sprunk", AnimationOptions =
-			{ Prop = "v_res_tt_can03", PropBone = 18905, PropPlacement = {0.12, 0.008, 0.03, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		--Jim-BeanMachine
-		["bmcoffee1"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Coffee2", AnimationOptions =
-			{ Prop = 'prop_fib_coffee', PropBone = 28422, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-
-		["bmcoffee2"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Coffee3", AnimationOptions =
-			{ Prop = 'ng_proc_coffee_01a', PropBone = 28422, PropPlacement = {0.0, 0.0, -0.06, 0.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-
-		["bmcoffee3"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Coffee3", AnimationOptions =
-			{ Prop = 'v_club_vu_coffeecup', PropBone = 28422, PropPlacement = {0.0, 0.0, -0.06, 0.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-		--Jim-PizzaThis
-		["redwine"] = {"mp_player_intdrink", "loop_bottle", "Red Wine Bottle", AnimationOptions =
-			{ Prop = "prop_wine_rose", PropBone = 18905, PropPlacement = {0.00, -0.26, 0.10, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		["whitewine"] = {"mp_player_intdrink", "loop_bottle", "White Wine Bottle", AnimationOptions =
-			{ Prop = "prop_wine_white", PropBone = 18905, PropPlacement = {0.00, -0.26, 0.10, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		["pizza"] = {"mp_player_inteat@burger", "mp_player_int_eat_burger_fp", "Pizza", AnimationOptions =
-			{ Prop = "v_res_tt_pizzaplate", PropBone = 18905, PropPlacement = {0.20, 0.038, 0.051, 15.0, 155.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		["bowl"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "bowl", AnimationOptions =
-			{ Prop = "h4_prop_h4_coke_plasticbowl_01", PropBone = 28422, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		["pineapple"] = {"mp_player_inteat@burger", "mp_player_int_eat_burger_fp", "Pizza", AnimationOptions =
-			{ Prop = "prop_pineapple", PropBone = 18905, PropPlacement = {0.10, 0.038, 0.03, 15.0, 50.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		["foodbowl"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "bowl", AnimationOptions =
-			{ Prop = "prop_cs_bowl_01", PropBone = 28422, PropPlacement = {0.0, 0.0, 0.050, 0.0, 0.0, 0.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		--Jim-BurgerShot
-		["milk"] = {"mp_player_intdrink", "loop_bottle", "Milk", AnimationOptions =
-			{ Prop = "v_res_tt_milk", PropBone = 18905, PropPlacement = {0.10, 0.008, 0.07, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		["bscoke"] = {"mp_player_intdrink", "loop_bottle", "BS Coke", AnimationOptions =
-			{ Prop = "prop_food_bs_juice01", PropBone = 18905, PropPlacement = {0.04, -0.10, 0.10, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		["bscoffee"] = {"mp_player_intdrink", "loop_bottle", "BS Coffee", AnimationOptions =
-			{ Prop = "prop_food_bs_coffee", PropBone = 18905, PropPlacement = {0.08, -0.10, 0.10, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		["glass"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Tall Glass", AnimationOptions =
-			{ Prop = 'prop_wheat_grass_glass', PropBone = 28422, PropPlacement = {0.0, 0.0, -0.1, 0.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-
-		["torpedo"] = {"mp_player_inteat@burger", "mp_player_int_eat_burger_fp", "Torpedo", AnimationOptions =
-			{ Prop = "prop_food_bs_burger2", PropBone = 18905, PropPlacement = {0.10, -0.07, 0.091, 15.0, 135.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		["bsfries"] = {"mp_player_inteat@burger", "mp_player_int_eat_burger_fp", "Fries", AnimationOptions =
-			{ Prop = "prop_food_bs_chips", PropBone = 18905, PropPlacement = {0.09, -0.06, 0.05, 300.0, 150.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-		["donut2"] = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Donut2", AnimationOptions =
-			{ Prop = 'prop_donut_02', PropBone = 18905, PropPlacement = {0.13, 0.05, 0.02, -50.0, 100.0, 270.0},
-				EmoteMoving = true, EmoteLoop = true, }},
-
-		--Jim-CatCafe
-		["boba1"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Boba 1", AnimationOptions =
-			{ Prop = 'denis3d_catcafe_boobaA', PropBone = 28422, PropPlacement = {0.0, 0.0, -0.1, 0.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-		["boba2"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Boba 2", AnimationOptions =
-			{ Prop = 'denis3d_catcafe_boobaB', PropBone = 28422, PropPlacement = {0.0, 0.0, -0.1, 0.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-		["boba3"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Boba 3", AnimationOptions =
-			{ Prop = 'denis3d_catcafe_boobaC', PropBone = 28422, PropPlacement = {0.0, 0.0, -0.1, 0.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-		["boba4"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Boba 4", AnimationOptions =
-			{ Prop = 'denis3d_catcafe_boobaD', PropBone = 28422, PropPlacement = {0.0, 0.0, -0.1, 0.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-		["mochi"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Mochi", AnimationOptions =
-			{ Prop = 'denis3d_catcafe_plateD', PropBone = 28422, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-
-		--Jim-Tequilala
-		["whiskeyb"] = {"anim@amb@nightclub@mini@drinking@drinking_shots@ped_b@normal@", "glass_hold", "Whiskey Bottle", AnimationOptions =
-			{ Prop = "prop_cs_whiskey_bottle", PropBone = 60309, PropPlacement = {0.08, 0.0, 0.05, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true }},
-		["rumb"] = {"anim@amb@nightclub@mini@drinking@drinking_shots@ped_b@normal@", "glass_hold", "Rum Bottle", AnimationOptions =
-			{ Prop = "prop_rum_bottle", PropBone = 60309, PropPlacement = {-0.04, -0.18, 0.12, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true }},
-		["icream"] = {"anim@amb@nightclub@mini@drinking@drinking_shots@ped_b@normal@", "glass_hold", "Irish Cream Bottle", AnimationOptions =
-			{ Prop = "prop_bottle_brandy", PropBone = 60309, PropPlacement = {-0.04, -0.18, 0.12, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true }},
-		["ginb"] =  {"anim@amb@nightclub@mini@drinking@drinking_shots@ped_b@normal@", "glass_hold", "Gin Bottle", AnimationOptions =
-			{ Prop = "prop_tequila_bottle", PropBone = 60309, PropPlacement = {-0.04, -0.18, 0.12, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true }},
-		["vodkab"] = {"anim@amb@nightclub@mini@drinking@drinking_shots@ped_b@normal@", "glass_hold", "Vodka Bottle", AnimationOptions =
-			{ Prop = 'prop_vodka_bottle', PropBone = 60309, PropPlacement = {-0.04, -0.18, 0.12, 240.0, -60.0},
-				EmoteMoving = true, EmoteLoop = true }},
-		["browncup"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Brown Cup", AnimationOptions =
-			{ Prop = 'v_serv_bs_mug', PropBone = 28422, PropPlacement = {0.03, -0.02, 0.0, 0.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-		["crisps"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Crisps", AnimationOptions =
-			{ Prop = 'v_ret_ml_chips2', PropBone = 28422, PropPlacement = {0.01, -0.05, -0.1, 0.0, 0.0, 90.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-		["smoke2"] = {"amb@world_human_aa_smoke@male@idle_a", "idle_c", "Smoke 2", AnimationOptions =
-			{ Prop = 'prop_cs_ciggy_01', PropBone = 28422, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-		["smoke3"] = {"amb@world_human_aa_smoke@male@idle_a", "idle_b", "Smoke 3", AnimationOptions =
-			{ Prop = 'prop_cs_ciggy_01', PropBone = 28422, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-		["smoke4"] = {"amb@world_human_smoking@female@idle_a", "idle_b", "Smoke 4", AnimationOptions =
-			{ Prop = 'prop_cs_ciggy_01', PropBone = 28422, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-		["bong"] = {"anim@safehouse@bong", "bong_stage3", "Bong", AnimationOptions =
-			{ Prop = 'hei_heist_sh_bong_01', PropBone = 18905, PropPlacement = {0.10,-0.25,0.0,95.0,190.0,180.0}, }},
-		["coffee"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Coffee", AnimationOptions =
-			{ Prop = 'p_amb_coffeecup_01', PropBone = 28422, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-		["whiskey"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Whiskey", AnimationOptions =
-			{ Prop = 'prop_drink_whisky', PropBone = 28422, PropPlacement = {0.01, -0.01, -0.06, 0.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-		["beer"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Beer", AnimationOptions =
-			{ Prop = 'prop_amb_beer_bottle', PropBone = 28422, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-		["cup"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Cup", AnimationOptions =
-			{ Prop = 'prop_plastic_cup_02', PropBone = 28422, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-		["donut"] = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Donut", AnimationOptions =
-			{ Prop = 'prop_amb_donut', PropBone = 18905, PropPlacement = {0.13, 0.05, 0.02, -50.0, 16.0, 60.0},
-				EmoteMoving = true, }},
-		["burger"] = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Burger", AnimationOptions =
-			{ Prop = 'prop_cs_burger_01', PropBone = 18905, PropPlacement = {0.13, 0.05, 0.02, -50.0, 16.0, 60.0},
-				EmoteMoving = true, }},
-		["sandwich"] = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Sandwich", AnimationOptions =
-			{ Prop = 'prop_sandwich_01', PropBone = 18905, PropPlacement = {0.13, 0.05, 0.02, -50.0, 16.0, 60.0},
-				EmoteMoving = true, }},
-		["soda"] = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Soda", AnimationOptions =
-			{ Prop = 'prop_ecola_can', PropBone = 28422, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 130.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-		["egobar"] = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Ego Bar", AnimationOptions =
-			{ Prop = 'prop_choc_ego', PropBone = 60309, PropPlacement = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
-				EmoteMoving = true, }},
-		["wine"] = {"anim@heists@humane_labs@finale@keycards", "ped_a_enter_loop", "Wine", AnimationOptions =
-			{ Prop = 'prop_drink_redwine', PropBone = 18905, PropPlacement = {0.10, -0.03, 0.03, -100.0, 0.0, -10.0},
-				EmoteMoving = true, EmoteLoop = true }},
-		["flute"] = {"anim@heists@humane_labs@finale@keycards", "ped_a_enter_loop", "Flute", AnimationOptions =
-			{ Prop = 'prop_champ_flute', PropBone = 18905, PropPlacement = {0.10, -0.03, 0.03, -100.0, 0.0, -10.0},
-				EmoteMoving = true, EmoteLoop = true }},
-		["champagne"] = {"anim@heists@humane_labs@finale@keycards", "ped_a_enter_loop", "Champagne", AnimationOptions =
-			{ Prop = 'prop_drink_champ', PropBone = 18905, PropPlacement = {0.10, -0.03, 0.03, -100.0, 0.0, -10.0},
-				EmoteMoving = true, EmoteLoop = true }},
-		["cigar"] = {"amb@world_human_smoking@male@male_a@enter", "enter", "Cigar", AnimationOptions =
-			{ Prop = 'prop_cigar_02', PropBone = 47419, PropPlacement = {0.010, 0.0, 0.0, 50.0, 0.0, -80.0},
-				EmoteMoving = true, EmoteDuration = 2600 }},
-		["cigar2"] = {"amb@world_human_smoking@male@male_a@enter", "enter", "Cigar 2", AnimationOptions =
-			{ Prop = 'prop_cigar_01', PropBone = 47419, PropPlacement = {0.010, 0.0, 0.0, 50.0, 0.0, -80.0},
-				EmoteMoving = true, EmoteDuration = 2600 }},
-		["joint"] = {"amb@world_human_smoking@male@male_a@enter", "enter", "Joint", AnimationOptions =
-			{ Prop = 'p_cs_joint_02', PropBone = 47419, PropPlacement = {0.015, -0.009, 0.003, 55.0, 0.0, 110.0},
-				EmoteMoving = true, EmoteDuration = 2600 }},
-		["cig"] = {"amb@world_human_smoking@male@male_a@enter", "enter", "Cig", AnimationOptions =
-			{ Prop = 'prop_amb_ciggy_01', PropBone = 47419, PropPlacement = {0.015, -0.009, 0.003, 55.0, 0.0, 110.0},
-				EmoteMoving = true, EmoteDuration = 2600 }},
-		["clean"] = {"timetable@floyd@clean_kitchen@base", "base", "Clean", AnimationOptions =
-			{ Prop = "prop_sponge_01", PropBone = 28422, PropPlacement = {0.0, 0.0, -0.01, 90.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-		["clean2"] = {"amb@world_human_maid_clean@", "base", "Clean 2", AnimationOptions =
-			{ Prop = "prop_sponge_01", PropBone = 28422, PropPlacement = {0.0, 0.0, -0.01, 90.0, 0.0, 0.0},
-				EmoteLoop = true, EmoteMoving = true, }},
-		["coke"] = { "switch@trevor@trev_smoking_meth", "trev_smoking_meth_loop", "Coke", AnimationOptions =
-			{ EmoteLoop = true, EmoteMoving = true, }},
-		["oxy"] = { "mp_suicide", "pill", "Oxy", AnimationOptions =
-			{ EmoteLoop = true, EmoteMoving = true, }},
 	},
+	Crafting = {
+		showItemBox = true		-- Display "use" item boxes on some inventories that need to be told to
+	}
 }

fxmanifest.lua

@@ -1,11 +1,27 @@
 name "Jim-Consumables"
 author "Jimathy"
-version "v1.3.2"
+version "2.0.09"
-description "Consumable Script By Jimathy"
+description "Consumables Script"
 fx_version "cerulean"
 game "gta5"
 lua54 'yes'
 
-shared_scripts { 'config.lua', 'shared/*.lua' }
+server_script '@oxmysql/lib/MySQL.lua'
-client_scripts { 'client/*.lua', }
+
-server_scripts { 'server/*.lua' }
+shared_scripts {
+    'config.lua',
+    'shared/emotes.lua',
+    'shared/consumables.lua',
+    'shared/shared.lua',
+
+    --Jim Bridge - https://github.com/jimathy/jim_bridge
+    '@jim_bridge/starter.lua',
+}
+
+client_scripts {
+    'client/*.lua',
+}
+
+server_script 'server/*.lua'
+
+dependency 'jim_bridge'

server/server.lua

@@ -1,34 +1,199 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+local Consumables = Config.Consumables
+local Emotes = Config.Emotes
+local isConsuming = {}
 
-for k, v in pairs(Config.Consumables) do
+local function massMakeUseable()
-	QBCore.Functions.CreateUseableItem(k, function(source, item) TriggerClientEvent('jim-consumables:Consume', source, item.name) end)
+    for k, v in pairs(Config.Consumables) do
-	if not QBCore.Shared.Items[k] then print("Item check - '"..k.."' not found in the shared lua") end
+        createUseableItem(k, function(source, item)
-	if not Config.Emotes[v.emote] then print("Emote check - '"..k.."' requested emote '"..v.emote.."' - not found in config.lua") end
+            local src = source
+            if not isConsuming[src] and hasItem(item.name, 1, src) then
+
+                registerConsume(src, item.name)
+                TriggerClientEvent(getScript()..':Consume', src, item.name)
+
+            end
+        end)
+    end
 end
 
-RegisterNetEvent('jim-consumables:server:toggleItem', function(give, item, amount)
+function registerConsume(src, item)
-	local src = source
+    -- Start building server sided item return table
-	if give == 0 or give == false then
+    local consumable = Consumables[item]
-		if QBCore.Functions.GetPlayer(src).Functions.RemoveItem(item, amount or 1) then
+    isConsuming[src] = {
-			TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items[item], "remove", amount or 1)
+        item = item,
-		end
+        rewardItem     = checkReward(consumable) or nil,
-	else
+        returnItem     = checkReturnItem(consumable) or nil,
-		if QBCore.Functions.GetPlayer(src).Functions.AddItem(item, amount or 1) then
+        packItem       = checkPackItem(consumable) or nil
-			TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items[item], "add", amount or 1)
+    }
-		end
+    debugPrint("^5Debug^7: ^2Player ^3"..src.." ^2started consuming ^7'^2"..item.."^7'")
-	end
+end
+
+RegisterNetEvent(getScript()..":RegisterConsuming", function(item)
+    local src = source
+    registerConsume(src, item)
 end)
 
-RegisterNetEvent('jim-consumables:server:addThirst', function(amount)
+onResourceStart(function()
-    local Player = QBCore.Functions.GetPlayer(source)
+    for k, v in pairs(Config.Consumables) do
-    if not Player then return end
+        if not Items[k] then
-    Player.Functions.SetMetaData('thirst', amount)
+            print("^1Debug^7: ^2Item check ^7- '^1"..k.."^7' ^2not found in the shared lua^7")
-    TriggerClientEvent('hud:client:UpdateNeeds', source, Player.PlayerData.metadata.hunger, amount)
+        end
+        if not Config.Emotes[v.emote] then
+            print("^1Debug^7: ^2Emote check ^7- '^1"..k.."^7' ^2requested emote ^7'^6"..v.emote.."^7' - ^2not found in config^7.^2lua^7")
+        end
+    end
+
+    massMakeUseable()
+
+    --Export Import System--
+    GlobalState.jimConsumableItems = Consumables
+    GlobalState.jimConsumableEmotes = Emotes
+end, true)
+
+onResourceStop(function()
+    GlobalState.jimConsumableItems = Consumables
+    GlobalState.jimConsumableEmotes = Emotes
 end)
 
-RegisterNetEvent('jim-consumables:server:addHunger', function(amount)
+local syncScheduled = false
-    local Player = QBCore.Functions.GetPlayer(source)
+function syncConsumables()
-    if not Player then return end
+	debugPrint("^5Statebag^7: ^2Sending ^6"..countTable(Consumables).." ^3Consumables ^2to all clients^7")
-    Player.Functions.SetMetaData('hunger', amount)
+    massMakeUseable()
-    TriggerClientEvent('hud:client:UpdateNeeds', source, amount, Player.PlayerData.metadata.thirst)
+    GlobalState.jimConsumableItems = Consumables
+    syncScheduled = false
+end
+
+local emoteSyncScheduled = false
+function syncEmotes()
+	debugPrint("^5Statebag^7: ^2Sending ^6"..countTable(Emotes).." ^3Emotes to all clients^7")
+    GlobalState.jimConsumableEmotes = Emotes
+    emoteSyncScheduled = false
+end
+
+-- Return item
+function checkPackItem(consumable)
+    local result = nil
+    if consumable.pack then
+        result = { item = consumable.pack.item, amount = consumable.pack.amount }
+    end
+    return result
+end
+
+-- Return item
+function checkReturnItem(consumable)
+    local result = nil
+    if consumable.returnItem then
+        result = { item = consumable.returnItem.item, amount = consumable.returnItem.amount }
+    end
+    return result
+end
+
+-- Reward items
+function checkReward(consumable)
+    local result = nil
+    local rewardItem = consumable.rewards or nil
+    if rewardItem then
+        debugPrint("Reward Item detected")
+        for i = 1, consumable.amounttogive or 1 do
+            local rarity = math.random(1, 4) -- rarity calculation
+            while true do
+                local item = math.random(1, countTable(rewardItem)) -- random item in the list to pick
+                if rewardItem[item].rarity >= rarity then
+                    result = result or {}
+                    result[#result+1] = { item = rewardItem[item].item, amount = math.random(1, rewardItem[item].max or 1) }
+                    debugPrint("^5Debug^7: ^2Cachced reward prize^7: '^6"..rewardItem[item].item.."^7'")
+                    break
+                end
+                Wait(10)
+                break
+            end
+        end
+    end
+    return result
+end
+
+RegisterNetEvent(getScript()..":server:finishConsume", function(needTypes)
+    local src = source
+
+    if isConsuming[src] ~= nil then
+
+        removeItem(isConsuming[src].item, 1, src)
+        if isConsuming[src].rewardItem then
+            debugPrint("^5Debug^7: ^2Giving player ^3"..src.." ^2reward items^7")
+            local item = isConsuming[src].rewardItem
+            addItem(item.item, item.amount, nil, src)
+        end
+        if isConsuming[src].returnItem then
+            debugPrint("^5Debug^7: ^2Giving player ^3"..src.." ^2return item^7")
+            for i = 1, #isConsuming[src].returnItem do
+                local item = isConsuming[src].returnItem[i]
+                addItem(item.item, item.amount, nil, src)
+            end
+        end
+        if isConsuming[src].packItem then
+            debugPrint("^5Debug^7: ^2Giving player ^3"..src.." ^2Pack items^7")
+            local item = isConsuming[src].packItem
+            addItem(item.item, item.amount, nil, src)
+        end
+
+        -- Needs
+        if needTypes.thirst then
+            debugPrint("^5Debug^7: ^2Thrist^7: [^6"..(needTypes.thirst or 0).."^7]")
+            setThirst(src, needTypes.thirst)
+        end
+        if needTypes.hunger then
+            debugPrint("^5Debug^7: ^2Hunger^7: [^6"..(needTypes.hunger or 0).."^7]")
+            setHunger(src, needTypes.hunger)
+        end
+        if needTypes.stress then
+            debugPrint("^5Debug^7: ^2Stress^7: [^6"..(needTypes.stress or 0).."^7]")
+            setStress(src, needTypes.stress)
+        end
+        isConsuming[src] = nil
+    else
+        return
+    end
 end)
+
+RegisterNetEvent(getScript()..":server:stopConsume", function()
+    local src = source
+    debugPrint("^5Player stopped consuming early^7", src)
+    isConsuming[src] = nil
+end)
+
+RegisterNetEvent(getScript()..':server:syncAddItem', function(itemName, data)
+    if not Consumables[itemName] then
+        Consumables[itemName] = data
+        --createUseableItem(itemName, function(source, item) TriggerClientEvent(getScript()..':Consume', source, itemName) end)
+        debugPrint("^5Debug^7: "..GetInvokingResource().." ^2is sending new ^3Item^7: '"..itemName.."'")
+        if not syncScheduled then
+            syncScheduled = true
+            SetTimeout(5000, syncConsumables)
+        end
+    else
+        debugPrint("^1Debug^7: "..GetInvokingResource().." ^2is sending ^1duplicate ^3Item^7: '"..itemName.."'")
+    end
+end)
+
+RegisterNetEvent(getScript()..':server:syncAddEmote', function(emoteName, data)
+    if not Emotes[emoteName] then
+        Emotes[emoteName] = data
+        debugPrint("^5Debug^7: "..GetInvokingResource().." ^2is sending new ^3Emote^7: '"..emoteName.."'")
+        if not emoteSyncScheduled then
+            emoteSyncScheduled = true
+            SetTimeout(5000, syncEmotes)
+        end
+    else
+        debugPrint("^1Debug^7: "..GetInvokingResource().." ^2is sending ^1duplicate ^3Emote^7: '"..emoteName.."'")
+    end
+end)
+
+--[[
+Core.Commands.Add('consumableCreator', "Create consumables (admin only)", {}, false, function(source)
+    if source > 0 then return TriggerClientEvent(getScript()..":client:consumableCreator", source) end
+end, 'admin')
+
+Core.Commands.Add('testConsumableEmotes', "Test consumables Emotes (admin only)", {}, false, function(source)
+    if source > 0 then return TriggerClientEvent(getScript()..":client:testEmotes", source) end
+end, 'admin')
+]]

shared/consumables.lua

@@ -0,0 +1,100 @@
+Config = Config or {}
+
+Config.Consumables = {
+
+	--Effects can be applied here, like stamina on coffee for example
+    vodka = { 			        emote = "vodkab", 		canRun = false, 	time = math.random(5000, 6000), stress = 0, heal = 0, armor = 0, type = "alcohol", stats = { effect = "stress", time = 5000, amount = 2, thirst = math.random(10,20), canOD = true }},
+    beer = { 			        emote = "beer", 		canRun = false, 	time = math.random(5000, 6000), stress = math.random(2, 4), heal = 0, armor = 0, type = "alcohol", stats = { thirst = math.random(10,20), canOD = true }},
+    whiskey = { 		        emote = "whiskey",  	canRun = false, 	time = math.random(5000, 6000), stress = math.random(2, 4), heal = 0, armor = 0, type = "alcohol", stats = { thirst = math.random(10,20), canOD = true }},
+    sandwich = {                emote = "sandwich", 	canRun = false, 	time = math.random(5000, 6000), stress = 0, heal = 0, armor = 0, type = "food", stats = { hunger = 20, }},
+
+    twerks_candy = {            emote = "egobar", 		canRun = true, 		time = math.random(5000, 6000), stress = 0, heal = 0, armor = 0, type = "food", stats = { hunger = math.random(10,15), }},
+    snikkel_candy = {           emote = "egobar", 		canRun = true, 		time = math.random(5000, 6000), stress = 0, heal = 0, armor = 0, type = "food", stats = { hunger = math.random(10,15), }},
+
+    coffee = {                  emote = "coffee", 		canRun = false, 	time = math.random(5000, 6000), stress = 0, heal = 0, armor = 0, type = "drink", stats = { time = 10000, thirst = math.random(10,15), }},
+    water_bottle = {            emote = "drink", 		canRun = false, 	time = math.random(5000, 6000), stress = 0, heal = 0, armor = 0, type = "drink", stats = { thirst = 20, }},
+    tosti = {                   emote = "sandwich", 	canRun = false, 	time = math.random(5000, 6000), stress = math.random(2, 4), heal = 0, armor = 0, type = "food", stats = { hunger = math.random(10,15), }},
+
+    kurkakola = { 		        emote = "ecola", 		canRun = false, 	time = math.random(5000, 6000), stress = math.random(2, 4), heal = 0, armor = 0, type = "drink", stats = { thirst = math.random(10,20), }},
+
+    --[[----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+    -- Items that effect status changes, like bleeding can cause problems as they are all handled in their own scripts
+    -- Testing these but they may be best left handled by default scripts
+    ["ifaks"] = { 			emote = "oxy", 		time = math.random(5000, 6000), stress = math.random(12, 24), heal = 10, armor = 0, type = "drug", stats = { effect = "heal", amount = 6, widepupils = false, canOD = false } },
+    ["bandage"] = { 		emote = "oxy", 		time = math.random(5000, 6000), stress = 0, heal = 10, armor = 0, type = "drug", stats = { effect = "heal", amount = 3, widepupils = false, canOD = false } }, },
+    ]]
+
+    --Testing effects & armor with small functionality to drugs - This may be another one left to default scripts
+    ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+    --[[ --Testing effects & armor with small functionality to drugs - This may be another one left to default scripts
+    joint = { 			emote = "smoke3",	time = math.random(5000, 6000), stress = math.random(12, 24), heal = 0, armor = 10, type = "drug", stats = { screen = "weed", effect = "armor", widepupils = false, canOD = false } },
+
+    cokebaggy = { 		emote = "coke",		time = math.random(5000, 6000), stress = math.random(12, 24), heal = 0, armor = 0, type = "drug", stats = { screen = "focus", effect = "stamina", widepupils = false, canOD = true } },
+    --crackbaggy = { 		emote = "coke",		time = math.random(5000, 6000), stress = math.random(12, 24), heal = 0, armor = 0, type = "drug", stats = { effect = "heal", widepupils = false, canOD = true } },
+    xtcbaggy = { 		emote = "oxy",		time = math.random(5000, 6000), stress = math.random(12, 24), heal = 0, armor = 10, type = "drug", stats = { effect = "strength", widepupils = true, canOD = true } },
+    oxy = { 			emote = "oxy",		time = math.random(5000, 6000), stress = math.random(12, 24), heal = 0, armor = 0, type = "drug", stats = { effect = "heal", widepupils = false, canOD = false } },
+    meth = { 			emote = "coke",		time = math.random(5000, 6000), stress = math.random(12, 24), heal = 0, armor = 10, type = "drug", stats = { effect = "stamina", widepupils = false, canOD = true } },
+    ]]		----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+    ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+
+    --Example item
+--    heartstopper = {
+--        emote = "burger", 							-- Select an emote from below, it has to be in here
+--        time = math.random(5000, 6000),				-- Amount of time it takes to consume the item
+--        stress = math.random(1,2),					-- Amount of stress relief, can be 0
+--        heal = 0, 									-- Set amount to heal by after consuming
+--        armor = 5,									-- Amount of armor to add
+--        type = "food",								-- Type: "alcohol" / "drink" / "food"
+--        canRun = true,                                -- If true player can run while using the item, if not it will cancel the event
+--
+--        stats = {
+--            screen = "thermal",						-- The screen effect to be played when after consuming the item "rampage" "turbo" "focus" "weed" "trevor" "nightvision" "thermal"
+--            effect = "heal", 						    -- The status effect given by the item, "heal" / "stamina"
+--                                                      -- This supports ps-buffs effects "armor" "stress" "swimming" "hacking" "intelligence" "luck" "strength"
+--            time = 10000,							    -- How long the effect should last (if not added it will default to 10000)
+--            amount = 6,								-- How much the value is changed by per second
+--            hunger = math.random(10, 20),			    -- The hunger/thirst stats of the item, if not found in the items.lua
+--            thirst = math.random(10, 20),			    -- The hunger/thirst stats of the item, if not found in the items.lua
+--            canOD = true,                             -- This creates an OD Effect, killing the user if they have too much
+--        },
+--        --Reward Items Variables
+--                                                      -- These can be the only thing in a consumable table and the item will still work
+--        amounttogive = 3,							    -- Used for "RewardItems", tells the script how many to give
+--        rewards = {
+--            [1] = {
+--                item = "plastic", 					-- prize item name
+--                max = 10,							    -- max amount to give (this is put into math.random(1, max) )
+--                rarity = 1,							-- the rarity system, 1 being rarest, 4 being most common
+--            },
+--        },
+--    },
+
+    -- Example Box Item
+--    ["9_box"] = {                                     -- Name of the box item in the shared
+--        emote = "uncuff",                             -- The emote than should run when "unboxing"
+--        canRun = true,                                -- If true player can run while using the item, if not it will cancel the event
+--        time = 3500,                                  -- How long it takes to use the item
+--        type = "pack",                                -- Designate it as a "pack" to the script knows what to do
+--        pack = {
+--            item = "9_ammo",                          -- The item to give from the box when complete
+--            amount = 20                               -- How many of the item to give
+--        },
+--    },
+
+    -- Example Cigar Item wiht requirements
+--    ["cigar"] = {                                     -- Name of the item in your shared items
+--        emote = "smokecigar",                         -- The emote than should run when "smoking"
+--        canRun = true,                                -- If true player can run while using the item, if not it will cancel the event
+--        time = math.random(5000, 6000),               -- How long it takes to use the item
+--        type = "smoke",                               -- Designate it as a "smoke" to the script knows what to do
+--        requiredItem = "lighter",                     -- Set a required item making it unsable if they don't have it
+--        stats = {
+--            effect = "stress",
+--            time = 5000,
+--            amount = math.random(10, 15),
+--            canOD = false
+--        }
+--    },
+}

shared/emotes.lua

@@ -0,0 +1,89 @@
+Config = Config or {}
+
+Config.Emotes = {
+    drink = { "mp_player_intdrink", "loop_bottle", "Drink",                                     AnimationOptions = { Prop = "prop_ld_flow_bottle",      PropBone = 18905, PropPlacement = {0.12, 0.008, 0.03, 240.0, -60.0}, EmoteMoving = true, EmoteLoop = true, }},
+    milk = {"mp_player_intdrink", "loop_bottle", "Glass of milk",                               AnimationOptions = { Prop = 'bzzz_farmprops_milk_a',    PropBone = 18905, PropPlacement = {-0.02, -0.04, 0.1, 34.0, 140.0, 224.0}, EmoteLoop = true, EmoteMoving = true, }},
+    coffee = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Coffee",                AnimationOptions = { Prop = 'p_amb_coffeecup_01',       PropBone = 28422, PropPlacement = {0.0,0.0,0.0,0.0,0.0,0.0}, EmoteLoop = true, EmoteMoving = true }},
+    burger = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Burger",	                AnimationOptions = { Prop = 'prop_cs_burger_01',        PropBone = 18905, PropPlacement = {0.13,0.05,0.02,-50.0,16.0,60.0}, EmoteMoving = true }},
+    beer = {"amb@world_human_drinking@beer@male@idle_a", "idle_c", "Beer",                      AnimationOptions = { Prop = 'prop_amb_beer_bottle',     PropBone = 28422, PropPlacement = {0.0,0.0,0.06,0.0,15.0,0.0}, EmoteLoop = true, EmoteMoving = true }},
+    egobar = {"mp_player_inteat@burger", "mp_player_int_eat_burger","Ego Bar",                  AnimationOptions = { Prop = 'prop_choc_ego',            PropBone = 60309, PropPlacement = {0.0,0.0,0.0,0.0,0.0,0.0}, EmoteMoving = true }},
+    sandwich = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Sandwich",              AnimationOptions = { Prop = 'prop_sandwich_01',         PropBone = 18905, PropPlacement = {0.13,0.05,0.02,-50.0,16.0,60.0}, EmoteMoving = true }},
+    apple = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Apple",                    AnimationOptions = { Prop = 'idrp_apple_solo',          PropBone = 18905, PropPlacement = {0.13,0.05,0.02,-50.0,16.0,60.0}, EmoteMoving = true }},
+    avacado = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Avacado",                AnimationOptions = { Prop = 'idrp_avo_solo',            PropBone = 18905, PropPlacement = {0.13,0.05,0.02,-50.0,16.0,60.0}, EmoteMoving = true }},
+    banana = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Banana",                  AnimationOptions = { Prop = 'idrp_bana_solo',           PropBone = 18905, PropPlacement = {0.13,0.05,0.02,-50.0,16.0,60.0}, EmoteMoving = true }},
+    carrot = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Carrot",                  AnimationOptions = { Prop = 'idrp_carrot_single',       PropBone = 18905, PropPlacement = {0.13,0.05,0.02,-50.0,16.0,60.0}, EmoteMoving = true }},
+    orange = {"mp_player_inteat@burger", "mp_player_int_eat_burger", "Orange",                  AnimationOptions = { Prop = 'idrp_bana_solo',           PropBone = 18905, PropPlacement = {0.13,0.05,0.02,-50.0,16.0,60.0}, EmoteMoving = true }},
+    smoke3 = { "amb@world_human_aa_smoke@male@idle_a", "idle_b", "Smoke 3",                     AnimationOptions = { Prop = 'prop_cs_ciggy_01',         PropBone = 28422, PropPlacement = {0.0,0.0,0.0,0.0,0.0,0.0}, EmoteLoop = true, EmoteMoving = true }},
+    whiskey = { "amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Whiskey",             AnimationOptions = { Prop = 'prop_drink_whisky',        PropBone = 28422, PropPlacement = {0.01,-0.01,-0.06,0.0,0.0,0.0}, EmoteLoop = true, EmoteMoving = true } },
+    vodkab = {"mp_player_intdrink", "loop_bottle", "(Don't Use) Vodka Bottle",                  AnimationOptions = { Prop = 'prop_vodka_bottle',        PropBone = 18905, PropPlacement = {0.00, -0.26, 0.10, 240.0, -60.0}, EmoteMoving = true, EmoteLoop = true }},
+    cherenkov1 = {"mp_player_intdrink", "loop_bottle", "(Don't Use) Vodka Bottle",              AnimationOptions = { Prop = 'prop_cherenkov_01',        PropBone = 18905, PropPlacement = {0.00, -0.26, 0.10, 240.0, -60.0}, EmoteMoving = true, EmoteLoop = true }},
+    cherenkov2 = {"mp_player_intdrink", "loop_bottle", "(Don't Use) Vodka Bottle",              AnimationOptions = { Prop = 'prop_cherenkov_04',        PropBone = 18905, PropPlacement = {0.00, -0.26, 0.10, 240.0, -60.0}, EmoteMoving = true, EmoteLoop = true }},
+    cherenkov3 = {"mp_player_intdrink", "loop_bottle", "(Don't Use) Vodka Bottle",              AnimationOptions = { Prop = 'prop_cherenkov_03',        PropBone = 18905, PropPlacement = {0.00, -0.26, 0.10, 240.0, -60.0}, EmoteMoving = true, EmoteLoop = true }},
+    cherenkov4 = {"mp_player_intdrink", "loop_bottle", "(Don't Use) Vodka Bottle",              AnimationOptions = { Prop = 'prop_cherenkov_02',        PropBone = 18905, PropPlacement = {0.00, -0.26, 0.10, 240.0, -60.0}, EmoteMoving = true, EmoteLoop = true }},
+    bleuturd = {"mp_player_intdrink", "loop_bottle", "(Don't Use) Vodka Bottle",                AnimationOptions = { Prop = 'prop_champ_01b',           PropBone = 18905, PropPlacement = {0.00, -0.26, 0.10, 240.0, -60.0}, EmoteMoving = true, EmoteLoop = true }},
+    bourgeoix = {"mp_player_intdrink", "loop_bottle", "(Don't Use) Vodka Bottle",               AnimationOptions = { Prop = 'prop_bottle_cognac',       PropBone = 18905, PropPlacement = {0.00, -0.26, 0.10, 240.0, -60.0}, EmoteMoving = true, EmoteLoop = true }},
+    cardiaque = {"mp_player_intdrink", "loop_bottle", "(Don't Use) Vodka Bottle",               AnimationOptions = { Prop = 'prop_bottle_brandy',       PropBone = 18905, PropPlacement = {0.00, -0.26, 0.10, 240.0, -60.0}, EmoteMoving = true, EmoteLoop = true }},
+    raggae = {"mp_player_intdrink", "loop_bottle", "(Don't Use) Vodka Bottle",                  AnimationOptions = { Prop = 'prop_rum_bottle',          PropBone = 18905, PropPlacement = {0.00, -0.26, 0.10, 240.0, -60.0}, EmoteMoving = true, EmoteLoop = true }},
+    ecola = {"mp_player_intdrink", "loop_bottle", "E-cola",                                     AnimationOptions = { Prop = "prop_ecola_can",           PropBone = 18905, PropPlacement = {0.12, 0.008, 0.03, 240.0, -60.0}, EmoteMoving = true, EmoteLoop = true, }},
+    crisps = {"amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Chrisps",               AnimationOptions = { Prop = 'v_ret_ml_chips2',          PropBone = 28422, PropPlacement = {0.01, -0.05, -0.1, 0.0, 0.0, 90.0}, EmoteLoop = true, EmoteMoving = true, }},
+    sprunk = {"mp_player_intdrink", "loop_bottle", "Sprunk",                                    AnimationOptions = { Prop = "v_res_tt_can03",           PropBone = 18905, PropPlacement = {0.12, 0.008, 0.03, 240.0, -60.0}, EmoteMoving = true, EmoteLoop = true, }},
+    wine = { "anim@heists@humane_labs@finale@keycards",	"ped_a_enter_loop",	"Wine",             AnimationOptions = { Prop = 'prop_drink_redwine',       PropBone = 18905, PropPlacement = {0.10, -0.03, 0.03, -100.0, 0.0, -10.0}, EmoteMoving = true, EmoteLoop = true }},
+    champagne = { "anim@heists@humane_labs@finale@keycards", "ped_a_enter_loop", "Champagne",   AnimationOptions = { Prop = 'prop_drink_champ',         PropBone = 18905, PropPlacement = { 0.10, -0.03, 0.03, -100.0, 0.0, -10.0 }, EmoteMoving = true, EmoteLoop = true }},
+    croissant = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Croissant",           AnimationOptions = { Prop = 'bzzz_foodpack_croissant001', PropBone = 60309, PropPlacement = { 0.00, 0.0, -0.01, 0.0, 0.0, 90.0 }, EmoteMoving = true }},
+    cup = { "amb@world_human_drinking@coffee@male@idle_a", "idle_c", "Cup",                     AnimationOptions = { Prop = 'prop_plastic_cup_02',      PropBone = 28422, PropPlacement = { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }, EmoteLoop = true, EmoteMoving = true }},
+    desert = { "mp_player_inteat@burger", "mp_player_int_eat_burger","Eat dessert",             AnimationOptions = { Prop = 'bzzz_food_dessert_a',      PropBone = 18905, PropPlacement = { 0.15, 0.03, 0.03, -42.0, -36.0, 0.0 }, EmoteMoving = true}},
+    dinner = { "anim@scripted@island@special_peds@pavel@hs4_pavel_ig5_caviar_p1", "base_idle", "Dinner", AnimationOptions = { Prop = "prop_cs_plate_01", PropBone = 60309, PropPlacement = { 0.0, 0.0, 0.0, 0.0, 0.0 }, SecondProp = 'h4_prop_h4_caviar_spoon_01a', SecondPropBone = 28422, SecondPropPlacement = { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }, EmoteLoop = true, EmoteMoving = true }},
+    flute = { "anim@heists@humane_labs@finale@keycards", "ped_a_enter_loop", "Flute",           AnimationOptions = { Prop = 'prop_champ_flute',         PropBone = 18905, PropPlacement = { 0.10, -0.03, 0.03, -100.0, 0.0, -10.0 }, EmoteMoving = true, EmoteLoop = true }},
+    frappe = { "amb@code_human_wander_drinking@male@base", "static", "Frappe",                  AnimationOptions = { Prop = 'brum_heartfrappe',         PropBone = 28422, PropPlacement = { 0.0, -0.0150, -0.0100, 0.0, -3.9999, 0.0 }, EmoteLoop = true, EmoteMoving = true }},
+    frappe2 = { "amb@code_human_wander_drinking@female@base", "static", "Frappe 2",             AnimationOptions = { Prop = 'beanmachine_cup',          PropBone = 28422, PropPlacement = { 0.0110, 0.0, 0.0300, 0.0, 0.0, -140.0 }, EmoteLoop = true, EmoteMoving = true }},
+    frappe3 = { "amb@code_human_wander_drinking@female@base", "static", "Frappe 3",             AnimationOptions = { Prop = 'beanmachine_cup2',         PropBone = 28422, PropPlacement = { 0.0, 0.0, -0.0600, 0.0, 0.0, -178.0 }, EmoteLoop = true, EmoteMoving = true }},
+    frappe4 = { "amb@code_human_wander_drinking@female@base", "static", "Frappe 4",             AnimationOptions = { Prop = 'beanmachine_cup3',         PropBone = 28422, PropPlacement = { 0.0, 0.0, -0.0600, 0.0, 0.0, -178.0 }, EmoteLoop = true, EmoteMoving = true }},
+    hotdog = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Hotdog",                 AnimationOptions = { Prop = 'prop_cs_hotdog_02',        PropBone = 60309, PropPlacement = { -0.0300, 0.0100, -0.0100, 95.1071, 94.7001, -66.9179 }, EmoteMoving = true }},
+    icecreama = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Ice cream Cherry",    AnimationOptions = { Prop = 'bzzz_icecream_cherry',     PropBone = 18905, PropPlacement = { 0.14, 0.03, 0.01, 85.0, 70.0, -203.0 }, EmoteMoving = true }},
+    icecreamb = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Ice cream Chocolate", AnimationOptions = { Prop = 'bzzz_icecream_chocolate',  PropBone = 18905, PropPlacement = { 0.14, 0.03, 0.01, 85.0, 70.0, -203.0 }, EmoteMoving = true }},
+    icecreamc = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Ice cream Lemon",     AnimationOptions = { Prop = 'bzzz_icecream_lemon',      PropBone = 18905, PropPlacement = { 0.14, 0.03, 0.01, 85.0, 70.0, -203.0 }, EmoteMoving = true }},
+    icecreamd = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Ice cream Pistachio", AnimationOptions = { Prop = 'bzzz_icecream_pistachio',  PropBone = 18905, PropPlacement = { 0.14, 0.03, 0.01, 85.0, 70.0, -203.0 }, EmoteMoving = true }},
+    icecreame = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Ice cream Raspberry", AnimationOptions = { Prop = 'bzzz_icecream_raspberry',  PropBone = 18905, PropPlacement = { 0.14, 0.03, 0.01, 85.0, 70.0, -203.0 }, EmoteMoving = true }},
+    icecreamf = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Ice cream Stracciatella", AnimationOptions = { Prop = 'bzzz_icecream_stracciatella', PropBone = 18905, PropPlacement = { 0.14, 0.03, 0.01, 85.0, 70.0, -203.0 }, EmoteMoving = true }},
+    icecreamg = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Ice cream Strawberry", AnimationOptions = { Prop = 'bzzz_icecream_strawberry', PropBone = 18905, PropPlacement = { 0.14, 0.03, 0.01, 85.0, 70.0, -203.0 }, EmoteMoving = true }},
+    icecreamh = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Ice cream Walnut",    AnimationOptions = { Prop = 'bzzz_icecream_walnut',     PropBone = 18905, PropPlacement = { 0.14, 0.03, 0.01, 85.0, 70.0, -203.0 }, EmoteMoving = true }},
+    macaroon = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Macaroon",             AnimationOptions = { Prop = 'bzzz_food_xmas_macaroon_a', PropBone = 18905, PropPlacement = { 0.15, 0.07, 0.00, 38.0, 7.0, 7.0 }, EmoteMoving = true }},
+    sipshake = { "smo@milkshake_idle", "milkshake_idle_clip", "Sip Milkshake - Bubblegum",      AnimationOptions = { Prop = 'brum_cherryshake_raspberry', PropBone = 28422, PropPlacement = { 0.0850, 0.0670, -0.0350, -115.0862, -165.7841, 24.1318 }, EmoteLoop = true, EmoteMoving = true }},
+    sipshakeb = { "smo@milkshake_idle", "milkshake_idle_clip", "Sip Milkshake - Cherry",        AnimationOptions = { Prop = 'brum_cherryshake_cherry',  PropBone = 28422, PropPlacement = { 0.0850, 0.0670, -0.0350, -115.0862, -165.7841, 24.1318 }, EmoteLoop = true, EmoteMoving = true }},
+    sipshakec = { "smo@milkshake_idle", "milkshake_idle_clip", "Sip Milkshake - Chocolate",     AnimationOptions = { Prop = 'brum_cherryshake_chocolate', PropBone = 28422, PropPlacement = { 0.0850, 0.0670, -0.0350, -115.0862, -165.7841, 24.1318 }, EmoteLoop = true, EmoteMoving = true }},
+    sipshaked = { "smo@milkshake_idle", "milkshake_idle_clip", "Sip Milkshake - Coffee",        AnimationOptions = { Prop = 'brum_cherryshake_coffee',  PropBone = 28422, PropPlacement = { 0.0850, 0.0670, -0.0350, -115.0862, -165.7841, 24.1318 }, EmoteLoop = true, EmoteMoving = true }},
+    sipshakee = { "smo@milkshake_idle", "milkshake_idle_clip", "Sip Milkshake - Double Chocolate", AnimationOptions = { Prop = 'brum_cherryshake_doublechocolate', PropBone = 28422, PropPlacement = { 0.0850, 0.0670, -0.0350, -115.0862, -165.7841, 24.1318 }, EmoteLoop = true, EmoteMoving = true }},
+    sipshakef = { "smo@milkshake_idle", "milkshake_idle_clip", "Sip Milkshake - Frappe",        AnimationOptions = { Prop = 'brum_cherryshake_frappe', PropBone = 28422, PropPlacement = { 0.0850, 0.0670, -0.0350, -115.0862, -165.7841, 24.1318 }, EmoteLoop = true, EmoteMoving = true }},
+    sipshakeg = { "smo@milkshake_idle", "milkshake_idle_clip", "Sip Milkshake - Lemon",         AnimationOptions = { Prop = 'brum_cherryshake_lemon', PropBone = 28422, PropPlacement = { 0.0850, 0.0670, -0.0350, -115.0862, -165.7841, 24.1318 }, EmoteLoop = true, EmoteMoving = true }},
+    sipshakeh = { "smo@milkshake_idle", "milkshake_idle_clip", "Sip Milkshake - Mint",          AnimationOptions = { Prop = 'brum_cherryshake_mint', PropBone = 28422, PropPlacement = { 0.0850, 0.0670, -0.0350, -115.0862, -165.7841, 24.1318 }, EmoteLoop = true, EmoteMoving = true }},
+    sipshakei = { "smo@milkshake_idle", "milkshake_idle_clip", "Sip Milkshake - Strawberry",    AnimationOptions = { Prop = 'brum_cherryshake_strawberry', PropBone = 28422, PropPlacement = { 0.0850, 0.0670, -0.0350, -115.0862, -165.7841, 24.1318 }, EmoteLoop = true, EmoteMoving = true }},
+    sipshakej = { "smo@milkshake_idle", "milkshake_idle_clip", "Sip Milkshake - Raspberry",     AnimationOptions = { Prop = 'brum_cherryshake_raspberry', PropBone = 28422, PropPlacement = { 0.0850, 0.0670, -0.0350, -115.0862, -165.7841, 24.1318 }, EmoteLoop = true, EmoteMoving = true }},
+    sipshakek = { "smo@milkshake_idle", "milkshake_idle_clip", "Sip Milkshake - Salted",        AnimationOptions = { Prop = 'brum_cherryshake_salted', PropBone = 28422, PropPlacement = { 0.0850, 0.0670, -0.0350, -115.0862, -165.7841, 24.1318 }, EmoteLoop = true, EmoteMoving = true }},
+    sipshakel = { "smo@milkshake_idle", "milkshake_idle_clip", "Sip Milkshake - Vanilla",       AnimationOptions = { Prop = 'brum_cherryshake_vanilla', PropBone = 28422, PropPlacement = { 0.0850, 0.0670, -0.0350, -115.0862, -165.7841, 24.1318 }, EmoteLoop = true, EmoteMoving = true }},
+    pizzaslice = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Pizza Slice - Jalapeño And Peperoni", AnimationOptions = { Prop = 'knjgh_pizzaslice1', PropBone = 60309, PropPlacement = { 0.0500, -0.0200, -0.0200, 73.6928, -66.7427, 68.3677 }, EmoteMoving = true }},
+    pizzas = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Pizza Slice - Jalapeño And Peperoni", AnimationOptions = { Prop = 'knjgh_pizzaslice1', PropBone = 60309, PropPlacement = { 0.0500, -0.0200, -0.0200, 73.6928, -66.7427, 68.3677 }, EmoteMoving = true }},
+    pizzas2 = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Pizza Slice - Tomato And Pesto", AnimationOptions = { Prop = 'knjgh_pizzaslice2', PropBone = 60309, PropPlacement = { 0.0500, -0.0200, -0.0200, 73.6928, -66.7427, 68.3677 }, EmoteMoving = true }},
+    pizzas3 = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Pizza Slice - Mushroom", AnimationOptions = { Prop = 'knjgh_pizzaslice3', PropBone = 60309, PropPlacement = { 0.0500, -0.0200, -0.0200, 73.6928, -66.7427, 68.3677 }, EmoteMoving = true }},
+    pizzas4 = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Pizza Slice - Margherita", AnimationOptions = { Prop = 'knjgh_pizzaslice4', PropBone = 60309, PropPlacement = { 0.0500, -0.0200, -0.0200, 73.6928, -66.7427, 68.3677 }, EmoteMoving = true }},
+    pizzas5 = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Pizza Slice - Double Peperoni", AnimationOptions = { Prop = 'knjgh_pizzaslice5', PropBone = 60309, PropPlacement = { 0.0500, -0.0200, -0.0200, 73.6928, -66.7427, 68.3677 }, EmoteMoving = true }},
+    popcorn = { "amb@code_human_wander_drinking@female@base", "static", "Popcorn",              AnimationOptions = { Prop = 'prop_taymckenzienz_popcorn', PropBone = 28422, PropPlacement = { -0.0200, -0.0100, -0.0700, -179.3626, 176.9331, 11.9833 }, EmoteLoop = true, EmoteMoving = true }},
+    sipsoda = { "smo@milkshake_idle", "milkshake_idle_clip", "Sip Soda Cup - Sprunk",           AnimationOptions = { Prop = 'prop_rpemotes_soda01', PropBone = 28422, PropPlacement = { 0.0470, 0.0040, -0.0600, -88.0263, -25.0367, -27.3898 }, EmoteLoop = true, EmoteMoving = true }},
+    sipsodab = { "smo@milkshake_idle", "milkshake_idle_clip", "Sip Soda Cup - Sprunk Light",    AnimationOptions = { Prop = 'prop_rpemotes_soda02', PropBone = 28422, PropPlacement = { 0.0470, 0.0040, -0.0600, -88.0263, -25.0367, -27.3898 }, EmoteLoop = true, EmoteMoving = true }},
+    sipsodac = { "smo@milkshake_idle", "milkshake_idle_clip", "Sip Soda Cup - eCola",           AnimationOptions = { Prop = 'prop_rpemotes_soda03', PropBone = 28422, PropPlacement = { 0.0470, 0.0040, -0.0600, -88.0263, -25.0367, -27.3898 }, EmoteLoop = true, EmoteMoving = true }},
+    sipsodad = { "smo@milkshake_idle", "milkshake_idle_clip", "Sip Soda Cup - eCola Light",     AnimationOptions = { Prop = 'prop_rpemotes_soda04', PropBone = 28422, PropPlacement = { 0.0470, 0.0040, -0.0600, -88.0263, -25.0367, -27.3898 }, EmoteLoop = true, EmoteMoving = true }},
+    taco = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Taco",                     AnimationOptions = { Prop = 'prop_taco_01', PropBone = 60309, PropPlacement = { -0.0170, 0.0070, -0.0210, 107.9846, -105.0251, 55.7779 }, EmoteMoving = true }},
+    xmascc = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Xmas Cupcake",           AnimationOptions = { Prop = 'pata_christmasfood6', PropBone = 60309, PropPlacement = { 0.0100, 0.0200, -0.0100, -170.1788, 87.6716, 30.0540 }, EmoteMoving = true }},
+    xmascc2 = { "mp_player_inteat@burger", "mp_player_int_eat_burger", "Xmas Cupcake 2",        AnimationOptions = { Prop = 'pata_christmasfood8', PropBone = 60309, PropPlacement = { 0.0200, 0.0, -0.0100, 9.3608, -90.1809, 66.3689 }, EmoteMoving = true }},
+    xmasic = { "anim@scripted@island@special_peds@pavel@hs4_pavel_ig5_caviar_p1", "base_idle", "Xmas Ice Cream", AnimationOptions = { Prop = "pata_christmasfood7", PropBone = 60309, PropPlacement = { -0.0460, 0.0000, -0.0300, 0.0, 0.0, -50.0000 }, SecondProp = 'h4_prop_h4_coke_spoon_01', SecondPropBone = 28422, SecondPropPlacement = { 0.0, 0.0, 0.0, 0.0, 20.0, 0.0 }, EmoteLoop = true, EmoteMoving = true }},
+    xmaswine = { "mp_player_intdrink", "loop_bottle", "Xmas Mulled Wine",                       AnimationOptions = { Prop = 'bzzz_food_xmas_mulled_wine_a', PropBone = 18905, PropPlacement = { 0.13, 0.03, 0.05, -110.0, -47.0, 7.0 }, EmoteMoving = true }},
+    cocoa = { "amb@world_human_aa_coffee@base", "base", "Xmas Cocoa",                           AnimationOptions = { Prop = 'pata_christmasfood1', PropBone = 28422, PropPlacement = { 0.0100, -0.1100, -0.1300, 0.0, 0.0, 0.0 }, EmoteLoop = true, EmoteMoving = true }},
+    coke = { "switch@trevor@trev_smoking_meth", "trev_smoking_meth_loop", "Coke",               AnimationOptions = { EmoteLoop = true, EmoteMoving = true }},
+    oxy = { "mp_suicide", "pill", "Oxy",                                                        AnimationOptions = { EmoteLoop = true, EmoteMoving = true }},
+    cigar = { "amb@world_human_smoking@male@male_a@enter", "enter", "Cigar",                    AnimationOptions = { Prop = 'prop_cigar_02', PropBone = 47419, PropPlacement = { 0.010, 0.0, 0.0, 50.0, 0.0, -80.0 }, EmoteMoving = true, EmoteDuration = 2600 }},
+    cigar2 = { "amb@world_human_smoking@male@male_a@enter", "enter", "Cigar 2",                 AnimationOptions = { Prop = 'prop_cigar_01', PropBone = 47419, PropPlacement = { 0.010, 0.0, 0.0, 50.0, 0.0, -80.0 }, EmoteMoving = true, EmoteDuration = 2600 }},
+    joint = { "amb@world_human_smoking@male@male_a@enter", "enter", "Joint",                    AnimationOptions = { Prop = 'p_cs_joint_02', PropBone = 47419, PropPlacement = { 0.015, -0.009, 0.003, 55.0, 0.0, 110.0 }, EmoteMoving = true, EmoteDuration = 2600 }},
+    cig = { "amb@world_human_smoking@male@male_a@enter", "enter", "Cig",                        AnimationOptions = { Prop = 'prop_amb_ciggy_01', PropBone = 47419, PropPlacement = { 0.015, -0.009, 0.003, 55.0, 0.0, 110.0 }, EmoteMoving = true, EmoteDuration = 2600 }},
+    smoke2 = { "amb@world_human_aa_smoke@male@idle_a", "idle_c", "Smoke 2",                     AnimationOptions = { Prop = 'prop_cs_ciggy_01', PropBone = 28422, PropPlacement = { 0.0, 0.0, 0.0, 0.0, 0.0, 0.0 }, EmoteLoop = true, EmoteMoving = true }},
+    smokecigar = { "amb@world_human_aa_smoke@male@idle_a", "idle_c", "Smoke Cigar",             AnimationOptions = { Prop = 'prop_cigar_01', PropBone = 28422, PropPlacement = { 0.0, 0.0, 0.0, 0.0, 0.0, 180.0 }, EmoteLoop = true, EmoteMoving = true }},
+    uncuff = { "mp_arresting", "a_uncuff", "Uncuff",                                            AnimationOptions = { EmoteLoop = true, EmoteMoving = true }},
+}

shared/shared.lua

@@ -1,247 +1,39 @@
-local QBCore = exports['qb-core']:GetCoreObject()
+function tempLockInv(toggle)
-RegisterNetEvent('QBCore:Client:UpdateObject', function() QBCore = exports['qb-core']:GetCoreObject() end)
+    LocalPlayer.state:set("inv_busy", toggle, true)
-
+    TriggerEvent('inventory:client:busy:status', toggle)
-local time = 1000
+    TriggerEvent('canUseInventoryAndHotbar:toggle', not toggle)
-function loadModel(model) if not HasModelLoaded(model) then
-	if Config.Debug then print("^5Debug^7: ^2Loading Model^7: '^6"..model.."^7'") end
-	while not HasModelLoaded(model) do
-		if time > 0 then time -= 1 RequestModel(model)
-		else time = 1000 print("^5Debug^7: ^3LoadModel^7: ^2Timed out loading model ^7'^6"..model.."^7'") break
-		end
-		Wait(10)
-	end
-end end
-function unloadModel(model) if Config.Debug then print("^5Debug^7: ^2Removing Model^7: '^6"..model.."^7'") end SetModelAsNoLongerNeeded(model) end
-function loadAnimDict(dict)	if not HasAnimDictLoaded(dict) then if Config.Debug then print("^5Debug^7: ^2Loading Anim Dictionary^7: '^6"..dict.."^7'") end while not HasAnimDictLoaded(dict) do RequestAnimDict(dict) Wait(5) end end end
-function unloadAnimDict(dict) if Config.Debug then print("^5Debug^7: ^2Removing Anim Dictionary^7: '^6"..dict.."^7'") end RemoveAnimDict(dict) end
-function loadPtfxDict(dict)	if not HasNamedPtfxAssetLoaded(dict) then if Config.Debug then print("^5Debug^7: ^2Loading Ptfx Dictionary^7: '^6"..dict.."^7'") end while not HasNamedPtfxAssetLoaded(dict) do RequestNamedPtfxAsset(dict) Wait(5) end end end
-function unloadPtfxDict(dict) if Config.Debug then print("^5Debug^7: ^2Removing Ptfx Dictionary^7: '^6"..dict.."^7'") end RemoveNamedPtfxAsset(dict) end
-
-function destroyProp(entity)
-	if Config.Debug then print("^5Debug^7: ^2Destroying Prop^7: '^6"..entity.."^7'") end
-	SetEntityAsMissionEntity(entity) Wait(5)
-	DetachEntity(entity, true, true) Wait(5)
-	DeleteObject(entity)
 end
 
-function makeProp(data, freeze, synced)
+function GenerateRandomValues(data)
-    loadModel(data.prop)
+    local transData = {}
-    local prop = CreateObject(data.prop, data.coords.x, data.coords.y, data.coords.z-1.03, synced or false, synced or false, 0)
+    for k, v in pairs(data) do
-    SetEntityHeading(prop, data.coords.w+180.0)
+        if type(v) == "table" then
-    FreezeEntityPosition(prop, freeze or 0)
+            debugPrint("Converting Table "..json.encode(v).." to math.random")
-    if Config.Debug then print("^5Debug^7: ^6Prop ^2Created ^7: '^6"..prop.."^7'") end
+            transData[k] = math.random(v[1], v[2])
-    return prop
+            debugPrint("Translated value: "..k.." - "..transData[k])
-end
+        else
-function triggerNotify(title, message, type, src)
+            transData[k] = v
-	if Config.Notify == "okok" then
+        end
-		if not src then	exports['okokNotify']:Alert(title, message, 6000, type)
-		else TriggerClientEvent('okokNotify:Alert', src, title, message, 6000, type) end
-	elseif Config.Notify == "qb" then
-		if not src then	TriggerEvent("QBCore:Notify", message, type)
-		else TriggerClientEvent("QBCore:Notify", src, message, type) end
-	elseif Config.Notify == "t" then
-		if not src then exports['t-notify']:Custom({title = title, style = type, message = message, sound = true})
-		else TriggerClientEvent('t-notify:client:Custom', src, { style = type, duration = 6000, title = title, message = message, sound = true, custom = true}) end
-	elseif Config.Notify == "infinity" then
-		if not src then TriggerEvent('infinity-notify:sendNotify', message, type)
-		else TriggerClientEvent('infinity-notify:sendNotify', src, message, type) end
-	elseif Config.Notify == "rr" then
-		if not src then exports.rr_uilib:Notify({msg = message, type = type, style = "dark", duration = 6000, position = "top-right", })
-		else TriggerClientEvent("rr_uilib:Notify", src, {msg = message, type = type, style = "dark", duration = 6000, position = "top-right", }) end
-	end
-end
-
-function countTable(table) local i = 0 for keys in pairs(table) do i = i + 1 end return i end
-
-function toggleItem(give, item, amount) TriggerServerEvent("jim-consumables:server:toggleItem", give, item, amount) end
-
---Screen Effects
-local alienEffect = false
-function AlienEffect()
-    if alienEffect then return else alienEffect = true end
-    if Config.Debug then print("^5Debug^7: ^3AlienEffect^7() ^2activated") end
-    AnimpostfxPlay("DrugsMichaelAliensFightIn", 3.0, 0)
-    Wait(math.random(5000, 8000))
-    local Ped = PlayerPedId()
-    local animDict = "MOVE_M@DRUNK@VERYDRUNK"
-    loadAnimDict(animDict)
-    SetPedCanRagdoll(Ped, true)
-    ShakeGameplayCam('DRUNK_SHAKE', 2.80)
-    SetTimecycleModifier("Drunk")
-    SetPedMovementClipset(Ped, animDict, 1)
-    SetPedMotionBlur(Ped, true)
-    SetPedIsDrunk(Ped, true)
-    Wait(1500)
-    SetPedToRagdoll(Ped, 5000, 1000, 1, 0, 0, 0)
-    Wait(13500)
-    SetPedToRagdoll(Ped, 5000, 1000, 1, 0, 0, 0)
-    Wait(120500)
-    ClearTimecycleModifier()
-    ResetScenarioTypesEnabled()
-    ResetPedMovementClipset(Ped, 0)
-    SetPedIsDrunk(Ped, false)
-    SetPedMotionBlur(Ped, false)
-    AnimpostfxStopAll()
-    ShakeGameplayCam('DRUNK_SHAKE', 0.0)
-    AnimpostfxPlay("DrugsMichaelAliensFight", 3.0, 0)
-    Wait(math.random(45000, 60000))
-    AnimpostfxPlay("DrugsMichaelAliensFightOut", 3.0, 0)
-    AnimpostfxStop("DrugsMichaelAliensFightIn")
-    AnimpostfxStop("DrugsMichaelAliensFight")
-    AnimpostfxStop("DrugsMichaelAliensFightOut")
-    alienEffect = false
-    if Config.Debug then print("^5Debug^7: ^3AlienEffect^7() ^2stopped") end
-end
-local weedEffect = false
-function WeedEffect()
-    if weedEffect then return else weedEffect = true end
-    if Config.Debug then print("^5Debug^7: ^3WeedEffect^7() ^2activated") end
-    AnimpostfxPlay("DrugsMichaelAliensFightIn", 3.0, 0)
-    Wait(math.random(3000, 20000))
-    AnimpostfxPlay("DrugsMichaelAliensFight", 3.0, 0)
-    Wait(math.random(15000, 20000))
-    AnimpostfxPlay("DrugsMichaelAliensFightOut", 3.0, 0)
-    AnimpostfxStop("DrugsMichaelAliensFightIn")
-    AnimpostfxStop("DrugsMichaelAliensFight")
-    AnimpostfxStop("DrugsMichaelAliensFightOut")
-    weedEffect = false
-    if Config.Debug then print("^5Debug^7: ^3WeedEffect^7() ^2stopped") end
-end
-local trevorEffect = false
-function TrevorEffect()
-    if trevorEffect then return else trevorEffect = true end
-    if Config.Debug then print("^5Debug^7: ^3TrevorEffect^7() ^2activated") end
-    AnimpostfxPlay("DrugsTrevorClownsFightIn", 3.0, 0)
-    Wait(3000)
-    AnimpostfxPlay("DrugsTrevorClownsFight", 3.0, 0)
-    Wait(30000)
-	AnimpostfxPlay("DrugsTrevorClownsFightOut", 3.0, 0)
-	AnimpostfxStop("DrugsTrevorClownsFight")
-	AnimpostfxStop("DrugsTrevorClownsFightIn")
-	AnimpostfxStop("DrugsTrevorClownsFightOut")
-    trevorEffect = false
-    if Config.Debug then print("^5Debug^7: ^3TrevorEffect^7() ^2stopped") end
-end
-local turboEffect = false
-function TurboEffect()
-    if turboEffect then return else turboEffect = true end
-    if Config.Debug then print("^5Debug^7: ^3TurboEffect^7() ^2activated") end
-    AnimpostfxPlay('RaceTurbo', 0, true)
-    SetTimecycleModifier('rply_motionblur')
-    ShakeGameplayCam('SKY_DIVING_SHAKE', 0.25)
-    Wait(30000)
-    StopGameplayCamShaking(true)
-    SetTransitionTimecycleModifier('default', 0.35)
-    Wait(1000)
-    ClearTimecycleModifier()
-    AnimpostfxStop('RaceTurbo')
-    turboEffect = false
-    if Config.Debug then print("^5Debug^7: ^3TurboEffect^7() ^2stopped") end
-end
-local rampageEffect = false
-function RampageEffect()
-    if rampageEffect then return else rampageEffect = true end
-    if Config.Debug then print("^5Debug^7: ^3RampageEffect^7() ^2activated") end
-    AnimpostfxPlay('Rampage', 0, true)
-    SetTimecycleModifier('rply_motionblur')
-    ShakeGameplayCam('SKY_DIVING_SHAKE', 0.25)
-    Wait(30000)
-    StopGameplayCamShaking(true)
-    SetTransitionTimecycleModifier('default', 0.35)
-    Wait(1000)
-    ClearTimecycleModifier()
-    AnimpostfxStop('Rampage')
-    rampageEffect = false
-    if Config.Debug then print("^5Debug^7: ^3RampageEffect^7() ^2stopped") end
-end
-local focusEffect = false
-function FocusEffect()
-    if focusEffect then return else focusEffect = true end
-    if Config.Debug then print("^5Debug^7: ^3FocusEffect^7() ^2activated") end
-    Wait(1000)
-    AnimpostfxPlay('FocusIn', 0, true)
-    Wait(30000)
-    AnimpostfxStop('FocusIn')
-    focusEffect = false
-    if Config.Debug then print("^5Debug^7: ^3FocusEffect^7() ^2stopped") end
-end
-local NightVisionEffect = false
-function NightVisionEffect()
-    if NightVisionEffect then return else NightVisionEffect = true end
-    if Config.Debug then print("^5Debug^7: ^3NightVisionEffect^7() ^2activated") end
-    SetNightvision(true)
-    Wait(math.random(3000, 4000))  -- FEEL FREE TO CHANGE THIS
-    SetNightvision(false)
-    SetSeethrough(false)
-    NightVisionEffect = false
-    if Config.Debug then print("^5Debug^7: ^3NightVisionEffect^7() ^2stopped") end
-end
-local thermalEffect = false
-function ThermalEffect()
-    if thermalEffect then return else thermalEffect = true end
-    if Config.Debug then print("^5Debug^7: ^3ThermalEffect^7() ^2activated") end
-    SetNightvision(true)
-    SetSeethrough(true)
-    Wait(math.random(2000, 3000))  -- FEEL FREE TO CHANGE THIS
-    SetNightvision(false)
-    SetSeethrough(false)
-    thermalEffect = false
-    if Config.Debug then print("^5Debug^7: ^3ThermalEffect^7() ^2stopped") end
-end
-
---Built-in Buff effects
-local healEffect = false
-function HealEffect(data)
-    if healEffect then return end
-    if Config.Debug then print("^5Debug^7: ^3HealEffect^7() ^2activated") end
-    healEffect = true
-    local count = (data[1] / 1000)
-    while count > 0 do
-        Wait(1000)
-        count -= 1
-        SetEntityHealth(PlayerPedId(), GetEntityHealth(PlayerPedId()) + data[2])
     end
-    healEffect = false
-    if Config.Debug then print("^5Debug^7: ^3HealEffect^7() ^2stopped") end
-end
 
-local staminaEffect = false
+    if transData.hunger > 0 then
-function StaminaEffect(data)
+        transData.hunger = transData.hunger > 100 and 100 or transData.hunger
-    if staminaEffect then return end
-    if Config.Debug then print("^5Debug^7: ^3StaminaEffect^7() ^2activated") end
-    staminaEffect = true
-    local startStamina = (data[1] / 1000)
-    SetRunSprintMultiplierForPlayer(PlayerId(), 1.49)
-    while startStamina > 0 do
-        Wait(1000)
-        if math.random(5, 100) < 10 then RestorePlayerStamina(PlayerId(), data[2]) end
-        startStamina -= 1
-        if math.random(5, 100) < 51 then end
     end
-    startStamina = 0
-    SetRunSprintMultiplierForPlayer(PlayerId(), 1.0)
-    staminaEffect = false
-    if Config.Debug then print("^5Debug^7: ^3StaminaEffect^7() ^2stopped") end
-end
 
-function StopEffects() -- Used to clear up any effects stuck on screen
+    if transData.thirst > 0 then
-    if Config.Debug then print("^5Debug^7: ^2All screen effects stopped") end
+        transData.thirst = transData.thirst > 100 and 100 or transData.thirst
-    ShakeGameplayCam('DRUNK_SHAKE', 0.0)
+    end
-    SetPedToRagdoll(PlayerPedId(), 5000, 1000, 1, 0, 0, 0)
+
-    ClearTimecycleModifier()
+    if transData.stress > 0 then
-    ResetScenarioTypesEnabled()
+        transData.stress = transData.stress > 100 and 100 or transData.stress
-    ResetPedMovementClipset(PlayerPedId(), 0)
+    end
-    SetPedIsDrunk(PlayerPedId(), false)
+
-    SetPedMotionBlur(PlayerPedId(), false)
+    return  transData["time"],
-    SetNightvision(false)
+            transData["heal"],
-    SetSeethrough(false)
+            transData["armor"],
-    AnimpostfxStop("DrugsMichaelAliensFightIn")
+            {
-    AnimpostfxStop("DrugsMichaelAliensFight")
+                hunger = transData["hunger"] or 0,
-    AnimpostfxStop("DrugsMichaelAliensFightOut")
+                thirst = transData["thirst"] or 0,
-	AnimpostfxStop("DrugsTrevorClownsFight")
+                stress = transData["stress"] or 0
-	AnimpostfxStop("DrugsTrevorClownsFightIn")
+            }
-	AnimpostfxStop("DrugsTrevorClownsFightOut")
-    AnimpostfxStop('RaceTurbo')
-    AnimpostfxStop('FocusIn')
-    AnimpostfxStop('Rampage')
 end

version.txt

@@ -0,0 +1,6 @@
+2.0.09
+
+- Fix possible issue with nil needTypes tables being sent
+- Fix packitems and return items not giving any items
+
+https://github.com/jimathy/jim-consumables/releases/latest