fixes to frontline attack; frontline CAP WIP

game/event/__init__.py

@@ -1,5 +1,6 @@
 from .event import *
 from .frontlineattack import *
+from .frontlinepatrol import *
 from .intercept import *
 from .baseattack import *
 from .navalintercept import *

game/event/baseattack.py

@@ -16,7 +16,7 @@ class BaseAttackEvent(Event):
     STRENGTH_RECOVERY = 0.55
 
     def __str__(self):
-        return "Attack from {} to {}".format(self.from_cp, self.to_cp)
+        return "Base attack from {} to {}".format(self.from_cp, self.to_cp)
 
     def is_successfull(self, debriefing: Debriefing):
         alive_attackers = sum([v for k, v in debriefing.alive_units[self.attacker_name].items() if db.unit_task(k) == PinpointStrike])

game/event/frontlineattack.py

@@ -16,7 +16,7 @@ class FrontlineAttackEvent(Event):
     ATTACKER_AMOUNT_FACTOR = 0.4
     ATTACKER_DEFENDER_FACTOR = 0.7
     STRENGTH_INFLUENCE = 0.3
-    SUCCESS_MIN_TARGETS = 3
+    SUCCESS_TARGETS_HIT_PERCENTAGE = 0.25
 
     defenders = None  # type: db.ArmorDict
 
@@ -35,9 +35,9 @@ class FrontlineAttackEvent(Event):
                 destroyed_targets += count
 
         if self.from_cp.captured:
-            return float(destroyed_targets) >= min(self.SUCCESS_MIN_TARGETS, total_targets)
+            return float(destroyed_targets) / total_targets >= self.SUCCESS_TARGETS_HIT_PERCENTAGE
         else:
-            return float(destroyed_targets) < min(self.SUCCESS_MIN_TARGETS, total_targets)
+            return float(destroyed_targets) / total_targets < self.SUCCESS_TARGETS_HIT_PERCENTAGE
 
     def commit(self, debriefing: Debriefing):
         super(FrontlineAttackEvent, self).commit(debriefing)

game/event/frontlinepatrol.py

@@ -0,0 +1,72 @@
+import math
+import random
+
+from dcs.task import *
+from dcs.vehicles import AirDefence
+
+from game import *
+from game.event import *
+from game.operation.frontlinepatrol import FrontlinePatrolOperation
+from userdata.debriefing import Debriefing
+
+
+class FrontlinePatrolEvent(Event):
+    ESCORT_FACTOR = 0.5
+    STRENGTH_INFLUENCE = 0.3
+    SUCCESS_TARGETS_HIT_PERCENTAGE = 0.6
+
+    cas = None  # type: db.PlaneDict
+    escort = None  # type: db.PlaneDict
+
+    @property
+    def threat_description(self):
+        return "{} aircraft + ? CAS".format(self.to_cp.base.scramble_count(self.game.settings.multiplier * self.ESCORT_FACTOR, CAP))
+
+    def __str__(self):
+        return "Frontline CAP from {} at {}".format(self.from_cp, self.to_cp)
+
+    def is_successfull(self, debriefing: Debriefing):
+        total_targets = sum(self.cas.values())
+        destroyed_targets = 0
+        for unit, count in debriefing.destroyed_units[self.defender_name].items():
+            if unit in self.cas:
+                destroyed_targets += count
+
+        if self.from_cp.captured:
+            return float(destroyed_targets) / total_targets >= self.SUCCESS_TARGETS_HIT_PERCENTAGE
+        else:
+            return float(destroyed_targets) / total_targets < self.SUCCESS_TARGETS_HIT_PERCENTAGE
+
+    def commit(self, debriefing: Debriefing):
+        super(FrontlinePatrolEvent, self).commit(debriefing)
+
+        if self.from_cp.captured:
+            if self.is_successfull(debriefing):
+                self.to_cp.base.affect_strength(-self.STRENGTH_INFLUENCE)
+            else:
+                self.to_cp.base.affect_strength(+self.STRENGTH_INFLUENCE)
+        else:
+            if self.is_successfull(debriefing):
+                self.from_cp.base.affect_strength(-self.STRENGTH_INFLUENCE)
+            else:
+                self.to_cp.base.affect_strength(-self.STRENGTH_INFLUENCE)
+
+    def skip(self):
+        pass
+
+    def player_attacking(self, interceptors: db.PlaneDict, clients: db.PlaneDict):
+        self.cas = self.to_cp.base.scramble_cas(self.game.settings.multiplier)
+        self.escort = self.to_cp.base.scramble_sweep(self.game.settings.multiplier * self.ESCORT_FACTOR)
+
+        op = FrontlinePatrolOperation(game=self.game,
+                                      attacker_name=self.attacker_name,
+                                      defender_name=self.defender_name,
+                                      attacker_clients={},
+                                      defender_clients=clients,
+                                      from_cp=self.from_cp,
+                                      to_cp=self.to_cp)
+        op.setup(cas=self.cas,
+                 escort=self.escort,
+                 interceptors=interceptors)
+
+        self.operation = op