weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-23 19:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auftrag

Browse Source 
- Improvements
This commit is contained in:
Frank
2026-03-01 23:11:36 +01:00
parent a57532d7bf
commit 216d023c45
2 changed files with 67 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Ops/Auftrag.lua
+12 -3
View File
@@ -676,7 +676,7 @@ AUFTRAG.Category={
--- AUFTRAG class version. --- AUFTRAG class version.
-- @field #string version -- @field #string version
AUFTRAG.version="1.4.0" AUFTRAG.version="1.4.1"
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO list -- TODO list
@@ -2191,7 +2191,7 @@ function AUFTRAG:NewFREIGHTTRANSPORT(StaticCargo, Destination)
-- Check if Destination is given -- Check if Destination is given
if Destination==nil then if Destination==nil then
self:E(self.lid..string.format("ERROR: Destination is nil for AUFTRAG:NewFREIGHTTRANSPORT! You must specify the destination airbase")) BASE:E(self.lid..string.format("ERROR: Destination is nil for AUFTRAG:NewFREIGHTTRANSPORT! You must specify the destination airbase"))
return nil return nil
elseif type(Destination)=="string" then elseif type(Destination)=="string" then
Destination=AIRBASE:FindByName(Destination) Destination=AIRBASE:FindByName(Destination)
@@ -2199,7 +2199,7 @@ function AUFTRAG:NewFREIGHTTRANSPORT(StaticCargo, Destination)
-- Check if Cargo is given -- Check if Cargo is given
if StaticCargo==nil then if StaticCargo==nil then
self:E(self.lid..string.format("ERROR: StaticCargo is nil for AUFTRAG:NewFREIGHTTRANSPORT! You must specify the static object that represents the cargo")) BASE:E(self.lid..string.format("ERROR: StaticCargo is nil for AUFTRAG:NewFREIGHTTRANSPORT! You must specify the static object that represents the cargo"))
return nil return nil
elseif type(StaticCargo)=="string" then elseif type(StaticCargo)=="string" then
StaticCargo=STATIC:FindByName(StaticCargo) StaticCargo=STATIC:FindByName(StaticCargo)
@@ -2214,6 +2214,15 @@ function AUFTRAG:NewFREIGHTTRANSPORT(StaticCargo, Destination)
local mission=AUFTRAG:New(AUFTRAG.Type.FREIGHTTRANSPORT) local mission=AUFTRAG:New(AUFTRAG.Type.FREIGHTTRANSPORT)
-- Check that the set is not empty
local Ncargo=StaticCargo:Count()
if Ncargo==0 then
mission:E(mission.lid..string.format("ERROR: No cargo items in set!"))
return nil
else
mission:T(mission.lid..string.format("FREIGHTTRANSPORT with N=%d cargo items in set", Ncargo))
end
mission:_TargetFromObject(StaticCargo) mission:_TargetFromObject(StaticCargo)
mission.missionTask=mission:GetMissionTaskforMissionType(AUFTRAG.Type.FREIGHTTRANSPORT) mission.missionTask=mission:GetMissionTaskforMissionType(AUFTRAG.Type.FREIGHTTRANSPORT)
Moose Development/Moose/Ops/OpsGroup.lua
+2 -2
View File
@@ -514,7 +514,7 @@ OPSGROUP.CargoStatus={
--- OpsGroup version. --- OpsGroup version.
-- @field #string version -- @field #string version
OPSGROUP.version="1.0.5" OPSGROUP.version="1.0.6"
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO list -- TODO list
@@ -6209,7 +6209,7 @@ function OPSGROUP:RouteToMission(mission, delay)
-- We must be careful when calling updateroute because there the task is overwritten. -- We must be careful when calling updateroute because there the task is overwritten.
-- We also clear present "UpdateRoute" FSM events -- We also clear present "UpdateRoute" FSM events
self:_ClearFSMEvent( "UpdateRoute" ) self:_ClearFSMEvent( "UpdateRoute" )
delayGo=-30 delayGo=-50 --30 sec was not enough for CH-47 to load more than one cargo item
self.group:SetTask(TaskCargo) self.group:SetTask(TaskCargo)
elseif mission.type==AUFTRAG.Type.ARTY then elseif mission.type==AUFTRAG.Type.ARTY then