From 47f6f7e8cc96d29e52a3397c6d0300860ef5dcf8 Mon Sep 17 00:00:00 2001
From: Thomas <72444570+Applevangelist@users.noreply.github.com>
Date: Wed, 4 Jan 2023 11:42:56 +0100
Subject: [PATCH] Update CTLD.lua

---
 Moose Development/Moose/Ops/CTLD.lua | 34 ++++++++++++++--------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/Moose Development/Moose/Ops/CTLD.lua b/Moose Development/Moose/Ops/CTLD.lua
index 677c810e8..04ceca24f 100644
--- a/Moose Development/Moose/Ops/CTLD.lua	
+++ b/Moose Development/Moose/Ops/CTLD.lua	
@@ -3754,18 +3754,22 @@ function CTLD:_AddRadioBeacon(Name, Sound, Mhz, Modulation, IsShip, IsDropped)
     end
   end
   local Sound = Sound or "beacon.ogg"
-  if IsDropped and Zone then
-    local ZoneCoord = Zone
-    local ZoneVec3 = ZoneCoord:GetVec3(1)
-    local Frequency = string.format("%09d",Mhz * 1000000) -- Freq in Hertz
-    local Sound =  self.RadioPath..Sound
-    trigger.action.radioTransmission(Sound, ZoneVec3, Modulation, false, tonumber(Frequency), 1000) -- Beacon in MP only runs for 30secs straight
-  elseif Zone then
-    local ZoneCoord = Zone:GetCoordinate(1)
-    local ZoneVec3 = ZoneCoord:GetVec3()
-    local Frequency = string.format("%09d",Mhz * 1000000) -- Freq in Hertz
-    local Sound =  self.RadioPath..Sound
-    trigger.action.radioTransmission(Sound, ZoneVec3, Modulation, false, tonumber(Frequency), 1000) -- Beacon in MP only runs for 30secs straight
+  if Zone then
+	if IsDropped then
+		local ZoneCoord = Zone
+		local ZoneVec3 = ZoneCoord:GetVec3() or {x=0,y=0,z=0}
+	   -- local Frequency = string.format("%09d",Mhz * 1000000) -- Freq in Hertz
+		local Frequency = Mhz * 1000000 -- Freq in Hertz
+		local Sound =  self.RadioPath..Sound
+		trigger.action.radioTransmission(Sound, ZoneVec3, Modulation, false, Frequency, 1000, name..math.random(1,10000)) -- Beacon in MP only runs for 30secs straight
+	  else
+		local ZoneCoord = Zone:GetCoordinate()
+		local ZoneVec3 = ZoneCoord:GetVec3() or {x=0,y=0,z=0}
+		--local Frequency = string.format("%09d",Mhz * 1000000) -- Freq in Hertz
+		local Frequency = Mhz * 1000000 -- Freq in Hert
+		local Sound =  self.RadioPath..Sound
+		trigger.action.radioTransmission(Sound, ZoneVec3, Modulation, false, Frequency, 1000, name ..math.random(1,10000)) -- Beacon in MP only runs for 30secs straight
+	  end
   end
   return self
 end
@@ -3817,11 +3821,7 @@ function CTLD:_RefreshRadioBeacons()
         local Name = czone.name
         local FM = FMbeacon.frequency  -- MHz
         local VHF = VHFbeacon.frequency -- KHz
-        local UHF = UHFbeacon.frequency  -- MHz
-       -- local co = coroutine.create(self._AddRadioBeacon)
-        --coroutine.resume(co, self, Name,Sound,FM,CTLD.RadioModulation.FM, IsShip, IsDropped)
-        --coroutine.resume(co, self, Name,Sound,VHF,CTLD.RadioModulation.FM, IsShip, IsDropped)
-        --coroutine.resume(co, self, Name,Sound,UHF,CTLD.RadioModulation.AM, IsShip, IsDropped)      
+        local UHF = UHFbeacon.frequency  -- MHz   
         self:_AddRadioBeacon(Name,Sound,FM, CTLD.RadioModulation.FM, IsShip, IsDropped)
         self:_AddRadioBeacon(Name,Sound,VHF,CTLD.RadioModulation.FM, IsShip, IsDropped)
         self:_AddRadioBeacon(Name,Sound,UHF,CTLD.RadioModulation.AM, IsShip, IsDropped)