From c0406e7c3c973fe03753ab854960e621752a9a09 Mon Sep 17 00:00:00 2001 From: Raffson Date: Fri, 14 Apr 2023 13:13:19 +0200 Subject: [PATCH] Refactor ingress altitude --- game/missiongenerator/aircraft/waypoints/deadingress.py | 4 ++-- game/missiongenerator/aircraft/waypoints/strikeingress.py | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/game/missiongenerator/aircraft/waypoints/deadingress.py b/game/missiongenerator/aircraft/waypoints/deadingress.py index 6746df34..0989d916 100644 --- a/game/missiongenerator/aircraft/waypoints/deadingress.py +++ b/game/missiongenerator/aircraft/waypoints/deadingress.py @@ -31,7 +31,7 @@ class DeadIngressBuilder(PydcsWaypointBuilder): task = AttackGroup( miz_group.id, weapon_type=WeaponType.Guided, - altitude=round(self.flight.coalition.doctrine.ingress_altitude.meters), + altitude=waypoint.alt, ) waypoint.tasks.append(task) @@ -42,7 +42,7 @@ class DeadIngressBuilder(PydcsWaypointBuilder): weapon_type=WeaponType.Unguided, expend=Expend.All, direction=math.radians(dir), - altitude=round(self.flight.coalition.doctrine.ingress_altitude.meters), + altitude=waypoint.alt, ) task.params["altitudeEnabled"] = False waypoint.tasks.append(task) diff --git a/game/missiongenerator/aircraft/waypoints/strikeingress.py b/game/missiongenerator/aircraft/waypoints/strikeingress.py index 4519851f..1c49527a 100644 --- a/game/missiongenerator/aircraft/waypoints/strikeingress.py +++ b/game/missiongenerator/aircraft/waypoints/strikeingress.py @@ -5,7 +5,7 @@ from dcs.planes import B_17G, B_52H, Tu_22M3, B_1B from dcs.point import MovingPoint from dcs.task import Bombing, Expend, OptFormation, WeaponType, CarpetBombing -from game.utils import mach +from game.utils import mach, meters from .pydcswaypointbuilder import PydcsWaypointBuilder @@ -38,7 +38,7 @@ class StrikeIngressBuilder(PydcsWaypointBuilder): weapon_type=WeaponType.Bombs, expend=Expend.All, carpet_length=avg_spacing, - altitude=round(self.flight.coalition.doctrine.ingress_altitude.meters), + altitude=waypoint.alt, ) waypoint.tasks.append(bombing) @@ -53,8 +53,7 @@ class StrikeIngressBuilder(PydcsWaypointBuilder): bombing.params["expend"] = Expend.All.value waypoint.tasks.append(bombing) - doctrine = self.flight.coalition.doctrine - waypoint.speed = mach(0.85, doctrine.ingress_altitude).meters_per_second + waypoint.speed = mach(0.85, meters(waypoint.alt)).meters_per_second # Register special waypoints self.register_special_waypoints(self.waypoint.targets)