From 242d735d8c55164cd67e69127ea3d89e2570362a Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Tue, 20 Sep 2022 09:27:19 +0200 Subject: [PATCH] #DETECTION * Make designate refer A2G coordinate system as set by user --- Moose Development/Moose/Functional/Designate.lua | 4 ++-- Moose Development/Moose/Functional/Detection.lua | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/Moose Development/Moose/Functional/Designate.lua b/Moose Development/Moose/Functional/Designate.lua index ead75b167..5a8d93a60 100644 --- a/Moose Development/Moose/Functional/Designate.lua +++ b/Moose Development/Moose/Functional/Designate.lua @@ -912,8 +912,8 @@ do -- DESIGNATE for DesignateIndex, Designating in pairs( self.Designating ) do local DetectedItem = DetectedItems[DesignateIndex] if DetectedItem then - local Report = self.Detection:DetectedItemReportSummary( DetectedItem, AttackGroup ):Text( ", " ) - DetectedReport:Add( string.rep( "-", 140 ) ) + local Report = self.Detection:DetectedItemReportSummary( DetectedItem, AttackGroup, nil, true ):Text( ", " ) + DetectedReport:Add( string.rep( "-", 40 ) ) DetectedReport:Add( " - " .. Report ) if string.find( Designating, "L" ) then DetectedReport:Add( " - " .. "Lasing Targets" ) diff --git a/Moose Development/Moose/Functional/Detection.lua b/Moose Development/Moose/Functional/Detection.lua index 04f8e237c..d48937517 100644 --- a/Moose Development/Moose/Functional/Detection.lua +++ b/Moose Development/Moose/Functional/Detection.lua @@ -2152,8 +2152,9 @@ do -- DETECTION_UNITS -- @param #DETECTION_BASE.DetectedItem DetectedItem The DetectedItem. -- @param Wrapper.Group#GROUP AttackGroup The group to generate the report for. -- @param Core.Settings#SETTINGS Settings Message formatting settings to use. + -- @param #boolean ForceA2GCoordinate Set creation of A2G coordinate -- @return Core.Report#REPORT The report of the detection items. - function DETECTION_UNITS:DetectedItemReportSummary( DetectedItem, AttackGroup, Settings ) + function DETECTION_UNITS:DetectedItemReportSummary( DetectedItem, AttackGroup, Settings, ForceA2GCoordinate ) self:F( { DetectedItem = DetectedItem } ) local DetectedItemID = self:GetDetectedItemID( DetectedItem ) @@ -2188,7 +2189,11 @@ do -- DETECTION_UNITS -- TODO: solve Index reference local DetectedItemCoordinate = self:GetDetectedItemCoordinate( DetectedItem ) local DetectedItemCoordText = DetectedItemCoordinate:ToString( AttackGroup, Settings ) - + + if ForceA2GCoordinate then + DetectedItemCoordText = DetectedItemCoordinate:ToStringA2G(AttackGroup,Settings) + end + local ThreatLevelA2G = self:GetDetectedItemThreatLevel( DetectedItem ) local Report = REPORT:New()