diff --git a/game/ato/flightplans/escort.py b/game/ato/flightplans/escort.py index 1884de21..88d0625b 100644 --- a/game/ato/flightplans/escort.py +++ b/game/ato/flightplans/escort.py @@ -36,7 +36,9 @@ class Builder(FormationAttackBuilder[EscortFlightPlan, FormationAttackLayout]): refuel = builder.refuel(self.package.waypoints.refuel) initial = None if self.package.primary_task == FlightType.STRIKE: - initial = builder.escort_hold(self.package.waypoints.initial, Distance.from_feet(20000)) + initial = builder.escort_hold( + self.package.waypoints.initial, Distance.from_feet(20000) + ) return FormationAttackLayout( departure=builder.takeoff(self.flight.departure), diff --git a/game/ato/flightplans/formationattack.py b/game/ato/flightplans/formationattack.py index 23b240a0..56d8bbe9 100644 --- a/game/ato/flightplans/formationattack.py +++ b/game/ato/flightplans/formationattack.py @@ -193,7 +193,9 @@ class FormationAttackBuilder(IBuilder[FlightPlanT, LayoutT], ABC): ) initial = None if self.package.primary_task == FlightType.STRIKE: - ingress = builder.nav(self.package.waypoints.ingress, Distance.from_feet(20000)) + ingress = builder.nav( + self.package.waypoints.ingress, Distance.from_feet(20000) + ) initial = builder.ingress( ingress_type, self.package.waypoints.initial, self.package.target ) diff --git a/game/missiongenerator/aircraft/aircraftbehavior.py b/game/missiongenerator/aircraft/aircraftbehavior.py index 1d543857..e71bbb55 100644 --- a/game/missiongenerator/aircraft/aircraftbehavior.py +++ b/game/missiongenerator/aircraft/aircraftbehavior.py @@ -21,7 +21,8 @@ from dcs.task import ( RunwayAttack, Transport, SEAD, - SwitchWaypoint, OptJettisonEmptyTanks, + SwitchWaypoint, + OptJettisonEmptyTanks, ) from dcs.unitgroup import FlyingGroup diff --git a/game/missiongenerator/aircraft/waypoints/joinpoint.py b/game/missiongenerator/aircraft/waypoints/joinpoint.py index 8a96e56a..19a9589e 100644 --- a/game/missiongenerator/aircraft/waypoints/joinpoint.py +++ b/game/missiongenerator/aircraft/waypoints/joinpoint.py @@ -60,11 +60,11 @@ class JoinPointBuilder(PydcsWaypointBuilder): waypoint.tasks.append(ecm_option) def configure_escort_tasks( - self, - waypoint: MovingPoint, - target_types: List[str], - max_dist: float = 30.0, - vertical_spacing: float = 2000.0, + self, + waypoint: MovingPoint, + target_types: List[str], + max_dist: float = 30.0, + vertical_spacing: float = 2000.0, ) -> None: rx = (random.random() + 0.1) * 1000 @@ -84,5 +84,6 @@ class JoinPointBuilder(PydcsWaypointBuilder): engagement_max_dist=int(nautical_miles(max_dist).meters), lastwpt=lastwpt, targets=target_types, - position=pos) + position=pos, + ) ) diff --git a/game/missiongenerator/aircraft/waypoints/refuel.py b/game/missiongenerator/aircraft/waypoints/refuel.py index 2813964b..ba03b4d2 100644 --- a/game/missiongenerator/aircraft/waypoints/refuel.py +++ b/game/missiongenerator/aircraft/waypoints/refuel.py @@ -6,9 +6,7 @@ from .pydcswaypointbuilder import PydcsWaypointBuilder class RefuelPointBuilder(PydcsWaypointBuilder): def add_tasks(self, waypoint: MovingPoint) -> None: - refuel = ControlledTask( - RefuelingTaskAction() - ) + refuel = ControlledTask(RefuelingTaskAction()) refuel.start_probability(10) waypoint.add_task(refuel) return super().add_tasks(waypoint) diff --git a/game/missiongenerator/aircraft/waypoints/splitpoint.py b/game/missiongenerator/aircraft/waypoints/splitpoint.py index d1f33c40..cd321121 100644 --- a/game/missiongenerator/aircraft/waypoints/splitpoint.py +++ b/game/missiongenerator/aircraft/waypoints/splitpoint.py @@ -22,6 +22,7 @@ class SplitPointBuilder(PydcsWaypointBuilder): waypoint.speed = mach(0.85, Distance.from_feet(20000)).meters_per_second waypoint.ETA_locked = False if self.flight is self.package.primary_flight: - script_code = f"trigger.action.setUserFlag(\"split-{id(self.package)}\", true)" - script = RunScript(script_code) - waypoint.tasks.append(script) \ No newline at end of file + script = RunScript( + f'trigger.action.setUserFlag("split-{id(self.package)}", true)' + ) + waypoint.tasks.append(script) diff --git a/game/missiongenerator/briefinggenerator.py b/game/missiongenerator/briefinggenerator.py index 2a5b1345..f449a9a7 100644 --- a/game/missiongenerator/briefinggenerator.py +++ b/game/missiongenerator/briefinggenerator.py @@ -91,7 +91,6 @@ class MissionInfoGenerator: if len(flight.client_units) > 0: self.player_flights.append(flight) - def add_jtac(self, jtac: JtacInfo) -> None: """Adds a JTAC to the mission.