From b62de933ad2162a11516db45edd7dad6c1fb508a Mon Sep 17 00:00:00 2001
From: Dan <WolfKnight98@users.noreply.github.com>
Date: Sun, 1 Dec 2019 20:04:58 +0000
Subject: [PATCH] Beep volume setting

---
 cl_radar.lua | 17 ++++++++++-------
 nui/radar.js |  5 +++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/cl_radar.lua b/cl_radar.lua
index 6418e23..7317cf1 100644
--- a/cl_radar.lua
+++ b/cl_radar.lua
@@ -55,15 +55,18 @@ RADAR.vars =
 		["same"] = 4, 
 		["opp"] = 3, 
 
-		["alert"] = true 
+		["alert"] = true,
+
+		["beep"] = 1.0
 	},
 
 	menuActive = false, 
 	currentOptionIndex = 1, 
 	menuOptions = {
 		{ displayText = { "¦¦¦", "FAS" }, optionsText = { "On¦", "Off" }, options = { true, false }, optionIndex = 1, settingText = "fastDisplay" },
-		{ displayText = { "¦SL", "SEn" }, optionsText = { "¦1¦", "¦2¦", "¦3¦", "¦4¦", "¦5¦" }, options = { 1, 2, 3, 4, 5 }, optionIndex = 4, settingText = "same" },
-		{ displayText = { "¦OP", "SEn" }, optionsText = { "¦1¦", "¦2¦", "¦3¦", "¦4¦", "¦5¦" }, options = { 1, 2, 3, 4, 5 }, optionIndex = 3, settingText = "opp" },
+		{ displayText = { "¦SL", "SEn" }, optionsText = { "¦1¦", "¦2¦", "¦3¦", "¦4¦", "¦5¦" }, options = { 0.2, 0.4, 0.6, 0.8, 1.0 }, optionIndex = 4, settingText = "same" },
+		{ displayText = { "¦OP", "SEn" }, optionsText = { "¦1¦", "¦2¦", "¦3¦", "¦4¦", "¦5¦" }, options = { 0.2, 0.4, 0.6, 0.8, 1.0 }, optionIndex = 3, settingText = "opp" },
+		{ displayText = { "¦¦b", "EEP" }, optionsText = { "¦1¦", "¦2¦", "¦3¦", "¦4¦", "¦5¦" }, options = { 0.2, 0.4, 0.6, 0.8, 1.0 }, optionIndex = 5, settingText = "beep" }
 	},
 
 	-- Player's vehicle speed, this is used to update the patrol vehicle speed on the radar
@@ -479,7 +482,7 @@ end
 
 function RADAR:UpdateRayEndCoords()
 	for k, v in pairs( self.rayTraces ) do 
-		local endY = ( self:GetSettingValue( v.rayType ) * 0.2 ) * v.endVec.baseY
+		local endY = self:GetSettingValue( v.rayType ) * v.endVec.baseY
 		v.endVec.y = endY
 	end 	
 end 
@@ -821,7 +824,7 @@ RegisterNUICallback( "setAntennaMode", function( data )
 		end )
 	end 
 
-	SendNUIMessage( { _type = "audio", name = "beep" } )
+	SendNUIMessage( { _type = "audio", name = "beep", vol = RADAR:GetSettingValue( "beep" ) } )
 end )
 
 RegisterNUICallback( "toggleAntenna", function( data ) 
@@ -831,7 +834,7 @@ RegisterNUICallback( "toggleAntenna", function( data )
 	else
 		RADAR:ToggleAntenna( data.value, function()
 			SendNUIMessage( { _type = "antennaXmit", ant = data.value, on = RADAR:IsAntennaTransmitting( data.value ) } )
-			SendNUIMessage( { _type = "audio", name = RADAR:IsAntennaTransmitting( data.value ) and "xmit_on" or "xmit_off" } )
+			SendNUIMessage( { _type = "audio", name = RADAR:IsAntennaTransmitting( data.value ) and "xmit_on" or "xmit_off", vol = RADAR:GetSettingValue( "beep" ) } )
 		end )
 	end 
 end )
@@ -845,7 +848,7 @@ RegisterNUICallback( "menu", function()
 		RADAR:SendMenuUpdate()
 	end
 
-	SendNUIMessage( { _type = "audio", name = "beep" } )
+	SendNUIMessage( { _type = "audio", name = "beep", vol = RADAR:GetSettingValue( "beep" ) } )
 end )
 
 
diff --git a/nui/radar.js b/nui/radar.js
index fd20e84..81801c2 100644
--- a/nui/radar.js
+++ b/nui/radar.js
@@ -306,9 +306,10 @@ function settingUpdate( ants, fast )
     }
 }
 
-function playAudio( name )
+function playAudio( name, vol )
 {
     let audio = new Audio( audioNames[name] );
+    audio.volume = vol; 
     audio.play();
 }
 
@@ -379,7 +380,7 @@ window.addEventListener( "message", function( event ) {
             settingUpdate( item.antennaData, item.fast ); 
             break; 
         case "audio":
-            playAudio( item.name ); 
+            playAudio( item.name, item.vol ); 
             break; 
         default:
             break;