diff --git a/Moose Development/Moose/Modules.lua b/Moose Development/Moose/Modules.lua index f4bf4a011..a7588315b 100644 --- a/Moose Development/Moose/Modules.lua +++ b/Moose Development/Moose/Modules.lua @@ -1,51 +1,51 @@ __Moose.Include( 'Scripts/Moose/Utilities/Enums.lua' ) -__Moose.Include( 'Scripts/Moose/Utilities/Routines.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/Profiler.lua' ) +__Moose.Include( 'Scripts/Moose/Utilities/Routines.lua' ) __Moose.Include( 'Scripts/Moose/Utilities/Socket.lua' ) +__Moose.Include( 'Scripts/Moose/Utilities/STTS.lua' ) +__Moose.Include( 'Scripts/Moose/Utilities/Templates.lua' ) +__Moose.Include( 'Scripts/Moose/Utilities/Utils.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/Event.lua' ) __Moose.Include( 'Scripts/Moose/Core/Fsm.lua' ) +__Moose.Include( 'Scripts/Moose/Core/Goal.lua' ) +__Moose.Include( 'Scripts/Moose/Core/MarkerOps_Base.lua' ) +__Moose.Include( 'Scripts/Moose/Core/Menu.lua' ) +__Moose.Include( 'Scripts/Moose/Core/Message.lua' ) +__Moose.Include( 'Scripts/Moose/Core/Point.lua' ) +__Moose.Include( 'Scripts/Moose/Core/Report.lua' ) +__Moose.Include( 'Scripts/Moose/Core/ScheduleDispatcher.lua' ) +__Moose.Include( 'Scripts/Moose/Core/Scheduler.lua' ) +__Moose.Include( 'Scripts/Moose/Core/Set.lua' ) +__Moose.Include( 'Scripts/Moose/Core/Settings.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/Astar.lua' ) -__Moose.Include( 'Scripts/Moose/Core/MarkerOps_Base.lua' ) __Moose.Include( 'Scripts/Moose/Core/TextAndSound.lua' ) -__Moose.Include( 'Scripts/Moose/Core/Condition.lua' ) +__Moose.Include( 'Scripts/Moose/Core/Timer.lua' ) +__Moose.Include( 'Scripts/Moose/Core/UserFlag.lua' ) +__Moose.Include( 'Scripts/Moose/Core/Velocity.lua' ) +__Moose.Include( 'Scripts/Moose/Core/Zone_Detection.lua' ) +__Moose.Include( 'Scripts/Moose/Core/Zone.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/Airbase.lua' ) +__Moose.Include( 'Scripts/Moose/Wrapper/Client.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/Identifiable.lua' ) __Moose.Include( 'Scripts/Moose/Wrapper/Marker.lua' ) +__Moose.Include( 'Scripts/Moose/Wrapper/Object.lua' ) +__Moose.Include( 'Scripts/Moose/Wrapper/Positionable.lua' ) +__Moose.Include( 'Scripts/Moose/Wrapper/Scenery.lua' ) +__Moose.Include( 'Scripts/Moose/Wrapper/Static.lua' ) +__Moose.Include( 'Scripts/Moose/Wrapper/Unit.lua' ) __Moose.Include( 'Scripts/Moose/Cargo/Cargo.lua' ) __Moose.Include( 'Scripts/Moose/Cargo/CargoUnit.lua' ) @@ -53,61 +53,61 @@ __Moose.Include( 'Scripts/Moose/Cargo/CargoSlingload.lua' ) __Moose.Include( 'Scripts/Moose/Cargo/CargoCrate.lua' ) __Moose.Include( 'Scripts/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/AICSAR.lua' ) +__Moose.Include( 'Scripts/Moose/Functional/Artillery.lua' ) __Moose.Include( 'Scripts/Moose/Functional/ATC_Ground.lua' ) +__Moose.Include( 'Scripts/Moose/Functional/Autolase.lua' ) +__Moose.Include( 'Scripts/Moose/Functional/CleanUp.lua' ) +__Moose.Include( 'Scripts/Moose/Functional/Designate.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/Escort.lua' ) __Moose.Include( 'Scripts/Moose/Functional/Fox.lua' ) __Moose.Include( 'Scripts/Moose/Functional/Mantis.lua' ) +__Moose.Include( 'Scripts/Moose/Functional/MissileTrainer.lua' ) +__Moose.Include( 'Scripts/Moose/Functional/Movement.lua' ) +__Moose.Include( 'Scripts/Moose/Functional/PseudoATC.lua' ) +__Moose.Include( 'Scripts/Moose/Functional/Range.lua' ) +__Moose.Include( 'Scripts/Moose/Functional/RAT.lua' ) +__Moose.Include( 'Scripts/Moose/Functional/Scoring.lua' ) +__Moose.Include( 'Scripts/Moose/Functional/Sead.lua' ) __Moose.Include( 'Scripts/Moose/Functional/Shorad.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/Autolase.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/AICSAR.lua' ) -__Moose.Include( 'Scripts/Moose/Functional/AmmoTruck.lua' ) +__Moose.Include( 'Scripts/Moose/Functional/Suppression.lua' ) +__Moose.Include( 'Scripts/Moose/Functional/Warehouse.lua' ) +__Moose.Include( 'Scripts/Moose/Functional/ZoneCaptureCoalition.lua' ) +__Moose.Include( 'Scripts/Moose/Functional/ZoneGoal.lua' ) +__Moose.Include( 'Scripts/Moose/Functional/ZoneGoalCargo.lua' ) +__Moose.Include( 'Scripts/Moose/Functional/ZoneGoalCoalition.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/AirWing.lua' ) +__Moose.Include( 'Scripts/Moose/Ops/ArmyGroup.lua' ) __Moose.Include( 'Scripts/Moose/Ops/ATIS.lua' ) __Moose.Include( 'Scripts/Moose/Ops/Auftrag.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/Target.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/OpsGroup.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/FlightGroup.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/NavyGroup.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/ArmyGroup.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/Cohort.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/Squadron.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/Platoon.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/Legion.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/AirWing.lua' ) +__Moose.Include( 'Scripts/Moose/Ops/Awacs.lua' ) __Moose.Include( 'Scripts/Moose/Ops/Brigade.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/Intelligence.lua' ) +__Moose.Include( 'Scripts/Moose/Ops/Chief.lua' ) +__Moose.Include( 'Scripts/Moose/Ops/Cohort.lua' ) __Moose.Include( 'Scripts/Moose/Ops/Commander.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/OpsTransport.lua' ) __Moose.Include( 'Scripts/Moose/Ops/CSAR.lua' ) __Moose.Include( 'Scripts/Moose/Ops/CTLD.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/OpsZone.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/Chief.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/Flotilla.lua' ) __Moose.Include( 'Scripts/Moose/Ops/Fleet.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/Awacs.lua' ) -__Moose.Include( 'Scripts/Moose/Ops/Operation.lua' ) __Moose.Include( 'Scripts/Moose/Ops/FlightControl.lua' ) +__Moose.Include( 'Scripts/Moose/Ops/FlightGroup.lua' ) +__Moose.Include( 'Scripts/Moose/Ops/Flotilla.lua' ) +__Moose.Include( 'Scripts/Moose/Ops/Intelligence.lua' ) +__Moose.Include( 'Scripts/Moose/Ops/Legion.lua' ) +__Moose.Include( 'Scripts/Moose/Ops/NavyGroup.lua' ) +__Moose.Include( 'Scripts/Moose/Ops/Operation.lua' ) +__Moose.Include( 'Scripts/Moose/Ops/OpsGroup.lua' ) +__Moose.Include( 'Scripts/Moose/Ops/OpsTransport.lua' ) +__Moose.Include( 'Scripts/Moose/Ops/OpsZone.lua' ) +__Moose.Include( 'Scripts/Moose/Ops/Platoon.lua' ) __Moose.Include( 'Scripts/Moose/Ops/PlayerTask.lua' ) +__Moose.Include( 'Scripts/Moose/Ops/RecoveryTanker.lua' ) +__Moose.Include( 'Scripts/Moose/Ops/RescueHelo.lua' ) +__Moose.Include( 'Scripts/Moose/Ops/Squadron.lua' ) +__Moose.Include( 'Scripts/Moose/Ops/Target.lua' ) __Moose.Include( 'Scripts/Moose/AI/AI_Balancer.lua' ) __Moose.Include( 'Scripts/Moose/AI/AI_Air.lua' ) @@ -146,12 +146,12 @@ __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( '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/SoundOutput.lua' ) __Moose.Include( 'Scripts/Moose/Sound/SRS.lua' ) +__Moose.Include( 'Scripts/Moose/Sound/UserSound.lua' ) __Moose.Include( 'Scripts/Moose/Tasking/CommandCenter.lua' ) __Moose.Include( 'Scripts/Moose/Tasking/Mission.lua' ) diff --git a/Moose Development/Moose/Ops/PlayerTask.lua b/Moose Development/Moose/Ops/PlayerTask.lua index 712be4161..82aed5737 100644 --- a/Moose Development/Moose/Ops/PlayerTask.lua +++ b/Moose Development/Moose/Ops/PlayerTask.lua @@ -1045,9 +1045,9 @@ AUFTRAG.Type.PRECISIONBOMBING = "Precision Bombing" -- @field #number AAA GROUP.Attribute.GROUND_AAA -- @field #number EWR GROUP.Attribute.GROUND_EWR PLAYERTASKCONTROLLER.SeadAttributes = { - SAM = GROUP.Attribute.GROUND_SAM, - AAA = GROUP.Attribute.GROUND_AAA, - EWR = GROUP.Attribute.GROUND_EWR, + SAM = GROUP.Attribute.GROUND_SAM, + AAA = GROUP.Attribute.GROUND_AAA, + EWR = GROUP.Attribute.GROUND_EWR, } --- @@ -1994,15 +1994,15 @@ end -- Default attribute types are: GROUP.Attribute.GROUND_SAM, GROUP.Attribute.GROUND_AAA, and GROUP.Attribute.GROUND_EWR. -- If you want to e.g. exclude AAA, so target groups with this attribute are assigned CAS or BAI tasks, and not SEAD, use this function as follows: -- --- `mycontroller:SetSEADAttributes({GROUP.Attribute.GROUND_SAM, GROUP.Attribute.GROUND_EWR})` +-- `mycontroller:SetSEADAttributes({GROUP.Attribute.GROUND_SAM, GROUP.Attribute.GROUND_EWR})` -- function PLAYERTASKCONTROLLER:SetSEADAttributes(Attributes) - self:T(self.lid.."SetSEADAttributes") - if type(Attributes) ~= "table" then - Attributes = {Attributes} - end - self.SeadAttributes = Attributes - return self + self:T(self.lid.."SetSEADAttributes") + if type(Attributes) ~= "table" then + Attributes = {Attributes} + end + self.SeadAttributes = Attributes + return self end --- [Internal] Function the check against SeadAttributes @@ -2010,15 +2010,15 @@ end -- @param #string Attribute -- @return #boolean IsSead function PLAYERTASKCONTROLLER:_IsAttributeSead(Attribute) - self:T(self.lid.."_IsAttributeSead?") - local IsSead = false - for _,_attribute in pairs(self.SeadAttributes) do - if Attribute == _attribute then - IsSead = true - break - end - end - return IsSead + self:T(self.lid.."_IsAttributeSead?") + local IsSead = false + for _,_attribute in pairs(self.SeadAttributes) do + if Attribute == _attribute then + IsSead = true + break + end + end + return IsSead end --- [Internal] Add a task to the task queue @@ -2048,22 +2048,22 @@ function PLAYERTASKCONTROLLER:_AddTask(Target) elseif targetobject:IsInstanceOf("GROUP") then self:T("SEAD Check GROUP") local attribute = targetobject:GetAttribute() - if self:_IsAttributeSead(attribute) then - type = AUFTRAG.Type.SEAD - --ttstype = "suppress air defense" - ttstype = self.gettext:GetEntry("SEADTTS",self.locale) - end + if self:_IsAttributeSead(attribute) then + type = AUFTRAG.Type.SEAD + --ttstype = "suppress air defense" + ttstype = self.gettext:GetEntry("SEADTTS",self.locale) + end elseif targetobject:IsInstanceOf("SET_GROUP") then self:T("SEAD Check SET_GROUP") targetobject:ForEachGroup( function (group) local attribute = group:GetAttribute() - if self:_IsAttributeSead(attribute) then - type = AUFTRAG.Type.SEAD - --ttstype = "suppress air defense" - ttstype = self.gettext:GetEntry("SEADTTS",self.locale) - end - end + if self:_IsAttributeSead(attribute) then + type = AUFTRAG.Type.SEAD + --ttstype = "suppress air defense" + ttstype = self.gettext:GetEntry("SEADTTS",self.locale) + end + end ) elseif targetobject:IsInstanceOf("SET_UNIT") then self:T("SEAD Check SET_UNIT")