Fix DaytimeMap error with disabled night missions.

Fixes https://github.com/dcs-liberation/dcs_liberation/issues/2429
This commit is contained in:
Dan Albert 2022-09-09 12:54:16 -07:00 committed by Raffson
parent b01895e2dd
commit 38e2bf187f
No known key found for this signature in database
GPG Key ID: B0402B2C9B764D99
6 changed files with 18 additions and 12 deletions

View File

@ -37,7 +37,8 @@ from .theater.theatergroundobject import (
TheaterGroundObject,
)
from .theater.transitnetwork import TransitNetwork, TransitNetworkBuilder
from .weather import Conditions, TimeOfDay
from .timeofday import TimeOfDay
from .weather import Conditions
if TYPE_CHECKING:
from .ato.airtaaskingorder import AirTaskingOrder

View File

@ -2,7 +2,7 @@ from dataclasses import dataclass
from datetime import time
from typing import TypeAlias
from game.weather import TimeOfDay
from game.timeofday import TimeOfDay
TimeRange: TypeAlias = tuple[time, time]

10
game/timeofday.py Normal file
View File

@ -0,0 +1,10 @@
from __future__ import annotations
from enum import Enum
class TimeOfDay(Enum):
Dawn = "dawn"
Day = "day"
Dusk = "dusk"
Night = "night"

View File

@ -4,13 +4,14 @@ import datetime
import logging
import random
from dataclasses import dataclass, field
from enum import Enum
from typing import Optional, TYPE_CHECKING
from dcs.cloud_presets import Clouds as PydcsClouds
from dcs.weather import CloudPreset, Weather as PydcsWeather, Wind
from game.theater.daytimemap import DaytimeMap
from game.theater.seasonalconditions import determine_season
from game.timeofday import TimeOfDay
from game.utils import Distance, Heading, Pressure, inches_hg, interpolate, meters
if TYPE_CHECKING:
@ -19,13 +20,6 @@ if TYPE_CHECKING:
from game.theater.seasonalconditions import SeasonalConditions
class TimeOfDay(Enum):
Dawn = "dawn"
Day = "day"
Dusk = "dusk"
Night = "night"
@dataclass(frozen=True)
class AtmosphericConditions:
#: Pressure at sea level.

View File

@ -13,8 +13,9 @@ from dcs.weather import CloudPreset, Weather as PydcsWeather
import qt_ui.uiconstants as CONST
from game.sim.gameupdateevents import GameUpdateEvents
from game.timeofday import TimeOfDay
from game.utils import mps
from game.weather import Conditions, TimeOfDay
from game.weather import Conditions
from qt_ui.simcontroller import SimController

View File

@ -3,7 +3,7 @@ from datetime import time
import pytest
from game.theater.daytimemap import DaytimeMap
from game.weather import TimeOfDay
from game.timeofday import TimeOfDay
def test_range_of() -> None: