Streamlining

game/ato/flightmembers.py

@@ -28,7 +28,7 @@ class FlightMembers(IFlightRoster):
     def from_roster(flight: Flight, roster: FlightRoster) -> FlightMembers:
         members = FlightMembers(flight)
         loadout = Loadout.default_for(flight)
-        if flight.squadron.aircraft.name == "F-15I Ra'am":
+        if flight.squadron.aircraft.variant_id == "F-15I Ra'am":
             loadout.pylons[16] = Weapon.with_clsid("{IDF_MODS_PROJECT_F-15I_Raam_Dome}")
         members.members = [FlightMember(p, loadout) for p in roster.pilots]
         return members
@@ -64,7 +64,7 @@ class FlightMembers(IFlightRoster):
             loadout = self.members[0].loadout.clone()
         else:
             loadout = Loadout.default_for(self.flight)
-        if self.flight.squadron.aircraft.name == "F-15I Ra'am":
+        if self.flight.squadron.aircraft.variant_id == "F-15I Ra'am":
             loadout.pylons[16] = Weapon.with_clsid("{IDF_MODS_PROJECT_F-15I_Raam_Dome}")
         for _ in range(new_size - self.max_size):
             member = FlightMember(self.flight.squadron.claim_available_pilot(), loadout)

game/ato/packagewaypoints.py

@@ -10,7 +10,7 @@ from game.ato.flightplans.waypointbuilder import WaypointBuilder
 from game.flightplan import JoinZoneGeometry
 from game.flightplan.ipsolver import IpSolver
 from game.flightplan.refuelzonegeometry import RefuelZoneGeometry
-from game.persistence.paths import liberation_user_dir
+from game.persistency import debug_dir
 from game.utils import dcs_to_shapely_point
 from game.utils import nautical_miles
 
@@ -33,7 +33,7 @@ class PackageWaypoints:
     ) -> PackageWaypoints:
         origin = package.departure_closest_to_target()
 
-        waypoint_debug_directory = liberation_user_dir() / "Debug/Waypoints"
+        waypoint_debug_directory = debug_dir() / "Waypoints"
 
         # Start by picking the best IP for the attack.
         ip_solver = IpSolver(