mirror of
https://github.com/dcs-liberation/dcs_liberation.git
synced 2025-11-10 14:22:26 +00:00
Allow flights to self-initialize.
This makes it possible to add new packages to a running sim. https://github.com/dcs-liberation/dcs_liberation/issues/1680
This commit is contained in:
parent
7a8b3591cd
commit
9cb641bddf
@ -21,6 +21,39 @@ class FlightState(ABC):
|
|||||||
self.settings = settings
|
self.settings = settings
|
||||||
self.avoid_further_combat = False
|
self.avoid_further_combat = False
|
||||||
|
|
||||||
|
def reinitialize(self, now: datetime) -> None:
|
||||||
|
from game.ato.flightstate import WaitingForStart
|
||||||
|
|
||||||
|
start_time = self.flight.flight_plan.startup_time()
|
||||||
|
if start_time <= now:
|
||||||
|
self._set_active_flight_state(now)
|
||||||
|
else:
|
||||||
|
self.flight.set_state(
|
||||||
|
WaitingForStart(self.flight, self.settings, start_time)
|
||||||
|
)
|
||||||
|
|
||||||
|
def _set_active_flight_state(self, now: datetime) -> None:
|
||||||
|
from game.ato.flightstate import StartUp
|
||||||
|
from game.ato.flightstate import Taxi
|
||||||
|
from game.ato.flightstate import Takeoff
|
||||||
|
from game.ato.flightstate import Navigating
|
||||||
|
|
||||||
|
match self.flight.start_type:
|
||||||
|
case StartType.COLD:
|
||||||
|
self.flight.set_state(StartUp(self.flight, self.settings, now))
|
||||||
|
case StartType.WARM:
|
||||||
|
self.flight.set_state(Taxi(self.flight, self.settings, now))
|
||||||
|
case StartType.RUNWAY:
|
||||||
|
self.flight.set_state(Takeoff(self.flight, self.settings, now))
|
||||||
|
case StartType.IN_FLIGHT:
|
||||||
|
self.flight.set_state(
|
||||||
|
Navigating(self.flight, self.settings, waypoint_index=0)
|
||||||
|
)
|
||||||
|
case _:
|
||||||
|
raise ValueError(
|
||||||
|
f"Unknown start type {self.flight.start_type} for {self.flight}"
|
||||||
|
)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def alive(self) -> bool:
|
def alive(self) -> bool:
|
||||||
return True
|
return True
|
||||||
|
|||||||
@ -20,7 +20,8 @@ class Uninitialized(FlightState):
|
|||||||
def on_game_tick(
|
def on_game_tick(
|
||||||
self, events: GameUpdateEvents, time: datetime, duration: timedelta
|
self, events: GameUpdateEvents, time: datetime, duration: timedelta
|
||||||
) -> None:
|
) -> None:
|
||||||
raise RuntimeError("Attempted to simulate flight that is not fully initialized")
|
self.reinitialize(time)
|
||||||
|
self.flight.state.on_game_tick(events, time, duration)
|
||||||
|
|
||||||
@property
|
@property
|
||||||
def is_waiting_for_start(self) -> bool:
|
def is_waiting_for_start(self) -> bool:
|
||||||
|
|||||||
@ -8,14 +8,8 @@ from datetime import datetime, timedelta
|
|||||||
from typing_extensions import TYPE_CHECKING
|
from typing_extensions import TYPE_CHECKING
|
||||||
|
|
||||||
from game.ato.flightstate import (
|
from game.ato.flightstate import (
|
||||||
Navigating,
|
|
||||||
StartUp,
|
|
||||||
Takeoff,
|
|
||||||
Taxi,
|
|
||||||
Uninitialized,
|
Uninitialized,
|
||||||
WaitingForStart,
|
|
||||||
)
|
)
|
||||||
from game.ato.starttype import StartType
|
|
||||||
from .combat import CombatInitiator, FrozenCombat
|
from .combat import CombatInitiator, FrozenCombat
|
||||||
from .simulationresults import SimulationResults
|
from .simulationresults import SimulationResults
|
||||||
|
|
||||||
@ -73,25 +67,7 @@ class AircraftSimulation:
|
|||||||
def set_initial_flight_states(self) -> None:
|
def set_initial_flight_states(self) -> None:
|
||||||
now = self.game.conditions.start_time
|
now = self.game.conditions.start_time
|
||||||
for flight in self.iter_flights():
|
for flight in self.iter_flights():
|
||||||
start_time = flight.flight_plan.startup_time()
|
flight.state.reinitialize(now)
|
||||||
if start_time <= now:
|
|
||||||
self.set_active_flight_state(flight, now)
|
|
||||||
else:
|
|
||||||
flight.set_state(
|
|
||||||
WaitingForStart(flight, self.game.settings, start_time)
|
|
||||||
)
|
|
||||||
|
|
||||||
def set_active_flight_state(self, flight: Flight, now: datetime) -> None:
|
|
||||||
if flight.start_type is StartType.COLD:
|
|
||||||
flight.set_state(StartUp(flight, self.game.settings, now))
|
|
||||||
elif flight.start_type is StartType.WARM:
|
|
||||||
flight.set_state(Taxi(flight, self.game.settings, now))
|
|
||||||
elif flight.start_type is StartType.RUNWAY:
|
|
||||||
flight.set_state(Takeoff(flight, self.game.settings, now))
|
|
||||||
elif flight.start_type is StartType.IN_FLIGHT:
|
|
||||||
flight.set_state(Navigating(flight, self.game.settings, waypoint_index=0))
|
|
||||||
else:
|
|
||||||
raise ValueError(f"Unknown start type {flight.start_type} for {flight}")
|
|
||||||
|
|
||||||
def reset(self) -> None:
|
def reset(self) -> None:
|
||||||
for flight in self.iter_flights():
|
for flight in self.iter_flights():
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user