display events on map

game/event/event.py

@@ -9,6 +9,7 @@ from dcs.unittype import UnitType
 from game import *
 from theater import *
 from gen.environmentgen import EnvironmentSettings
+from gen.conflictgen import Conflict
 from game.db import assigned_units_from, unitdict_from
 
 from userdata.debriefing import Debriefing

game/event/intercept.py

@@ -10,6 +10,11 @@ class InterceptEvent(Event):
 
     transport_unit = None  # type: FlyingType
 
+    def __init__(self, game, from_cp: ControlPoint, target_cp: ControlPoint, location: Point, attacker_name: str,
+                 defender_name: str):
+        super().__init__(game, from_cp, target_cp, location, attacker_name, defender_name)
+        self.location = Conflict.intercept_position(self.from_cp, self.to_cp)
+
     def __str__(self):
         return "Air Intercept"
 
@@ -74,7 +79,8 @@ class InterceptEvent(Event):
                                 from_cp=self.departure_cp,
                                 to_cp=self.to_cp)
 
-        op.setup(escort=assigned_units_from(escort),
+        op.setup(location=self.location,
+                 escort=assigned_units_from(escort),
                  transport={self.transport_unit: 1},
                  airdefense={airdefense_unit: self.AIRDEFENSE_COUNT},
                  interceptors=flights[CAP])

game/event/navalintercept.py

@@ -9,6 +9,11 @@ class NavalInterceptEvent(Event):
 
     targets = None  # type: db.ShipDict
 
+    def __init__(self, game, from_cp: ControlPoint, target_cp: ControlPoint, location: Point, attacker_name: str,
+                 defender_name: str):
+        super().__init__(game, from_cp, target_cp, location, attacker_name, defender_name)
+        self.location = Conflict.naval_intercept_position(from_cp, target_cp, game.theater)
+
     def _targets_count(self) -> int:
         from gen.conflictgen import IMPORTANCE_LOW
         factor = (self.to_cp.importance - IMPORTANCE_LOW + 0.1) * 20
@@ -83,7 +88,8 @@ class NavalInterceptEvent(Event):
             to_cp=self.to_cp
         )
 
-        op.setup(strikegroup=flights[CAS],
+        op.setup(location=self.location,
+                 strikegroup=flights[CAS],
                  interceptors={},
                  targets=self.targets)
 

game/game.py

@@ -51,7 +51,7 @@ Events:
 EVENT_PROBABILITIES = {
     # events always present; only for the player
     FrontlineAttackEvent: [100, 0],
-    FrontlinePatrolEvent: [100, 0],
+    #FrontlinePatrolEvent: [100, 0],
     StrikeEvent: [100, 0],
 
     # events randomly present; only for the player
@@ -169,10 +169,10 @@ class Game:
                     if not Conflict.has_frontline_between(player_cp, enemy_cp):
                         continue
 
-                if player_probability == 100 or self._roll(player_probability, player_cp.base.strength):
+                if player_probability == 100 or player_probability > 0 and self._roll(player_probability, player_cp.base.strength):
                     self._generate_player_event(event_class, player_cp, enemy_cp)
 
-                if enemy_probability == 100 or self._roll(enemy_probability, enemy_cp.base.strength):
+                if enemy_probability == 100 or  enemy_probability > 0 and self._roll(enemy_probability, enemy_cp.base.strength):
                     self._generate_enemy_event(event_class, player_cp, enemy_cp)
 
     def commision_unit_types(self, cp: ControlPoint, for_task: Task) -> typing.Collection[UnitType]:

game/operation/intercept.py

@@ -4,6 +4,7 @@ from .operation import *
 
 
 class InterceptOperation(Operation):
+    location = None  # type: Point
     escort = None  # type: db.AssignedUnitsDict
     transport = None  # type: db.PlaneDict
     interceptors = None  # type: db.AssignedUnitsDict
@@ -12,10 +13,12 @@ class InterceptOperation(Operation):
     trigger_radius = TRIGGER_RADIUS_LARGE
 
     def setup(self,
+              location: Point,
               escort: db.AssignedUnitsDict,
               transport: db.PlaneDict,
               airdefense: db.AirDefenseDict,
               interceptors: db.AssignedUnitsDict):
+        self.location = location
         self.escort = escort
         self.transport = transport
         self.airdefense = airdefense
@@ -30,6 +33,7 @@ class InterceptOperation(Operation):
         conflict = Conflict.intercept_conflict(
             attacker=self.current_mission.country(self.attacker_name),
             defender=self.current_mission.country(self.defender_name),
+            position=self.location,
             from_cp=self.from_cp,
             to_cp=self.to_cp,
             theater=self.game.theater

game/operation/navalintercept.py

@@ -4,15 +4,18 @@ from .operation import *
 
 
 class NavalInterceptionOperation(Operation):
+    location = None  # type: Point
     strikegroup = None  # type: db.AssignedUnitsDict
     interceptors = None  # type: db.AssignedUnitsDict
     targets = None  # type: db.ShipDict
     trigger_radius = TRIGGER_RADIUS_LARGE
 
     def setup(self,
+              location: Point,
               strikegroup: db.AssignedUnitsDict,
               interceptors: db.AssignedUnitsDict,
               targets: db.ShipDict):
+        self.location = location
         self.strikegroup = strikegroup
         self.interceptors = interceptors
         self.targets = targets
@@ -25,6 +28,7 @@ class NavalInterceptionOperation(Operation):
         conflict = Conflict.naval_intercept_conflict(
             attacker=self.current_mission.country(self.attacker_name),
             defender=self.current_mission.country(self.defender_name),
+            position=self.location,
             from_cp=self.from_cp,
             to_cp=self.to_cp,
             theater=self.game.theater