persistent time and weather between regular and quick missions; defense AA for frontline CAS

game/event/event.py

@@ -2,6 +2,7 @@ from dcs.unittype import UnitType
 
 from game import *
 from theater import *
+from gen.environmentgen import EnvironmentSettings
 
 from userdata.debriefing import Debriefing
 
@@ -15,6 +16,7 @@ class Event:
     operation = None  # type: Operation
     difficulty = 1  # type: int
     game = None  # type: Game
+    environment_settings = None  # type: EnvironmentSettings
     BONUS_BASE = 3
 
     def __init__(self, attacker_name: str, defender_name: str, from_cp: ControlPoint, to_cp: ControlPoint, game):
@@ -47,12 +49,16 @@ class Event:
 
     def generate(self):
         self.operation.is_awacs_enabled = self.is_awacs_enabled
+
         self.operation.prepare(self.game.theater.terrain, is_quick=False)
         self.operation.generate()
         self.operation.mission.save("build/nextturn.miz")
+        self.environment_settings = self.operation.environment_settings
 
     def generate_quick(self):
         self.operation.is_awacs_enabled = self.is_awacs_enabled
+        self.operation.environment_settings = self.environment_settings
+
         self.operation.prepare(self.game.theater.terrain, is_quick=True)
         self.operation.generate()
         self.operation.mission.save('build/nextturn_quick.miz')

game/event/groundintercept.py

@@ -2,6 +2,7 @@ import math
 import random
 
 from dcs.task import *
+from dcs.vehicles import AirDefence
 
 from game import *
 from game.event import *
@@ -57,6 +58,9 @@ class GroundInterceptEvent(Event):
         typecount = max(math.floor(self.difficulty * self.TARGET_AMOUNT_FACTOR), 1)
         self.targets = {unittype: typecount for unittype in unittypes}
 
