weyne/MOOSE
1
0
Fork 0
mirror of https://github.com/FlightControl-Master/MOOSE.git synced 2026-08-19 05:36:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into branch

Browse Source 
# Conflicts:
#	Moose Development/Moose/Wrapper/Controllable.lua
This commit is contained in:
Applevangelist
2025-11-15 16:52:18 +01:00
parent 742103ff02 ccaf926c6d
commit d25acf1065
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Moose Development/Moose/Functional/Warehouse.lua
+4 -4
View File
@@ -1132,7 +1132,7 @@
-- specify an "Assignment". This can be later used to identify the request and take the right actions. -- specify an "Assignment". This can be later used to identify the request and take the right actions.
-- --
-- Once the request is processed, the @{#WAREHOUSE.OnAfterSelfRequest} function is called. This is where we hook in and postprocess the spawned assets. -- Once the request is processed, the @{#WAREHOUSE.OnAfterSelfRequest} function is called. This is where we hook in and postprocess the spawned assets.
-- In particular, we use the @{AI.AI_Formation#AI_FORMATION} class to make some nice escorts for our carrier. -- In particular, we use the @{Functional.Formation#FORMATION} class to make some nice escorts for our carrier.
-- --
-- When the resue helo is spawned, we can check that this is the correct asset and make the helo go into formation with the carrier. -- When the resue helo is spawned, we can check that this is the correct asset and make the helo go into formation with the carrier.
-- Once the helo runs out of fuel, it will automatically return to the ship and land. For the warehouse, this means that the "cargo", i.e. the helicopter -- Once the helo runs out of fuel, it will automatically return to the ship and land. For the warehouse, this means that the "cargo", i.e. the helicopter
@@ -1175,7 +1175,7 @@
-- --
-- -- Define AI Formation object. -- -- Define AI Formation object.
-- -- Note that this has to be a global variable or the garbage collector will remove it for some reason! -- -- Note that this has to be a global variable or the garbage collector will remove it for some reason!
-- CarrierFormationLeft = AI_FORMATION:New(Mother, groupset, "Left Formation with Carrier", "Escort Carrier.") -- CarrierFormationLeft = FORMATION:New(Mother, groupset, "Left Formation with Carrier")
-- --
-- -- Formation parameters. -- -- Formation parameters.
-- CarrierFormationLeft:FormationLeftWing(200 ,50, 0, 0, 500, 50) -- CarrierFormationLeft:FormationLeftWing(200 ,50, 0, 0, 500, 50)
@@ -1190,7 +1190,7 @@
-- --
-- -- Define AI Formation object. -- -- Define AI Formation object.
-- -- Note that this has to be a global variable or the garbage collector will remove it for some reason! -- -- Note that this has to be a global variable or the garbage collector will remove it for some reason!
-- CarrierFormationRight = AI_FORMATION:New(Mother, groupset, "Right Formation with Carrier", "Escort Carrier.") -- CarrierFormationRight = FORMATION:New(Mother, groupset, "Right Formation with Carrier")
-- --
-- -- Formation parameters. -- -- Formation parameters.
-- CarrierFormationRight:FormationRightWing(200 ,50, 0, 0, 500, 50) -- CarrierFormationRight:FormationRightWing(200 ,50, 0, 0, 500, 50)
@@ -1208,7 +1208,7 @@
-- group:StartUncontrolled() -- group:StartUncontrolled()
-- --
-- -- Define AI Formation object. -- -- Define AI Formation object.
-- CarrierFormationHelo = AI_FORMATION:New(Mother, groupset, "Helo Formation with Carrier", "Fly Formation.") -- CarrierFormationHelo = FORMATION:New(Mother, groupset, "Helo Formation with Carrier")
-- --
-- -- Formation parameters. -- -- Formation parameters.
-- CarrierFormationHelo:FormationCenterWing(-150, 50, 20, 50, 100, 50) -- CarrierFormationHelo:FormationCenterWing(-150, 50, 20, 50, 100, 50)
Moose Development/Moose/Modules.lua
+1
View File
@@ -78,6 +78,7 @@ __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneGoalCargo.lua'
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Tiresias.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Tiresias.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Stratego.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Stratego.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ClientWatch.lua') __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ClientWatch.lua')
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Formation.lua')
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Airboss.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Airboss.lua' )
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/RecoveryTanker.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/RecoveryTanker.lua' )
Moose Development/Moose/Wrapper/Controllable.lua
+1 -1
View File
@@ -409,7 +409,7 @@ function CONTROLLABLE:SetTask( DCSTask, WaitTime )
local Controller = self:_GetController() local Controller = self:_GetController()
-- self:I( "Before SetTask" ) -- self:I( "Before SetTask" )
Controller:setTask( DCSTask ) Controller:setTask( DCSTask )
-- RESCUEHELO calls SetTask twice per second! hence spamming the DCS log file ==> setting this to trace. -- FORMATION class (used by RESCUEHELO) calls SetTask twice per second! hence spamming the DCS log file ==> setting this to trace.
self:T( { ControllableName = self:GetName(), DCSTask = DCSTask } ) self:T( { ControllableName = self:GetName(), DCSTask = DCSTask } )
else else
BASE:E( { DCSControllableName .. " is not alive anymore.", DCSTask = DCSTask } ) BASE:E( { DCSControllableName .. " is not alive anymore.", DCSTask = DCSTask } )