From afb084ebf8502909a694d5f1c999ce5753d926b1 Mon Sep 17 00:00:00 2001
From: Vasyl Horbachenko <vasyl.horbachenko@gmail.com>
Date: Tue, 11 Sep 2018 05:55:05 +0300
Subject: [PATCH] minor bugfixes

---
 game/event/event.py           | 1 +
 game/event/frontlinepatrol.py | 2 +-
 game/operation/operation.py   | 8 +++++---
 gen/airsupportgen.py          | 4 ++--
 gen/triggergen.py             | 3 +++
 5 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/game/event/event.py b/game/event/event.py
index 56aba0fb..d0a20d9e 100644
--- a/game/event/event.py
+++ b/game/event/event.py
@@ -3,6 +3,7 @@ import logging
 
 from dcs.unittype import UnitType
 from dcs.task import *
+from dcs.vehicles import AirDefence
 from dcs.unittype import UnitType
 
 from game import *
diff --git a/game/event/frontlinepatrol.py b/game/event/frontlinepatrol.py
index e2ec1603..4e137533 100644
--- a/game/event/frontlinepatrol.py
+++ b/game/event/frontlinepatrol.py
@@ -70,7 +70,7 @@ class FrontlinePatrolEvent(Event):
         op.setup(cas=assigned_units_from(self.cas),
                  escort=assigned_units_from(self.escort),
                  interceptors=flights[CAP],
-                 armor_attackers=db.unitdict_restrict_count(dict_from_flight(flights[PinpointStrike]), sum(defenders.values())),
+                 armor_attackers=db.unitdict_restrict_count(db.unitdict_from(flights[PinpointStrike]), sum(defenders.values())),
                  armor_defenders=defenders)
 
         self.operation = op
diff --git a/game/operation/operation.py b/game/operation/operation.py
index a87d7e33..96f5d4d1 100644
--- a/game/operation/operation.py
+++ b/game/operation/operation.py
@@ -86,9 +86,9 @@ class Operation:
 
         # air support
         self.airsupportgen.generate(self.is_awacs_enabled)
-        self.briefinggen.append_frequency("Tanker", "10X/240 MHz FM")
+        self.briefinggen.append_frequency("Tanker", "10X/131 MHz AM")
         if self.is_awacs_enabled:
-            self.briefinggen.append_frequency("AWACS", "244 MHz FM")
+            self.briefinggen.append_frequency("AWACS", "133 MHz AM")
 
         # ground infrastructure
         self.groundobjectgen.generate()
@@ -111,8 +111,10 @@ class Operation:
         else:
             self.envgen.load(self.environment_settings)
 
+        # @TODO: ADD WAYPOINT INFORMATION!
+
         # main frequencies
-        self.briefinggen.append_frequency("Flight", "251 MHz FM")
+        self.briefinggen.append_frequency("Flight", "251 MHz AM")
         if self.conflict.from_cp.is_global or self.conflict.to_cp.is_global:
             self.briefinggen.append_frequency("Carrier", "20X/ICLS CHAN1")
 
diff --git a/gen/airsupportgen.py b/gen/airsupportgen.py
index 6e4650d3..8e89dfc4 100644
--- a/gen/airsupportgen.py
+++ b/gen/airsupportgen.py
@@ -33,7 +33,7 @@ class AirSupportConflictGenerator:
             plane_type=tanker_unit,
             position=tanker_position,
             altitude=TANKER_ALT,
-            frequency=240,
+            frequency=131,
             start_type=StartType.Warm,
             tacanchannel="99X",
         )
@@ -49,6 +49,6 @@ class AirSupportConflictGenerator:
                 altitude=AWACS_ALT,
                 airport=None,
                 position=self.conflict.position.random_point_within(AWACS_DISTANCE, AWACS_DISTANCE),
-                frequency=244,
+                frequency=133,
                 start_type=StartType.Warm,
             )
diff --git a/gen/triggergen.py b/gen/triggergen.py
index 6377d796..38db66a1 100644
--- a/gen/triggergen.py
+++ b/gen/triggergen.py
@@ -79,6 +79,9 @@ class TriggersGenerator:
                         if player_cp.position.distance_to_point(group.position) > PUSH_TRIGGER_SIZE * 3:
                             continue
 
+                        if group.units[0].is_human():
+                            continue
+
                         regroup_heading = self.conflict.to_cp.position.heading_between_point(player_cp.position)
 
                         pos1 = group.position.point_from_heading(regroup_heading, REGROUP_ZONE_DISTANCE)