+        defense_aa_unit = random.choice(self.game.commision_unit_types(self.to_cp, AirDefence))
+        self.targets[defense_aa_unit] = 1
+
         op = GroundInterceptOperation(game=self.game,
                                       attacker_name=self.attacker_name,
                                       defender_name=self.defender_name,

game/game.py

@@ -141,6 +141,14 @@ class Game:
                     enemy_generated_types.append(event_class)
                     self.events.append(event_class(self.enemy, self.player, enemy_cp, player_cp, self))
 
+    def commision_unit_types(self, cp: ControlPoint, for_task: Task) -> typing.Collection[UnitType]:
+        importance_factor = (cp.importance - IMPORTANCE_LOW) / (IMPORTANCE_HIGH - IMPORTANCE_LOW)
+
+        if for_task == AirDefence and not self.settings.sams:
+            return [x for x in db.find_unittype(AirDefence, self.enemy) if x not in db.SAM_BAN]
+        else:
+            return db.choose_units(for_task, importance_factor, COMMISION_UNIT_VARIETY, self.enemy)
+
     def _commision_units(self, cp: ControlPoint):
         for for_task in [PinpointStrike, CAS, CAP, AirDefence]:
             limit = COMMISION_LIMITS_FACTORS[for_task] * math.pow(cp.importance, COMMISION_LIMITS_SCALE) * self.settings.multiplier
@@ -149,13 +157,7 @@ class Game:
                 awarded_points = COMMISION_AMOUNTS_FACTORS[for_task] * math.pow(cp.importance, COMMISION_AMOUNTS_SCALE) * self.settings.multiplier
                 points_to_spend = cp.base.append_commision_points(for_task, awarded_points)
                 if points_to_spend > 0:
-                    importance_factor = (cp.importance - IMPORTANCE_LOW) / (IMPORTANCE_HIGH - IMPORTANCE_LOW)
-
-                    if for_task == AirDefence and not self.settings.sams:
-                        unittypes = [x for x in db.find_unittype(AirDefence, self.enemy) if x not in db.SAM_BAN]
-                    else:
-                        unittypes = db.choose_units(for_task, importance_factor, COMMISION_UNIT_VARIETY, self.enemy)
-
+                    unittypes = self._commision_unit_types(cp, for_task)
                     d = {random.choice(unittypes): points_to_spend}
                     print("Commision {}: {}".format(cp, d))
                     cp.base.commision_units(d)
@@ -208,7 +210,8 @@ class Game:
 
     def pass_turn(self, no_action=False, ignored_cps: typing.Collection[ControlPoint]=None):
         for event in self.events:
-            event.skip()
+            if isinstance(event, UnitsDeliveryEvent):
+                event.skip()
 
         if not no_action:
             self._budget_player()

game/operation/antiaastrike.py

@@ -5,7 +5,7 @@ from gen.armor import *
 from gen.aircraft import *
 from gen.aaa import *
 from gen.shipgen import *
-from gen.settingsgen import *
+from gen.triggergen import *
 from gen.awacsgen import *
 from gen.visualgen import *
 from gen.conflictgen import Conflict

game/operation/capture.py

@@ -5,7 +5,7 @@ from gen.armor import *
 from gen.aircraft import *
 from gen.aaa import *
 from gen.shipgen import *
-from gen.settingsgen import *
+from gen.triggergen import *
 from gen.awacsgen import *
 from gen.visualgen import *
 

game/operation/groundattack.py

@@ -5,7 +5,7 @@ from gen.armor import *
 from gen.aircraft import *
 from gen.aaa import *
 from gen.shipgen import *
-from gen.settingsgen import *
+from gen.triggergen import *
 from gen.awacsgen import *
 from gen.visualgen import *
 from gen.conflictgen import Conflict

game/operation/groundintercept.py

@@ -5,7 +5,7 @@ from gen.armor import *
 from gen.aircraft import *
 from gen.aaa import *
 from gen.shipgen import *
-from gen.settingsgen import *
+from gen.triggergen import *
 from gen.awacsgen import *
 from gen.visualgen import *
 from gen.conflictgen import Conflict

game/operation/infantrytransport.py

@@ -5,7 +5,7 @@ from gen.armor import *
 from gen.aircraft import *
 from gen.aaa import *
 from gen.shipgen import *
-from gen.settingsgen import *
+from gen.triggergen import *
 from gen.awacsgen import *
 from gen.visualgen import *
 from gen.conflictgen import Conflict

game/operation/operation.py

@@ -16,10 +16,13 @@ class Operation:
     aagen = None  # type: AAConflictGenerator
     extra_aagen = None  # type: ExtraAAConflictGenerator
     shipgen = None  # type: ShipGenerator
-    envgen = None  # type: SettingsGenerator
+    triggersgen = None  # type: TriggersGenerator
     awacsgen = None  # type: AWACSConflictGenerator
     visualgen = None  # type: VisualGenerator
+    envgen = None  # type: EnvironmentGenerator
 
+    environment_settings = None
+    is_quick = None
     is_awacs_enabled = False
 
     def __init__(self,
@@ -48,8 +51,9 @@ class Operation:
         self.aagen = AAConflictGenerator(mission, conflict)
         self.shipgen = ShipGenerator(mission, conflict)
         self.awacsgen = AWACSConflictGenerator(mission, conflict, self.game)
-        self.envgen = SettingsGenerator(mission, conflict, self.game)
+        self.triggersgen = TriggersGenerator(mission, conflict, self.game)
         self.visualgen = VisualGenerator(mission, conflict, self.game)
+        self.envgen = EnviromentGenerator(mission, conflict, self.game)
 
         player_name = self.from_cp.captured and self.attacker_name or self.defender_name
         enemy_name = self.from_cp.captured and self.defender_name or self.attacker_name
@@ -73,7 +77,12 @@ class Operation:
             self.awacsgen.generate()
 
         self.extra_aagen.generate()
-        self.envgen.generate(self.is_quick)
+        self.triggersgen.generate(self.is_quick)
+
+        if self.environment_settings is None:
+            self.environment_settings = self.envgen.generate()
+        else:
+            self.envgen.load(self.environment_settings)
 
         for global_cp in self.game.theater.controlpoints:
             if not global_cp.is_global: