diff --git a/Moose Development/Moose/Core/Radio.lua b/Moose Development/Moose/Core/Radio.lua index 4cee7589f..a764d6519 100644 --- a/Moose Development/Moose/Core/Radio.lua +++ b/Moose Development/Moose/Core/Radio.lua @@ -23,7 +23,7 @@ RADIO = { Positionable, FileName = "", Frequency = 0, - Modulation = 0, + Modulation = radio.modulation.AM, Subtitle = "", SubtitleDuration = 10, Power = 100, @@ -74,7 +74,7 @@ function RADIO:NewGenericTransmission(...) self:F2(arg) self.FileName = RADIO:VerifyFileName(arg[1]) if arg[2] ~= nil then - self.Frequecy = arg[2] * 1000 -- Convert to Hz + self.Frequency = arg[2] * 1000 -- Convert to Hz end if arg[3] ~= nil then self.Modulation = arg[3] @@ -158,7 +158,7 @@ function RADIO:Broadcast() }) else -- If the POSITIONABLE is anything else, we revert to the general function - trigger.action.radioTransmission(self.FileName, self.Positionable:PositionVec3(), self.Modulation, 1, self.Frequency, self.Power) + trigger.action.radioTransmission(self.FileName, self.Positionable:GetPositionVec3(), self.Modulation, false, self.Frequency, self.Power) end return self end diff --git a/Moose Test Missions/RAD - Radio/RAD-000 - Radio Test Mission/RAD-000 - Radio Test Mission.lua b/Moose Test Missions/RAD - Radio/RAD-000 - Radio Test Mission/RAD-000 - Radio Test Mission.lua index 6f3d42910..4c0a2bc47 100644 --- a/Moose Test Missions/RAD - Radio/RAD-000 - Radio Test Mission/RAD-000 - Radio Test Mission.lua +++ b/Moose Test Missions/RAD - Radio/RAD-000 - Radio Test Mission/RAD-000 - Radio Test Mission.lua @@ -1,18 +1,10 @@ BASE:TraceAll(1) -BASE:TraceLevel(3) +BASE:TraceLevel(1) local Player = UNIT:FindByName("Player") Player:MessageToAll("MainScript Started 2", 10, "") -local Transmiter = UNIT:FindByName("Transmiter") +local Static = STATIC:FindByName("CommandCenter") -local TransmiterRadio = Transmiter:GetRadio() -TransmiterRadio:NewUnitTransmission("Noise.ogg", "Subtitle", 10, 251000, 0, 0) -TransmiterRadio:E({ - TransmiterRadio.Positionable, - TransmiterRadio.FileName, - TransmiterRadio.Subtitle, - TransmiterRadio.SubtitleDuration, - TransmiterRadio.Frequency, - TransmiterRadio.Modulation, - }) -TransmiterRadio:Broadcast() \ No newline at end of file +local StaticRadio = Static:GetRadio() +StaticRadio:NewGenericTransmission("Test Voice.ogg", 251000, radio.modulation.AM, 1000) +StaticRadio:Broadcast() diff --git a/Moose Test Missions/RAD - Radio/RAD-000 - Radio Test Mission/RAD-000 - Radio Test Mission.miz b/Moose Test Missions/RAD - Radio/RAD-000 - Radio Test Mission/RAD-000 - Radio Test Mission.miz index 6a8f93c6d..e0b4347a7 100644 Binary files a/Moose Test Missions/RAD - Radio/RAD-000 - Radio Test Mission/RAD-000 - Radio Test Mission.miz and b/Moose Test Missions/RAD - Radio/RAD-000 - Radio Test Mission/RAD-000 - Radio Test Mission.miz differ