From 7d347eee945cc24c7e3395dc9047140fd7ad06c3 Mon Sep 17 00:00:00 2001 From: Raffson Date: Sun, 15 Oct 2023 13:32:11 +0200 Subject: [PATCH] Fix traveltime & offsets --- game/ato/flightplans/flightplan.py | 1 - game/ato/traveltime.py | 6 ++++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/game/ato/flightplans/flightplan.py b/game/ato/flightplans/flightplan.py index 819aa858..fbba3833 100644 --- a/game/ato/flightplans/flightplan.py +++ b/game/ato/flightplans/flightplan.py @@ -189,7 +189,6 @@ class FlightPlan(ABC, Generic[LayoutT]): for previous_waypoint, waypoint in self.edges(until=destination): total += self.total_time_between_waypoints(previous_waypoint, waypoint) - total += self.travel_time_between_waypoints(previous_waypoint, waypoint) # Trim microseconds. Our simulation tick rate is 1 second, so anything that # takes 100.1 or 100.9 seconds will take 100 seconds. DCS doesn't handle diff --git a/game/ato/traveltime.py b/game/ato/traveltime.py index d07da0ff..e7457a58 100644 --- a/game/ato/traveltime.py +++ b/game/ato/traveltime.py @@ -1,6 +1,6 @@ from __future__ import annotations -from datetime import datetime, timedelta +from datetime import datetime from typing import TYPE_CHECKING from game.utils import Distance, SPEED_OF_SOUND_AT_SEA_LEVEL, Speed, mach, meters @@ -59,4 +59,6 @@ class TotEstimator: Returns: The earliest possible TOT for the given flight. """ - return now + flight.flight_plan.minimum_duration_from_start_to_tot() + flight_time = flight.flight_plan.minimum_duration_from_start_to_tot() + offset = flight.flight_plan.tot_offset + return now + flight_time - offset