diff --git a/client/client.lua b/client/client.lua index e1ef16d..03b1300 100644 --- a/client/client.lua +++ b/client/client.lua @@ -36,16 +36,18 @@ RegisterNetEvent('jim-consumables:Consume', function(itemName) if type == "drink" or type == "alcohol" then string = "Drinking " end if type == "food" then string = "Eating " end if type == "drug" then string = "Using " end - if consuming then cancelled = true if Config.Debug then print("^5Debug^7: ^3Consume^7: ^2Event already started^7, ^1Cancelling^7.") end LocalPlayer.state:set("inv_busy", false, true) - triggerNotify(nil, "Stopped "..string, "error") + if Config.UseProgbar then + TriggerEvent("progressbar:client:cancel") + else + triggerNotify(nil, "Stopped "..string, "error") + end consuming = not consuming return end - --Emote Stuff if Config.Debug then print("^5Debug^7: ^3Consume^7: ^2Grabbing Emote Animation Options^7...") end if emote.AnimationOptions then @@ -56,20 +58,20 @@ RegisterNetEvent('jim-consumables:Consume', function(itemName) 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) - - triggerNotify(nil, string..QBCore.Shared.Items[itemName].label.."..", "success") + if Config.UseProgbar then + QBCore.Functions.Progressbar('jimmy_consume_', string..QBCore.Shared.Items[itemName].label.."..", time, false, false, {disableMovement = false,disableCarMovement = false,disableMouse = false,disableCombat = true,}, {}, {}, {}, function()end) + else + triggerNotify(nil, string..QBCore.Shared.Items[itemName].label.."..", "success") + end consuming = true - CreateThread(function() --Prop Spawning if model then @@ -80,56 +82,52 @@ RegisterNetEvent('jim-consumables:Consume', function(itemName) destroyProp(attachProp) end end) - while consuming do if time <= 0 then consuming = false end - if IsControlJustPressed(0, 21) then - consuming = false - cancelled = true - LocalPlayer.state:set("inv_busy", false, true) - end - Wait(10) - time = time - 10 + if not Config.Consumables[itemName].canRun then + if IsControlJustPressed(0, 21) then + consuming = false + cancelled = true + LocalPlayer.state:set("inv_busy", false, true) + if Config.UseProgbar then + Wait(10) + TriggerEvent("progressbar:client:cancel") + else + triggerNotify(nil, "Cancelled "..string, "error") + end + end + end + Wait(10) + time = time - 10 end - StopEntityAnim(PlayerPedId(), anim, animDict, 1.0) unloadAnimDict(animDict) - if not cancelled then - toggleItem(false, itemName, 1) - - if QBCore.Shared.Items[itemName].thirst then - TriggerServerEvent("QBCore:Server:SetMetaData", "thirst", QBCore.Functions.GetPlayerData().metadata["thirst"] + QBCore.Shared.Items[itemName].thirst) end - if QBCore.Shared.Items[itemName].hunger then - TriggerServerEvent("QBCore:Server:SetMetaData", "hunger", QBCore.Functions.GetPlayerData().metadata["hunger"] + QBCore.Shared.Items[itemName].hunger) end - + 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 if not QBCore.Shared.Items[itemName].thirst and not QBCore.Shared.Items[itemName].hunger then local hunger = 0 local thirst = 0 if Config.Consumables[itemName].stats then if Config.Consumables[itemName].stats.hunger then hunger = Config.Consumables[itemName].stats.hunger end - TriggerServerEvent("QBCore:Server:SetMetaData", "hunger", QBCore.Functions.GetPlayerData().metadata["hunger"] + hunger) + TriggerServerEvent("jim-consumables:server:addHunger", QBCore.Functions.GetPlayerData().metadata["hunger"] + hunger) if Config.Consumables[itemName].stats.thirst then thirst = Config.Consumables[itemName].stats.thirst end - TriggerServerEvent("QBCore:Server:SetMetaData", "thirst", QBCore.Functions.GetPlayerData().metadata["thirst"] + thirst) + 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 @@ -140,9 +138,7 @@ RegisterNetEvent('jim-consumables:Consume', function(itemName) CreateThread(function() AlienEffect() end) -- Used as overdosing/too drunk effect end end - stats = Config.Consumables[itemName].stats or nil - if Config.Consumables[itemName].stats then if stats.screen then -- Screen effect activation if stats.screen == "turbo" then CreateThread(function() TurboEffect() end) end @@ -153,7 +149,6 @@ RegisterNetEvent('jim-consumables:Consume', function(itemName) if stats.screen == "nightvision" then CreateThread(function() NightVisionEffect() end) end if stats.screen == "thermal" then CreateThread(function() ThermalEffect() end) end end - if stats.canOD then if Config.Debug then print("^5Debug^7: ^3Consume^7: ^2Current ^4drugCount^7: ^6"..(drugCount + 1)) end drugCount = drugCount + 1 @@ -188,7 +183,6 @@ RegisterNetEvent('jim-consumables:Consume', function(itemName) end cancelled = false consuming = false - if Config.Debug then print("^5Debug^7: ^3Consume^7: ^2Finished, unlocking inventory^7...") end LocalPlayer.state:set("inv_busy", false, true) TriggerEvent('inventory:client:busy:status', false) TriggerEvent('canUseInventoryAndHotbar:toggle', false) end) diff --git a/config.lua b/config.lua index ca6a1bd..3e73f10 100644 --- a/config.lua +++ b/config.lua @@ -7,22 +7,24 @@ print("^2Jim^7-^2Consumables ^7v^41^7.^43^7.^41 ^7- ^2Consumables Script by ^1Ji Config = { Debug = false, Notify = "qb", + UseProgbar = false, + Consumables = { -- Default QB food and drink item override --Effects can be applied here, like stamina on coffee for example - ["vodka"] = { emote = "vodkab", 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", 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", 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", 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", 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", 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", 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", 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", 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", time = math.random(5000, 6000), stress = math.random(2, 4), heal = 0, armor = 0, type = "drink", stats = { thirst = math.random(10,20), }}, + ["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 @@ -271,4 +273,4 @@ Config = { ["oxy"] = { "mp_suicide", "pill", "Oxy", AnimationOptions = { EmoteLoop = true, EmoteMoving = true, }}, }, -} \ No newline at end of file +} diff --git a/server/server.lua b/server/server.lua index 038b0c5..0057029 100644 --- a/server/server.lua +++ b/server/server.lua @@ -6,7 +6,6 @@ for k, v in pairs(Config.Consumables) do if not Config.Emotes[v.emote] then print("Emote check - '"..k.."' requested emote '"..v.emote.."' - not found in config.lua") end end - RegisterNetEvent('jim-consumables:server:toggleItem', function(give, item, amount) local src = source if give == 0 or give == false then @@ -18,4 +17,18 @@ RegisterNetEvent('jim-consumables:server:toggleItem', function(give, item, amoun TriggerClientEvent('inventory:client:ItemBox', src, QBCore.Shared.Items[item], "add", amount or 1) end end +end) + +RegisterNetEvent('jim-consumables:server:addThirst', function(amount) + local Player = QBCore.Functions.GetPlayer(source) + if not Player then return end + Player.Functions.SetMetaData('thirst', amount) + TriggerClientEvent('hud:client:UpdateNeeds', source, Player.PlayerData.metadata.hunger, amount) +end) + +RegisterNetEvent('jim-consumables:server:addHunger', function(amount) + local Player = QBCore.Functions.GetPlayer(source) + if not Player then return end + Player.Functions.SetMetaData('hunger', amount) + TriggerClientEvent('hud:client:UpdateNeeds', source, amount, Player.PlayerData.metadata.thirst) end) \ No newline at end of file