diff --git a/game/campaignloader/campaign.py b/game/campaignloader/campaign.py index b1741e5d..e347f9fd 100644 --- a/game/campaignloader/campaign.py +++ b/game/campaignloader/campaign.py @@ -15,7 +15,6 @@ from game.profiling import logged_duration from game.theater import ( ConflictTheater, FalklandsTheater, - NormandyTheater, TheChannelTheater, ) from game.theater.iadsnetwork.iadsnetwork import IadsNetwork @@ -112,7 +111,6 @@ class Campaign: def load_theater(self, advanced_iads: bool) -> ConflictTheater: theaters = { - "Normandy": NormandyTheater, "The Channel": TheChannelTheater, "Falklands": FalklandsTheater, } diff --git a/game/theater/conflicttheater.py b/game/theater/conflicttheater.py index d9c440c7..e2e67358 100644 --- a/game/theater/conflicttheater.py +++ b/game/theater/conflicttheater.py @@ -9,7 +9,6 @@ from uuid import UUID from dcs.mapping import Point from dcs.terrain import ( falklands, - normandy, thechannel, ) from dcs.terrain.terrain import Terrain @@ -242,27 +241,6 @@ class ConflictTheater: return Heading.from_degrees(position.heading_between_point(conflict_center)) -class NormandyTheater(ConflictTheater): - terrain = normandy.Normandy() - landmap = load_landmap(Path("resources/normandylandmap.p")) - daytime_map = DaytimeMap( - dawn=(datetime.time(hour=6), datetime.time(hour=8)), - day=(datetime.time(hour=10), datetime.time(hour=17)), - dusk=(datetime.time(hour=17), datetime.time(hour=18)), - night=(datetime.time(hour=0), datetime.time(hour=5)), - ) - - @property - def timezone(self) -> datetime.timezone: - return datetime.timezone(datetime.timedelta(hours=0)) - - @property - def seasonal_conditions(self) -> SeasonalConditions: - from .seasonalconditions.normandy import CONDITIONS - - return CONDITIONS - - class TheChannelTheater(ConflictTheater): terrain = thechannel.TheChannel() landmap = load_landmap(Path("resources/channellandmap.p")) diff --git a/game/theater/seasonalconditions/normandy.py b/game/theater/seasonalconditions/normandy.py deleted file mode 100644 index a0f86b6d..00000000 --- a/game/theater/seasonalconditions/normandy.py +++ /dev/null @@ -1,36 +0,0 @@ -from .seasonalconditions import SeasonalConditions, Season, WeatherTypeChances - -CONDITIONS = SeasonalConditions( - summer_avg_pressure=30.02, # TODO: Find real-world data - winter_avg_pressure=29.72, # TODO: Find real-world data - summer_avg_temperature=20.0, - winter_avg_temperature=0.0, - temperature_day_night_difference=5.0, - weather_type_chances={ - # TODO: Find real-world data for all these values - Season.Winter: WeatherTypeChances( - thunderstorm=1, - raining=20, - cloudy=60, - clear_skies=20, - ), - Season.Spring: WeatherTypeChances( - thunderstorm=1, - raining=20, - cloudy=40, - clear_skies=40, - ), - Season.Summer: WeatherTypeChances( - thunderstorm=1, - raining=10, - cloudy=35, - clear_skies=55, - ), - Season.Fall: WeatherTypeChances( - thunderstorm=1, - raining=30, - cloudy=50, - clear_skies=20, - ), - }, -) diff --git a/resources/theaters/normandy/info.yaml b/resources/theaters/normandy/info.yaml new file mode 100644 index 00000000..109039cf --- /dev/null +++ b/resources/theaters/normandy/info.yaml @@ -0,0 +1,39 @@ +--- +name: Normandy +timezone: +0 +daytime: + dawn: [6, 8] + day: [10, 17] + dusk: [17, 18] + night: [0, 5] +climate: + day_night_temperature_difference: 5.0 + seasons: + winter: + average_pressure: 29.72 # TODO: Find real-world data + average_temperature: 0.0 + weather: + thunderstorm: 1 + raining: 20 + cloudy: 60 + clear: 20 + spring: + weather: + thunderstorm: 1 + raining: 20 + cloudy: 40 + clear: 40 + summer: + average_pressure: 30.02 # TODO: Find real-world data + average_temperature: 20.0 + weather: + thunderstorm: 1 + raining: 10 + cloudy: 35 + clear: 55 + fall: + weather: + thunderstorm: 1 + raining: 30 + cloudy: 50 + clear: 20 diff --git a/resources/normandylandmap.p b/resources/theaters/normandy/landmap.p similarity index 100% rename from resources/normandylandmap.p rename to resources/theaters/normandy/landmap.p