OPS

- Improved behaviour of OPSTRANSPORT when cargo or carrier is on mission.

Moose Development/Moose/Ops/Auftrag.lua

@@ -137,6 +137,7 @@
 -- @field #number missionRange Mission range in meters. Used by LEGION classes (AIRWING, BRIGADE, ...).
 -- @field Core.Point#COORDINATE missionWaypointCoord Mission waypoint coordinate.
 -- @field Core.Point#COORDINATE missionEgressCoord Mission egress waypoint coordinate.
+-- @field #number missionWaypointRadius Random radius in meters.
 -- 
 -- @field #table enrouteTasks Mission enroute tasks.
 -- 
@@ -4415,6 +4416,15 @@ function AUFTRAG:SetMissionWaypointCoord(Coordinate)
   return self
 end
 
+--- Set randomization of the mission waypoint coordinate. Each assigned group will get a random ingress coordinate, where the mission is executed.
+-- @param #AUFTRAG self
+-- @param #number Radius Distance in meters. Default `#nil`.
+-- @return #AUFTRAG self
+function AUFTRAG:SetMissionWaypointRandomization(Radius)
+  self.missionWaypointRadius=Radius
+  return self
+end
+
 --- Set the mission egress coordinate. This is the coordinate where the assigned group will go once the mission is finished.
 -- @param #AUFTRAG self
 -- @param Core.Point#COORDINATE Coordinate Egrees coordinate.

Moose Development/Moose/Ops/OpsGroup.lua

@@ -4134,6 +4134,13 @@ function OPSGROUP:GetMissionCurrent()
   return self:GetMissionByID(self.currentmission)
 end
 
+--- Check if group is currently on a mission.
+-- @param #OPSGROUP self
+-- @return #boolean If `true`, group is currently on a mission
+function OPSGROUP:IsOnMission()
+  return self.currentmission~=nil
+end
+
 --- On before "MissionStart" event.
 -- @param #OPSGROUP self
 -- @param #string From From state.
@@ -4477,7 +4484,7 @@ function OPSGROUP:RouteToMission(mission, delay)
     local waypointcoord=nil --Core.Point#COORDINATE
     
     -- Random radius of 1000 meters.
-    local randomradius=1000
+    local randomradius=mission.missionWaypointRadius or 1000
     
     -- Surface types.
     local surfacetypes=nil
@@ -4491,6 +4498,8 @@ function OPSGROUP:RouteToMission(mission, delay)
     if mission.type==AUFTRAG.Type.PATROLZONE or mission.type==AUFTRAG.Type.BARRAGE then
       local zone=mission.engageTarget:GetObject() --Core.Zone#ZONE
       waypointcoord=zone:GetRandomCoordinate(nil , nil, surfacetypes)
+    elseif mission.type==AUFTRAG.Type.ONGUARD then
+      waypointcoord=mission:GetMissionWaypointCoord(self.group, nil, surfacetypes)
     else
       waypointcoord=mission:GetMissionWaypointCoord(self.group, randomradius, surfacetypes)
     end
@@ -6175,7 +6184,7 @@ function OPSGROUP:_CheckCargoTransport()
   end
 
   -- Check if there is anything in the queue.
-  if not self.cargoTransport then
+  if not self.cargoTransport and not self:IsOnMission() then
     self.cargoTransport=self:_GetNextCargoTransport()
     if self.cargoTransport and not self:IsActive() then
       self:Activate()
@@ -7156,13 +7165,21 @@ function OPSGROUP:onafterLoading(From, Event, To)
   -- Loading time stamp.
   self.Tloading=timer.getAbsTime()
 
-  -- Cargo group table.
-  --local cargos=self.cargoTZC.Cargos
-  
+  -- Get valid cargos of the TZC.  
   local cargos={}
   for _,_cargo in pairs(self.cargoTZC.Cargos) do
     local cargo=_cargo --Ops.OpsGroup#OPSGROUP.CargoGroup
-    if self:CanCargo(cargo.opsgroup) and (not (cargo.delivered or cargo.opsgroup:IsDead())) then
+    
+    local isCarrier=cargo.opsgroup:IsPickingup() or cargo.opsgroup:IsLoading() or cargo.opsgroup:IsTransporting() or cargo.opsgroup:IsUnloading()
+    
+    local isOnMission=cargo.opsgroup:IsOnMission()
+
+    -- Check if cargo is in embark/pickup zone.
+    -- Added InUtero here, if embark zone is moving (ship) and cargo has been spawned late activated and its position is not updated. Not sure if that breaks something else!
+    local inzone=cargo.opsgroup:IsInZone(self.cargoTZC.EmbarkZone) --or cargo.opsgroup:IsInUtero()
+    
+    -- TODO: Need a better :IsBusy() function or :IsReadyForMission() :IsReadyForBoarding() :IsReadyForTransport()
+    if self:CanCargo(cargo.opsgroup) and inzone and cargo.opsgroup:IsNotCargo(true) and (not (cargo.delivered or cargo.opsgroup:IsDead() or isCarrier or isOnMission)) then
       table.insert(cargos, cargo)
     end
   end
@@ -7179,23 +7196,6 @@ function OPSGROUP:onafterLoading(From, Event, To)
   for _,_cargo in pairs(cargos) do
     local cargo=_cargo --#OPSGROUP.CargoGroup
 
-    -- Check that cargo weight is
-    if self:CanCargo(cargo.opsgroup) and (not (cargo.delivered or cargo.opsgroup:IsDead())) then
-    
-      -- Check if cargo is currently acting as carrier.
-      local isCarrier=cargo.opsgroup:IsPickingup() or cargo.opsgroup:IsLoading() or cargo.opsgroup:IsTransporting() or cargo.opsgroup:IsUnloading()
-
-      -- Check that group is NOT cargo and NOT acting as carrier already
-      -- TODO: Need a better :IsBusy() function or :IsReadyForMission() :IsReadyForBoarding() :IsReadyForTransport()
-      if cargo.opsgroup:IsNotCargo(true) and not isCarrier then
-
-        -- Check if cargo is in embark/pickup zone.
-        -- Added InUtero here, if embark zone is moving (ship) and cargo has been spawned late activated and its position is not updated. Not sure if that breaks something else!
-        local inzone=cargo.opsgroup:IsInZone(self.cargoTZC.EmbarkZone) --or cargo.opsgroup:IsInUtero()
-
-        -- Cargo MUST be inside zone or it will not be loaded!
-        if inzone then
-
     -- Find a carrier for this cargo.          
     local carrier=self:FindCarrierForCargo(cargo.opsgroup)
 
@@ -7207,25 +7207,9 @@ function OPSGROUP:onafterLoading(From, Event, To)
       -- Order cargo group to board the carrier.
       cargo.opsgroup:Board(self, carrier)
       
-          else
-            -- Debug info.
-            self:T(self.lid..string.format("Cannot board carrier! Group %s is NOT (yet) in zone %s", cargo.opsgroup:GetName(), self.cargoTZC.EmbarkZone:GetName()))                        
-          end
-
-        else
-          -- Debug info.
-          self:T(self.lid..string.format("Cargo %s NOT in embark zone %s (and not InUTERO)", cargo.opsgroup:GetName(), self.cargoTZC.EmbarkZone:GetName()))
     end
 
   end
-
-    else
-      -- Debug info.
-      self:T3(self.lid.."Cargo already delivered, is dead or carrier cannot")
-    end
-
-  end
-
 end
 
 --- Set (new) cargo status.