From 421ac6c427606ef8be9301d3f57ed346f424d055 Mon Sep 17 00:00:00 2001 From: Frank Date: Fri, 10 Dec 2021 10:38:34 +0100 Subject: [PATCH] Fixes in AUFTRAG and LEGION - Object in AUFTRAG:_TargetFromObject(Object) can be nil - Assets are optimized wrt later mission type for assets on alert5 --- Moose Development/Moose/Ops/Auftrag.lua | 2 +- Moose Development/Moose/Ops/Legion.lua | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Moose Development/Moose/Ops/Auftrag.lua b/Moose Development/Moose/Ops/Auftrag.lua index 7cb688283..d88f8f4dc 100644 --- a/Moose Development/Moose/Ops/Auftrag.lua +++ b/Moose Development/Moose/Ops/Auftrag.lua @@ -4239,7 +4239,7 @@ function AUFTRAG:_TargetFromObject(Object) self.engageTarget=Object - elseif Object then + else --if Object then self.engageTarget=TARGET:New(Object) diff --git a/Moose Development/Moose/Ops/Legion.lua b/Moose Development/Moose/Ops/Legion.lua index a62212cd8..0c47e609e 100644 --- a/Moose Development/Moose/Ops/Legion.lua +++ b/Moose Development/Moose/Ops/Legion.lua @@ -2005,7 +2005,7 @@ function LEGION.RecruitCohortAssets(Cohorts, MissionTypeRecruit, MissionTypeOpt, end -- Now we have a long list with assets. - LEGION._OptimizeAssetSelection(Assets, MissionTypeRecruit, TargetVec2, false) + LEGION._OptimizeAssetSelection(Assets, MissionTypeOpt, TargetVec2, false) -- Get payloads for air assets. @@ -2016,7 +2016,7 @@ function LEGION.RecruitCohortAssets(Cohorts, MissionTypeRecruit, MissionTypeOpt, if asset.legion:IsAirwing() and not asset.payload then -- Fetch payload for asset. This can be nil! - asset.payload=asset.legion:FetchPayloadFromStock(asset.unittype, MissionTypeRecruit, Payloads) + asset.payload=asset.legion:FetchPayloadFromStock(asset.unittype, MissionTypeOpt, Payloads) end end @@ -2030,7 +2030,7 @@ function LEGION.RecruitCohortAssets(Cohorts, MissionTypeRecruit, MissionTypeOpt, end -- Now find the best asset for the given payloads. - LEGION._OptimizeAssetSelection(Assets, MissionTypeRecruit, TargetVec2, true) + LEGION._OptimizeAssetSelection(Assets, MissionTypeOpt, TargetVec2, true) -- Number of assets. At most NreqMax. local Nassets=math.min(#Assets, NreqMax)