weyne/dcs-retribution
1
0
Fork 0
mirror of https://github.com/dcs-retribution/dcs-retribution.git synced 2025-11-10 15:41:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong logic wrt hold WPT & air-assault

Browse Source
This commit is contained in:
Raffson 2023-10-15 12:57:28 +02:00
parent 22900407dd
commit bcdf2ad887
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
game/ato/flightplans/escort.py
View File

@ -49,7 +49,7 @@ class Builder(FormationAttackBuilder[EscortFlightPlan, FormationAttackLayout]):
elif self.package.primary_flight is not None: elif self.package.primary_flight is not None:
fp = self.package.primary_flight.flight_plan fp = self.package.primary_flight.flight_plan
assert isinstance(fp.layout, AirAssaultLayout) assert isinstance(fp.layout, AirAssaultLayout)
assert fp.layout.pickup is not None if fp.layout.pickup:
hold = builder.hold(fp.layout.pickup.position) hold = builder.hold(fp.layout.pickup.position)
join = builder.join(self.package.waypoints.join) join = builder.join(self.package.waypoints.join)

8
game/ato/flightplans/formationattack.py
View File

@ -188,7 +188,7 @@ class FormationAttackBuilder(IBuilder[FlightPlanT, LayoutT], ABC):
hold = None hold = None
join = None join = None
if self.primary_flight_is_air_assault: if not self.primary_flight_is_air_assault:
hold = builder.hold(self._hold_point()) hold = builder.hold(self._hold_point())
join = builder.join(self.package.waypoints.join) join = builder.join(self.package.waypoints.join)
split = builder.split(self.package.waypoints.split) split = builder.split(self.package.waypoints.split)
@ -255,13 +255,11 @@ class FormationAttackBuilder(IBuilder[FlightPlanT, LayoutT], ABC):
@property @property
def primary_flight_is_air_assault(self) -> bool: def primary_flight_is_air_assault(self) -> bool:
if self.flight is self.package.primary_flight: if self.flight is self.package.primary_flight:
return True return self.flight.flight_type == FlightType.AIR_ASSAULT
else: else:
assert self.package.primary_flight is not None assert self.package.primary_flight is not None
fp = self.package.primary_flight.flight_plan fp = self.package.primary_flight.flight_plan
if fp.is_airassault: return fp.is_airassault
return True
return False
@staticmethod @staticmethod
def target_waypoint( def target_waypoint(