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

#SRS

Browse Source
This commit is contained in:
Applevangelist 2023-11-04 17:26:28 +01:00
parent 1064f2123b
commit 7a97fed8a1
2 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Moose Development/Moose/Core/Message.lua
View File

@ -524,6 +524,7 @@ function MESSAGE:ToSRS(frequency,modulation,gender,culture,voice,coalition,volum
if coordinate then if coordinate then
_MESSAGESRS.MSRS:SetCoordinate(coordinate) _MESSAGESRS.MSRS:SetCoordinate(coordinate)
end 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) _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 end
return self return self

14
Moose Development/Moose/Ops/EasyGCICAP.lua
View File

@ -1140,20 +1140,6 @@ function EASYGCICAP:_StartIntel()
-- Do we have a matching airwing? -- Do we have a matching airwing?
if targetairwing then if targetairwing then
local AssetCount = targetairwing:CountAssetsOnMission(MissionTypes,Cohort) 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? -- Enough airframes on mission already?
self:T(self.lid.." Assets on Mission "..AssetCount) self:T(self.lid.." Assets on Mission "..AssetCount)
if AssetCount <= MaxAliveMissions then if AssetCount <= MaxAliveMissions then