operation refactoring

gen/aircraft.py

@@ -647,12 +647,11 @@ AIRCRAFT_DATA["P-47D-30"] = AIRCRAFT_DATA["P-51D"]
 
 
 class AircraftConflictGenerator:
-    def __init__(self, mission: Mission, conflict: Conflict, settings: Settings,
+    def __init__(self, mission: Mission, settings: Settings,
                  game: Game, radio_registry: RadioRegistry):
         self.m = mission
         self.game = game
         self.settings = settings
-        self.conflict = conflict
         self.radio_registry = radio_registry
         self.flights: List[FlightData] = []
 

gen/armor.py

@@ -75,10 +75,33 @@ class GroundConflictGenerator:
         self.enemy_planned_combat_groups = enemy_planned_combat_groups
         self.player_planned_combat_groups = player_planned_combat_groups
         self.player_stance = CombatStance(player_stance)
-        self.enemy_stance = random.choice([CombatStance.AGGRESSIVE, CombatStance.AGGRESSIVE, CombatStance.AGGRESSIVE, CombatStance.ELIMINATION, CombatStance.BREAKTHROUGH]) if len(enemy_planned_combat_groups) > len(player_planned_combat_groups) else random.choice([CombatStance.DEFENSIVE, CombatStance.DEFENSIVE, CombatStance.DEFENSIVE, CombatStance.AMBUSH, CombatStance.AGGRESSIVE])
+        self.enemy_stance = self._enemy_stance()
         self.game = game
         self.jtacs: List[JtacInfo] = []
 
+    def _enemy_stance(self):
+        """Picks the enemy stance according to the number of planned groups on the frontline for each side"""
+        if len(self.enemy_planned_combat_groups) > len(self.player_planned_combat_groups): 
+            return random.choice(
+                [
+                    CombatStance.AGGRESSIVE,
+                    CombatStance.AGGRESSIVE,
+                    CombatStance.AGGRESSIVE,
+                    CombatStance.ELIMINATION,
+                    CombatStance.BREAKTHROUGH
+                ]
+            )
+        else:
+            return random.choice(
+                [
+                    CombatStance.DEFENSIVE,
+                    CombatStance.DEFENSIVE,
+                    CombatStance.DEFENSIVE,
+                    CombatStance.AMBUSH,
+                    CombatStance.AGGRESSIVE
+                ]
+            )
+
     def _group_point(self, point) -> Point:
         distance = random.randint(
                 int(self.conflict.size * SPREAD_DISTANCE_FACTOR[0]),
@@ -266,7 +289,7 @@ class GroundConflictGenerator:
                             hold_2.number = 3
                             dcs_group.add_trigger_action(hold_2)
 
-                            retreat_task = GoToWaypoint(toIndex=3)
+                            retreat_task = GoToWaypoint(to_index=3)
                             retreat_task.number = 4
                             dcs_group.add_trigger_action(retreat_task)
 
@@ -362,7 +385,7 @@ class GroundConflictGenerator:
         dcs_group.add_waypoint(self.find_retreat_point(dcs_group, forward_heading, (int)(RETREAT_DISTANCE / 8)), PointAction.OffRoad)
 
         # Fallback task
-        fallback = ControlledTask(GoToWaypoint(toIndex=len(dcs_group.points)))
+        fallback = ControlledTask(GoToWaypoint(to_index=len(dcs_group.points)))
         fallback.enabled = False
         dcs_group.add_trigger_action(Hold())
         dcs_group.add_trigger_action(fallback)

gen/conflictgen.py

@@ -157,6 +157,24 @@ class Conflict:
 
         return left_position, _heading_sum(heading, 90), int(right_position.distance_to_point(left_position))
 
+    @classmethod
+    def frontline_cas_conflict(cls, attacker_name: str, defender_name: str, attacker: Country, defender: Country, from_cp: ControlPoint, to_cp: ControlPoint, theater: ConflictTheater):
+        assert cls.has_frontline_between(from_cp, to_cp)
+        position, heading, distance = cls.frontline_vector(from_cp, to_cp, theater)
+
+        return cls(
+            position=position,
+            heading=heading,
+            distance=distance,
+            theater=theater,
+            from_cp=from_cp,
+            to_cp=to_cp,
+            attackers_side=attacker_name,
+            defenders_side=defender_name,
+            attackers_country=attacker,
+            defenders_country=defender,
+        )
+
     @classmethod
     def _extend_ground_position(cls, initial: Point, max_distance: int, heading: int, theater: ConflictTheater) -> Point:
         pos = initial

gen/forcedoptionsgen.py

@@ -1,5 +1,7 @@
+from __future__ import annotations
+
 import logging
-import typing
+from typing import TYPE_CHECKING
 from enum import IntEnum
 
 from dcs.mission import Mission
@@ -7,6 +9,8 @@ from dcs.forcedoptions import ForcedOptions
 
 from .conflictgen import *
 
+if TYPE_CHECKING:
+    from game.game import Game
 
 class Labels(IntEnum):
     Off = 0
@@ -16,9 +20,8 @@ class Labels(IntEnum):
 
 
 class ForcedOptionsGenerator:
-    def __init__(self, mission: Mission, conflict: Conflict, game):
+    def __init__(self, mission: Mission, game: Game):
         self.mission = mission
-        self.conflict = conflict
         self.game = game
 
     def _set_options_view(self):

gen/groundobjectsgen.py

@@ -353,40 +353,16 @@ class GroundObjectsGenerator:
     locations for spawning ground objects, determining their types, and creating
     the appropriate generators.
     """
-    FARP_CAPACITY = 4
 
-    def __init__(self, mission: Mission, conflict: Conflict, game: Game,
+    def __init__(self, mission: Mission, game: Game,
                  radio_registry: RadioRegistry, tacan_registry: TacanRegistry):
         self.m = mission
-        self.conflict = conflict
         self.game = game
         self.radio_registry = radio_registry
         self.tacan_registry = tacan_registry
         self.icls_alloc = iter(range(1, 21))
         self.runways: Dict[str, RunwayData] = {}
 
-    def generate_farps(self, number_of_units=1) -> Iterator[StaticGroup]:
-        if self.conflict.is_vector:
-            center = self.conflict.center
-            heading = self.conflict.heading - 90
-        else:
-            center, heading = self.conflict.frontline_position(self.conflict.from_cp, self.conflict.to_cp, self.game.theater)
-            heading -= 90
-
-        initial_position = center.point_from_heading(heading, FARP_FRONTLINE_DISTANCE)
-        position = self.conflict.find_ground_position(initial_position, heading)
-        if not position:
-            position = initial_position
-
-        for i, _ in enumerate(range(0, number_of_units, self.FARP_CAPACITY)):
-            position = position.point_from_heading(0, i * 275)
-
-            yield self.m.farp(
-                country=self.m.country(self.game.player_country),
-                name="FARP",
-                position=position,
-            )
-
     def generate(self):
         for cp in self.game.theater.controlpoints:
             if cp.captured:

gen/triggergen.py

@@ -32,7 +32,7 @@ class Silence(Option):
 class TriggersGenerator:
     def __init__(self, mission: Mission, conflict: Conflict, game):
         self.mission = mission
-        self.conflict = conflict
+        self.conflict = conflict  #  TODO: Move conflict out of this class.  Only needed for bullseye position
         self.game = game
 
     def _set_allegiances(self, player_coalition: str, enemy_coalition: str):

gen/visualgen.py

@@ -92,9 +92,8 @@ def turn_heading(heading, fac):
 
 
 class VisualGenerator:
-    def __init__(self, mission: Mission, conflict: Conflict, game: Game):
+    def __init__(self, mission: Mission, game: Game):
         self.mission = mission
-        self.conflict = conflict
         self.game = game
 
     def _generate_frontline_smokes(self):