diff --git a/Moose Development/Moose/Modules_local.lua b/Moose Development/Moose/Modules_local.lua new file mode 100644 index 000000000..949bcce75 --- /dev/null +++ b/Moose Development/Moose/Modules_local.lua @@ -0,0 +1,172 @@ +__Moose.Include( 'Utilities\\Enums.lua' ) +__Moose.Include( 'Utilities\\Routines.lua' ) +__Moose.Include( 'Utilities\\Utils.lua' ) +__Moose.Include( 'Utilities\\Profiler.lua' ) +__Moose.Include( 'Utilities\\Templates.lua' ) +__Moose.Include( 'Utilities\\STTS.lua' ) +__Moose.Include( 'Utilities\\FiFo.lua' ) +__Moose.Include( 'Utilities\\Socket.lua' ) + +__Moose.Include( 'Core\\Base.lua' ) +__Moose.Include( 'Core\\Beacon.lua' ) +__Moose.Include( 'Core\\UserFlag.lua' ) +__Moose.Include( 'Core\\Report.lua' ) +__Moose.Include( 'Core\\Scheduler.lua' ) +__Moose.Include( 'Core\\ScheduleDispatcher.lua' ) +__Moose.Include( 'Core\\Event.lua' ) +__Moose.Include( 'Core\\Settings.lua' ) +__Moose.Include( 'Core\\Menu.lua' ) +__Moose.Include( 'Core\\Zone.lua' ) +__Moose.Include( 'Core\\Zone_Detection.lua' ) +__Moose.Include( 'Core\\Database.lua' ) +__Moose.Include( 'Core\\Set.lua' ) +__Moose.Include( 'Core\\Point.lua' ) +__Moose.Include( 'Core\\Velocity.lua' ) +__Moose.Include( 'Core\\Message.lua' ) +__Moose.Include( 'Core\\Fsm.lua' ) +__Moose.Include( 'Core\\Spawn.lua' ) +__Moose.Include( 'Core\\SpawnStatic.lua' ) +__Moose.Include( 'Core\\Timer.lua' ) +__Moose.Include( 'Core\\Goal.lua' ) +__Moose.Include( 'Core\\Spot.lua' ) +__Moose.Include( 'Core\\Astar.lua' ) +__Moose.Include( 'Core\\MarkerOps_Base.lua' ) +__Moose.Include( 'Core\\TextAndSound.lua' ) +__Moose.Include( 'Core\\Condition.lua' ) + +__Moose.Include( 'Wrapper\\Object.lua' ) +__Moose.Include( 'Wrapper\\Identifiable.lua' ) +__Moose.Include( 'Wrapper\\Positionable.lua' ) +__Moose.Include( 'Wrapper\\Controllable.lua' ) +__Moose.Include( 'Wrapper\\Group.lua' ) +__Moose.Include( 'Wrapper\\Unit.lua' ) +__Moose.Include( 'Wrapper\\Client.lua' ) +__Moose.Include( 'Wrapper\\Static.lua' ) +__Moose.Include( 'Wrapper\\Airbase.lua' ) +__Moose.Include( 'Wrapper\\Scenery.lua' ) +__Moose.Include( 'Wrapper\\Marker.lua' ) + +__Moose.Include( 'Cargo\\Cargo.lua' ) +__Moose.Include( 'Cargo\\CargoUnit.lua' ) +__Moose.Include( 'Cargo\\CargoSlingload.lua' ) +__Moose.Include( 'Cargo\\CargoCrate.lua' ) +__Moose.Include( 'Cargo\\CargoGroup.lua' ) + +__Moose.Include( 'Functional\\Scoring.lua' ) +__Moose.Include( 'Functional\\CleanUp.lua' ) +__Moose.Include( 'Functional\\Movement.lua' ) +__Moose.Include( 'Functional\\Sead.lua' ) +__Moose.Include( 'Functional\\Escort.lua' ) +__Moose.Include( 'Functional\\MissileTrainer.lua' ) +__Moose.Include( 'Functional\\ATC_Ground.lua' ) +__Moose.Include( 'Functional\\Detection.lua' ) +__Moose.Include( 'Functional\\DetectionZones.lua' ) +__Moose.Include( 'Functional\\Designate.lua' ) +__Moose.Include( 'Functional\\RAT.lua' ) +__Moose.Include( 'Functional\\Range.lua' ) +__Moose.Include( 'Functional\\ZoneGoal.lua' ) +__Moose.Include( 'Functional\\ZoneGoalCoalition.lua' ) +__Moose.Include( 'Functional\\ZoneCaptureCoalition.lua' ) +__Moose.Include( 'Functional\\Artillery.lua' ) +__Moose.Include( 'Functional\\Suppression.lua' ) +__Moose.Include( 'Functional\\PseudoATC.lua' ) +__Moose.Include( 'Functional\\Warehouse.lua' ) +__Moose.Include( 'Functional\\Fox.lua' ) +__Moose.Include( 'Functional\\Mantis.lua' ) +__Moose.Include( 'Functional\\Shorad.lua' ) +__Moose.Include( 'Functional\\Autolase.lua' ) +__Moose.Include( 'Functional\\AICSAR.lua' ) +__Moose.Include( 'Functional\\AmmoTruck.lua' ) + +__Moose.Include( 'Ops\\Airboss.lua' ) +__Moose.Include( 'Ops\\RecoveryTanker.lua' ) +__Moose.Include( 'Ops\\RescueHelo.lua' ) +__Moose.Include( 'Ops\\ATIS.lua' ) +__Moose.Include( 'Ops\\Auftrag.lua' ) +__Moose.Include( 'Ops\\Target.lua' ) +__Moose.Include( 'Ops\\OpsGroup.lua' ) +__Moose.Include( 'Ops\\FlightGroup.lua' ) +__Moose.Include( 'Ops\\NavyGroup.lua' ) +__Moose.Include( 'Ops\\ArmyGroup.lua' ) +__Moose.Include( 'Ops\\Cohort.lua' ) +__Moose.Include( 'Ops\\Squadron.lua' ) +__Moose.Include( 'Ops\\Platoon.lua' ) +__Moose.Include( 'Ops\\Legion.lua' ) +__Moose.Include( 'Ops\\AirWing.lua' ) +__Moose.Include( 'Ops\\Brigade.lua' ) +__Moose.Include( 'Ops\\Intelligence.lua' ) +__Moose.Include( 'Ops\\Commander.lua' ) +__Moose.Include( 'Ops\\OpsTransport.lua' ) +__Moose.Include( 'Ops\\CSAR.lua' ) +__Moose.Include( 'Ops\\CTLD.lua' ) +__Moose.Include( 'Ops\\OpsZone.lua' ) +__Moose.Include( 'Ops\\Chief.lua' ) +__Moose.Include( 'Ops\\Flotilla.lua' ) +__Moose.Include( 'Ops\\Fleet.lua' ) +__Moose.Include( 'Ops\\Awacs.lua' ) +__Moose.Include( 'Ops\\PlayerTask.lua' ) +__Moose.Include( 'Ops\\Operation.lua' ) +__Moose.Include( 'Ops\\FlightControl.lua' ) + +__Moose.Include( 'AI\\AI_Balancer.lua' ) +__Moose.Include( 'AI\\AI_Air.lua' ) +__Moose.Include( 'AI\\AI_Air_Patrol.lua' ) +__Moose.Include( 'AI\\AI_Air_Engage.lua' ) +__Moose.Include( 'AI\\AI_A2A_Patrol.lua' ) +__Moose.Include( 'AI\\AI_A2A_Cap.lua' ) +__Moose.Include( 'AI\\AI_A2A_Gci.lua' ) +__Moose.Include( 'AI\\AI_A2A_Dispatcher.lua' ) +__Moose.Include( 'AI\\AI_A2G_BAI.lua' ) +__Moose.Include( 'AI\\AI_A2G_CAS.lua' ) +__Moose.Include( 'AI\\AI_A2G_SEAD.lua' ) +__Moose.Include( 'AI\\AI_A2G_Dispatcher.lua' ) +__Moose.Include( 'AI\\AI_Patrol.lua' ) +__Moose.Include( 'AI\\AI_Cap.lua' ) +__Moose.Include( 'AI\\AI_Cas.lua' ) +__Moose.Include( 'AI\\AI_Bai.lua' ) +__Moose.Include( 'AI\\AI_Formation.lua' ) +__Moose.Include( 'AI\\AI_Escort.lua' ) +__Moose.Include( 'AI\\AI_Escort_Request.lua' ) +__Moose.Include( 'AI\\AI_Escort_Dispatcher.lua' ) +__Moose.Include( 'AI\\AI_Escort_Dispatcher_Request.lua' ) +__Moose.Include( 'AI\\AI_Cargo.lua' ) +__Moose.Include( 'AI\\AI_Cargo_APC.lua' ) +__Moose.Include( 'AI\\AI_Cargo_Helicopter.lua' ) +__Moose.Include( 'AI\\AI_Cargo_Airplane.lua' ) +__Moose.Include( 'AI\\AI_Cargo_Ship.lua' ) +__Moose.Include( 'AI\\AI_Cargo_Dispatcher.lua' ) +__Moose.Include( 'AI\\AI_Cargo_Dispatcher_APC.lua' ) +__Moose.Include( 'AI\\AI_Cargo_Dispatcher_Helicopter.lua' ) +__Moose.Include( 'AI\\AI_Cargo_Dispatcher_Airplane.lua' ) +__Moose.Include( 'AI\\AI_Cargo_Dispatcher_Ship.lua' ) + +__Moose.Include( 'Actions\\Act_Assign.lua' ) +__Moose.Include( 'Actions\\Act_Route.lua' ) +__Moose.Include( 'Actions\\Act_Account.lua' ) +__Moose.Include( 'Actions\\Act_Assist.lua' ) + +__Moose.Include( 'Sound\\UserSound.lua' ) +__Moose.Include( 'Sound\\SoundOutput.lua' ) +__Moose.Include( 'Sound\\Radio.lua' ) +__Moose.Include( 'Sound\\RadioQueue.lua' ) +__Moose.Include( 'Sound\\RadioSpeech.lua' ) +__Moose.Include( 'Sound\\SRS.lua' ) + +__Moose.Include( 'Tasking\\CommandCenter.lua' ) +__Moose.Include( 'Tasking\\Mission.lua' ) +__Moose.Include( 'Tasking\\Task.lua' ) +__Moose.Include( 'Tasking\\TaskInfo.lua' ) +__Moose.Include( 'Tasking\\Task_Manager.lua' ) +__Moose.Include( 'Tasking\\DetectionManager.lua' ) +__Moose.Include( 'Tasking\\Task_A2G_Dispatcher.lua' ) +__Moose.Include( 'Tasking\\Task_A2G.lua' ) +__Moose.Include( 'Tasking\\Task_A2A_Dispatcher.lua' ) +__Moose.Include( 'Tasking\\Task_A2A.lua' ) +__Moose.Include( 'Tasking\\Task_Cargo.lua' ) +__Moose.Include( 'Tasking\\Task_Cargo_Transport.lua' ) +__Moose.Include( 'Tasking\\Task_Cargo_CSAR.lua' ) +__Moose.Include( 'Tasking\\Task_Cargo_Dispatcher.lua' ) +__Moose.Include( 'Tasking\\Task_Capture_Zone.lua' ) +__Moose.Include( 'Tasking\\Task_Capture_Dispatcher.lua' ) + +__Moose.Include( 'Globals.lua' ) diff --git a/Moose Development/Moose/Ops/Awacs.lua b/Moose Development/Moose/Ops/Awacs.lua index 471301b5e..454e9ec21 100644 --- a/Moose Development/Moose/Ops/Awacs.lua +++ b/Moose Development/Moose/Ops/Awacs.lua @@ -1900,6 +1900,7 @@ function AWACS:SetSRS(PathToSRS,Gender,Culture,Port,Voice,Volume,PathToGoogleKey self.Volume = Volume or 1.0 self.AwacsSRS = MSRS:New(self.PathToSRS,self.MultiFrequency,self.MultiModulation,self.Volume) + self.AwacsSRS:SetCoalition(self.coalition) self.AwacsSRS:SetGender(self.Gender) self.AwacsSRS:SetCulture(self.Culture) self.AwacsSRS:SetVoice(self.Voice) diff --git a/Moose Development/Moose/Ops/OpsGroup.lua b/Moose Development/Moose/Ops/OpsGroup.lua index 4267f559a..9d0bc7d4c 100644 --- a/Moose Development/Moose/Ops/OpsGroup.lua +++ b/Moose Development/Moose/Ops/OpsGroup.lua @@ -10135,8 +10135,8 @@ function OPSGROUP:_CheckDamage() self:ElementDamaged(element) damaged=true end - - end + + end end @@ -11784,7 +11784,7 @@ function OPSGROUP:_UpdatePosition() self.positionLast=self.position or self:GetVec3() self.headingLast=self.heading or self:GetHeading() self.orientXLast=self.orientX or self:GetOrientationX() - self.velocityLast=self.velocity or self.group:GetVelocityMPS() + self.velocityLast=self.velocity or self.group:GetVelocityMPS() -- Current state. self.position=self:GetVec3() @@ -12438,18 +12438,18 @@ function OPSGROUP:GetAmmoUnit(unit, display) if ammotable then local weapons=#ammotable - - --self:I(ammotable) + + --self:I(ammotable) -- Loop over all weapons. for w=1,weapons do -- Number of current weapon. local Nammo=ammotable[w]["count"] - - -- Range in meters. Seems only to exist for missiles (not shells). - local rmin=ammotable[w]["desc"]["rangeMin"] or 0 - local rmax=ammotable[w]["desc"]["rangeMaxAltMin"] or 0 + + -- Range in meters. Seems only to exist for missiles (not shells). + local rmin=ammotable[w]["desc"]["rangeMin"] or 0 + local rmax=ammotable[w]["desc"]["rangeMaxAltMin"] or 0 -- Type name of current weapon. local Tammo=ammotable[w]["desc"]["typeName"] @@ -12713,7 +12713,7 @@ function OPSGROUP:_AddElementByName(unitname) element.gid=element.DCSunit:getNumber() element.uid=element.DCSunit:getID() --element.group=unit:GetGroup() - element.controller=element.DCSunit:getController() + element.controller=element.DCSunit:getController() element.Nhit=0 element.opsgroup=self