From c0cb2761df8b37e9506bbf6e47806fa72765f7f9 Mon Sep 17 00:00:00 2001 From: AvarianKnight Date: Sun, 28 Feb 2021 12:27:51 -0600 Subject: [PATCH] fix(submixs): add the right values - add default submix values Co-Authored-By: Poggu <45881722+Poggicek@users.noreply.github.com> --- client/main.lua | 14 ++++++++++++-- client/module/radio.lua | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/client/main.lua b/client/main.lua index d31797e..5517465 100644 --- a/client/main.lua +++ b/client/main.lua @@ -39,6 +39,16 @@ RegisterCommand('vol', function(_, args) end end) + +-- default submix incase people want to fiddle with it. +-- freq_low = 389.0 +-- freq_hi = 3248.0 +-- fudge = 0.0 +-- rm_mod_freq = 0.0 +-- rm_mix = 0.16 +-- o_freq_lo = 348.0 +-- 0_freq_hi = 4900.0 + -- radio submix local radioEffectId = CreateAudioSubmix('Radio') SetAudioSubmixEffectRadioFx(radioEffectId, 0) @@ -48,8 +58,8 @@ AddAudioSubmixOutput(radioEffectId, 0) local phoneEffectId = CreateAudioSubmix('Phone') SetAudioSubmixEffectRadioFx(phoneEffectId, 1) SetAudioSubmixEffectParamInt(phoneEffectId, 1, GetHashKey('default'), 1) -SetAudioSubmixEffectParamFloat(phoneEffectId, 1, GetHashKey('freq_low'), 20.2) -SetAudioSubmixEffectParamFloat(phoneEffectId, 1, GetHashKey('o_freq_lo'), 700.4) +SetAudioSubmixEffectParamFloat(phoneEffectId, 1, GetHashKey('freq_low'), 700.0) +SetAudioSubmixEffectParamFloat(phoneEffectId, 1, GetHashKey('freq_hi'), 15000.0) AddAudioSubmixOutput(phoneEffectId, 1) local submixFunctions = { diff --git a/client/module/radio.lua b/client/module/radio.lua index a42f668..e2b4d86 100644 --- a/client/module/radio.lua +++ b/client/module/radio.lua @@ -96,7 +96,7 @@ RegisterCommand('+radiotalk', function() -- since this is a shared resource (between my server and the public), probably don't want to try and use our export :P -- use fallback in this case. if GetResourceState("pma-ambulance") ~= "missing" then - if exports["pma-ambulance"]:isPlayerDead() then + if LocalPlayer.state.isDead then return false end elseif IsPlayerDead(PlayerId()) then