fixed incompatible missions being available from carriers

game/event/convoystrike.py

@@ -28,6 +28,10 @@ class ConvoyStrikeEvent(Event):
     def tasks(self):
         return [CAS]
 
+    @property
+    def global_cp_available(self) -> bool:
+        return True
+
     def flight_name(self, for_task: typing.Type[Task]) -> str:
         if for_task == CAS:
             return "Strike flight"

game/event/event.py

@@ -70,6 +70,10 @@ class Event:
     def ai_banned_tasks(self) -> typing.Collection[typing.Type[Task]]:
         return []
 
+    @property
+    def global_cp_available(self) -> bool:
+        return False
+
     def bonus(self) -> int:
         return int(math.log(self.to_cp.importance + 1, DIFFICULTY_LOG_BASE) * self.BONUS_BASE)
 

game/event/frontlineattack.py

@@ -22,6 +22,10 @@ class FrontlineAttackEvent(Event):
         else:
             return [CAP]
 
+    @property
+    def global_cp_available(self) -> bool:
+        return True
+
     def flight_name(self, for_task: typing.Type[Task]) -> str:
         if for_task == CAS:
             return "CAS flight"

game/event/intercept.py

@@ -37,6 +37,10 @@ class InterceptEvent(Event):
     def threat_description(self):
         return "{} aircraft".format(self.enemy_cp.base.scramble_count(self._enemy_scramble_multiplier(), CAP))
 
+    @property
+    def global_cp_available(self) -> bool:
+        return True
+
     def is_successfull(self, debriefing: Debriefing):
         units_destroyed = debriefing.destroyed_units[self.defender_name].get(self.transport_unit, 0)
         if self.departure_cp.captured:

game/event/navalintercept.py

@@ -42,6 +42,10 @@ class NavalInterceptEvent(Event):
             s += ", {} aircraft".format(self.departure_cp.base.scramble_count(self.game.settings.multiplier))
         return s
 
+    @property
+    def global_cp_available(self) -> bool:
+        return True
+
     def is_successfull(self, debriefing: Debriefing):
         total_targets = sum(self.targets.values())
         destroyed_targets = 0

game/event/strike.py

@@ -28,6 +28,10 @@ class StrikeEvent(Event):
     def ai_banned_tasks(self):
         return [CAS]
 
+    @property
+    def global_cp_available(self) -> bool:
+        return True
+
     def flight_name(self, for_task: typing.Type[Task]) -> str:
         if for_task == CAP:
             if self.is_player_attacking:

game/operation/convoystrike.py

@@ -28,6 +28,9 @@ class ConvoyStrikeOperation(Operation):
                         conflict=conflict)
 
     def generate(self):
+        if self.is_player_attack:
+            self.prepare_carriers(db.unitdict_from(self.strikegroup))
+
         planes_flights = {k: v for k, v in self.strikegroup.items() if k in plane_map.values()}
         self.airgen.generate_cas_strikegroup(*assigned_units_split(planes_flights), at=self.attackers_starting_position)
 

game/operation/frontlineattack.py

@@ -37,6 +37,9 @@ class FrontlineAttackOperation(Operation):
                         conflict=conflict)
 
     def generate(self):
+        if self.is_player_attack:
+            self.prepare_carriers(db.unitdict_from(self.strikegroup))
+
         self.armorgen.generate_vec(self.attackers, self.target)
 
         planes_flights = {k: v for k, v in self.strikegroup.items() if k in plane_map.values()}

game/operation/frontlinepatrol.py

@@ -43,6 +43,9 @@ class FrontlinePatrolOperation(Operation):
                         conflict=conflict)
 
     def generate(self):
+        if self.is_player_attack:
+            self.prepare_carriers(db.unitdict_from(self.interceptors))
+
         self.airgen.generate_defenders_cas(*assigned_units_split(self.cas), at=self.defenders_starting_position)
         self.airgen.generate_defenders_escort(*assigned_units_split(self.escort), at=self.defenders_starting_position)
         self.airgen.generate_migcap(*assigned_units_split(self.interceptors), at=self.attackers_starting_position)

