Merge branch 'dev' into f16i-mod-support-v2.2

game/theater/controlpoint.py

@@ -63,7 +63,6 @@ from .frontline import FrontLine
 from .missiontarget import MissionTarget
 from .theatergroundobject import (
     GenericCarrierGroundObject,
-    IadsGroundObject,
     TheaterGroundObject,
     VehicleGroupGroundObject,
 )
@@ -1177,7 +1176,10 @@ class NavalControlPoint(ControlPoint, ABC):
                 # TODO: Inter-ship logistics?
             ]
         else:
-            yield FlightType.ANTISHIP
+            yield from [
+                FlightType.ANTISHIP,
+                FlightType.SEAD_ESCORT,
+            ]
         yield from super().mission_types(for_player)
 
     @property
@@ -1425,6 +1427,7 @@ class Fob(ControlPoint):
         if not self.is_friendly(for_player):
             yield FlightType.STRIKE
             yield FlightType.AIR_ASSAULT
+            yield FlightType.OCA_AIRCRAFT
 
         yield from super().mission_types(for_player)
 

game/theater/iadsnetwork/iadsnetwork.py

@@ -1,13 +1,14 @@
 from __future__ import annotations
-from collections import defaultdict
-from dataclasses import dataclass, field
 
 import logging
+import uuid
+from collections import defaultdict
+from dataclasses import dataclass, field
 from typing import TYPE_CHECKING, Iterator, Optional
 from uuid import UUID
-import uuid
-from game.theater.iadsnetwork.iadsrole import IadsRole
+
 from game.dcs.groundunittype import GroundUnitType
+from game.theater.iadsnetwork.iadsrole import IadsRole
 from game.theater.theatergroundobject import (
     IadsBuildingGroundObject,
     IadsGroundObject,

game/theater/iadsnetwork/iadsrole.py

@@ -1,9 +1,8 @@
 from __future__ import annotations
 
-from dataclasses import dataclass, field
 from enum import Enum
-from game.data.groups import GroupTask
 
+from game.data.groups import GroupTask
 from game.utils import Distance
 
 

game/theater/landmap.py

@@ -1,9 +1,9 @@
-from dataclasses import dataclass
-import pickle
-from functools import cached_property
-from typing import Optional, Tuple, Union
 import logging
+import pickle
+from dataclasses import dataclass
+from functools import cached_property
 from pathlib import Path
+from typing import Optional, Union
 
 from shapely import geometry
 from shapely.geometry import MultiPolygon, Polygon

game/theater/missiontarget.py

@@ -1,10 +1,8 @@
 from __future__ import annotations
 
-from collections.abc import Sequence
-from typing import Iterator, TYPE_CHECKING, Union
+from typing import Iterator, TYPE_CHECKING
 
 from dcs.mapping import Point
-from dcs.unit import Unit
 
 if TYPE_CHECKING:
     from game.ato.flighttype import FlightType

game/theater/start_generator.py

@@ -52,10 +52,12 @@ class GeneratorSettings:
 @dataclass
 class ModSettings:
     a4_skyhawk: bool = False
+    a6a_intruder: bool = False
     f4b_phantom: bool = False
     f15d_baz: bool = False
     f_16_idf: bool = False
     f22_raptor: bool = False
+    f84g_thunderjet: bool = False
     f100_supersabre: bool = False
     f104_starfighter: bool = False
     f105_thunderchief: bool = False

game/theater/theatergroundobject.py

@@ -6,7 +6,6 @@ from abc import ABC
 from typing import Any, Iterator, List, Optional, TYPE_CHECKING
 
 from dcs.mapping import Point
-
 from shapely.geometry import Point as ShapelyPoint
 
 from game.sidc import (
@@ -351,7 +350,10 @@ class NavalGroundObject(TheaterGroundObject, ABC):
         from game.ato import FlightType
 
         if not self.is_friendly(for_player):
-            yield FlightType.ANTISHIP
+            yield from [
+                FlightType.ANTISHIP,
+                FlightType.SEAD_ESCORT,
+            ]
         yield from super().mission_types(for_player)
 
     @property