From 4ac583e4345a36f8e2af2c226c62886b5dbc2c05 Mon Sep 17 00:00:00 2001 From: Applevangelist Date: Tue, 9 Jan 2024 17:28:58 +0100 Subject: [PATCH 1/3] SRS changes --- Moose Development/Moose/Ops/Airboss.lua | 3 ++- Moose Development/Moose/Sound/SRS.lua | 36 ++++++++++++++++++++++--- 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/Moose Development/Moose/Ops/Airboss.lua b/Moose Development/Moose/Ops/Airboss.lua index d7a467e44..1b9355b11 100644 --- a/Moose Development/Moose/Ops/Airboss.lua +++ b/Moose Development/Moose/Ops/Airboss.lua @@ -3062,7 +3062,7 @@ function AIRBOSS:EnableSRS(PathToSRS,Port,Culture,Gender,Voice,GoogleCreds,Volum -- SRS local Frequency = self.AirbossRadio.frequency 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:SetCoordinate(self:GetCoordinate()) self.SRS:SetCulture(Culture or "en-US") @@ -3072,6 +3072,7 @@ function AIRBOSS:EnableSRS(PathToSRS,Port,Culture,Gender,Voice,GoogleCreds,Volum self.SRS:SetPort(Port or 5002) self.SRS:SetLabel(self.AirbossRadio.alias or "AIRBOSS") self.SRS:SetCoordinate(self.carrier:GetCoordinate()) + self.SRS:SetVolume(Volume or 1) --self.SRS:SetModulations(Modulations) if GoogleCreds then self.SRS:SetGoogle(GoogleCreds) diff --git a/Moose Development/Moose/Sound/SRS.lua b/Moose Development/Moose/Sound/SRS.lua index ec38d5862..9d075dfd0 100644 --- a/Moose Development/Moose/Sound/SRS.lua +++ b/Moose Development/Moose/Sound/SRS.lua @@ -265,19 +265,47 @@ MSRS.version="0.3.0" --- Voices -- @type MSRS.Voices MSRS.Voices = { - Microsoft = { + Microsoft = { -- working ones if not using gRPC and MS ["Hedda"] = "Microsoft Hedda Desktop", -- de-DE ["Hazel"] = "Microsoft Hazel Desktop", -- en-GB ["David"] = "Microsoft David Desktop", -- en-US ["Zira"] = "Microsoft Zira Desktop", -- en-US ["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 = { - ["Hedda"] = "Hedda", -- de-DE + 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 ["Hazel"] = "Hazel", -- en-GB + ["George"] = "George", -- en-GB + ["Susan"] = "Susan", -- en-GB ["David"] = "David", -- 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 = { Standard = { From 4fda8cc5fb4eeae2d356b58261526839274055f4 Mon Sep 17 00:00:00 2001 From: kaltokri Date: Tue, 9 Jan 2024 16:09:19 +0100 Subject: [PATCH 2/3] Easy debugging for all Moosers #2093 Enables everybody to use load Moose from an external full path. This is needed to use PyCharm with EmmyLua Debugger. Needs also De-Sanitize to load mission script with full path. --- Moose Development/Moose/Modules.lua | 281 +++++++++--------- .../Moose Templates/Moose_Dynamic_Loader.lua | 6 +- .../Moose Templates/Moose_Static_Loader.lua | 8 +- 3 files changed, 152 insertions(+), 143 deletions(-) diff --git a/Moose Development/Moose/Modules.lua b/Moose Development/Moose/Modules.lua index bdc145ff2..cc311d84d 100644 --- a/Moose Development/Moose/Modules.lua +++ b/Moose Development/Moose/Modules.lua @@ -1,149 +1,152 @@ -__Moose.Include( 'Scripts/Moose/Utilities/Enums.lua' ) -__Moose.Include( 'Scripts/Moose/Utilities/Utils.lua' ) -__Moose.Include( 'Scripts/Moose/Utilities/Profiler.lua' ) -__Moose.Include( 'Scripts/Moose/Utilities/Templates.lua' ) -__Moose.Include( 'Scripts/Moose/Utilities/STTS.lua' ) -__Moose.Include( 'Scripts/Moose/Utilities/FiFo.lua' ) -__Moose.Include( 'Scripts/Moose/Utilities/Socket.lua' ) +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/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( 'Scripts/Moose/Core/Base.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Astar.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Beacon.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Condition.lua' ) -__Moose.Include( 'Scripts/Moose/Core/UserFlag.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Report.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Scheduler.lua' ) -__Moose.Include( 'Scripts/Moose/Core/ScheduleDispatcher.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Event.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Settings.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Menu.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Zone.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Zone_Detection.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Database.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Set.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Point.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Velocity.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Message.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Fsm.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Spawn.lua' ) -__Moose.Include( 'Scripts/Moose/Core/SpawnStatic.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Timer.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Goal.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Spot.lua' ) -__Moose.Include( 'Scripts/Moose/Core/MarkerOps_Base.lua' ) -__Moose.Include( 'Scripts/Moose/Core/TextAndSound.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Pathline.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/UserFlag.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Report.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Core/Scheduler.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/Timer.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( 'Scripts/Moose/Wrapper/Object.lua' ) -__Moose.Include( 'Scripts/Moose/Wrapper/Identifiable.lua' ) -__Moose.Include( 'Scripts/Moose/Wrapper/Positionable.lua' ) -__Moose.Include( 'Scripts/Moose/Wrapper/Controllable.lua' ) -__Moose.Include( 'Scripts/Moose/Wrapper/Group.lua' ) -__Moose.Include( 'Scripts/Moose/Wrapper/Unit.lua' ) -__Moose.Include( 'Scripts/Moose/Wrapper/Client.lua' ) -__Moose.Include( 'Scripts/Moose/Wrapper/Static.lua' ) -__Moose.Include( 'Scripts/Moose/Wrapper/Airbase.lua' ) -__Moose.Include( 'Scripts/Moose/Wrapper/Scenery.lua' ) -__Moose.Include( 'Scripts/Moose/Wrapper/Marker.lua' ) -__Moose.Include( 'Scripts/Moose/Wrapper/Weapon.lua' ) -__Moose.Include( 'Scripts/Moose/Wrapper/Net.lua' ) -__Moose.Include( 'Scripts/Moose/Wrapper/Storage.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/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' ) -__Moose.Include( 'Scripts/Moose/Cargo/Cargo.lua' ) -__Moose.Include( 'Scripts/Moose/Cargo/CargoUnit.lua' ) -__Moose.Include( 'Scripts/Moose/Cargo/CargoSlingload.lua' ) -__Moose.Include( 'Scripts/Moose/Cargo/CargoCrate.lua' ) -__Moose.Include( 'Scripts/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( 'Scripts/Moose/Functional/Scoring.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/CleanUp.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/Movement.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/Sead.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/Escort.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/MissileTrainer.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/ATC_Ground.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/Detection.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/DetectionZones.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/Designate.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/RAT.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/Range.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/ZoneGoal.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/ZoneGoalCoalition.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/ZoneCaptureCoalition.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/Artillery.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/Suppression.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/PseudoATC.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/Warehouse.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/Fox.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/Mantis.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/Shorad.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/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/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/Shorad.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/Airboss.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/RecoveryTanker.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/RescueHelo.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/ATIS.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/CTLD.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/CSAR.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( 'Scripts/Moose/AI/AI_Balancer.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Air.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Air_Patrol.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Air_Engage.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_A2A_Patrol.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_A2A_Cap.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_A2A_Gci.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_A2A_Dispatcher.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_A2G_BAI.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_A2G_CAS.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_A2G_SEAD.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_A2G_Dispatcher.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Patrol.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_CAP.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_CAS.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_BAI.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Formation.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Escort.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Escort_Request.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Escort_Dispatcher.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Escort_Dispatcher_Request.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Cargo.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_APC.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Helicopter.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Airplane.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Ship.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Dispatcher.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Dispatcher_APC.lua' ) -__Moose.Include( 'Scripts/Moose/AI/AI_Cargo_Dispatcher_Helicopter.lua' ) -__Moose.Include( 'Scripts/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_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( 'Scripts/Moose/Actions/Act_Assign.lua' ) -__Moose.Include( 'Scripts/Moose/Actions/Act_Route.lua' ) -__Moose.Include( 'Scripts/Moose/Actions/Act_Account.lua' ) -__Moose.Include( 'Scripts/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( 'Scripts/Moose/Sound/UserSound.lua' ) -__Moose.Include( 'Scripts/Moose/Sound/SoundOutput.lua' ) -__Moose.Include( 'Scripts/Moose/Sound/Radio.lua' ) -__Moose.Include( 'Scripts/Moose/Sound/RadioQueue.lua' ) -__Moose.Include( 'Scripts/Moose/Sound/RadioSpeech.lua' ) -__Moose.Include( 'Scripts/Moose/Sound/SRS.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/SRS.lua' ) -__Moose.Include( 'Scripts/Moose/Tasking/CommandCenter.lua' ) -__Moose.Include( 'Scripts/Moose/Tasking/Mission.lua' ) -__Moose.Include( 'Scripts/Moose/Tasking/Task.lua' ) -__Moose.Include( 'Scripts/Moose/Tasking/TaskInfo.lua' ) -__Moose.Include( 'Scripts/Moose/Tasking/Task_Manager.lua' ) -__Moose.Include( 'Scripts/Moose/Tasking/DetectionManager.lua' ) -__Moose.Include( 'Scripts/Moose/Tasking/Task_A2G_Dispatcher.lua' ) -__Moose.Include( 'Scripts/Moose/Tasking/Task_A2G.lua' ) -__Moose.Include( 'Scripts/Moose/Tasking/Task_A2A_Dispatcher.lua' ) -__Moose.Include( 'Scripts/Moose/Tasking/Task_A2A.lua' ) -__Moose.Include( 'Scripts/Moose/Tasking/Task_CARGO.lua' ) -__Moose.Include( 'Scripts/Moose/Tasking/Task_Cargo_Transport.lua' ) -__Moose.Include( 'Scripts/Moose/Tasking/Task_Cargo_CSAR.lua' ) -__Moose.Include( 'Scripts/Moose/Tasking/Task_Cargo_Dispatcher.lua' ) -__Moose.Include( 'Scripts/Moose/Tasking/Task_Capture_Zone.lua' ) -__Moose.Include( 'Scripts/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( 'Scripts/Moose/Globals.lua' ) +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Globals.lua' ) diff --git a/Moose Setup/Moose Templates/Moose_Dynamic_Loader.lua b/Moose Setup/Moose Templates/Moose_Dynamic_Loader.lua index d63555297..705345afe 100644 --- a/Moose Setup/Moose Templates/Moose_Dynamic_Loader.lua +++ b/Moose Setup/Moose Templates/Moose_Dynamic_Loader.lua @@ -18,5 +18,7 @@ __Moose.Include = function( IncludeFile ) end __Moose.Includes = {} - -__Moose.Include( 'Scripts/Moose/Modules.lua' ) +if not MOOSE_DEVELOPMENT_FOLDER then + MOOSE_DEVELOPMENT_FOLDER='Scripts' +end +__Moose.Include( MOOSE_DEVELOPMENT_FOLDER..'/Moose/Modules.lua' ) diff --git a/Moose Setup/Moose Templates/Moose_Static_Loader.lua b/Moose Setup/Moose Templates/Moose_Static_Loader.lua index 788682234..5acab64b1 100644 --- a/Moose Setup/Moose Templates/Moose_Static_Loader.lua +++ b/Moose Setup/Moose Templates/Moose_Static_Loader.lua @@ -3,7 +3,11 @@ -- Try to load Moose as individual script files from Date: Wed, 10 Jan 2024 15:18:34 +0100 Subject: [PATCH 3/3] Added player name to `...PilotDown()` event --- Moose Development/Moose/Ops/CSAR.lua | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/Moose Development/Moose/Ops/CSAR.lua b/Moose Development/Moose/Ops/CSAR.lua index 147b742f8..5ecc2c4c8 100644 --- a/Moose Development/Moose/Ops/CSAR.lua +++ b/Moose Development/Moose/Ops/CSAR.lua @@ -293,7 +293,7 @@ CSAR.AircraftType["Bronco-OV-10A"] = 2 --- CSAR class version. -- @field #string version -CSAR.version="1.0.18" +CSAR.version="1.0.19" ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- -- ToDo list @@ -536,6 +536,7 @@ function CSAR:New(Coalition, Template, Alias) -- @param #number Frequency Beacon frequency in kHz. -- @param #string Leadername Name of the #UNIT of the downed pilot. -- @param #string CoordinatesText String of the position of the pilot. Format determined by self.coordtype. + -- @param #string Playername Player name if any given. Might be nil! --- On After "Aproach" event. Heli close to downed Pilot. -- @function [parent=#CSAR] OnAfterApproach @@ -842,7 +843,7 @@ function CSAR:_AddCsar(_coalition , _country, _point, _typeName, _unitName, _pla self:_CreateDownedPilotTrack(_spawnedGroup,_GroupName,_coalition,_unitName,_text,_typeName,_freq,_playerName,wetfeet) - self:_InitSARForPilot(_spawnedGroup, _unitName, _freq, noMessage) --shagrat use unitName to have the aircraft callsign / descriptive "name" etc. + self:_InitSARForPilot(_spawnedGroup, _unitName, _freq, noMessage, _playerName) --shagrat use unitName to have the aircraft callsign / descriptive "name" etc. return self end @@ -1224,7 +1225,8 @@ end -- @param #string _GroupName Name of the Group -- @param #number _freq Beacon frequency. -- @param #boolean _nomessage Send message true or false. -function CSAR:_InitSARForPilot(_downedGroup, _GroupName, _freq, _nomessage) +-- @param #string _playername Name of the downed pilot if any +function CSAR:_InitSARForPilot(_downedGroup, _GroupName, _freq, _nomessage, _playername) self:T(self.lid .. " _InitSARForPilot") local _leader = _downedGroup:GetUnit(1) local _groupName = _GroupName @@ -1247,7 +1249,7 @@ function CSAR:_InitSARForPilot(_downedGroup, _GroupName, _freq, _nomessage) end -- trigger FSM event - self:__PilotDown(2,_downedGroup, _freqk, _groupName, _coordinatesText) + self:__PilotDown(2,_downedGroup, _freqk, _groupName, _coordinatesText, _playername) return self end @@ -1923,7 +1925,7 @@ function CSAR:_DisplayToAllSAR(_message, _side, _messagetime) local messagetime = _messagetime or self.messageTime if self.msrs then local voice = self.CSARVoice or MSRS.Voices.Google.Standard.en_GB_Standard_F - if self.msrs.google == nil then + if self.msrs:GetProvider() == MSRS.Provider.WINDOWS then voice = self.CSARVoiceMS or MSRS.Voices.Microsoft.Hedda end self:I("Voice = "..voice) @@ -2310,7 +2312,8 @@ function CSAR:onafterStart(From, Event, To) self.msrs:SetVoice(self.SRSVoice) self.msrs:SetGender(self.SRSGender) if self.SRSGPathToCredentials then - self.msrs:SetGoogle(self.SRSGPathToCredentials) + self.msrs:SetProviderOptionsGoogle(self.SRSGPathToCredentials,self.SRSGPathToCredentials) + self.msrs:SetProvider(MSRS.Provider.GOOGLE) end self.msrs:SetVolume(self.SRSVolume) self.msrs:SetLabel("CSAR") @@ -2542,8 +2545,9 @@ end -- @param #number Frequency Beacon frequency in kHz. -- @param #string Leadername Name of the #UNIT of the downed pilot. -- @param #string CoordinatesText String of the position of the pilot. Format determined by self.coordtype. -function CSAR:onbeforePilotDown(From, Event, To, Group, Frequency, Leadername, CoordinatesText) - self:T({From, Event, To, Group, Frequency, Leadername, CoordinatesText}) +-- @param #string Playername Player name if any given. Might be nil! +function CSAR:onbeforePilotDown(From, Event, To, Group, Frequency, Leadername, CoordinatesText, Playername) + self:T({From, Event, To, Group, Frequency, Leadername, CoordinatesText, tostring(Playername)}) return self end