diff --git a/changelog.md b/changelog.md index a779e550..ee728067 100644 --- a/changelog.md +++ b/changelog.md @@ -4,7 +4,7 @@ Saves from 13.x are not compatible with 14.0.0. ## Features/Improvements -* **[Engine]** Support for DCS 2.9.16.10973 +* **[Engine]** Support for DCS 2.9.19.13478 * **[UI]** Allow saving after fast forwarding manually with sim speed controls (--show-sim-speed-controls option). ## Fixes diff --git a/game/missiongenerator/aircraft/flightgroupconfigurator.py b/game/missiongenerator/aircraft/flightgroupconfigurator.py index 3eeb0b95..9d4baa54 100644 --- a/game/missiongenerator/aircraft/flightgroupconfigurator.py +++ b/game/missiongenerator/aircraft/flightgroupconfigurator.py @@ -285,7 +285,7 @@ class FlightGroupConfigurator: if ( unit_callsign.name is None ): # pydcs needs unit.callsign to be set for eastern callsigns - unit.callsign = str(unit_callsign) # type: ignore + unit.callsign = str(unit_callsign) else: # Use western callsign unit.callsign_dict = unit_callsign.pydcs_dict( country=self.flight.country diff --git a/game/missiongenerator/aircraft/flightgroupspawner.py b/game/missiongenerator/aircraft/flightgroupspawner.py index b8a51b82..db72122e 100644 --- a/game/missiongenerator/aircraft/flightgroupspawner.py +++ b/game/missiongenerator/aircraft/flightgroupspawner.py @@ -243,11 +243,7 @@ class FlightGroupSpawner: for i in range(self.flight.count): group.units[i].position = hpad.position group.units[i].heading = hpad.heading - # pydcs has just `parking_id = None`, so mypy thinks str is invalid. Ought - # to fix pydcs, but that's not the kind of change we want to pull into the - # 6.1 branch, and frankly we should probably just improve pydcs's handling - # of FARPs instead. - group.units[i].parking_id = str(i + 1) # type: ignore + group.units[i].parking_id = str(i + 1) return group def dcs_start_type(self) -> DcsStartType: diff --git a/requirements.txt b/requirements.txt index 408a12ad..ed71bdcc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -36,7 +36,7 @@ pre-commit==3.5.0 pydantic==2.5.2 pydantic-settings==2.1.0 pydantic_core==2.14.5 -pydcs @ git+https://github.com/dcs-liberation/dcs@38989596a8ec20d4095b9d84541d7a7bafa36704 +pydcs @ git+https://github.com/dcs-liberation/dcs@431f2abbedd5ef603df3b73055f07cd3e787278e pyinstaller==6.0.0 pyinstaller-hooks-contrib==2023.6 pyproj==3.6.1