Merge remote-tracking branch 'origin/develop' into branch

# Conflicts:
#	Moose Development/Moose/Ops/Auftrag.lua
This commit is contained in:
Applevangelist
2025-07-04 16:25:49 +02:00
+2 -2
View File
@@ -1738,7 +1738,7 @@ function AUFTRAG:NewSEADInZone(TargetZone, Altitude, TargetTypes, Duration)
-- Mission options: -- Mission options:
mission.missionTask=ENUMS.MissionTask.SEAD mission.missionTask=ENUMS.MissionTask.SEAD
mission.missionAltitude=mission.engageAltitude mission.missionAltitude=mission.engageAltitude
mission.missionFraction=0.7 mission.missionFraction=0.2
mission.optionROE=ENUMS.ROE.OpenFire mission.optionROE=ENUMS.ROE.OpenFire
mission.optionROT=ENUMS.ROT.EvadeFire mission.optionROT=ENUMS.ROT.EvadeFire
@@ -6366,7 +6366,7 @@ function AUFTRAG:GetDCSMissionTask()
local unit = _unit -- Wrapper.Unit#UNTI local unit = _unit -- Wrapper.Unit#UNTI
if unit and unit:IsAlive() and unit:HasSEAD() then if unit and unit:IsAlive() and unit:HasSEAD() then
self:T("Adding UNIT for SEAD: "..unit:GetName()) self:T("Adding UNIT for SEAD: "..unit:GetName())
local task = CONTROLLABLE.TaskAttackUnit(nil,unit,GroupAttack,AI.Task.WeaponExpend.ALL,1,Direction,self.engageAltitude,4161536) local task = CONTROLLABLE.TaskAttackUnit(nil,unit,GroupAttack,AI.Task.WeaponExpend.ALL,1,Direction,self.engageAltitude,2956984318)
table.insert(DCStasks, task) table.insert(DCStasks, task)
SeadUnitSet:AddUnit(unit) SeadUnitSet:AddUnit(unit)
end end