From 5ee1f5d3afd8f7d357c749624cd2e33c66fc076c Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Sun, 10 Apr 2022 09:28:38 +0200 Subject: [PATCH] CSAR/AICSAR - added port options for SRS --- Moose Development/Moose/Functional/AICSAR.lua | 11 ++++++++--- Moose Development/Moose/Ops/CSAR.lua | 5 ++++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Moose Development/Moose/Functional/AICSAR.lua b/Moose Development/Moose/Functional/AICSAR.lua index 8d79999e5..ef8d154f6 100644 --- a/Moose Development/Moose/Functional/AICSAR.lua +++ b/Moose Development/Moose/Functional/AICSAR.lua @@ -145,7 +145,7 @@ -- -- Switch on radio transmissions via **either** SRS **or** "normal" DCS radio e.g. like so: -- --- my_aicsar:SetSRSRadio(true,"C:\\Program Files\\DCS-SimpleRadio-Standalone",270,radio.modulation.AM) +-- my_aicsar:SetSRSRadio(true,"C:\\Program Files\\DCS-SimpleRadio-Standalone",270,radio.modulation.AM,5002) -- -- or -- @@ -159,7 +159,7 @@ -- @field #AICSAR AICSAR = { ClassName = "AICSAR", - version = "0.0.5", + version = "0.0.6", lid = "", coalition = coalition.side.BLUE, template = "", @@ -183,6 +183,7 @@ AICSAR = { SRSPath = "\\", SRSModulation = radio.modulation.AM, SRSSoundPath = nil, -- defaults to "l10n/DEFAULT/", i.e. add messages via "Sount to..." in the ME + SRSPort = 5002, DCSRadio = false, DCSFrequency = 243, DCSModulation = radio.modulation.AM, @@ -310,6 +311,7 @@ function AICSAR:New(Alias,Coalition,Pilottemplate,Helotemplate,FARP,MASHZone) self.SRSPath = "\\" self.SRSModulation = radio.modulation.AM self.SRSSoundPath = nil -- defaults to "l10n/DEFAULT/", i.e. add messages via "Sound to..." in the ME + self.SRSPort = 5002 -- DCS Radio - add messages via "Sound to..." in the ME self.DCSRadio = false @@ -456,8 +458,9 @@ end -- @param #number Frequency Defaults to 243 (guard) -- @param #number Modulation Radio modulation. Defaults to radio.modulation.AM -- @param #string SoundPath Where to find the audio files. Defaults to nil, i.e. add messages via "Sound to..." in the Mission Editor. +-- @param #number Port Port of the SRS, defaults to 5002. -- @return #AICSAR self -function AICSAR:SetSRSRadio(OnOff,Path,Frequency,Modulation,SoundPath) +function AICSAR:SetSRSRadio(OnOff,Path,Frequency,Modulation,SoundPath,Port) self:T(self.lid .. "SetSRSRadio") self:T(self.lid .. "SetSRSRadio to "..tostring(OnOff)) self.SRSRadio = OnOff and true @@ -465,8 +468,10 @@ function AICSAR:SetSRSRadio(OnOff,Path,Frequency,Modulation,SoundPath) self.SRSPath = Path or "c:\\" self.SRSModulation = Modulation or radio.modulation.AM self.SRSSoundPath = SoundPath or nil -- defaults to "l10n/DEFAULT/", i.e. add messages by "Sound to..." in the ME + self.SRSPort = Port or 5002 if OnOff then self.SRS = MSRS:New(Path,Frequency,Modulation) + self.SRS:SetPort(self.SRSPort) end return self end diff --git a/Moose Development/Moose/Ops/CSAR.lua b/Moose Development/Moose/Ops/CSAR.lua index 8b71f4195..a213f5632 100644 --- a/Moose Development/Moose/Ops/CSAR.lua +++ b/Moose Development/Moose/Ops/CSAR.lua @@ -124,6 +124,7 @@ -- self.SRSPath = "E:\\Progra~1\\DCS-SimpleRadio-Standalone\\" -- adjust your own path in your SRS installation -- server(!) -- self.SRSchannel = 300 -- radio channel -- self.SRSModulation = radio.modulation.AM -- modulation +-- self.SRSport = 5002 -- and SRS port -- -- -- self.csarUsePara = false -- If set to true, will use the LandingAfterEjection Event instead of Ejection --shagrat -- self.wetfeettemplate = "man in floating thingy" -- if you use a mod to have a pilot in a rescue float, put the template name in here for wet feet spawns. Note: in conjunction with csarUsePara this might create dual ejected pilots in edge cases. @@ -259,7 +260,7 @@ CSAR.AircraftType["AH-64D_BLK_II"] = 2 --- CSAR class version. -- @field #string version -CSAR.version="1.0.4d" +CSAR.version="1.0.4e" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- ToDo list @@ -413,6 +414,7 @@ function CSAR:New(Coalition, Template, Alias) self.SRSPath = "E:\\Progra~1\\DCS-SimpleRadio-Standalone\\" -- adjust your own path in your server(!) self.SRSchannel = 300 -- radio channel self.SRSModulation = radio.modulation.AM -- modulation + self.SRSport = 5002 -- port ------------------------ --- Pseudo Functions --- @@ -1523,6 +1525,7 @@ function CSAR:_DisplayMessageToSAR(_unit, _text, _time, _clear, _speak, _overrid local modulation = self.SRSModulation local channel = self.SRSchannel local msrs = MSRS:New(path,channel,modulation) + msrs:SetPort(self.SRSport) msrs:PlaySoundText(srstext, 2) end return self