Merge remote-tracking branch 'origin/develop' into develop

game/event/event.py

@@ -21,6 +21,7 @@ class Event:
     silent = False
     informational = False
     is_awacs_enabled = False
+    ca_slots = 0
     operation = None  # type: Operation
     difficulty = 1  # type: int
     game = None  # type: Game
@@ -74,6 +75,7 @@ class Event:
 
     def generate(self):
         self.operation.is_awacs_enabled = self.is_awacs_enabled
+        self.operation.ca_slots = self.ca_slots
 
         self.operation.prepare(self.game.theater.terrain, is_quick=False)
         self.operation.generate()

game/operation/operation.py

@@ -27,6 +27,7 @@ class Operation:
     trigger_radius = TRIGGER_RADIUS_MEDIUM
     is_quick = None
     is_awacs_enabled = False
+    ca_slots = 0
 
     def __init__(self,
                  game,
@@ -50,7 +51,6 @@ class Operation:
     def initialize(self, mission: Mission, conflict: Conflict):
         self.mission = mission
         self.conflict = conflict
-
         self.armorgen = ArmorConflictGenerator(mission, conflict)
         self.airgen = AircraftConflictGenerator(mission, conflict, self.game.settings)
         self.aagen = AAConflictGenerator(mission, conflict)
@@ -90,6 +90,13 @@ class Operation:
         if self.is_awacs_enabled:
             self.briefinggen.append_frequency("AWACS", "133 MHz AM")
 
+        # combined arms
+        self.mission.groundControl.pilot_can_control_vehicles = self.ca_slots > 0
+        if self.game.player in [country.name for country in self.mission.coalition["blue"].countries.values()]:
+            self.mission.groundControl.blue_tactical_commander = self.ca_slots
+        else:
+            self.mission.groundControl.red_tactical_commander = self.ca_slots
+
         # ground infrastructure
         self.groundobjectgen.generate()
         self.extra_aagen.generate()