Merge pull request #75 from Mustachedom:update

Update

ate_balloon/fxmanifest.lua

@@ -0,0 +1,25 @@
+fx_version 'cerulean'
+game 'gta5'
+
+lua54 'yes'
+this_is_a_map 'yes'
+
+author 'Atenea'
+description 'Props para ti <3'
+version '1.0.1'
+
+---------------------------------------------------------------------------
+-- INCLUDED FILES
+---------------------------------------------------------------------------
+files {
+    'stream/*.ytyp',
+}
+
+data_file 'DLC_ITYP_REQUEST' 'stream/*.ytyp'
+
+dependency '/assetpacks'
+
+
+escrow_ignore {
+    'stream/*.ydr',
+}

ate_balloon/readme.txt

@@ -0,0 +1,20 @@
+Thank you for your purchase!
+We hope you enjoy this prop ♥
+
+Author: Atenea Store | Atenea
+
+-- IMPORTANT --
+/Please read below.
+
+► If you rename the folder or files I will not be responsible if it does not work correctly afterwards.
+
+► If you encounter any problems, errors, or have any questions related to our prop, JOIN OUR DISCORD.
+Don't hesitate to open a ticket, we’ll assist you as quickly as possible.
+
+				https://discord.gg/mam8Nmg49d
+
+				SCRIPTS
+				https://discord.gg/S5WZ7ecKDc
+
+Make sure you’ve already READ our post on FiveM/Tebex/Discord.
+Atenea from the Atenea Store Team.

client/whippit.lua

@@ -0,0 +1,77 @@
+local prop = nil
+local function animation(color)
+    local coords = GetEntityCoords(PlayerPedId())
+    ps.requestAnim('mp_player_intdrink')
+    ps.requestModel(color)
+    prop = CreateObject(GetHashKey(color), coords.x, coords.y, coords.z, true, true, true)
+    AttachEntityToEntity(prop, PlayerPedId(), GetPedBoneIndex(PlayerPedId(), 18905), 0.087000, -0.130001, 0.138999, 63.630001, 3.299881, -21.000000, true, true, false, true, 1, true)
+    TaskPlayAnim(PlayerPedId(), 'mp_player_intdrink', 'loop_bottle', 8.0, -8.0, -1, 49, 0, false, false, false)
+    if ps.progressbar('Inhaling Nitrous', 5000, false) then
+        ClearPedTasks(PlayerPedId())
+        DetachEntity(prop, true, true)
+        DeleteEntity(prop)
+        prop = nil
+        return true
+    else
+        ClearPedTasks(PlayerPedId())
+        DetachEntity(prop, true, true)
+        DeleteEntity(prop)
+        prop = nil
+        return false
+    end
+end
+local function blur(duration)
+    CreateThread(function()
+        TriggerScreenblurFadeIn(1000)
+        Wait(duration)
+        TriggerScreenblurFadeOut(1000)
+    end)
+end
+
+ps.registerCallback('md-drugs:client:useWhippit', function(color)
+    if animation(color) then
+        blur(30000)
+        return true
+    else
+        return false
+    end
+end)
+
+local function spawnShops()
+    local locations = ps.callback('md-drugs:server:getWhippitLocations')
+    for k, v in pairs(locations) do
+        ps.requestModel(v.ped)
+        local ped = CreatePed(5, GetHashKey(v.ped), v.loc.x, v.loc.y, v.loc.z, v.loc.w, true, true)
+        FreezeEntityPosition(ped, true)
+        SetEntityInvincible(ped, true)
+        SetBlockingOfNonTemporaryEvents(ped, true)
+        ps.entityTarget(ped, {
+            {
+                label = ps.lang('Whippit.targetShop'),
+                icon = 'fa-solid fa-cart-shopping',
+                action = function()
+                    local menu = {}
+                    local items = ps.callback('md-drugs:server:getwhippitShop')
+                    for item, price in pairs (items) do
+                        menu[#menu + 1] = {
+                            title = ps.getLabel(item),
+                            icon = ps.getImage(item),
+                            description = '$' .. price,
+                            action = function()
+                                local amount = ps.input(ps.getLabel(item), {
+                                    {type = 'number', label = 'Amount', name = 'amount', min = 1, max = 100, default = 1}
+                                })
+                                if amount and amount[1] then
+                                    TriggerServerEvent('md-drugs:server:buyWhippitItem', k, item, amount[1])
+                                end
+                            end
+                        }
+                    end
+                    ps.menu(ps.lang('Whippit.shopHeader'), ps.lang('Whippit.shopHeader'), menu)
+                end
+            },
+        })
+    end
+end
+
+spawnShops()

fxmanifest.lua

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

items_install/item_names/ox_inventory.md

@@ -2078,4 +2078,76 @@
            image = "kitty_orange4.png" 
          },
     },
+    ["blue_uninflated_balloon"] = { 
+    label = 'Blue Uninflated Balloon', 
+    description = "", 
+    weight = 100, 
+    stack = true, 
+    close = true, 
+    client = { image = 'blue_uninflated_balloon.png' } 
+},
+["cracker"] = { 
+    label = 'Cracker', 
+    description = "", 
+    weight = 100, 
+    stack = true, 
+    close = true, 
+    client = { image = 'cracker.png' } 
+},
+["green_uninflated_balloon"] = { 
+    label = 'Green Uninflated Balloon', 
+    description = "", 
+    weight = 100, 
+    stack = true, 
+    close = true, 
+    client = { image = 'green_uninflated_balloon.png' } 
+},
+["orange_uninflated_balloon"] = { 
+    label = 'Orange Uninflated Balloon', 
+    description = "", 
+    weight = 100, 
+    stack = true, 
+    close = true, 
+    client = { image = 'orange_uninflated_balloon.png' } 
+},
+["purple_uninflated_balloon"] = { 
+    label = 'Purple Uninflated Balloon', 
+    description = "", 
+    weight = 100, 
+    stack = true, 
+    close = true, 
+    client = { image = 'purple_uninflated_balloon.png' } 
+},
+["red_uninflated_balloon"] = { 
+    label = 'Red Uninflated Balloon', 
+    description = "", 
+    weight = 100, 
+    stack = true, 
+    close = true, 
+    client = { image = 'red_uninflated_balloon.png' } 
+},
+["whipped_cream_cannister"] = { 
+    label = 'Whipped Cream Cannister', 
+    description = "", 
+    weight = 100, 
+    stack = true, 
+    close = true, 
+    client = { image = 'whipped_cream_cannister.png' } 
+},
+["white_uninflated_balloon"] = { 
+    label = 'White Uninflated Balloon', 
+    description = "", 
+    weight = 100, 
+    stack = true, 
+    close = true, 
+    client = { image = 'white_uninflated_balloon.png' } 
+},
+["yellow_uninflated_balloon"] = { 
+    label = 'Yellow Uninflated Balloon', 
+    description = "", 
+    weight = 100, 
+    stack = true, 
+    close = true, 
+    client = { image = 'yellow_uninflated_balloon.png' } 
+},
 ```

items_install/item_names/qb-inventory.md

@@ -261,4 +261,15 @@
     orange_cats2 				 = {name = "orange_cats2", 			    		label = "orange cats", 	    weight = 100, 		type = "item", 		image = "kitty_orange2.png", 				unique = false, 	useable = true, 	shouldClose = true,	   combinable = nil,      description = ""},
     orange_cats3 				 = {name = "orange_cats3", 			    		label = "orange cats", 		weight = 100, 		type = "item", 		image = "kitty_orange3.png", 				unique = false, 	useable = true, 	shouldClose = true,	   combinable = nil,      description = ""},
     orange_cats4 				 = {name = "orange_cats4", 			    		label = "orange cats", 		weight = 100, 		type = "item", 		image = "kitty_orange4.png", 				unique = false, 	useable = true, 	shouldClose = true,	   combinable = nil,      description = ""},
+     blue_uninflated_balloon = { name = 'blue_uninflated_balloon', label = 'Blue Uninflated Balloon', weight = 100, type = 'item', image = 'blue_uninflated_balloon.png', unique = false, useable = true, shouldClose = true, description = "" },
+cracker = { name = 'cracker', label = 'Cracker', weight = 100, type = 'item', image = 'cracker.png', unique = false, useable = true, shouldClose = true, description = "" },
+green_uninflated_balloon = { name = 'green_uninflated_balloon', label = 'Green Uninflated Balloon', weight = 100, type = 'item', image = 'green_uninflated_balloon.png', unique = false, useable = true, shouldClose = true, description = "" },
+orange_uninflated_balloon = { name = 'orange_uninflated_balloon', label = 'Orange Uninflated Balloon', weight = 100, type = 'item', image = 'orange_uninflated_balloon.png', unique = false, useable = true, shouldClose = true, description = "" },
+purple_uninflated_balloon = { name = 'purple_uninflated_balloon', label = 'Purple Uninflated Balloon', weight = 100, type = 'item', image = 'purple_uninflated_balloon.png', unique = false, useable = true, shouldClose = true, description = "" },
+red_uninflated_balloon = { name = 'red_uninflated_balloon', label = 'Red Uninflated Balloon', weight = 100, type = 'item', image = 'red_uninflated_balloon.png', unique = false, useable = true, shouldClose = true, description = "" },
+whipped_cream_cannister = { name = 'whipped_cream_cannister', label = 'Whipped Cream Cannister', weight = 100, type = 'item', image = 'whipped_cream_cannister.png', unique = false, useable = true, shouldClose = true, description = "" },
+white_uninflated_balloon = { name = 'white_uninflated_balloon', label = 'White Uninflated Balloon', weight = 100, type = 'item', image = 'white_uninflated_balloon.png', unique = false, useable = true, shouldClose = true, description = "" },
+yellow_uninflated_balloon = { name = 'yellow_uninflated_balloon', label = 'Yellow Uninflated Balloon', weight = 100, type = 'item', image = 'yellow_uninflated_balloon.png', unique = false, useable = true, shouldClose = true, description = "" },
+
+     
      ```

