From c73290eebbf72a62149a1fc68603a1662699de6f Mon Sep 17 00:00:00 2001
From: Khopa <clemguip@gmail.com>
Date: Tue, 2 Jun 2020 13:00:10 +0200
Subject: [PATCH] Nav Target point for JF-17 and F-14. Fix activation trigger
 using wrong coalition when playing REDFOR side.

---
 game/game.py          | 12 ++++++++++++
 gen/aircraft.py       | 14 +++++++++-----
 gen/flights/flight.py |  2 +-
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/game/game.py b/game/game.py
index 9ca3810d..0cb05186 100644
--- a/game/game.py
+++ b/game/game.py
@@ -168,6 +168,18 @@ class Game:
         else:
             return event.name == self.player_name
 
+    def get_player_coalition_id(self):
+        if self.player_country in db.BLUEFOR_FACTIONS:
+            return 2
+        else:
+            return 1
+
+    def get_enemy_coalition_id(self):
+        if self.get_player_coalition_id() == 1:
+            return 2
+        else:
+            return 1
+
     def pass_turn(self, no_action=False, ignored_cps: typing.Collection[ControlPoint] = None):
         logging.info("Pass turn")
         self.informations.append(Information("End of turn #" + str(self.turn), "-" * 40, 0))
diff --git a/gen/aircraft.py b/gen/aircraft.py
index 2798b098..73b28749 100644
--- a/gen/aircraft.py
+++ b/gen/aircraft.py
@@ -353,16 +353,16 @@ class AircraftConflictGenerator:
             self.setup_group_activation_trigger(flight, group)
 
     def setup_group_activation_trigger(self, flight, group):
-        if flight.scheduled_in > 0:
+        if flight.scheduled_in > 0 and flight.client_count == 0:
             group.late_activation = True
             activation_trigger = TriggerOnce(Event.NoEvent, "LiberationActivationTriggerForGroup" + str(group.id))
             activation_trigger.add_condition(TimeAfter(seconds=flight.scheduled_in*60))
 
             if(flight.from_cp.cptype == ControlPointType.AIRBASE):
                 if not flight.from_cp.captured:
-                    activation_trigger.add_condition(CoalitionHasAirdrome(1, flight.from_cp.id))
+                    activation_trigger.add_condition(CoalitionHasAirdrome(self.game.get_player_coalition_id(), flight.from_cp.id))
                 else:
-                    activation_trigger.add_condition(CoalitionHasAirdrome(2, flight.from_cp.id))
+                    activation_trigger.add_condition(CoalitionHasAirdrome(self.game.get_enemy_coalition_id(), flight.from_cp.id))
 
 
             activation_trigger.add_action(ActivateGroup(group.id))
@@ -475,11 +475,15 @@ class AircraftConflictGenerator:
         for point in flight.points:
             group.add_waypoint(Point(point.x,point.y), point.alt)
             if not bombing_point_found:
-                for t in point.targets:
+                for j, t in enumerate(point.targets):
                     if hasattr(t, "obj_name"):
                         buildings = self.game.theater.find_ground_objects_by_obj_name(t.obj_name)
-                        for building in buildings:
+                        for j, building in enumerate(buildings):
                             group.points[i].tasks.append(Bombing(building.position))
+                            if group.units[0].unit_type == JF_17 and j < 4:
+                                group.add_nav_target_point(building.position, "PP" + str(j+1))
+                            if group.units[0].unit_type == F_14B and j == 0:
+                                group.add_nav_target_point(building.position, "ST")
                     else:
                         group.points[i].tasks.append(Bombing(t.position))
                     bombing_point_found = True
diff --git a/gen/flights/flight.py b/gen/flights/flight.py
index b6e6ea68..0bfad12a 100644
--- a/gen/flights/flight.py
+++ b/gen/flights/flight.py
@@ -30,7 +30,7 @@ class FlightType(Enum):
     EWAR = 16
 
 
-class FlightWaypoint():
+class FlightWaypoint:
 
     def __init__(self, x: float, y: float, alt=0):
         self.x = x