diff --git a/game/data/doctrine.py b/game/data/doctrine.py index bfc5b714..6fcc746e 100644 --- a/game/data/doctrine.py +++ b/game/data/doctrine.py @@ -1,26 +1,8 @@ from game.utils import nm_to_meter, feet_to_meter -MAX_NUMBER_OF_INTERCEPTION_GROUP = 3 -MISSION_DURATION = 120 # in minutes -CAP_EVERY_X_MINUTES = 20 -CAS_EVERY_X_MINUTES = 30 -SEAD_EVERY_X_MINUTES = 40 -STRIKE_EVERY_X_MINUTES = 40 - -INGRESS_EGRESS_DISTANCE = nm_to_meter(45) -INGRESS_ALT = feet_to_meter(20000) -EGRESS_ALT = feet_to_meter(20000) -PATROL_ALT_RANGE = (feet_to_meter(15000), feet_to_meter(33000)) -NAV_ALT = 9144 -PATTERN_ALTITUDE = feet_to_meter(5000) - -CAP_DEFAULT_ENGAGE_DISTANCE = nm_to_meter(40) - - - MODERN_DOCTRINE = { - "GENERATORS":{ + "GENERATORS": { "CAS": True, "CAP": True, "SEAD": True, @@ -110,4 +92,4 @@ WWII_DOCTRINE = { "MAX_NUMBER_OF_INTERCEPTION_GROUP": 3, -} \ No newline at end of file +} diff --git a/qt_ui/uiconstants.py b/qt_ui/uiconstants.py index 43b4ea7d..be107c02 100644 --- a/qt_ui/uiconstants.py +++ b/qt_ui/uiconstants.py @@ -74,6 +74,8 @@ def load_icons(): ICONS[category] = QPixmap("./resources/ui/ground_assets/" + category + ".png") ICONS[category + "_blue"] = QPixmap("./resources/ui/ground_assets/" + category + "_blue.png") ICONS["destroyed"] = QPixmap("./resources/ui/ground_assets/destroyed.png") + ICONS["ship"] = QPixmap("./resources/ui/ground_assets/ship.png") + ICONS["ship_blue"] = QPixmap("./resources/ui/ground_assets/ship_blue.png") ICONS["Generator"] = QPixmap("./resources/ui/misc/generator.png") ICONS["Missile"] = QPixmap("./resources/ui/misc/missile.png") diff --git a/qt_ui/widgets/map/QMapGroundObject.py b/qt_ui/widgets/map/QMapGroundObject.py index c675d20f..b28f2ea6 100644 --- a/qt_ui/widgets/map/QMapGroundObject.py +++ b/qt_ui/widgets/map/QMapGroundObject.py @@ -44,10 +44,15 @@ class QMapGroundObject(QGraphicsRectItem): #super(QMapControlPoint, self).paint(painter, option, widget) if self.parent.get_display_rule("go"): painter.save() + + cat = self.model.category + if cat == "aa" and self.model.sea_object: + cat = "ship" + if not self.model.is_dead and not self.cp.captured: - painter.drawPixmap(option.rect, CONST.ICONS[self.model.category]) + painter.drawPixmap(option.rect, CONST.ICONS[cat]) elif not self.model.is_dead: - painter.drawPixmap(option.rect, CONST.ICONS[self.model.category + "_blue"]) + painter.drawPixmap(option.rect, CONST.ICONS[cat + "_blue"]) else: painter.drawPixmap(option.rect, CONST.ICONS["destroyed"]) painter.restore() diff --git a/resources/customized_payloads/P-47D-30.lua b/resources/customized_payloads/P-47D-30.lua index 4e672f36..df5f21cd 100644 --- a/resources/customized_payloads/P-47D-30.lua +++ b/resources/customized_payloads/P-47D-30.lua @@ -42,7 +42,7 @@ local unitPayloads = { }, }, [3] = { - ["name"] = "ANTISTRIKE", + ["name"] = "ANTISHIP", ["pylons"] = { }, ["tasks"] = { diff --git a/resources/ui/ground_assets/ship.png b/resources/ui/ground_assets/ship.png new file mode 100644 index 00000000..92602b16 Binary files /dev/null and b/resources/ui/ground_assets/ship.png differ diff --git a/resources/ui/ground_assets/ship_blue.png b/resources/ui/ground_assets/ship_blue.png new file mode 100644 index 00000000..9dcaa889 Binary files /dev/null and b/resources/ui/ground_assets/ship_blue.png differ