Fixing tests + mypy issues

game/settings/__init__.py

@@ -4,4 +4,4 @@ from .boundedintoption import BoundedIntOption
 from .choicesoption import ChoicesOption
 from .minutesoption import MinutesOption
 from .optiondescription import OptionDescription
-from .settings import AutoAtoBehavior, Settings
+from .settings import AutoAtoBehavior, NightMissions, Settings

game/settings/settings.py

@@ -14,7 +14,6 @@ from .minutesoption import minutes_option
 from .optiondescription import OptionDescription, SETTING_DESCRIPTION_KEY
 from .skilloption import skill_option
 from ..ato.starttype import StartType
-from ..weather.conditions import NightMissions
 
 Views = ForcedOptions.Views
 
@@ -27,6 +26,13 @@ class AutoAtoBehavior(Enum):
     Prefer = "Prefer player pilots"
 
 
+@unique
+class NightMissions(Enum):
+    DayAndNight = "nightmissions_nightandday"
+    OnlyDay = "nightmissions_onlyday"
+    OnlyNight = "nightmissions_onlynight"
+
+
 DIFFICULTY_PAGE = "Difficulty"
 
 AI_DIFFICULTY_SECTION = "AI Difficulty"

game/weather/conditions.py

@@ -4,21 +4,14 @@ import datetime
 import logging
 import random
 from dataclasses import dataclass
-from enum import Enum
 
-from game.settings import Settings
-from game.theater import ConflictTheater, DaytimeMap, SeasonalConditions
+from game.settings import Settings, NightMissions
+from game.theater import ConflictTheater, SeasonalConditions
 from game.theater.seasonalconditions import determine_season
 from game.timeofday import TimeOfDay
 from game.weather.weather import Weather, Thunderstorm, Raining, Cloudy, ClearSkies
 
 
-class NightMissions(Enum):
-    DayAndNight = "nightmissions_nightandday"
-    OnlyDay = "nightmissions_onlyday"
-    OnlyNight = "nightmissions_onlynight"
-
-
 @dataclass
 class Conditions:
     time_of_day: TimeOfDay