diff --git a/Moose Development/Moose/Core/Set.lua b/Moose Development/Moose/Core/Set.lua index 58f12c4f1..bd56a7454 100644 --- a/Moose Development/Moose/Core/Set.lua +++ b/Moose Development/Moose/Core/Set.lua @@ -437,44 +437,44 @@ end --- Handles the OnPlayerEnterUnit event to fill the active players table (with the unit filter applied). -- @param #SET_BASE self -- @param Core.Event#EVENTDATA Event -function SET_BASE:_EventOnPlayerEnterUnit( Event ) - self:F3( { Event } ) - - if Event.IniDCSUnit then - local ObjectName, Object = self:AddInDatabase( Event ) - self:T3( ObjectName, Object ) - if self:IsIncludeObject( Object ) then - self:Add( ObjectName, Object ) - --self:_EventOnPlayerEnterUnit( Event ) - end - end -end +--function SET_BASE:_EventOnPlayerEnterUnit( Event ) +-- self:F3( { Event } ) +-- +-- if Event.IniDCSUnit then +-- local ObjectName, Object = self:AddInDatabase( Event ) +-- self:T3( ObjectName, Object ) +-- if self:IsIncludeObject( Object ) then +-- self:Add( ObjectName, Object ) +-- --self:_EventOnPlayerEnterUnit( Event ) +-- end +-- end +--end --- Handles the OnPlayerLeaveUnit event to clean the active players table. -- @param #SET_BASE self -- @param Core.Event#EVENTDATA Event -function SET_BASE:_EventOnPlayerLeaveUnit( Event ) - self:F3( { Event } ) - - local ObjectName = Event.IniDCSUnit - if Event.IniDCSUnit then - if Event.IniDCSGroup then - local GroupUnits = Event.IniDCSGroup:getUnits() - local PlayerCount = 0 - for _, DCSUnit in pairs( GroupUnits ) do - if DCSUnit ~= Event.IniDCSUnit then - if DCSUnit:getPlayerName() ~= nil then - PlayerCount = PlayerCount + 1 - end - end - end - self:E(PlayerCount) - if PlayerCount == 0 then - self:Remove( Event.IniDCSGroupName ) - end - end - end -end +--function SET_BASE:_EventOnPlayerLeaveUnit( Event ) +-- self:F3( { Event } ) +-- +-- local ObjectName = Event.IniDCSUnit +-- if Event.IniDCSUnit then +-- if Event.IniDCSGroup then +-- local GroupUnits = Event.IniDCSGroup:getUnits() +-- local PlayerCount = 0 +-- for _, DCSUnit in pairs( GroupUnits ) do +-- if DCSUnit ~= Event.IniDCSUnit then +-- if DCSUnit:getPlayerName() ~= nil then +-- PlayerCount = PlayerCount + 1 +-- end +-- end +-- end +-- self:E(PlayerCount) +-- if PlayerCount == 0 then +-- self:Remove( Event.IniDCSGroupName ) +-- end +-- end +-- end +--end -- Iterators diff --git a/Moose Development/Moose/Functional/ATC_Ground.lua b/Moose Development/Moose/Functional/ATC_Ground.lua index a0a6a016c..1660cefa1 100644 --- a/Moose Development/Moose/Functional/ATC_Ground.lua +++ b/Moose Development/Moose/Functional/ATC_Ground.lua @@ -124,28 +124,24 @@ end --- @param #ATC_GROUND self function ATC_GROUND:_AirbaseMonitor() - self:E( "In Scheduler") + self.SetClient:ForEachClient( + --- @param Wrapper.Client#CLIENT Client + function( Client ) - for AirbaseID, AirbaseMeta in pairs( self.Airbases ) do + if Client:IsAlive() then - if AirbaseMeta.Monitor == true then + local IsOnGround = Client:InAir() == false - self:E( AirbaseID, AirbaseMeta.MaximumSpeed ) + for AirbaseID, AirbaseMeta in pairs( self.Airbases ) do + self:E( AirbaseID, AirbaseMeta.MaximumSpeed ) + + if AirbaseMeta.Monitor == true and Client:IsInZone( AirbaseMeta.ZoneBoundary ) then - self.SetClient:ForEachClientInZone( AirbaseMeta.ZoneBoundary, - - --- @param Wrapper.Client#CLIENT Client - function( Client ) - - self:E( Client.UnitName ) - if Client and Client:IsAlive() then local NotInRunwayZone = true for ZoneRunwayID, ZoneRunway in pairs( AirbaseMeta.ZoneRunways ) do NotInRunwayZone = ( Client:IsNotInZone( ZoneRunway ) == true ) and NotInRunwayZone or false end - local IsOnGround = Client:InAir() == false - if NotInRunwayZone then if IsOnGround then @@ -245,13 +241,13 @@ function ATC_GROUND:_AirbaseMonitor() Client:SetState( self, "Taxi", false ) end end - else - Client:SetState( self, "Taxi", false ) end end - ) + else + Client:SetState( self, "Taxi", false ) + end end - end + ) return true end diff --git a/docs/Documentation/AI_A2A.html b/docs/Documentation/AI_A2A.html index e0b4ec30e..5e103cb10 100644 --- a/docs/Documentation/AI_A2A.html +++ b/docs/Documentation/AI_A2A.html @@ -671,6 +671,7 @@
+ #number AI_A2A.IdleCount diff --git a/docs/Documentation/Cargo.html b/docs/Documentation/Cargo.html index 3f1622ad1..64107dd30 100644 --- a/docs/Documentation/Cargo.html +++ b/docs/Documentation/Cargo.html @@ -2269,6 +2269,7 @@ The amount of seconds to delay the action.

