diff --git a/game/helipad.py b/game/helipad.py index 4146556b..c6d489d0 100644 --- a/game/helipad.py +++ b/game/helipad.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from typing import Optional from dcs import Point @@ -15,7 +17,7 @@ class Helipad(PointWithHeading): self.static_unit: Optional[StaticGroup] = None @staticmethod - def from_point(point: Point, heading: Heading) -> "Helipad": + def from_point(point: Point, heading: Heading) -> Helipad: h = Helipad() h.x = point.x h.y = point.y diff --git a/game/theater/conflicttheater.py b/game/theater/conflicttheater.py index 01a98742..4d8bf750 100644 --- a/game/theater/conflicttheater.py +++ b/game/theater/conflicttheater.py @@ -271,7 +271,6 @@ class MizCampaignLoader: def helipads(self) -> Iterator[StaticGroup]: for group in self.blue.static_group: if group.units[0].type == self.FARP_HELIPAD: - print("helooooo") yield group @property diff --git a/game/theater/controlpoint.py b/game/theater/controlpoint.py index 68df933b..4b843b1a 100644 --- a/game/theater/controlpoint.py +++ b/game/theater/controlpoint.py @@ -405,7 +405,7 @@ class ControlPoint(MissionTarget, ABC): """ Returns true if cp has a free helipad """ - return False in [h.occupied for h in self.helipads] + return not all(h.occupied for h in self.helipads) def get_free_helipad(self) -> Optional[Helipad]: """ @@ -1187,8 +1187,6 @@ class Fob(ControlPoint): return len(self.helipads) def can_operate(self, aircraft: AircraftType) -> bool: - print(aircraft) - print(aircraft.helicopter) if aircraft.helicopter: return True else: diff --git a/gen/aircraft.py b/gen/aircraft.py index f19efc61..28f5dac0 100644 --- a/gen/aircraft.py +++ b/gen/aircraft.py @@ -749,7 +749,6 @@ class AircraftConflictGenerator: group.points[0].type = "TakeOffGroundHot" helipad.occupied = True - group_generated = True for i in range(flight.count - 1): helipad = cp.get_free_helipad()