Generate weather conditions at turn start.

Weather and exact time of day information is helpful during mission
planning, so generate it at the start of the turn rather than at
takeoff time.

Another advantage aside from planning is that we can now use the wind
information to set carrier headings and takeoff runways appropriately.

qt_ui/widgets/QTopPanel.py

@@ -97,7 +97,7 @@ class QTopPanel(QFrame):
         if game is None:
             return
 
-        self.turnCounter.setCurrentTurn(game.turn, game.current_day)
+        self.turnCounter.setCurrentTurn(game.turn, game.conditions)
         self.budgetBox.setGame(game)
         self.factionsInfos.setGame(game)
 

qt_ui/widgets/QTurnCounter.py

@@ -1,7 +1,8 @@
 import datetime
 
-from PySide2.QtWidgets import QLabel, QHBoxLayout, QGroupBox
+from PySide2.QtWidgets import QLabel, QHBoxLayout, QGroupBox, QVBoxLayout
 
+from game.weather import Conditions, TimeOfDay
 import qt_ui.uiconstants as CONST
 
 
@@ -13,23 +14,37 @@ class QTurnCounter(QGroupBox):
     def __init__(self):
         super(QTurnCounter, self).__init__("Turn")
 
-        self.icons = [CONST.ICONS["Dawn"], CONST.ICONS["Day"], CONST.ICONS["Dusk"], CONST.ICONS["Night"]]
-
-        self.daytime_icon = QLabel()
-        self.daytime_icon.setPixmap(self.icons[0])
-        self.turn_info = QLabel()
+        self.icons = {
+            TimeOfDay.Dawn: CONST.ICONS["Dawn"],
+            TimeOfDay.Day: CONST.ICONS["Day"],
+            TimeOfDay.Dusk: CONST.ICONS["Dusk"],
+            TimeOfDay.Night: CONST.ICONS["Night"],
+        }
 
         self.layout = QHBoxLayout()
-        self.layout.addWidget(self.daytime_icon)
-        self.layout.addWidget(self.turn_info)
         self.setLayout(self.layout)
 
-    def setCurrentTurn(self, turn: int, current_day: datetime):
+        self.daytime_icon = QLabel()
+        self.daytime_icon.setPixmap(self.icons[TimeOfDay.Dawn])
+        self.layout.addWidget(self.daytime_icon)
+
+        self.time_column = QVBoxLayout()
+        self.layout.addLayout(self.time_column)
+
+        self.date_display = QLabel()
+        self.time_column.addWidget(self.date_display)
+
+        self.time_display = QLabel()
+        self.time_column.addWidget(self.time_display)
+
+    def setCurrentTurn(self, turn: int, conditions: Conditions) -> None:
+        """Sets the turn information display.
+
+        :arg turn Current turn number.
+        :arg conditions Current time and weather conditions.
         """
-        Set the money amount to display
-        :arg turn Current turn number
-        :arg current_day Current day
-        """
-        self.daytime_icon.setPixmap(self.icons[turn % 4])
-        self.turn_info.setText(current_day.strftime("%d %b %Y"))
+        self.daytime_icon.setPixmap(self.icons[conditions.time_of_day])
+        self.date_display.setText(conditions.start_time.strftime("%d %b %Y"))
+        self.time_display.setText(
+            conditions.start_time.strftime("%H:%M:%S Local"))
         self.setTitle("Turn " + str(turn + 1))

qt_ui/widgets/map/QLiberationMap.py

@@ -21,6 +21,7 @@ from game import Game, db
 from game.data.aaa_db import AAA_UNITS
 from game.data.radar_db import UNITS_WITH_RADAR
 from game.utils import meter_to_feet
+from game.weather import TimeOfDay
 from gen import Conflict, PackageWaypointTiming
 from gen.ato import Package
 from gen.flights.flight import Flight, FlightWaypoint, FlightWaypointType
@@ -509,9 +510,9 @@ class QLiberationMap(QGraphicsView):
             scene.addPixmap(bg)
 
             # Apply graphical effects to simulate current daytime
-            if self.game.current_turn_daytime == "day":
+            if self.game.current_turn_time_of_day == TimeOfDay.Day:
                 pass
-            elif self.game.current_turn_daytime == "night":
+            elif self.game.current_turn_time_of_day == TimeOfDay.Night:
                 ov = QPixmap(bg.width(), bg.height())
                 ov.fill(CONST.COLORS["night_overlay"])
                 overlay = scene.addPixmap(ov)