From d9f7be4f256cf737614806192f0b1a6b9faf3b84 Mon Sep 17 00:00:00 2001 From: Frank Date: Sat, 28 Mar 2020 16:51:06 +0100 Subject: [PATCH] Ops --- Moose Development/Moose/Ops/Auftrag.lua | 7 +++++-- Moose Development/Moose/Wrapper/Controllable.lua | 4 ++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Moose Development/Moose/Ops/Auftrag.lua b/Moose Development/Moose/Ops/Auftrag.lua index 0208ec9a7..3f87929ea 100644 --- a/Moose Development/Moose/Ops/Auftrag.lua +++ b/Moose Development/Moose/Ops/Auftrag.lua @@ -6,6 +6,7 @@ -- * Handy events. -- * Set mission start/stop times. -- * Set mission priority and urgency (can cancel running missions). +-- * Specific mission options for ROE, ROT, formation, etc. -- * Interface to FLIGHTGROUP, AIRWING and WINGCOMMANDER classes. -- -- @@ -674,7 +675,7 @@ function AUFTRAG:NewBOMBRUNWAY(Airdrome, Altitude) -- Mission options: mission.missionTask=ENUMS.MissionTask.RUNWAYATTACK mission.missionAltitude=mission.engageAltitude*0.8 - mission.missionFraction=0.5 + mission.missionFraction=0.2 mission.optionROE=ENUMS.ROE.OpenFire mission.optionROT=ENUMS.ROT.PassiveDefense @@ -1703,8 +1704,10 @@ end -- @return #number Distance in meters. function AUFTRAG:GetTargetDistance(FromCoord) local TargetCoord=self:GetTargetCoordinate() - if TargetCoord then + if TargetCoord and FromCoord then return TargetCoord:Get2DDistance(FromCoord) + else + self:E(self.lid.."ERROR: TargetCoord or FromCoord does not exist in AUFTRAG:GetTargetDistance() function! Returning 0") end return 0 end diff --git a/Moose Development/Moose/Wrapper/Controllable.lua b/Moose Development/Moose/Wrapper/Controllable.lua index 4fa1edbd3..32da09276 100644 --- a/Moose Development/Moose/Wrapper/Controllable.lua +++ b/Moose Development/Moose/Wrapper/Controllable.lua @@ -1195,8 +1195,8 @@ function CONTROLLABLE:TaskBombingRunway(Airbase, WeaponType, WeaponExpend, Attac weaponType = WeaponType or ENUMS.WeaponFlag.AnyBomb, expend = WeaponExpend or AI.Task.WeaponExpend.ALL, attackQty = AttackQty or 1, - direction = Direction and math.rad(Direction) or nil, - groupAttack = GroupAttack and GroupAttack or false, + direction = Direction and math.rad(Direction) or 0, + groupAttack = GroupAttack and true or false, }, }