diff --git a/Moose Development/Moose/Escort.lua b/Moose Development/Moose/Escort.lua index 430456d7e..69247c56e 100644 --- a/Moose Development/Moose/Escort.lua +++ b/Moose Development/Moose/Escort.lua @@ -164,6 +164,7 @@ ESCORT = { -- @param Client#CLIENT EscortClient The client escorted by the EscortGroup. -- @param Group#GROUP EscortGroup The group AI escorting the EscortClient. -- @param #string EscortName Name of the escort. +-- @param #string EscortBriefing A text showing the ESCORT briefing to the player. Note that if no EscortBriefing is provided, the default briefing will be shown. -- @return #ESCORT self -- @usage -- -- Declare a new EscortPlanes object as follows: @@ -201,12 +202,18 @@ function ESCORT:New( EscortClient, EscortGroup, EscortName, EscortBriefing ) self.EscortGroup:OptionROTVertical() self.EscortGroup:OptionROEOpenFire() - - EscortGroup:MessageToClient( EscortGroup:GetCategoryName() .. " '" .. EscortName .. "' (" .. EscortGroup:GetCallsign() .. ") reporting! " .. - "We're escorting your flight. " .. - "Use the Radio Menu and F10 and use the options under + " .. EscortName .. "\n", - 60, EscortClient - ) + + if not EscortBriefing then + EscortGroup:MessageToClient( EscortGroup:GetCategoryName() .. " '" .. EscortName .. "' (" .. EscortGroup:GetCallsign() .. ") reporting! " .. + "We're escorting your flight. " .. + "Use the Radio Menu and F10 and use the options under + " .. EscortName .. "\n", + 60, EscortClient + ) + else + EscortGroup:MessageToClient( EscortGroup:GetCategoryName() .. " '" .. EscortName .. "' (" .. EscortGroup:GetCallsign() .. ") " .. EscortBriefing, + 60, EscortClient + ) + end self.FollowDistance = 100 self.CT1 = 0 diff --git a/Moose Development/Release Notes/2016-07 - ReleaseNotes.txt b/Moose Development/Release Notes/2016-07 - ReleaseNotes.txt index 381b2087c..9a0830a54 100644 --- a/Moose Development/Release Notes/2016-07 - ReleaseNotes.txt +++ b/Moose Development/Release Notes/2016-07 - ReleaseNotes.txt @@ -1,3 +1,7 @@ +2016-08-08 + - Added briefing to method ESCORT:New() + -- If no EscortBriefing is given, the New() method will show the default briefing. + 2016-08-06 - Made PointVec3 and Vec3, PointVec2 and Vec2 terminology used in the code consistent. -- Replaced method PointVec3() to Vec3() where the code manages a Vec3. Replaced all references to the method. diff --git a/Moose Training/Documentation/AIBalancer.html b/Moose Training/Documentation/AIBalancer.html index 7ed6c3bd6..8156c7979 100644 --- a/Moose Training/Documentation/AIBalancer.html +++ b/Moose Training/Documentation/AIBalancer.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Airbase.html b/Moose Training/Documentation/Airbase.html index 0634cdcf1..d9f76684b 100644 --- a/Moose Training/Documentation/Airbase.html +++ b/Moose Training/Documentation/Airbase.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/AirbasePolice.html b/Moose Training/Documentation/AirbasePolice.html index d5553bc79..605a5ca32 100644 --- a/Moose Training/Documentation/AirbasePolice.html +++ b/Moose Training/Documentation/AirbasePolice.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Base.html b/Moose Training/Documentation/Base.html index d605c47e1..540c75fb0 100644 --- a/Moose Training/Documentation/Base.html +++ b/Moose Training/Documentation/Base.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/CARGO.html b/Moose Training/Documentation/CARGO.html index d50e38429..1d3d81148 100644 --- a/Moose Training/Documentation/CARGO.html +++ b/Moose Training/Documentation/CARGO.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/CleanUp.html b/Moose Training/Documentation/CleanUp.html index 67f35845f..e5f550022 100644 --- a/Moose Training/Documentation/CleanUp.html +++ b/Moose Training/Documentation/CleanUp.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Client.html b/Moose Training/Documentation/Client.html index ab23da747..a08d10616 100644 --- a/Moose Training/Documentation/Client.html +++ b/Moose Training/Documentation/Client.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Controllable.html b/Moose Training/Documentation/Controllable.html index bfcc6e019..7f96fa9df 100644 --- a/Moose Training/Documentation/Controllable.html +++ b/Moose Training/Documentation/Controllable.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DCSAirbase.html b/Moose Training/Documentation/DCSAirbase.html index f8af8efaa..4bc1c0852 100644 --- a/Moose Training/Documentation/DCSAirbase.html +++ b/Moose Training/Documentation/DCSAirbase.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DCSCoalitionObject.html b/Moose Training/Documentation/DCSCoalitionObject.html index da6b30e85..d1d2320bb 100644 --- a/Moose Training/Documentation/DCSCoalitionObject.html +++ b/Moose Training/Documentation/DCSCoalitionObject.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DCSCommand.html b/Moose Training/Documentation/DCSCommand.html index 11eb9a2ea..502cfb87a 100644 --- a/Moose Training/Documentation/DCSCommand.html +++ b/Moose Training/Documentation/DCSCommand.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DCSController.html b/Moose Training/Documentation/DCSController.html index 367d2d2e0..ea2375308 100644 --- a/Moose Training/Documentation/DCSController.html +++ b/Moose Training/Documentation/DCSController.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DCSGroup.html b/Moose Training/Documentation/DCSGroup.html index 6b0b65d7a..f6aa319e1 100644 --- a/Moose Training/Documentation/DCSGroup.html +++ b/Moose Training/Documentation/DCSGroup.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DCSObject.html b/Moose Training/Documentation/DCSObject.html index 37d749eb5..4f5ee1296 100644 --- a/Moose Training/Documentation/DCSObject.html +++ b/Moose Training/Documentation/DCSObject.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DCSTask.html b/Moose Training/Documentation/DCSTask.html index 231e7ebfe..f4343d13f 100644 --- a/Moose Training/Documentation/DCSTask.html +++ b/Moose Training/Documentation/DCSTask.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DCSTypes.html b/Moose Training/Documentation/DCSTypes.html index 6dbbf21fa..fd10c177b 100644 --- a/Moose Training/Documentation/DCSTypes.html +++ b/Moose Training/Documentation/DCSTypes.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DCSUnit.html b/Moose Training/Documentation/DCSUnit.html index fbf5ea56b..204d96266 100644 --- a/Moose Training/Documentation/DCSUnit.html +++ b/Moose Training/Documentation/DCSUnit.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DCSWorld.html b/Moose Training/Documentation/DCSWorld.html index 23b8fa947..25ee094bb 100644 --- a/Moose Training/Documentation/DCSWorld.html +++ b/Moose Training/Documentation/DCSWorld.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DCScountry.html b/Moose Training/Documentation/DCScountry.html index 9411bf740..5a5ace5bf 100644 --- a/Moose Training/Documentation/DCScountry.html +++ b/Moose Training/Documentation/DCScountry.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DCStimer.html b/Moose Training/Documentation/DCStimer.html index 63fc547b3..de1e7f2b8 100644 --- a/Moose Training/Documentation/DCStimer.html +++ b/Moose Training/Documentation/DCStimer.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DCStrigger.html b/Moose Training/Documentation/DCStrigger.html index 2183b03dc..04a04b872 100644 --- a/Moose Training/Documentation/DCStrigger.html +++ b/Moose Training/Documentation/DCStrigger.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DEPLOYTASK.html b/Moose Training/Documentation/DEPLOYTASK.html index ddbc204f1..5c973ed5c 100644 --- a/Moose Training/Documentation/DEPLOYTASK.html +++ b/Moose Training/Documentation/DEPLOYTASK.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DESTROYBASETASK.html b/Moose Training/Documentation/DESTROYBASETASK.html index 173d3f91b..ee3c47701 100644 --- a/Moose Training/Documentation/DESTROYBASETASK.html +++ b/Moose Training/Documentation/DESTROYBASETASK.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DESTROYGROUPSTASK.html b/Moose Training/Documentation/DESTROYGROUPSTASK.html index 2417d2285..ca9eb410b 100644 --- a/Moose Training/Documentation/DESTROYGROUPSTASK.html +++ b/Moose Training/Documentation/DESTROYGROUPSTASK.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DESTROYRADARSTASK.html b/Moose Training/Documentation/DESTROYRADARSTASK.html index 749065ff8..cfebdc772 100644 --- a/Moose Training/Documentation/DESTROYRADARSTASK.html +++ b/Moose Training/Documentation/DESTROYRADARSTASK.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DESTROYUNITTYPESTASK.html b/Moose Training/Documentation/DESTROYUNITTYPESTASK.html index 58820d538..d274e9902 100644 --- a/Moose Training/Documentation/DESTROYUNITTYPESTASK.html +++ b/Moose Training/Documentation/DESTROYUNITTYPESTASK.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Database.html b/Moose Training/Documentation/Database.html index 3e99e8ef1..a59f00200 100644 --- a/Moose Training/Documentation/Database.html +++ b/Moose Training/Documentation/Database.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Detection.html b/Moose Training/Documentation/Detection.html index 9637e8b1a..46b899586 100644 --- a/Moose Training/Documentation/Detection.html +++ b/Moose Training/Documentation/Detection.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/DetectionManager.html b/Moose Training/Documentation/DetectionManager.html index d121d9b22..73fe107e3 100644 --- a/Moose Training/Documentation/DetectionManager.html +++ b/Moose Training/Documentation/DetectionManager.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Escort.html b/Moose Training/Documentation/Escort.html index 427054cf2..87b3c0f5c 100644 --- a/Moose Training/Documentation/Escort.html +++ b/Moose Training/Documentation/Escort.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • @@ -1849,7 +1849,8 @@ Name of the escort.

  • -

    EscortBriefing :

    +

    #string EscortBriefing : +A text showing the ESCORT briefing to the player. Note that if no EscortBriefing is provided, the default briefing will be shown.

  • diff --git a/Moose Training/Documentation/Event.html b/Moose Training/Documentation/Event.html index 97a9b9111..9f4f4c71f 100644 --- a/Moose Training/Documentation/Event.html +++ b/Moose Training/Documentation/Event.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/GOHOMETASK.html b/Moose Training/Documentation/GOHOMETASK.html index 5e33bc5f4..b09648ce5 100644 --- a/Moose Training/Documentation/GOHOMETASK.html +++ b/Moose Training/Documentation/GOHOMETASK.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Group.html b/Moose Training/Documentation/Group.html index 55b875474..265c2486f 100644 --- a/Moose Training/Documentation/Group.html +++ b/Moose Training/Documentation/Group.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Identifiable.html b/Moose Training/Documentation/Identifiable.html index aa76494eb..b2a3c60ad 100644 --- a/Moose Training/Documentation/Identifiable.html +++ b/Moose Training/Documentation/Identifiable.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/MISSION.html b/Moose Training/Documentation/MISSION.html index 9e8769577..41d5e1c57 100644 --- a/Moose Training/Documentation/MISSION.html +++ b/Moose Training/Documentation/MISSION.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/MOVEMENT.html b/Moose Training/Documentation/MOVEMENT.html index eb5441ac6..6e40b87e2 100644 --- a/Moose Training/Documentation/MOVEMENT.html +++ b/Moose Training/Documentation/MOVEMENT.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Menu.html b/Moose Training/Documentation/Menu.html index 106781eb9..8bc38451b 100644 --- a/Moose Training/Documentation/Menu.html +++ b/Moose Training/Documentation/Menu.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Message.html b/Moose Training/Documentation/Message.html index 0e1876930..e39b5087d 100644 --- a/Moose Training/Documentation/Message.html +++ b/Moose Training/Documentation/Message.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/MissileTrainer.html b/Moose Training/Documentation/MissileTrainer.html index ec2503338..423c8d196 100644 --- a/Moose Training/Documentation/MissileTrainer.html +++ b/Moose Training/Documentation/MissileTrainer.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/NOTASK.html b/Moose Training/Documentation/NOTASK.html index 73e14d07f..efd9a36ce 100644 --- a/Moose Training/Documentation/NOTASK.html +++ b/Moose Training/Documentation/NOTASK.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Object.html b/Moose Training/Documentation/Object.html index 685bf9c0e..1f4038b0b 100644 --- a/Moose Training/Documentation/Object.html +++ b/Moose Training/Documentation/Object.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/PICKUPTASK.html b/Moose Training/Documentation/PICKUPTASK.html index 1bf8d3194..811c6540e 100644 --- a/Moose Training/Documentation/PICKUPTASK.html +++ b/Moose Training/Documentation/PICKUPTASK.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/PatrolZone.html b/Moose Training/Documentation/PatrolZone.html index 7d05a219d..b19ff7105 100644 --- a/Moose Training/Documentation/PatrolZone.html +++ b/Moose Training/Documentation/PatrolZone.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Point.html b/Moose Training/Documentation/Point.html index 38ce6a40d..f3fcf26f8 100644 --- a/Moose Training/Documentation/Point.html +++ b/Moose Training/Documentation/Point.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Positionable.html b/Moose Training/Documentation/Positionable.html index 8d9290782..0fa7e726d 100644 --- a/Moose Training/Documentation/Positionable.html +++ b/Moose Training/Documentation/Positionable.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Process.html b/Moose Training/Documentation/Process.html index 60f04dd87..424cf1c47 100644 --- a/Moose Training/Documentation/Process.html +++ b/Moose Training/Documentation/Process.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Process_Destroy.html b/Moose Training/Documentation/Process_Destroy.html index 2f8d5a812..2855f017a 100644 --- a/Moose Training/Documentation/Process_Destroy.html +++ b/Moose Training/Documentation/Process_Destroy.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Process_JTAC.html b/Moose Training/Documentation/Process_JTAC.html index 9efaaf760..0bc8c3ee2 100644 --- a/Moose Training/Documentation/Process_JTAC.html +++ b/Moose Training/Documentation/Process_JTAC.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Process_Smoke.html b/Moose Training/Documentation/Process_Smoke.html index 9fc5b44ef..2f7dd81b3 100644 --- a/Moose Training/Documentation/Process_Smoke.html +++ b/Moose Training/Documentation/Process_Smoke.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/ROUTETASK.html b/Moose Training/Documentation/ROUTETASK.html index ba41e613d..95da95775 100644 --- a/Moose Training/Documentation/ROUTETASK.html +++ b/Moose Training/Documentation/ROUTETASK.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/STAGE.html b/Moose Training/Documentation/STAGE.html index 6cfd74f46..3981c44ff 100644 --- a/Moose Training/Documentation/STAGE.html +++ b/Moose Training/Documentation/STAGE.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Scheduler.html b/Moose Training/Documentation/Scheduler.html index f0b748b63..55625ea67 100644 --- a/Moose Training/Documentation/Scheduler.html +++ b/Moose Training/Documentation/Scheduler.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Scoring.html b/Moose Training/Documentation/Scoring.html index 670d4ef4a..f3c992ba6 100644 --- a/Moose Training/Documentation/Scoring.html +++ b/Moose Training/Documentation/Scoring.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Sead.html b/Moose Training/Documentation/Sead.html index 4b6fbd52f..190937702 100644 --- a/Moose Training/Documentation/Sead.html +++ b/Moose Training/Documentation/Sead.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Set.html b/Moose Training/Documentation/Set.html index ddf800cab..09d775274 100644 --- a/Moose Training/Documentation/Set.html +++ b/Moose Training/Documentation/Set.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Spawn.html b/Moose Training/Documentation/Spawn.html index 3c4d851fc..ad12ba9dd 100644 --- a/Moose Training/Documentation/Spawn.html +++ b/Moose Training/Documentation/Spawn.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • @@ -139,7 +139,7 @@ So in principle, the group list will contain all parameters and configurations a

    Return value

    @@ -1331,6 +1373,9 @@ The group that was spawned. You can use this group for further actions.

    + +

    Don't repeat the group from Take-Off till Landing and back Take-Off by ReSpawning.

    +
    @@ -1422,6 +1467,23 @@ The group that was spawned. You can use this group for further actions.

    + +
    +
    +
    + + #number + +SPAWN.SpawnCount + +
    +
    + + + + +

    The internal counter of the amount of spawning the has happened since SpawnStart.

    +
    @@ -1758,6 +1820,23 @@ Is the number of the Group that is to be spawned.

    #string: SpawnGroupName

    + +
    +
    +
    + + + +SPAWN.SpawnGroups + +
    +
    + + + + +

    Array containing the descriptions of each Group to be Spawned.

    +
    @@ -1825,6 +1904,23 @@ when nothing was spawned.

    + +
    +
    +
    + + #boolean + +SPAWN.SpawnIsScheduled + +
    +
    + + + + +

    Reflects if the spawning for this SpawnTemplatePrefix is going to be scheduled or not.

    +
    @@ -1859,6 +1955,23 @@ when nothing was spawned.

    The maximum amount of groups that can be alive of SpawnTemplatePrefix at the same time.

    + +
    +
    +
    + + #boolean + +SPAWN.SpawnRandomize + +
    +
    + + + + +

    Sets the randomization flag of new Spawned units to false.

    +
    @@ -1887,6 +2000,20 @@ when nothing was spawned.

    + +
    +
    +
    + + + +SPAWN.SpawnRandomizeRouteHeight + +
    +
    + + +
    @@ -2019,6 +2146,23 @@ Spawn_BE_KA50 = SPAWN:New( 'BE KA-50@RAMP-Ground Defense' ):Schedule( 600, 0.5 ) + +
    +
    +
    + + + +SPAWN.SpawnTemplate + +
    +
    + + + + +

    Contains the template structure for a Group Spawn from the Mission Editor. Note that this group must have lateActivation always on!!!

    +
    @@ -2098,21 +2242,17 @@ The group that was spawned. You can use this group for further actions.

    + #boolean -SPAWN:UnControlled() +SPAWN.UnControlled
    -

    Will spawn a plane group in uncontrolled mode...

    + -

    This will be similar to the uncontrolled flag setting in the ME.

    - -

    Return value

    - -

    #SPAWN: -self

    +

    When working in UnControlled mode, all planes are Spawned in UnControlled mode before the scheduler starts.

    diff --git a/Moose Training/Documentation/StateMachine.html b/Moose Training/Documentation/StateMachine.html index c5f4dd3af..ea22499eb 100644 --- a/Moose Training/Documentation/StateMachine.html +++ b/Moose Training/Documentation/StateMachine.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Static.html b/Moose Training/Documentation/Static.html index 94315f2ae..a56f0c0ae 100644 --- a/Moose Training/Documentation/Static.html +++ b/Moose Training/Documentation/Static.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/StaticObject.html b/Moose Training/Documentation/StaticObject.html index a5c772f7b..a6a1f5c39 100644 --- a/Moose Training/Documentation/StaticObject.html +++ b/Moose Training/Documentation/StaticObject.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/TASK.html b/Moose Training/Documentation/TASK.html index c00f6ca40..0f946a29e 100644 --- a/Moose Training/Documentation/TASK.html +++ b/Moose Training/Documentation/TASK.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Task_A2G.html b/Moose Training/Documentation/Task_A2G.html new file mode 100644 index 000000000..0e37d2258 --- /dev/null +++ b/Moose Training/Documentation/Task_A2G.html @@ -0,0 +1,427 @@ + + + + + + +
    +
    + +
    +
    +
    +
    + +
    +

    Module Task_A2G

    + +

    This module contains the TASK_A2G classes.

    + + + +

    1) #TASK_A2G class, extends Task#TASK_BASE

    +

    The #TASK_A2G class defines a CAS or BAI task of a Set of Target Units, +located at a Target Zone, based on the tasking capabilities defined in Task#TASK_BASE. +The TASK_A2G is implemented using a Statemachine#STATEMACHINE_TASK, and has the following statuses:

    + +
      +
    • None: Start of the process
    • +
    • Planned: The SEAD task is planned. Upon Planned, the sub-process ProcessAssign#PROCESSASSIGN_ACCEPT is started to accept the task.
    • +
    • Assigned: The SEAD task is assigned to a Group#GROUP. Upon Assigned, the sub-process ProcessRoute#PROCESSROUTE is started to route the active Units in the Group to the attack zone.
    • +
    • Success: The SEAD task is successfully completed. Upon Success, the sub-process ProcessSEAD#PROCESSSEAD is started to follow-up successful SEADing of the targets assigned in the task.
    • +
    • Failed: The SEAD task has failed. This will happen if the player exists the task early, without communicating a possible cancellation to HQ.
    • +
    + +
    + +

    Authors: FlightControl - Design and Programming

    + + +

    Global(s)

    + + + + + +
    TASK_A2G + +
    +

    Type TASK_A2G

    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    TASK_A2G:AssignToUnit(TaskUnit) +

    Assign the Task to a Unit.

    +
    TASK_A2G.ClassName + +
    TASK_A2G:CleanUp() +

    Removes a TASK_A2G.

    +
    TASK_A2G:GetPlannedMenuText() + +
    TASK_A2G:New(Mission, SetGroup, TaskName, TaskType, UnitSetTargets, TargetZone, TargetSetUnit, FACUnit) +

    Instantiates a new TASK_A2G.

    +
    TASK_A2G:OnNext(Fsm, Event, From, To, Event) +

    StateMachine callback function for a TASK

    +
    TASK_A2G.TaskScheduler + +
    TASK_A2G:_Schedule() + +
    TASK_A2G:_Scheduler() + +
    + +

    Global(s)

    +
    +
    + + #TASK_A2G + +TASK_A2G + +
    +
    + + + +
    +
    +

    Type Task_A2G

    + +

    Type TASK_A2G

    + +

    The TASK_A2G class

    + +

    Field(s)

    +
    +
    + + +TASK_A2G:AssignToUnit(TaskUnit) + +
    +
    + +

    Assign the Task to a Unit.

    + +

    Parameter

    + +

    Return value

    + +

    #TASK_A2G: +self

    + +
    +
    +
    +
    + + #string + +TASK_A2G.ClassName + +
    +
    + + + +
    +
    +
    +
    + + +TASK_A2G:CleanUp() + +
    +
    + +

    Removes a TASK_A2G.

    + +

    Return value

    + +

    #nil:

    + + +
    +
    +
    +
    + + +TASK_A2G:GetPlannedMenuText() + +
    +
    + + + +
    +
    +
    +
    + + +TASK_A2G:New(Mission, SetGroup, TaskName, TaskType, UnitSetTargets, TargetZone, TargetSetUnit, FACUnit) + +
    +
    + +

    Instantiates a new TASK_A2G.

    + +

    Parameters

    +
      +
    • + +

      Mission#MISSION Mission :

      + +
    • +
    • + +

      Set#SET_GROUP SetGroup : +The set of groups for which the Task can be assigned.

      + +
    • +
    • + +

      #string TaskName : +The name of the Task.

      + +
    • +
    • + +

      #string TaskType : +BAI or CAS

      + +
    • +
    • + +

      Set#SET_UNIT UnitSetTargets :

      + +
    • +
    • + +

      Zone#ZONE_BASE TargetZone :

      + +
    • +
    • + +

      TargetSetUnit :

      + +
    • +
    • + +

      FACUnit :

      + +
    • +
    +

    Return value

    + +

    #TASK_A2G: +self

    + +
    +
    +
    +
    + + +TASK_A2G:OnNext(Fsm, Event, From, To, Event) + +
    +
    + +

    StateMachine callback function for a TASK

    + +

    Parameters

    + +
    +
    +
    +
    + + + +TASK_A2G.TaskScheduler + +
    +
    + + + +
    +
    +
    +
    + + +TASK_A2G:_Schedule() + +
    +
    + + + +
    +
    +
    +
    + + +TASK_A2G:_Scheduler() + +
    +
    + + + +
    +
    + +
    + +
    + + diff --git a/Moose Training/Documentation/Task_Assign.html b/Moose Training/Documentation/Task_Assign.html index d45007cca..8b817f643 100644 --- a/Moose Training/Documentation/Task_Assign.html +++ b/Moose Training/Documentation/Task_Assign.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • @@ -92,7 +92,7 @@

    Module Task_Assign

    -

    This module contains the TASK_ASSIGN classes.

    +

    This module contains the PROCESS_ASSIGN classes.

    diff --git a/Moose Training/Documentation/Task_Client_Menu.html b/Moose Training/Documentation/Task_Client_Menu.html index 96e545df5..fc35db8ed 100644 --- a/Moose Training/Documentation/Task_Client_Menu.html +++ b/Moose Training/Documentation/Task_Client_Menu.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Task_Route.html b/Moose Training/Documentation/Task_Route.html index 92baa50c7..fdfb28c8e 100644 --- a/Moose Training/Documentation/Task_Route.html +++ b/Moose Training/Documentation/Task_Route.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • diff --git a/Moose Training/Documentation/Task_SEAD.html b/Moose Training/Documentation/Task_SEAD.html index 9ed4c2f91..a68747971 100644 --- a/Moose Training/Documentation/Task_SEAD.html +++ b/Moose Training/Documentation/Task_SEAD.html @@ -77,8 +77,8 @@
  • Static
  • StaticObject
  • Task
  • +
  • Task_A2G
  • Task_Assign
  • -
  • Task_CAS
  • Task_Client_Menu
  • Task_Route
  • Task_SEAD
  • @@ -97,8 +97,9 @@

    1) #TASK_SEAD class, extends Task#TASK_BASE

    -

    The #TASK_SEAD class defines a new SEAD task of a Set of Target Units, located at a Target Zone, based on the tasking capabilities defined in Task#TASK_BASE. -The TASK_SEAD is processed through a Statemachine#STATEMACHINE_TASK, and has the following statuses:

    +

    The #TASK_SEAD class defines a SEAD task for a Set of Target Units, located at a Target Zone, +based on the tasking capabilities defined in Task#TASK_BASE. +The TASK_SEAD is implemented using a Statemachine#STATEMACHINE_TASK, and has the following statuses: