From ffef3183c76323aebe333ebe75f87180c70b6d1a Mon Sep 17 00:00:00 2001 From: Frank Date: Wed, 22 Feb 2023 23:01:47 +0100 Subject: [PATCH] OpsGroup - Fixed bug in checklos --- Moose Development/Moose/Functional/Artillery.lua | 9 --------- Moose Development/Moose/Ops/OpsGroup.lua | 4 +++- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/Moose Development/Moose/Functional/Artillery.lua b/Moose Development/Moose/Functional/Artillery.lua index 52ec23e15..1a96ee165 100644 --- a/Moose Development/Moose/Functional/Artillery.lua +++ b/Moose Development/Moose/Functional/Artillery.lua @@ -2249,20 +2249,12 @@ function ARTY:OnEventShot(EventData) self:T3(self.lid.."EVENT SHOT: Weapon name = ".._weaponName) local group = EventData.IniGroup --Wrapper.Group#GROUP - - env.info("FF 100") if group and group:IsAlive() then - - env.info("FF 200") if EventData.IniGroupName == self.groupname then - - env.info("FF 300") if self.currentTarget then - - env.info("FF 400") -- Increase number of shots fired by this group on this target. self.Nshots=self.Nshots+1 @@ -2856,7 +2848,6 @@ function ARTY:onafterStatus(Controllable, From, Event, To) end for _,targetname in pairs(notpossible) do self:E(self.lid..string.format("%s: Removing target %s because requested weapon is not possible with this type of unit.", self.groupname, targetname)) - env.info("FF 1000",showMessageBox) self:RemoveTarget(targetname) end diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua index 210c7b90f..d39721a86 100644 --- a/Moose Development/Moose/Ops/OpsGroup.lua +++ b/Moose Development/Moose/Ops/OpsGroup.lua @@ -1683,7 +1683,7 @@ function OPSGROUP:HasLoS(Coordinate, Element, OffsetElement, OffsetCoordinate) -- Check los for the given element. if Element.unit and Element.unit:IsAlive() then local vec3=Element.unit:GetVec3() - local los=checklos(Element) + local los=checklos(vec3) return los end else @@ -7091,6 +7091,8 @@ function OPSGROUP:SetLaserTarget(Target) -- Set coordinate. self.spot.Coordinate:UpdateFromVec3(self.spot.vec3) + + self.spot.Coordinate:MarkToAll("Target Laser",ReadOnly,Text) end end