From 7a97fed8a135cb1eda1fe84528dce5c0e219c37e Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Sat, 4 Nov 2023 17:26:28 +0100 Subject: [PATCH] #SRS --- Moose Development/Moose/Core/Message.lua | 1 + Moose Development/Moose/Ops/EasyGCICAP.lua | 14 -------------- 2 files changed, 1 insertion(+), 14 deletions(-) diff --git a/Moose Development/Moose/Core/Message.lua b/Moose Development/Moose/Core/Message.lua index 715ab77a4..65aa9f02b 100644 --- a/Moose Development/Moose/Core/Message.lua +++ b/Moose Development/Moose/Core/Message.lua @@ -524,6 +524,7 @@ function MESSAGE:ToSRS(frequency,modulation,gender,culture,voice,coalition,volum if coordinate then _MESSAGESRS.MSRS:SetCoordinate(coordinate) end + local category = string.gsub(self.MessageCategory,":","") _MESSAGESRS.SRSQ:NewTransmission(self.MessageText,nil,_MESSAGESRS.MSRS,nil,nil,nil,nil,nil,frequency,modulation,gender or _MESSAGESRS.Gender,culture or _MESSAGESRS.Culture,voice or _MESSAGESRS.Voice,volume,self.MessageCategory) end return self diff --git a/Moose Development/Moose/Ops/EasyGCICAP.lua b/Moose Development/Moose/Ops/EasyGCICAP.lua index 0d2ce7d99..c3192dae1 100644 --- a/Moose Development/Moose/Ops/EasyGCICAP.lua +++ b/Moose Development/Moose/Ops/EasyGCICAP.lua @@ -1140,20 +1140,6 @@ function EASYGCICAP:_StartIntel() -- Do we have a matching airwing? if targetairwing then local AssetCount = targetairwing:CountAssetsOnMission(MissionTypes,Cohort) - --[[ - local Assets = targetairwing:GetAssetsOnMission(AUFTRAG.Type.GCICAP) - for _,_asset in pairs(Assets) do - local asset = _asset -- Functional.Warehouse#WAREHOUSE.Assetitem - local fg = asset.flightgroup - local name = asset.spawngroupname - local mission = fg:GetMissionCurrent() - local mtype = mission.type - local distance = position:Get3DDistance(fg:GetCoordinate()) or 1000*1000 - distance = distance / 1000 - local text = string.format("FlightGroup %s on mission %s with distance %d km",name,mtype,distance) - local m = MESSAGE:New(text,15,"GCICAP"):ToAllIf(self.debug):ToLog() - end - --]] -- Enough airframes on mission already? self:T(self.lid.." Assets on Mission "..AssetCount) if AssetCount <= MaxAliveMissions then