Reworked payloads, factions, map display, carrier. Re-added Tarawa support, many minor bug fixes. UI changes.

gen/aircraft.py

@@ -42,18 +42,14 @@ TRANSPORT_LANDING_ALT = 2000
 DEFENCE_ENGAGEMENT_MAX_DISTANCE = 60000
 INTERCEPT_MAX_DISTANCE = 200000
 
-GROUP_VERTICAL_OFFSET = 300
-
 
 class AircraftConflictGenerator:
     escort_targets = [] # type: typing.List[typing.Tuple[FlyingGroup, int]]
-    vertical_offset = None  # type: int
 
     def __init__(self, mission: Mission, conflict: Conflict, settings: Settings):
         self.m = mission
         self.settings = settings
         self.conflict = conflict
-        self.vertical_offset = 0
         self.escort_targets = []
 
     def _start_type(self) -> StartType:
@@ -91,6 +87,8 @@ class AircraftConflictGenerator:
         did_load_loadout = False
         unit_type = group.units[0].unit_type
 
+        print("SETUP GROUP : " + str(for_task) + " -- " + str(group.name))
+
         if unit_type in db.PLANE_PAYLOAD_OVERRIDES:
             override_loadout = db.PLANE_PAYLOAD_OVERRIDES[unit_type]
             if type(override_loadout) == dict:
@@ -163,12 +161,11 @@ class AircraftConflictGenerator:
         assert count > 0
         assert unit is not None
 
-        self.vertical_offset += GROUP_VERTICAL_OFFSET
         if unit_type in helicopters.helicopter_map.values():
-            alt = WARM_START_HELI_ALT + self.vertical_offset
+            alt = WARM_START_HELI_ALT
             speed = WARM_START_HELI_AIRSPEED
         else:
-            alt = WARM_START_ALTITUDE + self.vertical_offset
+            alt = WARM_START_ALTITUDE
             speed = WARM_START_AIRSPEED
 
         pos = Point(at.x + random.randint(100, 1000), at.y + random.randint(100, 1000))
@@ -334,12 +331,18 @@ class AircraftConflictGenerator:
             group = self.generate_planned_flight(cp, country, flight)
             if flight.flight_type == FlightType.INTERCEPTION:
                 self.setup_group_as_intercept_flight(group, flight)
-            elif flight.flight_type == FlightType.CAP:
+            elif flight.flight_type in [FlightType.CAP, FlightType.TARCAP, FlightType.BARCAP]:
                 self.setup_group_as_cap_flight(group, flight)
-            elif flight.flight_type == FlightType.CAS:
+            elif flight.flight_type in [FlightType.CAS, FlightType.BAI]:
                 self.setup_group_as_cas_flight(group, flight)
-            elif flight.flight_type == FlightType.SEAD or flight.flight_type == FlightType.DEAD:
+            elif flight.flight_type in [FlightType.STRIKE]:
+                self.setup_group_as_strike_flight(group, flight)
+            elif flight.flight_type in [FlightType.ANTISHIP]:
+                self.setup_group_as_antiship_flight(group, flight)
+            elif flight.flight_type in [FlightType.SEAD, FlightType.DEAD]:
                 self.setup_group_as_sead_flight(group, flight)
+            else:
+                self.setup_group_as_cap_flight(group, flight)
             self._setup_custom_payload(flight, group)
 
     def generate_planned_flight(self, cp, country, flight:Flight):
@@ -413,17 +416,50 @@ class AircraftConflictGenerator:
         group.points[0].tasks.append(CASTaskAction())
         group.points[0].tasks.append(OptReactOnThreat(OptReactOnThreat.Values.EvadeFire))
         group.points[0].tasks.append(OptROE(OptROE.Values.OpenFireWeaponFree))
+        group.points[0].tasks.append(OptRestrictJettison(True))
 
         for point in flight.points:
             group.add_waypoint(Point(point.x,point.y), point.alt)
 
     def setup_group_as_sead_flight(self, group, flight):
+        group.task = SEAD.name
         self._setup_group(group, SEAD, flight.client_count)
 
         group.points[0].tasks.clear()
         group.points[0].tasks.append(SEADTaskAction())
         group.points[0].tasks.append(OptReactOnThreat(OptReactOnThreat.Values.EvadeFire))