+ CARGO_CRATE.CargoCarrier diff --git a/docs/Documentation/Designate.html b/docs/Documentation/Designate.html index 0e77566fe..1f8e3673b 100644 --- a/docs/Documentation/Designate.html +++ b/docs/Documentation/Designate.html @@ -1160,6 +1160,7 @@ 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 76f441953..f9bc34671 100644 --- a/docs/Documentation/Detection.html +++ b/docs/Documentation/Detection.html @@ -2469,7 +2469,6 @@ The index of the DetectedItem.

- #number DETECTION_BASE.DetectedItemCount diff --git a/docs/Documentation/Point.html b/docs/Documentation/Point.html index c3e994063..0d83bdc5d 100644 --- a/docs/Documentation/Point.html +++ b/docs/Documentation/Point.html @@ -3495,7 +3495,6 @@ The y coordinate.

- POINT_VEC2.z diff --git a/docs/Documentation/Positionable.html b/docs/Documentation/Positionable.html index 7605224ac..680f960e5 100644 --- a/docs/Documentation/Positionable.html +++ b/docs/Documentation/Positionable.html @@ -2017,6 +2017,7 @@ The height in meters to add to the altitude of the positionable.

+ Core.Spot#SPOT POSITIONABLE.Spot diff --git a/docs/Documentation/Set.html b/docs/Documentation/Set.html index b981a7e2e..e50f2d821 100644 --- a/docs/Documentation/Set.html +++ b/docs/Documentation/Set.html @@ -555,18 +555,6 @@ SET_BASE:_EventOnDeadOrCrash(Event)

Handles the OnDead or OnCrash event for alive units set.

- - - - SET_BASE:_EventOnPlayerEnterUnit(Event) - -

Handles the OnPlayerEnterUnit event to fill the active players table (with the unit filter applied).

- - - - SET_BASE:_EventOnPlayerLeaveUnit(Event) - -

Handles the OnPlayerLeaveUnit event to clean the active players table.

@@ -3059,48 +3047,6 @@ self

- -SET_BASE:_EventOnPlayerEnterUnit(Event) - -
-
- -

Handles the OnPlayerEnterUnit event to fill the active players table (with the unit filter applied).

- -

Parameter

- -
-
-
-
- - -SET_BASE:_EventOnPlayerLeaveUnit(Event) - -
-
- -

Handles the OnPlayerLeaveUnit event to clean the active players table.

- -

Parameter

