FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into develop

Browse Source 
# Conflicts:
#	Moose Development/Moose/Ops/CTLD.lua
This commit is contained in:
Applevangelist
2022-12-07 19:00:59 +01:00
parent 2fc2031665 dcfce8b619
commit 047a108689
2 changed files with 130 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Moose Development/Moose/Ops/CTLD.lua
View File

@@ -3703,22 +3703,22 @@ function CTLD:_AddRadioBeacon(Name, Sound, Mhz, Modulation, IsShip, IsDropped)
local Frequency = string.format("%09d",Mhz * 1000000) -- Freq in Hertz
--local Frequency = Mhz*1000000
local Sound = "l10n/DEFAULT/"..Sound
local name = string.format("%s-%f-%s",Zone:GetName(),Mhz,tostring(Modulation))
--local name = string.format("%s-%f-%s",Zone:GetName(),Mhz,tostring(Modulation))
--trigger.action.stopRadioTransmission(name)
trigger.action.radioTransmission(Sound, ZoneVec3, Modulation, false, tonumber(Frequency), 100000,name) -- Beacon in MP only runs for 30secs straight
local status = string.format("***** Beacon added Freq %s Mod %s", Frequency, UTILS.GetModulationName(Modulation))
MESSAGE:New(status,10,"Debug"):ToLogIf(self.debug)
trigger.action.radioTransmission(Sound, ZoneVec3, Modulation, false, tonumber(Frequency), 1000) -- Beacon in MP only runs for 30secs straight
--local status = string.format("***** Beacon added Freq %s Mod %s", Frequency, UTILS.GetModulationName(Modulation))
--MESSAGE:New(status,10,"Debug"):ToLogIf(self.debug)
elseif Zone then
local ZoneCoord = Zone:GetCoordinate(1)
local ZoneVec3 = ZoneCoord:GetVec3()
local Frequency = string.format("%09d",Mhz * 1000000) -- Freq in Hertz
--local Frequency = Mhz*1000000
local Sound = "l10n/DEFAULT/"..Sound
local name = string.format("%s-%f-%s",Zone:GetName(),Mhz,tostring(Modulation))
--local name = string.format("%s-%f-%s",Zone:GetName(),Mhz,tostring(Modulation))
--trigger.action.stopRadioTransmission(name)
trigger.action.radioTransmission(Sound, ZoneVec3, Modulation, false, tonumber(Frequency), 100000,name) -- Beacon in MP only runs for 30secs straight
local status = string.format("***** Beacon added Freq %s Mod %s", Frequency, UTILS.GetModulationName(Modulation))
MESSAGE:New(status,10,"Debug"):ToLogIf(self.debug)
trigger.action.radioTransmission(Sound, ZoneVec3, Modulation, false, tonumber(Frequency), 1000) -- Beacon in MP only runs for 30secs straight
--local status = string.format("***** Beacon added Freq %s Mod %s", Frequency, UTILS.GetModulationName(Modulation))
--MESSAGE:New(status,10,"Debug"):ToLogIf(self.debug)
end
return self
end