diff --git a/game/theater/controlpoint.py b/game/theater/controlpoint.py index 81b2dc94..7793b866 100644 --- a/game/theater/controlpoint.py +++ b/game/theater/controlpoint.py @@ -404,7 +404,7 @@ class Airfield(ControlPoint): return self.airport.runways[0].heading def has_runway(self) -> bool: - return True + return not self.damaged def active_runway(self, conditions: Conditions, dynamic_runways: Dict[str, RunwayData]) -> RunwayData: diff --git a/qt_ui/widgets/map/QMapControlPoint.py b/qt_ui/widgets/map/QMapControlPoint.py index 0f88bf7e..45f78860 100644 --- a/qt_ui/widgets/map/QMapControlPoint.py +++ b/qt_ui/widgets/map/QMapControlPoint.py @@ -33,13 +33,12 @@ class QMapControlPoint(QMapObject): painter.setBrush(self.brush_color) painter.setPen(self.pen_color) - if self.control_point.has_runway(): - if self.isUnderMouse(): - painter.setBrush(const.COLORS["white"]) - painter.setPen(self.pen_color) + if not self.control_point.has_runway(): + painter.setBrush(const.COLORS["black"]) + painter.setPen(self.brush_color) - r = option.rect - painter.drawEllipse(r.x(), r.y(), r.width(), r.height()) + r = option.rect + painter.drawEllipse(r.x(), r.y(), r.width(), r.height()) # TODO: Draw sunk carriers differently. # Either don't draw them at all, or perhaps use a sunk ship icon. painter.restore() diff --git a/qt_ui/windows/basemenu/QBaseMenu2.py b/qt_ui/windows/basemenu/QBaseMenu2.py index 992a4478..b17c394e 100644 --- a/qt_ui/windows/basemenu/QBaseMenu2.py +++ b/qt_ui/windows/basemenu/QBaseMenu2.py @@ -61,7 +61,7 @@ class QBaseMenu2(QDialog): title.setProperty("style", "base-title") aircraft = self.cp.base.total_aircraft armor = self.cp.base.total_armor - runway_status = "operational" if self.cp.has_runway() else "inoperative" + runway_status = "operational" if self.cp.has_runway() else "damaged" intel_summary = QLabel("\n".join([ f"{aircraft} aircraft", f"{armor} ground units",