From 4bd6d6719fb060e5aed242146bbee973fd5054c1 Mon Sep 17 00:00:00 2001 From: bitpredator <67551273+bitpredator@users.noreply.github.com> Date: Fri, 14 Jun 2024 17:45:21 +0200 Subject: [PATCH] =?UTF-8?q?chore:=20pma-voice\client\commands.lua=20?= =?UTF-8?q?=F0=9F=8E=A8=20Run=20formatter?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../[phone]/pma-voice/client/commands.lua | 122 +++++++++--------- 1 file changed, 63 insertions(+), 59 deletions(-) diff --git a/server-data/resources/[phone]/pma-voice/client/commands.lua b/server-data/resources/[phone]/pma-voice/client/commands.lua index 79713c88d..c3e3953e1 100644 --- a/server-data/resources/[phone]/pma-voice/client/commands.lua +++ b/server-data/resources/[phone]/pma-voice/client/commands.lua @@ -1,83 +1,87 @@ local wasProximityDisabledFromOverride = false disableProximityCycle = false -RegisterCommand('setvoiceintent', function(source, args) - if GetConvarInt('voice_allowSetIntent', 1) == 1 then - local intent = args[1] - if intent == 'speech' then - MumbleSetAudioInputIntent(`speech`) - elseif intent == 'music' then - MumbleSetAudioInputIntent(`music`) - end - LocalPlayer.state:set('voiceIntent', intent, true) - end +RegisterCommand("setvoiceintent", function(source, args) + if GetConvarInt("voice_allowSetIntent", 1) == 1 then + local intent = args[1] + if intent == "speech" then + MumbleSetAudioInputIntent(`speech`) + elseif intent == "music" then + MumbleSetAudioInputIntent(`music`) + end + LocalPlayer.state:set("voiceIntent", intent, true) + end end) -TriggerEvent('chat:addSuggestion', '/setvoiceintent', 'Sets the players voice intent', { - { - name = "intent", - help = "speech is default and enables noise suppression & high pass filter, music disables both of these." - }, +TriggerEvent("chat:addSuggestion", "/setvoiceintent", "Sets the players voice intent", { + { + name = "intent", + help = "speech is default and enables noise suppression & high pass filter, music disables both of these.", + }, }) -- TODO: Better implementation of this? -RegisterCommand('vol', function(_, args) - if not args[1] then return end - setVolume(tonumber(args[1])) +RegisterCommand("vol", function(_, args) + if not args[1] then + return + end + setVolume(tonumber(args[1])) end) -TriggerEvent('chat:addSuggestion', '/vol', 'Sets the radio/phone volume', { - { name = "volume", help = "A range between 1-100 on how loud you want them to be" }, +TriggerEvent("chat:addSuggestion", "/vol", "Sets the radio/phone volume", { + { name = "volume", help = "A range between 1-100 on how loud you want them to be" }, }) -exports('setAllowProximityCycleState', function(state) - type_check({ state, "boolean" }) - disableProximityCycle = state +exports("setAllowProximityCycleState", function(state) + type_check({ state, "boolean" }) + disableProximityCycle = state end) function setProximityState(proximityRange, isCustom) - local voiceModeData = Cfg.voiceModes[mode] - MumbleSetTalkerProximity(proximityRange + 0.0) - LocalPlayer.state:set('proximity', { - index = mode, - distance = proximityRange, - mode = isCustom and "Custom" or voiceModeData[2], - }, true) - sendUIMessage({ - -- JS expects this value to be - 1, "custom" voice is on the last index - voiceMode = isCustom and #Cfg.voiceModes or mode - 1 - }) + local voiceModeData = Cfg.voiceModes[mode] + MumbleSetTalkerProximity(proximityRange + 0.0) + LocalPlayer.state:set("proximity", { + index = mode, + distance = proximityRange, + mode = isCustom and "Custom" or voiceModeData[2], + }, true) + sendUIMessage({ + -- JS expects this value to be - 1, "custom" voice is on the last index + voiceMode = isCustom and #Cfg.voiceModes or mode - 1, + }) end exports("overrideProximityRange", function(range, disableCycle) - type_check({ range, "number" }) - setProximityState(range, true) - if disableCycle then - disableProximityCycle = true - wasProximityDisabledFromOverride = true - end + type_check({ range, "number" }) + setProximityState(range, true) + if disableCycle then + disableProximityCycle = true + wasProximityDisabledFromOverride = true + end end) exports("clearProximityOverride", function() - local voiceModeData = Cfg.voiceModes[mode] - setProximityState(voiceModeData[1], false) - if wasProximityDisabledFromOverride then - disableProximityCycle = false - end + local voiceModeData = Cfg.voiceModes[mode] + setProximityState(voiceModeData[1], false) + if wasProximityDisabledFromOverride then + disableProximityCycle = false + end end) -RegisterCommand('cycleproximity', function() - -- Proximity is either disabled, or manually overwritten. - if GetConvarInt('voice_enableProximityCycle', 1) ~= 1 or disableProximityCycle then return end - local newMode = mode + 1 +RegisterCommand("cycleproximity", function() + -- Proximity is either disabled, or manually overwritten. + if GetConvarInt("voice_enableProximityCycle", 1) ~= 1 or disableProximityCycle then + return + end + local newMode = mode + 1 - -- If we're within the range of our voice modes, allow the increase, otherwise reset to the first state - if newMode <= #Cfg.voiceModes then - mode = newMode - else - mode = 1 - end + -- If we're within the range of our voice modes, allow the increase, otherwise reset to the first state + if newMode <= #Cfg.voiceModes then + mode = newMode + else + mode = 1 + end - setProximityState(Cfg.voiceModes[mode][1], false) - TriggerEvent('pma-voice:setTalkingMode', mode) + setProximityState(Cfg.voiceModes[mode][1], false) + TriggerEvent("pma-voice:setTalkingMode", mode) end, false) -if gameVersion == 'fivem' then - RegisterKeyMapping('cycleproximity', 'Cycle Proximity', 'keyboard', GetConvar('voice_defaultCycle', 'F11')) +if gameVersion == "fivem" then + RegisterKeyMapping("cycleproximity", "Cycle Proximity", "keyboard", GetConvar("voice_defaultCycle", "F11")) end