number of fixes to the mission generation

game/db.py

@@ -239,8 +239,6 @@ UNIT_BY_COUNTRY = {
         M_2000C,
         AV8BNA,
 
-        A_10A,
-        A_10C,
         Su_25T,
         L_39ZA,
 

game/event/capture.py

@@ -12,24 +12,12 @@ from .event import Event
 
 class CaptureEvent(Event):
     silent = True
-    BONUS_BASE = 10
+    BONUS_BASE = 15
     STRENGTH_RECOVERY = 0.35
 
     def __str__(self):
         return "Attack from {} to {}".format(self.from_cp, self.to_cp)
 
-    @property
-    def threat_description(self):
-        descr = "{} aircraft + CAS, {} vehicles".format(
-            self.enemy_cp.base.scramble_count(self.game.settings.multiplier),
-            self.enemy_cp.base.assemble_count()
-        )
-
-        if self.is_player_attacking:
-            descr += ", {} AA".format(self.enemy_cp.base.assemble_aa_count())
-
-        return descr
-
     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])
         alive_defenders = sum([v for k, v in debriefing.alive_units[self.defender_name].items() if db.unit_task(k) == PinpointStrike])

game/event/event.py

@@ -18,7 +18,7 @@ class Event:
     difficulty = 1  # type: int
     game = None  # type: Game
     environment_settings = None  # type: EnvironmentSettings
-    BONUS_BASE = 3
+    BONUS_BASE = 5
 
     def __init__(self, attacker_name: str, defender_name: str, from_cp: ControlPoint, to_cp: ControlPoint, game):
         self.attacker_name = attacker_name

game/event/groundintercept.py

@@ -18,6 +18,13 @@ class GroundInterceptEvent(Event):
 
     targets = None  # type: db.ArmorDict
 
+    @property
+    def threat_description(self):
+        if not self.game.is_player_attack(self):
+            return "{} aicraft".format(self.from_cp.base.scramble_count(self.game.settings.multiplier, CAS))
+        else:
+            return super(GroundInterceptEvent, self).threat_description
+
     def __str__(self):
         return "Fontline CAS from {} at {}".format(self.from_cp, self.to_cp)
 

game/event/infantrytransport.py

@@ -40,6 +40,8 @@ class InfantryTransportEvent(Event):
             to_cp=self.to_cp
         )
 
-        op.setup(transport=transport)
+        air_defense = db.find_unittype(AirDefence, self.defender_name)[0]
+        op.setup(transport=transport,
+                 aa={air_defense: 2})
 
         self.operation = op

game/event/intercept.py

@@ -13,7 +13,6 @@ from .event import Event
 
 
 class InterceptEvent(Event):
-    BONUS_BASE = 5
     STRENGTH_INFLUENCE = 0.3
     GLOBAL_STRENGTH_INFLUENCE = 0.3
     AIRDEFENSE_COUNT = 3
@@ -25,7 +24,7 @@ class InterceptEvent(Event):
 
     @property
     def threat_description(self):
-        return "{} aircraft".format(self.enemy_cp.base.scramble_count(self.game.settings.multiplier))
+        return "{} aircraft".format(self.enemy_cp.base.scramble_count(self.game.settings.multiplier, CAP))
 
     def is_successfull(self, debriefing: Debriefing):
         units_destroyed = debriefing.destroyed_units[self.defender_name].get(self.transport_unit, 0)

game/game.py

@@ -64,7 +64,7 @@ AWACS_BUDGET_COST = 4
 # Initial budget value
 PLAYER_BUDGET_INITIAL = 120
 # Base post-turn bonus value
-PLAYER_BUDGET_BASE = 30
+PLAYER_BUDGET_BASE = 10
 # Bonus multiplier logarithm base
 PLAYER_BUDGET_IMPORTANCE_LOG = 2
 

game/operation/infantrytransport.py

@@ -15,9 +15,11 @@ from .operation import Operation
 
 class InfantryTransportOperation(Operation):
     transport = None  # type: db.HeliDict
+    aa = None  # type: db.AirDefenseDict
 
-    def setup(self, transport: db.HeliDict):
+    def setup(self, transport: db.HeliDict, aa: db.AirDefenseDict):
         self.transport = transport
+        self.aa = aa
 
     def prepare(self, terrain: Terrain, is_quick: bool):
         super(InfantryTransportOperation, self).prepare(terrain, is_quick)
@@ -40,7 +42,8 @@ class InfantryTransportOperation(Operation):
             at=self.attackers_starting_position
         )
 
-        self.armorgen.generate_passengers(count=8)
+        self.armorgen.generate_passengers(count=6)
+        self.aagen.generate_at_defenders_location(self.aa)
 
         self.visualgen.generate_transportation_marker(self.conflict.ground_attackers_location)
         self.visualgen.generate_transportation_destination(self.conflict.position)