diff --git a/client/client.lua b/client/client.lua index 54cb857..88d6246 100644 --- a/client/client.lua +++ b/client/client.lua @@ -1,6 +1,5 @@ local QBCore = exports['qb-core']:GetCoreObject() -PlayerJob = {} local alcoholCount = 0 local drugCount = 0 @@ -8,6 +7,9 @@ local drugCount = 0 for k in pairs(Config.Emotes) do if Config.Emotes[k].AnimationOptions.Prop then Config.Emotes[k].AnimationOptions.Prop = GetHashKey(Config.Emotes[k].AnimationOptions.Prop) + if Config.Emotes[k].AnimationOptions.SecondProp then + Config.Emotes[k].AnimationOptions.SecondProp = GetHashKey(Config.Emotes[k].AnimationOptions.SecondProp) + end end end @@ -21,12 +23,17 @@ RegisterNetEvent('jim-consumables:Consume', function(itemName) local emote = Config.Emotes[Config.Consumables[itemName].emote] local animDict = tostring(emote[1]) local anim = tostring(emote[2]) - local model, bone, drugeffect, stress - local P1, P2, P3, P4, P5, P6 = table.unpack({0.0, 0.0, 0.0, 0.0, 0.0, 0.0}) + 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 model = emote.AnimationOptions.Prop bone = GetPedBoneIndex(PlayerPedId(), 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) + P7, P8, P9, P10, P11, P12 = table.unpack(emote.AnimationOptions.SecondPropPlacement) + end end local time = Config.Consumables[itemName].time or math.random(5000, 6000) local type = Config.Consumables[itemName].type or "food" @@ -76,14 +83,19 @@ RegisterNetEvent('jim-consumables:Consume', function(itemName) consuming = true CreateThread(function() --Prop Spawning - if model then - if Config.Debug then print("^5Debug^7: ^3Consume^7: ^2Spawning consumable prop^7.") end - local attachProp = makeProp({ prop = model, coords = vector4(0.0,0.0,0.0,0.0)}, 1, 1) - AttachEntityToEntity(attachProp, PlayerPedId(), bone, P1, P2, P3, P4, P5, P6, true, true, false, true, 1, true) - while consuming do Wait(100) end - destroyProp(attachProp) - end - end) + if model and IsModelValid(model) == 1 then + if Config.Debug then print("^5Debug^7: ^3PropSpawn^7: ^2Spawning consumable prop^7.") end + attachProp = makeProp({ prop = model, coords = vector4(0.0,0.0,0.0,0.0)}, 1, 1) + AttachEntityToEntity(attachProp, PlayerPedId(), bone, P1, P2, P3, P4, P5, P6, true, true, false, true, 1, true) + if model2 and IsModelValid(model2) == 1 then + attachProp2 = makeProp({ prop = model2, coords = vector4(0.0,0.0,0.0,0.0)}, 1, 1) + AttachEntityToEntity(attachProp2, PlayerPedId(), bone2, P7, P8, P9, P10, P11, P12, true, true, false, true, 1, true) + else print("^5Debug^7: ^3Consume^7: ^2Second prop model isn't valid/found^7.") end + while consuming do Wait(50) end + if DoesEntityExist(attachProp) then destroyProp(attachProp) attachProp = nil end + if DoesEntityExist(attachProp2) then destroyProp(attachProp2) attackProp = nil end + else print("^5Debug^7: ^3PropSpawnstop^7: ^2Prop model isn't valid/found^7.") end + end) while consuming do if time <= 0 then consuming = false end if not Config.Consumables[itemName].canRun then @@ -100,7 +112,7 @@ RegisterNetEvent('jim-consumables:Consume', function(itemName) end end Wait(10) - time = time - 10 + time -= 10 end StopEntityAnim(PlayerPedId(), anim, animDict, 1.0) unloadAnimDict(animDict) @@ -153,7 +165,7 @@ RegisterNetEvent('jim-consumables:Consume', function(itemName) end if stats.canOD then if Config.Debug then print("^5Debug^7: ^3Consume^7: ^2Current ^4drugCount^7: ^6"..(drugCount + 1)) end - drugCount = drugCount + 1 + drugCount += 1 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)) @@ -194,13 +206,13 @@ CreateThread(function() Wait(10) if alcoholCount > 0 then Wait(1000 * 60 * 15) - alcoholCount = alcoholCount - 1 + alcoholCount -= 1 else Wait(1000) end if drugCount > 0 then Wait(1000 * 60 * 15) - drugCount = drugCount - 1 + drugCount -= 1 else Wait(1000) end diff --git a/fxmanifest.lua b/fxmanifest.lua index b0e6bf8..46488a7 100644 --- a/fxmanifest.lua +++ b/fxmanifest.lua @@ -1,10 +1,11 @@ name "Jim-Consumables" author "Jimathy" -version "v1.3.1" +version "v1.3.2" description "Consumable Script By Jimathy" fx_version "cerulean" game "gta5" +lua54 'yes' shared_scripts { 'config.lua', 'shared/*.lua' } client_scripts { 'client/*.lua', } -server_scripts { 'server/*.lua' } \ No newline at end of file +server_scripts { 'server/*.lua' } diff --git a/shared/shared.lua b/shared/shared.lua index d773818..e056dd7 100644 --- a/shared/shared.lua +++ b/shared/shared.lua @@ -5,7 +5,7 @@ local time = 1000 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 = time - 1 RequestModel(model) + 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) @@ -51,7 +51,7 @@ function triggerNotify(title, message, type, src) end end -function countTable(table) local i = 0 for keys in pairs(table) do i = i + 1 end return i end +function countTable(table) local i = 0 for keys in pairs(table) do i += 1 end return i end function toggleItem(give, item, amount) TriggerServerEvent("jim-consumables:server:toggleItem", give, item, amount) end @@ -198,7 +198,7 @@ function HealEffect(data) local count = (data[1] / 1000) while count > 0 do Wait(1000) - count = count - 1 + count -= 1 SetEntityHealth(PlayerPedId(), GetEntityHealth(PlayerPedId()) + data[2]) end healEffect = false @@ -215,7 +215,7 @@ function StaminaEffect(data) while startStamina > 0 do Wait(1000) if math.random(5, 100) < 10 then RestorePlayerStamina(PlayerId(), data[2]) end - startStamina = startStamina - 1 + startStamina -= 1 if math.random(5, 100) < 51 then end end startStamina = 0 @@ -244,4 +244,4 @@ function StopEffects() -- Used to clear up any effects stuck on screen AnimpostfxStop('RaceTurbo') AnimpostfxStop('FocusIn') AnimpostfxStop('Rampage') -end \ No newline at end of file +end