locales/DJ.lua

@@ -258,5 +258,10 @@ Lang.xtc = {
 Lang.merchant = {
     targetOpen = 'Open merchant menu, LET’S GOOOO!',
 }
-
+Lang.Whippit = {
+    targetShop = 'Open Whippit Shop, PARTY TIME!',
+    needBalloon = 'Need a balloon for this, HYPE!',
+    needCanister = 'Need a canister for this, WOO!',
+    shopHeader = 'Whippit Shop, LET’S GO!',
+}
 return Lang

locales/cs.lua

@@ -259,5 +259,10 @@ Lang.xtc = {
 Lang.merchant = {
     targetOpen = 'Otevřít obchodní nabídku',
 }
-
+Lang.Whippit = {
+    targetShop = 'Otevřít obchod Whippit',
+    needBalloon = 'Potřebujete balón pro tuto akci',
+    needCanister = 'Potřebujete kanister pro tuto akci',
+    shopHeader = 'Obchod Whippit',
+}
 return Lang

locales/de.lua

@@ -259,5 +259,10 @@ Lang.xtc = {
 Lang.merchant = {
     targetOpen = 'Händlermenü öffnen',
 }
-
+Lang.Whippit = {
+    targetShop = 'Whippit Shop öffnen',
+    needBalloon = 'Du brauchst einen Ballon für diese Aktion',
+    needCanister = 'Du brauchst einen Kanister für diese Aktion',
+    shopHeader = 'Whippit Shop',
+}
 return Lang

locales/dovahzul.lua

@@ -258,5 +258,10 @@ Lang.xtc = {
 Lang.merchant = {
     targetOpen = 'Open merchant menu'
 }
-
+Lang.Whippit = {
+    targetShop = 'Open Whippit Shop',
+    needBalloon = 'You Need A Balloon For This',
+    needCanister = 'You Need A Canister For This',
+    shopHeader = 'Whippit Shop'
+}
 return Lang

locales/en.lua

@@ -260,4 +260,11 @@ Lang.merchant = {
     targetOpen = 'Open Merchant Menu',
 }
 
+Lang.Whippit = {
+    targetShop = 'Open Whippit Shop',
+    needBalloon = 'You Need A Balloon For This',
+    needCanister = 'You Need A Canister For This',
+    shopHeader = 'Whippit Shop',
+}
+
 return Lang

locales/es.lua

@@ -260,4 +260,11 @@ Lang.merchant = {
     targetOpen = 'Abrir menú de comerciante',
 }
 
+Lang.Whippit = {
+    targetShop = 'Abrir tienda Whippit',
+    needBalloon = 'Necesitas un globo para esto',
+    needCanister = 'Necesitas un bote para esto',
+    shopHeader = 'Tienda Whippit',
+}
+
 return Lang

locales/fr.lua

@@ -260,4 +260,10 @@ Lang.merchant = {
     targetOpen = 'Ouvrir le menu du marchand',
 }
 
+Lang.Whippit = {
+    targetShop = 'Ouvrir la boutique Whippit',
+    needBalloon = 'Vous avez besoin d’un ballon pour ça',
+    needCanister = 'Vous avez besoin d’un bidon pour ça',
+    shopHeader = 'Boutique Whippit',
+}
 return Lang

locales/gungan.lua

@@ -260,4 +260,10 @@ Lang.merchant = {
     targetOpen = 'Openin da merchant menu',
 }
 
+Lang.Whippit = {
+    targetShop = 'Open Whippit Shop',
+    needBalloon = 'Yousa needin a balloon for dis',
+    needCanister = 'Yousa needin a canister for dis',
+    shopHeader = 'Whippit Shop',
+}
 return Lang

locales/klingon.lua

@@ -259,5 +259,10 @@ Lang.xtc = {
 Lang.merchant = {
     targetOpen = 'merchant mIch poSmoH',
 }
-
+Lang.Whippit = {
+    targetShop = 'Whippit Shop poSmoH',
+    needBalloon = 'DochvamvaD balloon DaHutlh',
+    needCanister = 'DochvamvaD canister DaHutlh',
+    shopHeader = 'Whippit Shop',
+}
 return Lang

locales/meanieweenie.lua

@@ -259,5 +259,11 @@ Lang.xtc = {
 Lang.merchant = {
     targetOpen = 'Open merchant menu, asshole',
 }
+Lang.Whippit = {
+    targetShop = 'Open Whippit Shop',
+    needBalloon = 'You need a balloon for this, dumbass',
+    needCanister = 'You need a canister for this, moron',
+    shopHeader = 'Whippit Shop',
+}
 
 return Lang

locales/nl.lua

@@ -260,4 +260,10 @@ Lang.merchant = {
     targetOpen = 'Handelaarsmenu openen',
 }
 
+Lang.Whippit = {
+    targetShop = 'Whippit-winkel openen',
+    needBalloon = 'Je hebt een ballon nodig voor dit proces',
+    needCanister = 'Je hebt een kanister nodig voor dit proces',
+    shopHeader = 'Whippit-winkel',
+}
 return Lang

locales/piglatin.lua

@@ -260,4 +260,10 @@ Lang.merchant = {
     targetOpen = 'Openyay ErchantMay EnuMay',
 }
 
+Lang.Whippit = {
+    targetShop = 'Openyay HippitWay OpShay',
+    needBalloon = 'ouYay Eednay Ayay AlloonBay Orfay isThay',
+    needCanister = 'ouYay Eednay Ayay AnisterCay Orfay isThay',
+    shopHeader = 'HippitWay OpShay',
+}
 return Lang

locales/pirate.lua

@@ -260,4 +260,10 @@ Lang.merchant = {
     targetOpen = 'Open the trader’s menu',
 }
 
+Lang.Whippit = {
+    targetShop = 'Open Whippit Shop',
+    needBalloon = 'Ye need a balloon fer this, matey',
+    needCanister = 'Ye need a canister fer this, swabbie',
+    shopHeader = 'Whippit Shop',
+}
 return Lang

locales/pt-br.lua

@@ -259,5 +259,10 @@ Lang.xtc = {
 Lang.merchant = {
     targetOpen = 'Abrir menu do comerciante',
 }
-
+Lang.Whippit = {
+    targetShop = 'Abrir loja Whippit',
+    needBalloon = 'Você precisa de um balão para isso',
+    needCanister = 'Você precisa de um recipiente para isso',
+    shopHeader = 'Loja Whippit',
+}
 return Lang

locales/tr.lua

@@ -260,4 +260,10 @@ Lang.merchant = {
     targetOpen = 'Tüccar menüsünü aç',
 }
 
+Lang.Whippit = {
+    targetShop = 'Whippit Dükkanını Aç',
+    needBalloon = 'Bunun için bir balona ihtiyacın var',
+    needCanister = 'Bunun için bir bidona ihtiyacın var',
+    shopHeader = 'Whippit Dükkanı',
+}
 return Lang

locales/uwu.lua

@@ -257,4 +257,11 @@ Lang.xtc = {
 Lang.merchant = {
     targetOpen = 'Open Wopen Store',
 }
+
+Lang.Whippit = {
+    targetShop = 'Open Whippit Shop',
+    needBalloon = 'You need a balloon for this, cutie! 🎈',
+    needCanister = 'You need a canister for this, bby! 🛢️',
+    shopHeader = 'Whippit Shop 🥳',
+}
 return Lang

locales/wookie.lua

@@ -257,4 +257,11 @@ Lang.merchant = {
     targetOpen = 'Rraa raw!',
 }
 
+Lang.Whippit = {
+    targetShop = 'Rraa Whippit!',
+    needBalloon = 'Rraa balloon!',
+    needCanister = 'Rraa canister!',
+    shopHeader = 'Whippit Rraa!',
+}
+
 return Lang

readme.md

@@ -19,7 +19,7 @@ A fully customizable, immersive drug system for FiveM servers.
 - **Beta Testers:** Your invaluable feedback made this possible.  
 - **[1of1 Servers](https://1of1servers.com/  ):** Top-notch hosting and support. Join their [Discord](https://discord.gg/1of1servers  ).  
 - **[Kamaryn](https://discord.gg/KPRmZqFS  ):** For the [installation guide video](https://youtu.be/zvuYnUfrqaA?si=FGJuBO5krZMC14Nd).  
-
+- **[Athena](https://discord.gg/mam8Nmg49d):** For the Balloon props :)
 ## 🎬 Preview
 
 🎥 **[Watch Full Preview Video](https://www.youtube.com/watch?v=I_x7_oz_SAU)**
@@ -163,4 +163,7 @@ A fully customizable, immersive drug system for FiveM servers.
 ### STEP 5
 - Run SQL
     - if you dont know how, click this image below
-        - [![YouTube Video](https://img.youtube.com/vi/8QpFOluK_xo/hqdefault.jpg)](https://www.youtube.com/watch?v=8QpFOluK_xo)
+        - [![YouTube Video](https://img.youtube.com/vi/8QpFOluK_xo/hqdefault.jpg)](https://www.youtube.com/watch?v=8QpFOluK_xo)
+
+### STEP 6 
+    - If you want whippits, take the folder `ate_balloon` and place that folder into the standalone folder like it was another script :) (or a [props] if you got it)

server/whippit.lua

@@ -0,0 +1,69 @@
+
+local itemCraft = {
+    cracker = {
+        {color = 'blue',    item = 'blue_uninflated_balloon'},
+        {color = 'green',   item = 'green_uninflated_balloon'},
+        {color = 'orange',  item = 'orange_uninflated_balloon'},
+        {color = 'purple',  item = 'purple_uninflated_balloon'},
+        {color = 'red',     item = 'red_uninflated_balloon'},
+        {color = 'white',   item = 'white_uninflated_balloon'},
+        {color = 'yellow',  item = 'yellow_uninflated_balloon'}
+    }
+}
+local store = {
+    {loc =vector4(1695.47, 4872.98, 42.16, 288.86), ped = 'ig_priest' },
+}
+ps.registerCallback('md-drugs:server:getWhippitLocations', function(source)
+    return store
+end)
+local itemShop = {
+    blue_uninflated_balloon = 5,
+    green_uninflated_balloon = 5,
+    orange_uninflated_balloon = 5,
+    purple_uninflated_balloon = 5,
+    red_uninflated_balloon = 5,
+    white_uninflated_balloon = 5,
+    yellow_uninflated_balloon = 5,
+    cracker = 500,
+    whipped_cream_cannister = 10
+}
+
+ps.registerCallback('md-drugs:server:getwhippitShop', function(source)
+    return itemShop
+end)
+
+RegisterServerEvent('md-drugs:server:buyWhippitItem', function(loc, item,amount)
+    local src = source
+    if not ps.checkDistance(src, store[loc].loc, 3.0) then return end
+    if not itemShop[item] then return end
+    local price = itemShop[item] * amount
+    if not ps.removeMoney(src, 'cash', price, 'whippit-shop') then
+        return ps.notify(src, ps.lang('Whippit.notEnoughMoney', price), 'error')
+    end
+    ps.addItem(src, item, amount)
+end)
+
+ps.createUseable('cracker', function(source)
+    local src = source
+    if not ps.hasItem(src, 'cracker', 1) then return end
+    if not ps.hasItem(src, 'whipped_cream_cannister', 1) then return end
+    local balloonItem, balloonColor = nil, nil
+    for _, balloon in pairs(itemCraft['cracker']) do
+        if ps.hasItem(src, balloon.item, 1) then
+            balloonItem = balloon.item
+            balloonColor = 'ate_balloon_' .. balloon.color
+            break
+        end
+    end
+    if not balloonItem then
+        return ps.notify(src, ps.lang('Whippit.needBalloon'), 'error')
+    end
+
+    if not ps.removeItem(src, 'whipped_cream_cannister', 1) then
+        return ps.notify(src, ps.lang('Whippit.needCanister'), 'error')
+    end
+    if not ps.removeItem(src, balloonItem, 1) then
+        return ps.warn(src, 'Failed to remove balloon', 'error')
+    end
+    ps.callback('md-drugs:client:useWhippit', src, balloonColor)
+end)

shared/config.lua

@@ -49,6 +49,7 @@ Config.Drugs = { -- want a drug turn on? keep it true, want it turned off, mark
     TravellingMerchant = true,
     weed = true,
     wholesale = false,
+    whippit = true,
     xtc = true,
 }
 

version.txt

@@ -53,9 +53,16 @@ Build: 4.0.4
    - update version in fxmanifest to 4.0.4
    - update client/meth.lua
    
-Newest Build: 4.0.5
+Build: 4.0.5
  - fix server/xtc.lua to use src for activePresses
  - fix server/xtc.lua to work with crafting pills
  - HOT TO UPDATE
  - Replace server/xtc.lua 
- - adjust fxmanifest version to 4.0.5
+ - adjust fxmanifest version to 4.0.5
+
+Newest Build: 4.0.6
+  - add whippits to the script
+     - to add move the folder `ate_balloon` to standalone folder
+       - or anywhere else like it is its own script
+      - add the items ( located at the bottom of ox.md/qb.md) and images
+      - add the server and client file named whippit.lua