From 17211e159721e73cfdd9500425cb0fd219f6bac7 Mon Sep 17 00:00:00 2001 From: Raffson Date: Mon, 10 Jul 2023 22:04:39 +0200 Subject: [PATCH] Include SEAD Sweep in common escorts --- game/commander/tasks/packageplanningtask.py | 3 ++- game/commander/tasks/primitive/cas.py | 2 +- game/commander/tasks/primitive/dead.py | 4 +--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/game/commander/tasks/packageplanningtask.py b/game/commander/tasks/packageplanningtask.py index dad8c0c4..85676150 100644 --- a/game/commander/tasks/packageplanningtask.py +++ b/game/commander/tasks/packageplanningtask.py @@ -2,10 +2,10 @@ from __future__ import annotations import itertools import operator +import random from abc import abstractmethod from dataclasses import dataclass, field from enum import IntEnum, auto, unique -import random from typing import Generic, Iterator, Optional, TYPE_CHECKING, TypeVar, Union from game.ato.flighttype import FlightType @@ -112,6 +112,7 @@ class PackagePlanningTask(TheaterCommanderTask, Generic[MissionTargetT]): def propose_common_escorts(self) -> None: self.propose_flight(FlightType.SEAD_ESCORT, 2, EscortType.Sead) self.propose_flight(FlightType.ESCORT, 2, EscortType.AirToAir) + self.propose_flight(FlightType.SEAD_SWEEP, 2, EscortType.Sead) def iter_iads_ranges( self, state: TheaterState, range_type: RangeType diff --git a/game/commander/tasks/primitive/cas.py b/game/commander/tasks/primitive/cas.py index 597e293d..372016c3 100644 --- a/game/commander/tasks/primitive/cas.py +++ b/game/commander/tasks/primitive/cas.py @@ -1,7 +1,6 @@ from __future__ import annotations from dataclasses import dataclass -from random import randint from game.ato.flighttype import FlightType from game.commander.tasks.packageplanningtask import PackagePlanningTask @@ -33,3 +32,4 @@ class PlanCas(PackagePlanningTask[FrontLine]): size = self.get_flight_size() self.propose_flight(FlightType.CAS, size) self.propose_flight(FlightType.TARCAP, 2) + self.propose_flight(FlightType.SEAD_SWEEP, 2) diff --git a/game/commander/tasks/primitive/dead.py b/game/commander/tasks/primitive/dead.py index 6991066e..c1a29ea6 100644 --- a/game/commander/tasks/primitive/dead.py +++ b/game/commander/tasks/primitive/dead.py @@ -3,7 +3,6 @@ from __future__ import annotations from dataclasses import dataclass from game.ato.flighttype import FlightType -from game.commander.missionproposals import EscortType from game.commander.tasks.packageplanningtask import PackagePlanningTask from game.commander.theaterstate import TheaterState from game.theater.theatergroundobject import IadsGroundObject @@ -42,7 +41,6 @@ class PlanDead(PackagePlanningTask[IadsGroundObject]): # needs a decent refactor to the escort planning to do so. if self.target.has_live_radar_sam: self.propose_flight(FlightType.SEAD, 2) - self.propose_flight(FlightType.SEAD_ESCORT, 2, EscortType.Sead) - self.propose_flight(FlightType.ESCORT, 2, EscortType.AirToAir) + self.propose_common_escorts() if self.target.control_point.coalition.game.settings.autoplan_tankers_for_dead: self.propose_flight(FlightType.REFUELING, 1)