From 8d8070bbd725d031ff842dc84204c259fa19f91f Mon Sep 17 00:00:00 2001 From: Frank Date: Sun, 13 Jun 2021 10:59:46 +0200 Subject: [PATCH 1/4] Update Globals.lua Added CR at the end. --- Moose Development/Moose/Globals.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Globals.lua b/Moose Development/Moose/Globals.lua index 734f7c1df..df7fafe36 100644 --- a/Moose Development/Moose/Globals.lua +++ b/Moose Development/Moose/Globals.lua @@ -42,4 +42,4 @@ else end if __na then BASE:I("Check /Scripts/MissionScripting.lua and comment out the lines with sanitizeModule(''). Use at your own risk!)") -end \ No newline at end of file +end From 77a3c7369d7ec062f078c43aee058451fce0d3f5 Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Fri, 18 Jun 2021 12:00:15 +0200 Subject: [PATCH 2/4] Update Shorad.lua --- Moose Development/Moose/Functional/Shorad.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Functional/Shorad.lua b/Moose Development/Moose/Functional/Shorad.lua index 5dc7e769f..011a4989b 100644 --- a/Moose Development/Moose/Functional/Shorad.lua +++ b/Moose Development/Moose/Functional/Shorad.lua @@ -13,7 +13,7 @@ -- -- === -- --- ### Author : **applevangelist ** +-- ### Author : **applevangelist** -- -- @module Functional.Shorad -- @image Functional.Shorad.jpg @@ -94,7 +94,7 @@ SHORAD = { lid = "", DefendHarms = true, DefendMavs = true, - DefenseLowProb = 70, + DefenseLowProb = 75, DefenseHighProb = 90, UseEmOnOff = false, } From bf33e4ed4fea8ee73da71a02f8be7aa49e28d0de Mon Sep 17 00:00:00 2001 From: Applevangelist <72444570+Applevangelist@users.noreply.github.com> Date: Fri, 18 Jun 2021 12:12:54 +0200 Subject: [PATCH 3/4] Update CSAR.lua (#1552) --- Moose Development/Moose/Ops/CSAR.lua | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Moose Development/Moose/Ops/CSAR.lua b/Moose Development/Moose/Ops/CSAR.lua index c7600e156..8d6e7292c 100644 --- a/Moose Development/Moose/Ops/CSAR.lua +++ b/Moose Development/Moose/Ops/CSAR.lua @@ -224,13 +224,14 @@ CSAR.AircraftType["SA342Mistral"] = 2 CSAR.AircraftType["SA342Minigun"] = 2 CSAR.AircraftType["SA342L"] = 4 CSAR.AircraftType["SA342M"] = 4 -CSAR.AircraftType["UH-1H"] = 4 -CSAR.AircraftType["Mi-8MT"] = 8 -CSAR.AircraftType["Mi-24"] = 8 +CSAR.AircraftType["UH-1H"] = 8 +CSAR.AircraftType["Mi-8MT"] = 12 +CSAR.AircraftType["Mi-24P"] = 8 +CSAR.AircraftType["Mi-24V"] = 8 --- CSAR class version. -- @field #string version -CSAR.version="0.1.3r2" +CSAR.version="0.1.3r3" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- ToDo list @@ -1748,7 +1749,7 @@ function CSAR:_AddBeaconToGroup(_group, _freq) end if _group:IsAlive() then - local _radioUnit = _group:GetUnit(1) + local _radioUnit = _group:GetUnit(1) local Frequency = _freq -- Freq in Hertz local Sound = "l10n/DEFAULT/"..self.radioSound trigger.action.radioTransmission(Sound, _radioUnit:GetPositionVec3(), 0, false, Frequency, 1000) -- Beacon in MP only runs for exactly 30secs straight From 0e8732fd449a3eecac3dacb0b462432a24be15d4 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 19 Jun 2021 22:27:12 +0200 Subject: [PATCH 4/4] ATIS - ATIS MSRS uses coalition of airbase - update coalition if base was captured --- Moose Development/Moose/Ops/ATIS.lua | 45 ++++++++++++++++++++++++++- Moose Development/Moose/Sound/SRS.lua | 17 ++++++++++ 2 files changed, 61 insertions(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/ATIS.lua b/Moose Development/Moose/Ops/ATIS.lua index 368d3c488..e8b475195 100644 --- a/Moose Development/Moose/Ops/ATIS.lua +++ b/Moose Development/Moose/Ops/ATIS.lua @@ -589,7 +589,7 @@ _ATIS={} --- ATIS class version. -- @field #string version -ATIS.version="0.9.5" +ATIS.version="0.9.6" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- TODO list @@ -1143,6 +1143,7 @@ function ATIS:SetSRS(PathToSRS, Gender, Culture, Voice, Port) self.msrs:SetCulture(Culture) self.msrs:SetVoice(Voice) self.msrs:SetPort(Port) + self.msrs:SetCoalition(self:GetCoalition()) if self.dTQueueCheck<=10 then self:SetQueueUpdateTime(90) end @@ -1157,6 +1158,14 @@ function ATIS:SetQueueUpdateTime(TimeInterval) self.dTQueueCheck=TimeInterval or 5 end +--- Get the coalition of the associated airbase. +-- @param #ATIS self +-- @return #number Coalition of the associcated airbase. +function ATIS:GetCoalition() + local coal=self.airbase and self.airbase:GetCoalition() or nil + return coal +end + ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- Start & Status ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- @@ -1203,6 +1212,10 @@ function ATIS:onafterStart(From, Event, To) -- Start radio queue. self.radioqueue:Start(1, 0.1) + + -- Handle airbase capture + -- Handle events. + self:HandleEvent(EVENTS.BaseCaptured) -- Init status updates. self:__Status(-2) @@ -2259,6 +2272,36 @@ function ATIS:onafterReport(From, Event, To, Text) end +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- +-- Event Functions +------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- + +--- Base captured +-- @param #ATIS self +-- @param Core.Event#EVENTDATA EventData Event data. +function ATIS:OnEventBaseCaptured(EventData) + + if EventData and EventData.Place then + + -- Place is the airbase that was captured. + local airbase=EventData.Place --Wrapper.Airbase#AIRBASE + + -- Check that this airbase belongs or did belong to this warehouse. + if EventData.PlaceName==self.airbasename then + + -- New coalition of airbase after it was captured. + local NewCoalitionAirbase=airbase:GetCoalition() + + if self.useSRS and self.msrs and self.msrs.coalition~=NewCoalitionAirbase then + self.msrs:SetCoalition(NewCoalitionAirbase) + end + + end + + end + +end + ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- Misc Functions ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua index d4253971c..9be975a78 100644 --- a/Moose Development/Moose/Sound/SRS.lua +++ b/Moose Development/Moose/Sound/SRS.lua @@ -150,6 +150,7 @@ function MSRS:New(PathToSRS, Frequency, Modulation) self:SetFrequencies(Frequency) self:SetModulations(Modulation) self:SetGender() + self:SetCoalition() return self end @@ -207,6 +208,22 @@ function MSRS:GetPort() return self.port end +--- Set coalition. +-- @param #MSRS self +-- @param #number Coalition Coalition. Default 0. +-- @return #MSRS self +function MSRS:SetCoalition(Coalition) + self.coalition=Coalition or 0 +end + +--- Get coalition. +-- @param #MSRS self +-- @return #number Coalition. +function MSRS:GetCoalition() + return self.coalition +end + + --- Set frequencies. -- @param #MSRS self -- @param #table Frequencies Frequencies in MHz. Can also be given as a #number if only one frequency should be used.