Improved Frontline CAS

game/operation/frontlinecas.py

@@ -1,3 +1,5 @@
+from itertools import zip_longest
+
 from dcs.terrain import Terrain
 
 from game import db
@@ -13,26 +15,29 @@ from gen.conflictgen import Conflict
 from .operation import Operation
 
 
-class GroundInterceptOperation(Operation):
+MAX_DISTANCE_BETWEEN_GROUPS = 12000
+
+
+class FrontlineCASOperation(Operation):
+    attackers = None  # type: db.ArmorDict
     strikegroup = None  # type: db.PlaneDict
-    interceptors = None  # type: db.PlaneDict
     target = None  # type: db.ArmorDict
 
     def setup(self,
               target: db.ArmorDict,
-              strikegroup: db.PlaneDict,
-              interceptors: db.PlaneDict):
+              attackers: db.ArmorDict,
+              strikegroup: db.PlaneDict):
         self.strikegroup = strikegroup
-        self.interceptors = interceptors
         self.target = target
+        self.attackers = attackers
 
     def prepare(self, terrain: Terrain, is_quick: bool):
-        super(GroundInterceptOperation, self).prepare(terrain, is_quick)
+        super(FrontlineCASOperation, self).prepare(terrain, is_quick)
         if self.defender_name == self.game.player:
             self.attackers_starting_position = None
             self.defenders_starting_position = None
 
-        conflict = Conflict.ground_intercept_conflict(
+        conflict = Conflict.frontline_cas_conflict(
             attacker=self.mission.country(self.attacker_name),
             defender=self.mission.country(self.defender_name),
             from_cp=self.from_cp,
@@ -44,10 +49,6 @@ class GroundInterceptOperation(Operation):
                         conflict=conflict)
 
     def generate(self):
+        self.armorgen.generate_vec(self.attackers, self.target)
         self.airgen.generate_cas_strikegroup(self.strikegroup, clients=self.attacker_clients, at=self.attackers_starting_position)
-
-        if self.interceptors:
-            self.airgen.generate_defense(self.interceptors, clients=self.defender_clients, at=self.defenders_starting_position)
-
-        self.armorgen.generate({}, self.target)
-        super(GroundInterceptOperation, self).generate()
+        super(FrontlineCASOperation, self).generate()