diff --git a/Moose Development/Moose/Ops/Auftrag.lua b/Moose Development/Moose/Ops/Auftrag.lua index f49ec5824..c53eaf0db 100644 --- a/Moose Development/Moose/Ops/Auftrag.lua +++ b/Moose Development/Moose/Ops/Auftrag.lua @@ -1820,7 +1820,7 @@ end --- **[AIR]** Create a BOMBRUNWAY mission. -- @param #AUFTRAG self --- @param Wrapper.Airbase#AIRBASE Airdrome The airbase to bomb. This must be an airdrome (not a FARP or ship) as these to not have a runway. +-- @param Wrapper.Airbase#AIRBASE Airdrome The airbase to bomb. This must be an airdrome (not a FARP or ship) as these do not have a runway. -- @param #number Altitude Engage altitude in feet. Default 25000 ft. -- @return #AUFTRAG self function AUFTRAG:NewBOMBRUNWAY(Airdrome, Altitude) @@ -5832,6 +5832,12 @@ function AUFTRAG:GetMissionWaypointCoord(group, randomradius, surfacetypes) end return coord end + + -- Check if a coord has been explicitly set. + if self.missionIngressCoord then + local coord=self.missionIngressCoord + return coord + end -- Create waypoint coordinate half way between us and the target. local waypointcoord=COORDINATE:New(0,0,0) diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua index 87f56e3ff..3fd37f26d 100644 --- a/Moose Development/Moose/Ops/OpsGroup.lua +++ b/Moose Development/Moose/Ops/OpsGroup.lua @@ -1041,7 +1041,7 @@ function OPSGROUP:SetReturnToLegion(Switch) else self.legionReturn=true end - self:T(self.lid..string.format("Setting ReturnToLetion=%s", tostring(self.legionReturn))) + self:T(self.lid..string.format("Setting ReturnToLegion=%s", tostring(self.legionReturn))) return self end @@ -6119,13 +6119,14 @@ function OPSGROUP:RouteToMission(mission, delay) local waypoint=nil --#OPSGROUP.Waypoint if self:IsFlightgroup() then + local ingresscoord = mission:GetMissionIngressCoord() - if ingresscoord and not self:IsWaiting() then - waypoint=FLIGHTGROUP.AddWaypoint(self, ingresscoord, SpeedToMission, uid, UTILS.MetersToFeet(ingresscoord.y or self.altitudeCruise), false) + if ingresscoord and mission:IsReadyToPush() then + waypoint=FLIGHTGROUP.AddWaypoint(self, ingresscoord, SpeedToMission, uid, UTILS.MetersToFeet(self.altitudeCruise), false) uid=waypoint.uid end - + waypoint=FLIGHTGROUP.AddWaypoint(self, waypointcoord, SpeedToMission, uid, UTILS.MetersToFeet(mission.missionAltitude or self.altitudeCruise), false) elseif self:IsArmygroup() then