diff --git a/init.lua b/init.lua index 5da1da6..8d6d94f 100644 --- a/init.lua +++ b/init.lua @@ -104,7 +104,7 @@ if IsDuplicityVersion() then return end Bridge.RegisterModule("Fuel", Fuel) Bridge.RegisterModule("Input", Input) -Bridge.RegisterModule("Progressbar", Progressbar) +Bridge.RegisterModule("ProgressBar", ProgressBar) Bridge.RegisterModule("Target", Target) Bridge.RegisterModule("Menu", Menu) diff --git a/lib/shared/rebound_entities.lua b/lib/shared/rebound_entities.lua index 021aaf1..c1f3c26 100644 --- a/lib/shared/rebound_entities.lua +++ b/lib/shared/rebound_entities.lua @@ -90,7 +90,7 @@ if not isServer then goto client end function ReboundEntities.Create(entityData, src) local entity = ReboundEntities.Register(entityData) assert(entity and entity.position, "Invalid entity data") - entity.rotation = entity.rotation or vector3(0, 0, 0) + entity.rotation = entity.rotation or vector3(0, 0, entityData.heading or 0) TriggerClientEvent(GetCurrentResourceName() .. ":client:CreateReboundEntity", src or -1, entity) return entity end diff --git a/modules/target/_defualt/client.lua b/modules/target/_defualt/client.lua new file mode 100644 index 0000000..6c3a7ca --- /dev/null +++ b/modules/target/_defualt/client.lua @@ -0,0 +1,45 @@ +Target = Target or {} + +local function warnUser() + print("Currently Only Targeting Is Supported.") +end + +Target.AddGlobalPlayer = function(options) + warnUser() +end + +Target.AddGlobalVehicle = function(options) + warnUser() +end + +Target.RemoveGlobalVehicle = function(options) + warnUser() +end + +Target.AddLocalEntity = function(entities, _options) + warnUser() +end + +Target.AddModel = function(models, options) + warnUser() +end + +Target.AddBoxZone = function(name, coords, size, heading, options) + warnUser() +end + +Target.RemoveGlobalPlayer = function() + warnUser() +end + +Target.RemoveLocalEntity = function(entity) + warnUser() +end + +Target.RemoveModel = function(model) + warnUser() +end + +Target.RemoveZone = function(name) + warnUser() +end \ No newline at end of file diff --git a/modules/target/ox_target/client.lua b/modules/target/ox_target/client.lua index 6f1b69e..332e170 100644 --- a/modules/target/ox_target/client.lua +++ b/modules/target/ox_target/client.lua @@ -12,7 +12,7 @@ detectDebugEnabled() local ox_target = exports.ox_target local targetZones = {} -Target = {} +Target = Target or {} Target.FixOptions = function(options) for k, v in pairs(options) do diff --git a/modules/target/qb-target/client.lua b/modules/target/qb-target/client.lua index 7913612..f747694 100644 --- a/modules/target/qb-target/client.lua +++ b/modules/target/qb-target/client.lua @@ -11,7 +11,7 @@ detectDebugEnabled() local targetZones = {} -Target = {} +Target = Target or {} Target.FixOptions = function(options) for k, v in pairs(options) do diff --git a/modules/target/sleepless_interact/client.lua b/modules/target/sleepless_interact/client.lua new file mode 100644 index 0000000..d3870cd --- /dev/null +++ b/modules/target/sleepless_interact/client.lua @@ -0,0 +1,35 @@ +if GetResourceState('sleepless_interact') ~= 'started' then return end + +local sleepless = exports.sleepless_interact + +Target = Target or {} + +Target.FixOptions = function(options) + for k, v in pairs(options) do + local action = v.onSelect or v.action + local select = function(entityOrData) + if type(entityOrData) == 'table' then + return action(entityOrData.entity) + end + return action(entityOrData) + end + options[k].onSelect = select + end + return options +end + +Target.AddLocalEntity = function(entity, _options) + local options = Target.FixOptions(_options) + sleepless:addLocalEntity({ + id = entity, + entity = entity, + options = options, + renderDistance = 10.0, + activeDistance = 2.0, + cooldown = 1500 + }) +end + +Target.RemoveLocalEntity = function(entity) + sleepless:removeLocalEntity(entity) +end \ No newline at end of file