diff --git a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua index 747bb258c..ccfbfa352 100644 --- a/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua +++ b/Moose Development/Moose/AI/AI_A2A_Dispatcher.lua @@ -864,7 +864,7 @@ do -- AI_A2A_DISPATCHER -- TODO: Check detection through radar. self.Detection:FilterCategories( { Unit.Category.AIRPLANE, Unit.Category.HELICOPTER } ) --self.Detection:InitDetectRadar( true ) - self.Detection:SetDetectionInterval( 30 ) + self.Detection:SetRefreshTimeInterval( 30 ) self:SetEngageRadius() self:SetGciRadius() @@ -1276,7 +1276,7 @@ do -- AI_A2A_DISPATCHER -- @return #number, Core.CommandCenter#REPORT function AI_A2A_DISPATCHER:GetAIFriendliesNearBy( DetectedItem ) - local FriendliesNearBy = self.Detection:GetFriendliesNearBy( DetectedItem ) + local FriendliesNearBy = self.Detection:GetFriendliesDistance( DetectedItem ) return FriendliesNearBy end @@ -1551,6 +1551,7 @@ do -- AI_A2A_DISPATCHER local RecceSet = self.Detection:GetDetectionSetGroup() RecceSet:FilterPrefixes( DefenderSquadron.TemplatePrefixes ) + RecceSet:FilterStart() self.Detection:SetFriendlyPrefixes( DefenderSquadron.TemplatePrefixes ) diff --git a/Moose Development/Moose/AI/AI_A2A_Patrol.lua b/Moose Development/Moose/AI/AI_A2A_Patrol.lua index c466be768..92cd522d3 100644 --- a/Moose Development/Moose/AI/AI_A2A_Patrol.lua +++ b/Moose Development/Moose/AI/AI_A2A_Patrol.lua @@ -120,7 +120,7 @@ -- * @{#AI_A2A_PATROL.SetDetectionOn}(): Set the detection on. The AI will detect for targets. -- * @{#AI_A2A_PATROL.SetDetectionOff}(): Set the detection off, the AI will not detect for targets. The existing target list will NOT be erased. -- --- The detection frequency can be set with @{#AI_A2A_PATROL.SetDetectionInterval}( seconds ), where the amount of seconds specify how much seconds will be waited before the next detection. +-- The detection frequency can be set with @{#AI_A2A_PATROL.SetRefreshTimeInterval}( seconds ), where the amount of seconds specify how much seconds will be waited before the next detection. -- Use the method @{#AI_A2A_PATROL.GetDetectedUnits}() to obtain a list of the @{Unit}s detected by the AI. -- -- The detection can be filtered to potential targets in a specific zone. diff --git a/Moose Development/Moose/AI/AI_BAI.lua b/Moose Development/Moose/AI/AI_BAI.lua index f23118233..426bfea04 100644 --- a/Moose Development/Moose/AI/AI_BAI.lua +++ b/Moose Development/Moose/AI/AI_BAI.lua @@ -612,7 +612,7 @@ function AI_BAI_ZONE:onafterEngage( Controllable, From, Event, To, --- NOW ROUTE THE GROUP! Controllable:WayPointExecute( 1 ) - self:SetDetectionInterval( 2 ) + self:SetRefreshTimeInterval( 2 ) self:SetDetectionActivated() self:__Target( -2 ) -- Start Targetting end diff --git a/Moose Development/Moose/AI/AI_CAS.lua b/Moose Development/Moose/AI/AI_CAS.lua index df166ea0d..bd6b0e18a 100644 --- a/Moose Development/Moose/AI/AI_CAS.lua +++ b/Moose Development/Moose/AI/AI_CAS.lua @@ -539,7 +539,7 @@ function AI_CAS_ZONE:onafterEngage( Controllable, From, Event, To, Controllable:OptionROEOpenFire() Controllable:OptionROTVertical() - self:SetDetectionInterval( 2 ) + self:SetRefreshTimeInterval( 2 ) self:SetDetectionActivated() self:__Target( -2 ) -- Start Targetting end diff --git a/Moose Development/Moose/AI/AI_Patrol.lua b/Moose Development/Moose/AI/AI_Patrol.lua index 5c5ce3f23..30e36cee0 100644 --- a/Moose Development/Moose/AI/AI_Patrol.lua +++ b/Moose Development/Moose/AI/AI_Patrol.lua @@ -128,7 +128,7 @@ -- * @{#AI_PATROL_ZONE.SetDetectionOn}(): Set the detection on. The AI will detect for targets. -- * @{#AI_PATROL_ZONE.SetDetectionOff}(): Set the detection off, the AI will not detect for targets. The existing target list will NOT be erased. -- --- The detection frequency can be set with @{#AI_PATROL_ZONE.SetDetectionInterval}( seconds ), where the amount of seconds specify how much seconds will be waited before the next detection. +-- The detection frequency can be set with @{#AI_PATROL_ZONE.SetRefreshTimeInterval}( seconds ), where the amount of seconds specify how much seconds will be waited before the next detection. -- Use the method @{#AI_PATROL_ZONE.GetDetectedUnits}() to obtain a list of the @{Unit}s detected by the AI. -- -- The detection can be filtered to potential targets in a specific zone. @@ -187,7 +187,7 @@ function AI_PATROL_ZONE:New( PatrolZone, PatrolFloorAltitude, PatrolCeilingAltit -- defafult PatrolAltType to "RADIO" if not specified self.PatrolAltType = PatrolAltType or "RADIO" - self:SetDetectionInterval( 30 ) + self:SetRefreshTimeInterval( 30 ) self.CheckStatus = true @@ -544,7 +544,7 @@ end -- @param #AI_PATROL_ZONE self -- @param #number Seconds The interval in seconds. -- @return #AI_PATROL_ZONE self -function AI_PATROL_ZONE:SetDetectionInterval( Seconds ) +function AI_PATROL_ZONE:SetRefreshTimeInterval( Seconds ) self:F2() if Seconds then diff --git a/Moose Development/Moose/Functional/Detection.lua b/Moose Development/Moose/Functional/Detection.lua index fc3339ff1..2e0dd9363 100644 --- a/Moose Development/Moose/Functional/Detection.lua +++ b/Moose Development/Moose/Functional/Detection.lua @@ -322,7 +322,7 @@ do -- DETECTION_BASE self.DetectionSetGroup = DetectionSetGroup - self.DetectionInterval = 30 + self.RefreshTimeInterval = 30 self:InitDetectVisual( nil ) self:InitDetectOptical( nil ) @@ -507,7 +507,7 @@ do -- DETECTION_BASE -- @param #string Event The Event string. -- @param #string To The To State string. function DETECTION_BASE:onafterStart(From,Event,To) - self:__Detect(0.1) + self:__Detect( 1 ) end --- @param #DETECTION_BASE self @@ -742,7 +742,7 @@ do -- DETECTION_BASE self:CleanDetectionItem( DetectedItem, DetectedItemID ) -- Any DetectionItem that has a Set with zero elements in it, must be removed from the DetectionItems list. end - self:__Detect( self.DetectionInterval ) + self:__Detect( self.RefreshTimeInterval ) end end @@ -922,12 +922,12 @@ do -- DETECTION_BASE --- Set the detection interval time in seconds. -- @param #DETECTION_BASE self - -- @param #number DetectionInterval Interval in seconds. + -- @param #number RefreshTimeInterval Interval in seconds. -- @return #DETECTION_BASE self - function DETECTION_BASE:SetDetectionInterval( DetectionInterval ) + function DETECTION_BASE:SetRefreshTimeInterval( RefreshTimeInterval ) self:F2() - self.DetectionInterval = DetectionInterval + self.RefreshTimeInterval = RefreshTimeInterval return self end diff --git a/Moose Development/Moose/Tasking/DetectionManager.lua b/Moose Development/Moose/Tasking/DetectionManager.lua index 0812459af..8e9010a3e 100644 --- a/Moose Development/Moose/Tasking/DetectionManager.lua +++ b/Moose Development/Moose/Tasking/DetectionManager.lua @@ -15,7 +15,7 @@ -- --------------------------------- -- Derived DETECTION_MANAGER classes will reports detected units using the method @{DetectionManager#DETECTION_MANAGER.ReportDetected}(). This method implements polymorphic behaviour. -- --- The time interval in seconds of the reporting can be changed using the methods @{DetectionManager#DETECTION_MANAGER.SetReportInterval}(). +-- The time interval in seconds of the reporting can be changed using the methods @{DetectionManager#DETECTION_MANAGER.SetRefreshTimeInterval}(). -- To control how long a reporting message is displayed, use @{DetectionManager#DETECTION_MANAGER.SetReportDisplayTime}(). -- Derived classes need to implement the method @{DetectionManager#DETECTION_MANAGER.GetReportDisplayTime}() to use the correct display time for displayed messages during a report. -- @@ -126,7 +126,7 @@ do -- DETECTION MANAGER self:AddTransition( "Started", "Report", "Started" ) - self:SetReportInterval( 30 ) + self:SetRefreshTimeInterval( 30 ) self:SetReportDisplayTime( 25 ) self:E( { Detection = Detection } ) @@ -143,19 +143,19 @@ do -- DETECTION MANAGER self:E( "onafterReport" ) - self:__Report( -self._ReportInterval ) + self:__Report( -self._RefreshTimeInterval ) self:ProcessDetected( self.Detection ) end --- Set the reporting time interval. -- @param #DETECTION_MANAGER self - -- @param #number ReportInterval The interval in seconds when a report needs to be done. + -- @param #number RefreshTimeInterval The interval in seconds when a report needs to be done. -- @return #DETECTION_MANAGER self - function DETECTION_MANAGER:SetReportInterval( ReportInterval ) + function DETECTION_MANAGER:SetRefreshTimeInterval( RefreshTimeInterval ) self:F2() - self._ReportInterval = ReportInterval + self._RefreshTimeInterval = RefreshTimeInterval end diff --git a/Moose Development/Moose/Tasking/Task_A2A_Dispatcher.lua b/Moose Development/Moose/Tasking/Task_A2A_Dispatcher.lua index f21928fdf..0167c71f9 100644 --- a/Moose Development/Moose/Tasking/Task_A2A_Dispatcher.lua +++ b/Moose Development/Moose/Tasking/Task_A2A_Dispatcher.lua @@ -93,7 +93,7 @@ do -- TASK_A2A_DISPATCHER -- -- local EWRDetection = DETECTION_AREAS:New( EWRSet, 6000 ) -- EWRDetection:SetFriendliesRange( 10000 ) - -- EWRDetection:SetDetectionInterval(30) + -- EWRDetection:SetRefreshTimeInterval(30) -- -- -- Setup the A2A dispatcher, and initialize it. -- A2ADispatcher = TASK_A2A_DISPATCHER:New( Mission, AttackGroups, EWRDetection ) @@ -197,7 +197,7 @@ do -- TASK_A2A_DISPATCHER -- TODO: Check detection through radar. self.Detection:FilterCategories( Unit.Category.AIRPLANE, Unit.Category.HELICOPTER ) self.Detection:InitDetectRadar( true ) - self.Detection:SetDetectionInterval( 30 ) + self.Detection:SetRefreshTimeInterval( 30 ) self:AddTransition( "Started", "Assign", "Started" ) diff --git a/docs/Documentation/AI_A2A_Dispatcher.html b/docs/Documentation/AI_A2A_Dispatcher.html index 6cc0cf345..703bc7751 100644 --- a/docs/Documentation/AI_A2A_Dispatcher.html +++ b/docs/Documentation/AI_A2A_Dispatcher.html @@ -749,7 +749,7 @@ Per one, two, three, four?

