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

xx

Browse Source
This commit is contained in:
Applevangelist 2025-03-11 16:32:01 +01:00
parent 6c8fa5585b
commit 96ad3ff98b
2 changed files with 199 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

238
Moose Development/Moose/Ops/PlayerTask.lua
View File

@ -1935,6 +1935,7 @@ function PLAYERTASKCONTROLLER:New(Name, Coalition, Type, ClientFilter)
self.TaskQueue = FIFO:New() -- Utilities.FiFo#FIFO self.TaskQueue = FIFO:New() -- Utilities.FiFo#FIFO
self.TasksPerPlayer = FIFO:New() -- Utilities.FiFo#FIFO self.TasksPerPlayer = FIFO:New() -- Utilities.FiFo#FIFO
self.PrecisionTasks = FIFO:New() -- Utilities.FiFo#FIFO self.PrecisionTasks = FIFO:New() -- Utilities.FiFo#FIFO
self.LasingDroneSet = SET_OPSGROUP:New() -- Core.Set#SET_OPSGROUP
--self.PlayerMenu = {} -- #table --self.PlayerMenu = {} -- #table
self.FlashPlayer = {} -- #table self.FlashPlayer = {} -- #table
self.AllowFlash = false self.AllowFlash = false
@ -2348,6 +2349,7 @@ end
-- @param Core.Point#COORDINATE HoldingPoint (Optional) Point where the drone should initially circle. If not set, defaults to BullsEye of the coalition. -- @param Core.Point#COORDINATE HoldingPoint (Optional) Point where the drone should initially circle. If not set, defaults to BullsEye of the coalition.
-- @param #number Alt (Optional) Altitude in feet. Only applies if using a FLIGHTGROUP object! Defaults to 10000. -- @param #number Alt (Optional) Altitude in feet. Only applies if using a FLIGHTGROUP object! Defaults to 10000.
-- @param #number Speed (Optional) Speed in knots. Only applies if using a FLIGHTGROUP object! Defaults to 120. -- @param #number Speed (Optional) Speed in knots. Only applies if using a FLIGHTGROUP object! Defaults to 120.
-- @param #number MaxTravelDist (Optional) Max distance to travel to traget. Only applies if using a FLIGHTGROUP object! Defaults to 100 NM.
-- @return #PLAYERTASKCONTROLLER self -- @return #PLAYERTASKCONTROLLER self
-- @usage -- @usage
-- -- Set up precision bombing, FlightGroup as lasing unit -- -- Set up precision bombing, FlightGroup as lasing unit
@ -2362,35 +2364,55 @@ end
-- ArmyGroup:Activate() -- ArmyGroup:Activate()
-- taskmanager:EnablePrecisionBombing(ArmyGroup,1688) -- taskmanager:EnablePrecisionBombing(ArmyGroup,1688)
-- --
function PLAYERTASKCONTROLLER:EnablePrecisionBombing(FlightGroup,LaserCode,HoldingPoint, Alt, Speed) function PLAYERTASKCONTROLLER:EnablePrecisionBombing(FlightGroup,LaserCode,HoldingPoint,Alt,Speed,MaxTravelDist)
self:T(self.lid.."EnablePrecisionBombing") self:T(self.lid.."EnablePrecisionBombing")
if not self.LasingDroneSet then
self.LasingDroneSet = SET_OPSGROUP:New()
end
local LasingDrone -- Ops.FlightGroup#FLIGHTGROUP FlightGroup
if FlightGroup then if FlightGroup then
if FlightGroup.ClassName and (FlightGroup.ClassName == "FLIGHTGROUP" or FlightGroup.ClassName == "ARMYGROUP")then if FlightGroup.ClassName and (FlightGroup.ClassName == "FLIGHTGROUP" or FlightGroup.ClassName == "ARMYGROUP")then
-- ok we have a FG -- ok we have a FG
self.LasingDrone = FlightGroup -- Ops.FlightGroup#FLIGHTGROUP FlightGroup LasingDrone = FlightGroup -- Ops.FlightGroup#FLIGHTGROUP FlightGroup
self.LasingDrone.playertask = {}
self.LasingDrone.playertask.busy = false
self.LasingDrone.playertask.id = 0
self.precisionbombing = true self.precisionbombing = true
self.LasingDrone:SetLaser(LaserCode)
self.LaserCode = LaserCode or 1688 LasingDrone.playertask = {}
self.LasingDroneTemplate = self.LasingDrone:_GetTemplate(true) LasingDrone.playertask.id = 0
self.LasingDroneAlt = Alt or 10000 LasingDrone.playertask.busy = false
self.LasingDroneSpeed = Speed or 120 LasingDrone.playertask.lasercode = LaserCode or 1688
LasingDrone:SetLaser(LasingDrone.playertask.lasercode)
LasingDrone.playertask.template = LasingDrone:_GetTemplate(true)
LasingDrone.playertask.alt = Alt or 10000
LasingDrone.playertask.speed = Speed or 120
LasingDrone.playertask.maxtravel = UTILS.NMToMeters(MaxTravelDist) or UTILS.NMToMeters(100)
-- let it orbit the BullsEye if FG -- let it orbit the BullsEye if FG
if self.LasingDrone:IsFlightgroup() then if LasingDrone:IsFlightgroup() then
self.LasingDroneIsFlightgroup = true --settings.IsFlightgroup = true
local BullsCoordinate = COORDINATE:NewFromVec3( coalition.getMainRefPoint( self.Coalition )) local BullsCoordinate = COORDINATE:NewFromVec3( coalition.getMainRefPoint( self.Coalition ))
if HoldingPoint then BullsCoordinate = HoldingPoint end if HoldingPoint then BullsCoordinate = HoldingPoint end
local Orbit = AUFTRAG:NewORBIT_CIRCLE(BullsCoordinate,self.LasingDroneAlt,self.LasingDroneSpeed) local Orbit = AUFTRAG:NewORBIT_CIRCLE(BullsCoordinate,Alt,Speed)
self.LasingDrone:AddMission(Orbit) LasingDrone:AddMission(Orbit)
elseif self.LasingDrone:IsArmygroup() then elseif LasingDrone:IsArmygroup() then
self.LasingDroneIsArmygroup = true --settings.IsArmygroup = true
local BullsCoordinate = COORDINATE:NewFromVec3( coalition.getMainRefPoint( self.Coalition )) local BullsCoordinate = COORDINATE:NewFromVec3( coalition.getMainRefPoint( self.Coalition ))
if HoldingPoint then BullsCoordinate = HoldingPoint end if HoldingPoint then BullsCoordinate = HoldingPoint end
local Orbit = AUFTRAG:NewONGUARD(BullsCoordinate) local Orbit = AUFTRAG:NewONGUARD(BullsCoordinate)
self.LasingDrone:AddMission(Orbit) LasingDrone:AddMission(Orbit)
end end
self.LasingDroneSet:AddObject(FlightGroup)
elseif FlightGroup.ClassName and (FlightGroup.ClassName == "SET_OPSGROUP") then --SET_OPSGROUP
FlightGroup:ForEachGroup(
function(group)
self:EnablePrecisionBombing(group,LaserCode,HoldingPoint,Alt,Speed)
end
)
else else
self:E(self.lid.."No FLIGHTGROUP object passed or FLIGHTGROUP is not alive!") self:E(self.lid.."No FLIGHTGROUP object passed or FLIGHTGROUP is not alive!")
end end
@ -2401,6 +2423,20 @@ function PLAYERTASKCONTROLLER:EnablePrecisionBombing(FlightGroup,LaserCode,Holdi
return self return self
end end
--- [User] Convenience function - add done or ground allowing precision laser-guided bombing on statics and "high-value" ground units (MBT etc)
-- @param #PLAYERTASKCONTROLLER self
-- @param Ops.FlightGroup#FLIGHTGROUP FlightGroup The FlightGroup (e.g. drone) to be used for lasing (one unit in one group only).
-- Can optionally be handed as Ops.ArmyGroup#ARMYGROUP - **Note** might not find an LOS spot or get lost on the way. Cannot island-hop.
-- @param #number LaserCode The lasercode to be used. Defaults to 1688.
-- @param Core.Point#COORDINATE HoldingPoint (Optional) Point where the drone should initially circle. If not set, defaults to BullsEye of the coalition.
-- @param #number Alt (Optional) Altitude in feet. Only applies if using a FLIGHTGROUP object! Defaults to 10000.
-- @param #number Speed (Optional) Speed in knots. Only applies if using a FLIGHTGROUP object! Defaults to 120.
-- @return #PLAYERTASKCONTROLLER self
function PLAYERTASKCONTROLLER:AddPrecisionBombingOpsGroup(FlightGroup,LaserCode,HoldingPoint, Alt, Speed)
self:EnablePrecisionBombing(FlightGroup,LaserCode,HoldingPoint,Alt,Speed)
return self
end
--- [User] Allow precision laser-guided bombing on statics and "high-value" ground units (MBT etc) with player units lasing. --- [User] Allow precision laser-guided bombing on statics and "high-value" ground units (MBT etc) with player units lasing.
-- @param #PLAYERTASKCONTROLLER self -- @param #PLAYERTASKCONTROLLER self
@ -2923,41 +2959,71 @@ end
function PLAYERTASKCONTROLLER:_CheckPrecisionTasks() function PLAYERTASKCONTROLLER:_CheckPrecisionTasks()
self:T(self.lid.."_CheckPrecisionTasks") self:T(self.lid.."_CheckPrecisionTasks")
if self.PrecisionTasks:Count() > 0 and self.precisionbombing then if self.PrecisionTasks:Count() > 0 and self.precisionbombing then
if not self.LasingDrone or self.LasingDrone:IsDead() then
-- alive checks
self.LasingDroneSet:ForEachGroup(
function(LasingDrone)
if not LasingDrone or LasingDrone:IsDead() then
-- we need a new drone -- we need a new drone
self:E(self.lid.."Lasing drone is dead ... creating a new one!") self:E(self.lid.."Lasing drone is dead ... creating a new one!")
if self.LasingDrone then if LasingDrone then
self.LasingDrone:_Respawn(1,nil,true) LasingDrone:_Respawn(1,nil,true)
else else
--[[
-- DONE: Handle ArmyGroup -- DONE: Handle ArmyGroup
if self.LasingDroneIsFlightgroup then if LasingDrone:IsFlightgroup() then
local FG = FLIGHTGROUP:New(self.LasingDroneTemplate) local FG = FLIGHTGROUP:New(LasingDroneTemplate)
FG:Activate() FG:Activate()
self:EnablePrecisionBombing(FG,self.LaserCode or 1688) self:EnablePrecisionBombing(FG,self.LaserCode or 1688)
else else
local FG = ARMYGROUP:New(self.LasingDroneTemplate) local FG = ARMYGROUP:New(LasingDroneTemplate)
FG:Activate() FG:Activate()
self:EnablePrecisionBombing(FG,self.LaserCode or 1688) self:EnablePrecisionBombing(FG,self.LaserCode or 1688)
end -- if LasingDroneIsFlightgroup
--]]
end -- if LasingDrone
end -- if not LasingDrone
end -- function
)
local function SelectDrone()
local selected = nil
self.LasingDroneSet:ForEachGroup(
function(grp)
if grp.playertask and (not grp.playertask.busy) then
selected = grp
end end
end end
return self )
return selected
end end
-- do we have a lasing unit assigned?
if self.LasingDrone and self.LasingDrone:IsAlive() then local SelectedDrone = SelectDrone() -- Ops.OpsGroup#OPSGROUP
if self.LasingDrone.playertask and (not self.LasingDrone.playertask.busy) then
-- do we have a lasing unit assignable?
if SelectedDrone and SelectedDrone:IsAlive() then
if SelectedDrone.playertask and (not SelectedDrone.playertask.busy) then
-- not busy, get a task -- not busy, get a task
self:T(self.lid.."Sending lasing unit to target") self:T(self.lid.."Sending lasing unit to target")
local task = self.PrecisionTasks:Pull() -- Ops.PlayerTask#PLAYERTASK local task = self.PrecisionTasks:Pull() -- Ops.PlayerTask#PLAYERTASK
self.LasingDrone.playertask.id = task.PlayerTaskNr -- distance check
self.LasingDrone.playertask.busy = true local startpoint = SelectedDrone:GetCoordinate()
self.LasingDrone.playertask.inreach = false local endpoint = task.Target:GetCoordinate()
self.LasingDrone.playertask.reachmessage = false local dist = math.huge
if startpoint and endpoint then
dist = startpoint:Get2DDistance(endpoint)
end
if dist <= SelectedDrone.playertask.maxtravel then
SelectedDrone.playertask.id = task.PlayerTaskNr
SelectedDrone.playertask.busy = true
SelectedDrone.playertask.inreach = false
SelectedDrone.playertask.reachmessage = false
-- move the drone to target -- move the drone to target
if self.LasingDroneIsFlightgroup then if SelectedDrone:IsFlightgroup() then
self.LasingDrone:CancelAllMissions() SelectedDrone:CancelAllMissions()
local auftrag = AUFTRAG:NewORBIT_CIRCLE(task.Target:GetCoordinate(),self.LasingDroneAlt,self.LasingDroneSpeed) local auftrag = AUFTRAG:NewORBIT_CIRCLE(task.Target:GetCoordinate(),SelectedDrone.playertask.alt,SelectedDrone.playertask.speed)
self.LasingDrone:AddMission(auftrag) SelectedDrone:AddMission(auftrag)
elseif self.LasingDroneIsArmygroup then elseif SelectedDrone:IsArmygroup() then
local tgtcoord = task.Target:GetCoordinate() local tgtcoord = task.Target:GetCoordinate()
local tgtzone = ZONE_RADIUS:New("ArmyGroup-"..math.random(1,10000),tgtcoord:GetVec2(),3000) local tgtzone = ZONE_RADIUS:New("ArmyGroup-"..math.random(1,10000),tgtcoord:GetVec2(),3000)
local finalpos=nil -- Core.Point#COORDINATE local finalpos=nil -- Core.Point#COORDINATE
@ -2970,51 +3036,58 @@ function PLAYERTASKCONTROLLER:_CheckPrecisionTasks()
end end
end end
if finalpos then if finalpos then
self.LasingDrone:CancelAllMissions() SelectedDrone:CancelAllMissions()
-- yeah we got one -- yeah we got one
local auftrag = AUFTRAG:NewARMOREDGUARD(finalpos,"Off road") local auftrag = AUFTRAG:NewARMOREDGUARD(finalpos,"Off road")
self.LasingDrone:AddMission(auftrag) SelectedDrone:AddMission(auftrag)
else else
-- could not find LOS position! -- could not find LOS position!
self:E("***Could not find LOS position to post ArmyGroup for lasing!") self:E("***Could not find LOS position to post ArmyGroup for lasing!")
self.LasingDrone.playertask.id = 0 SelectedDrone.playertask.id = 0
self.LasingDrone.playertask.busy = false SelectedDrone.playertask.busy = false
self.LasingDrone.playertask.inreach = false SelectedDrone.playertask.inreach = false
self.LasingDrone.playertask.reachmessage = false SelectedDrone.playertask.reachmessage = false
end end
end end
else
self:T(self.lid.."Lasing unit too far from target")
end
self.PrecisionTasks:Push(task,task.PlayerTaskNr) self.PrecisionTasks:Push(task,task.PlayerTaskNr)
elseif self.LasingDrone.playertask and self.LasingDrone.playertask.busy then end
local function DronesWithTask(SelectedDrone)
-- handle drones with a task
if SelectedDrone.playertask and SelectedDrone.playertask.busy then
-- drone is busy, set up laser when over target -- drone is busy, set up laser when over target
local task = self.PrecisionTasks:ReadByID(self.LasingDrone.playertask.id) -- Ops.PlayerTask#PLAYERTASK local task = self.PrecisionTasks:ReadByID(SelectedDrone.playertask.id) -- Ops.PlayerTask#PLAYERTASK
self:T("Looking at Task: "..task.PlayerTaskNr.." Type: "..task.Type.." State: "..task:GetState()) self:T("Looking at Task: "..task.PlayerTaskNr.." Type: "..task.Type.." State: "..task:GetState())
if (not task) or task:GetState() == "Done" or task:GetState() == "Stopped" then if (not task) or task:GetState() == "Done" or task:GetState() == "Stopped" then
-- we're done here -- we're done here
local task = self.PrecisionTasks:PullByID(self.LasingDrone.playertask.id) -- Ops.PlayerTask#PLAYERTASK local task = self.PrecisionTasks:PullByID(SelectedDrone.playertask.id) -- Ops.PlayerTask#PLAYERTASK
self:_CheckTaskQueue() self:_CheckTaskQueue()
task = nil task = nil
if self.LasingDrone:IsLasing() then if SelectedDrone:IsLasing() then
self.LasingDrone:__LaserOff(-1) SelectedDrone:__LaserOff(-1)
end end
self.LasingDrone.playertask.busy = false SelectedDrone.playertask.busy = false
self.LasingDrone.playertask.inreach = false SelectedDrone.playertask.inreach = false
self.LasingDrone.playertask.id = 0 SelectedDrone.playertask.id = 0
self.LasingDrone.playertask.reachmessage = false SelectedDrone.playertask.reachmessage = false
self:T(self.lid.."Laser Off") self:T(self.lid.."Laser Off")
else else
-- not done yet -- not done yet
local dcoord = self.LasingDrone:GetCoordinate() local dcoord = SelectedDrone:GetCoordinate()
local tcoord = task.Target:GetCoordinate() local tcoord = task.Target:GetCoordinate()
tcoord.y = tcoord.y + 2 tcoord.y = tcoord.y + 2
local dist = dcoord:Get2DDistance(tcoord) local dist = dcoord:Get2DDistance(tcoord)
-- close enough? -- close enough?
if dist < 3000 and not self.LasingDrone:IsLasing() then if dist < 3000 and not SelectedDrone:IsLasing() then
self:T(self.lid.."Laser On") self:T(self.lid.."Laser On")
self.LasingDrone:__LaserOn(-1,tcoord) SelectedDrone:__LaserOn(-1,tcoord)
self.LasingDrone.playertask.inreach = true SelectedDrone.playertask.inreach = true
if not self.LasingDrone.playertask.reachmessage then if not SelectedDrone.playertask.reachmessage then
--local textmark = self.gettext:GetEntry("FLARETASK",self.locale) --local textmark = self.gettext:GetEntry("FLARETASK",self.locale)
self.LasingDrone.playertask.reachmessage = true SelectedDrone.playertask.reachmessage = true
local clients = task:GetClients() local clients = task:GetClients()
local text = "" local text = ""
for _,playername in pairs(clients) do for _,playername in pairs(clients) do
@ -3022,7 +3095,7 @@ function PLAYERTASKCONTROLLER:_CheckPrecisionTasks()
local ttsplayername = playername local ttsplayername = playername
if self.customcallsigns[playername] then if self.customcallsigns[playername] then
ttsplayername = self.customcallsigns[playername] ttsplayername = self.customcallsigns[playername]
end end --
--text = string.format("%s, %s, pointer over target for task %03d, lasing!", playername, self.MenuName or self.Name, task.PlayerTaskNr) --text = string.format("%s, %s, pointer over target for task %03d, lasing!", playername, self.MenuName or self.Name, task.PlayerTaskNr)
text = string.format(pointertext, ttsplayername, self.MenuName or self.Name, task.PlayerTaskNr) text = string.format(pointertext, ttsplayername, self.MenuName or self.Name, task.PlayerTaskNr)
if not self.NoScreenOutput then if not self.NoScreenOutput then
@ -3034,18 +3107,22 @@ function PLAYERTASKCONTROLLER:_CheckPrecisionTasks()
) )
if client then if client then
local m = MESSAGE:New(text,15,"Tasking"):ToClient(client) local m = MESSAGE:New(text,15,"Tasking"):ToClient(client)
end end --
end end --
end end --
if self.UseSRS then if self.UseSRS then
self.SRSQueue:NewTransmission(text,nil,self.SRS,nil,2) self.SRSQueue:NewTransmission(text,nil,self.SRS,nil,2)
end end --
end end --
end end --
end end -- end else
end end -- end handle drones with a task
end end -- end function
end
self.LasingDroneSet:ForEachGroup(DronesWithTask)
end --
end --
return self return self
end end
@ -3558,6 +3635,22 @@ function PLAYERTASKCONTROLLER:_FlashInfo()
return self return self
end end
--- [Internal] Find matching drone for precision bombing task, if any is assigned.
-- @param #PLAYERTASKCONTROLLER self
-- @param #number ID Task ID to look for
-- @return Ops.OpsGroup#OPSGROUP Drone
function PLAYERTASKCONTROLLER:_FindLasingDroneForTaskID(ID)
local drone = nil
self.LasingDroneSet:ForEachGroup(
function(grp)
if grp and grp:IsAlive() and grp.playertask and grp.playertask.id and grp.playertask.id == ID then
drone = grp
end
end
)
return drone
end
--- [Internal] Show active task info --- [Internal] Show active task info
-- @param #PLAYERTASKCONTROLLER self -- @param #PLAYERTASKCONTROLLER self
-- @param Ops.PlayerTask#PLAYERTASK Task -- @param Ops.PlayerTask#PLAYERTASK Task
@ -3585,6 +3678,7 @@ function PLAYERTASKCONTROLLER:_ActiveTaskInfo(Task, Group, Client)
local Elevation = Coordinate:GetLandHeight() or 0 -- meters local Elevation = Coordinate:GetLandHeight() or 0 -- meters
local CoordText = "" local CoordText = ""
local CoordTextLLDM = nil local CoordTextLLDM = nil
local LasingDrone = self:_FindLasingDroneForTaskID(task.PlayerTaskNr)
if self.Type ~= PLAYERTASKCONTROLLER.Type.A2A then if self.Type ~= PLAYERTASKCONTROLLER.Type.A2A then
CoordText = Coordinate:ToStringA2G(Client,nil,self.ShowMagnetic) CoordText = Coordinate:ToStringA2G(Client,nil,self.ShowMagnetic)
else else
@ -3620,11 +3714,11 @@ function PLAYERTASKCONTROLLER:_ActiveTaskInfo(Task, Group, Client)
text = text .. string.format(elev,tostring(math.floor(Elevation)),elevationmeasure) text = text .. string.format(elev,tostring(math.floor(Elevation)),elevationmeasure)
-- Prec bombing -- Prec bombing
if task.Type == AUFTRAG.Type.PRECISIONBOMBING and self.precisionbombing then if task.Type == AUFTRAG.Type.PRECISIONBOMBING and self.precisionbombing then
if self.LasingDrone and self.LasingDrone.playertask then if LasingDrone and LasingDrone.playertask then
local yes = self.gettext:GetEntry("YES",self.locale) local yes = self.gettext:GetEntry("YES",self.locale)
local no = self.gettext:GetEntry("NO",self.locale) local no = self.gettext:GetEntry("NO",self.locale)
local inreach = self.LasingDrone.playertask.inreach == true and yes or no local inreach = LasingDrone.playertask.inreach == true and yes or no
local islasing = self.LasingDrone:IsLasing() == true and yes or no local islasing = LasingDrone:IsLasing() == true and yes or no
local prectext = self.gettext:GetEntry("POINTERTARGETREPORT",self.locale) local prectext = self.gettext:GetEntry("POINTERTARGETREPORT",self.locale)
prectext = string.format(prectext,inreach,islasing) prectext = string.format(prectext,inreach,islasing)
text = text .. prectext.." ("..self.LaserCode..")" text = text .. prectext.." ("..self.LaserCode..")"
@ -3732,7 +3826,7 @@ function PLAYERTASKCONTROLLER:_ActiveTaskInfo(Task, Group, Client)
local ttstext = string.format(ThreatLocaleTextTTS,ttsplayername,self.MenuName or self.Name,ttstaskname,ThreatLevelText, targets, CoordText) local ttstext = string.format(ThreatLocaleTextTTS,ttsplayername,self.MenuName or self.Name,ttstaskname,ThreatLevelText, targets, CoordText)
-- POINTERTARGETLASINGTTS = ". Pointer over target and lasing." -- POINTERTARGETLASINGTTS = ". Pointer over target and lasing."
if task.Type == AUFTRAG.Type.PRECISIONBOMBING and self.precisionbombing then if task.Type == AUFTRAG.Type.PRECISIONBOMBING and self.precisionbombing then
if self.LasingDrone.playertask.inreach and self.LasingDrone:IsLasing() then if LasingDrone and LasingDrone.playertask.inreach and LasingDrone:IsLasing() then
local lasingtext = self.gettext:GetEntry("POINTERTARGETLASINGTTS",self.locale) local lasingtext = self.gettext:GetEntry("POINTERTARGETLASINGTTS",self.locale)
ttstext = ttstext .. lasingtext ttstext = ttstext .. lasingtext
end end

