update to ground objects parser; waypoints in briefings & general briefings update; minor fixes

game/game.py

@@ -49,13 +49,13 @@ Events:
 * InfantryTransportEvent - helicopter infantry transport
 """
 EVENT_PROBABILITIES = {
-    BaseAttackEvent: [100, 10],
+    BaseAttackEvent: [100, 15],
     FrontlineAttackEvent: [100, 0],
     FrontlinePatrolEvent: [100, 0],
     StrikeEvent: [100, 0],
-    InterceptEvent: [25, 10],
+    InterceptEvent: [25, 15],
     InsurgentAttackEvent: [0, 10],
-    NavalInterceptEvent: [25, 10],
+    NavalInterceptEvent: [25, 15],
     InfantryTransportEvent: [25, 0],
 }
 

game/operation/baseattack.py

@@ -59,5 +59,11 @@ class BaseAttackOperation(Operation):
 
         self.briefinggen.title = "Base attack"
         self.briefinggen.description = "The goal of an attacker is to lower defender presence by destroying their armor and aircraft. Base will be considered captured if attackers on the ground overrun the defenders. Be advised that your flight will not attack anything until you explicitly tell them so by comms menu."
+
+        if self.game.player == self.attacker_name:
+            self.briefinggen.append_waypoint("TARGET")
+        else:
+            pass
+
         super(BaseAttackOperation, self).generate()
 

game/operation/frontlineattack.py

@@ -51,4 +51,6 @@ class FrontlineAttackOperation(Operation):
 
         self.briefinggen.title = "Frontline CAS"
         self.briefinggen.description = "Provide CAS for the ground forces attacking enemy lines. Operation will be considered successful if total number of enemy units will be lower than your own by a factor of 1.5 (i.e. with 12 units from both sides, enemy forces need to be reduced to at least 8), meaning that you (and, probably, your wingmans) should concentrate on destroying the enemy units. Target base strength will be lowered as a result. Be advised that your flight will not attack anything until you explicitly tell them so by comms menu."
+        self.briefinggen.append_waypoint("CAS AREA IP")
+        self.briefinggen.append_waypoint("CAS AREA EGRESS")
         super(FrontlineAttackOperation, self).generate()

game/operation/frontlinepatrol.py

@@ -51,4 +51,6 @@ class FrontlinePatrolOperation(Operation):
 
         self.briefinggen.title = "Frontline CAP"
         self.briefinggen.description = "Providing CAP support for ground units attacking enemy lines. Enemy will scramble its CAS and your task is to intercept it. Operation will be considered successful if total number of friendly units will be lower than enemy by at least a factor of 0.8 (i.e. with 12 units from both sides, there should be at least 8 friendly units alive), lowering targets strength as a result."
+        self.briefinggen.append_waypoint("CAP AREA IP")
+        self.briefinggen.append_waypoint("CAP AREA EGRESS")
         super(FrontlinePatrolOperation, self).generate()

game/operation/infantrytransport.py

@@ -36,6 +36,7 @@ class InfantryTransportOperation(Operation):
 
         self.briefinggen.title = "Infantry transport"
         self.briefinggen.description = "Helicopter operation to transport infantry troops from the base to the front line. Lowers target strength"
+        self.briefinggen.append_waypoint("DROP POINT")
 
         # TODO: horrible, horrible hack
         # this will disable vehicle activation triggers,

game/operation/insurgentattack.py

@@ -28,10 +28,11 @@ class InsurgentAttackOperation(Operation):
                         conflict=conflict)
 
     def generate(self):
-        self.airgen.generate_defense(*assigned_units_split(self.strikegroup), at=self.defenders_starting_position)
+        self.airgen.generate_defenders_cas(*assigned_units_split(self.strikegroup), at=self.defenders_starting_position)
         self.armorgen.generate(self.target, {})
 
         self.briefinggen.title = "Destroy insurgents"
         self.briefinggen.description = "Destroy vehicles of insurgents in close proximity of the friendly base. Be advised that your flight will not attack anything until you explicitly tell them so by comms menu."
+        self.briefinggen.append_waypoint("TARGET")
 
         super(InsurgentAttackOperation, self).generate()

game/operation/intercept.py

@@ -56,7 +56,14 @@ class InterceptOperation(Operation):
         self.airgen.generate_interception(*assigned_units_split(self.interceptors), at=self.attackers_starting_position)
 
         self.briefinggen.title = "Air Intercept"
-        self.briefinggen.description = "Intercept enemy supply transport aircraft. Escort will also be present if there are available planes on the base. Operation will be considered successful if most of the targets are destroyed, lowering targets strength as a result"
+
+        if self.game.player == self.attacker_name:
+            self.briefinggen.description = "Intercept enemy supply transport aircraft. Escort will also be present if there are available planes on the base. Operation will be considered successful if most of the targets are destroyed, lowering targets strength as a result"
+            self.briefinggen.append_waypoint("TARGET")
+            for unit_type, count in self.transport.items():
+                self.briefinggen.append_target("{} ({})".format(db.unit_type_name(unit_type), count))
+        else:
+            self.briefinggen.description = "Escort friendly supply transport aircraft. Operation will be considered failed if most of the targets are destroyed, lowering CP strength as a result"
 
         super(InterceptOperation, self).generate()
 

game/operation/navalintercept.py

@@ -48,7 +48,13 @@ class NavalInterceptionOperation(Operation):
             )
 
         self.briefinggen.title = "Naval Intercept"
-        self.briefinggen.description = "Destroy supply transport ships. Lowers target strength. Be advised that your flight will not attack anything until you explicitly tell them so by comms menu."
+        if self.game.player == self.attacker_name:
+            self.briefinggen.description = "Destroy supply transport ships. Lowers target strength. Be advised that your flight will not attack anything until you explicitly tell them so by comms menu."
+            for unit_type, count in self.targets:
+                self.briefinggen.append_target("{} ({})".format(db.unit_type_name(unit_type), count))
+        else:
+            self.briefinggen.description = "Protect supply transport ships."
+        self.briefinggen.append_waypoint("TARGET")
 
         super(NavalInterceptionOperation, self).generate()
 

game/operation/operation.py

@@ -111,8 +111,6 @@ class Operation:
         else:
             self.envgen.load(self.environment_settings)
 
-        # @TODO: ADD WAYPOINT INFORMATION!
-
         # main frequencies
         self.briefinggen.append_frequency("Flight", "251 MHz AM")
         if self.conflict.from_cp.is_global or self.conflict.to_cp.is_global:

game/operation/strike.py

@@ -47,7 +47,8 @@ class StrikeOperation(Operation):
             category_counters[object.category] = category_counters.get(object.category, 0) + 1
             markpoint_name = "{}{}".format(object.name_abbrev, category_counters[object.category])
             targets.append((markpoint_name, object.position))
-            self.briefinggen.append_target(str(object), markpoint_name)
+            self.briefinggen.append_target(str(object))
+            self.briefinggen.append_waypoint("TARGET {} (TP {})".format(str(object), markpoint_name))
 
         targets.sort(key=lambda x: self.from_cp.position.distance_to_point(x[1]))