weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes in AUFTRAG and LEGION

Browse Source 
- Object in AUFTRAG:_TargetFromObject(Object) can be nil
- Assets are optimized wrt later mission type for assets on alert5
This commit is contained in:
Frank 2021-12-10 10:38:34 +01:00
parent 72550d6d84
commit 421ac6c427
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Moose Development/Moose/Ops/Auftrag.lua
View File

@ -4239,7 +4239,7 @@ function AUFTRAG:_TargetFromObject(Object)
self.engageTarget=Object self.engageTarget=Object
elseif Object then else --if Object then
self.engageTarget=TARGET:New(Object) self.engageTarget=TARGET:New(Object)

6
Moose Development/Moose/Ops/Legion.lua
View File

@ -2005,7 +2005,7 @@ function LEGION.RecruitCohortAssets(Cohorts, MissionTypeRecruit, MissionTypeOpt,
end end
-- Now we have a long list with assets. -- 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. -- Get payloads for air assets.
@ -2016,7 +2016,7 @@ function LEGION.RecruitCohortAssets(Cohorts, MissionTypeRecruit, MissionTypeOpt,
if asset.legion:IsAirwing() and not asset.payload then if asset.legion:IsAirwing() and not asset.payload then
-- Fetch payload for asset. This can be nil! -- 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
end end
@ -2030,7 +2030,7 @@ function LEGION.RecruitCohortAssets(Cohorts, MissionTypeRecruit, MissionTypeOpt,
end end
-- Now find the best asset for the given payloads. -- 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. -- Number of assets. At most NreqMax.
local Nassets=math.min(#Assets, NreqMax) local Nassets=math.min(#Assets, NreqMax)