9
Moose Development/Moose/Wrapper/Controllable.lua
View File

@ -5639,7 +5639,7 @@ end
--- [GROUND] Create and enable a new IR Marker for the given controllable UNIT or GROUP. --- [GROUND] Create and enable a new IR Marker for the given controllable UNIT or GROUP.
-- @param #CONTROLLABLE self -- @param #CONTROLLABLE self
-- @param #boolean EnableImmediately (Optionally) If true start up the IR Marker immediately. Else you need to call `myobject:EnableIRMarker()` later on. -- @param #boolean EnableImmediately (Optionally) If true start up the IR Marker immediately. Else you need to call `myobject:EnableIRMarker()` later on.
-- @param #number Runtime (Optionally) Run this IR Marker for the given number of seconds, then stop. Use in conjunction with EnableImmediately. -- @param #number Runtime (Optionally) Run this IR Marker for the given number of seconds, then stop. Use in conjunction with EnableImmediately. Defaults to 60 seconds.
-- @return #CONTROLLABLE self -- @return #CONTROLLABLE self
function CONTROLLABLE:NewIRMarker(EnableImmediately, Runtime) function CONTROLLABLE:NewIRMarker(EnableImmediately, Runtime)
self:T2("NewIRMarker") self:T2("NewIRMarker")
@ -5751,7 +5751,12 @@ end
-- @return #boolean outcome -- @return #boolean outcome
function CONTROLLABLE:HasIRMarker() function CONTROLLABLE:HasIRMarker()
self:T2("HasIRMarker") self:T2("HasIRMarker")
if self.timer and self.timer:IsRunning() then return true end if self:IsInstanceOf("GROUP") then
local units = self:GetUnits() or {}
for _,_unit in pairs(units) do
if _unit.timer and _unit.timer:IsRunning() then return true end
end
elseif self.timer and self.timer:IsRunning() then return true end
return false return false
end end