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

Revert "legion"

Browse Source 
This reverts commit abc69bc838c20d665ab00a6ab9f1f66b80de957c.
This commit is contained in:
Applevangelist 2021-12-07 18:10:21 +01:00
parent abc69bc838
commit 9082054ba9
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -324,7 +324,7 @@ function LEGION:AddMission(Mission)
-- Set target for ALERT 5. -- Set target for ALERT 5.
if Mission.type==AUFTRAG.Type.ALERT5 then if Mission.type==AUFTRAG.Type.ALERT5 then
Mission:_TargetFromObject(self:GetCoordinate()) --Mission:_TargetFromObject(self:GetCoordinate())
end end
-- Add mission to queue. -- Add mission to queue.
@ -694,13 +694,10 @@ function LEGION:onafterMissionRequest(From, Event, To, Mission)
asset.flightgroup:MissionCancel(currM) asset.flightgroup:MissionCancel(currM)
end end
--[[ Cancel the current mission. -- Cancel the current mission.
if Mission.type==AUFTRAG.Type.ARMORATTACK and asset.attribute == "Ground_Tank" then if currM and currM.type==AUFTRAG.Type.ONGUARD then
if currM and (currM.type==AUFTRAG.Type.ONGUARD or currM.type==AUFTRAG.Type.ARMOREDGUARD) then
asset.flightgroup:MissionCancel(currM) asset.flightgroup:MissionCancel(currM)
end end
end
--]]
-- Trigger event. -- Trigger event.
self:__OpsOnMission(5, asset.flightgroup, Mission) self:__OpsOnMission(5, asset.flightgroup, Mission)
@ -735,16 +732,16 @@ function LEGION:onafterMissionRequest(From, Event, To, Mission)
end end
local specialcoordinate = nil local coordinate = nil
if Mission.specialCoordinate then if Mission.specialCoordinate then
specialcoordinate = Mission.specialCoordinate coordinate = Mission.specialCoordinate
end end
-- TODO: Get/set functions for assignment string. -- TODO: Get/set functions for assignment string.
local assignment=string.format("Mission-%d", Mission.auftragsnummer) local assignment=string.format("Mission-%d", Mission.auftragsnummer)
-- Add request to legion warehouse. -- Add request to legion warehouse.
self:AddRequest(self, WAREHOUSE.Descriptor.ASSETLIST, Assetlist, #Assetlist, nil, nil, Mission.prio, assignment, specialcoordinate) self:AddRequest(self, WAREHOUSE.Descriptor.ASSETLIST, Assetlist, #Assetlist, nil, nil, Mission.prio, assignment, coordinate)
-- The queueid has been increased in the onafterAddRequest function. So we can simply use it here. -- The queueid has been increased in the onafterAddRequest function. So we can simply use it here.
Mission.requestID[self.alias]=self.queueid Mission.requestID[self.alias]=self.queueid