From 826935eb7d8ae1035a9219dfd05886808bbfedea Mon Sep 17 00:00:00 2001
From: Khopa <clemguip@gmail.com>
Date: Sun, 14 Jun 2020 17:31:45 +0200
Subject: [PATCH] Ship icons for ship groups

---
 game/data/doctrine.py                      |  22 ++-------------------
 qt_ui/uiconstants.py                       |   2 ++
 qt_ui/widgets/map/QMapGroundObject.py      |   9 +++++++--
 resources/customized_payloads/P-47D-30.lua |   2 +-
 resources/ui/ground_assets/ship.png        | Bin 0 -> 211 bytes
 resources/ui/ground_assets/ship_blue.png   | Bin 0 -> 220 bytes
 6 files changed, 12 insertions(+), 23 deletions(-)
 create mode 100644 resources/ui/ground_assets/ship.png
 create mode 100644 resources/ui/ground_assets/ship_blue.png

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 0000000000000000000000000000000000000000..92602b16d77c47679df1e8841683c613dffd28b8
GIT binary patch
literal 211
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sEXgD|57Yp@DXFvHWuF~q_@Ij7VtO@Va-L*b((ssenD2KM@G
zoTpTzcqDlp&O1g*BryDKI2{^ca$qWx<cwPmhP*5eoRbf5a7dqPXgK|QJHtui*WnIA
zEFsJS46O@v_AtCsX*$Wdjv<kGqUVGoPtG1-U^v7pW18`Hb1l$L22WQ%mvv4FO#l~g
BJahm6

literal 0
HcmV?d00001

diff --git a/resources/ui/ground_assets/ship_blue.png b/resources/ui/ground_assets/ship_blue.png
new file mode 100644
index 0000000000000000000000000000000000000000..9dcaa88957e13b1960cb14c5107aea5502fb3aa2
GIT binary patch
literal 220
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!73?$#)eFPF<EDmyaVpw-h<|UBBlJ4m1$iT3%
zpZiZDE0Avx;1lBNZrr+P-odNao;|yI9VkW+xCn$d0Tpo;ctjR6F!1dMVMYtqU=^UC
zsi%u$h{WaO24*!?g8&DE8NCM&FjyaE;BS^ZmB1k6z_wUHfP+C&V0Hr!v%uM&6a^Lo
a0|tijOun5pD>9~ltoC&Eb6Mw<&;$TFI5D>X

literal 0
HcmV?d00001