FlightControl-Master/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-10-29 16:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Applevangelist 2024-08-03 14:31:24 +02:00
commit ed82a4715d
79 changed files with 4887 additions and 386 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Moose Development/Moose/.vscode/settings.json vendored
View File

@ -1,7 +1,17 @@
{ {
"Lua.workspace.preloadFileSize": 1000, "Lua.workspace.preloadFileSize": 10000,
"Lua.diagnostics.disable": [ "Lua.diagnostics.disable": [
"undefined-doc-name" "undefined-doc-name",
"duplicate-set-field",
"trailing-space",
"need-check-nil",
"ambiguity-1",
"undefined-doc-param",
"redundant-parameter",
"param-type-mismatch",
"deprecated",
"undefined-global",
"lowercase-global"
], ],
"Lua.diagnostics.globals": [ "Lua.diagnostics.globals": [
"BASE", "BASE",

2
Moose Development/Moose/AI/AI_A2A_Cap.lua
View File

@ -11,7 +11,7 @@
-- @module AI.AI_A2A_Cap -- @module AI.AI_A2A_Cap
-- @image AI_Combat_Air_Patrol.JPG -- @image AI_Combat_Air_Patrol.JPG
--- @type AI_A2A_CAP -- @type AI_A2A_CAP
-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL -- @extends AI.AI_Air_Patrol#AI_AIR_PATROL
-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE -- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE

6
Moose Development/Moose/AI/AI_A2A_Gci.lua
View File

@ -13,8 +13,8 @@
--- @type AI_A2A_GCI -- @type AI_A2A_GCI
-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE -- @extends AI.AI_A2A#AI_A2A
--- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders. --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders.
@ -39,6 +39,8 @@
-- --
-- ## 2. AI_A2A_GCI is a FSM -- ## 2. AI_A2A_GCI is a FSM
-- --
-- ![Process](..\Presentations\AI_GCI\Dia2.JPG)
--
-- ### 2.1 AI_A2A_GCI States -- ### 2.1 AI_A2A_GCI States
-- --
-- * **None** ( Group ): The process is not started yet. -- * **None** ( Group ): The process is not started yet.

4
Moose Development/Moose/AI/AI_A2A_Patrol.lua
View File

@ -10,8 +10,8 @@
-- @image AI_Air_Patrolling.JPG -- @image AI_Air_Patrolling.JPG
--- @type AI_A2A_PATROL -- @type AI_A2A_PATROL
-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL -- @extends AI.AI_A2A#AI_A2A
--- Implements the core functions to patrol a @{Core.Zone} by an AI @{Wrapper.Group} or @{Wrapper.Group}. --- Implements the core functions to patrol a @{Core.Zone} by an AI @{Wrapper.Group} or @{Wrapper.Group}.
-- --

7
Moose Development/Moose/AI/AI_A2G_BAI.lua
View File

@ -11,9 +11,8 @@
-- @module AI.AI_A2G_BAI -- @module AI.AI_A2G_BAI
-- @image AI_Air_To_Ground_Engage.JPG -- @image AI_Air_To_Ground_Engage.JPG
--- @type AI_A2G_BAI -- @type AI_A2G_BAI
-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL -- @extends AI.AI_A2A_Engage#AI_A2A_Engage -- TODO: Documentation. This class does not exist, unable to determine what it extends.
-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE
--- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders. --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders.
-- --
@ -47,7 +46,7 @@ AI_A2G_BAI = {
function AI_A2G_BAI:New2( AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) function AI_A2G_BAI:New2( AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType )
local AI_Air = AI_AIR:New( AIGroup ) local AI_Air = AI_AIR:New( AIGroup )
local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) -- #AI_AIR_PATROL
local AI_Air_Engage = AI_AIR_ENGAGE:New( AI_Air_Patrol, AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType ) local AI_Air_Engage = AI_AIR_ENGAGE:New( AI_Air_Patrol, AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType )
local self = BASE:Inherit( self, AI_Air_Engage ) local self = BASE:Inherit( self, AI_Air_Engage )

7
Moose Development/Moose/AI/AI_A2G_CAS.lua
View File

@ -11,9 +11,8 @@
-- @module AI.AI_A2G_CAS -- @module AI.AI_A2G_CAS
-- @image AI_Air_To_Ground_Engage.JPG -- @image AI_Air_To_Ground_Engage.JPG
--- @type AI_A2G_CAS -- @type AI_A2G_CAS
-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL -- @extends AI.AI_A2G_Patrol#AI_AIR_PATROL TODO: Documentation. This class does not exist, unable to determine what it extends.
-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE
--- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders. --- Implements the core functions to intercept intruders. Use the Engage trigger to intercept intruders.
-- --
@ -47,7 +46,7 @@ AI_A2G_CAS = {
function AI_A2G_CAS:New2( AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) function AI_A2G_CAS:New2( AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType )
local AI_Air = AI_AIR:New( AIGroup ) local AI_Air = AI_AIR:New( AIGroup )
local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) local AI_Air_Patrol = AI_AIR_PATROL:New( AI_Air, AIGroup, PatrolZone, PatrolFloorAltitude, PatrolCeilingAltitude, PatrolMinSpeed, PatrolMaxSpeed, PatrolAltType ) -- #AI_AIR_PATROL
local AI_Air_Engage = AI_AIR_ENGAGE:New( AI_Air_Patrol, AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType ) local AI_Air_Engage = AI_AIR_ENGAGE:New( AI_Air_Patrol, AIGroup, EngageMinSpeed, EngageMaxSpeed, EngageFloorAltitude, EngageCeilingAltitude, EngageAltType )
local self = BASE:Inherit( self, AI_Air_Engage ) local self = BASE:Inherit( self, AI_Air_Engage )

5
Moose Development/Moose/AI/AI_A2G_SEAD.lua
View File

@ -13,9 +13,8 @@
--- @type AI_A2G_SEAD -- @type AI_A2G_SEAD
-- @extends AI.AI_Air_Patrol#AI_AIR_PATROL -- @extends AI.AI_A2G_Patrol#AI_AIR_PATROL
-- @extends AI.AI_Air_Engage#AI_AIR_ENGAGE
--- Implements the core functions to SEAD intruders. Use the Engage trigger to intercept intruders. --- Implements the core functions to SEAD intruders. Use the Engage trigger to intercept intruders.

2
Moose Development/Moose/AI/AI_Air_Patrol.lua
View File

@ -9,7 +9,7 @@
-- @module AI.AI_Air_Patrol -- @module AI.AI_Air_Patrol
-- @image AI_Air_To_Ground_Patrol.JPG -- @image AI_Air_To_Ground_Patrol.JPG
--- @type AI_AIR_PATROL -- @type AI_AIR_PATROL
-- @extends AI.AI_Air#AI_AIR -- @extends AI.AI_Air#AI_AIR
--- The AI_AIR_PATROL class implements the core functions to patrol a @{Core.Zone} by an AI @{Wrapper.Group} --- The AI_AIR_PATROL class implements the core functions to patrol a @{Core.Zone} by an AI @{Wrapper.Group}

16
Moose Development/Moose/AI/AI_BAI.lua
View File

@ -408,7 +408,7 @@ function AI_BAI_ZONE:onafterStart( Controllable, From, Event, To )
self:SetDetectionDeactivated() -- When not engaging, set the detection off. self:SetDetectionDeactivated() -- When not engaging, set the detection off.
end end
--- @param Wrapper.Controllable#CONTROLLABLE AIControllable -- @param Wrapper.Controllable#CONTROLLABLE AIControllable
function _NewEngageRoute( AIControllable ) function _NewEngageRoute( AIControllable )
AIControllable:T( "NewEngageRoute" ) AIControllable:T( "NewEngageRoute" )
@ -417,7 +417,7 @@ function _NewEngageRoute( AIControllable )
end end
--- @param #AI_BAI_ZONE self -- @param #AI_BAI_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
@ -429,7 +429,7 @@ function AI_BAI_ZONE:onbeforeEngage( Controllable, From, Event, To )
end end
end end
--- @param #AI_BAI_ZONE self -- @param #AI_BAI_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
@ -478,7 +478,7 @@ function AI_BAI_ZONE:onafterTarget( Controllable, From, Event, To )
end end
--- @param #AI_BAI_ZONE self -- @param #AI_BAI_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
@ -488,7 +488,7 @@ function AI_BAI_ZONE:onafterAbort( Controllable, From, Event, To )
self:__Route( 1 ) self:__Route( 1 )
end end
--- @param #AI_BAI_ZONE self -- @param #AI_BAI_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
@ -612,7 +612,7 @@ function AI_BAI_ZONE:onafterEngage( Controllable, From, Event, To,
end end
--- @param #AI_BAI_ZONE self -- @param #AI_BAI_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
@ -623,7 +623,7 @@ function AI_BAI_ZONE:onafterAccomplish( Controllable, From, Event, To )
end end
--- @param #AI_BAI_ZONE self -- @param #AI_BAI_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
@ -637,7 +637,7 @@ function AI_BAI_ZONE:onafterDestroy( Controllable, From, Event, To, EventData )
end end
--- @param #AI_BAI_ZONE self -- @param #AI_BAI_ZONE self
-- @param Core.Event#EVENTDATA EventData -- @param Core.Event#EVENTDATA EventData
function AI_BAI_ZONE:OnEventDead( EventData ) function AI_BAI_ZONE:OnEventDead( EventData )
self:F( { "EventDead", EventData } ) self:F( { "EventDead", EventData } )

2
Moose Development/Moose/AI/AI_Balancer.lua
View File

@ -27,7 +27,7 @@
-- @module AI.AI_Balancer -- @module AI.AI_Balancer
-- @image AI_Balancing.JPG -- @image AI_Balancing.JPG
--- @type AI_BALANCER -- @type AI_BALANCER
-- @field Core.Set#SET_CLIENT SetClient -- @field Core.Set#SET_CLIENT SetClient
-- @field Core.Spawn#SPAWN SpawnAI -- @field Core.Spawn#SPAWN SpawnAI
-- @field Wrapper.Group#GROUP Test -- @field Wrapper.Group#GROUP Test

18
Moose Development/Moose/AI/AI_CAP.lua
View File

@ -31,7 +31,7 @@
-- @module AI.AI_CAP -- @module AI.AI_CAP
-- @image AI_Combat_Air_Patrol.JPG -- @image AI_Combat_Air_Patrol.JPG
--- @type AI_CAP_ZONE -- @type AI_CAP_ZONE
-- @field Wrapper.Controllable#CONTROLLABLE AIControllable The @{Wrapper.Controllable} patrolling. -- @field Wrapper.Controllable#CONTROLLABLE AIControllable The @{Wrapper.Controllable} patrolling.
-- @field Core.Zone#ZONE_BASE TargetZone The @{Core.Zone} where the patrol needs to be executed. -- @field Core.Zone#ZONE_BASE TargetZone The @{Core.Zone} where the patrol needs to be executed.
-- @extends AI.AI_Patrol#AI_PATROL_ZONE -- @extends AI.AI_Patrol#AI_PATROL_ZONE
@ -344,7 +344,7 @@ function AI_CAP_ZONE:onafterStart( Controllable, From, Event, To )
end end
--- @param AI.AI_CAP#AI_CAP_ZONE -- @param AI.AI_CAP#AI_CAP_ZONE
-- @param Wrapper.Group#GROUP EngageGroup -- @param Wrapper.Group#GROUP EngageGroup
function AI_CAP_ZONE.EngageRoute( EngageGroup, Fsm ) function AI_CAP_ZONE.EngageRoute( EngageGroup, Fsm )
@ -355,7 +355,7 @@ function AI_CAP_ZONE.EngageRoute( EngageGroup, Fsm )
end end
end end
--- @param #AI_CAP_ZONE self -- @param #AI_CAP_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
@ -367,7 +367,7 @@ function AI_CAP_ZONE:onbeforeEngage( Controllable, From, Event, To )
end end
end end
--- @param #AI_CAP_ZONE self -- @param #AI_CAP_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
@ -395,7 +395,7 @@ function AI_CAP_ZONE:onafterDetected( Controllable, From, Event, To )
end end
end end
--- @param #AI_CAP_ZONE self -- @param #AI_CAP_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
@ -405,7 +405,7 @@ function AI_CAP_ZONE:onafterAbort( Controllable, From, Event, To )
self:__Route( 1 ) self:__Route( 1 )
end end
--- @param #AI_CAP_ZONE self -- @param #AI_CAP_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
@ -505,7 +505,7 @@ function AI_CAP_ZONE:onafterEngage( Controllable, From, Event, To )
end end
end end
--- @param #AI_CAP_ZONE self -- @param #AI_CAP_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
@ -515,7 +515,7 @@ function AI_CAP_ZONE:onafterAccomplish( Controllable, From, Event, To )
self:SetDetectionOff() self:SetDetectionOff()
end end
--- @param #AI_CAP_ZONE self -- @param #AI_CAP_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
@ -528,7 +528,7 @@ function AI_CAP_ZONE:onafterDestroy( Controllable, From, Event, To, EventData )
end end
end end
--- @param #AI_CAP_ZONE self -- @param #AI_CAP_ZONE self
-- @param Core.Event#EVENTDATA EventData -- @param Core.Event#EVENTDATA EventData
function AI_CAP_ZONE:OnEventDead( EventData ) function AI_CAP_ZONE:OnEventDead( EventData )
self:F( { "EventDead", EventData } ) self:F( { "EventDead", EventData } )

16
Moose Development/Moose/AI/AI_CAS.lua
View File

@ -363,7 +363,7 @@ function AI_CAS_ZONE:onafterStart( Controllable, From, Event, To )
self:SetDetectionDeactivated() -- When not engaging, set the detection off. self:SetDetectionDeactivated() -- When not engaging, set the detection off.
end end
--- @param AI.AI_CAS#AI_CAS_ZONE -- @param AI.AI_CAS#AI_CAS_ZONE
-- @param Wrapper.Group#GROUP EngageGroup -- @param Wrapper.Group#GROUP EngageGroup
function AI_CAS_ZONE.EngageRoute( EngageGroup, Fsm ) function AI_CAS_ZONE.EngageRoute( EngageGroup, Fsm )
@ -375,7 +375,7 @@ function AI_CAS_ZONE.EngageRoute( EngageGroup, Fsm )
end end
--- @param #AI_CAS_ZONE self -- @param #AI_CAS_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
@ -387,7 +387,7 @@ function AI_CAS_ZONE:onbeforeEngage( Controllable, From, Event, To )
end end
end end
--- @param #AI_CAS_ZONE self -- @param #AI_CAS_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
@ -420,7 +420,7 @@ function AI_CAS_ZONE:onafterTarget( Controllable, From, Event, To )
end end
--- @param #AI_CAS_ZONE self -- @param #AI_CAS_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
@ -430,7 +430,7 @@ function AI_CAS_ZONE:onafterAbort( Controllable, From, Event, To )
self:__Route( 1 ) self:__Route( 1 )
end end
--- @param #AI_CAS_ZONE self -- @param #AI_CAS_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
@ -530,7 +530,7 @@ function AI_CAS_ZONE:onafterEngage( Controllable, From, Event, To,
end end
--- @param #AI_CAS_ZONE self -- @param #AI_CAS_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
@ -541,7 +541,7 @@ function AI_CAS_ZONE:onafterAccomplish( Controllable, From, Event, To )
end end
--- @param #AI_CAS_ZONE self -- @param #AI_CAS_ZONE self
-- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM. -- @param Wrapper.Controllable#CONTROLLABLE Controllable The Controllable Object managed by the FSM.
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
@ -555,7 +555,7 @@ function AI_CAS_ZONE:onafterDestroy( Controllable, From, Event, To, EventData )
end end
--- @param #AI_CAS_ZONE self -- @param #AI_CAS_ZONE self
-- @param Core.Event#EVENTDATA EventData -- @param Core.Event#EVENTDATA EventData
function AI_CAS_ZONE:OnEventDead( EventData ) function AI_CAS_ZONE:OnEventDead( EventData )
self:F( { "EventDead", EventData } ) self:F( { "EventDead", EventData } )

2
Moose Development/Moose/AI/AI_Cargo_APC.lua
View File

@ -9,7 +9,7 @@
-- @module AI.AI_Cargo_APC -- @module AI.AI_Cargo_APC
-- @image AI_Cargo_Dispatching_For_APC.JPG -- @image AI_Cargo_Dispatching_For_APC.JPG
--- @type AI_CARGO_APC -- @type AI_CARGO_APC
-- @extends AI.AI_Cargo#AI_CARGO -- @extends AI.AI_Cargo#AI_CARGO

2
Moose Development/Moose/AI/AI_Cargo_Airplane.lua
View File

@ -9,7 +9,7 @@
-- @module AI.AI_Cargo_Airplane -- @module AI.AI_Cargo_Airplane
-- @image AI_Cargo_Dispatching_For_Airplanes.JPG -- @image AI_Cargo_Dispatching_For_Airplanes.JPG
--- @type AI_CARGO_AIRPLANE -- @type AI_CARGO_AIRPLANE
-- @extends Core.Fsm#FSM_CONTROLLABLE -- @extends Core.Fsm#FSM_CONTROLLABLE

2
Moose Development/Moose/AI/AI_Cargo_Dispatcher_APC.lua
View File

@ -30,7 +30,7 @@
-- @module AI.AI_Cargo_Dispatcher_APC -- @module AI.AI_Cargo_Dispatcher_APC
-- @image AI_Cargo_Dispatching_For_APC.JPG -- @image AI_Cargo_Dispatching_For_APC.JPG
--- @type AI_CARGO_DISPATCHER_APC -- @type AI_CARGO_DISPATCHER_APC
-- @extends AI.AI_Cargo_Dispatcher#AI_CARGO_DISPATCHER -- @extends AI.AI_Cargo_Dispatcher#AI_CARGO_DISPATCHER

2
Moose Development/Moose/AI/AI_Cargo_Dispatcher_Airplane.lua
View File

@ -24,7 +24,7 @@
-- @image AI_Cargo_Dispatching_For_Airplanes.JPG -- @image AI_Cargo_Dispatching_For_Airplanes.JPG
--- @type AI_CARGO_DISPATCHER_AIRPLANE -- @type AI_CARGO_DISPATCHER_AIRPLANE
-- @extends AI.AI_Cargo_Dispatcher#AI_CARGO_DISPATCHER -- @extends AI.AI_Cargo_Dispatcher#AI_CARGO_DISPATCHER

2
Moose Development/Moose/AI/AI_Cargo_Dispatcher_Helicopter.lua
View File

@ -25,7 +25,7 @@
-- @module AI.AI_Cargo_Dispatcher_Helicopter -- @module AI.AI_Cargo_Dispatcher_Helicopter
-- @image AI_Cargo_Dispatching_For_Helicopters.JPG -- @image AI_Cargo_Dispatching_For_Helicopters.JPG
--- @type AI_CARGO_DISPATCHER_HELICOPTER -- @type AI_CARGO_DISPATCHER_HELICOPTER
-- @extends AI.AI_Cargo_Dispatcher#AI_CARGO_DISPATCHER -- @extends AI.AI_Cargo_Dispatcher#AI_CARGO_DISPATCHER

4
Moose Development/Moose/AI/AI_Cargo_Dispatcher_Ship.lua
View File

@ -23,7 +23,7 @@
-- @module AI.AI_Cargo_Dispatcher_Ship -- @module AI.AI_Cargo_Dispatcher_Ship
-- @image AI_Cargo_Dispatcher.JPG -- @image AI_Cargo_Dispatcher.JPG
--- @type AI_CARGO_DISPATCHER_SHIP -- @type AI_CARGO_DISPATCHER_SHIP
-- @extends AI.AI_Cargo_Dispatcher#AI_CARGO_DISPATCHER -- @extends AI.AI_Cargo_Dispatcher#AI_CARGO_DISPATCHER
@ -160,7 +160,7 @@ AI_CARGO_DISPATCHER_SHIP = {
-- local SetPickupZones = SET_ZONE:New():FilterPrefixes( "Pickup" ):FilterStart() -- local SetPickupZones = SET_ZONE:New():FilterPrefixes( "Pickup" ):FilterStart()
-- local SetDeployZones = SET_ZONE:New():FilterPrefixes( "Deploy" ):FilterStart() -- local SetDeployZones = SET_ZONE:New():FilterPrefixes( "Deploy" ):FilterStart()
-- NEED MORE THOUGHT - ShippingLane is part of Warehouse....... -- NEED MORE THOUGHT - ShippingLane is part of Warehouse.......
-- local ShippingLane = GROUP:New():FilterPrefixes( "ShippingLane" ):FilterStart() -- local ShippingLane = SET_GROUP:New():FilterPrefixes( "ShippingLane" ):FilterOnce():GetSetObjects()
-- --
-- AICargoDispatcherShip = AI_CARGO_DISPATCHER_SHIP:New( SetShip, SetCargoInfantry, SetPickupZones, SetDeployZones, ShippingLane ) -- AICargoDispatcherShip = AI_CARGO_DISPATCHER_SHIP:New( SetShip, SetCargoInfantry, SetPickupZones, SetDeployZones, ShippingLane )
-- AICargoDispatcherShip:Start() -- AICargoDispatcherShip:Start()

8
Moose Development/Moose/AI/AI_Cargo_Helicopter.lua
View File

@ -9,7 +9,7 @@
-- @module AI.AI_Cargo_Helicopter -- @module AI.AI_Cargo_Helicopter
-- @image AI_Cargo_Dispatching_For_Helicopters.JPG -- @image AI_Cargo_Dispatching_For_Helicopters.JPG
--- @type AI_CARGO_HELICOPTER -- @type AI_CARGO_HELICOPTER
-- @extends Core.Fsm#FSM_CONTROLLABLE -- @extends Core.Fsm#FSM_CONTROLLABLE
@ -287,7 +287,7 @@ function AI_CARGO_HELICOPTER:SetLandingSpeedAndHeight(speed, height)
return self return self
end end
--- @param #AI_CARGO_HELICOPTER self -- @param #AI_CARGO_HELICOPTER self
-- @param Wrapper.Group#GROUP Helicopter -- @param Wrapper.Group#GROUP Helicopter
-- @param From -- @param From
-- @param Event -- @param Event
@ -326,7 +326,7 @@ function AI_CARGO_HELICOPTER:onafterLanded( Helicopter, From, Event, To )
end end
--- @param #AI_CARGO_HELICOPTER self -- @param #AI_CARGO_HELICOPTER self
-- @param Wrapper.Group#GROUP Helicopter -- @param Wrapper.Group#GROUP Helicopter
-- @param From -- @param From
-- @param Event -- @param Event
@ -409,7 +409,7 @@ function AI_CARGO_HELICOPTER:onafterQueue( Helicopter, From, Event, To, Coordina
end end
--- @param #AI_CARGO_HELICOPTER self -- @param #AI_CARGO_HELICOPTER self
-- @param Wrapper.Group#GROUP Helicopter -- @param Wrapper.Group#GROUP Helicopter
-- @param From -- @param From
-- @param Event -- @param Event

2
Moose Development/Moose/AI/AI_Cargo_Ship.lua
View File

@ -9,7 +9,7 @@
-- @module AI.AI_Cargo_Ship -- @module AI.AI_Cargo_Ship
-- @image AI_Cargo_Dispatcher.JPG -- @image AI_Cargo_Dispatcher.JPG
--- @type AI_CARGO_SHIP -- @type AI_CARGO_SHIP
-- @extends AI.AI_Cargo#AI_CARGO -- @extends AI.AI_Cargo#AI_CARGO
--- Brings a dynamic cargo handling capability for an AI naval group. --- Brings a dynamic cargo handling capability for an AI naval group.

8
Moose Development/Moose/AI/AI_Escort_Dispatcher_Request.lua
View File

@ -15,7 +15,7 @@
-- @image MOOSE.JPG -- @image MOOSE.JPG
--- @type AI_ESCORT_DISPATCHER_REQUEST -- @type AI_ESCORT_DISPATCHER_REQUEST
-- @extends Core.Fsm#FSM -- @extends Core.Fsm#FSM
@ -33,7 +33,7 @@ AI_ESCORT_DISPATCHER_REQUEST = {
ClassName = "AI_ESCORT_DISPATCHER_REQUEST", ClassName = "AI_ESCORT_DISPATCHER_REQUEST",
} }
--- @field #list -- @field #list
AI_ESCORT_DISPATCHER_REQUEST.AI_Escorts = {} AI_ESCORT_DISPATCHER_REQUEST.AI_Escorts = {}
@ -80,7 +80,7 @@ function AI_ESCORT_DISPATCHER_REQUEST:onafterStart( From, Event, To )
end end
--- @param #AI_ESCORT_DISPATCHER_REQUEST self -- @param #AI_ESCORT_DISPATCHER_REQUEST self
-- @param Core.Event#EVENTDATA EventData -- @param Core.Event#EVENTDATA EventData
function AI_ESCORT_DISPATCHER_REQUEST:OnEventExit( EventData ) function AI_ESCORT_DISPATCHER_REQUEST:OnEventExit( EventData )
@ -97,7 +97,7 @@ function AI_ESCORT_DISPATCHER_REQUEST:OnEventExit( EventData )
end end
--- @param #AI_ESCORT_DISPATCHER_REQUEST self -- @param #AI_ESCORT_DISPATCHER_REQUEST self
-- @param Core.Event#EVENTDATA EventData -- @param Core.Event#EVENTDATA EventData
function AI_ESCORT_DISPATCHER_REQUEST:OnEventBirth( EventData ) function AI_ESCORT_DISPATCHER_REQUEST:OnEventBirth( EventData )

24
Moose Development/Moose/AI/AI_Escort_Request.lua
View File

@ -136,12 +136,12 @@
-- --
-- Escort groups can have their own mission. This menu item will allow the escort group to resume their Mission from a given waypoint. -- Escort groups can have their own mission. This menu item will allow the escort group to resume their Mission from a given waypoint.
-- Note that this is really fantastic, as you now have the dynamic of taking control of the escort groups, and allowing them to resume their path or mission. -- Note that this is really fantastic, as you now have the dynamic of taking control of the escort groups, and allowing them to resume their path or mission.
-- --
-- # Developer Note -- # Developer Note
-- --
-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
-- Therefore, this class is considered to be deprecated -- Therefore, this class is considered to be deprecated
-- --
-- === -- ===
-- --
-- ### Authors: **FlightControl** -- ### Authors: **FlightControl**
@ -153,7 +153,7 @@
--- @type AI_ESCORT_REQUEST -- @type AI_ESCORT_REQUEST
-- @extends AI.AI_Escort#AI_ESCORT -- @extends AI.AI_Escort#AI_ESCORT
--- AI_ESCORT_REQUEST class --- AI_ESCORT_REQUEST class
@ -228,7 +228,7 @@ function AI_ESCORT_REQUEST:New( EscortUnit, EscortSpawn, EscortAirbase, EscortNa
return self return self
end end
--- @param #AI_ESCORT_REQUEST self -- @param #AI_ESCORT_REQUEST self
function AI_ESCORT_REQUEST:SpawnEscort() function AI_ESCORT_REQUEST:SpawnEscort()
local EscortGroup = self.EscortSpawn:SpawnAtAirbase( self.EscortAirbase, SPAWN.Takeoff.Hot ) local EscortGroup = self.EscortSpawn:SpawnAtAirbase( self.EscortAirbase, SPAWN.Takeoff.Hot )
@ -253,7 +253,7 @@ function AI_ESCORT_REQUEST:SpawnEscort()
self:_InitEscortMenus( EscortGroup ) self:_InitEscortMenus( EscortGroup )
self:_InitEscortRoute( EscortGroup ) self:_InitEscortRoute( EscortGroup )
--- @param #AI_ESCORT self -- @param #AI_ESCORT self
-- @param Core.Event#EVENTDATA EventData -- @param Core.Event#EVENTDATA EventData
function EscortGroup:OnEventDeadOrCrash( EventData ) function EscortGroup:OnEventDeadOrCrash( EventData )
self:F( { "EventDead", EventData } ) self:F( { "EventDead", EventData } )
@ -268,7 +268,7 @@ function AI_ESCORT_REQUEST:SpawnEscort()
end end
--- @param #AI_ESCORT_REQUEST self -- @param #AI_ESCORT_REQUEST self
-- @param Core.Set#SET_GROUP EscortGroupSet -- @param Core.Set#SET_GROUP EscortGroupSet
function AI_ESCORT_REQUEST:onafterStart( EscortGroupSet ) function AI_ESCORT_REQUEST:onafterStart( EscortGroupSet )
@ -290,14 +290,14 @@ function AI_ESCORT_REQUEST:onafterStart( EscortGroupSet )
end end
--- @param #AI_ESCORT_REQUEST self -- @param #AI_ESCORT_REQUEST self
-- @param Core.Set#SET_GROUP EscortGroupSet -- @param Core.Set#SET_GROUP EscortGroupSet
function AI_ESCORT_REQUEST:onafterStop( EscortGroupSet ) function AI_ESCORT_REQUEST:onafterStop( EscortGroupSet )
self:F() self:F()
EscortGroupSet:ForEachGroup( EscortGroupSet:ForEachGroup(
--- @param Wrapper.Group#GROUP EscortGroup -- @param Core.Group#GROUP EscortGroup
function( EscortGroup ) function( EscortGroup )
EscortGroup:WayPointInitialize() EscortGroup:WayPointInitialize()

32
Moose Development/Moose/AI/AI_Formation.lua
View File

@ -34,8 +34,8 @@
-- @field Core.Scheduler#SCHEDULER FollowScheduler The instance of the SCHEDULER class. -- @field Core.Scheduler#SCHEDULER FollowScheduler The instance of the SCHEDULER class.
-- @field #number FollowDistance The current follow distance. -- @field #number FollowDistance The current follow distance.
-- @field #boolean ReportTargets If true, nearby targets are reported. -- @field #boolean ReportTargets If true, nearby targets are reported.
-- @field DCS#AI.Option.Air.val.ROE OptionROE Which ROE is set to the FollowGroup. -- @Field DCSTypes#AI.Option.Air.val.ROE OptionROE Which ROE is set to the FollowGroup.
-- @field DCS#AI.Option.Air.val.REACTION_ON_THREAT OptionReactionOnThreat Which REACTION_ON_THREAT is set to the FollowGroup. -- @field DCSTypes#AI.Option.Air.val.REACTION_ON_THREAT OptionReactionOnThreat Which REACTION_ON_THREAT is set to the FollowGroup.
-- @field #number dtFollow Time step between position updates. -- @field #number dtFollow Time step between position updates.
@ -92,12 +92,12 @@
-- local LargeFormation = AI_FORMATION:New( LeaderUnit, FollowGroupSet, "Center Wing Formation", "Briefing" ) -- local LargeFormation = AI_FORMATION:New( LeaderUnit, FollowGroupSet, "Center Wing Formation", "Briefing" )
-- LargeFormation:FormationCenterWing( 500, 50, 0, 250, 250 ) -- LargeFormation:FormationCenterWing( 500, 50, 0, 250, 250 )
-- LargeFormation:__Start( 1 ) -- LargeFormation:__Start( 1 )
-- --
-- # Developer Note -- # Developer Note
-- --
-- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE -- Note while this class still works, it is no longer supported as the original author stopped active development of MOOSE
-- Therefore, this class is considered to be deprecated -- Therefore, this class is considered to be deprecated
-- --
-- @field #AI_FORMATION -- @field #AI_FORMATION
AI_FORMATION = { AI_FORMATION = {
ClassName = "AI_FORMATION", ClassName = "AI_FORMATION",
@ -117,7 +117,7 @@ AI_FORMATION = {
AI_FORMATION.__Enum = {} AI_FORMATION.__Enum = {}
--- @type AI_FORMATION.__Enum.Formation -- @type AI_FORMATION.__Enum.Formation
-- @field #number None -- @field #number None
-- @field #number Line -- @field #number Line
-- @field #number Trail -- @field #number Trail
@ -142,7 +142,7 @@ AI_FORMATION.__Enum.Formation = {
Box = 10, Box = 10,
} }
--- @type AI_FORMATION.__Enum.Mode -- @type AI_FORMATION.__Enum.Mode
-- @field #number Mission -- @field #number Mission
-- @field #number Formation -- @field #number Formation
AI_FORMATION.__Enum.Mode = { AI_FORMATION.__Enum.Mode = {
@ -152,13 +152,13 @@ AI_FORMATION.__Enum.Mode = {
Reconnaissance = "R", Reconnaissance = "R",
} }
--- @type AI_FORMATION.__Enum.ReportType -- @type AI_FORMATION.__Enum.ReportType
-- @field #number All -- @field #number All
-- @field #number Airborne -- @field #number Airborne
-- @field #number GroundRadar -- @field #number GroundRadar
-- @field #number Ground -- @field #number Ground
AI_FORMATION.__Enum.ReportType = { AI_FORMATION.__Enum.ReportType = {
Airborne = "*", All = "*",
Airborne = "A", Airborne = "A",
GroundRadar = "R", GroundRadar = "R",
Ground = "G", Ground = "G",
@ -996,7 +996,7 @@ function AI_FORMATION:SetFlightModeMission( FollowGroup )
FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Mission ) FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Mission )
else else
self.FollowGroupSet:ForSomeGroupAlive( self.FollowGroupSet:ForSomeGroupAlive(
--- @param Wrapper.Group#GROUP EscortGroup -- @param Core.Group#GROUP EscortGroup
function( FollowGroup ) function( FollowGroup )
FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) ) FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )
FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Mission ) FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Mission )
@ -1020,7 +1020,7 @@ function AI_FORMATION:SetFlightModeAttack( FollowGroup )
FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Attack ) FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Attack )
else else
self.FollowGroupSet:ForSomeGroupAlive( self.FollowGroupSet:ForSomeGroupAlive(
--- @param Wrapper.Group#GROUP EscortGroup -- @param Core.Group#GROUP EscortGroup
function( FollowGroup ) function( FollowGroup )
FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) ) FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )
FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Attack ) FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Attack )
@ -1044,7 +1044,7 @@ function AI_FORMATION:SetFlightModeFormation( FollowGroup )
FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Formation ) FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Formation )
else else
self.FollowGroupSet:ForSomeGroupAlive( self.FollowGroupSet:ForSomeGroupAlive(
--- @param Wrapper.Group#GROUP EscortGroup -- @param Core.Group#GROUP EscortGroup
function( FollowGroup ) function( FollowGroup )
FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) ) FollowGroup:SetState( FollowGroup, "PreviousMode", FollowGroup:GetState( FollowGroup, "Mode" ) )
FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Formation ) FollowGroup:SetState( FollowGroup, "Mode", self.__Enum.Mode.Formation )
@ -1222,7 +1222,7 @@ function AI_FORMATION:FollowMe(FollowGroup, ClientUnit, CT1, CV1, CT2, CV2)
local CVI = { local CVI = {
x = CV2.x + CS * 10 * math.sin(Ca), x = CV2.x + CS * 10 * math.sin(Ca),
y = GH2.y + Inclination, -- + FollowFormation.y, y = GH2.y + Inclination, -- + FollowFormation.y,
y = GH2.y, --y = GH2.y,
z = CV2.z + CS * 10 * math.cos(Ca), z = CV2.z + CS * 10 * math.cos(Ca),
} }

6
Moose Development/Moose/Actions/Act_Account.lua
View File

@ -274,7 +274,7 @@ do -- ACT_ACCOUNT_DEADS
--- DCS Events --- DCS Events
--- @param #ACT_ACCOUNT_DEADS self -- @param #ACT_ACCOUNT_DEADS self
-- @param Core.Event#EVENTDATA EventData -- @param Core.Event#EVENTDATA EventData
function ACT_ACCOUNT_DEADS:OnEventHit( EventData ) function ACT_ACCOUNT_DEADS:OnEventHit( EventData )
self:T( { "EventDead", EventData } ) self:T( { "EventDead", EventData } )
@ -285,7 +285,7 @@ do -- ACT_ACCOUNT_DEADS
end end
end end
--- @param #ACT_ACCOUNT_DEADS self -- @param #ACT_ACCOUNT_DEADS self
-- @param Core.Event#EVENTDATA EventData -- @param Core.Event#EVENTDATA EventData
function ACT_ACCOUNT_DEADS:onfuncEventDead( EventData ) function ACT_ACCOUNT_DEADS:onfuncEventDead( EventData )
self:T( { "EventDead", EventData } ) self:T( { "EventDead", EventData } )
@ -297,7 +297,7 @@ do -- ACT_ACCOUNT_DEADS
--- DCS Events --- DCS Events
--- @param #ACT_ACCOUNT_DEADS self -- @param #ACT_ACCOUNT_DEADS self
-- @param Core.Event#EVENTDATA EventData -- @param Core.Event#EVENTDATA EventData
function ACT_ACCOUNT_DEADS:onfuncEventCrash( EventData ) function ACT_ACCOUNT_DEADS:onfuncEventCrash( EventData )
self:T( { "EventDead", EventData } ) self:T( { "EventDead", EventData } )

2
Moose Development/Moose/Actions/Act_Assist.lua
View File

@ -200,7 +200,7 @@ do -- ACT_ASSIST_SMOKE_TARGETS_ZONE
function ACT_ASSIST_SMOKE_TARGETS_ZONE:onenterSmoking( ProcessUnit, From, Event, To ) function ACT_ASSIST_SMOKE_TARGETS_ZONE:onenterSmoking( ProcessUnit, From, Event, To )
self.TargetSetUnit:ForEachUnit( self.TargetSetUnit:ForEachUnit(
--- @param Wrapper.Unit#UNIT SmokeUnit -- @param Wrapper.Unit#UNIT SmokeUnit
function( SmokeUnit ) function( SmokeUnit )
if math.random( 1, ( 100 * self.TargetSetUnit:Count() ) / 4 ) <= 100 then if math.random( 1, ( 100 * self.TargetSetUnit:Count() ) / 4 ) <= 100 then
SCHEDULER:New( self, SCHEDULER:New( self,

2
Moose Development/Moose/Cargo/CargoCrate.lua
View File

@ -78,7 +78,7 @@ do -- CARGO_CRATE
return self return self
end end
--- @param #CARGO_CRATE self -- @param #CARGO_CRATE self
-- @param Core.Event#EVENTDATA EventData -- @param Core.Event#EVENTDATA EventData
function CARGO_CRATE:OnEventCargoDead( EventData ) function CARGO_CRATE:OnEventCargoDead( EventData )

2
Moose Development/Moose/Cargo/CargoGroup.lua
View File

@ -598,7 +598,7 @@ do -- CARGO_GROUP
end end
--- Get the amount of cargo units in the group. --- Get the underlying GROUP object from the CARGO_GROUP.
-- @param #CARGO_GROUP self -- @param #CARGO_GROUP self
-- @return #CARGO_GROUP -- @return #CARGO_GROUP
function CARGO_GROUP:GetGroup( Cargo ) function CARGO_GROUP:GetGroup( Cargo )

2
Moose Development/Moose/Cargo/CargoSlingload.lua
View File

@ -72,7 +72,7 @@ do -- CARGO_SLINGLOAD
end end
--- @param #CARGO_SLINGLOAD self -- @param #CARGO_SLINGLOAD self
-- @param Core.Event#EVENTDATA EventData -- @param Core.Event#EVENTDATA EventData
function CARGO_SLINGLOAD:OnEventCargoDead( EventData ) function CARGO_SLINGLOAD:OnEventCargoDead( EventData )

2
Moose Development/Moose/Core/ClientMenu.lua
View File

@ -417,7 +417,7 @@ end
CLIENTMENUMANAGER = { CLIENTMENUMANAGER = {
ClassName = "CLIENTMENUMANAGER", ClassName = "CLIENTMENUMANAGER",
lid = "", lid = "",
version = "0.1.5a", version = "0.1.6",
name = nil, name = nil,
clientset = nil, clientset = nil,
menutree = {}, menutree = {},

6
Moose Development/Moose/Core/Fsm.lua
View File

@ -79,7 +79,7 @@
do -- FSM do -- FSM
--- @type FSM -- @type FSM
-- @field #string ClassName Name of the class. -- @field #string ClassName Name of the class.
-- @field Core.Scheduler#SCHEDULER CallScheduler Call scheduler. -- @field Core.Scheduler#SCHEDULER CallScheduler Call scheduler.
-- @field #table options Options. -- @field #table options Options.
@ -949,7 +949,7 @@ end
do -- FSM_CONTROLLABLE do -- FSM_CONTROLLABLE
--- @type FSM_CONTROLLABLE -- @type FSM_CONTROLLABLE
-- @field Wrapper.Controllable#CONTROLLABLE Controllable -- @field Wrapper.Controllable#CONTROLLABLE Controllable
-- @extends Core.Fsm#FSM -- @extends Core.Fsm#FSM
@ -1082,7 +1082,7 @@ end
do -- FSM_PROCESS do -- FSM_PROCESS
--- @type FSM_PROCESS -- @type FSM_PROCESS
-- @field Tasking.Task#TASK Task -- @field Tasking.Task#TASK Task
-- @extends Core.Fsm#FSM_CONTROLLABLE -- @extends Core.Fsm#FSM_CONTROLLABLE

8
Moose Development/Moose/Core/Goal.lua
View File

@ -24,7 +24,7 @@
do -- Goal do -- Goal
--- @type GOAL -- @type GOAL
-- @extends Core.Fsm#FSM -- @extends Core.Fsm#FSM
--- Models processes that have an objective with a defined achievement. Derived classes implement the ways how the achievements can be realized. --- Models processes that have an objective with a defined achievement. Derived classes implement the ways how the achievements can be realized.
@ -71,10 +71,10 @@ do -- Goal
ClassName = "GOAL", ClassName = "GOAL",
} }
--- @field #table GOAL.Players -- @field #table GOAL.Players
GOAL.Players = {} GOAL.Players = {}
--- @field #number GOAL.TotalContributions -- @field #number GOAL.TotalContributions
GOAL.TotalContributions = 0 GOAL.TotalContributions = 0
--- GOAL Constructor. --- GOAL Constructor.
@ -145,7 +145,7 @@ do -- Goal
self.TotalContributions = self.TotalContributions + 1 self.TotalContributions = self.TotalContributions + 1
end end
--- @param #GOAL self -- @param #GOAL self
-- @param #number Player contribution. -- @param #number Player contribution.
function GOAL:GetPlayerContribution( PlayerName ) function GOAL:GetPlayerContribution( PlayerName )
return self.Players[PlayerName] or 0 return self.Players[PlayerName] or 0

5
Moose Development/Moose/Core/Message.lua
View File

@ -177,7 +177,7 @@ end
-- --
-- -- Send the 2 messages created with the @{New} method to the Client Group. -- -- Send the 2 messages created with the @{New} method to the Client Group.
-- -- Note that the Message of MessageClient2 is overwriting the Message of MessageClient1. -- -- Note that the Message of MessageClient2 is overwriting the Message of MessageClient1.
-- Client = CLIENT:FindByName("UnitNameOfMyClient") -- Client = CLIENT:FindByName("NameOfClientUnit")
-- --
-- MessageClient1 = MESSAGE:New( "Congratulations, you've just hit a target", 25, "Score" ):ToClient( Client ) -- MessageClient1 = MESSAGE:New( "Congratulations, you've just hit a target", 25, "Score" ):ToClient( Client )
-- MessageClient2 = MESSAGE:New( "Congratulations, you've just killed a target", 25, "Score" ):ToClient( Client ) -- MessageClient2 = MESSAGE:New( "Congratulations, you've just killed a target", 25, "Score" ):ToClient( Client )
@ -192,7 +192,7 @@ end
-- --
function MESSAGE:ToClient( Client, Settings ) function MESSAGE:ToClient( Client, Settings )
self:F( Client ) self:F( Client )
self:ToUnit(Client, Settings) self:ToUnit(Client,Settings)
return self return self
end end
@ -239,6 +239,7 @@ function MESSAGE:ToUnit( Unit, Settings )
if self.MessageDuration ~= 0 then if self.MessageDuration ~= 0 then
self:T( self.MessageCategory .. self.MessageText:gsub("\n$",""):gsub("\n$","") .. " / " .. self.MessageDuration ) self:T( self.MessageCategory .. self.MessageText:gsub("\n$",""):gsub("\n$","") .. " / " .. self.MessageDuration )
local ID = Unit:GetID()
trigger.action.outTextForUnit( Unit:GetID(), self.MessageCategory .. self.MessageText:gsub("\n$",""):gsub("\n$",""), self.MessageDuration, self.ClearScreen ) trigger.action.outTextForUnit( Unit:GetID(), self.MessageCategory .. self.MessageText:gsub("\n$",""):gsub("\n$",""), self.MessageDuration, self.ClearScreen )
end end
end end

3
Moose Development/Moose/Core/Report.lua
View File

@ -15,7 +15,8 @@
-- @module Core.Report -- @module Core.Report
-- @image Core_Report.JPG -- @image Core_Report.JPG
--- @type REPORT ---
-- @type REPORT
-- @extends Core.Base#BASE -- @extends Core.Base#BASE
--- Provides a handy means to create messages and reports. --- Provides a handy means to create messages and reports.

2
Moose Development/Moose/Core/ScheduleDispatcher.lua
View File

@ -1,4 +1,4 @@
--- **Core** - SCHEDULEDISPATCHER dispatches the different schedules. ---- **Core** - SCHEDULEDISPATCHER dispatches the different schedules.
-- --
-- === -- ===
-- --

33
Moose Development/Moose/Core/Settings.lua
View File

@ -29,7 +29,9 @@
-- @module Core.Settings -- @module Core.Settings
-- @image Core_Settings.JPG -- @image Core_Settings.JPG
--- @type SETTINGS
---
-- @type SETTINGS
-- @extends Core.Base#BASE -- @extends Core.Base#BASE
--- Takes care of various settings that influence the behavior of certain functionalities and classes within the MOOSE framework. --- Takes care of various settings that influence the behavior of certain functionalities and classes within the MOOSE framework.
@ -218,7 +220,8 @@ SETTINGS = {
SETTINGS.__Enum = {} SETTINGS.__Enum = {}
--- @type SETTINGS.__Enum.Era ---
-- @type SETTINGS.__Enum.Era
-- @field #number WWII -- @field #number WWII
-- @field #number Korea -- @field #number Korea
-- @field #number Cold -- @field #number Cold
@ -491,7 +494,7 @@ do -- SETTINGS
return (self.A2ASystem and self.A2ASystem == "MGRS") or (not self.A2ASystem and _SETTINGS:IsA2A_MGRS()) return (self.A2ASystem and self.A2ASystem == "MGRS") or (not self.A2ASystem and _SETTINGS:IsA2A_MGRS())
end end
--- @param #SETTINGS self -- @param #SETTINGS self
-- @param Wrapper.Group#GROUP MenuGroup Group for which to add menus. -- @param Wrapper.Group#GROUP MenuGroup Group for which to add menus.
-- @param #table RootMenu Root menu table -- @param #table RootMenu Root menu table
-- @return #SETTINGS -- @return #SETTINGS
@ -945,49 +948,49 @@ do -- SETTINGS
return self return self
end end
--- @param #SETTINGS self -- @param #SETTINGS self
function SETTINGS:A2GMenuSystem( MenuGroup, RootMenu, A2GSystem ) function SETTINGS:A2GMenuSystem( MenuGroup, RootMenu, A2GSystem )
self.A2GSystem = A2GSystem self.A2GSystem = A2GSystem
MESSAGE:New( string.format( "Settings: Default A2G coordinate system set to %s for all players!", A2GSystem ), 5 ):ToAll() MESSAGE:New( string.format( "Settings: Default A2G coordinate system set to %s for all players!", A2GSystem ), 5 ):ToAll()
self:SetSystemMenu( MenuGroup, RootMenu ) self:SetSystemMenu( MenuGroup, RootMenu )
end end
--- @param #SETTINGS self -- @param #SETTINGS self
function SETTINGS:A2AMenuSystem( MenuGroup, RootMenu, A2ASystem ) function SETTINGS:A2AMenuSystem( MenuGroup, RootMenu, A2ASystem )
self.A2ASystem = A2ASystem self.A2ASystem = A2ASystem
MESSAGE:New( string.format( "Settings: Default A2A coordinate system set to %s for all players!", A2ASystem ), 5 ):ToAll() MESSAGE:New( string.format( "Settings: Default A2A coordinate system set to %s for all players!", A2ASystem ), 5 ):ToAll()
self:SetSystemMenu( MenuGroup, RootMenu ) self:SetSystemMenu( MenuGroup, RootMenu )
end end
--- @param #SETTINGS self -- @param #SETTINGS self
function SETTINGS:MenuLL_DDM_Accuracy( MenuGroup, RootMenu, LL_Accuracy ) function SETTINGS:MenuLL_DDM_Accuracy( MenuGroup, RootMenu, LL_Accuracy )
self.LL_Accuracy = LL_Accuracy self.LL_Accuracy = LL_Accuracy
MESSAGE:New( string.format( "Settings: Default LL accuracy set to %s for all players!", LL_Accuracy ), 5 ):ToAll() MESSAGE:New( string.format( "Settings: Default LL accuracy set to %s for all players!", LL_Accuracy ), 5 ):ToAll()
self:SetSystemMenu( MenuGroup, RootMenu ) self:SetSystemMenu( MenuGroup, RootMenu )
end end
--- @param #SETTINGS self -- @param #SETTINGS self
function SETTINGS:MenuMGRS_Accuracy( MenuGroup, RootMenu, MGRS_Accuracy ) function SETTINGS:MenuMGRS_Accuracy( MenuGroup, RootMenu, MGRS_Accuracy )
self.MGRS_Accuracy = MGRS_Accuracy self.MGRS_Accuracy = MGRS_Accuracy
MESSAGE:New( string.format( "Settings: Default MGRS accuracy set to %s for all players!", MGRS_Accuracy ), 5 ):ToAll() MESSAGE:New( string.format( "Settings: Default MGRS accuracy set to %s for all players!", MGRS_Accuracy ), 5 ):ToAll()
self:SetSystemMenu( MenuGroup, RootMenu ) self:SetSystemMenu( MenuGroup, RootMenu )
end end
--- @param #SETTINGS self -- @param #SETTINGS self
function SETTINGS:MenuMWSystem( MenuGroup, RootMenu, MW ) function SETTINGS:MenuMWSystem( MenuGroup, RootMenu, MW )
self.Metric = MW self.Metric = MW
MESSAGE:New( string.format( "Settings: Default measurement format set to %s for all players!", MW and "Metric" or "Imperial" ), 5 ):ToAll() MESSAGE:New( string.format( "Settings: Default measurement format set to %s for all players!", MW and "Metric" or "Imperial" ), 5 ):ToAll()
self:SetSystemMenu( MenuGroup, RootMenu ) self:SetSystemMenu( MenuGroup, RootMenu )
end end
--- @param #SETTINGS self -- @param #SETTINGS self
function SETTINGS:MenuMessageTimingsSystem( MenuGroup, RootMenu, MessageType, MessageTime ) function SETTINGS:MenuMessageTimingsSystem( MenuGroup, RootMenu, MessageType, MessageTime )
self:SetMessageTime( MessageType, MessageTime ) self:SetMessageTime( MessageType, MessageTime )
MESSAGE:New( string.format( "Settings: Default message time set for %s to %d.", MessageType, MessageTime ), 5 ):ToAll() MESSAGE:New( string.format( "Settings: Default message time set for %s to %d.", MessageType, MessageTime ), 5 ):ToAll()
end end
do do
--- @param #SETTINGS self -- @param #SETTINGS self
function SETTINGS:MenuGroupA2GSystem( PlayerUnit, PlayerGroup, PlayerName, A2GSystem ) function SETTINGS:MenuGroupA2GSystem( PlayerUnit, PlayerGroup, PlayerName, A2GSystem )
--BASE:E( {PlayerUnit:GetName(), A2GSystem } ) --BASE:E( {PlayerUnit:GetName(), A2GSystem } )
self.A2GSystem = A2GSystem self.A2GSystem = A2GSystem
@ -998,7 +1001,7 @@ do -- SETTINGS
end end
end end
--- @param #SETTINGS self -- @param #SETTINGS self
function SETTINGS:MenuGroupA2ASystem( PlayerUnit, PlayerGroup, PlayerName, A2ASystem ) function SETTINGS:MenuGroupA2ASystem( PlayerUnit, PlayerGroup, PlayerName, A2ASystem )
self.A2ASystem = A2ASystem self.A2ASystem = A2ASystem
MESSAGE:New( string.format( "Settings: A2A format set to %s for player %s.", A2ASystem, PlayerName ), 5 ):ToGroup( PlayerGroup ) MESSAGE:New( string.format( "Settings: A2A format set to %s for player %s.", A2ASystem, PlayerName ), 5 ):ToGroup( PlayerGroup )
@ -1008,7 +1011,7 @@ do -- SETTINGS
end end
end end
--- @param #SETTINGS self -- @param #SETTINGS self
function SETTINGS:MenuGroupLL_DDM_AccuracySystem( PlayerUnit, PlayerGroup, PlayerName, LL_Accuracy ) function SETTINGS:MenuGroupLL_DDM_AccuracySystem( PlayerUnit, PlayerGroup, PlayerName, LL_Accuracy )
self.LL_Accuracy = LL_Accuracy self.LL_Accuracy = LL_Accuracy
MESSAGE:New( string.format( "Settings: LL format accuracy set to %d decimal places for player %s.", LL_Accuracy, PlayerName ), 5 ):ToGroup( PlayerGroup ) MESSAGE:New( string.format( "Settings: LL format accuracy set to %d decimal places for player %s.", LL_Accuracy, PlayerName ), 5 ):ToGroup( PlayerGroup )
@ -1018,7 +1021,7 @@ do -- SETTINGS
end end
end end
--- @param #SETTINGS self -- @param #SETTINGS self
function SETTINGS:MenuGroupMGRS_AccuracySystem( PlayerUnit, PlayerGroup, PlayerName, MGRS_Accuracy ) function SETTINGS:MenuGroupMGRS_AccuracySystem( PlayerUnit, PlayerGroup, PlayerName, MGRS_Accuracy )
self.MGRS_Accuracy = MGRS_Accuracy self.MGRS_Accuracy = MGRS_Accuracy
MESSAGE:New( string.format( "Settings: MGRS format accuracy set to %d for player %s.", MGRS_Accuracy, PlayerName ), 5 ):ToGroup( PlayerGroup ) MESSAGE:New( string.format( "Settings: MGRS format accuracy set to %d for player %s.", MGRS_Accuracy, PlayerName ), 5 ):ToGroup( PlayerGroup )
@ -1028,7 +1031,7 @@ do -- SETTINGS
end end
end end
--- @param #SETTINGS self -- @param #SETTINGS self
function SETTINGS:MenuGroupMWSystem( PlayerUnit, PlayerGroup, PlayerName, MW ) function SETTINGS:MenuGroupMWSystem( PlayerUnit, PlayerGroup, PlayerName, MW )
self.Metric = MW self.Metric = MW
MESSAGE:New( string.format( "Settings: Measurement format set to %s for player %s.", MW and "Metric" or "Imperial", PlayerName ), 5 ):ToGroup( PlayerGroup ) MESSAGE:New( string.format( "Settings: Measurement format set to %s for player %s.", MW and "Metric" or "Imperial", PlayerName ), 5 ):ToGroup( PlayerGroup )
@ -1038,7 +1041,7 @@ do -- SETTINGS
end end
end end
--- @param #SETTINGS self -- @param #SETTINGS self
function SETTINGS:MenuGroupMessageTimingsSystem( PlayerUnit, PlayerGroup, PlayerName, MessageType, MessageTime ) function SETTINGS:MenuGroupMessageTimingsSystem( PlayerUnit, PlayerGroup, PlayerName, MessageType, MessageTime )
self:SetMessageTime( MessageType, MessageTime ) self:SetMessageTime( MessageType, MessageTime )
MESSAGE:New( string.format( "Settings: Default message time set for %s to %d.", MessageType, MessageTime ), 5 ):ToGroup( PlayerGroup ) MESSAGE:New( string.format( "Settings: Default message time set for %s to %d.", MessageType, MessageTime ), 5 ):ToGroup( PlayerGroup )

2
Moose Development/Moose/Core/UserFlag.lua
View File

@ -18,7 +18,7 @@
do -- UserFlag do -- UserFlag
--- @type USERFLAG -- @type USERFLAG
-- @field #string ClassName Name of the class -- @field #string ClassName Name of the class
-- @field #string UserFlagName Name of the flag. -- @field #string UserFlagName Name of the flag.
-- @extends Core.Base#BASE -- @extends Core.Base#BASE

4
Moose Development/Moose/Core/Velocity.lua
View File

@ -20,7 +20,7 @@
do -- Velocity do -- Velocity
--- @type VELOCITY -- @type VELOCITY
-- @extends Core.Base#BASE -- @extends Core.Base#BASE
@ -127,7 +127,7 @@ end
do -- VELOCITY_POSITIONABLE do -- VELOCITY_POSITIONABLE
--- @type VELOCITY_POSITIONABLE -- @type VELOCITY_POSITIONABLE
-- @extends Core.Base#BASE -- @extends Core.Base#BASE

2
Moose Development/Moose/Core/Zone.lua
View File

@ -3641,7 +3641,7 @@ do -- ZONE_ELASTIC
end end
--- Create a convec hull. --- Create a convex hull.
-- @param #ZONE_ELASTIC self -- @param #ZONE_ELASTIC self
-- @param #table pl Points -- @param #table pl Points
-- @return #table Points -- @return #table Points

3
Moose Development/Moose/Core/Zone_Detection.lua
View File

@ -2,7 +2,8 @@
-- @module Core.Zone_Detection -- @module Core.Zone_Detection
-- @image MOOSE.JPG -- @image MOOSE.JPG
--- @type ZONE_DETECTION ---
-- @type ZONE_DETECTION
-- @field DCS#Vec2 Vec2 The current location of the zone. -- @field DCS#Vec2 Vec2 The current location of the zone.
-- @field DCS#Distance Radius The radius of the zone. -- @field DCS#Distance Radius The radius of the zone.
-- @extends #ZONE_BASE -- @extends #ZONE_BASE

49
Moose Development/Moose/Functional/Artillery.lua
View File

@ -2301,12 +2301,12 @@ function ARTY:OnEventShot(EventData)
self.Nukes=self.Nukes-1 self.Nukes=self.Nukes-1
end end
-- Decrease available illuminatin shells because we just fired one. -- Decrease available illumination shells because we just fired one.
if self.currentTarget.weapontype==ARTY.WeaponType.IlluminationShells then if self.currentTarget.weapontype==ARTY.WeaponType.IlluminationShells then
self.Nillu=self.Nillu-1 self.Nillu=self.Nillu-1
end end
-- Decrease available illuminatin shells because we just fired one. -- Decrease available smoke shells because we just fired one.
if self.currentTarget.weapontype==ARTY.WeaponType.SmokeShells then if self.currentTarget.weapontype==ARTY.WeaponType.SmokeShells then
self.Nsmoke=self.Nsmoke-1 self.Nsmoke=self.Nsmoke-1
end end
@ -3717,51 +3717,6 @@ function ARTY:_NuclearBlast(_coord)
ignite(_fires) ignite(_fires)
end end
--[[
local ZoneNuke=ZONE_RADIUS:New("Nukezone", _coord:GetVec2(), 2000)
-- Scan for Scenery objects.
ZoneNuke:Scan(Object.Category.SCENERY)
-- Array with all possible hideouts, i.e. scenery objects in the vicinity of the group.
local scenery={}
for SceneryTypeName, SceneryData in pairs(ZoneNuke:GetScannedScenery()) do
for SceneryName, SceneryObject in pairs(SceneryData) do
local SceneryObject = SceneryObject -- Wrapper.Scenery#SCENERY
-- Position of the scenery object.
local spos=SceneryObject:GetCoordinate()
-- Distance from group to impact point.
local distance= spos:Get2DDistance(_coord)
-- Place markers on every possible scenery object.
if self.Debug then
local MarkerID=spos:MarkToAll(string.format("%s scenery object %s", self.Controllable:GetName(), SceneryObject:GetTypeName()))
local text=string.format("%s scenery: %s, Coord %s", self.Controllable:GetName(), SceneryObject:GetTypeName(), SceneryObject:GetCoordinate():ToStringLLDMS())
self:T2(SUPPRESSION.id..text)
end
-- Add to table.
table.insert(scenery, {object=SceneryObject, distance=distance})
--SceneryObject:Destroy()
end
end
-- Sort scenery wrt to distance from impact point.
-- local _sort = function(a,b) return a.distance < b.distance end
-- table.sort(scenery,_sort)
-- for _,object in pairs(scenery) do
-- local sobject=object -- Wrapper.Scenery#SCENERY
-- sobject:Destroy()
-- end
]]
end end
--- Route group to a certain point. --- Route group to a certain point.

11
Moose Development/Moose/Functional/CleanUp.lua
View File

@ -52,11 +52,13 @@
-- @module Functional.CleanUp -- @module Functional.CleanUp
-- @image CleanUp_Airbases.JPG -- @image CleanUp_Airbases.JPG
--- @type CLEANUP_AIRBASE.__ Methods which are not intended for mission designers, but which are used interally by the moose designer :-) ---
-- @type CLEANUP_AIRBASE.__ Methods which are not intended for mission designers, but which are used interally by the moose designer :-)
-- @field #map<#string,Wrapper.Airbase#AIRBASE> Airbases Map of Airbases. -- @field #map<#string,Wrapper.Airbase#AIRBASE> Airbases Map of Airbases.
-- @extends Core.Base#BASE -- @extends Core.Base#BASE
--- @type CLEANUP_AIRBASE ---
-- @type CLEANUP_AIRBASE
-- @extends #CLEANUP_AIRBASE.__ -- @extends #CLEANUP_AIRBASE.__
--- Keeps airbases clean, and tries to guarantee continuous airbase operations, even under combat. --- Keeps airbases clean, and tries to guarantee continuous airbase operations, even under combat.
@ -93,7 +95,7 @@ CLEANUP_AIRBASE = {
-- @field #CLEANUP_AIRBASE.__ -- @field #CLEANUP_AIRBASE.__
CLEANUP_AIRBASE.__ = {} CLEANUP_AIRBASE.__ = {}
--- @field #CLEANUP_AIRBASE.__.Airbases -- @field #CLEANUP_AIRBASE.__.Airbases
CLEANUP_AIRBASE.__.Airbases = {} CLEANUP_AIRBASE.__.Airbases = {}
--- Creates the main object which is handling the cleaning of the debris within the given Zone Names. --- Creates the main object which is handling the cleaning of the debris within the given Zone Names.
@ -240,7 +242,8 @@ function CLEANUP_AIRBASE.__:DestroyMissile( MissileObject )
end end
end end
--- @param #CLEANUP_AIRBASE self ---
-- @param #CLEANUP_AIRBASE self
-- @param Core.Event#EVENTDATA EventData -- @param Core.Event#EVENTDATA EventData
function CLEANUP_AIRBASE.__:OnEventBirth( EventData ) function CLEANUP_AIRBASE.__:OnEventBirth( EventData )
self:F( { EventData } ) self:F( { EventData } )

10
Moose Development/Moose/Functional/DetectionZones.lua
View File

@ -4,7 +4,7 @@
do -- DETECTION_ZONES do -- DETECTION_ZONES
--- @type DETECTION_ZONES -- @type DETECTION_ZONES
-- @field DCS#Distance DetectionZoneRange The range till which targets are grouped upon the first detected target. -- @field DCS#Distance DetectionZoneRange The range till which targets are grouped upon the first detected target.
-- @field #DETECTION_BASE.DetectedItems DetectedItems A list of areas containing the set of @{Wrapper.Unit}s, @{Core.Zone}s, the center @{Wrapper.Unit} within the zone, and ID of each area that was detected within a DetectionZoneRange. -- @field #DETECTION_BASE.DetectedItems DetectedItems A list of areas containing the set of @{Wrapper.Unit}s, @{Core.Zone}s, the center @{Wrapper.Unit} within the zone, and ID of each area that was detected within a DetectionZoneRange.
-- @extends Functional.Detection#DETECTION_BASE -- @extends Functional.Detection#DETECTION_BASE
@ -68,7 +68,7 @@ do -- DETECTION_ZONES
return self return self
end end
--- @param #DETECTION_ZONES self -- @param #DETECTION_ZONES self
-- @param #number The amount of alive recce. -- @param #number The amount of alive recce.
function DETECTION_ZONES:CountAliveRecce() function DETECTION_ZONES:CountAliveRecce()
@ -76,7 +76,7 @@ do -- DETECTION_ZONES
end end
--- @param #DETECTION_ZONES self -- @param #DETECTION_ZONES self
function DETECTION_ZONES:ForEachAliveRecce( IteratorFunction, ... ) function DETECTION_ZONES:ForEachAliveRecce( IteratorFunction, ... )
self:F2( arg ) self:F2( arg )
@ -352,7 +352,7 @@ do -- DETECTION_ZONES
--DetectedSet:Flush( self ) --DetectedSet:Flush( self )
DetectedSet:ForEachUnit( DetectedSet:ForEachUnit(
--- @param Wrapper.Unit#UNIT DetectedUnit -- @param Wrapper.Unit#UNIT DetectedUnit
function( DetectedUnit ) function( DetectedUnit )
if DetectedUnit:IsAlive() then if DetectedUnit:IsAlive() then
--self:T( "Detected Set #" .. DetectedItem.ID .. ":" .. DetectedUnit:GetName() ) --self:T( "Detected Set #" .. DetectedItem.ID .. ":" .. DetectedUnit:GetName() )
@ -380,7 +380,7 @@ do -- DETECTION_ZONES
end end
--- @param #DETECTION_ZONES self -- @param #DETECTION_ZONES self
-- @param #string From The From State string. -- @param #string From The From State string.
-- @param #string Event The Event string. -- @param #string Event The Event string.
-- @param #string To The To State string. -- @param #string To The To State string.

2
Moose Development/Moose/Functional/Fox.lua
View File

@ -141,7 +141,7 @@ FOX = {
explosiondist = 200, explosiondist = 200,
explosiondist2 = 500, explosiondist2 = 500,
bigmissilemass = 50, bigmissilemass = 50,
destroy = nil, --destroy = nil,
dt50 = 5, dt50 = 5,
dt10 = 1, dt10 = 1,
dt05 = 0.5, dt05 = 0.5,

36
Moose Development/Moose/Functional/RAT.lua
View File

@ -1,4 +1,4 @@
--- **Functional** - Create random airtraffic in your missions. --- **Functional** - Create random air traffic in your missions.
-- --
-- === -- ===
-- --
@ -179,8 +179,8 @@
-- * Climb rate is set to a moderate value of ~1500 ft/min. -- * Climb rate is set to a moderate value of ~1500 ft/min.
-- * The standard descent rate follows the 3:1 rule, i.e. 1000 ft decent per 3 miles of travel. Hence, angle of descent is ~3.6 degrees. -- * The standard descent rate follows the 3:1 rule, i.e. 1000 ft decent per 3 miles of travel. Hence, angle of descent is ~3.6 degrees.
-- * A holding point is randomly selected at a distance between 5 and 10 km away from destination airport. -- * A holding point is randomly selected at a distance between 5 and 10 km away from destination airport.
-- * The altitude of theholding point is ~1200 m AGL. Holding patterns might or might not happen with variable duration. -- * The altitude of the holding point is ~1200 m AGL. Holding patterns might or might not happen with variable duration.
-- * If an aircraft is spawned in air, the procedure omitts taxi and take-off and starts with the climb/cruising part. -- * If an aircraft is spawned in air, the procedure omits taxi and take-off and starts with the climb/cruising part.
-- * All values are randomized for each spawned aircraft. -- * All values are randomized for each spawned aircraft.
-- --
-- ## Mission Editor Setup -- ## Mission Editor Setup
@ -196,13 +196,13 @@
-- Voilà, your already done! -- Voilà, your already done!
-- --
-- Optionally, you can set a specific livery for the aircraft or give it some weapons. -- Optionally, you can set a specific livery for the aircraft or give it some weapons.
-- However, the aircraft will by default not engage any enemies. Think of them as beeing on a peaceful or ferry mission. -- However, the aircraft will by default not engage any enemies. Think of them as being on a peaceful or ferry mission.
-- --
-- ## Basic Lua Script -- ## Basic Lua Script
-- --
-- ![Process](..\Presentations\RAT\RAT_Basic_Lua_Script.png) -- ![Process](..\Presentations\RAT\RAT_Basic_Lua_Script.png)
-- --
-- The basic Lua script for one template group consits of two simple lines as shown in the picture above. -- The basic Lua script for one template group consists of two simple lines as shown in the picture above.
-- --
-- * **Line 2** creates a new RAT object "yak". The only required parameter for the constructor @{#RAT.New}() is the name of the group as defined in the mission editor. In this example it is "RAT_YAK". -- * **Line 2** creates a new RAT object "yak". The only required parameter for the constructor @{#RAT.New}() is the name of the group as defined in the mission editor. In this example it is "RAT_YAK".
-- * **Line 5** trigger the command to spawn the aircraft. The (optional) parameter for the @{#RAT.Spawn}() function is the number of aircraft to be spawned of this object. -- * **Line 5** trigger the command to spawn the aircraft. The (optional) parameter for the @{#RAT.Spawn}() function is the number of aircraft to be spawned of this object.
@ -216,9 +216,9 @@
-- ## Parking Problems -- ## Parking Problems
-- --
-- One big issue in DCS is that not all aircraft can be spawned on every airport or airbase. In particular, bigger aircraft might not have a valid parking spot at smaller airports and -- One big issue in DCS is that not all aircraft can be spawned on every airport or airbase. In particular, bigger aircraft might not have a valid parking spot at smaller airports and
-- airstripes. This can lead to multiple problems in DCS. -- airstrips. This can lead to multiple problems in DCS.
-- --
-- * Landing: When an aircraft tries to land at an airport where it does not have a valid parking spot, it is immidiately despawned the moment its wheels touch the runway, i.e. -- * Landing: When an aircraft tries to land at an airport where it does not have a valid parking spot, it is immediately despawned the moment its wheels touch the runway, i.e.
-- when a landing event is triggered. This leads to the loss of the RAT aircraft. On possible way to circumvent the this problem is to let another RAT aircraft spawn at landing -- when a landing event is triggered. This leads to the loss of the RAT aircraft. On possible way to circumvent the this problem is to let another RAT aircraft spawn at landing
-- and not when it shuts down its engines. See the @{#RAT.RespawnAfterLanding}() function. -- and not when it shuts down its engines. See the @{#RAT.RespawnAfterLanding}() function.
-- * Spawning: When a big aircraft is dynamically spawned on a small airbase a few things can go wrong. For example, it could be spawned at a parking spot with a shelter. -- * Spawning: When a big aircraft is dynamically spawned on a small airbase a few things can go wrong. For example, it could be spawned at a parking spot with a shelter.
@ -246,9 +246,9 @@
-- c17:Spawn(5) -- c17:Spawn(5)
-- --
-- This would randomly spawn five C-17s but only on airports which have big open air parking spots. Note that also only destination airports are allowed -- This would randomly spawn five C-17s but only on airports which have big open air parking spots. Note that also only destination airports are allowed
-- which do have this type of parking spot. This should ensure that the aircraft is able to land at the destination without beeing despawned immidiately. -- which do have this type of parking spot. This should ensure that the aircraft is able to land at the destination without being despawned immediately.
-- --
-- Also, the aircraft are spawned only on the requested parking spot types and not on any other type. If no parking spot of this type is availabe at the -- Also, the aircraft are spawned only on the requested parking spot types and not on any other type. If no parking spot of this type is available at the
-- moment of spawning, the group is automatically spawned in air above the selected airport. -- moment of spawning, the group is automatically spawned in air above the selected airport.
-- --
-- ## Examples -- ## Examples
@ -274,7 +274,7 @@
-- --
-- It is also possible to make aircraft "commute" between two airports, i.e. flying from airport A to B and then back from B to A, etc. -- It is also possible to make aircraft "commute" between two airports, i.e. flying from airport A to B and then back from B to A, etc.
-- This can be done by the @{#RAT.Commute}() function. Note that if no departure or destination airports are specified, the first departure and destination are chosen randomly. -- This can be done by the @{#RAT.Commute}() function. Note that if no departure or destination airports are specified, the first departure and destination are chosen randomly.
-- Then the aircraft will fly back and forth between those two airports indefinetly. -- Then the aircraft will fly back and forth between those two airports indefinitely.
-- --
-- --
-- ### Spawn in Air -- ### Spawn in Air
@ -302,7 +302,7 @@
-- * @{#RAT.SetTakeoff}("cold"), which means that all aircraft are spawned with their engines off, -- * @{#RAT.SetTakeoff}("cold"), which means that all aircraft are spawned with their engines off,
-- * @{#RAT.SetTakeoff}("hot"), which means that all aircraft are spawned with their engines on, -- * @{#RAT.SetTakeoff}("hot"), which means that all aircraft are spawned with their engines on,
-- * @{#RAT.SetTakeoff}("runway"), which means that all aircraft are spawned already at the runway ready to takeoff. -- * @{#RAT.SetTakeoff}("runway"), which means that all aircraft are spawned already at the runway ready to takeoff.
-- Note that in this case the default spawn intervall is set to 180 seconds in order to avoid aircraft jamms on the runway. Generally, this takeoff at runways should be used with care and problems are to be expected. -- Note that in this case the default spawn intervall is set to 180 seconds in order to avoid aircraft jams on the runway. Generally, this takeoff at runways should be used with care and problems are to be expected.
-- --
-- --
-- The options @{#RAT.SetMinDistance}() and @{#RAT.SetMaxDistance}() can be used to restrict the range from departure to destination. For example -- The options @{#RAT.SetMinDistance}() and @{#RAT.SetMaxDistance}() can be used to restrict the range from departure to destination. For example
@ -325,7 +325,7 @@
-- --
-- * @{#RAT.SetFLcruise}(300) will cause most planes fly around FL300. -- * @{#RAT.SetFLcruise}(300) will cause most planes fly around FL300.
-- * @{#RAT.SetFLmin}(100) restricts the cruising alt such that no plane will fly below FL100. Note that this automatically changes the minimum distance from departure to destination. -- * @{#RAT.SetFLmin}(100) restricts the cruising alt such that no plane will fly below FL100. Note that this automatically changes the minimum distance from departure to destination.
-- That means that only destinations are possible for which the aircraft has had enought time to reach that flight level and descent again. -- That means that only destinations are possible for which the aircraft has had enough time to reach that flight level and descent again.
-- * @{#RAT.SetFLmax}(200) will restrict the cruise alt to maximum FL200, i.e. no aircraft will travel above this height. -- * @{#RAT.SetFLmax}(200) will restrict the cruise alt to maximum FL200, i.e. no aircraft will travel above this height.
-- --
-- --
@ -762,10 +762,10 @@ function RAT:Spawn(naircraft)
-- Set the coalition table based on choice of self.coalition and self.friendly. -- Set the coalition table based on choice of self.coalition and self.friendly.
self:_SetCoalitionTable() self:_SetCoalitionTable()
-- Get all airports of this map beloning to friendly coalition(s). -- Get all airports of this map belonging to friendly coalition(s).
self:_GetAirportsOfCoalition() self:_GetAirportsOfCoalition()
-- Set submenuname if it has not been set by user. -- Set sub-menu name if it has not been set by user.
if not self.SubMenuName then if not self.SubMenuName then
self.SubMenuName=self.alias self.SubMenuName=self.alias
end end
@ -1302,9 +1302,9 @@ end
--- Set name of destination airports or zones for the AI aircraft. --- Set name of destination airports or zones for the AI aircraft.
-- @param #RAT self -- @param #RAT self
-- @param #string destinationnames Name of the destination airport or table of destination airports. -- @param #string destinationnames Name of the destination airport or #table of destination airports.
-- @return #RAT RAT self object. -- @return #RAT RAT self object.
-- @usage RAT:SetDestination("Krymsk") makes all aircraft of this RAT oject fly to Krymsk airport. -- @usage RAT:SetDestination("Krymsk") makes all aircraft of this RAT object fly to Krymsk airport.
function RAT:SetDestination(destinationnames) function RAT:SetDestination(destinationnames)
self:F2(destinationnames) self:F2(destinationnames)
@ -1564,7 +1564,7 @@ function RAT:NoRespawn()
return self return self
end end
--- Number of tries to respawn an aircraft in case it has accitentally been spawned on runway. --- Number of tries to respawn an aircraft in case it has accidentally been spawned on runway.
-- @param #RAT self -- @param #RAT self
-- @param #number n Number of retries. Default is 3. -- @param #number n Number of retries. Default is 3.
-- @return #RAT RAT self object. -- @return #RAT RAT self object.
@ -1621,7 +1621,7 @@ function RAT:RespawnInAirNotAllowed()
return self return self
end end
--- Check if aircraft have accidentally been spawned on the runway. If so they will be removed immediatly. --- Check if aircraft have accidentally been spawned on the runway. If so they will be removed immediately.
-- @param #RAT self -- @param #RAT self
-- @param #boolean switch If true, check is performed. If false, this check is omitted. -- @param #boolean switch If true, check is performed. If false, this check is omitted.
-- @param #number radius Distance in meters until a unit is considered to have spawned accidentally on the runway. Default is 75 m. -- @param #number radius Distance in meters until a unit is considered to have spawned accidentally on the runway. Default is 75 m.

3071
Moose Development/Moose/Functional/Tactics.lua Normal file
View File

File diff suppressed because it is too large Load Diff

9
Moose Development/Moose/Functional/Tiresias.lua
View File

@ -97,7 +97,7 @@
TIRESIAS = { TIRESIAS = {
ClassName = "TIRESIAS", ClassName = "TIRESIAS",
debug = false, debug = false,
version = "0.0.4", version = "0.0.5",
Interval = 20, Interval = 20,
GroundSet = nil, GroundSet = nil,
VehicleSet = nil, VehicleSet = nil,
@ -187,7 +187,7 @@ function TIRESIAS:SetAAARanges(FiringRange,SwitchAAA)
return self return self
end end
--- [USER] Add a SET_GROUP of GROUP objects as exceptions. Can be done multiple times. --- [USER] Add a SET_GROUP of GROUP objects as exceptions. Can be done multiple times. Does **not** work work for GROUP objects spawned into the SET after start, i.e. the groups need to exist in the game already.
-- @param #TIRESIAS self -- @param #TIRESIAS self
-- @param Core.Set#SET_GROUP Set to add to the exception list. -- @param Core.Set#SET_GROUP Set to add to the exception list.
-- @return #TIRESIAS self -- @return #TIRESIAS self
@ -203,7 +203,7 @@ function TIRESIAS:AddExceptionSet(Set)
} }
exceptions:AddGroup(grp,true) exceptions:AddGroup(grp,true)
end end
BASE:I("TIRESIAS: Added exception group: "..grp:GetName()) BASE:T("TIRESIAS: Added exception group: "..grp:GetName())
end end
) )
return self return self
@ -391,6 +391,7 @@ function TIRESIAS:_SwitchOnGroups(group,radius)
if ground:CountAlive() > 0 then if ground:CountAlive() > 0 then
ground:ForEachGroupAlive( ground:ForEachGroupAlive(
function(grp) function(grp)
local name = grp:GetName()
if grp.Tiresias and grp.Tiresias.type and (not grp.Tiresias.exception == true ) then if grp.Tiresias and grp.Tiresias.type and (not grp.Tiresias.exception == true ) then
if grp.Tiresias.invisible == true then if grp.Tiresias.invisible == true then
grp:SetCommandInvisible(false) grp:SetCommandInvisible(false)
@ -407,7 +408,7 @@ function TIRESIAS:_SwitchOnGroups(group,radius)
end end
--BASE:I(string.format("TIRESIAS - Switch on %s %s (Exception %s)",tostring(grp.Tiresias.type),grp:GetName(),tostring(grp.Tiresias.exception))) --BASE:I(string.format("TIRESIAS - Switch on %s %s (Exception %s)",tostring(grp.Tiresias.type),grp:GetName(),tostring(grp.Tiresias.exception)))
else else
BASE:E("TIRESIAS - This group has not been initialized or is an exception!") BASE:T("TIRESIAS - This group "..tostring(name).. " has not been initialized or is an exception!")
end end
end end
) )

16
Moose Development/Moose/Functional/ZoneCaptureCoalition.lua
View File

@ -48,7 +48,7 @@
do -- ZONE_CAPTURE_COALITION do -- ZONE_CAPTURE_COALITION
--- @type ZONE_CAPTURE_COALITION -- @type ZONE_CAPTURE_COALITION
-- @field #string ClassName Name of the class. -- @field #string ClassName Name of the class.
-- @field #number MarkBlue ID of blue F10 mark. -- @field #number MarkBlue ID of blue F10 mark.
-- @field #number MarkRed ID of red F10 mark. -- @field #number MarkRed ID of red F10 mark.
@ -161,7 +161,7 @@ do -- ZONE_CAPTURE_COALITION
-- The mission designer can use these values to alter the logic. -- The mission designer can use these values to alter the logic.
-- For example: -- For example:
-- --
-- --- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION self -- -- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION self
-- function ZoneCaptureCoalition:OnEnterGuarded( From, Event, To ) -- function ZoneCaptureCoalition:OnEnterGuarded( From, Event, To )
-- if From ~= "Empty" then -- if From ~= "Empty" then
-- -- Display a message -- -- Display a message
@ -172,7 +172,7 @@ do -- ZONE_CAPTURE_COALITION
-- --
-- ## Example Event Handler. -- ## Example Event Handler.
-- --
-- --- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION self -- -- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION self
-- function ZoneCaptureCoalition:OnEnterGuarded( From, Event, To ) -- function ZoneCaptureCoalition:OnEnterGuarded( From, Event, To )
-- if From ~= To then -- if From ~= To then
-- local Coalition = self:GetCoalition() -- local Coalition = self:GetCoalition()
@ -273,7 +273,7 @@ do -- ZONE_CAPTURE_COALITION
-- Depending on the zone ownership, different messages are sent. -- Depending on the zone ownership, different messages are sent.
-- Note the methods `ZoneCaptureCoalition:GetZoneName()`. -- Note the methods `ZoneCaptureCoalition:GetZoneName()`.
-- --
-- --- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION self -- -- @param Functional.ZoneCaptureCoalition#ZONE_CAPTURE_COALITION self
-- function ZoneCaptureCoalition:OnEnterGuarded( From, Event, To ) -- function ZoneCaptureCoalition:OnEnterGuarded( From, Event, To )
-- if From ~= To then -- if From ~= To then
-- local Coalition = self:GetCoalition() -- local Coalition = self:GetCoalition()
@ -294,7 +294,7 @@ do -- ZONE_CAPTURE_COALITION
-- Next is the Event Handler when the **Empty** state transition is triggered. -- Next is the Event Handler when the **Empty** state transition is triggered.
-- Now we smoke the ZoneCaptureCoalition with a green color, using `self:Smoke( SMOKECOLOR.Green )`. -- Now we smoke the ZoneCaptureCoalition with a green color, using `self:Smoke( SMOKECOLOR.Green )`.
-- --
-- --- @param Functional.Protect#ZONE_CAPTURE_COALITION self -- -- @param Functional.Protect#ZONE_CAPTURE_COALITION self
-- function ZoneCaptureCoalition:OnEnterEmpty() -- function ZoneCaptureCoalition:OnEnterEmpty()
-- self:Smoke( SMOKECOLOR.Green ) -- self:Smoke( SMOKECOLOR.Green )
-- US_CC:MessageTypeToCoalition( string.format( "%s is unprotected, and can be captured!", ZoneCaptureCoalition:GetZoneName() ), MESSAGE.Type.Information ) -- US_CC:MessageTypeToCoalition( string.format( "%s is unprotected, and can be captured!", ZoneCaptureCoalition:GetZoneName() ), MESSAGE.Type.Information )
@ -304,7 +304,7 @@ do -- ZONE_CAPTURE_COALITION
-- The next Event Handlers speak for itself. -- The next Event Handlers speak for itself.
-- When the zone is Attacked, we smoke the zone white and send some messages to each coalition. -- When the zone is Attacked, we smoke the zone white and send some messages to each coalition.
-- --
-- --- @param Functional.Protect#ZONE_CAPTURE_COALITION self -- -- @param Functional.Protect#ZONE_CAPTURE_COALITION self
-- function ZoneCaptureCoalition:OnEnterAttacked() -- function ZoneCaptureCoalition:OnEnterAttacked()
-- ZoneCaptureCoalition:Smoke( SMOKECOLOR.White ) -- ZoneCaptureCoalition:Smoke( SMOKECOLOR.White )
-- local Coalition = self:GetCoalition() -- local Coalition = self:GetCoalition()
@ -321,7 +321,7 @@ do -- ZONE_CAPTURE_COALITION
-- When the zone is Captured, we send some victory or loss messages to the correct coalition. -- When the zone is Captured, we send some victory or loss messages to the correct coalition.
-- And we add some score. -- And we add some score.
-- --
-- --- @param Functional.Protect#ZONE_CAPTURE_COALITION self -- -- @param Functional.Protect#ZONE_CAPTURE_COALITION self
-- function ZoneCaptureCoalition:OnEnterCaptured() -- function ZoneCaptureCoalition:OnEnterCaptured()
-- local Coalition = self:GetCoalition() -- local Coalition = self:GetCoalition()
-- self:E({Coalition = Coalition}) -- self:E({Coalition = Coalition})
@ -641,7 +641,7 @@ do -- ZONE_CAPTURE_COALITION
-- --
-- @usage -- @usage
-- -- For example, one could stop the monitoring when the zone was captured! -- -- For example, one could stop the monitoring when the zone was captured!
-- --- @param Functional.Protect#ZONE_CAPTURE_COALITION self -- -- @param Functional.Protect#ZONE_CAPTURE_COALITION self
-- function ZoneCaptureCoalition:OnEnterCaptured() -- function ZoneCaptureCoalition:OnEnterCaptured()
-- local Coalition = self:GetCoalition() -- local Coalition = self:GetCoalition()
-- self:E({Coalition = Coalition}) -- self:E({Coalition = Coalition})

4
Moose Development/Moose/Functional/ZoneGoal.lua
View File

@ -17,7 +17,7 @@
do -- Zone do -- Zone
--- @type ZONE_GOAL -- @type ZONE_GOAL
-- @field #string ClassName Name of the class. -- @field #string ClassName Name of the class.
-- @field Core.Goal#GOAL Goal The goal object. -- @field Core.Goal#GOAL Goal The goal object.
-- @field #number SmokeTime Time stamp in seconds when the last smoke of the zone was triggered. -- @field #number SmokeTime Time stamp in seconds when the last smoke of the zone was triggered.
@ -178,7 +178,7 @@ do -- Zone
end end
--- @param #ZONE_GOAL self -- @param #ZONE_GOAL self
-- @param Core.Event#EVENTDATA EventData Event data table. -- @param Core.Event#EVENTDATA EventData Event data table.
function ZONE_GOAL:__Destroyed( EventData ) function ZONE_GOAL:__Destroyed( EventData )
self:F( { "EventDead", EventData } ) self:F( { "EventDead", EventData } )

4
Moose Development/Moose/Functional/ZoneGoalCargo.lua
View File

@ -21,7 +21,7 @@
do -- ZoneGoal do -- ZoneGoal
--- @type ZONE_GOAL_CARGO -- @type ZONE_GOAL_CARGO
-- @extends Functional.ZoneGoal#ZONE_GOAL -- @extends Functional.ZoneGoal#ZONE_GOAL
@ -55,7 +55,7 @@ do -- ZoneGoal
ClassName = "ZONE_GOAL_CARGO", ClassName = "ZONE_GOAL_CARGO",
} }
--- @field #table ZONE_GOAL_CARGO.States -- @field #table ZONE_GOAL_CARGO.States
ZONE_GOAL_CARGO.States = {} ZONE_GOAL_CARGO.States = {}
--- ZONE_GOAL_CARGO Constructor. --- ZONE_GOAL_CARGO Constructor.

4
Moose Development/Moose/Functional/ZoneGoalCoalition.lua
View File

@ -16,7 +16,7 @@
do -- ZoneGoal do -- ZoneGoal
--- @type ZONE_GOAL_COALITION -- @type ZONE_GOAL_COALITION
-- @field #string ClassName Name of the Class. -- @field #string ClassName Name of the Class.
-- @field #number Coalition The current coalition ID of the zone owner. -- @field #number Coalition The current coalition ID of the zone owner.
-- @field #number PreviousCoalition The previous owner of the zone. -- @field #number PreviousCoalition The previous owner of the zone.
@ -48,7 +48,7 @@ do -- ZoneGoal
ObjectCategories = nil, ObjectCategories = nil,
} }
--- @field #table ZONE_GOAL_COALITION.States -- @field #table ZONE_GOAL_COALITION.States
ZONE_GOAL_COALITION.States = {} ZONE_GOAL_COALITION.States = {}
--- ZONE_GOAL_COALITION Constructor. --- ZONE_GOAL_COALITION Constructor.

3
Moose Development/Moose/Modules.lua
View File

@ -2,7 +2,7 @@ __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Enums.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Utils.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Utils.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Profiler.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Profiler.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Templates.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Templates.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/STTS.lua' ) --__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/STTS.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/FiFo.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/FiFo.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Socket.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Socket.lua' )
@ -84,7 +84,6 @@ __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Autolase.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneGoalCargo.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneGoalCargo.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Tiresias.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Tiresias.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Stratego.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Stratego.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ClientWatch.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Airboss.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Airboss.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/RecoveryTanker.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/RecoveryTanker.lua' )

18
Moose Development/Moose/Modules_local.lua
View File

@ -1,9 +1,7 @@
__Moose.Include( 'Utilities\\Enums.lua' ) __Moose.Include( 'Utilities\\Enums.lua' )
__Moose.Include( 'Utilities\\Routines.lua' )
__Moose.Include( 'Utilities\\Utils.lua' ) __Moose.Include( 'Utilities\\Utils.lua' )
__Moose.Include( 'Utilities\\Profiler.lua' ) __Moose.Include( 'Utilities\\Profiler.lua' )
__Moose.Include( 'Utilities\\Templates.lua' ) --__Moose.Include( 'Utilities\\STTS.lua' )
__Moose.Include( 'Utilities\\STTS.lua' )
__Moose.Include( 'Utilities\\FiFo.lua' ) __Moose.Include( 'Utilities\\FiFo.lua' )
__Moose.Include( 'Utilities\\Socket.lua' ) __Moose.Include( 'Utilities\\Socket.lua' )
@ -17,11 +15,11 @@ __Moose.Include( 'Core\\Event.lua' )
__Moose.Include( 'Core\\Settings.lua' ) __Moose.Include( 'Core\\Settings.lua' )
__Moose.Include( 'Core\\Menu.lua' ) __Moose.Include( 'Core\\Menu.lua' )
__Moose.Include( 'Core\\Zone.lua' ) __Moose.Include( 'Core\\Zone.lua' )
__Moose.Include( 'Core\\Zone_Detection.lua' ) __Moose.Include( 'Core\\Velocity.lua' )
__Moose.Include( 'Core\\Database.lua' ) __Moose.Include( 'Core\\Database.lua' )
__Moose.Include( 'Core\\Set.lua' ) __Moose.Include( 'Core\\Set.lua' )
__Moose.Include( 'Core\\Point.lua' ) __Moose.Include( 'Core\\Point.lua' )
__Moose.Include( 'Core\\Velocity.lua' ) __Moose.Include( 'Core\\Pathline.lua' )
__Moose.Include( 'Core\\Message.lua' ) __Moose.Include( 'Core\\Message.lua' )
__Moose.Include( 'Core\\Fsm.lua' ) __Moose.Include( 'Core\\Fsm.lua' )
__Moose.Include( 'Core\\Spawn.lua' ) __Moose.Include( 'Core\\Spawn.lua' )
@ -46,6 +44,9 @@ __Moose.Include( 'Wrapper\\Static.lua' )
__Moose.Include( 'Wrapper\\Airbase.lua' ) __Moose.Include( 'Wrapper\\Airbase.lua' )
__Moose.Include( 'Wrapper\\Scenery.lua' ) __Moose.Include( 'Wrapper\\Scenery.lua' )
__Moose.Include( 'Wrapper\\Marker.lua' ) __Moose.Include( 'Wrapper\\Marker.lua' )
__Moose.Include( 'Wrapper\\Net.lua' )
__Moose.Include( 'Wrapper\\Weapon.lua' )
__Moose.Include( 'Wrapper\\Storage.lua' )
__Moose.Include( 'Cargo\\Cargo.lua' ) __Moose.Include( 'Cargo\\Cargo.lua' )
__Moose.Include( 'Cargo\\CargoUnit.lua' ) __Moose.Include( 'Cargo\\CargoUnit.lua' )
@ -77,7 +78,9 @@ __Moose.Include( 'Functional\\Mantis.lua' )
__Moose.Include( 'Functional\\Shorad.lua' ) __Moose.Include( 'Functional\\Shorad.lua' )
__Moose.Include( 'Functional\\Autolase.lua' ) __Moose.Include( 'Functional\\Autolase.lua' )
__Moose.Include( 'Functional\\AICSAR.lua' ) __Moose.Include( 'Functional\\AICSAR.lua' )
__Moose.Include( 'Functional\\ClientWatch.lua' ) __Moose.Include( 'Functional\\AmmoTruck.lua' )
__Moose.Include( 'Functional\\Tiresias.lua' )
__Moose.Include( 'Functional\\Stratego.lua' )
__Moose.Include( 'Ops\\Airboss.lua' ) __Moose.Include( 'Ops\\Airboss.lua' )
__Moose.Include( 'Ops\\RecoveryTanker.lua' ) __Moose.Include( 'Ops\\RecoveryTanker.lua' )
@ -108,6 +111,9 @@ __Moose.Include( 'Ops\\Awacs.lua' )
__Moose.Include( 'Ops\\PlayerTask.lua' ) __Moose.Include( 'Ops\\PlayerTask.lua' )
__Moose.Include( 'Ops\\Operation.lua' ) __Moose.Include( 'Ops\\Operation.lua' )
__Moose.Include( 'Ops\\FlightControl.lua' ) __Moose.Include( 'Ops\\FlightControl.lua' )
__Moose.Include( 'Ops\\PlayerRecce.lua' )
__Moose.Include( 'Ops\\EasyGCICAP.lua' )
__Moose.Include( 'Ops\\EasyA2G.lua' )
__Moose.Include( 'AI\\AI_Balancer.lua' ) __Moose.Include( 'AI\\AI_Balancer.lua' )
__Moose.Include( 'AI\\AI_Air.lua' ) __Moose.Include( 'AI\\AI_Air.lua' )

1
Moose Development/Moose/Ops/Airboss.lua
View File

@ -3623,6 +3623,7 @@ function AIRBOSS:onafterStart( From, Event, To )
self:HandleEvent( EVENTS.PlayerLeaveUnit, self._PlayerLeft ) self:HandleEvent( EVENTS.PlayerLeaveUnit, self._PlayerLeft )
self:HandleEvent( EVENTS.MissionEnd ) self:HandleEvent( EVENTS.MissionEnd )
self:HandleEvent( EVENTS.RemoveUnit ) self:HandleEvent( EVENTS.RemoveUnit )
self:HandleEvent( EVENTS.UnitLost, self.OnEventRemoveUnit )
-- self.StatusScheduler=SCHEDULER:New(self) -- self.StatusScheduler=SCHEDULER:New(self)
-- self.StatusScheduler:Schedule(self, self._Status, {}, 1, 0.5) -- self.StatusScheduler:Schedule(self, self._Status, {}, 1, 0.5)

1
Moose Development/Moose/Ops/ArmyGroup.lua
View File

@ -403,6 +403,7 @@ function ARMYGROUP:New(group)
self:HandleEvent(EVENTS.Birth, self.OnEventBirth) self:HandleEvent(EVENTS.Birth, self.OnEventBirth)
self:HandleEvent(EVENTS.Dead, self.OnEventDead) self:HandleEvent(EVENTS.Dead, self.OnEventDead)
self:HandleEvent(EVENTS.RemoveUnit, self.OnEventRemoveUnit) self:HandleEvent(EVENTS.RemoveUnit, self.OnEventRemoveUnit)
self:HandleEvent(EVENTS.UnitLost, self.OnEventRemoveUnit)
self:HandleEvent(EVENTS.Hit, self.OnEventHit) self:HandleEvent(EVENTS.Hit, self.OnEventHit)
-- Start the status monitoring. -- Start the status monitoring.

4
Moose Development/Moose/Ops/Awacs.lua
View File

@ -17,7 +17,7 @@
-- === -- ===
-- --
-- ### Author: **applevangelist** -- ### Author: **applevangelist**
-- @date Last Update Jan 2024 -- @date Last Update July 2024
-- @module Ops.AWACS -- @module Ops.AWACS
-- @image OPS_AWACS.jpg -- @image OPS_AWACS.jpg
@ -935,7 +935,7 @@ AWACS.TaskStatus = {
--@field #boolean FromAI --@field #boolean FromAI
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- TODO-List 0.2.53 -- TODO-List 0.2.54
------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-- --
-- DONE - WIP - Player tasking, VID -- DONE - WIP - Player tasking, VID

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

@ -163,7 +163,7 @@
-- --
-- Will at a strategic zone with importance 2. -- Will at a strategic zone with importance 2.
-- --
-- If the zone is currently owned by another coalition and enemy ground troops are present in the zone, a CAS and an ARTY mission are lauchned: -- If the zone is currently owned by another coalition and enemy ground troops are present in the zone, a CAS and an ARTY mission are launched:
-- --
-- * A mission of type `AUFTRAG.Type.CASENHANCED` is started if assets are available that can carry out this mission type. -- * A mission of type `AUFTRAG.Type.CASENHANCED` is started if assets are available that can carry out this mission type.
-- * A mission of type `AUFTRAG.Type.ARTY` is started provided assets are available. -- * A mission of type `AUFTRAG.Type.ARTY` is started provided assets are available.

1
Moose Development/Moose/Ops/Cohort.lua
View File

@ -1009,6 +1009,7 @@ function COHORT:CanMission(Mission)
if Mission.refuelSystem and Mission.refuelSystem==self.tankerSystem then if Mission.refuelSystem and Mission.refuelSystem==self.tankerSystem then
-- Correct refueling system. -- Correct refueling system.
self:T(self.lid..string.format("INFO: Correct refueling system requested=%s != %s=available", tostring(Mission.refuelSystem), tostring(self.tankerSystem)))
else else
self:T(self.lid..string.format("INFO: Wrong refueling system requested=%s != %s=available", tostring(Mission.refuelSystem), tostring(self.tankerSystem))) self:T(self.lid..string.format("INFO: Wrong refueling system requested=%s != %s=available", tostring(Mission.refuelSystem), tostring(self.tankerSystem)))
return false return false

1510
Moose Development/Moose/Ops/EasyA2G.lua Normal file
View File

File diff suppressed because it is too large Load Diff

1
Moose Development/Moose/Ops/NavyGroup.lua
View File

@ -395,6 +395,7 @@ function NAVYGROUP:New(group)
self:HandleEvent(EVENTS.Birth, self.OnEventBirth) self:HandleEvent(EVENTS.Birth, self.OnEventBirth)
self:HandleEvent(EVENTS.Dead, self.OnEventDead) self:HandleEvent(EVENTS.Dead, self.OnEventDead)
self:HandleEvent(EVENTS.RemoveUnit, self.OnEventRemoveUnit) self:HandleEvent(EVENTS.RemoveUnit, self.OnEventRemoveUnit)
self:HandleEvent(EVENTS.UnitLost, self.OnEventRemoveUnit)
-- Start the status monitoring. -- Start the status monitoring.
self.timerStatus=TIMER:New(self.Status, self):Start(1, 30) self.timerStatus=TIMER:New(self.Status, self):Start(1, 30)

7
Moose Development/Moose/Sound/SRS.lua
View File

@ -1238,7 +1238,7 @@ function MSRS:PlayTextExt(Text, Delay, Frequencies, Modulations, Gender, Culture
self:T({Text, Delay, Frequencies, Modulations, Gender, Culture, Voice, Volume, Label, Coordinate} ) self:T({Text, Delay, Frequencies, Modulations, Gender, Culture, Voice, Volume, Label, Coordinate} )
if Delay and Delay>0 then if Delay and Delay>0 then
self:ScheduleOnce(Delay, MSRS.PlayTextExt, self, Text, 0, Frequencies, Modulations, Gender, Culture, Voice, Volume, Label, Coordinate) self:ScheduleOnce(Delay, self.PlayTextExt, self, Text, 0, Frequencies, Modulations, Gender, Culture, Voice, Volume, Label, Coordinate)
else else
Frequencies = Frequencies or self:GetFrequencies() Frequencies = Frequencies or self:GetFrequencies()
@ -1560,8 +1560,8 @@ end
function MSRS:_DCSgRPCtts(Text, Frequencies, Gender, Culture, Voice, Volume, Label, Coordinate) function MSRS:_DCSgRPCtts(Text, Frequencies, Gender, Culture, Voice, Volume, Label, Coordinate)
-- Debug info. -- Debug info.
self:F("MSRS_BACKEND_DCSGRPC:_DCSgRPCtts()") self:T("MSRS_BACKEND_DCSGRPC:_DCSgRPCtts()")
self:F({Text, Frequencies, Gender, Culture, Voice, Volume, Label, Coordinate}) self:T({Text, Frequencies, Gender, Culture, Voice, Volume, Label, Coordinate})
local options = {} -- #MSRS.GRPCOptions local options = {} -- #MSRS.GRPCOptions
@ -1587,7 +1587,6 @@ function MSRS:_DCSgRPCtts(Text, Frequencies, Gender, Culture, Voice, Volume, Lab
-- Provider (win, gcloud, ...) -- Provider (win, gcloud, ...)
local provider = self.provider or MSRS.Provider.WINDOWS local provider = self.provider or MSRS.Provider.WINDOWS
self:F({provider=provider})
-- Provider options: voice, credentials -- Provider options: voice, credentials
options.provider = {} options.provider = {}

6
Moose Development/Moose/Sound/SoundOutput.lua
View File

@ -24,7 +24,7 @@
do -- Sound Base do -- Sound Base
--- @type SOUNDBASE -- @type SOUNDBASE
-- @field #string ClassName Name of the class. -- @field #string ClassName Name of the class.
-- @extends Core.Base#BASE -- @extends Core.Base#BASE
@ -100,7 +100,7 @@ end
do -- Sound File do -- Sound File
--- @type SOUNDFILE -- @type SOUNDFILE
-- @field #string ClassName Name of the class -- @field #string ClassName Name of the class
-- @field #string filename Name of the flag. -- @field #string filename Name of the flag.
-- @field #string path Directory path, where the sound file is located. This includes the final slash "/". -- @field #string path Directory path, where the sound file is located. This includes the final slash "/".
@ -292,7 +292,7 @@ end
do -- Text-To-Speech do -- Text-To-Speech
--- @type SOUNDTEXT -- @type SOUNDTEXT
-- @field #string ClassName Name of the class -- @field #string ClassName Name of the class
-- @field #string text Text to speak. -- @field #string text Text to speak.
-- @field #number duration Duration in seconds. -- @field #number duration Duration in seconds.

2
Moose Development/Moose/Sound/UserSound.lua
View File

@ -21,7 +21,7 @@
do -- UserSound do -- UserSound
--- @type USERSOUND -- @type USERSOUND
-- @extends Core.Base#BASE -- @extends Core.Base#BASE

13
Moose Development/Moose/Tasking/CommandCenter.lua
View File

@ -181,7 +181,8 @@ COMMANDCENTER = {
} }
--- @type COMMANDCENTER.AutoAssignMethods ---
-- @type COMMANDCENTER.AutoAssignMethods
COMMANDCENTER.AutoAssignMethods = { COMMANDCENTER.AutoAssignMethods = {
["Random"] = 1, ["Random"] = 1,
["Distance"] = 2, ["Distance"] = 2,
@ -210,7 +211,7 @@ function COMMANDCENTER:New( CommandCenterPositionable, CommandCenterName )
self:SetMessageDuration(10) self:SetMessageDuration(10)
self:HandleEvent( EVENTS.Birth, self:HandleEvent( EVENTS.Birth,
--- @param #COMMANDCENTER self -- @param #COMMANDCENTER self
-- @param Core.Event#EVENTDATA EventData -- @param Core.Event#EVENTDATA EventData
function( self, EventData ) function( self, EventData )
if EventData.IniObjectCategory == 1 then if EventData.IniObjectCategory == 1 then
@ -241,7 +242,7 @@ function COMMANDCENTER:New( CommandCenterPositionable, CommandCenterName )
-- -- - Assign the PlayerUnit to the Task if required. -- -- - Assign the PlayerUnit to the Task if required.
-- -- - Send a message to the other players in the group that this player has joined. -- -- - Send a message to the other players in the group that this player has joined.
-- self:HandleEvent( EVENTS.PlayerEnterUnit, -- self:HandleEvent( EVENTS.PlayerEnterUnit,
-- --- @param #COMMANDCENTER self -- -- @param #COMMANDCENTER self
-- -- @param Core.Event#EVENTDATA EventData -- -- @param Core.Event#EVENTDATA EventData
-- function( self, EventData ) -- function( self, EventData )
-- local PlayerUnit = EventData.IniUnit -- local PlayerUnit = EventData.IniUnit
@ -258,7 +259,7 @@ function COMMANDCENTER:New( CommandCenterPositionable, CommandCenterName )
-- The PlayerUnit will be UnAssigned from the Task. -- The PlayerUnit will be UnAssigned from the Task.
-- When there is no Unit left running the Task, the Task goes into Abort... -- When there is no Unit left running the Task, the Task goes into Abort...
self:HandleEvent( EVENTS.MissionEnd, self:HandleEvent( EVENTS.MissionEnd,
--- @param #TASK self -- @param #TASK self
-- @param Core.Event#EVENTDATA EventData -- @param Core.Event#EVENTDATA EventData
function( self, EventData ) function( self, EventData )
local PlayerUnit = EventData.IniUnit local PlayerUnit = EventData.IniUnit
@ -273,7 +274,7 @@ function COMMANDCENTER:New( CommandCenterPositionable, CommandCenterName )
-- The PlayerUnit will be UnAssigned from the Task. -- The PlayerUnit will be UnAssigned from the Task.
-- When there is no Unit left running the Task, the Task goes into Abort... -- When there is no Unit left running the Task, the Task goes into Abort...
self:HandleEvent( EVENTS.PlayerLeaveUnit, self:HandleEvent( EVENTS.PlayerLeaveUnit,
--- @param #TASK self -- @param #TASK self
-- @param Core.Event#EVENTDATA EventData -- @param Core.Event#EVENTDATA EventData
function( self, EventData ) function( self, EventData )
local PlayerUnit = EventData.IniUnit local PlayerUnit = EventData.IniUnit
@ -290,7 +291,7 @@ function COMMANDCENTER:New( CommandCenterPositionable, CommandCenterName )
-- The PlayerUnit will be UnAssigned from the Task. -- The PlayerUnit will be UnAssigned from the Task.
-- When there is no Unit left running the Task, the Task goes into Abort... -- When there is no Unit left running the Task, the Task goes into Abort...
self:HandleEvent( EVENTS.Crash, self:HandleEvent( EVENTS.Crash,
--- @param #TASK self -- @param #TASK self
-- @param Core.Event#EVENTDATA EventData -- @param Core.Event#EVENTDATA EventData
function( self, EventData ) function( self, EventData )
local PlayerUnit = EventData.IniUnit local PlayerUnit = EventData.IniUnit

4
Moose Development/Moose/Tasking/DetectionManager.lua
View File

@ -48,7 +48,7 @@
do -- DETECTION MANAGER do -- DETECTION MANAGER
--- @type DETECTION_MANAGER -- @type DETECTION_MANAGER
-- @field Core.Set#SET_GROUP SetGroup The groups to which the FAC will report to. -- @field Core.Set#SET_GROUP SetGroup The groups to which the FAC will report to.
-- @field Functional.Detection#DETECTION_BASE Detection The DETECTION_BASE object that is used to report the detected objects. -- @field Functional.Detection#DETECTION_BASE Detection The DETECTION_BASE object that is used to report the detected objects.
-- @field Tasking.CommandCenter#COMMANDCENTER CC The command center that is used to communicate with the players. -- @field Tasking.CommandCenter#COMMANDCENTER CC The command center that is used to communicate with the players.
@ -62,7 +62,7 @@ do -- DETECTION MANAGER
Detection = nil, Detection = nil,
} }
--- @field Tasking.CommandCenter#COMMANDCENTER -- @field Tasking.CommandCenter#COMMANDCENTER
DETECTION_MANAGER.CC = nil DETECTION_MANAGER.CC = nil
--- FAC constructor. --- FAC constructor.

15
Moose Development/Moose/Tasking/Mission.lua
View File

@ -19,7 +19,8 @@
-- @module Tasking.Mission -- @module Tasking.Mission
-- @image Task_Mission.JPG -- @image Task_Mission.JPG
--- @type MISSION ---
-- @type MISSION
-- @field #MISSION.Clients _Clients -- @field #MISSION.Clients _Clients
-- @field Core.Menu#MENU_COALITION MissionMenu -- @field Core.Menu#MENU_COALITION MissionMenu
-- @field #string MissionBriefing -- @field #string MissionBriefing
@ -790,7 +791,7 @@ function MISSION:HasGroup( TaskGroup )
return Has return Has
end end
--- @param #MISSION self -- @param #MISSION self
-- @return #number -- @return #number
function MISSION:GetTasksRemaining() function MISSION:GetTasksRemaining()
-- Determine how many tasks are remaining. -- Determine how many tasks are remaining.
@ -805,7 +806,7 @@ function MISSION:GetTasksRemaining()
return TasksRemaining return TasksRemaining
end end
--- @param #MISSION self -- @param #MISSION self
-- @return #number -- @return #number
function MISSION:GetTaskTypes() function MISSION:GetTaskTypes()
-- Determine how many tasks are remaining. -- Determine how many tasks are remaining.
@ -865,7 +866,7 @@ end
---- - <xx> Aborted Tasks (xp) ---- - <xx> Aborted Tasks (xp)
---- - <xx> Failed Tasks (xp) ---- - <xx> Failed Tasks (xp)
---- ----
---- @param #MISSION self -- @param #MISSION self
---- @return #string ---- @return #string
--function MISSION:ReportSummary() --function MISSION:ReportSummary()
-- --
@ -1175,7 +1176,7 @@ end
--- @param #MISSION self -- @param #MISSION self
-- @param #string TaskStatus The status -- @param #string TaskStatus The status
-- @param Wrapper.Group#GROUP ReportGroup -- @param Wrapper.Group#GROUP ReportGroup
function MISSION:MenuReportTasksPerStatus( ReportGroup, TaskStatus ) function MISSION:MenuReportTasksPerStatus( ReportGroup, TaskStatus )
@ -1186,7 +1187,7 @@ function MISSION:MenuReportTasksPerStatus( ReportGroup, TaskStatus )
end end
--- @param #MISSION self -- @param #MISSION self
-- @param Wrapper.Group#GROUP ReportGroup -- @param Wrapper.Group#GROUP ReportGroup
function MISSION:MenuReportPlayersPerTask( ReportGroup ) function MISSION:MenuReportPlayersPerTask( ReportGroup )
@ -1195,7 +1196,7 @@ function MISSION:MenuReportPlayersPerTask( ReportGroup )
self:GetCommandCenter():MessageTypeToGroup( Report, ReportGroup, MESSAGE.Type.Overview ) self:GetCommandCenter():MessageTypeToGroup( Report, ReportGroup, MESSAGE.Type.Overview )
end end
--- @param #MISSION self -- @param #MISSION self
-- @param Wrapper.Group#GROUP ReportGroup -- @param Wrapper.Group#GROUP ReportGroup
function MISSION:MenuReportPlayersProgress( ReportGroup ) function MISSION:MenuReportPlayersProgress( ReportGroup )

11
Moose Development/Moose/Tasking/Task.lua
View File

@ -220,7 +220,8 @@
-- @module Tasking.Task -- @module Tasking.Task
-- @image MOOSE.JPG -- @image MOOSE.JPG
--- @type TASK ---
-- @type TASK
-- @field Core.Scheduler#SCHEDULER TaskScheduler -- @field Core.Scheduler#SCHEDULER TaskScheduler
-- @field Tasking.Mission#MISSION Mission -- @field Tasking.Mission#MISSION Mission
-- @field Core.Set#SET_GROUP SetGroup The Set of Groups assigned to the Task -- @field Core.Set#SET_GROUP SetGroup The Set of Groups assigned to the Task
@ -726,7 +727,7 @@ function TASK:AddGroups( GroupSet )
GroupSet = GroupSet or SET_GROUP:New() GroupSet = GroupSet or SET_GROUP:New()
self.SetGroup:ForEachGroup( self.SetGroup:ForEachGroup(
--- @param Wrapper.Group#GROUP GroupSet -- @param Wrapper.Group#GROUP GroupSet
function( GroupItem ) function( GroupItem )
GroupSet:Add( GroupItem:GetName(), GroupItem) GroupSet:Add( GroupItem:GetName(), GroupItem)
end end
@ -819,7 +820,7 @@ end
do -- Group Assignment do -- Group Assignment
--- @param #TASK self -- @param #TASK self
-- @param Actions.Act_Assign#ACT_ASSIGN AcceptClass -- @param Actions.Act_Assign#ACT_ASSIGN AcceptClass
function TASK:SetAssignMethod( AcceptClass ) function TASK:SetAssignMethod( AcceptClass )
@ -1199,7 +1200,7 @@ function TASK:RemoveAssignedMenuForGroup( TaskGroup )
end end
--- @param #TASK self -- @param #TASK self
-- @param Wrapper.Group#GROUP TaskGroup -- @param Wrapper.Group#GROUP TaskGroup
function TASK:MenuAssignToGroup( TaskGroup ) function TASK:MenuAssignToGroup( TaskGroup )
@ -1208,7 +1209,7 @@ function TASK:MenuAssignToGroup( TaskGroup )
self:AssignToGroup( TaskGroup ) self:AssignToGroup( TaskGroup )
end end
--- @param #TASK self -- @param #TASK self
-- @param Wrapper.Group#GROUP TaskGroup -- @param Wrapper.Group#GROUP TaskGroup
function TASK:MenuMarkToGroup( TaskGroup ) function TASK:MenuMarkToGroup( TaskGroup )
self:F() self:F()

8
Moose Development/Moose/Tasking/TaskInfo.lua
View File

@ -11,7 +11,8 @@
-- @module Tasking.TaskInfo -- @module Tasking.TaskInfo
-- @image MOOSE.JPG -- @image MOOSE.JPG
--- @type TASKINFO ---
-- @type TASKINFO
-- @extends Core.Base#BASE -- @extends Core.Base#BASE
--- ---
@ -29,7 +30,8 @@ TASKINFO = {
ClassName = "TASKINFO", ClassName = "TASKINFO",
} }
--- @type TASKINFO.Detail #string A string that flags to document which level of detail needs to be shown in the report. ---
-- @type TASKINFO.Detail #string A string that flags to document which level of detail needs to be shown in the report.
-- --
-- - "M" for Markings on the Map (F10). -- - "M" for Markings on the Map (F10).
-- - "S" for Summary Reports. -- - "S" for Summary Reports.
@ -279,7 +281,7 @@ function TASKINFO:AddCargoSet( SetCargo, Order, Detail, Keep )
local CargoReport = REPORT:New() local CargoReport = REPORT:New()
CargoReport:Add( "" ) CargoReport:Add( "" )
SetCargo:ForEachCargo( SetCargo:ForEachCargo(
--- @param Cargo.Cargo#CARGO Cargo -- @param Cargo.Cargo#CARGO Cargo
function( Cargo ) function( Cargo )
CargoReport:Add( string.format( ' - %s (%s) %s - status %s ', Cargo:GetName(), Cargo:GetType(), Cargo:GetTransportationMethod(), Cargo:GetCurrentState() ) ) CargoReport:Add( string.format( ' - %s (%s) %s - status %s ', Cargo:GetName(), Cargo:GetType(), Cargo:GetTransportationMethod(), Cargo:GetCurrentState() ) )
end end

24
Moose Development/Moose/Tasking/Task_A2A.lua
View File

@ -173,19 +173,19 @@ do -- TASK_A2A
end end
--- @param #TASK_A2A self -- @param #TASK_A2A self
-- @param Core.Set#SET_UNIT TargetSetUnit The set of targets. -- @param Core.Set#SET_UNIT TargetSetUnit The set of targets.
function TASK_A2A:SetTargetSetUnit( TargetSetUnit ) function TASK_A2A:SetTargetSetUnit( TargetSetUnit )
self.TargetSetUnit = TargetSetUnit self.TargetSetUnit = TargetSetUnit
end end
--- @param #TASK_A2A self -- @param #TASK_A2A self
function TASK_A2A:GetPlannedMenuText() function TASK_A2A:GetPlannedMenuText()
return self:GetStateString() .. " - " .. self:GetTaskName() .. " ( " .. self.TargetSetUnit:GetUnitTypesText() .. " )" return self:GetStateString() .. " - " .. self:GetTaskName() .. " ( " .. self.TargetSetUnit:GetUnitTypesText() .. " )"
end end
--- @param #TASK_A2A self -- @param #TASK_A2A self
-- @param Core.Point#COORDINATE RendezVousCoordinate The Coordinate object referencing to the 2D point where the RendezVous point is located on the map. -- @param Core.Point#COORDINATE RendezVousCoordinate The Coordinate object referencing to the 2D point where the RendezVous point is located on the map.
-- @param #number RendezVousRange The RendezVousRange that defines when the player is considered to have arrived at the RendezVous point. -- @param #number RendezVousRange The RendezVousRange that defines when the player is considered to have arrived at the RendezVous point.
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
@ -198,7 +198,7 @@ do -- TASK_A2A
ActRouteRendezVous:SetRange( RendezVousRange ) ActRouteRendezVous:SetRange( RendezVousRange )
end end
--- @param #TASK_A2A self -- @param #TASK_A2A self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @return Core.Point#COORDINATE The Coordinate object referencing to the 2D point where the RendezVous point is located on the map. -- @return Core.Point#COORDINATE The Coordinate object referencing to the 2D point where the RendezVous point is located on the map.
-- @return #number The RendezVousRange that defines when the player is considered to have arrived at the RendezVous point. -- @return #number The RendezVousRange that defines when the player is considered to have arrived at the RendezVous point.
@ -210,7 +210,7 @@ do -- TASK_A2A
return ActRouteRendezVous:GetCoordinate(), ActRouteRendezVous:GetRange() return ActRouteRendezVous:GetCoordinate(), ActRouteRendezVous:GetRange()
end end
--- @param #TASK_A2A self -- @param #TASK_A2A self
-- @param Core.Zone#ZONE_BASE RendezVousZone The Zone object where the RendezVous is located on the map. -- @param Core.Zone#ZONE_BASE RendezVousZone The Zone object where the RendezVous is located on the map.
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
function TASK_A2A:SetRendezVousZone( RendezVousZone, TaskUnit ) function TASK_A2A:SetRendezVousZone( RendezVousZone, TaskUnit )
@ -221,7 +221,7 @@ do -- TASK_A2A
ActRouteRendezVous:SetZone( RendezVousZone ) ActRouteRendezVous:SetZone( RendezVousZone )
end end
--- @param #TASK_A2A self -- @param #TASK_A2A self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @return Core.Zone#ZONE_BASE The Zone object where the RendezVous is located on the map. -- @return Core.Zone#ZONE_BASE The Zone object where the RendezVous is located on the map.
function TASK_A2A:GetRendezVousZone( TaskUnit ) function TASK_A2A:GetRendezVousZone( TaskUnit )
@ -232,7 +232,7 @@ do -- TASK_A2A
return ActRouteRendezVous:GetZone() return ActRouteRendezVous:GetZone()
end end
--- @param #TASK_A2A self -- @param #TASK_A2A self
-- @param Core.Point#COORDINATE TargetCoordinate The Coordinate object where the Target is located on the map. -- @param Core.Point#COORDINATE TargetCoordinate The Coordinate object where the Target is located on the map.
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
function TASK_A2A:SetTargetCoordinate( TargetCoordinate, TaskUnit ) function TASK_A2A:SetTargetCoordinate( TargetCoordinate, TaskUnit )
@ -243,7 +243,7 @@ do -- TASK_A2A
ActRouteTarget:SetCoordinate( TargetCoordinate ) ActRouteTarget:SetCoordinate( TargetCoordinate )
end end
--- @param #TASK_A2A self -- @param #TASK_A2A self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @return Core.Point#COORDINATE The Coordinate object where the Target is located on the map. -- @return Core.Point#COORDINATE The Coordinate object where the Target is located on the map.
function TASK_A2A:GetTargetCoordinate( TaskUnit ) function TASK_A2A:GetTargetCoordinate( TaskUnit )
@ -254,7 +254,7 @@ do -- TASK_A2A
return ActRouteTarget:GetCoordinate() return ActRouteTarget:GetCoordinate()
end end
--- @param #TASK_A2A self -- @param #TASK_A2A self
-- @param Core.Zone#ZONE_BASE TargetZone The Zone object where the Target is located on the map. -- @param Core.Zone#ZONE_BASE TargetZone The Zone object where the Target is located on the map.
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
function TASK_A2A:SetTargetZone( TargetZone, Altitude, Heading, TaskUnit ) function TASK_A2A:SetTargetZone( TargetZone, Altitude, Heading, TaskUnit )
@ -265,7 +265,7 @@ do -- TASK_A2A
ActRouteTarget:SetZone( TargetZone, Altitude, Heading ) ActRouteTarget:SetZone( TargetZone, Altitude, Heading )
end end
--- @param #TASK_A2A self -- @param #TASK_A2A self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @return Core.Zone#ZONE_BASE The Zone object where the Target is located on the map. -- @return Core.Zone#ZONE_BASE The Zone object where the Target is located on the map.
function TASK_A2A:GetTargetZone( TaskUnit ) function TASK_A2A:GetTargetZone( TaskUnit )
@ -309,7 +309,7 @@ do -- TASK_A2A
self:__Goal( -10 ) self:__Goal( -10 )
end end
--- @param #TASK_A2A self -- @param #TASK_A2A self
function TASK_A2A:UpdateTaskInfo( DetectedItem ) function TASK_A2A:UpdateTaskInfo( DetectedItem )
if self:IsStatePlanned() or self:IsStateAssigned() then if self:IsStatePlanned() or self:IsStateAssigned() then
@ -501,7 +501,7 @@ do -- TASK_A2A_SWEEP
return self return self
end end
--- @param #TASK_A2A_SWEEP self -- @param #TASK_A2A_SWEEP self
function TASK_A2A_SWEEP:onafterGoal( TaskUnit, From, Event, To ) function TASK_A2A_SWEEP:onafterGoal( TaskUnit, From, Event, To )
local TargetSetUnit = self.TargetSetUnit -- Core.Set#SET_UNIT local TargetSetUnit = self.TargetSetUnit -- Core.Set#SET_UNIT

2
Moose Development/Moose/Tasking/Task_A2A_Dispatcher.lua
View File

@ -148,7 +148,7 @@ do -- TASK_A2A_DISPATCHER
-- --
-- TaskDispatcher = TASK_A2A_DISPATCHER:New( ... ) -- TaskDispatcher = TASK_A2A_DISPATCHER:New( ... )
-- --
-- --- @param #TaskDispatcher self -- -- @param #TaskDispatcher self
-- -- @param #string From Contains the name of the state from where the Event was triggered. -- -- @param #string From Contains the name of the state from where the Event was triggered.
-- -- @param #string Event Contains the name of the event that was triggered. In this case Assign. -- -- @param #string Event Contains the name of the event that was triggered. In this case Assign.
-- -- @param #string To Contains the name of the state that will be transitioned to. -- -- @param #string To Contains the name of the state that will be transitioned to.

50
Moose Development/Moose/Tasking/Task_CARGO.lua
View File

@ -409,7 +409,7 @@
do -- TASK_CARGO do -- TASK_CARGO
--- @type TASK_CARGO -- @type TASK_CARGO
-- @extends Tasking.Task#TASK -- @extends Tasking.Task#TASK
--- Model tasks for players to transport Cargo. --- Model tasks for players to transport Cargo.
@ -620,7 +620,7 @@ do -- TASK_CARGO
Fsm:AddTransition( "Rejected", "Reject", "Aborted" ) Fsm:AddTransition( "Rejected", "Reject", "Aborted" )
Fsm:AddTransition( "Failed", "Fail", "Failed" ) Fsm:AddTransition( "Failed", "Fail", "Failed" )
---- @param #FSM_PROCESS self -- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @param #TASK_CARGO Task -- @param #TASK_CARGO Task
function Fsm:OnAfterAssigned( TaskUnit, Task ) function Fsm:OnAfterAssigned( TaskUnit, Task )
@ -643,7 +643,7 @@ do -- TASK_CARGO
Task.SetCargo:ForEachCargo( Task.SetCargo:ForEachCargo(
--- @param Cargo.Cargo#CARGO Cargo -- @param Cargo.Cargo#CARGO Cargo
function( Cargo ) function( Cargo )
if Cargo:IsAlive() then if Cargo:IsAlive() then
@ -837,7 +837,7 @@ do -- TASK_CARGO
--#Wrapper.Unit#UNIT --#Wrapper.Unit#UNIT
--- @param #FSM_PROCESS self -- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task -- @param Tasking.Task_Cargo#TASK_CARGO Task
-- @param From -- @param From
@ -857,7 +857,7 @@ do -- TASK_CARGO
--- @param #FSM_PROCESS self -- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task -- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterArriveAtPickup( TaskUnit, Task ) function Fsm:onafterArriveAtPickup( TaskUnit, Task )
@ -873,7 +873,7 @@ do -- TASK_CARGO
end end
--- @param #FSM_PROCESS self -- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task -- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterCancelRouteToPickup( TaskUnit, Task ) function Fsm:onafterCancelRouteToPickup( TaskUnit, Task )
@ -884,7 +884,7 @@ do -- TASK_CARGO
end end
--- @param #FSM_PROCESS self -- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
function Fsm:onafterRouteToDeploy( TaskUnit, Task, From, Event, To, DeployZone ) function Fsm:onafterRouteToDeploy( TaskUnit, Task, From, Event, To, DeployZone )
self:F( { TaskUnit = TaskUnit, Task = Task and Task:GetClassNameAndID() } ) self:F( { TaskUnit = TaskUnit, Task = Task and Task:GetClassNameAndID() } )
@ -896,7 +896,7 @@ do -- TASK_CARGO
end end
--- @param #FSM_PROCESS self -- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task -- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterArriveAtDeploy( TaskUnit, Task ) function Fsm:onafterArriveAtDeploy( TaskUnit, Task )
@ -911,7 +911,7 @@ do -- TASK_CARGO
end end
--- @param #FSM_PROCESS self -- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task -- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterCancelRouteToDeploy( TaskUnit, Task ) function Fsm:onafterCancelRouteToDeploy( TaskUnit, Task )
@ -923,7 +923,7 @@ do -- TASK_CARGO
--- @param #FSM_PROCESS self -- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task -- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterLand( TaskUnit, Task, From, Event, To, Action ) function Fsm:onafterLand( TaskUnit, Task, From, Event, To, Action )
@ -958,7 +958,7 @@ do -- TASK_CARGO
end end
end end
--- @param #FSM_PROCESS self -- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task -- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterLanded( TaskUnit, Task, From, Event, To, Action ) function Fsm:onafterLanded( TaskUnit, Task, From, Event, To, Action )
@ -991,7 +991,7 @@ do -- TASK_CARGO
end end
end end
--- @param #FSM_PROCESS self -- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task -- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterPrepareBoarding( TaskUnit, Task, From, Event, To, Cargo ) function Fsm:onafterPrepareBoarding( TaskUnit, Task, From, Event, To, Cargo )
@ -1003,7 +1003,7 @@ do -- TASK_CARGO
end end
--- @param #FSM_PROCESS self -- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task -- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterBoard( TaskUnit, Task, From, Event, To, Cargo ) function Fsm:onafterBoard( TaskUnit, Task, From, Event, To, Cargo )
@ -1031,7 +1031,7 @@ do -- TASK_CARGO
end end
--- @param #FSM_PROCESS self -- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task -- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterBoarded( TaskUnit, Task, From, Event, To, Cargo ) function Fsm:onafterBoarded( TaskUnit, Task, From, Event, To, Cargo )
@ -1046,7 +1046,7 @@ do -- TASK_CARGO
end end
--- @param #FSM_PROCESS self -- @param #FSM_PROCESS self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @param Tasking.Task_Cargo#TASK_CARGO Task -- @param Tasking.Task_Cargo#TASK_CARGO Task
function Fsm:onafterLoad( TaskUnit, Task, From, Event, To, Cargo ) function Fsm:onafterLoad( TaskUnit, Task, From, Event, To, Cargo )
@ -1195,26 +1195,26 @@ do -- TASK_CARGO
return self.SmokeColor return self.SmokeColor
end end
--- @param #TASK_CARGO self -- @param #TASK_CARGO self
function TASK_CARGO:GetPlannedMenuText() function TASK_CARGO:GetPlannedMenuText()
return self:GetStateString() .. " - " .. self:GetTaskName() .. " ( " .. self.TargetSetUnit:GetUnitTypesText() .. " )" return self:GetStateString() .. " - " .. self:GetTaskName() .. " ( " .. self.TargetSetUnit:GetUnitTypesText() .. " )"
end end
--- @param #TASK_CARGO self -- @param #TASK_CARGO self
-- @return Core.Set#SET_CARGO The Cargo Set. -- @return Core.Set#SET_CARGO The Cargo Set.
function TASK_CARGO:GetCargoSet() function TASK_CARGO:GetCargoSet()
return self.SetCargo return self.SetCargo
end end
--- @param #TASK_CARGO self -- @param #TASK_CARGO self
-- @return #list<Core.Zone#ZONE_BASE> The Deployment Zones. -- @return #list<Core.Zone#ZONE_BASE> The Deployment Zones.
function TASK_CARGO:GetDeployZones() function TASK_CARGO:GetDeployZones()
return self.DeployZones return self.DeployZones
end end
--- @param #TASK_CARGO self -- @param #TASK_CARGO self
-- @param AI.AI_Cargo#AI_CARGO Cargo The cargo. -- @param AI.AI_Cargo#AI_CARGO Cargo The cargo.
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @return #TASK_CARGO -- @return #TASK_CARGO
@ -1237,7 +1237,7 @@ do -- TASK_CARGO
end end
--- @param #TASK_CARGO self -- @param #TASK_CARGO self
-- @param Core.Zone#ZONE DeployZone -- @param Core.Zone#ZONE DeployZone
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @return #TASK_CARGO -- @return #TASK_CARGO
@ -1258,7 +1258,7 @@ do -- TASK_CARGO
end end
--- @param #TASK_CARGO self -- @param #TASK_CARGO self
-- @param Core.Zone#ZONE DeployZone -- @param Core.Zone#ZONE DeployZone
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @return #TASK_CARGO -- @return #TASK_CARGO
@ -1269,7 +1269,7 @@ do -- TASK_CARGO
return self return self
end end
--- @param #TASK_CARGO self -- @param #TASK_CARGO self
-- @param Core.Zone#ZONE DeployZone -- @param Core.Zone#ZONE DeployZone
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @return #TASK_CARGO -- @return #TASK_CARGO
@ -1280,7 +1280,7 @@ do -- TASK_CARGO
return self return self
end end
--- @param #TASK_CARGO self -- @param #TASK_CARGO self
-- @param #list<Core.Zone#ZONE> DeployZones -- @param #list<Core.Zone#ZONE> DeployZones
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @return #TASK_CARGO -- @return #TASK_CARGO
@ -1295,7 +1295,7 @@ do -- TASK_CARGO
--- @param #TASK_CARGO self -- @param #TASK_CARGO self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @return Core.Zone#ZONE_BASE The Zone object where the Target is located on the map. -- @return Core.Zone#ZONE_BASE The Zone object where the Target is located on the map.
function TASK_CARGO:GetTargetZone( TaskUnit ) function TASK_CARGO:GetTargetZone( TaskUnit )
@ -1364,7 +1364,7 @@ do -- TASK_CARGO
return self.GoalTotal return self.GoalTotal
end end
--- @param #TASK_CARGO self -- @param #TASK_CARGO self
function TASK_CARGO:UpdateTaskInfo() function TASK_CARGO:UpdateTaskInfo()
if self:IsStatePlanned() or self:IsStateAssigned() then if self:IsStatePlanned() or self:IsStateAssigned() then

2
Moose Development/Moose/Tasking/Task_Capture_Dispatcher.lua
View File

@ -69,7 +69,7 @@ do -- TASK_CAPTURE_DISPATCHER
-- @extends Tasking.Task_Manager#TASK_MANAGER -- @extends Tasking.Task_Manager#TASK_MANAGER
-- @field TASK_CAPTURE_DISPATCHER.ZONE ZONE -- @field TASK_CAPTURE_DISPATCHER.ZONE ZONE
--- @type TASK_CAPTURE_DISPATCHER.CSAR -- @type TASK_CAPTURE_DISPATCHER.CSAR
-- @field Wrapper.Unit#UNIT PilotUnit -- @field Wrapper.Unit#UNIT PilotUnit
-- @field Tasking.Task#TASK Task -- @field Tasking.Task#TASK Task

10
Moose Development/Moose/Tasking/Task_Capture_Zone.lua
View File

@ -119,7 +119,7 @@ do -- TASK_ZONE_GOAL
end end
--- @param #TASK_ZONE_GOAL self -- @param #TASK_ZONE_GOAL self
-- @param Functional.ZoneGoal#ZONE_GOAL ZoneGoal The ZoneGoal Engine. -- @param Functional.ZoneGoal#ZONE_GOAL ZoneGoal The ZoneGoal Engine.
function TASK_ZONE_GOAL:SetProtect( ZoneGoal ) function TASK_ZONE_GOAL:SetProtect( ZoneGoal )
@ -128,13 +128,13 @@ do -- TASK_ZONE_GOAL
--- @param #TASK_ZONE_GOAL self -- @param #TASK_ZONE_GOAL self
function TASK_ZONE_GOAL:GetPlannedMenuText() function TASK_ZONE_GOAL:GetPlannedMenuText()
return self:GetStateString() .. " - " .. self:GetTaskName() .. " ( " .. self.ZoneGoal:GetZoneName() .. " )" return self:GetStateString() .. " - " .. self:GetTaskName() .. " ( " .. self.ZoneGoal:GetZoneName() .. " )"
end end
--- @param #TASK_ZONE_GOAL self -- @param #TASK_ZONE_GOAL self
-- @param Core.Zone#ZONE_BASE TargetZone The Zone object where the Target is located on the map. -- @param Core.Zone#ZONE_BASE TargetZone The Zone object where the Target is located on the map.
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
function TASK_ZONE_GOAL:SetTargetZone( TargetZone, TaskUnit ) function TASK_ZONE_GOAL:SetTargetZone( TargetZone, TaskUnit )
@ -146,7 +146,7 @@ do -- TASK_ZONE_GOAL
end end
--- @param #TASK_ZONE_GOAL self -- @param #TASK_ZONE_GOAL self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
-- @return Core.Zone#ZONE_BASE The Zone object where the Target is located on the map. -- @return Core.Zone#ZONE_BASE The Zone object where the Target is located on the map.
function TASK_ZONE_GOAL:GetTargetZone( TaskUnit ) function TASK_ZONE_GOAL:GetTargetZone( TaskUnit )
@ -286,7 +286,7 @@ do -- TASK_CAPTURE_ZONE
end end
--- @param #TASK_CAPTURE_ZONE self -- @param #TASK_CAPTURE_ZONE self
-- @param Wrapper.Unit#UNIT TaskUnit -- @param Wrapper.Unit#UNIT TaskUnit
function TASK_CAPTURE_ZONE:OnAfterGoal( From, Event, To, PlayerUnit, PlayerName ) function TASK_CAPTURE_ZONE:OnAfterGoal( From, Event, To, PlayerUnit, PlayerName )

4
Moose Development/Moose/Tasking/Task_Cargo_CSAR.lua
View File

@ -72,8 +72,8 @@
do -- TASK_CARGO_CSAR do -- TASK_CARGO_CSAR
--- @type TASK_CARGO_CSAR -- @type TASK_CARGO_CSAR
-- @extends Tasking.Task_CARGO#TASK_CARGO -- @extends Tasking.Task_Cargo#TASK_CARGO
--- Orchestrates the task for players to execute CSAR for downed pilots. --- Orchestrates the task for players to execute CSAR for downed pilots.
-- --

2
Moose Development/Moose/Tasking/Task_Cargo_Dispatcher.lua
View File

@ -77,7 +77,7 @@ do -- TASK_CARGO_DISPATCHER
-- @field TASK_CARGO_DISPATCHER.CSAR CSAR -- @field TASK_CARGO_DISPATCHER.CSAR CSAR
-- @field Core.Set#SET_ZONE SetZonesCSAR -- @field Core.Set#SET_ZONE SetZonesCSAR
--- @type TASK_CARGO_DISPATCHER.CSAR -- @type TASK_CARGO_DISPATCHER.CSAR
-- @field Wrapper.Unit#UNIT PilotUnit -- @field Wrapper.Unit#UNIT PilotUnit
-- @field Tasking.Task#TASK Task -- @field Tasking.Task#TASK Task

4
Moose Development/Moose/Tasking/Task_Cargo_Transport.lua
View File

@ -285,7 +285,7 @@ do -- TASK_CARGO_TRANSPORT
local CargoReport = REPORT:New( "Transport Cargo. The following cargo needs to be transported including initial positions:") local CargoReport = REPORT:New( "Transport Cargo. The following cargo needs to be transported including initial positions:")
SetCargo:ForEachCargo( SetCargo:ForEachCargo(
--- @param Core.Cargo#CARGO Cargo -- @param Core.Cargo#CARGO Cargo
function( Cargo ) function( Cargo )
local CargoType = Cargo:GetType() local CargoType = Cargo:GetType()
local CargoName = Cargo:GetName() local CargoName = Cargo:GetName()
@ -348,7 +348,7 @@ do -- TASK_CARGO_TRANSPORT
return CargoDeployed return CargoDeployed
end end
--- @param #TASK_CARGO_TRANSPORT self -- @param #TASK_CARGO_TRANSPORT self
function TASK_CARGO_TRANSPORT:onafterGoal( TaskUnit, From, Event, To ) function TASK_CARGO_TRANSPORT:onafterGoal( TaskUnit, From, Event, To )
local CargoSet = self.CargoSet local CargoSet = self.CargoSet

2
Moose Development/Moose/Wrapper/Positionable.lua
View File

@ -671,7 +671,7 @@ function POSITIONABLE:GetBoundingRadius( MinDist )
return math.max( math.max( CX, CZ ), boxmin ) return math.max( math.max( CX, CZ ), boxmin )
end end
BASE:E( { "Cannot GetBoundingRadius", Positionable = self, Alive = self:IsAlive() } ) BASE:T( { "Cannot GetBoundingRadius", Positionable = self, Alive = self:IsAlive() } )
return nil return nil
end end

71
Moose Setup/Moose.files
View File

@ -2,7 +2,6 @@ Utilities/Enums.lua
Utilities/Utils.lua Utilities/Utils.lua
Utilities/Enums.lua Utilities/Enums.lua
Utilities/Profiler.lua Utilities/Profiler.lua
Utilities/Templates.lua
Utilities/STTS.lua Utilities/STTS.lua
Utilities/FiFo.lua Utilities/FiFo.lua
Utilities/Socket.lua Utilities/Socket.lua
@ -17,19 +16,17 @@ Core/Event.lua
Core/Settings.lua Core/Settings.lua
Core/Menu.lua Core/Menu.lua
Core/Zone.lua Core/Zone.lua
Core/Zone_Detection.lua
Core/Database.lua Core/Database.lua
Core/Set.lua Core/Set.lua
Core/Point.lua Core/Point.lua
Core/Velocity.lua
Core/Message.lua Core/Message.lua
Core/Fsm.lua Core/Fsm.lua
Core/Spawn.lua Core/Spawn.lua
Core/SpawnStatic.lua Core/SpawnStatic.lua
Core/Timer.lua Core/Timer.lua
Core/Goal.lua
Core/Spot.lua Core/Spot.lua
Core/TextAndSound.lua Core/MarkerOps_Base.lua
Core/Astar.lua
Core/Condition.lua Core/Condition.lua
Core/Pathline.lua Core/Pathline.lua
Core/ClientMenu.lua Core/ClientMenu.lua
@ -51,26 +48,17 @@ Wrapper/Weapon.lua
Wrapper/Net.lua Wrapper/Net.lua
Wrapper/Storage.lua Wrapper/Storage.lua
Cargo/Cargo.lua
Cargo/CargoUnit.lua
Cargo/CargoSlingload.lua
Cargo/CargoCrate.lua
Cargo/CargoGroup.lua
Functional/Scoring.lua Functional/Scoring.lua
Functional/CleanUp.lua Functional/CleanUp.lua
Functional/Movement.lua Functional/Movement.lua
Functional/Sead.lua Functional/Sead.lua
Functional/Escort.lua Functional/Escort.lua
Functional/MissileTrainer.lua
Functional/ATC_Ground.lua Functional/ATC_Ground.lua
Functional/Detection.lua Functional/Detection.lua
Functional/DetectionZones.lua Functional/DetectionZones.lua
Functional/Designate.lua Functional/Designate.lua
Functional/RAT.lua Functional/RAT.lua
Functional/Range.lua Functional/Range.lua
Functional/ZoneGoal.lua
Functional/ZoneGoalCoalition.lua
Functional/ZoneCaptureCoalition.lua Functional/ZoneCaptureCoalition.lua
Functional/Artillery.lua Functional/Artillery.lua
Functional/Suppression.lua Functional/Suppression.lua
@ -85,7 +73,6 @@ Functional/AmmoTruck.lua
Functional/ZoneGoalCargo.lua Functional/ZoneGoalCargo.lua
Functional/Tiresias.lua Functional/Tiresias.lua
Functional/Stratego.lua Functional/Stratego.lua
Functional/ClientWatch.lua
Ops/Airboss.lua Ops/Airboss.lua
Ops/RecoveryTanker.lua Ops/RecoveryTanker.lua
@ -119,43 +106,6 @@ Ops/ArmyGroup.lua
Ops/OpsTransport.lua Ops/OpsTransport.lua
Ops/Target.lua Ops/Target.lua
AI/AI_Balancer.lua
AI/AI_Air.lua
AI/AI_Air_Patrol.lua
AI/AI_Air_Engage.lua
AI/AI_A2A_Patrol.lua
AI/AI_A2A_Cap.lua
AI/AI_A2A_Gci.lua
AI/AI_A2A_Dispatcher.lua
AI/AI_A2G_BAI.lua
AI/AI_A2G_CAS.lua
AI/AI_A2G_SEAD.lua
AI/AI_A2G_Dispatcher.lua
AI/AI_Patrol.lua
AI/AI_CAP.lua
AI/AI_CAS.lua
AI/AI_BAI.lua
AI/AI_Formation.lua
AI/AI_Escort.lua
AI/AI_Escort_Request.lua
AI/AI_Escort_Dispatcher.lua
AI/AI_Escort_Dispatcher_Request.lua
AI/AI_Cargo.lua
AI/AI_Cargo_APC.lua
AI/AI_Cargo_Helicopter.lua
AI/AI_Cargo_Airplane.lua
AI/AI_Cargo_Ship.lua
AI/AI_Cargo_Dispatcher.lua
AI/AI_Cargo_Dispatcher_APC.lua
AI/AI_Cargo_Dispatcher_Helicopter.lua
AI/AI_Cargo_Dispatcher_Airplane.lua
AI/AI_Cargo_Dispatcher_Ship.lua
Actions/Act_Assign.lua
Actions/Act_Route.lua
Actions/Act_Account.lua
Actions/Act_Assist.lua
Sound/UserSound.lua Sound/UserSound.lua
Sound/SoundOutput.lua Sound/SoundOutput.lua
Sound/Radio.lua Sound/Radio.lua
@ -163,21 +113,4 @@ Sound/RadioQueue.lua
Sound/RadioSpeech.lua Sound/RadioSpeech.lua
Sound/SRS.lua Sound/SRS.lua
Tasking/CommandCenter.lua
Tasking/Mission.lua
Tasking/Task.lua
Tasking/TaskInfo.lua
Tasking/Task_Manager.lua
Tasking/DetectionManager.lua
Tasking/Task_A2G_Dispatcher.lua
Tasking/Task_A2G.lua
Tasking/Task_A2A_Dispatcher.lua
Tasking/Task_A2A.lua
Tasking/Task_CARGO.lua
Tasking/Task_Cargo_Transport.lua
Tasking/Task_Cargo_CSAR.lua
Tasking/Task_Cargo_Dispatcher.lua
Tasking/Task_Capture_Zone.lua
Tasking/Task_Capture_Dispatcher.lua
Globals.lua Globals.lua

2
Moose Setup/Moose_Create.lua
View File

@ -1,4 +1,4 @@
-- This routine is called from the LDT environment to create the Moose.lua file stub for use in .miz files. --- This routine is called from the LDT environment to create the Moose.lua file stub for use in .miz files.
local MooseDynamicStatic = arg[1] local MooseDynamicStatic = arg[1]
local MooseCommitHash = arg[2] local MooseCommitHash = arg[2]