From 3cea1cc78c66635421734d1921c19371e13b6b9a Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Thu, 2 Jan 2025 16:20:47 +0100 Subject: [PATCH 1/3] #PLAYERRECCE - allow to display add'l location in report as per user settings for laser and visual targets. --- Moose Development/Moose/Ops/PlayerRecce.lua | 26 ++++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/PlayerRecce.lua b/Moose Development/Moose/Ops/PlayerRecce.lua index f6a90c9a9..0f3c1f556 100644 --- a/Moose Development/Moose/Ops/PlayerRecce.lua +++ b/Moose Development/Moose/Ops/PlayerRecce.lua @@ -80,6 +80,7 @@ -- @field #boolean smokeownposition -- @field #table SmokeOwn -- @field #boolean smokeaveragetargetpos +-- @field #boolean reporttostringbullsonly -- @extends Core.Fsm#FSM --- @@ -133,7 +134,8 @@ PLAYERRECCE = { TargetCache = nil, smokeownposition = false, SmokeOwn = {}, - smokeaveragetargetpos = false, + smokeaveragetargetpos = true, + reporttostringbullsonly = true, } --- @@ -236,6 +238,8 @@ function PLAYERRECCE:New(Name, Coalition, PlayerSet) self.minthreatlevel = 0 + self.reporttostringbullsonly = true + self.TForget = 600 self.TargetCache = FIFO:New() @@ -929,6 +933,7 @@ function PLAYERRECCE:_LaseTarget(client,targetset) if (not oldtarget) or targetset:IsNotInSet(oldtarget) or target:IsDead() or target:IsDestroyed() then -- lost LOS or dead laser:LaseOff() + self:T(self.lid.."Target Life Points: "..target:GetLife() or "none") if target:IsDead() or target:IsDestroyed() or target:GetLife() < 2 then self:__Shack(-1,client,oldtarget) --self.LaserTarget[playername] = nil @@ -1274,6 +1279,9 @@ self:T(self.lid.."_ReportLaserTargets") report:Add("Threat Level: "..ThreatGraph.." ("..ThreatLevelText..")") if not self.ReferencePoint then report:Add("Location: "..client:GetCoordinate():ToStringBULLS(self.Coalition,Settings)) + if self.reporttostringbullsonly ~= true then + report:Add("Location: "..client:GetCoordinate():ToStringA2G(nil,Settings)) + end else report:Add("Location: "..client:GetCoordinate():ToStringFromRPShort(self.ReferencePoint,self.RPName,client,Settings)) end @@ -1317,8 +1325,14 @@ function PLAYERRECCE:_ReportVisualTargets(client,group,playername) report:Add("Threat Level: "..ThreatGraph.." ("..ThreatLevelText..")") if not self.ReferencePoint then report:Add("Location: "..client:GetCoordinate():ToStringBULLS(self.Coalition,Settings)) + if self.reporttostringbullsonly ~= true then + report:Add("Location: "..client:GetCoordinate():ToStringA2G(nil,Settings)) + end else report:Add("Location: "..client:GetCoordinate():ToStringFromRPShort(self.ReferencePoint,self.RPName,client,Settings)) + if self.reporttostringbullsonly ~= true then + report:Add("Location: "..client:GetCoordinate():ToStringA2G(nil,Settings)) + end end report:Add(string.rep("-",15)) local text = report:Text() @@ -1552,6 +1566,16 @@ function PLAYERRECCE:SetMenuName(Name) return self end +--- [User] Set reporting to be BULLS only or BULLS plus playersettings based coordinate. +-- @param #PLAYERRECCE self +-- @param #boolean OnOff +-- @return #PLAYERRECCE self +function PLAYERRECCE:SetReportBullsOnly(OnOff) + self:T(self.lid.."SetReportBullsOnly: "..tostring(OnOff)) + self.reporttostringbullsonly = OnOff + return self +end + --- [User] Enable smoking of own position -- @param #PLAYERRECCE self -- @return #PLAYERRECCE self From ac5dfab82fc57038d707fb2c4da70d64ee852ad1 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Thu, 2 Jan 2025 17:22:39 +0100 Subject: [PATCH 2/3] #PLAYERRECCE - Fine tune check when a unit is dead or just per se has less than 2 LifePoints --- Moose Development/Moose/Ops/PlayerRecce.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Moose Development/Moose/Ops/PlayerRecce.lua b/Moose Development/Moose/Ops/PlayerRecce.lua index 0f3c1f556..7091139cd 100644 --- a/Moose Development/Moose/Ops/PlayerRecce.lua +++ b/Moose Development/Moose/Ops/PlayerRecce.lua @@ -106,7 +106,7 @@ PLAYERRECCE = { ClassName = "PLAYERRECCE", verbose = true, lid = nil, - version = "0.1.23", + version = "0.1.24", ViewZone = {}, ViewZoneVisual = {}, ViewZoneLaser = {}, @@ -934,7 +934,7 @@ function PLAYERRECCE:_LaseTarget(client,targetset) -- lost LOS or dead laser:LaseOff() self:T(self.lid.."Target Life Points: "..target:GetLife() or "none") - if target:IsDead() or target:IsDestroyed() or target:GetLife() < 2 then + if target:IsDead() or target:IsDestroyed() or target:GetDamage() > 79 or target:GetLife() <= 1 then self:__Shack(-1,client,oldtarget) --self.LaserTarget[playername] = nil else From be062061d5292f77387bb0f1be88fe6f2983bfc9 Mon Sep 17 00:00:00 2001 From: Frank Date: Thu, 2 Jan 2025 23:01:49 +0100 Subject: [PATCH 3/3] Update Auftrag.lua - Improved docs for ARTY --- Moose Development/Moose/Ops/Auftrag.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/Auftrag.lua b/Moose Development/Moose/Ops/Auftrag.lua index 0bdfcaa58..432ce4d8a 100644 --- a/Moose Development/Moose/Ops/Auftrag.lua +++ b/Moose Development/Moose/Ops/Auftrag.lua @@ -2156,7 +2156,11 @@ end ]] ---- **[GROUND, NAVAL]** Create an ARTY mission. +--- **[GROUND, NAVAL]** Create an ARTY mission ("Fire at point" task). +-- +-- If the group has more than one weapon type supporting the "Fire at point" task, the employed weapon type can be set via the `AUFTRAG:SetWeaponType()` function. +-- +-- **Note** that it is recommended to set the weapon range via the `OPSGROUP:AddWeaponRange()` function as this cannot be retrieved from the DCS API. -- @param #AUFTRAG self -- @param Core.Point#COORDINATE Target Center of the firing solution. -- @param #number Nshots Number of shots to be fired. Default `#nil`.