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

Update CTLD.lua

Browse Source
This commit is contained in:
Thomas 2023-01-04 11:42:56 +01:00 committed by GitHub
parent dde458aea0
commit 47f6f7e8cc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3754,18 +3754,22 @@ function CTLD:_AddRadioBeacon(Name, Sound, Mhz, Modulation, IsShip, IsDropped)
end end
end end
local Sound = Sound or "beacon.ogg" local Sound = Sound or "beacon.ogg"
if IsDropped and Zone then if Zone then
local ZoneCoord = Zone if IsDropped then
local ZoneVec3 = ZoneCoord:GetVec3(1) local ZoneCoord = Zone
local Frequency = string.format("%09d",Mhz * 1000000) -- Freq in Hertz local ZoneVec3 = ZoneCoord:GetVec3() or {x=0,y=0,z=0}
local Sound = self.RadioPath..Sound -- local Frequency = string.format("%09d",Mhz * 1000000) -- Freq in Hertz
trigger.action.radioTransmission(Sound, ZoneVec3, Modulation, false, tonumber(Frequency), 1000) -- Beacon in MP only runs for 30secs straight local Frequency = Mhz * 1000000 -- Freq in Hertz
elseif Zone then local Sound = self.RadioPath..Sound
local ZoneCoord = Zone:GetCoordinate(1) trigger.action.radioTransmission(Sound, ZoneVec3, Modulation, false, Frequency, 1000, name..math.random(1,10000)) -- Beacon in MP only runs for 30secs straight
local ZoneVec3 = ZoneCoord:GetVec3() else
local Frequency = string.format("%09d",Mhz * 1000000) -- Freq in Hertz local ZoneCoord = Zone:GetCoordinate()
local Sound = self.RadioPath..Sound local ZoneVec3 = ZoneCoord:GetVec3() or {x=0,y=0,z=0}
trigger.action.radioTransmission(Sound, ZoneVec3, Modulation, false, tonumber(Frequency), 1000) -- Beacon in MP only runs for 30secs straight --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 end
return self return self
end end
@ -3817,11 +3821,7 @@ function CTLD:_RefreshRadioBeacons()
local Name = czone.name local Name = czone.name
local FM = FMbeacon.frequency -- MHz local FM = FMbeacon.frequency -- MHz
local VHF = VHFbeacon.frequency -- KHz local VHF = VHFbeacon.frequency -- KHz
local UHF = UHFbeacon.frequency -- MHz 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)
self:_AddRadioBeacon(Name,Sound,FM, CTLD.RadioModulation.FM, IsShip, IsDropped) self:_AddRadioBeacon(Name,Sound,FM, CTLD.RadioModulation.FM, IsShip, IsDropped)
self:_AddRadioBeacon(Name,Sound,VHF,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) self:_AddRadioBeacon(Name,Sound,UHF,CTLD.RadioModulation.AM, IsShip, IsDropped)