From 6dad9f70a9f28323f8050fbc30aacf266286e432 Mon Sep 17 00:00:00 2001 From: Mustache Dom <123716453+Mustachedom@users.noreply.github.com> Date: Tue, 1 Oct 2024 16:09:49 -0700 Subject: [PATCH] a a --- client/consumables.lua | 50 +++++++++++++++++++++++++++++++++--------- server/consumables.lua | 6 ++--- shared/consumables.lua | 22 ++++++++++++++----- 3 files changed, 60 insertions(+), 18 deletions(-) diff --git a/client/consumables.lua b/client/consumables.lua index 9c54f69..5152b36 100644 --- a/client/consumables.lua +++ b/client/consumables.lua @@ -1,17 +1,47 @@ local QBCore = exports['qb-core']:GetCoreObject() -RegisterNetEvent('md-drugs:client:consumedrugs', function(time, effect, anim, progresstext, status, statval, item) +RegisterNetEvent('md-drugs:client:consumedrugs', function(time, effect, anim, progresstext, status, item) + print(time, effect, anim, progresstext, status, item) if not progressbar(progresstext .. GetLabel(item).. "!", time, anim ) then return end TriggerServerEvent('md-drugs:server:removeconsum', item) - if status == "armor" then - TriggerServerEvent('hospital:server:SetArmor', statval) - TriggerServerEvent('consumables:server:useArmor') - SetPedArmour(PlayerPedId(), statval) - else - TriggerServerEvent('md-drugs:server:updatestatus', status, statval) + for k, v in pairs (status) do + print(k,v) + if k == 'health' then + local cur = GetEntityHealth(PlayerPedId()) + SetEntityHealth(PlayerPedId(), cur + v) + elseif k == 'thirst' or k == 'stress' or k == 'hunger' then + TriggerServerEvent('md-drugs:server:updatestatus', k, v) + elseif k == "armor" then + TriggerServerEvent('hospital:server:SetArmor', v) + TriggerServerEvent('consumables:server:useArmor') + SetPedArmour(PlayerPedId(), statval) + elseif k == 'speed' then + TriggerEvent('md-drugs:client:recievebuff', k, v) + elseif k == 'strength' then + TriggerEvent('md-drugs:client:recievebuff', k, v) + end end - TriggerEvent('evidence:client:SetStatus', 'widepupils', 200) - if effect == "alien" then AlienEffect() elseif effect == "ecstacy" then EcstasyEffect() elseif effect == "meth" then MethBagEffect() elseif effect == "coke" then CokeBaggyEffect() elseif effect == "trevor" then TrevorEffect() else end - if status == nil then return end + TriggerEvent('evidence:client:SetStatus', 'widepupils', 200) if effect == "alien" then AlienEffect() elseif effect == "ecstacy" then EcstasyEffect() elseif effect == "meth" then MethBagEffect() elseif effect == "coke" then CokeBaggyEffect() elseif effect == "trevor" then TrevorEffect() else end if status == nil then return end end) +RegisterNetEvent('md-drugs:client:recievebuff', function(type, amount) +if type == 'speed' then + local count = 0 + SetRunSprintMultiplierForPlayer(PlayerPedId(), 1.49) + repeat + count = count + 1 + Wait(1000) + until count == amount + SetRunSprintMultiplierForPlayer(PlayerPedId(), 1.00) +end +if type == 'strength' then + local strength = 0 + SetCurrentPedWeapon(PlayerPedId(), 'weapon_unarmed', true) + SetWeaponDamageModifier(GetHashKey("WEAPON_UNARMED"), 60.0) + repeat + strength = strength + 1 + Wait(1000) + until strength == amount + SetWeaponDamageModifier(GetHashKey("WEAPON_UNARMED"), 1.0) +end +end) \ No newline at end of file diff --git a/server/consumables.lua b/server/consumables.lua index d4fa8b5..dc34c02 100644 --- a/server/consumables.lua +++ b/server/consumables.lua @@ -7,9 +7,8 @@ for k, v in pairs (Consumables.Items) do QBCore.Functions.CreateUseableItem(k, f if v.effect == nil then v.effect = 0 end if v.anim == nil then v.anim = Consumables.defaultanim end if v.progressbartext == nil then v.progressbartext = Consumables.defaultprogresstext end - if v.status == nil and v.statval == nil then v.status = 'thirst' v.statval = 0 end - if v.statval ~= nil and v.statval == nil then v.statval = Consumables.defaultstatval end - TriggerClientEvent("md-drugs:client:consumedrugs", source, v.time, v.effect, v.anim, v.progressbartext, v.status, v.statval, k) + if v.add == nil then v.add = 'none' end + TriggerClientEvent("md-drugs:client:consumedrugs", source, v.time, v.effect, v.anim, v.progressbartext, v.add, k) end) end @@ -20,6 +19,7 @@ RegisterNetEvent('md-drugs:server:removeconsum', function(item) end) RegisterNetEvent('md-drugs:server:updatestatus', function(stat, statval) + print(stat,statval) local Player = QBCore.Functions.GetPlayer(source) if stat == "thirst" then local value = Player.PlayerData.metadata.thirst + statval diff --git a/shared/consumables.lua b/shared/consumables.lua index 017e833..8859fcc 100644 --- a/shared/consumables.lua +++ b/shared/consumables.lua @@ -12,9 +12,21 @@ Consumables.defaultstatval = 0 trevor none ]] + +--[[ +add = {} +health = number -- amount of health to give +stress = number -- number of stress to give +speed = number -- number of seconds you a fast boi +hunger = number -- number of hunger to fill +thirst = number -- same shit +strength = number -- how long you are strong boi + +]] Consumables.Items = { -- meth - ["methbags"] = { time = 4000, effect = 'meth', anim = "smoke", progressbartext = "Smoking", status = 'thirst', statval = 10}, + ["methbags"] = { time = 4000, effect = 'meth', anim = "smoke", progressbartext = "Smoking", + add = {health = -20, stress = -10, speed = 40, strength = 10, thirst = -30}}, -- coke ["cokebaggy"] = { anim = 'smell', time = 1000, effect = 'coke'}, ["cokebaggystagetwo"] = { anim = 'smell', time = 1000, effect = 'coke'}, @@ -109,10 +121,10 @@ Consumables.Items = { ["orange_cats3"] = { anim = 'edible', time = 1000, effect = 'ecstacy'}, ["orange_cats4"] = { anim = 'edible', time = 1000, effect = 'ecstacy'}, -- weed - ["specialbrownie"] = { anim = 'edible', effect = 'alien', status = 'hunger', statval = 10}, - ["specialcookie"] = { anim = 'edible', effect = 'alien', status = 'hunger', statval = 10}, - ["specialchocolate"] = { anim = 'edible', effect = 'alien', status = 'hunger', statval = 10}, - ["specialmuffin"] = { anim = 'edible', effect = 'alien', status = 'hunger', statval = 10}, + ["specialbrownie"] = { anim = 'edible', effect = 'alien', add = {hunger = 10}}, + ["specialcookie"] = { anim = 'edible', effect = 'alien', add = {hunger = 10}}, + ["specialchocolate"] = { anim = 'edible', effect = 'alien', add = {hunger = 10}}, + ["specialmuffin"] = { anim = 'edible', effect = 'alien', add = {hunger = 10}}, ["blunt"] = { anim = 'smokeweed', effect = 'alien'}, ["dextroblunts"] = { anim = 'smokeweed', effect = 'alien'}, ["leanblunts"] = { anim = 'smokeweed', effect = 'alien'},