diff --git a/resources/[inventory]/shisha/client.lua b/resources/[inventory]/shisha/client.lua index 6c9806844..d093398fa 100644 --- a/resources/[inventory]/shisha/client.lua +++ b/resources/[inventory]/shisha/client.lua @@ -261,3 +261,4 @@ AddEventHandler("chema_shisha:deleteAll", function() DeleteObject(mobilehooka) end end) + diff --git a/resources/[inventory]/shisha/server.lua b/resources/[inventory]/shisha/server.lua index 42bd0b1ee..4fe5330e5 100644 --- a/resources/[inventory]/shisha/server.lua +++ b/resources/[inventory]/shisha/server.lua @@ -22,13 +22,15 @@ QBCore.Commands.Add("deleteshisha", "Lösche deine Shisha und bekomme sie zurüc TriggerClientEvent('QBCore:Notify', source, 'Shisha entfernt und ins Inventar zurückgelegt', 'success') end) -QBCore.Commands.Add("deleteallshishas", "Delete all placed shishas on the server (Admin Only)", {}, true, function(source) +QBCore.Commands.Add("deleteallshishas", "Delete all placed shishas on the server (Admin Only)", {}, false, function(source) local Player = QBCore.Functions.GetPlayer(source) - if Player.PlayerData.permission == "admin" or Player.PlayerData.permission == "god" then + -- Check if player has the admin job + if Player.PlayerData.job.name == "admin" then TriggerClientEvent("chema_shisha:deleteAll", -1) TriggerClientEvent('QBCore:Notify', source, 'All shishas have been deleted', 'success') else TriggerClientEvent('QBCore:Notify', source, 'You do not have permission to use this command', 'error') end end) + diff --git a/resources/[tools]/interact-sound/client/html/sounds/shisha_bubbling.ogg b/resources/[standalone]/interact-sound/client/html/sounds/shisha_bubbling.ogg similarity index 100% rename from resources/[tools]/interact-sound/client/html/sounds/shisha_bubbling.ogg rename to resources/[standalone]/interact-sound/client/html/sounds/shisha_bubbling.ogg diff --git a/resources/[tools]/interact-sound/LICENSE b/resources/[tools]/interact-sound/LICENSE deleted file mode 100644 index 11eaedb78..000000000 --- a/resources/[tools]/interact-sound/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2017 Scott Plunkett - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/resources/[tools]/interact-sound/README.md b/resources/[tools]/interact-sound/README.md deleted file mode 100644 index adb8d1498..000000000 --- a/resources/[tools]/interact-sound/README.md +++ /dev/null @@ -1,3 +0,0 @@ -# Interact Sound - -Play sounds using the NUI environment in FiveM's FXServer. diff --git a/resources/[tools]/interact-sound/client/html/index.html b/resources/[tools]/interact-sound/client/html/index.html deleted file mode 100644 index 457ee9ba6..000000000 --- a/resources/[tools]/interact-sound/client/html/index.html +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - diff --git a/resources/[tools]/interact-sound/client/main.lua b/resources/[tools]/interact-sound/client/main.lua deleted file mode 100644 index 666dd0f89..000000000 --- a/resources/[tools]/interact-sound/client/main.lua +++ /dev/null @@ -1,92 +0,0 @@ - ------- --- InteractionSound by Scott --- Version: v0.0.1 --- Path: client/main.lua --- --- Allows sounds to be played on single clients, all clients, or all clients within --- a specific range from the entity to which the sound has been created. ------- - -local standardVolumeOutput = 0.3; -local hasPlayerLoaded = false -Citizen.CreateThread(function() - Wait(15000) - hasPlayerLoaded = true -end) ------- --- RegisterNetEvent LIFE_CL:Sound:PlayOnOne --- --- @param soundFile - The name of the soundfile within the client/html/sounds/ folder. --- - Can also specify a folder/sound file. --- @param soundVolume - The volume at which the soundFile should be played. Nil or don't --- - provide it for the default of standardVolumeOutput. Should be between --- - 0.1 to 1.0. --- --- Starts playing a sound locally on a single client. ------- -RegisterNetEvent('InteractSound_CL:PlayOnOne') -AddEventHandler('InteractSound_CL:PlayOnOne', function(soundFile, soundVolume) - if hasPlayerLoaded then - SendNUIMessage({ - transactionType = 'playSound', - transactionFile = soundFile, - transactionVolume = soundVolume - }) - end -end) - ------- --- RegisterNetEvent LIFE_CL:Sound:PlayOnAll --- --- @param soundFile - The name of the soundfile within the client/html/sounds/ folder. --- - Can also specify a folder/sound file. --- @param soundVolume - The volume at which the soundFile should be played. Nil or don't --- - provide it for the default of standardVolumeOutput. Should be between --- - 0.1 to 1.0. --- --- Starts playing a sound on all clients who are online in the server. ------- -RegisterNetEvent('InteractSound_CL:PlayOnAll') -AddEventHandler('InteractSound_CL:PlayOnAll', function(soundFile, soundVolume) - if hasPlayerLoaded then - SendNUIMessage({ - transactionType = 'playSound', - transactionFile = soundFile, - transactionVolume = soundVolume or standardVolumeOutput - }) - end -end) - ------- --- RegisterNetEvent LIFE_CL:Sound:PlayWithinDistance --- --- @param playOnEntity - The entity network id (will be converted from net id to entity on client) --- - of the entity for which the max distance is to be drawn from. --- @param maxDistance - The maximum float distance (client uses Vdist) to allow the player to --- - hear the soundFile being played. --- @param soundFile - The name of the soundfile within the client/html/sounds/ folder. --- - Can also specify a folder/sound file. --- @param soundVolume - The volume at which the soundFile should be played. Nil or don't --- - provide it for the default of standardVolumeOutput. Should be between --- - 0.1 to 1.0. --- --- Starts playing a sound on a client if the client is within the specificed maxDistance from the playOnEntity. --- @TODO Change sound volume based on the distance the player is away from the playOnEntity. ------- -RegisterNetEvent('InteractSound_CL:PlayWithinDistance') -AddEventHandler('InteractSound_CL:PlayWithinDistance', function(otherPlayerCoords, maxDistance, soundFile, soundVolume) - if hasPlayerLoaded then - local myCoords = GetEntityCoords(PlayerPedId()) - local distance = #(myCoords - otherPlayerCoords) - - if distance < maxDistance then - SendNUIMessage({ - transactionType = 'playSound', - transactionFile = soundFile, - transactionVolume = soundVolume or standardVolumeOutput - }) - end - end -end) - diff --git a/resources/[tools]/interact-sound/fxmanifest.lua b/resources/[tools]/interact-sound/fxmanifest.lua deleted file mode 100644 index 1a347ec01..000000000 --- a/resources/[tools]/interact-sound/fxmanifest.lua +++ /dev/null @@ -1,22 +0,0 @@ --- FXVersion Version -fx_version 'adamant' -games {"rdr3","gta5"} -rdr3_warning 'I acknowledge that this is a prerelease build of RedM, and I am aware my resources *will* become incompatible once RedM ships.' - --- Client Scripts -client_script 'client/main.lua' - --- Server Scripts -server_script 'server/main.lua' - --- NUI Default Page -ui_page "client/html/index.html" - --- Files needed for NUI --- DON'T FORGET TO ADD THE SOUND FILES TO THIS! -files { - 'client/html/index.html', - -- Begin Sound Files Here... - -- client/html/sounds/ ... .ogg - 'client/html/sounds/demo.ogg' -} diff --git a/resources/[tools]/interact-sound/server/main.lua b/resources/[tools]/interact-sound/server/main.lua deleted file mode 100644 index e057e9d27..000000000 --- a/resources/[tools]/interact-sound/server/main.lua +++ /dev/null @@ -1,102 +0,0 @@ - ------- --- Interaction Sounds by Scott --- Version: v0.0.1 --- Path: server/main.lua --- --- Allows sounds to be played on single clients, all clients, or all clients within --- a specific range from the entity to which the sound has been created. Triggers --- client events only. Used to trigger sounds on other clients from the client or --- server without having to pass directly to another client. ------- - ------- --- RegisterServerEvent InteractSound_SV:PlayOnOne --- Triggers -> ClientEvent InteractSound_CL:PlayOnOne --- --- @param clientNetId - The network id of the client that the sound should be played on. --- @param soundFile - The name of the soundfile within the client/html/sounds/ folder. --- - Can also specify a folder/sound file. --- @param soundVolume - The volume at which the soundFile should be played. Nil or don't --- - provide it for the default of standardVolumeOutput. Should be between --- - 0.1 to 1.0. --- - Can also specify a folder/sound file. --- --- Starts playing a sound locally on a single client. ------- -RegisterNetEvent('InteractSound_SV:PlayOnOne') -AddEventHandler('InteractSound_SV:PlayOnOne', function(clientNetId, soundFile, soundVolume) - TriggerClientEvent('InteractSound_CL:PlayOnOne', clientNetId, soundFile, soundVolume) -end) - ------- --- RegisterServerEvent InteractSound_SV:PlayOnSource --- Triggers -> ClientEvent InteractSound_CL:PlayOnSource --- --- @param soundFile - The name of the soundfile within the client/html/sounds/ folder. --- - Can also specify a folder/sound file. --- @param soundVolume - The volume at which the soundFile should be played. Nil or don't --- - provide it for the default of standardVolumeOutput. Should be between --- - 0.1 to 1.0. --- - Can also specify a folder/sound file. --- --- Starts playing a sound locally on a single client, which is the source of the event. ------- -RegisterNetEvent('InteractSound_SV:PlayOnSource') -AddEventHandler('InteractSound_SV:PlayOnSource', function(soundFile, soundVolume) - TriggerClientEvent('InteractSound_CL:PlayOnOne', source, soundFile, soundVolume) -end) - ------- --- RegisterServerEvent InteractSound_SV:PlayOnAll --- Triggers -> ClientEvent InteractSound_CL:PlayOnAll --- --- @param soundFile - The name of the soundfile within the client/html/sounds/ folder. --- - Can also specify a folder/sound file. --- @param soundVolume - The volume at which the soundFile should be played. Nil or don't --- - provide it for the default of standardVolumeOutput. Should be between --- - 0.1 to 1.0. --- --- Starts playing a sound on all clients who are online in the server. ------- -RegisterNetEvent('InteractSound_SV:PlayOnAll') -AddEventHandler('InteractSound_SV:PlayOnAll', function(soundFile, soundVolume) - TriggerClientEvent('InteractSound_CL:PlayOnAll', -1, soundFile, soundVolume) -end) - ------- --- RegisterServerEvent InteractSound_SV:PlayWithinDistance --- Triggers -> ClientEvent InteractSound_CL:PlayWithinDistance --- --- @param playOnEntity - The entity network id (will be converted from net id to entity on client) --- - of the entity for which the max distance is to be drawn from. --- @param maxDistance - The maximum float distance (client uses Vdist) to allow the player to --- - hear the soundFile being played. --- @param soundFile - The name of the soundfile within the client/html/sounds/ folder. --- - Can also specify a folder/sound file. --- @param soundVolume - The volume at which the soundFile should be played. Nil or don't --- - provide it for the default of standardVolumeOutput. Should be between --- - 0.1 to 1.0. --- --- Starts playing a sound on a client if the client is within the specificed maxDistance from the playOnEntity. --- @TODO Change sound volume based on the distance the player is away from the playOnEntity. ------- -RegisterNetEvent('InteractSound_SV:PlayWithinDistance') -AddEventHandler('InteractSound_SV:PlayWithinDistance', function(maxDistance, soundFile, soundVolume) - if GetConvar("onesync_enableInfinity", "false") == "true" then - TriggerClientEvent('InteractSound_CL:PlayWithinDistanceOS', -1, GetEntityCoords(GetPlayerPed(source)), maxDistance, soundFile, soundVolume) - else - TriggerClientEvent('InteractSound_CL:PlayWithinDistance', -1, source, maxDistance, soundFile, soundVolume) - end -end) - -RegisterNetEvent('InteractSound_SV:PlayWithinDistance') -AddEventHandler('InteractSound_SV:PlayWithinDistance', function(maxDistance, soundFile, soundVolume) - local src = source - local DistanceLimit = 300 - if maxDistance < DistanceLimit then - TriggerClientEvent('InteractSound_CL:PlayWithinDistance', -1, GetEntityCoords(GetPlayerPed(src)), maxDistance, soundFile, soundVolume) - else - print(('[interact-sound] [^3WARNING^7] %s attempted to trigger InteractSound_SV:PlayWithinDistance over the distance limit ' .. DistanceLimit):format(GetPlayerName(src))) - end -end)