weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2025-08-15 10:47:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set the new spawn altitude

Browse Source
This commit is contained in:
FlightControl_Master 2017-08-05 13:33:02 +02:00
parent 544b68c51f
commit 446ecc5b4d
2 changed files with 62 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
Moose Development/Moose/AI/AI_A2A_Dispatcher.lua
View File

@ -418,6 +418,15 @@ do -- AI_A2A_DISPATCHER
-- A2ADispatcher:SetSquadronTakeoffFromParkingHot( "Novo" )
--
--
-- #### 6.1.1. Takeoff Altitude when spawning new aircraft in the air.
--
-- In the case of the @{#AI_A2A_DISPATCHER.SetSquadronTakeoffInAir}() there is also an other parameter that can be applied.
-- That is modifying or setting the **altitude** from where planes spawn in the air.
-- Use the method @{#AI_A2A_DISPATCHER.SetSquadronTakeoffInAirAltitude}() to set the altitude for a specific squadron.
-- The default takeoff altitude can be modified or set using the method @{#AI_A2A_DISPATCHER.SetSquadronTakeoffInAirAltitude}().
-- As part of the method @{#AI_A2A_DISPATCHER.SetSquadronTakeoffInAir}() a parameter can be specified to set the takeoff altitude.
-- If this parameter is not specified, then the default altitude will be used for the squadron.
--
-- ### 6.2. Set squadron landing methods
--
-- In analogy with takeoff, the landing methods are to control how squadrons land at the airfield:
@ -839,6 +848,7 @@ do -- AI_A2A_DISPATCHER
self:SetDisengageRadius( 300000 ) -- The default disengage radius is 300 km.
self:SetDefaultTakeoff( AI_A2A_DISPATCHER.Takeoff.Air )
self:SetDefaultTakeoffInAirAltitude( 500 ) -- Default takeoff is 500 meters above the ground.
self:SetDefaultLanding( AI_A2A_DISPATCHER.Landing.NearAirbase )
self:SetDefaultOverhead( 1 )
self:SetDefaultGrouping( 1 )
@ -1874,6 +1884,7 @@ do -- AI_A2A_DISPATCHER
--- Sets flights to take-off in the air, as part of the defense system.
-- @param #AI_A2A_DISPATCHER self
-- @param #string SquadronName The name of the squadron.
-- @param #number TakeoffAltitude (optional) The altitude in meters above the ground. If not given, the default takeoff altitude will be used.
-- @usage:
--
-- local Dispatcher = AI_A2A_DISPATCHER:New( ... )
@ -1883,10 +1894,14 @@ do -- AI_A2A_DISPATCHER
--
-- @return #AI_A2A_DISPATCHER
--
function AI_A2A_DISPATCHER:SetSquadronTakeoffInAir( SquadronName )
function AI_A2A_DISPATCHER:SetSquadronTakeoffInAir( SquadronName, TakeoffAltitude )
self:SetSquadronTakeoff( SquadronName, AI_A2A_DISPATCHER.Takeoff.Air )
if TakeoffAltitude then
self:SetSquadronTakeoffInAirAltitude( SquadronName, TakeoffAltitude )
end
return self
end
@ -2007,6 +2022,47 @@ do -- AI_A2A_DISPATCHER
end
--- Defines the default altitude where airplanes will spawn in the air and take-off as part of the defense system, when the take-off in the air method has been selected.
-- @param #AI_A2A_DISPATCHER self
-- @param #number TakeoffAltitude The altitude in meters above the ground.
-- @usage:
--
-- local A2ADispatcher = AI_A2A_DISPATCHER:New( ... )
--
-- -- Set the default takeoff altitude when taking off in the air.
-- A2ADispatcher:SetDefaultTakeoffInAirAltitude( 2000 ) -- This makes planes start at 2000 meters above the ground.
--
-- @return #AI_A2A_DISPATCHER
--
function AI_A2A_DISPATCHER:SetDefaultTakeoffInAirAltitude( TakeoffAltitude )
self.DefenderDefault.TakeoffAltitude = TakeoffAltitude
return self
end
--- Defines the default altitude where airplanes will spawn in the air and take-off as part of the defense system, when the take-off in the air method has been selected.
-- @param #AI_A2A_DISPATCHER self
-- @param #string SquadronName The name of the squadron.
-- @param #number TakeoffAltitude The altitude in meters above the ground.
-- @usage:
--
-- local A2ADispatcher = AI_A2A_DISPATCHER:New( ... )
--
-- -- Set the default takeoff altitude when taking off in the air.
-- A2ADispatcher:SetSquadronTakeoffInAirAltitude( "SquadronName", 2000 ) -- This makes planes start at 2000 meters above the ground.
--
-- @return #AI_A2A_DISPATCHER
--
function AI_A2A_DISPATCHER:SetSquadronTakeoffInAirAltitude( SquadronName, TakeoffAltitude )
local DefenderSquadron = self:GetSquadron( SquadronName )
DefenderSquadron.TakeoffAltitude = TakeoffAltitude
return self
end
--- Defines the default method at which flights will land and despawn as part of the defense system.
-- @param #AI_A2A_DISPATCHER self
-- @param #number Landing The landing method which can be NearAirbase, AtRunway, AtEngineShutdown
@ -2461,7 +2517,7 @@ do -- AI_A2A_DISPATCHER
Spawn:InitGrouping( DefenderGrouping )
local TakeoffMethod = self:GetSquadronTakeoff( SquadronName )
local DefenderCAP = Spawn:SpawnAtAirbase( DefenderSquadron.Airbase, TakeoffMethod )
local DefenderCAP = Spawn:SpawnAtAirbase( DefenderSquadron.Airbase, TakeoffMethod, DefenderSquadron.TakeoffAltitude or self.DefenderDefault.TakeoffAltitude )
self:AddDefenderToSquadron( DefenderSquadron, DefenderCAP, DefenderGrouping )
if DefenderCAP then
@ -2608,7 +2664,7 @@ do -- AI_A2A_DISPATCHER
end
local TakeoffMethod = self:GetSquadronTakeoff( ClosestDefenderSquadronName )
local DefenderGCI = Spawn:SpawnAtAirbase( DefenderSquadron.Airbase, TakeoffMethod ) -- Wrapper.Group#GROUP
local DefenderGCI = Spawn:SpawnAtAirbase( DefenderSquadron.Airbase, TakeoffMethod, DefenderSquadron.TakeoffAltitude or self.DefenderDefault.TakeoffAltitude ) -- Wrapper.Group#GROUP
self:F( { GCIDefender = DefenderGCI:GetName() } )
DefendersNeeded = DefendersNeeded - DefenderGrouping

5
Moose Development/Moose/Functional/Spawn.lua
View File

@ -989,9 +989,10 @@ end
-- @param #SPAWN self
-- @param Wrapper.Airbase#AIRBASE Airbase The @{Airbase} where to spawn the group.
-- @param #SPAWN.Takeoff Takeoff (optional) The location and takeoff method. Default is Hot.
-- @param #number TakeoffAltitude (optional) The altitude above the ground.
-- @return Wrapper.Group#GROUP that was spawned.
-- @return #nil Nothing was spawned.
function SPAWN:SpawnAtAirbase( Airbase, Takeoff ) -- R2.2
function SPAWN:SpawnAtAirbase( Airbase, Takeoff, TakeoffAltitude ) -- R2.2
self:F( { self.SpawnTemplatePrefix, Airbase } )
local PointVec3 = Airbase:GetPointVec3()
@ -1025,7 +1026,7 @@ function SPAWN:SpawnAtAirbase( Airbase, Takeoff ) -- R2.2
SpawnTemplate.route.points[1].x = PointVec3.x
SpawnTemplate.route.points[1].y = PointVec3.z
SpawnTemplate.route.points[1].alt = PointVec3.y + 200
SpawnTemplate.route.points[1].alt = PointVec3.y + TakeoffAltitude
SpawnTemplate.route.points[1].type = GROUPTEMPLATE.Takeoff[Takeoff]
SpawnTemplate.route.points[1].airdromeId = Airbase:GetID()