From 697042eac6c086da902b4016e7abb63d4b687b1e Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Wed, 10 Jan 2024 13:38:48 +0100 Subject: [PATCH 1/4] EASYGCICAP - less noise --- Moose Development/Moose/Ops/EasyGCICAP.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Moose Development/Moose/Ops/EasyGCICAP.lua b/Moose Development/Moose/Ops/EasyGCICAP.lua index ee1dc3138..6e3ef6079 100644 --- a/Moose Development/Moose/Ops/EasyGCICAP.lua +++ b/Moose Development/Moose/Ops/EasyGCICAP.lua @@ -491,7 +491,7 @@ function EASYGCICAP:_AddAirwing(Airbasename, Alias) -- Create Airwing local CAP_Wing = AIRWING:New(Airbasename,Alias) - CAP_Wing:SetVerbosityLevel(3) + CAP_Wing:SetVerbosityLevel(0) CAP_Wing:SetReportOff() CAP_Wing:SetMarker(false) CAP_Wing:SetAirbase(AIRBASE:FindByName(Airbasename)) From 21babb548c88d3093750be1471e2ddc6765a868c Mon Sep 17 00:00:00 2001 From: kaltokri Date: Wed, 10 Jan 2024 15:39:23 +0100 Subject: [PATCH 2/4] Fixed typo off manual merge and added PyCharm to gitignore --- .gitignore | 3 + Moose Development/Moose/Modules.lua | 342 ++++++++++++++-------------- 2 files changed, 174 insertions(+), 171 deletions(-) diff --git a/.gitignore b/.gitignore index 170eeefe1..63ed14ae4 100644 --- a/.gitignore +++ b/.gitignore @@ -228,6 +228,9 @@ pip-log.txt #Goodsync _gsdata_/ +# PyCharm +.idea + #GITHUB Moose Test Missions/MOOSE_Test_Template.miz Moose Development/Moose/.vscode/launch.json diff --git a/Moose Development/Moose/Modules.lua b/Moose Development/Moose/Modules.lua index e38c4b128..a00763d1c 100644 --- a/Moose Development/Moose/Modules.lua +++ b/Moose Development/Moose/Modules.lua @@ -1,185 +1,185 @@ if not MOOSE_DEVELOPMENT_FOLDER then MOOSE_DEVELOPMENT_FOLDER='Scripts' end -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Utilities/Enums.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Utilities/FiFo.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Utilities/Profiler.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Utilities/Socket.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Utilities/STTS.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Utilities/Templates.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Utilities/Utils.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Enums.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/FiFo.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Profiler.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Socket.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/STTS.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Templates.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Utils.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Base.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Base.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Astar.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Beacon.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Condition.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/ClientMenu.lua') -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Database.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Event.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Fsm.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Goal.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/MarkerOps_Base.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Menu.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Message.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Point.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Report.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/ScheduleDispatcher.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Scheduler.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Set.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Settings.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Spawn.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/SpawnStatic.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Spot.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/TextAndSound.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Timer.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/UserFlag.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Velocity.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Zone_Detection.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Zone.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Pathline.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Astar.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Beacon.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Condition.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/ClientMenu.lua') +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Database.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Event.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Fsm.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Goal.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/MarkerOps_Base.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Menu.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Message.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Point.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Report.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/ScheduleDispatcher.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Scheduler.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Set.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Settings.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Spawn.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/SpawnStatic.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Spot.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/TextAndSound.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Timer.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/UserFlag.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Velocity.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Zone_Detection.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Zone.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Pathline.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Airbase.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Client.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Controllable.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Group.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Identifiable.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Marker.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Object.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Positionable.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Scenery.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Static.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Unit.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Weapon.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Net.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Storage.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Airbase.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Client.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Controllable.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Group.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Identifiable.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Marker.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Object.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Positionable.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Scenery.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Static.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Unit.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Weapon.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Net.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Storage.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Cargo/Cargo.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Cargo/CargoUnit.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Cargo/CargoSlingload.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Cargo/CargoCrate.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Cargo/CargoGroup.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Cargo/Cargo.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Cargo/CargoUnit.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Cargo/CargoSlingload.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Cargo/CargoCrate.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Cargo/CargoGroup.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/AICSAR.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/AmmoTruck.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Artillery.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/ATC_Ground.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Autolase.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/CleanUp.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Designate.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Detection.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/DetectionZones.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Escort.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Fox.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Mantis.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/MissileTrainer.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Movement.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/PseudoATC.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Range.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/RAT.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Scoring.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Sead.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Shorad.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Suppression.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Warehouse.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/ZoneCaptureCoalition.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/ZoneGoal.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/ZoneGoalCargo.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/ZoneGoalCoalition.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/AICSAR.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/AmmoTruck.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Artillery.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ATC_Ground.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Autolase.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/CleanUp.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Designate.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Detection.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/DetectionZones.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Escort.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Fox.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Mantis.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/MissileTrainer.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Movement.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/PseudoATC.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Range.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/RAT.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Scoring.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Sead.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Shorad.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Suppression.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Warehouse.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneCaptureCoalition.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneGoal.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneGoalCargo.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneGoalCoalition.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/Ops/Airboss.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/AirWing.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/ArmyGroup.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/ATIS.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Auftrag.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Awacs.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Brigade.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Chief.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Cohort.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Commander.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/CSAR.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/CTLD.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Fleet.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/FlightControl.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/FlightGroup.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Flotilla.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Intelligence.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Legion.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/NavyGroup.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Operation.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/OpsGroup.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/OpsTransport.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/OpsZone.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Platoon.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/PlayerTask.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/PlayerRecce.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/RecoveryTanker.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/RescueHelo.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Squadron.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Target.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/EasyGCICAP.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Airboss.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/AirWing.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/ArmyGroup.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/ATIS.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Auftrag.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Awacs.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Brigade.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Chief.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Cohort.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Commander.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/CSAR.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/CTLD.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Fleet.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/FlightControl.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/FlightGroup.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Flotilla.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Intelligence.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Legion.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/NavyGroup.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Operation.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/OpsGroup.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/OpsTransport.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/OpsZone.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Platoon.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/PlayerTask.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/PlayerRecce.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/RecoveryTanker.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/RescueHelo.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Squadron.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Target.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/EasyGCICAP.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Balancer.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Air.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Air_Patrol.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Air_Engage.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_A2A_Patrol.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_A2A_Cap.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_A2A_Gci.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_A2A_Dispatcher.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_A2G_BAI.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_A2G_CAS.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_A2G_SEAD.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_A2G_Dispatcher.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Patrol.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_CAP.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_CAS.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_BAI.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Formation.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Escort.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Escort_Request.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Escort_Dispatcher.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Escort_Dispatcher_Request.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo_APC.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo_Helicopter.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo_Airplane.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo_Ship.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo_Dispatcher.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo_Dispatcher_APC.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo_Dispatcher_Helicopter.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo_Dispatcher_Airplane.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo_Dispatcher_Ship.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Balancer.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Air.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Air_Patrol.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Air_Engage.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_A2A_Patrol.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_A2A_Cap.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_A2A_Gci.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_A2A_Dispatcher.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_A2G_BAI.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_A2G_CAS.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_A2G_SEAD.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_A2G_Dispatcher.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Patrol.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_CAP.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_CAS.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_BAI.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Formation.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Escort.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Escort_Request.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Escort_Dispatcher.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Escort_Dispatcher_Request.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo_APC.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo_Helicopter.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo_Airplane.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo_Ship.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo_Dispatcher.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo_Dispatcher_APC.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo_Dispatcher_Helicopter.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo_Dispatcher_Airplane.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/AI/AI_Cargo_Dispatcher_Ship.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Actions/Act_Assign.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Actions/Act_Route.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Actions/Act_Account.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Actions/Act_Assist.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Actions/Act_Assign.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Actions/Act_Route.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Actions/Act_Account.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Actions/Act_Assist.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Sound/Radio.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Sound/RadioQueue.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Sound/RadioSpeech.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Sound/SoundOutput.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Sound/SRS.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Sound/UserSound.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/Radio.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/RadioQueue.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/RadioSpeech.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/SoundOutput.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/SRS.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/UserSound.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/CommandCenter.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Mission.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/TaskInfo.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_Manager.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/DetectionManager.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_A2G_Dispatcher.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_A2G.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_A2A_Dispatcher.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_A2A.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_CARGO.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_Cargo_Transport.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_Cargo_CSAR.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_Cargo_Dispatcher.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_Capture_Zone.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_Capture_Dispatcher.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/CommandCenter.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Mission.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/TaskInfo.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_Manager.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/DetectionManager.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_A2G_Dispatcher.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_A2G.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_A2A_Dispatcher.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_A2A.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_CARGO.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_Cargo_Transport.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_Cargo_CSAR.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_Cargo_Dispatcher.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_Capture_Zone.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Task_Capture_Dispatcher.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Globals.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Globals.lua' ) From a44ad5c7551e4a4df34f2f9d4526be78f7c3f202 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Thu, 11 Jan 2024 10:05:22 +0100 Subject: [PATCH 3/4] Changed order to match master branch for better auto-merge --- Moose Development/Moose/Modules.lua | 113 ++++++++++++++-------------- 1 file changed, 56 insertions(+), 57 deletions(-) diff --git a/Moose Development/Moose/Modules.lua b/Moose Development/Moose/Modules.lua index b8202a1cc..a380e6528 100644 --- a/Moose Development/Moose/Modules.lua +++ b/Moose Development/Moose/Modules.lua @@ -1,52 +1,51 @@ __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Enums.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/FiFo.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Profiler.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Socket.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/STTS.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Templates.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Utils.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Profiler.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Templates.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/STTS.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/FiFo.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Utilities/Socket.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Base.lua' ) - __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Astar.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Beacon.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Condition.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/ClientMenu.lua') -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Database.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Event.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Fsm.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Goal.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/MarkerOps_Base.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Menu.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Message.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Point.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/UserFlag.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Report.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/ScheduleDispatcher.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Scheduler.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Set.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/ScheduleDispatcher.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Event.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Settings.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Menu.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Zone.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Zone_Detection.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Database.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Set.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Point.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Velocity.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Message.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Fsm.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Spawn.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/SpawnStatic.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Spot.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/TextAndSound.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Timer.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/UserFlag.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Velocity.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Zone_Detection.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Zone.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Goal.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Spot.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/MarkerOps_Base.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/TextAndSound.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Pathline.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/ClientMenu.lua') -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Airbase.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Client.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Object.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Identifiable.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Positionable.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Controllable.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Group.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Identifiable.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Marker.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Object.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Positionable.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Scenery.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Static.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Unit.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Client.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Static.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Airbase.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Scenery.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Marker.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Weapon.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Net.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Wrapper/Storage.lua' ) @@ -57,47 +56,49 @@ __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Cargo/CargoSlingload.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Cargo/CargoCrate.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Cargo/CargoGroup.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/AICSAR.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/AmmoTruck.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Artillery.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ATC_Ground.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Autolase.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Scoring.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/CleanUp.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Designate.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Movement.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Sead.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Escort.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/MissileTrainer.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ATC_Ground.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Detection.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/DetectionZones.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Escort.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Designate.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/RAT.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Range.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneGoal.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneGoalCoalition.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneCaptureCoalition.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Artillery.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Suppression.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/PseudoATC.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Warehouse.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Fox.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Mantis.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/MissileTrainer.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Movement.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/PseudoATC.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Range.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/RAT.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Scoring.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Sead.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Shorad.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Suppression.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Warehouse.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneCaptureCoalition.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneGoal.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/AICSAR.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/AmmoTruck.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/Autolase.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneGoalCargo.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Functional/ZoneGoalCoalition.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/Ops/Airboss.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/RecoveryTanker.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/RescueHelo.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/ATIS.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/CTLD.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/CSAR.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/AirWing.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/ArmyGroup.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/ATIS.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Auftrag.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Awacs.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Brigade.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Chief.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Cohort.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Commander.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/CSAR.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/CTLD.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Fleet.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/FlightControl.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/FlightGroup.lua' ) @@ -112,8 +113,6 @@ __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/OpsZone.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Platoon.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/PlayerTask.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/PlayerRecce.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/RecoveryTanker.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/RescueHelo.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Squadron.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/Target.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Ops/EasyGCICAP.lua' ) @@ -155,12 +154,12 @@ __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Actions/Act_Route.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Actions/Act_Account.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Actions/Act_Assist.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/UserSound.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/SoundOutput.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/Radio.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/RadioQueue.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/RadioSpeech.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/SoundOutput.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/SRS.lua' ) -__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Sound/UserSound.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/CommandCenter.lua' ) __Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Tasking/Mission.lua' ) From 35d91c9c949fed9ad0bcb8ff89f63fac40979bfc Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Thu, 11 Jan 2024 12:52:15 +0100 Subject: [PATCH 4/4] EASYGCICAP Additions --- Moose Development/Moose/Ops/EasyGCICAP.lua | 25 ++++++---------------- 1 file changed, 6 insertions(+), 19 deletions(-) diff --git a/Moose Development/Moose/Ops/EasyGCICAP.lua b/Moose Development/Moose/Ops/EasyGCICAP.lua index 6e3ef6079..115eb1c63 100644 --- a/Moose Development/Moose/Ops/EasyGCICAP.lua +++ b/Moose Development/Moose/Ops/EasyGCICAP.lua @@ -258,10 +258,10 @@ EASYGCICAP.version="0.0.9" --- Create a new GCICAP Manager -- @param #EASYGCICAP self --- @param #string Alias --- @param #string AirbaseName --- @param #string Coalition --- @param #string EWRName +-- @param #string Alias A Name for this GCICAP +-- @param #string AirbaseName Name of the Home Airbase +-- @param #string Coalition Coalition, e.g. "blue" or "red" +-- @param #string EWRName (Partial) group name of the EWR system of the coalition, e.g. "Red EWR" -- @return #EASYGCICAP self function EASYGCICAP:New(Alias, AirbaseName, Coalition, EWRName) -- Inherit everything from FSM class. @@ -528,6 +528,7 @@ function EASYGCICAP:_AddAirwing(Airbasename, Alias) flightgroup:SetDespawnAfterHolding() flightgroup:SetDestinationbase(AIRBASE:FindByName(Airbasename)) flightgroup:GetGroup():CommandEPLRS(true,5) + flightgroup:GetGroup():SetOptionRadarUsingForContinousSearch() if Mission.type ~= AUFTRAG.Type.TANKER and Mission.type ~= AUFTRAG.Type.AWACS and Mission.type ~= AUFTRAG.Type.RECON then flightgroup:SetDetection(true) flightgroup:SetEngageDetectedOn(self.engagerange,{"Air"},self.GoZoneSet,self.NoGoZoneSet) @@ -548,7 +549,7 @@ function EASYGCICAP:_AddAirwing(Airbasename, Alias) flightgroup:SetFuelLowRTB(true) Intel:AddAgent(flightgroup) function flightgroup:OnAfterHolding(From,Event,To) - self:ClearToLand(5) + self:Despawn(1,true) end end @@ -1140,20 +1141,6 @@ function EASYGCICAP:_StartIntel() -- Do we have a matching airwing? if targetairwing then local AssetCount = targetairwing:CountAssetsOnMission(MissionTypes,Cohort) - --[[ - local Assets = targetairwing:GetAssetsOnMission(AUFTRAG.Type.GCICAP) - for _,_asset in pairs(Assets) do - local asset = _asset -- Functional.Warehouse#WAREHOUSE.Assetitem - local fg = asset.flightgroup - local name = asset.spawngroupname - local mission = fg:GetMissionCurrent() - local mtype = mission.type - local distance = position:Get3DDistance(fg:GetCoordinate()) or 1000*1000 - distance = distance / 1000 - local text = string.format("FlightGroup %s on mission %s with distance %d km",name,mtype,distance) - local m = MESSAGE:New(text,15,"GCICAP"):ToAllIf(self.debug):ToLog() - end - --]] -- Enough airframes on mission already? self:T(self.lid.." Assets on Mission "..AssetCount) if AssetCount <= MaxAliveMissions then