From 2127f70ffd8eefa47319d8008782e6b91f619979 Mon Sep 17 00:00:00 2001 From: Nordi98 Date: Wed, 2 Jul 2025 17:45:10 +0200 Subject: [PATCH] ed --- .../[standalone]/vms_firework/client.lua | 2 + .../[standalone]/vms_firework/config.lua | 80 +++++++------------ .../[standalone]/vms_firework/fxmanifest.lua | 20 +++-- 3 files changed, 42 insertions(+), 60 deletions(-) diff --git a/resources/[standalone]/vms_firework/client.lua b/resources/[standalone]/vms_firework/client.lua index 04c349d02..5e960b228 100644 --- a/resources/[standalone]/vms_firework/client.lua +++ b/resources/[standalone]/vms_firework/client.lua @@ -1,3 +1,5 @@ +lib.require('ox_lib') + local function DrawText3D(coords, text) local camCoords = GetFinalRenderedCamCoord() local distance = #(coords - camCoords) diff --git a/resources/[standalone]/vms_firework/config.lua b/resources/[standalone]/vms_firework/config.lua index cd045f7a1..17b223d5f 100644 --- a/resources/[standalone]/vms_firework/config.lua +++ b/resources/[standalone]/vms_firework/config.lua @@ -12,17 +12,24 @@ elseif Config.Core == "QB-Core" then QBCore = exports['qb-core']:GetCoreObject() end +-- Changed notification system to use ox_lib Config.Notification = function(message, time, type) if type == "success" then - exports["vms_notify"]:Notification("FIREWORK", message, time, "#27FF09", "fa-solid fa-fire") - -- TriggerEvent('esx:showNotification', message) --[ ESX ] - -- TriggerEvent('QBCore:Notify', message, 'success', time) -- [ QB-Core ] - + lib.notify({ + title = 'FIREWORK', + description = message, + duration = time, + type = 'success', + icon = 'fire' + }) elseif type == "error" then - exports["vms_notify"]:Notification("FIREWORK", message, time, "#FF0909", "fa-solid fa-fire") - -- TriggerEvent('esx:showNotification', message) --[ ESX ] - -- TriggerEvent('QBCore:Notify', message, 'error', time) -- [ QB-Core ] - + lib.notify({ + title = 'FIREWORK', + description = message, + duration = time, + type = 'error', + icon = 'fire' + }) end end @@ -38,18 +45,18 @@ Config.PlacingAnimation = {'anim@mp_fireworks', 'place_firework_3_box'} -- Anima Config.DisableMultiplyFireworks = false -- if you set it true, the player will be able to place one firework, the next one only after he finishes shooting +-- Enabled lighter requirement Config.NeedLighter = true -Config.LighterItem = 'lighter' - +Config.LighterItem = 'lighter' -- Changed from 'bread' to 'lighter' Config.Fireworks = { [1] = { - item = 'firework1', -- name or nil - itemRemovable = true, -- if it is on the item, is it to be removed after use - command = 'fire_1', -- name of command or nil - shoots = 50, -- count of shots + item = 'firework1', + itemRemovable = true, + command = nil, -- Removed command to only use items + shoots = 50, prop = "ind_prop_firework_03", - timeToStart = 5500, -- +/- 5000 == 5 seconds + timeToStart = 5500, timeBetweenShoots = 1250, particles = { {name = "scr_indep_fireworks", effect = "scr_indep_firework_starburst", scale = 2.0, plusHeight = 50.0, randomizeXY = true, timeToNextShoot = 120}, @@ -60,7 +67,7 @@ Config.Fireworks = { [2] = { item = 'firework2', itemRemovable = true, - command = 'fire_2', + command = nil, -- Removed command to only use items shoots = 80, prop = "ind_prop_firework_03", timeToStart = 5500, @@ -74,7 +81,7 @@ Config.Fireworks = { [3] = { item = 'firework3', itemRemovable = true, - command = 'fire_3', + command = nil, -- Removed command to only use items shoots = 80, prop = "ind_prop_firework_03", timeToStart = 5500, @@ -89,7 +96,7 @@ Config.Fireworks = { [4] = { item = 'firework4', itemRemovable = true, - command = 'fire_4', + command = nil, -- Removed command to only use items shoots = 50, prop = "ind_prop_firework_03", timeToStart = 5000, @@ -99,9 +106,9 @@ Config.Fireworks = { }, }, [5] = { - item = 'fontain_4', + item = 'fontain4', itemRemovable = true, - command = 'fontain_4', + command = nil, -- Removed command to only use items shoots = 80, prop = "ind_prop_firework_04", timeToStart = 3500, @@ -110,37 +117,4 @@ Config.Fireworks = { {name = "scr_indep_fireworks", effect = "scr_indep_firework_fountain", scale = 0.25, plusHeight = 0.25, randomizeXY = false, timeToNextShoot = 500}, }, }, - --[[ - [6] = { - item = nil, - itemRemovable = false, - command = '', - shoots = 1, - prop = "ind_prop_firework_04", - timeToStart = 1000, - timeBetweenShoots = 100, - particles = { - -- {name = "proj_indep_firework", effect = "scr_indep_firework_grd_burst", scale = 2.0, plusHeight = 50.0, randomizeXY = true, timeToNextShoot = 600}, - -- {name = "proj_indep_firework", effect = "scr_indep_firework_air_burst", scale = 2.0, plusHeight = 50.0, randomizeXY = true, timeToNextShoot = 600}, - - -- {name = "proj_indep_firework_v2", effect = "scr_firework_indep_burst_rwb", scale = 1.0, plusHeight = 50.0, randomizeXY = true, timeToNextShoot = 2025}, - -- {name = "proj_indep_firework_v2", effect = "scr_firework_indep_spiral_burst_rwb", scale = 1.0, plusHeight = 50.0, randomizeXY = true, timeToNextShoot = 2025}, - -- {name = "proj_indep_firework_v2", effect = "scr_firework_indep_ring_burst_rwb", scale = 1.0, plusHeight = 50.0, randomizeXY = true, timeToNextShoot = 2025}, - -- {name = "proj_indep_firework_v2", effect = "scr_xmas_firework_burst_fizzle", scale = 1.0, plusHeight = 50.0, randomizeXY = true, timeToNextShoot = 2025}, - -- {name = "proj_indep_firework_v2", effect = "scr_firework_indep_repeat_burst_rwb", scale = 1.0, plusHeight = 50.0, randomizeXY = true, timeToNextShoot = 2025}, - - -- {name = "proj_xmas_firework", effect = "scr_firework_xmas_ring_burst_rgw", scale = 1.0, plusHeight = 50.0, randomizeXY = true, timeToNextShoot = 2025}, - -- {name = "proj_xmas_firework", effect = "scr_firework_xmas_burst_rgw", scale = 1.0, plusHeight = 50.0, randomizeXY = true, timeToNextShoot = 2025}, - -- {name = "proj_xmas_firework", effect = "scr_firework_xmas_repeat_burst_rgw", scale = 1.0, plusHeight = 50.0, randomizeXY = true, timeToNextShoot = 2025}, - -- {name = "proj_xmas_firework", effect = "scr_firework_xmas_spiral_burst_rgw", scale = 1.0, plusHeight = 50.0, randomizeXY = true, timeToNextShoot = 2025}, - - -- {name = "scr_indep_fireworks", effect = "scr_indep_firework_starburst", scale = 1.0, plusHeight = 50.0, randomizeXY = true, timeToNextShoot = 2025}, - -- {name = "scr_indep_fireworks", effect = "scr_indep_firework_shotburst", scale = 1.0, plusHeight = 50.0, randomizeXY = true, timeToNextShoot = 2025}, - -- {name = "scr_indep_fireworks", effect = "scr_indep_firework_trailburst", scale = 1.0, plusHeight = 50.0, randomizeXY = true, timeToNextShoot = 2025}, - -- {name = "scr_indep_fireworks", effect = "scr_indep_firework_trailburst_spawn", scale = 1.0, plusHeight = 50.0, randomizeXY = true, timeToNextShoot = 2025}, - -- {name = "scr_indep_fireworks", effect = "scr_indep_firework_burst_spawn", scale = 1.0, plusHeight = 50.0, randomizeXY = true, timeToNextShoot = 2025}, - -- {name = "scr_indep_fireworks", effect = "scr_indep_firework_fountain", scale = 1.0, plusHeight = 50.0, randomizeXY = true, timeToNextShoot = 2025}, - }, - } - ]] } diff --git a/resources/[standalone]/vms_firework/fxmanifest.lua b/resources/[standalone]/vms_firework/fxmanifest.lua index f295677d9..64ed20afb 100644 --- a/resources/[standalone]/vms_firework/fxmanifest.lua +++ b/resources/[standalone]/vms_firework/fxmanifest.lua @@ -1,17 +1,23 @@ fx_version 'cerulean' game 'gta5' -lua54 'yes' -author 'vames™️' -description 'vms_firework' +author 'Your Name' +description 'Firework Script' version '1.0.0' -shared_script 'config.lua' +shared_scripts { + '@ox_lib/init.lua', -- Add this line + 'config.lua' +} client_scripts { - 'client.lua' + 'client.lua' } server_scripts { - 'server.lua' -} \ No newline at end of file + 'server.lua' +} + +dependencies { + 'ox_lib' -- Add this line +}