weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-22 06:45:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Ops

Browse Source
This commit is contained in:
Frank
2020-03-20 23:11:29 +01:00
parent 4dd8e53c1c
commit c2257729d5
3 changed files with 141 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Ops/AirWing.lua
+19
View File
@@ -510,6 +510,25 @@ function AIRWING:AddPatrolPointTANKER(Coordinate, Heading, LegLength, Altitude,
return self return self
end end
--- Add a patrol Point for AWACS missions.
-- @param #AIRWING self
-- @param Core.Point#COORDINATE Coordinate Coordinate of the patrol point.
-- @param #number Heading Heading in degrees.
-- @param #number LegLength Length of race-track orbit in NM.
-- @param #number Altitude Orbit altitude in feet.
-- @param #number Speed Orbit speed in knots.
-- @return #AIRWING self
function AIRWING:AddPatrolPointAWACS(Coordinate, Heading, LegLength, Altitude, Speed)
local cappoint=self:NewPatrolPoint(Coordinate, Heading, LegLength, Altitude, Speed)
cappoint.coord:MarkToAll(string.format("AWACS Point alt=%d", cappoint.altitude))
table.insert(self.pointsAWACS, cappoint)
return self
end
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- Start & Status -- Start & Status
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Moose Development/Moose/Ops/FlightGroup.lua
+102 -74
View File
@@ -614,7 +614,7 @@ end
--- Add a *waypoint* task. --- Add a *waypoint* task.
-- @param #FLIGHTGROUP self -- @param #FLIGHTGROUP self
-- @param #table task DCS task table structure. -- @param #table task DCS task table structure.
-- @param #number waypointindex Number of waypoint. Counting starts at one! -- @param #number waypointindex Number of waypoint. Counting starts at one! Default is the as *next* waypoint.
-- @param #string description Brief text describing the task, e.g. "Attack SAM". -- @param #string description Brief text describing the task, e.g. "Attack SAM".
-- @param #number prio Priority of the task. Number between 1 and 100. Default is 50. -- @param #number prio Priority of the task. Number between 1 and 100. Default is 50.
-- @param #number duration Duration before task is cancelled in seconds counted after task started. Default never. -- @param #number duration Duration before task is cancelled in seconds counted after task started. Default never.
@@ -655,10 +655,26 @@ end
-- @param #FLIGHTGROUP self -- @param #FLIGHTGROUP self
-- @param #table task DCS task table structure. -- @param #table task DCS task table structure.
function FLIGHTGROUP:AddTaskEnroute(task) function FLIGHTGROUP:AddTaskEnroute(task)
if not self.taskenroute then if not self.taskenroute then
self.taskenroute={} self.taskenroute={}
end end
table.insert(self.taskenroute, task)
-- Check not to add the same task twice!
local gotit=false
for _,Task in pairs(self.taskenroute) do
if Task.id==task.id then
gotit=true
break
end
end
if not gotit then
table.insert(self.taskenroute, task)
end
end end
--- Add an *enroute* task to attack targets in a certain **circular** zone. --- Add an *enroute* task to attack targets in a certain **circular** zone.
@@ -1090,6 +1106,12 @@ end
function FLIGHTGROUP:SetTask(DCSTask) function FLIGHTGROUP:SetTask(DCSTask)
if self:IsAlive() then if self:IsAlive() then
if self.taskcurrent>0 then
local task=self:GetTaskCurrent()
self:RemoveTask(task)
self.taskcurrent=0
end
-- Inject enroute tasks. -- Inject enroute tasks.
if self.taskenroute and #self.taskenroute>0 then if self.taskenroute and #self.taskenroute>0 then
if tostring(DCSTask.id)=="ComboTask" then if tostring(DCSTask.id)=="ComboTask" then
@@ -1366,43 +1388,43 @@ function FLIGHTGROUP:onafterFlightStatus(From, Event, To)
local nMissions=self:CountRemainingMissison() local nMissions=self:CountRemainingMissison()
-- Short info. -- Short info.
local text=string.format("Status %s [%d/%d]: Tasks=%d (%d,%d) Current=%d. Missions=%s. Waypoint=%d/%d. Detected=%d. Destination=%s, FC=%s", if self.verbose>0 then
fsmstate, #self.elements, #self.elements, nTaskTot, nTaskSched, nTaskWP, self.taskcurrent, nMissions, self.currentwp or 0, self.waypoints and #self.waypoints or 0, local text=string.format("Status %s [%d/%d]: Tasks=%d (%d,%d) Current=%d. Missions=%s. Waypoint=%d/%d. Detected=%d. Destination=%s, FC=%s",
self.detectedunits:Count(), self.destbase and self.destbase:GetName() or "unknown", self.flightcontrol and self.flightcontrol.airbasename or "none") fsmstate, #self.elements, #self.elements, nTaskTot, nTaskSched, nTaskWP, self.taskcurrent, nMissions, self.currentwp or 0, self.waypoints and #self.waypoints or 0,
if self.verbose>0 then self.detectedunits:Count(), self.destbase and self.destbase:GetName() or "unknown", self.flightcontrol and self.flightcontrol.airbasename or "none")
self:I(self.lid..text) self:I(self.lid..text)
end end
-- Element status. -- Element status.
text="Elements:" if self.verbose>1 then
for i,_element in pairs(self.elements) do local text="Elements:"
local element=_element --#FLIGHTGROUP.Element for i,_element in pairs(self.elements) do
local element=_element --#FLIGHTGROUP.Element
local name=element.name
local status=element.status local name=element.name
local unit=element.unit local status=element.status
local fuel=unit:GetFuel() or 0 local unit=element.unit
local life=unit:GetLifeRelative() or 0 local fuel=unit:GetFuel() or 0
local parking=element.parking and tostring(element.parking.TerminalID) or "X" local life=unit:GetLifeRelative() or 0
local parking=element.parking and tostring(element.parking.TerminalID) or "X"
-- Check if element is not dead and we missed an event.
if life<0 and element.status~=FLIGHTGROUP.ElementStatus.DEAD and element.status~=FLIGHTGROUP.ElementStatus.INUTERO then -- Check if element is not dead and we missed an event.
self:ElementDead(element) if life<0 and element.status~=FLIGHTGROUP.ElementStatus.DEAD and element.status~=FLIGHTGROUP.ElementStatus.INUTERO then
self:ElementDead(element)
end
-- Get ammo.
local nammo=0; local nshells=0 ; local nrockets=0; local nbombs=0; local nmissiles=0
if element.status~=FLIGHTGROUP.ElementStatus.DEAD then
nammo, nshells, nrockets, nbombs, nmissiles=self:GetAmmoElement(element)
end
-- Output text for element.
text=text..string.format("\n[%d] %s: status=%s, fuel=%.1f, life=%.1f, shells=%d, rockets=%d, bombs=%d, missiles=%d, parking=%s", i, name, status, fuel*100, life*100, nshells, nrockets, nbombs, nmissiles, parking)
end end
if #self.elements==0 then
-- Get ammo. text=text.." none!"
local nammo=0; local nshells=0 ; local nrockets=0; local nbombs=0; local nmissiles=0
if element.status~=FLIGHTGROUP.ElementStatus.DEAD then
nammo, nshells, nrockets, nbombs, nmissiles=self:GetAmmoElement(element)
end end
-- Output text for element.
text=text..string.format("\n[%d] %s: status=%s, fuel=%.1f, life=%.1f, shells=%d, rockets=%d, bombs=%d, missiles=%d, parking=%s", i, name, status, fuel*100, life*100, nshells, nrockets, nbombs, nmissiles, parking)
end
if #self.elements==0 then
text=text.." none!"
end
if self.verbose>1 then
self:I(self.lid..text) self:I(self.lid..text)
end end
@@ -1411,34 +1433,34 @@ function FLIGHTGROUP:onafterFlightStatus(From, Event, To)
--- ---
-- Task queue. -- Task queue.
text=string.format("Tasks #%d", #self.taskqueue) if #self.taskqueue>0 and self.verbose>1 then
for i,_task in pairs(self.taskqueue) do local text=string.format("Tasks #%d", #self.taskqueue)
local task=_task --#FLIGHTGROUP.Task for i,_task in pairs(self.taskqueue) do
local name=task.description local task=_task --#FLIGHTGROUP.Task
local taskid=task.dcstask.id or "unknown" local name=task.description
local status=task.status local taskid=task.dcstask.id or "unknown"
local clock=UTILS.SecondsToClock(task.time, true) local status=task.status
local eta=task.time-timer.getAbsTime() local clock=UTILS.SecondsToClock(task.time, true)
local started=task.timestamp and UTILS.SecondsToClock(task.timestamp, true) or "N/A" local eta=task.time-timer.getAbsTime()
local duration=-1 local started=task.timestamp and UTILS.SecondsToClock(task.timestamp, true) or "N/A"
if task.duration then local duration=-1
duration=task.duration if task.duration then
if task.timestamp then
-- Time the task is running.
duration=task.duration-(timer.getAbsTime()-task.timestamp)
else
-- Time the task is supposed to run.
duration=task.duration duration=task.duration
if task.timestamp then
-- Time the task is running.
duration=task.duration-(timer.getAbsTime()-task.timestamp)
else
-- Time the task is supposed to run.
duration=task.duration
end
end
-- Output text for element.
if task.type==FLIGHTGROUP.TaskType.SCHEDULED then
text=text..string.format("\n[%d] %s (%s): status=%s, scheduled=%s (%d sec), started=%s, duration=%d", i, taskid, name, status, clock, eta, started, duration)
elseif task.type==FLIGHTGROUP.TaskType.WAYPOINT then
text=text..string.format("\n[%d] %s (%s): status=%s, waypoint=%d, started=%s, duration=%d, stopflag=%d", i, taskid, name, status, task.waypoint, started, duration, task.stopflag:Get())
end end
end end
-- Output text for element.
if task.type==FLIGHTGROUP.TaskType.SCHEDULED then
text=text..string.format("\n[%d] %s (%s): status=%s, scheduled=%s (%d sec), started=%s, duration=%d", i, taskid, name, status, clock, eta, started, duration)
elseif task.type==FLIGHTGROUP.TaskType.WAYPOINT then
text=text..string.format("\n[%d] %s (%s): status=%s, waypoint=%d, started=%s, duration=%d, stopflag=%d", i, taskid, name, status, task.waypoint, started, duration, task.stopflag:Get())
end
end
if #self.taskqueue>0 and self.verbose>1 then
self:I(self.lid..text) self:I(self.lid..text)
end end
@@ -1447,18 +1469,18 @@ function FLIGHTGROUP:onafterFlightStatus(From, Event, To)
--- ---
-- Current mission name. -- Current mission name.
local Mission=self:GetMissionByID(self.currentmission) if self.verbose>0 then
local Mission=self:GetMissionByID(self.currentmission)
-- Current status.
local text=string.format("Missions %d, Current: %s", self:CountRemainingMissison(), Mission and Mission.name or "none") -- Current status.
for i,_mission in pairs(self.missionqueue) do local text=string.format("Missions %d, Current: %s", self:CountRemainingMissison(), Mission and Mission.name or "none")
local mission=_mission --Ops.Auftrag#AUFTRAG for i,_mission in pairs(self.missionqueue) do
local Cstart= UTILS.SecondsToClock(mission.Tstart, true) local mission=_mission --Ops.Auftrag#AUFTRAG
local Cstop = mission.Tstop and UTILS.SecondsToClock(mission.Tstop, true) or "INF" local Cstart= UTILS.SecondsToClock(mission.Tstart, true)
text=text..string.format("\n[%d] %s (%s) status=%s (%s), Time=%s-%s, prio=%d targets=%d", local Cstop = mission.Tstop and UTILS.SecondsToClock(mission.Tstop, true) or "INF"
i, tostring(mission.name), mission.type, mission:GetFlightStatus(self), tostring(mission.status), Cstart, Cstop, mission.prio, mission:CountMissionTargets()) text=text..string.format("\n[%d] %s (%s) status=%s (%s), Time=%s-%s, prio=%d targets=%d",
end i, tostring(mission.name), mission.type, mission:GetFlightStatus(self), tostring(mission.status), Cstart, Cstop, mission.prio, mission:CountMissionTargets())
if self.verbose>0 then end
self:I(self.lid..text) self:I(self.lid..text)
end end
@@ -2544,7 +2566,8 @@ function FLIGHTGROUP:_CheckFlightDone(delay)
self:I(self.lid..string.format("Passed Final WP but still have current Tasks (%s) or Missions (%s) left to do", tostring(self.taskcurrent), tostring(self.currentmission))) self:I(self.lid..string.format("Passed Final WP but still have current Tasks (%s) or Missions (%s) left to do", tostring(self.taskcurrent), tostring(self.currentmission)))
end end
else else
self:I(self.lid.."Did NOT pass the final waypoint yet") self:I(self.lid.."Did NOT pass the final waypoint yet ==> update route")
self:UpdateRoute()
end end
end end
end end
@@ -3357,9 +3380,10 @@ function FLIGHTGROUP:onafterTaskDone(From, Event, To, Task)
-- Check if this task was the task of the current mission ==> Mission Done! -- Check if this task was the task of the current mission ==> Mission Done!
local Mission=self:GetMissionByTaskID(Task.id) local Mission=self:GetMissionByTaskID(Task.id)
local status=Mission:GetFlightStatus(self)
if Mission then if Mission then
local status=Mission:GetFlightStatus(self)
if status~=AUFTRAG.FlightStatus.PAUSED then if status~=AUFTRAG.FlightStatus.PAUSED then
env.info("FF Task Done ==> Mission Done!") env.info("FF Task Done ==> Mission Done!")
self:MissionDone(Mission) self:MissionDone(Mission)
@@ -3496,7 +3520,11 @@ end
-- @param #string To To state. -- @param #string To To state.
function FLIGHTGROUP:onafterUnpauseMission(From, Event, To) function FLIGHTGROUP:onafterUnpauseMission(From, Event, To)
self:MissionStart(self.missionpaused) self:I(self.lid..string.format("Unpausing mission"))
local mission=self:GetMissionByID(self.missionpaused.auftragsnummer)
self:MissionStart(mission)
self.missionpaused=nil self.missionpaused=nil
Moose Development/Moose/Wrapper/Unit.lua
+20 -16
View File
@@ -466,23 +466,27 @@ function UNIT:IsTanker()
local system=nil local system=nil
local Desc=self:GetDesc() if tanker then
if Desc and Desc.tankerType then
system=Desc.tankerType
end
local typename=self:GetTypeName() local Desc=self:GetDesc()
if Desc and Desc.tankerType then
if typename=="IL-78M" then system=Desc.tankerType
system=1 --probe end
elseif typename=="KC130" then
system=1 --probe local typename=self:GetTypeName()
elseif typename=="KC135BDA" then
system=1 --probe if typename=="IL-78M" then
elseif typename=="KC135MPRS" then system=1 --probe
system=1 --probe elseif typename=="KC130" then
elseif typename=="S-3B Tanker" then system=1 --probe
system=1 --probe elseif typename=="KC135BDA" then
system=1 --probe
elseif typename=="KC135MPRS" then
system=1 --probe
elseif typename=="S-3B Tanker" then
system=1 --probe
end
end end
env.info(string.format("unit %s type=%s: tanker=%s system=%s", tostring(self.UnitName), tostring(typename), tostring(tanker), tostring(system))) env.info(string.format("unit %s type=%s: tanker=%s system=%s", tostring(self.UnitName), tostring(typename), tostring(tanker), tostring(system)))