diff --git a/Moose Development/Moose/GroupSet.lua b/Moose Development/Moose/GroupSet.lua index fb3f45fc5..f3aea95fc 100644 --- a/Moose Development/Moose/GroupSet.lua +++ b/Moose Development/Moose/GroupSet.lua @@ -23,7 +23,7 @@ -- -- * @{#GROUPSET.FilterCoalitions}: Builds the GROUPSET with the groups belonging to the coalition(s). -- * @{#GROUPSET.FilterCategories}: Builds the GROUPSET with the groups belonging to the category(ies). --- * @{#GROUPSET.FilterTypes}: Builds the GROUPSET with the groups belonging to the unit type(s). +-- * @{#GROUPSET.FilterCountries}: Builds the GROUPSET with the gruops belonging to the country(ies). -- * @{#GROUPSET.FilterPrefixes}: Builds the GROUPSET with the groups starting with the same prefix string(s). -- -- Once the filter criteria have been set for the GROUPSET, you can start filtering using: @@ -41,12 +41,7 @@ -- The iterator methods will walk the GROUPSET set, and call for each element within the set a function that you provide. -- The following iterator methods are currently available within the GROUPSET: -- --- * @{#GROUPSET.ForEachGroup}: Calls a function for each alive unit it finds within the GROUPSET. --- --- Planned iterators methods in development are (so these are not yet available): --- --- * @{#GROUPSET.ForEachUnitInGroup}: Calls a function for each group contained within the GROUPSET. --- * @{#GROUPSET.ForEachUnitInZone}: Calls a function for each unit within a certain zone contained within the GROUPSET. +-- * @{#GROUPSET.ForEachGroup}: Calls a function for each alive group it finds within the GROUPSET. -- -- @module GroupSet -- @author FlightControl @@ -101,10 +96,10 @@ function GROUPSET:New() end ---- Finds a Unit based on the Unit Name. +--- Finds a Group based on the Group Name. -- @param #GROUPSET self -- @param #string GroupName --- @return Group#GROUP The found Unit. +-- @return Group#GROUP The found Group. function GROUPSET:FindUnit( GroupName ) local GroupFound = self.Set[GroupName] @@ -169,7 +164,7 @@ function GROUPSET:FilterCountries( Countries ) end ---- Builds a set of groups of defined unit prefixes. +--- Builds a set of groups of defined GROUP prefixes. -- All the groups starting with the given prefixes will be included within the set. -- @param #GROUPSET self -- @param #string Prefixes The prefix of which the group name starts with. @@ -242,7 +237,7 @@ function GROUPSET:ForEachUnit( IteratorFunction, ... ) end ------ Interate the GROUPSET and call an interator function for each **alive** player, providing the Unit of the player and optional parameters. +----- Interate the GROUPSET and call an interator function for each **alive** player, providing the Group of the player and optional parameters. ---- @param #GROUPSET self ---- @param #function IteratorFunction The function that will be called when there is an alive player in the GROUPSET. The function needs to accept a GROUP parameter. ---- @return #GROUPSET self 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 6339b2e01..a555b44df 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: 20160527_1334' ) +env.info( 'Moose Generation Timestamp: 20160527_1352' ) local base = _G env.info("Loading MOOSE " .. base.timer.getAbsTime() ) diff --git a/Moose Mission Setup/Moose.lua b/Moose Mission Setup/Moose.lua index 6339b2e01..a555b44df 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: 20160527_1334' ) +env.info( 'Moose Generation Timestamp: 20160527_1352' ) local base = _G env.info("Loading MOOSE " .. base.timer.getAbsTime() ) diff --git a/Moose Test Missions/Moose_Test_CLEANUP/Moose_Test_CLEANUP.miz b/Moose Test Missions/Moose_Test_CLEANUP/Moose_Test_CLEANUP.miz index 5b3946c14..4e11868b2 100644 Binary files a/Moose Test Missions/Moose_Test_CLEANUP/Moose_Test_CLEANUP.miz and b/Moose Test Missions/Moose_Test_CLEANUP/Moose_Test_CLEANUP.miz differ diff --git a/Moose Test Missions/Moose_Test_DATABASE/Moose_Test_DATABASE.miz b/Moose Test Missions/Moose_Test_DATABASE/Moose_Test_DATABASE.miz index bc67a6daa..9977c082b 100644 Binary files a/Moose Test Missions/Moose_Test_DATABASE/Moose_Test_DATABASE.miz and b/Moose Test Missions/Moose_Test_DATABASE/Moose_Test_DATABASE.miz differ diff --git a/Moose Test Missions/Moose_Test_DESTROY/MOOSE_Test_DESTROY.miz b/Moose Test Missions/Moose_Test_DESTROY/MOOSE_Test_DESTROY.miz index 741f65acd..2a439db3c 100644 Binary files a/Moose Test Missions/Moose_Test_DESTROY/MOOSE_Test_DESTROY.miz and b/Moose Test Missions/Moose_Test_DESTROY/MOOSE_Test_DESTROY.miz differ diff --git a/Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.miz b/Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.miz index e8c0176c4..41ca99bd5 100644 Binary files a/Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.miz and b/Moose Test Missions/Moose_Test_ESCORT/MOOSE_Test_ESCORT.miz differ diff --git a/Moose Test Missions/Moose_Test_MISSILETRAINER/Moose_Test_MISSILETRAINER.miz b/Moose Test Missions/Moose_Test_MISSILETRAINER/Moose_Test_MISSILETRAINER.miz index 3c78aff79..70fd8bf2c 100644 Binary files a/Moose Test Missions/Moose_Test_MISSILETRAINER/Moose_Test_MISSILETRAINER.miz and b/Moose Test Missions/Moose_Test_MISSILETRAINER/Moose_Test_MISSILETRAINER.miz differ diff --git a/Moose Test Missions/Moose_Test_SEAD/MOOSE_Test_SEAD.miz b/Moose Test Missions/Moose_Test_SEAD/MOOSE_Test_SEAD.miz index b7f520bf6..707f40154 100644 Binary files a/Moose Test Missions/Moose_Test_SEAD/MOOSE_Test_SEAD.miz and b/Moose Test Missions/Moose_Test_SEAD/MOOSE_Test_SEAD.miz differ diff --git a/Moose Test Missions/Moose_Test_SPAWN/MOOSE_Test_SPAWN.miz b/Moose Test Missions/Moose_Test_SPAWN/MOOSE_Test_SPAWN.miz index efb125ade..d661eba53 100644 Binary files a/Moose Test Missions/Moose_Test_SPAWN/MOOSE_Test_SPAWN.miz and b/Moose Test Missions/Moose_Test_SPAWN/MOOSE_Test_SPAWN.miz differ diff --git a/Moose Test Missions/Moose_Test_SPAWN_Repeat/MOOSE_Test_SPAWN_Repeat.miz b/Moose Test Missions/Moose_Test_SPAWN_Repeat/MOOSE_Test_SPAWN_Repeat.miz index 91112db60..12db2587b 100644 Binary files a/Moose Test Missions/Moose_Test_SPAWN_Repeat/MOOSE_Test_SPAWN_Repeat.miz and b/Moose Test Missions/Moose_Test_SPAWN_Repeat/MOOSE_Test_SPAWN_Repeat.miz differ diff --git a/Moose Test Missions/Moose_Test_TASK_Pickup_and_Deploy/MOOSE_Test_TASK_Pickup_and_Deploy.miz b/Moose Test Missions/Moose_Test_TASK_Pickup_and_Deploy/MOOSE_Test_TASK_Pickup_and_Deploy.miz index 3b8e93543..304ea1296 100644 Binary files a/Moose Test Missions/Moose_Test_TASK_Pickup_and_Deploy/MOOSE_Test_TASK_Pickup_and_Deploy.miz and b/Moose Test Missions/Moose_Test_TASK_Pickup_and_Deploy/MOOSE_Test_TASK_Pickup_and_Deploy.miz differ diff --git a/Moose Test Missions/Moose_Test_WRAPPER/Moose_Test_WRAPPER.miz b/Moose Test Missions/Moose_Test_WRAPPER/Moose_Test_WRAPPER.miz index 36e69ef22..5f4bfcb56 100644 Binary files a/Moose Test Missions/Moose_Test_WRAPPER/Moose_Test_WRAPPER.miz and b/Moose Test Missions/Moose_Test_WRAPPER/Moose_Test_WRAPPER.miz differ diff --git a/Moose Training/Documentation/GroupSet.html b/Moose Training/Documentation/GroupSet.html index 140e7e19a..20bf94a0d 100644 --- a/Moose Training/Documentation/GroupSet.html +++ b/Moose Training/Documentation/GroupSet.html @@ -99,7 +99,7 @@ Filter criteria are defined by:

@@ -122,14 +122,7 @@ The iterator methods will walk the GROUPSET set, and call for each element withi The following iterator methods are currently available within the GROUPSET:

- -

Planned iterators methods in development are (so these are not yet available):

- - @@ -189,7 +182,7 @@ The following iterator methods are currently available within the GROUPSET:

GROUPSET:FilterPrefixes(Prefixes) -

Builds a set of groups of defined unit prefixes.

+

Builds a set of groups of defined GROUP prefixes.

@@ -207,7 +200,7 @@ The following iterator methods are currently available within the GROUPSET:

GROUPSET:FindUnit(GroupName) -

Finds a Unit based on the Unit Name.

+

Finds a Group based on the Group Name.

@@ -438,7 +431,7 @@ self

-

Builds a set of groups of defined unit prefixes.

+

Builds a set of groups of defined GROUP prefixes.

All the groups starting with the given prefixes will be included within the set.

@@ -525,7 +518,7 @@ The GROUP

-

Finds a Unit based on the Unit Name.

+

Finds a Group based on the Group Name.

Parameter