Skip to content

feat(progress): ptfx for props #89

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Andyyy7666 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(progress): ptfx for props #89

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
68 changes: 56 additions & 12 deletions resource/interface/client/progress.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ local DisableControlAction = DisableControlAction
local DisablePlayerFiring = DisablePlayerFiring
local playerState = LocalPlayer.state
local createdProps = {}
local createdPtfx = {}
local maxProps = GetConvarInt('ox:progressPropLimit', 2)

---@class ProgressPropProps
Expand Down Expand Up @@ -46,7 +47,30 @@ local function createProp(ped, prop)
true, false, true, prop.rotOrder or 0, true)
SetModelAsNoLongerNeeded(result)

return object
local ptfx = nil
local ptfxData = prop.ptfx
if ptfxData then
local ok, result = pcall(lib.requestNamedPtfxAsset, ptfxData.asset)
if not ok then
lib.print.error(result)
goto skip
end

UseParticleFxAssetNextCall(ptfxData.asset)
ptfx = StartParticleFxLoopedOnEntity(
ptfxData.name,
object,
ptfxData.pos.x, ptfxData.pos.y, ptfxData.pos.z,
ptfxData.rot.x, ptfxData.rot.y, ptfxData.rot.z,
ptfxData.scale or 1.0,
false, false, false
)
RemoveNamedPtfxAsset(ptfxData.asset)

::skip::
end

return object, ptfx
end

local function interruptProgress(data)
Expand Down Expand Up @@ -229,16 +253,28 @@ end

local function deleteProgressProps(serverId)
Copy link
Member

@Maximus7474 Maximus7474 Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Being that this function no longer relates to just the progress props either rename it or split the removal of props and ptfx within separate functions. (Personal suggestion)

local playerProps = createdProps[serverId]
if playerProps then
createdProps[serverId] = nil

for i = 1, #playerProps do
local prop = playerProps[i]

if DoesEntityExist(prop) then
DeleteEntity(prop)
end
end
end

if not playerProps then return end

createdProps[serverId] = nil

for i = 1, #playerProps do
local prop = playerProps[i]

if DoesEntityExist(prop) then
DeleteEntity(prop)
local playerPtfx = createdPtfx[serverId]
if playerPtfx then
createdPtfx[serverId] = nil

for i = 1, #playerPtfx do
local ptfx = playerPtfx[i]

if DoesParticleFxLoopedExist(ptfx) then
StopParticleFxLooped(ptfx, false)
end
end
end
end
Expand All @@ -261,24 +297,32 @@ AddStateBagChangeHandler('lib:progressProps', nil, function(bagName, key, value,
end

local playerProps = {}
local playerPtfx = {}

if value.model then
local prop = createProp(ped, value)
local prop, ptfx = createProp(ped, value)

if prop then
playerProps[#playerProps + 1] = prop
end
if ptfx then
playerPtfx[#playerPtfx + 1] = ptfx
end
else
local propCount = math.min(maxProps, #value)

for i = 1, propCount do
local prop = createProp(ped, value[i])
local prop, ptfx = createProp(ped, value[i])

if prop then
playerProps[#playerProps + 1] = prop
end
if ptfx then
playerPtfx[#playerPtfx + 1] = ptfx
end
end
end

createdProps[serverId] = playerProps
createdPtfx[serverId] = playerPtfx
end)