Merge pull request #76 from The-Order-Of-The-Sacred-Framework/dev
0.6.1
This commit is contained in:
7 files changed
+35
-19
No files matched your search
+1
-1
@@ -4,7 +4,7 @@ lua54 'yes'
|
||||
use_experimental_fxv2_oal 'yes'
|
||||
author 'The Order of the Sacred Framework'
|
||||
description 'A bridge made for the community to use as a base for their own projects. This bridge will allow a single format to work with nearly all commonly used systems while still offering expandability.'
|
||||
version '0.6.0'
|
||||
version '0.6.1'
|
||||
|
||||
shared_scripts {
|
||||
'@ox_lib/init.lua',
|
||||
|
||||
Vendored
+5
-9
@@ -1,5 +1,4 @@
|
||||
Cache = Cache or Require("lib/cache/shared/cache.lua")
|
||||
|
||||
Cache = Require("lib/cache/shared/cache.lua")
|
||||
-- Comparison functions for client-side state
|
||||
local function GetPed()
|
||||
return PlayerPedId()
|
||||
@@ -29,12 +28,9 @@ local function GetWeapon()
|
||||
return GetSelectedPedWeapon(ped)
|
||||
end
|
||||
|
||||
AddEventHandler('onResourceStart', function(resource)
|
||||
if resource ~= GetCurrentResourceName() then return end
|
||||
Cache.Create("Ped", GetPed, 1000) -- Check ped every second (adjust as needed)
|
||||
Cache.Create("Vehicle", GetVehicle, 500) -- Check vehicle every 500ms
|
||||
Cache.Create("Seat", GetVehicleSeat, 500) -- Check if in vehicle every 500ms
|
||||
Cache.Create("Weapon", GetWeapon, 250) -- Check weapon every 250ms
|
||||
end)
|
||||
Cache.Create("Ped", GetPed, 1000) -- Check ped every second (adjust as needed)
|
||||
Cache.Create("Vehicle", GetVehicle, 500) -- Check vehicle every 500ms
|
||||
Cache.Create("Seat", GetVehicleSeat, 500) -- Check if in vehicle every 500ms
|
||||
Cache.Create("Weapon", GetWeapon, 250) -- Check weapon every 250ms
|
||||
|
||||
return Cache
|
||||
Vendored
+4
-4
@@ -1,7 +1,6 @@
|
||||
Cache = {}
|
||||
Cache.Caches = {}
|
||||
|
||||
Cache.LoopRunning = false
|
||||
local Cache = {}
|
||||
Cache.Caches = Cache.Caches or {}
|
||||
Cache.LoopRunning = Cache.LoopRunning or false
|
||||
|
||||
local max = 5000
|
||||
local function StartLoop()
|
||||
@@ -54,6 +53,7 @@ function Cache.Create(name, compare, waitTime)
|
||||
for _, onChange in pairs(Cache.Caches[name].OnChange) do
|
||||
onChange(Cache.Caches[name].Value, nil)
|
||||
end
|
||||
print("Cache created: " .. name .. " with initial value: " .. tostring(Cache.Caches[name].Value))
|
||||
return StartLoop()
|
||||
end
|
||||
|
||||
|
||||
@@ -57,18 +57,18 @@ function Scaleform.Run(scaleform, onUpdate)
|
||||
if runningScaleform then return end
|
||||
runningScaleform = scaleform
|
||||
CreateThread(function()
|
||||
while runningScaleform do
|
||||
while runningScaleform do
|
||||
DrawScaleformMovieFullscreen(scaleform, 255, 255, 255, 255, 0)
|
||||
if onUpdate then
|
||||
if onUpdate then
|
||||
shouldQuit = onUpdate()
|
||||
if shouldQuit then
|
||||
if shouldQuit then
|
||||
Scaleform.Stop()
|
||||
break
|
||||
end
|
||||
end
|
||||
Wait(2)
|
||||
end
|
||||
end)
|
||||
end
|
||||
end)
|
||||
end
|
||||
|
||||
function Scaleform.Stop()
|
||||
|
||||
@@ -134,6 +134,12 @@ Framework.GetStatus = function(src, column)
|
||||
return xPlayer.get(column) or nil
|
||||
end
|
||||
|
||||
Framework.GetIsPlayerDead = function(src)
|
||||
local xPlayer = ESX.GetPlayerFromId(src)
|
||||
if not xPlayer then return end
|
||||
return xPlayer.get("is_dead") or false
|
||||
end
|
||||
|
||||
-- Framework.AddThirst(src, value)
|
||||
-- Adds the specified value from the player's thirst level.
|
||||
Framework.AddThirst = function(src, value)
|
||||
|
||||
@@ -253,6 +253,13 @@ Framework.GetHunger = function(src)
|
||||
return newHunger
|
||||
end
|
||||
|
||||
Framework.GetIsPlayerDead = function(src)
|
||||
local player = QBCore.Functions.GetPlayer(src)
|
||||
if not player then return end
|
||||
local playerData = player.PlayerData
|
||||
return playerData.metadata.isdead or false
|
||||
end
|
||||
|
||||
|
||||
---This will get the thirst of a player
|
||||
---@param src any
|
||||
|
||||
@@ -218,6 +218,13 @@ Framework.GetHunger = function(src)
|
||||
return newHunger
|
||||
end
|
||||
|
||||
Framework.GetIsPlayerDead = function(src)
|
||||
local player = QBox:GetPlayer(src)
|
||||
if not player then return end
|
||||
local playerData = player.PlayerData
|
||||
return playerData.metadata.isdead or false
|
||||
end
|
||||
|
||||
---This will return the players thirst level.
|
||||
---@param src number
|
||||
---@return number
|
||||
|
||||
Reference in new issue
Block a user