From d0804a6f9ecd91169376efd549f79d250e400612 Mon Sep 17 00:00:00 2001 From: Khopa Date: Tue, 24 Nov 2020 13:08:59 +0100 Subject: [PATCH] Added missile icons for missiles sites --- qt_ui/uiconstants.py | 2 ++ qt_ui/widgets/map/QMapGroundObject.py | 3 +++ resources/ui/ground_assets/missile.png | Bin 0 -> 644 bytes resources/ui/ground_assets/missile_blue.png | Bin 0 -> 636 bytes 4 files changed, 5 insertions(+) create mode 100644 resources/ui/ground_assets/missile.png create mode 100644 resources/ui/ground_assets/missile_blue.png diff --git a/qt_ui/uiconstants.py b/qt_ui/uiconstants.py index 24fde874..614388aa 100644 --- a/qt_ui/uiconstants.py +++ b/qt_ui/uiconstants.py @@ -107,6 +107,8 @@ def load_icons(): 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["missile"] = QPixmap("./resources/ui/ground_assets/missile.png") + ICONS["missile_blue"] = QPixmap("./resources/ui/ground_assets/missile_blue.png") ICONS["Generator"] = QPixmap("./resources/ui/misc/"+get_theme_icons()+"/generator.png") ICONS["Missile"] = QPixmap("./resources/ui/misc/"+get_theme_icons()+"/missile.png") diff --git a/qt_ui/widgets/map/QMapGroundObject.py b/qt_ui/widgets/map/QMapGroundObject.py index f1d3e542..7d8217b5 100644 --- a/qt_ui/widgets/map/QMapGroundObject.py +++ b/qt_ui/widgets/map/QMapGroundObject.py @@ -9,6 +9,7 @@ from game import Game from game.data.building_data import FORTIFICATION_BUILDINGS from game.db import REWARDS from game.theater import ControlPoint, TheaterGroundObject +from game.theater.theatergroundobject import MissileSiteGroundObject from qt_ui.windows.groundobject.QGroundObjectMenu import QGroundObjectMenu from .QMapObject import QMapObject from ...displayoptions import DisplayOptions @@ -72,6 +73,8 @@ class QMapGroundObject(QMapObject): cat = self.ground_object.category if cat == "aa" and self.ground_object.sea_object: cat = "ship" + if isinstance(self.ground_object, MissileSiteGroundObject): + cat = "missile" rect = QRect(option.rect.x() + 2, option.rect.y(), option.rect.width() - 2, option.rect.height()) diff --git a/resources/ui/ground_assets/missile.png b/resources/ui/ground_assets/missile.png new file mode 100644 index 0000000000000000000000000000000000000000..29c706fa639247ef7199911dd5f04a7373c21348 GIT binary patch literal 644 zcmV-~0(Px#1ZP1_K>z@;j|==^1poj5?NCfqMdv~%->i5C9=twT)E)nWoM)}gr`PI<)%f$KA&iBB#`rOz4{{HD#Kk=4_{qgYQBLwC? zBj-gc=R+yxIUVe6S@M^O`qtamfCkgr1(fj7( z=}|fGhVGd00AILL_t(IPmR-SLxM0A2H??Llu_8y zqM{_r?0z$#i(Ra=oBIEMPP-h8v7_~VfbHyIXCD|Lj+q%9s^bt+VpCHh6h;$5{|jc- z6A1u!Zoa&r3dLwp_7<1?3ffEqcbW5*s*ee1QCsDlSN%0rGonGTz9GP7xMd62VY?pj zoyP8--30)n^{BZoyA(wR7;POKs&f>?7%;aL31Ep|AiE$U2XK)Gh6s+JmIpa;d~$lG zO9mK=^NYsiRa;d|kcsO!;i(cukck^9ZtoBv#Jv=qI0+xbFJc2$dF-e?o@&oxW`pia z5=#-jiUt^X>-D7wJ^4Ml!+Xk;_yg9lGqgWb{`K9383KeDc-cA%*l^^+XaZmXyhZ5W emv{R0cgPPsSt+ATO4r2z00001ph{m^E{ zWOAA%!z3u#yr>95HQ};K7L)YwxNw5#DyQ$KQOUlX7|W0Jt^rX98!1?2FfM|X1jno4 zSq-xi(25bNghq$jaYVHuM1gx6kTU$lxB+Jyp`3!93`T`;C`0>ueA~vGk2v)NOerq4 zV9bEY6%6Vzu?)2ib89#_Kv)w>hOoH{lOlLj!LJr4YH+jyDJqDEF|!I`58Nv;zmEC| zeA>YJZ+zK8Y#Yo=F|~rFEdlJa>DsR39{)A*B=Jj&?e29FMZBr zP+9)7^V&?7s6A#aX>K>)wK9_9undFEli$f~l0H zb&>jcYgHu8abshBEw5_OKCsvAvY<3f(Q3ms6;_y1Kf4J6th4l+D}OvQSbhAbjX4tm zH0@QBI*s&Jh42ckPQ%mxD<*h4-_uh4V*CNyOR%%2Jinye@ww*ZC|imaFLD`*zF(s+ zY#%&(=bexn!*Pid$+ZKEp-eZqM=JAzB*1&Yo3eM%)zv|aji@b6N9&K!3BPl$`$ow_ UY&#AsO-J5Ga3kY6st7^Bf1znW{Qv*} literal 0 HcmV?d00001