- AI_A2A_DISPATCHER:SetSquadron(SquadronName, AirbaseName, SpawnTemplates, Resources) + AI_A2A_DISPATCHER:SetSquadron(SquadronName, AirbaseName, TemplatePrefixes, Resources)

This is the main method to define Squadrons programmatically.

@@ -4132,7 +4132,7 @@ when you don't want to let the AIA2ADISPATCHER react immediately when a
-AI_A2A_DISPATCHER:SetSquadron(SquadronName, AirbaseName, SpawnTemplates, Resources) +AI_A2A_DISPATCHER:SetSquadron(SquadronName, AirbaseName, TemplatePrefixes, Resources)
@@ -4194,7 +4194,7 @@ To ease the airbase naming when using the LDT editor and IntelliSense, the
  • -

    #string SpawnTemplates : +

    #string TemplatePrefixes : A string or an array of strings specifying the prefix names of the templates (not going to explain what is templates here again). Examples are { "104th", "105th" } or "104th" or "Template 1" or "BLUE PLANES". Just remember that your template (groups late activated) need to start with the prefix you have specified in your code. diff --git a/docs/Documentation/AI_A2A_Patrol.html b/docs/Documentation/AI_A2A_Patrol.html index 4b46dcbc5..3e8626ebe 100644 --- a/docs/Documentation/AI_A2A_Patrol.html +++ b/docs/Documentation/AI_A2A_Patrol.html @@ -406,7 +406,7 @@ Only put detection on when absolutely necessary, and the frequency of the detect

  • AIA2APATROL.SetDetectionOff(): Set the detection off, the AI will not detect for targets. The existing target list will NOT be erased.
    • -

    The detection frequency can be set with AIA2APATROL.SetDetectionInterval( seconds ), where the amount of seconds specify how much seconds will be waited before the next detection. +

    The detection frequency can be set with AIA2APATROL.SetRefreshTimeInterval( seconds ), where the amount of seconds specify how much seconds will be waited before the next detection. Use the method AIA2APATROL.GetDetectedUnits() to obtain a list of the Units detected by the AI.

    The detection can be filtered to potential targets in a specific zone. diff --git a/docs/Documentation/AI_Patrol.html b/docs/Documentation/AI_Patrol.html index fa84b7673..0892b0b07 100644 --- a/docs/Documentation/AI_Patrol.html +++ b/docs/Documentation/AI_Patrol.html @@ -485,12 +485,6 @@ AI_PATROL_ZONE:SetDetectionDeactivated()

    Deactivate the detection.

    - - - - AI_PATROL_ZONE:SetDetectionInterval(Seconds) - -

    Set the interval in seconds between each detection executed by the AI.

    @@ -509,6 +503,12 @@ AI_PATROL_ZONE:SetDetectionZone(DetectionZone)

    Set the detection zone where the AI is detecting targets.

    + + + + AI_PATROL_ZONE:SetRefreshTimeInterval(Seconds) + +

    Set the interval in seconds between each detection executed by the AI.

    @@ -742,7 +742,7 @@ Only put detection on when absolutely necessary, and the frequency of the detect
  • AIPATROLZONE.SetDetectionOff(): Set the detection off, the AI will not detect for targets. The existing target list will NOT be erased.
    • -

    The detection frequency can be set with AIPATROLZONE.SetDetectionInterval( seconds ), where the amount of seconds specify how much seconds will be waited before the next detection. +

    The detection frequency can be set with AIPATROLZONE.SetRefreshTimeInterval( seconds ), where the amount of seconds specify how much seconds will be waited before the next detection. Use the method AIPATROLZONE.GetDetectedUnits() to obtain a list of the Units detected by the AI.

    The detection can be filtered to potential targets in a specific zone. @@ -926,6 +926,9 @@ Use the method AIPATROLZONE.M + +

    This table contains the targets detected during patrol.

    +
    @@ -2258,39 +2261,6 @@ self

    - -AI_PATROL_ZONE:SetDetectionInterval(Seconds) - -
    -
    - -

    Set the interval in seconds between each detection executed by the AI.

    - - -

    The list of already detected targets will be kept and updated. -Newly detected targets will be added, but already detected targets that were -not detected in this cycle, will NOT be removed! -The default interval is 30 seconds.

    - -

    Parameter

    -
      -
    • - -

      #number Seconds : -The interval in seconds.

      - -
      • -
    -

    Return value

    - -

    #AIPATROLZONE: -self

    - -
    -
    -
    -
    - AI_PATROL_ZONE:SetDetectionOff() @@ -2361,6 +2331,39 @@ self

    + +AI_PATROL_ZONE:SetRefreshTimeInterval(Seconds) + +
    +
    + +

    Set the interval in seconds between each detection executed by the AI.

    + + +

    The list of already detected targets will be kept and updated. +Newly detected targets will be added, but already detected targets that were +not detected in this cycle, will NOT be removed! +The default interval is 30 seconds.

    + +

    Parameter

    +
      +
    • + +

      #number Seconds : +The interval in seconds.

      + +
      • +
    +

    Return value

    + +

    #AIPATROLZONE: +self

    + +
    +
    +
    +
    + AI_PATROL_ZONE:SetSpeed(PatrolMinSpeed, PatrolMaxSpeed) diff --git a/docs/Documentation/Cargo.html b/docs/Documentation/Cargo.html index 9f6098452..a11fd4dba 100644 --- a/docs/Documentation/Cargo.html +++ b/docs/Documentation/Cargo.html @@ -3417,6 +3417,7 @@ The range till cargo will board.

    + CARGO_UNIT.CargoCarrier diff --git a/docs/Documentation/Designate.html b/docs/Documentation/Designate.html index c18932686..31210aea8 100644 --- a/docs/Documentation/Designate.html +++ b/docs/Documentation/Designate.html @@ -1130,7 +1130,6 @@ function below will use the range 1-7 just in case

    - DESIGNATE.LaserCodes diff --git a/docs/Documentation/Detection.html b/docs/Documentation/Detection.html index 15a67b87c..e055abe7c 100644 --- a/docs/Documentation/Detection.html +++ b/docs/Documentation/Detection.html @@ -476,12 +476,6 @@ DETECTION uses the in-built detection capabilities of DCS World, but adds new fu DETECTION_BASE.DetectionCount - - - - DETECTION_BASE.DetectionInterval - - @@ -529,18 +523,36 @@ The different values of Unit.Category can be:

    Multiple Unit.Category entries can be given as a table and then these will be evaluated as an OR expression.

    + + + + DETECTION_BASE:FilterFriendliesCategory(FriendliesCategory) + +

    Filters friendly units by unit category.

    DETECTION_BASE:ForgetDetectedUnit(UnitName)

    Forget a Unit from a DetectionItem

    + + + + DETECTION_BASE.FriendliesCategory + + DETECTION_BASE.FriendliesRange + + + + DETECTION_BASE.FriendlyPrefixes + + @@ -799,6 +811,12 @@ The different values of Unit.Category can be:

    DETECTION_BASE:OnLeaveStopped(From, Event, To)

    OnLeave Transition Handler for State Stopped.

    + + + + DETECTION_BASE.RefreshTimeInterval + + @@ -865,12 +883,6 @@ The different values of Unit.Category can be:

    DETECTION_BASE:SetDetectedItemThreatLevel(The, DetectedItem)

    Set the detected item threatlevel.

    - - - - DETECTION_BASE:SetDetectionInterval(DetectionInterval) - -

    Set the detection interval time in seconds.

    @@ -883,12 +895,24 @@ The different values of Unit.Category can be:

    DETECTION_BASE:SetFriendliesRange(FriendliesRange)

    Set the radius in meters to validate if friendlies are nearby.

    + + + + DETECTION_BASE:SetFriendlyPrefixes(FriendlyPrefixes) + +

    This will allow during friendly search any recce or detection unit to be also considered as a friendly.

    DETECTION_BASE:SetIntercept(Intercept, IntereptDelay, InterceptDelay)

    Set the parameters to calculate to optimal intercept point.

    + + + + DETECTION_BASE:SetRefreshTimeInterval(RefreshTimeInterval) + +

    Set the detection interval time in seconds.

    @@ -2614,20 +2638,6 @@ The group to generate the report for.

    - -
    -
    -
    - - #number - -DETECTION_BASE.DetectionInterval - -
    -
    - - -
    @@ -2754,6 +2764,32 @@ cs.DCSUnit#Unit> FilterCategories The Categories entries

    #DETECTION_BASE: self

    + +
    +
    +
    + + +DETECTION_BASE:FilterFriendliesCategory(FriendliesCategory) + +
    +
    + +

    Filters friendly units by unit category.

    + +

    Parameter

    +
      +
    • + +

      FriendliesCategory :

      + +
      • +
    +

    Return value

    + +

    #DETECTION_BASE:

    + +
    @@ -2781,6 +2817,20 @@ The UnitName that needs to be forgotten from the DetectionItem Sets.

    #DETECTION_BASE:

    + +
    +
    +
    + + + +DETECTION_BASE.FriendliesCategory + +
    +
    + + +
    @@ -2795,6 +2845,19 @@ The UnitName that needs to be forgotten from the DetectionItem Sets.

    + +
    +
    +
    + + +DETECTION_BASE.FriendlyPrefixes + +
    +
    + + +
    @@ -3468,7 +3531,7 @@ true if already identified.

    Return value

    #boolean: -trhe if there are friendlies nearby

    +true if there are friendlies nearby

    @@ -3987,6 +4050,20 @@ The To State string.

    #boolean: Return false to cancel Transition.

    + +
    +
    +
    + + #number + +DETECTION_BASE.RefreshTimeInterval + +
    +
    + + +
    @@ -4273,33 +4350,6 @@ DetectedItem to calculate the threatlevel for.

    #DETECTION_BASE:

    - -
    -
    -
    - - -DETECTION_BASE:SetDetectionInterval(DetectionInterval) - -
    -
    - -

    Set the detection interval time in seconds.

    - -

    Parameter

    -
      -
    • - -

      #number DetectionInterval : -Interval in seconds.

      - -
      • -
    -

    Return value

    - -

    #DETECTION_BASE: -self

    -
    @@ -4360,6 +4410,39 @@ Radius to use when checking if Friendlies are nearby.

    #DETECTION_BASE: self

    + +
    +
    +
    + + +DETECTION_BASE:SetFriendlyPrefixes(FriendlyPrefixes) + +
    +
    + +

    This will allow during friendly search any recce or detection unit to be also considered as a friendly.

    + + +

    By default, recce aren't considered friendly, because that would mean that a recce would be also an attacking friendly, +and this is wrong. +However, in a CAP situation, when the CAP is part of an EWR network, the CAP is also an attacker. +This, this method allows to register for a detection the CAP unit name prefixes to be considered CAP.

    + +

    Parameter

    +
      +
    • + +

      #string FriendlyPrefixes : +A string or a list of prefixes.

      + +
      • +
    +

    Return value

    + +

    #DETECTION_BASE:

    + +
    @@ -4403,6 +4486,33 @@ self

    + +DETECTION_BASE:SetRefreshTimeInterval(RefreshTimeInterval) + +
    +
    + +

    Set the detection interval time in seconds.

    + +

    Parameter

    +
      +
    • + +

      #number RefreshTimeInterval : +Interval in seconds.

      + +
      • +
    +

    Return value

    + +

    #DETECTION_BASE: +self

    + +
    +
    +
    +
    + DETECTION_BASE:SetRejectZones(RejectZones) diff --git a/docs/Documentation/DetectionManager.html b/docs/Documentation/DetectionManager.html index ffff150e6..f6ee82ce5 100644 --- a/docs/Documentation/DetectionManager.html +++ b/docs/Documentation/DetectionManager.html @@ -121,7 +121,7 @@ Reportings can be done in several manners, and it is up to the derived classes i

    1.2) DETECTION_MANAGER reporting:

    Derived DETECTION_MANAGER classes will reports detected units using the method DetectionManager#DETECTION_MANAGER.ReportDetected(). This method implements polymorphic behaviour.

    -

    The time interval in seconds of the reporting can be changed using the methods DetectionManager#DETECTION_MANAGER.SetReportInterval(). +

    The time interval in seconds of the reporting can be changed using the methods DetectionManager#DETECTION_MANAGER.SetRefreshTimeInterval(). To control how long a reporting message is displayed, use DetectionManager#DETECTION_MANAGER.SetReportDisplayTime(). Derived classes need to implement the method DetectionManager#DETECTION_MANAGER.GetReportDisplayTime() to use the correct display time for displayed messages during a report.

    @@ -223,15 +223,15 @@ If an ad-hoc report is requested, use the method DETECTION_MANAGER:SetReportDisplayTime(ReportDisplayTime) + DETECTION_MANAGER:SetRefreshTimeInterval(RefreshTimeInterval) -

    Set the reporting message display time.

    +

    Set the reporting time interval.

    - DETECTION_MANAGER:SetReportInterval(ReportInterval) + DETECTION_MANAGER:SetReportDisplayTime(ReportDisplayTime) -

    Set the reporting time interval.

    +

    Set the reporting message display time.

    @@ -247,13 +247,13 @@ If an ad-hoc report is requested, use the method DETECTION_MANAGER._ReportDisplayTime + DETECTION_MANAGER._RefreshTimeInterval - DETECTION_MANAGER._ReportInterval + DETECTION_MANAGER._ReportDisplayTime @@ -614,6 +614,33 @@ self

    + +DETECTION_MANAGER:SetRefreshTimeInterval(RefreshTimeInterval) + +
    +
    + +

    Set the reporting time interval.

    + +

    Parameter

    +
      +
    • + +

      #number RefreshTimeInterval : +The interval in seconds when a report needs to be done.

      + +
      • +
    +

    Return value

    + +

    #DETECTION_MANAGER: +self

    + +
    +
    +
    +
    + DETECTION_MANAGER:SetReportDisplayTime(ReportDisplayTime) @@ -641,33 +668,6 @@ self

    - -DETECTION_MANAGER:SetReportInterval(ReportInterval) - -
    -
    - -

    Set the reporting time interval.

    - -

    Parameter

    -
      -
    • - -

      #number ReportInterval : -The interval in seconds when a report needs to be done.

      - -
      • -
    -

    Return value

    - -

    #DETECTION_MANAGER: -self

    - -
    -
    -
    -
    - DETECTION_MANAGER:Start() @@ -695,8 +695,8 @@ self

    - -DETECTION_MANAGER._ReportDisplayTime + +DETECTION_MANAGER._RefreshTimeInterval
    @@ -709,8 +709,8 @@ self

    - -DETECTION_MANAGER._ReportInterval + +DETECTION_MANAGER._ReportDisplayTime
    diff --git a/docs/Documentation/Fsm.html b/docs/Documentation/Fsm.html index e0276d335..177f34281 100644 --- a/docs/Documentation/Fsm.html +++ b/docs/Documentation/Fsm.html @@ -1598,7 +1598,7 @@ A string defining the start state.

    - + #string FSM._StartState @@ -1897,7 +1897,6 @@ A string defining the start state.

    - FSM.current diff --git a/docs/Documentation/Movement.html b/docs/Documentation/Movement.html index 4307c3aaa..be5ce073c 100644 --- a/docs/Documentation/Movement.html +++ b/docs/Documentation/Movement.html @@ -227,6 +227,7 @@ on defined intervals (currently every minute).

    + #number MOVEMENT.AliveUnits @@ -235,6 +236,9 @@ on defined intervals (currently every minute).

    + +

    Contains the counter how many units are currently alive

    +
    diff --git a/docs/Documentation/Positionable.html b/docs/Documentation/Positionable.html index 573b1fc66..f5b1c4a9e 100644 --- a/docs/Documentation/Positionable.html +++ b/docs/Documentation/Positionable.html @@ -1836,6 +1836,7 @@ The height in meters to add to the altitude of the positionable.

    + Core.Spot#SPOT POSITIONABLE.Spot diff --git a/docs/Documentation/Settings.html b/docs/Documentation/Settings.html index 85d72ad06..992d1808d 100644 --- a/docs/Documentation/Settings.html +++ b/docs/Documentation/Settings.html @@ -1093,7 +1093,7 @@ true if metric.

    - + #boolean SETTINGS.Metric diff --git a/docs/Documentation/Spawn.html b/docs/Documentation/Spawn.html index c9dc9dd3f..3c14d9de6 100644 --- a/docs/Documentation/Spawn.html +++ b/docs/Documentation/Spawn.html @@ -2194,6 +2194,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.

    +
    @@ -3126,7 +3129,7 @@ Spawn_BE_KA50 = SPAWN:New( 'BE KA-50@RAMP-Ground Defense' ):Schedule( 600, 0.5 )
    - + #boolean SPAWN.SpawnUnControlled @@ -3150,7 +3153,7 @@ Spawn_BE_KA50 = SPAWN:New( 'BE KA-50@RAMP-Ground Defense' ):Schedule( 600, 0.5 ) -

    When the first Spawn executes, all the Groups need to be made visible before start.

    +

    Flag that indicates if all the Groups of the SpawnGroup need to be visible when Spawned.

    diff --git a/docs/Documentation/SpawnStatic.html b/docs/Documentation/SpawnStatic.html index d8aa5e633..bc91b9624 100644 --- a/docs/Documentation/SpawnStatic.html +++ b/docs/Documentation/SpawnStatic.html @@ -436,7 +436,6 @@ ptional) The name of the new static.

    - #number SPAWNSTATIC.SpawnIndex diff --git a/docs/Documentation/Task_A2A_Dispatcher.html b/docs/Documentation/Task_A2A_Dispatcher.html index 11141d207..6c6029eb9 100644 --- a/docs/Documentation/Task_A2A_Dispatcher.html +++ b/docs/Documentation/Task_A2A_Dispatcher.html @@ -307,7 +307,7 @@ increasing or decreasing the radar coverage of the Early Warning System.

    local EWRDetection = DETECTION_AREAS:New( EWRSet, 6000 ) EWRDetection:SetFriendliesRange( 10000 ) -EWRDetection:SetDetectionInterval(30) +EWRDetection:SetRefreshTimeInterval(30) -- Setup the A2A dispatcher, and initialize it. A2ADispatcher = TASK_A2A_DISPATCHER:New( Mission, AttackGroups, EWRDetection ) diff --git a/docs/Documentation/Task_Cargo.html b/docs/Documentation/Task_Cargo.html index 5ccba6643..743615651 100644 --- a/docs/Documentation/Task_Cargo.html +++ b/docs/Documentation/Task_Cargo.html @@ -552,7 +552,7 @@ based on the tasking capabilities defined in Task#TA
    - Core.Cargo#CARGO + FSM_PROCESS.Cargo @@ -566,7 +566,6 @@ based on the tasking capabilities defined in Task#TA
    - FSM_PROCESS.DeployZone @@ -631,7 +630,7 @@ based on the tasking capabilities defined in Task#TA
    - + #number TASK_CARGO.CargoLimit