From abc69bc838c20d665ab00a6ab9f1f66b80de957c Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Tue, 7 Dec 2021 17:35:56 +0100 Subject: [PATCH] legion --- Moose Development/Moose/Ops/Legion.lua | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/Moose Development/Moose/Ops/Legion.lua b/Moose Development/Moose/Ops/Legion.lua index 18c1422c3..b142bbabb 100644 --- a/Moose Development/Moose/Ops/Legion.lua +++ b/Moose Development/Moose/Ops/Legion.lua @@ -324,7 +324,7 @@ function LEGION:AddMission(Mission) -- Set target for ALERT 5. if Mission.type==AUFTRAG.Type.ALERT5 then - --Mission:_TargetFromObject(self:GetCoordinate()) + Mission:_TargetFromObject(self:GetCoordinate()) end -- Add mission to queue. @@ -694,11 +694,14 @@ function LEGION:onafterMissionRequest(From, Event, To, Mission) asset.flightgroup:MissionCancel(currM) end - -- Cancel the current mission. - if currM and currM.type==AUFTRAG.Type.ONGUARD then - asset.flightgroup:MissionCancel(currM) + --[[ Cancel the current mission. + if Mission.type==AUFTRAG.Type.ARMORATTACK and asset.attribute == "Ground_Tank" then + if currM and (currM.type==AUFTRAG.Type.ONGUARD or currM.type==AUFTRAG.Type.ARMOREDGUARD) then + asset.flightgroup:MissionCancel(currM) + end end - + --]] + -- Trigger event. self:__OpsOnMission(5, asset.flightgroup, Mission) @@ -732,16 +735,16 @@ function LEGION:onafterMissionRequest(From, Event, To, Mission) end - local coordinate = nil + local specialcoordinate = nil if Mission.specialCoordinate then - coordinate = Mission.specialCoordinate + specialcoordinate = Mission.specialCoordinate end -- TODO: Get/set functions for assignment string. local assignment=string.format("Mission-%d", Mission.auftragsnummer) -- Add request to legion warehouse. - self:AddRequest(self, WAREHOUSE.Descriptor.ASSETLIST, Assetlist, #Assetlist, nil, nil, Mission.prio, assignment, coordinate) + self:AddRequest(self, WAREHOUSE.Descriptor.ASSETLIST, Assetlist, #Assetlist, nil, nil, Mission.prio, assignment, specialcoordinate) -- The queueid has been increased in the onafterAddRequest function. So we can simply use it here. Mission.requestID[self.alias]=self.queueid