- -
-
-
-
- SET_BASE:_FilterStart() diff --git a/docs/Documentation/Spawn.html b/docs/Documentation/Spawn.html index b8ac96005..c17bcf5bb 100644 --- a/docs/Documentation/Spawn.html +++ b/docs/Documentation/Spawn.html @@ -2882,9 +2882,6 @@ when nothing was spawned.

- -

Overwrite unit names by default with group name.

-
@@ -2899,9 +2896,6 @@ when nothing was spawned.

- -

By default, no InitLimit

-
@@ -2937,7 +2931,7 @@ when nothing was spawned.

- #number + SPAWN.SpawnMaxGroups @@ -2954,7 +2948,7 @@ when nothing was spawned.

- #number + SPAWN.SpawnMaxUnitsAlive @@ -3282,7 +3276,7 @@ Spawn_BE_KA50 = SPAWN:New( 'BE KA-50@RAMP-Ground Defense' ):Schedule( 600, 0.5 )
- + #boolean SPAWN.SpawnUnControlled @@ -3306,7 +3300,7 @@ Spawn_BE_KA50 = SPAWN:New( 'BE KA-50@RAMP-Ground Defense' ):Schedule( 600, 0.5 ) -

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

+

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

diff --git a/docs/Documentation/SpawnStatic.html b/docs/Documentation/SpawnStatic.html index 8da9a331b..5c4e83a59 100644 --- a/docs/Documentation/SpawnStatic.html +++ b/docs/Documentation/SpawnStatic.html @@ -490,7 +490,6 @@ ptional) The name of the new static.

- #number SPAWNSTATIC.SpawnIndex diff --git a/docs/Documentation/Task_Cargo.html b/docs/Documentation/Task_Cargo.html index 119956c02..968104c7e 100644 --- a/docs/Documentation/Task_Cargo.html +++ b/docs/Documentation/Task_Cargo.html @@ -576,6 +576,7 @@ based on the tasking capabilities defined in Task#TA
+ FSM_PROCESS.DeployZone diff --git a/docs/Documentation/ZoneGoal.html b/docs/Documentation/ZoneGoal.html index cd85537f6..8120d650d 100644 --- a/docs/Documentation/ZoneGoal.html +++ b/docs/Documentation/ZoneGoal.html @@ -489,7 +489,6 @@ The name of the player.

- ZONE_GOAL.SmokeTime @@ -498,9 +497,6 @@ The name of the player.

- -

self.SmokeColor = nil

-
diff --git a/docs/Presentations/ATC_GROUND/Dia1.JPG b/docs/Presentations/ATC_GROUND/Dia1.JPG new file mode 100644 index 000000000..154a6c8aa Binary files /dev/null and b/docs/Presentations/ATC_GROUND/Dia1.JPG differ diff --git a/docs/Presentations/ATC_GROUND/Dia2.JPG b/docs/Presentations/ATC_GROUND/Dia2.JPG new file mode 100644 index 000000000..e94f024da Binary files /dev/null and b/docs/Presentations/ATC_GROUND/Dia2.JPG differ diff --git a/docs/Presentations/ATC_GROUND/Dia3.JPG b/docs/Presentations/ATC_GROUND/Dia3.JPG new file mode 100644 index 000000000..636ffa2a7 Binary files /dev/null and b/docs/Presentations/ATC_GROUND/Dia3.JPG differ diff --git a/docs/Presentations/ATC_GROUND/Dia4.JPG b/docs/Presentations/ATC_GROUND/Dia4.JPG new file mode 100644 index 000000000..516b06654 Binary files /dev/null and b/docs/Presentations/ATC_GROUND/Dia4.JPG differ diff --git a/docs/Presentations/ATC_GROUND/Dia5.JPG b/docs/Presentations/ATC_GROUND/Dia5.JPG new file mode 100644 index 000000000..7169ee3f1 Binary files /dev/null and b/docs/Presentations/ATC_GROUND/Dia5.JPG differ diff --git a/docs/Presentations/ATC_GROUND/Dia6.JPG b/docs/Presentations/ATC_GROUND/Dia6.JPG new file mode 100644 index 000000000..ee9f49739 Binary files /dev/null and b/docs/Presentations/ATC_GROUND/Dia6.JPG differ