game/operation/intercept.py

@@ -43,7 +43,8 @@ class InterceptOperation(Operation):
                         conflict=conflict)
 
     def generate(self):
-        self.prepare_carriers(db.unitdict_from(self.interceptors))
+        if self.is_player_attack:
+            self.prepare_carriers(db.unitdict_from(self.interceptors))
 
         self.airgen.generate_transport(self.transport, self.to_cp.at)
         self.airgen.generate_defenders_escort(*assigned_units_split(self.escort), at=self.defenders_starting_position)

game/operation/navalintercept.py

@@ -37,7 +37,8 @@ class NavalInterceptionOperation(Operation):
         self.initialize(self.current_mission, conflict)
 
     def generate(self):
-        self.prepare_carriers(db.unitdict_from(self.strikegroup))
+        if self.is_player_attack:
+            self.prepare_carriers(db.unitdict_from(self.strikegroup))
 
         target_groups = self.shipgen.generate_cargo(units=self.targets)
 

game/operation/operation.py

@@ -55,6 +55,10 @@ class Operation:
     def is_successfull(self, debriefing: Debriefing) -> bool:
         return True
 
+    @property
+    def is_player_attack(self) -> bool:
+        return self.from_cp.captured
+
     def initialize(self, mission: Mission, conflict: Conflict):
         self.current_mission = mission
         self.conflict = conflict
@@ -104,7 +108,10 @@ class Operation:
                                                  at=global_cp.at)
 
             if global_cp == self.departure_cp and not self.is_quick:
-                self.attackers_starting_position = ship
+                if self.to_cp.captured:
+                    self.attackers_starting_position = ship
+                else:
+                    self.defenders_starting_position = ship
 
     def generate(self):
         # air support

ui/overviewcanvas.py

@@ -365,8 +365,9 @@ class OverviewCanvas:
                     self.surface.blit(labelHover, (coords[0] - label.get_width() / 2 + 1, coords[1] + 1))
 
                 self.draw_base_info(self.overlay, cp, (0, 0))
-                if self.selected_event_info and cp.captured and self.selected_event_info[0].location.distance_to_point(cp.position) < EVENT_DEPARTURE_MAX_DISTANCE:
-                    pygame.draw.line(self.surface, self.WHITE, point, self.selected_event_info[1])
+                if self.selected_event_info:
+                    if self._cp_available_for_selected_event(cp):
+                        pygame.draw.line(self.surface, self.WHITE, point, self.selected_event_info[1])
 
             else:
                 self.surface.blit(label, (coords[0] - label.get_width() / 2 + 1, coords[1] + 1))
@@ -510,11 +511,14 @@ class OverviewCanvas:
 
     def _selected_cp(self, cp):
         if self.selected_event_info:
-            event = self.selected_event_info[0]
-            event.departure_cp = cp
+            if self._cp_available_for_selected_event(cp):
+                event = self.selected_event_info[0]
+                event.departure_cp = cp
 
-            self.selected_event_info = None
-            self.parent.start_event(event)
+                self.selected_event_info = None
+                self.parent.start_event(event)
+            else:
+                return
         else:
             self.parent.go_cp(cp)
 
@@ -563,6 +567,20 @@ class OverviewCanvas:
         else:
             return None
 
+    def _cp_available_for_selected_event(self, cp: ControlPoint) -> bool:
+        event = self.selected_event_info[0]
+
+        if not cp.captured:
+            return False
+
+        if event.location.distance_to_point(cp.position) > EVENT_DEPARTURE_MAX_DISTANCE:
+            return False
+
+        if cp.is_global and not event.global_cp_available:
+            return False
+
+        return True
+
     def _player_color(self):
         return self.game.player == "USA" and self.BLUE or self.RED