diff --git a/Moose Development/Moose/Controllable.lua b/Moose Development/Moose/Controllable.lua index db46f5dae..8b9869a92 100644 --- a/Moose Development/Moose/Controllable.lua +++ b/Moose Development/Moose/Controllable.lua @@ -2119,6 +2119,7 @@ end -- @param #table WayPoints If WayPoints is given, then use the route. -- @return #CONTROLLABLE function CONTROLLABLE:WayPointInitialize( WayPoints ) + self:F( { WayPoint, WayPointIndex, WayPointFunction } ) if WayPoints then self.WayPoints = WayPoints @@ -2179,6 +2180,7 @@ end -- @param #number WaitTime The amount seconds to wait before initiating the mission. -- @return #CONTROLLABLE function CONTROLLABLE:WayPointExecute( WayPoint, WaitTime ) + self:F( { WayPoint, WaitTime } ) if not WayPoint then WayPoint = 1 diff --git a/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua b/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua index 0f5916e98..dc6fc0a37 100644 --- a/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua +++ b/Moose Mission Setup/Moose Mission Update/l10n/DEFAULT/Moose.lua @@ -1,5 +1,5 @@ env.info( '*** MOOSE STATIC INCLUDE START *** ' ) -env.info( 'Moose Generation Timestamp: 20160719_2203' ) +env.info( 'Moose Generation Timestamp: 20160720_1731' ) local base = _G Include = {} @@ -6072,6 +6072,7 @@ end -- @param #table WayPoints If WayPoints is given, then use the route. -- @return #CONTROLLABLE function CONTROLLABLE:WayPointInitialize( WayPoints ) + self:F( { WayPoint, WayPointIndex, WayPointFunction } ) if WayPoints then self.WayPoints = WayPoints @@ -6132,6 +6133,7 @@ end -- @param #number WaitTime The amount seconds to wait before initiating the mission. -- @return #CONTROLLABLE function CONTROLLABLE:WayPointExecute( WayPoint, WaitTime ) + self:F( { WayPoint, WayPointIndex, WayPointFunction } ) if not WayPoint then WayPoint = 1 diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua index 0f5916e98..dc6fc0a37 100644 --- a/Moose Mission Setup/Moose.lua +++ b/Moose Mission Setup/Moose.lua @@ -1,5 +1,5 @@ env.info( '*** MOOSE STATIC INCLUDE START *** ' ) -env.info( 'Moose Generation Timestamp: 20160719_2203' ) +env.info( 'Moose Generation Timestamp: 20160720_1731' ) local base = _G Include = {} @@ -6072,6 +6072,7 @@ end -- @param #table WayPoints If WayPoints is given, then use the route. -- @return #CONTROLLABLE function CONTROLLABLE:WayPointInitialize( WayPoints ) + self:F( { WayPoint, WayPointIndex, WayPointFunction } ) if WayPoints then self.WayPoints = WayPoints @@ -6132,6 +6133,7 @@ end -- @param #number WaitTime The amount seconds to wait before initiating the mission. -- @return #CONTROLLABLE function CONTROLLABLE:WayPointExecute( WayPoint, WaitTime ) + self:F( { WayPoint, WayPointIndex, WayPointFunction } ) if not WayPoint then WayPoint = 1 diff --git a/Moose Test Missions/Moose_Test_DETECTION_DISPATCHER/Moose_Test_DETECTION_DISPATCHER.lua b/Moose Test Missions/Moose_Test_DETECTION_DISPATCHER/Moose_Test_DETECTION_DISPATCHER.lua index a023859c2..200b3b1c1 100644 --- a/Moose Test Missions/Moose_Test_DETECTION_DISPATCHER/Moose_Test_DETECTION_DISPATCHER.lua +++ b/Moose Test Missions/Moose_Test_DETECTION_DISPATCHER/Moose_Test_DETECTION_DISPATCHER.lua @@ -1,17 +1,12 @@ -local Mission = MISSION:New( "Attack Detect Mission", "High", "Attack Detect Mission Briefing", coalition.side.RED ) local Scoring = SCORING:New( "Detect Demo" ) -Mission:AddScoring( Scoring ) +local Mission = MISSION:New( "Attack Detect Mission", "High", "Attack Detect Mission Briefing", coalition.side.RED ):AddScoring( Scoring ) local FACSet = SET_GROUP:New():FilterPrefixes( "FAC" ):FilterCoalitions("red"):FilterStart() - local FACDetection = DETECTION_AREAS:New( FACSet, 10000, 3000 ) local AttackGroups = SET_GROUP:New():FilterCoalitions( "red" ):FilterPrefixes( "Attack" ):FilterStart() - - local CommandCenter = GROUP:FindByName( "HQ" ) - local TaskAssign = DETECTION_DISPATCHER:New( Mission, CommandCenter, AttackGroups, FACDetection ) diff --git a/Moose Test Missions/Moose_Test_DETECTION_DISPATCHER/Moose_Test_DETECTION_DISPATCHER.miz b/Moose Test Missions/Moose_Test_DETECTION_DISPATCHER/Moose_Test_DETECTION_DISPATCHER.miz index efcc256b9..7700b387f 100644 Binary files a/Moose Test Missions/Moose_Test_DETECTION_DISPATCHER/Moose_Test_DETECTION_DISPATCHER.miz and b/Moose Test Missions/Moose_Test_DETECTION_DISPATCHER/Moose_Test_DETECTION_DISPATCHER.miz differ diff --git a/Moose Training/Presentations/DCS World - MOOSE - Detection - Part 1 - Explanation.pptx b/Moose Training/Presentations/DCS World - MOOSE - Detection - Part 1 - Explanation.pptx deleted file mode 100644 index a4ab4851a..000000000 Binary files a/Moose Training/Presentations/DCS World - MOOSE - Detection - Part 1 - Explanation.pptx and /dev/null differ diff --git a/Moose Training/Presentations/DCS World - MOOSE - Detection - Part 1 - Teaser.pptx b/Moose Training/Presentations/DCS World - MOOSE - Detection - Part 1 - Teaser.pptx new file mode 100644 index 000000000..d3385d469 Binary files /dev/null and b/Moose Training/Presentations/DCS World - MOOSE - Detection - Part 1 - Teaser.pptx differ