mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2025-10-29 16:58:06 +00:00
Merge branch 'master' into develop
# Conflicts: # Moose Development/Moose/Modules.lua # Moose Development/Moose/Ops/Airboss.lua
This commit is contained in:
kaltokri
commit
547579ffb0
@ -1,182 +1,185 @@
|
|||||||
__Moose.Include( 'Scripts/Moose/Utilities/Enums.lua' )
|
if not MOOSE_DEVELOPMENT_FOLDER then
|
||||||
__Moose.Include( 'Scripts/Moose/Utilities/FiFo.lua' )
|
MOOSE_DEVELOPMENT_FOLDER='Scripts'
|
||||||
__Moose.Include( 'Scripts/Moose/Utilities/Profiler.lua' )
|
end
|
||||||
__Moose.Include( 'Scripts/Moose/Utilities/Socket.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Utilities/Enums.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Utilities/STTS.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Utilities/FiFo.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Utilities/Templates.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Utilities/Profiler.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Utilities/Utils.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( 'Scripts/Moose/Core/Base.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Base.lua' )
|
||||||
|
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Astar.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Astar.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Beacon.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Beacon.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Condition.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Condition.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/ClientMenu.lua')
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/ClientMenu.lua')
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Database.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Database.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Event.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Event.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Fsm.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Fsm.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Goal.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Goal.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/MarkerOps_Base.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/MarkerOps_Base.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Menu.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Menu.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Message.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Message.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Point.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Point.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Report.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Report.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/ScheduleDispatcher.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/ScheduleDispatcher.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Scheduler.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Scheduler.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Set.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Set.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Settings.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Settings.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Spawn.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Spawn.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/SpawnStatic.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/SpawnStatic.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Spot.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Spot.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/TextAndSound.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/TextAndSound.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Timer.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Timer.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/UserFlag.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/UserFlag.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Velocity.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Velocity.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Zone_Detection.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Zone_Detection.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Zone.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Zone.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Core/Pathline.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Core/Pathline.lua' )
|
||||||
|
|
||||||
__Moose.Include( 'Scripts/Moose/Wrapper/Airbase.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Airbase.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Wrapper/Client.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Client.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Wrapper/Controllable.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Controllable.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Wrapper/Group.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Group.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Wrapper/Identifiable.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Identifiable.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Wrapper/Marker.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Marker.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Wrapper/Object.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Object.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Wrapper/Positionable.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Positionable.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Wrapper/Scenery.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Scenery.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Wrapper/Static.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Static.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Wrapper/Unit.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Unit.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Wrapper/Weapon.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Weapon.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Wrapper/Net.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Net.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Wrapper/Storage.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Wrapper/Storage.lua' )
|
||||||
|
|
||||||
__Moose.Include( 'Scripts/Moose/Cargo/Cargo.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Cargo/Cargo.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Cargo/CargoUnit.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Cargo/CargoUnit.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Cargo/CargoSlingload.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Cargo/CargoSlingload.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Cargo/CargoCrate.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Cargo/CargoCrate.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Cargo/CargoGroup.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Cargo/CargoGroup.lua' )
|
||||||
|
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/AICSAR.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/AICSAR.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/AmmoTruck.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/AmmoTruck.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/Artillery.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Artillery.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/ATC_Ground.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/ATC_Ground.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/Autolase.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Autolase.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/CleanUp.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/CleanUp.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/Designate.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Designate.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/Detection.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Detection.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/DetectionZones.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/DetectionZones.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/Escort.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Escort.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/Fox.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Fox.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/Mantis.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Mantis.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/MissileTrainer.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/MissileTrainer.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/Movement.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Movement.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/PseudoATC.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/PseudoATC.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/Range.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Range.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/RAT.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/RAT.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/Scoring.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Scoring.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/Sead.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Sead.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/Shorad.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Shorad.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/Suppression.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Suppression.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/Warehouse.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Warehouse.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/ZoneCaptureCoalition.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/ZoneCaptureCoalition.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/ZoneGoal.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/ZoneGoal.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/ZoneGoalCargo.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/ZoneGoalCargo.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/ZoneGoalCoalition.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/ZoneGoalCoalition.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/Tiresias.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Tiresias.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Functional/Stratego.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Functional/Stratego.lua' )
|
||||||
|
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/Airboss.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Airboss.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/AirWing.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/AirWing.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/ArmyGroup.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/ArmyGroup.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/ATIS.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/ATIS.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/Auftrag.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Auftrag.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/Awacs.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Awacs.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/Brigade.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Brigade.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/Chief.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Chief.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/Cohort.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Cohort.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/Commander.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Commander.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/CSAR.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/CSAR.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/CTLD.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/CTLD.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/Fleet.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Fleet.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/FlightControl.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/FlightControl.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/FlightGroup.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/FlightGroup.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/Flotilla.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Flotilla.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/Intelligence.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Intelligence.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/Legion.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Legion.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/NavyGroup.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/NavyGroup.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/Operation.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Operation.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/OpsGroup.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/OpsGroup.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/OpsTransport.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/OpsTransport.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/OpsZone.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/OpsZone.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/Platoon.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Platoon.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/PlayerTask.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/PlayerTask.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/PlayerRecce.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/PlayerRecce.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/RecoveryTanker.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/RecoveryTanker.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/RescueHelo.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/RescueHelo.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/Squadron.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Squadron.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/Target.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/Target.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Ops/EasyGCICAP.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Ops/EasyGCICAP.lua' )
|
||||||
|
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Balancer.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Balancer.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Air.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Air.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Air_Patrol.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Air_Patrol.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Air_Engage.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Air_Engage.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_A2A_Patrol.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_A2A_Patrol.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_A2A_Cap.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_A2A_Cap.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_A2A_Gci.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_A2A_Gci.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_A2A_Dispatcher.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_A2A_Dispatcher.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_A2G_BAI.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_A2G_BAI.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_A2G_CAS.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_A2G_CAS.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_A2G_SEAD.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_A2G_SEAD.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_A2G_Dispatcher.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_A2G_Dispatcher.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Patrol.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Patrol.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_CAP.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_CAP.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_CAS.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_CAS.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_BAI.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_BAI.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Formation.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Formation.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Escort.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Escort.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Escort_Request.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Escort_Request.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Escort_Dispatcher.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Escort_Dispatcher.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Escort_Dispatcher_Request.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Escort_Dispatcher_Request.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Cargo.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_APC.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo_APC.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Helicopter.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo_Helicopter.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Airplane.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo_Airplane.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Ship.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo_Ship.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Dispatcher.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo_Dispatcher.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Dispatcher_APC.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo_Dispatcher_APC.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Dispatcher_Helicopter.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo_Dispatcher_Helicopter.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Dispatcher_Airplane.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo_Dispatcher_Airplane.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Dispatcher_Ship.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/AI/AI_Cargo_Dispatcher_Ship.lua' )
|
||||||
|
|
||||||
__Moose.Include( 'Scripts/Moose/Actions/Act_Assign.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Actions/Act_Assign.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Actions/Act_Route.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Actions/Act_Route.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Actions/Act_Account.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Actions/Act_Account.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Actions/Act_Assist.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Actions/Act_Assist.lua' )
|
||||||
|
|
||||||
__Moose.Include( 'Scripts/Moose/Sound/Radio.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Sound/Radio.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Sound/RadioQueue.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Sound/RadioQueue.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Sound/RadioSpeech.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Sound/RadioSpeech.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Sound/SoundOutput.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Sound/SoundOutput.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Sound/SRS.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Sound/SRS.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Sound/UserSound.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Sound/UserSound.lua' )
|
||||||
|
|
||||||
__Moose.Include( 'Scripts/Moose/Tasking/CommandCenter.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/CommandCenter.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Tasking/Mission.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Mission.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Tasking/Task.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Tasking/TaskInfo.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/TaskInfo.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Tasking/Task_Manager.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_Manager.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Tasking/DetectionManager.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/DetectionManager.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Tasking/Task_A2G_Dispatcher.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_A2G_Dispatcher.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Tasking/Task_A2G.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_A2G.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Tasking/Task_A2A_Dispatcher.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_A2A_Dispatcher.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Tasking/Task_A2A.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_A2A.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Tasking/Task_CARGO.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_CARGO.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Tasking/Task_Cargo_Transport.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_Cargo_Transport.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Tasking/Task_Cargo_CSAR.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_Cargo_CSAR.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Tasking/Task_Cargo_Dispatcher.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_Cargo_Dispatcher.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Tasking/Task_Capture_Zone.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_Capture_Zone.lua' )
|
||||||
__Moose.Include( 'Scripts/Moose/Tasking/Task_Capture_Dispatcher.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Tasking/Task_Capture_Dispatcher.lua' )
|
||||||
|
|
||||||
__Moose.Include( 'Scripts/Moose/Globals.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'Moose/Globals.lua' )
|
||||||
|
|||||||
@ -3062,7 +3062,7 @@ function AIRBOSS:EnableSRS(PathToSRS,Port,Culture,Gender,Voice,GoogleCreds,Volum
|
|||||||
-- SRS
|
-- SRS
|
||||||
local Frequency = self.AirbossRadio.frequency
|
local Frequency = self.AirbossRadio.frequency
|
||||||
local Modulation = self.AirbossRadio.modulation
|
local Modulation = self.AirbossRadio.modulation
|
||||||
self.SRS = MSRS:New(PathToSRS,Frequency,Modulation,Volume,AltBackend)
|
self.SRS = MSRS:New(PathToSRS,Frequency,Modulation,AltBackend)
|
||||||
self.SRS:SetCoalition(self:GetCoalition())
|
self.SRS:SetCoalition(self:GetCoalition())
|
||||||
self.SRS:SetCoordinate(self:GetCoordinate())
|
self.SRS:SetCoordinate(self:GetCoordinate())
|
||||||
self.SRS:SetCulture(Culture or "en-US")
|
self.SRS:SetCulture(Culture or "en-US")
|
||||||
@ -3072,7 +3072,7 @@ function AIRBOSS:EnableSRS(PathToSRS,Port,Culture,Gender,Voice,GoogleCreds,Volum
|
|||||||
self.SRS:SetPort(Port or 5002)
|
self.SRS:SetPort(Port or 5002)
|
||||||
self.SRS:SetLabel(self.AirbossRadio.alias or "AIRBOSS")
|
self.SRS:SetLabel(self.AirbossRadio.alias or "AIRBOSS")
|
||||||
self.SRS:SetCoordinate(self.carrier:GetCoordinate())
|
self.SRS:SetCoordinate(self.carrier:GetCoordinate())
|
||||||
self.SRS:SetVolume(Volume)
|
self.SRS:SetVolume(Volume or 1)
|
||||||
--self.SRS:SetModulations(Modulations)
|
--self.SRS:SetModulations(Modulations)
|
||||||
if GoogleCreds then
|
if GoogleCreds then
|
||||||
self.SRS:SetProviderOptionsGoogle(GoogleCreds,GoogleCreds)
|
self.SRS:SetProviderOptionsGoogle(GoogleCreds,GoogleCreds)
|
||||||
|
|||||||
@ -265,19 +265,47 @@ MSRS.version="0.3.0"
|
|||||||
--- Voices
|
--- Voices
|
||||||
-- @type MSRS.Voices
|
-- @type MSRS.Voices
|
||||||
MSRS.Voices = {
|
MSRS.Voices = {
|
||||||
Microsoft = {
|
Microsoft = { -- working ones if not using gRPC and MS
|
||||||
["Hedda"] = "Microsoft Hedda Desktop", -- de-DE
|
["Hedda"] = "Microsoft Hedda Desktop", -- de-DE
|
||||||
["Hazel"] = "Microsoft Hazel Desktop", -- en-GB
|
["Hazel"] = "Microsoft Hazel Desktop", -- en-GB
|
||||||
["David"] = "Microsoft David Desktop", -- en-US
|
["David"] = "Microsoft David Desktop", -- en-US
|
||||||
["Zira"] = "Microsoft Zira Desktop", -- en-US
|
["Zira"] = "Microsoft Zira Desktop", -- en-US
|
||||||
["Hortense"] = "Microsoft Hortense Desktop", --fr-FR
|
["Hortense"] = "Microsoft Hortense Desktop", --fr-FR
|
||||||
|
["de-DE-Hedda"] = "Microsoft Hedda Desktop", -- de-DE
|
||||||
|
["en-GB-Hazel"] = "Microsoft Hazel Desktop", -- en-GB
|
||||||
|
["en-US-David"] = "Microsoft David Desktop", -- en-US
|
||||||
|
["en-US-Zira"] = "Microsoft Zira Desktop", -- en-US
|
||||||
|
["fr-FR-Hortense"] = "Microsoft Hortense Desktop", --fr-FR
|
||||||
},
|
},
|
||||||
MicrosoftGRPC = {
|
MicrosoftGRPC = { -- en-US/GB voices only as of Jan 2024, working ones if using gRPC and MS, if voice packs are installed
|
||||||
["Hedda"] = "Hedda", -- de-DE
|
--["Hedda"] = "Hedda", -- de-DE
|
||||||
["Hazel"] = "Hazel", -- en-GB
|
["Hazel"] = "Hazel", -- en-GB
|
||||||
|
["George"] = "George", -- en-GB
|
||||||
|
["Susan"] = "Susan", -- en-GB
|
||||||
["David"] = "David", -- en-US
|
["David"] = "David", -- en-US
|
||||||
["Zira"] = "Zira", -- en-US
|
["Zira"] = "Zira", -- en-US
|
||||||
["Hortense"] = "Hortense", --fr-FR
|
["Mark"] = "Mark", -- en-US
|
||||||
|
["James"] = "James", --en-AU
|
||||||
|
["Catherine"] = "Catherine", --en-AU
|
||||||
|
["Richard"] = "Richard", --en-CA
|
||||||
|
["Linda"] = "Linda", --en-CA
|
||||||
|
["Ravi"] = "Ravi", --en-IN
|
||||||
|
["Heera"] = "Heera", --en-IN
|
||||||
|
["Sean"] = "Sean", --en-IR
|
||||||
|
["en_GB_Hazel"] = "Hazel", -- en-GB
|
||||||
|
["en_GB_George"] = "George", -- en-GB
|
||||||
|
["en_GB_Susan"] = "Susan", -- en-GB
|
||||||
|
["en_US_David"] = "David", -- en-US
|
||||||
|
["en_US_Zira"] = "Zira", -- en-US
|
||||||
|
["en_US_Mark"] = "Mark", -- en-US
|
||||||
|
["en_AU_James"] = "James", --en-AU
|
||||||
|
["en_AU_Catherine"] = "Catherine", --en-AU
|
||||||
|
["en_CA_Richard"] = "Richard", --en-CA
|
||||||
|
["en_CA_Linda"] = "Linda", --en-CA
|
||||||
|
["en_IN_Ravi"] = "Ravi", --en-IN
|
||||||
|
["en_IN_Heera"] = "Heera", --en-IN
|
||||||
|
["en_IR_Sean"] = "Sean", --en-IR
|
||||||
|
--]]
|
||||||
},
|
},
|
||||||
Google = {
|
Google = {
|
||||||
Standard = {
|
Standard = {
|
||||||
|
|||||||
@ -18,5 +18,7 @@ __Moose.Include = function( IncludeFile )
|
|||||||
end
|
end
|
||||||
|
|
||||||
__Moose.Includes = {}
|
__Moose.Includes = {}
|
||||||
|
if not MOOSE_DEVELOPMENT_FOLDER then
|
||||||
__Moose.Include( 'Scripts/Moose/Modules.lua' )
|
MOOSE_DEVELOPMENT_FOLDER='Scripts'
|
||||||
|
end
|
||||||
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Modules.lua' )
|
||||||
|
|||||||
@ -3,7 +3,11 @@
|
|||||||
-- Try to load Moose as individual script files from <DcsInstallDir\Script\Moose
|
-- Try to load Moose as individual script files from <DcsInstallDir\Script\Moose
|
||||||
-- which should be a Junction link to the MOOSE repository subfolder "Moose Development\Moose".
|
-- which should be a Junction link to the MOOSE repository subfolder "Moose Development\Moose".
|
||||||
-- This method is used by Moose developers and not mission builders.
|
-- This method is used by Moose developers and not mission builders.
|
||||||
ModuleLoader = 'Scripts/Moose/Modules.lua'
|
if not MOOSE_DEVELOPMENT_FOLDER then
|
||||||
|
MOOSE_DEVELOPMENT_FOLDER='Scripts'
|
||||||
|
end
|
||||||
|
|
||||||
|
ModuleLoader = MOOSE_DEVELOPMENT_FOLDER..'/Moose/Modules.lua'
|
||||||
|
|
||||||
if io then
|
if io then
|
||||||
local f=io.open(ModuleLoader,"r")
|
local f=io.open(ModuleLoader,"r")
|
||||||
@ -31,7 +35,7 @@ if io then
|
|||||||
|
|
||||||
__Moose.Includes = {}
|
__Moose.Includes = {}
|
||||||
|
|
||||||
__Moose.Include( 'Scripts/Moose/Modules.lua' )
|
__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Modules.lua' )
|
||||||
BASE:TraceOnOff( true )
|
BASE:TraceOnOff( true )
|
||||||
env.info( '*** MOOSE INCLUDE END *** ' )
|
env.info( '*** MOOSE INCLUDE END *** ' )
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user