-        group.points[0].tasks.append(OptROE(OptROE.Values.WeaponFree))
+        group.points[0].tasks.append(OptROE(OptROE.Values.OpenFireWeaponFree))
+        group.points[0].tasks.append(OptRestrictJettison(True))
+
+        i = 1
+        for point in flight.points:
+            group.add_waypoint(Point(point.x,point.y), point.alt)
+            group.points[i].tasks.clear()
+            group.points[i].tasks.append(SEADTaskAction())
+            i = i + 1
+
+    def setup_group_as_strike_flight(self, group, flight):
+        group.task = PinpointStrike.name
+        self._setup_group(group, GroundAttack, flight.client_count)
+
+        group.points[0].tasks.clear()
+        group.points[0].tasks.append(CASTaskAction())
+        group.points[0].tasks.append(OptReactOnThreat(OptReactOnThreat.Values.EvadeFire))
+        group.points[0].tasks.append(OptROE(OptROE.Values.OpenFireWeaponFree))
+        group.points[0].tasks.append(OptRestrictJettison(True))
+
+        for point in flight.points:
+            group.add_waypoint(Point(point.x,point.y), point.alt)
+
+    def setup_group_as_antiship_flight(self, group, flight):
+        group.task = AntishipStrike.name
+        self._setup_group(group, AntishipStrike, flight.client_count)
+
+        group.points[0].tasks.clear()
+        group.points[0].tasks.append(AntishipStrikeTaskAction())
+        group.points[0].tasks.append(OptReactOnThreat(OptReactOnThreat.Values.EvadeFire))
+        group.points[0].tasks.append(OptROE(OptROE.Values.OpenFireWeaponFree))
+        group.points[0].tasks.append(OptRestrictJettison(True))
 
         for point in flight.points:
             group.add_waypoint(Point(point.x,point.y), point.alt)

gen/environmentgen.py

@@ -56,11 +56,20 @@ class EnviromentGenerator:
         start_time = self.game.current_day
 
         daytime = self.game.current_turn_daytime
-        if self.game.settings.night_disabled and daytime == "night":
-            daytime = "day"
         logging.info("Mission time will be {}".format(daytime))
+        if self.game.settings.night_disabled:
+            logging.info("Skip Night mission due to user settings")
+            if daytime == "dawn":
+                time_range = (8, 9)
+            elif daytime == "noon":
+                time_range = (10, 12)
+            elif daytime == "dusk":
+                time_range = (12, 14)
+            elif daytime == "night":
+                time_range = (14, 17)
+        else:
+            time_range = self.game.theater.daytime_map[daytime]
 
-        time_range = self.game.theater.daytime_map[daytime]
         start_time += timedelta(hours=random.randint(*time_range))
 
         logging.info("time - {}, slot - {}, night skipped - {}".format(

gen/fleet/carrier_group.py

@@ -13,7 +13,11 @@ class CarrierGroupGenerator(GroupGenerator):
 
         # Add carrier
         if "aircraft_carrier" in self.faction.keys():
-            carrier_type = random.choice(self.faction["aircraft_carrier"])
+
+            if "supercarrier" in self.faction.keys() and self.game.settings.supercarrier:
+                carrier_type = random.choice(self.faction["supercarrier"])
+            else:
+                carrier_type = random.choice(self.faction["aircraft_carrier"])
             self.add_unit(carrier_type, "Carrier", self.position.x, self.position.y, self.heading)
         else:
             return
@@ -24,4 +28,6 @@ class CarrierGroupGenerator(GroupGenerator):
         self.add_unit(dd_type, "DD2", self.position.x + 250, self.position.y - 450, self.heading)
 
         self.add_unit(dd_type, "DD3", self.position.x + 450, self.position.y + 850, self.heading)
-        self.add_unit(dd_type, "DD4", self.position.x + 450, self.position.y - 850, self.heading)
+        self.add_unit(dd_type, "DD4", self.position.x + 450, self.position.y - 850, self.heading)
+
+        self.get_generated_group().points[0].speed = 20

gen/fleet/lha_group.py

@@ -3,23 +3,22 @@ import random
 from gen.sam.group_generator import GroupGenerator
 
 
-class HelicopterCarrierGroupGenerator(GroupGenerator):
+class LHAGroupGenerator(GroupGenerator):
 
     def __init__(self, game, ground_object, faction):
-        super(HelicopterCarrierGroupGenerator, self).__init__(game, ground_object)
+        super(LHAGroupGenerator, self).__init__(game, ground_object)
         self.faction = faction
 
     def generate(self):
 
         # Add carrier
-        if self.faction["aircraft_carrier"]:
+        if "helicopter_carrier" in self.faction.keys():
             carrier_type = random.choice(self.faction["helicopter_carrier"])
-            self.add_unit(carrier_type, "Carrier", self.position.x, self.position.y, self.heading)
+            self.add_unit(carrier_type, "LHA", self.position.x, self.position.y, self.heading)
 
         # Add destroyers escort
         dd_type = random.choice(self.faction["destroyer"])
         self.add_unit(dd_type, "DD1", self.position.x + 50, self.position.y + 150, self.heading)
         self.add_unit(dd_type, "DD2", self.position.x + 50, self.position.y - 150, self.heading)
 
-        self.add_unit(dd_type, "DD3", self.position.x + 150, self.position.y + 250, self.heading)
-        self.add_unit(dd_type, "DD4", self.position.x + 150, self.position.y - 250, self.heading)
+        self.get_generated_group().points[0].speed = 20

gen/fleet/ship_group_generator.py

@@ -1,15 +1,11 @@
-import random
-
-from dcs.vehicles import Armor
-
 from game import db
-from gen.defenses.armored_group_generator import ArmoredGroupGenerator
 from gen.fleet.carrier_group import CarrierGroupGenerator
+from gen.fleet.lha_group import LHAGroupGenerator
 
 
 def generate_carrier_group(faction:str, game, ground_object):
     """
-    This generate a ship group
+    This generate a carrier group
     :param parentCp: The parent control point
     :param ground_object: The ground object which will own the ship group
     :param country: Owner country
@@ -18,3 +14,16 @@ def generate_carrier_group(faction:str, game, ground_object):
     generator = CarrierGroupGenerator(game, ground_object, db.FACTIONS[faction])
     generator.generate()
     return generator.get_generated_group()
+
+
+def generate_lha_group(faction:str, game, ground_object):
+    """
+    This generate a lha carrier group
+    :param parentCp: The parent control point
+    :param ground_object: The ground object which will own the ship group
+    :param country: Owner country
+    :return: Nothing, but put the group reference inside the ground object
+    """
+    generator = LHAGroupGenerator(game, ground_object, db.FACTIONS[faction])
+    generator.generate()
+    return generator.get_generated_group()

gen/flights/ai_flight_planner.py

@@ -21,20 +21,6 @@ SEAD_EVERY_X_MINUTES = 40
 
 class FlightPlanner:
 
-    from_cp = None
-    game = None
-
-    interceptor_flights = []
-    cap_flights = []
-    cas_flights = []
-    strike_flights = []
-    sead_flights = []
-    custom_flights = []
-    flights = []
-
-    potential_sead_targets = []
-    potential_strike_targets = []
-
     def __init__(self, from_cp, game):
         # TODO : have the flight planner depend on a 'stance' setting : [Defensive, Aggresive... etc] and faction doctrine
         # TODO : the flight planner should plan package and operations
@@ -52,6 +38,7 @@ class FlightPlanner:
         self.cas_flights = []
         self.strike_flights = []
         self.sead_flights = []
+        self.custom_flights = []
         self.flights = []
         self.potential_sead_targets = []
         self.potential_strike_targets = []

gen/ground_forces/ai_ground_planner.py

@@ -3,6 +3,7 @@ from enum import Enum
 
 from dcs.vehicles import *
 
+from gen import Conflict
 from gen.ground_forces.combat_stance import CombatStance
 from theater import ControlPoint
 
@@ -156,6 +157,7 @@ class CombatGroup:
         self.units = []
         self.role = role
         self.assigned_enemy_cp = None
+        self.start_position = None
 
     def __str__(self):
         s = ""

gen/groundobjectsgen.py

@@ -77,19 +77,16 @@ class GroundObjectsGenerator:
                                     vehicle.position.y = u.position.y
                                     vehicle.heading = u.heading
                                     vg.add_unit(vehicle)
-                elif ground_object.dcs_identifier == "CARRIER":
+                elif ground_object.dcs_identifier in ["CARRIER", "LHA"]:
                     for g in ground_object.groups:
                         if len(g.units) > 0:
 
                             utype = unit_type_from_name(g.units[0].type)
-
                             sg = self.m.ship_group(side, g.name, utype, position=g.position, heading=g.units[0].heading)
 
                             sg.units[0].name = self.m.string(g.units[0].name)
                             for i, u in enumerate(g.units):
                                 if i > 0:
-                                    print(u.type)
-                                    print(type(u.type))
                                     ship = Ship(self.m.next_unit_id(), self.m.string(u.name), unit_type_from_name(u.type))
                                     ship.position.x = u.position.x
                                     ship.position.y = u.position.y