From 10ffb987ea196d539bb1c484ed29dc552d56b48f Mon Sep 17 00:00:00 2001 From: DarkPhoenix Date: Mon, 23 Dec 2019 17:02:34 +0300 Subject: [PATCH] Detect concord race and show appropriate icon --- eos/gamedata.py | 1 + gui/shipBrowser.py | 2 +- imgs/gui/race_concord_small.png | Bin 0 -> 2868 bytes 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 imgs/gui/race_concord_small.png diff --git a/eos/gamedata.py b/eos/gamedata.py index 7eb2bd160..3bcab94ba 100644 --- a/eos/gamedata.py +++ b/eos/gamedata.py @@ -400,6 +400,7 @@ class Item(EqBase): 9 : "guristas", # Caldari + Gallente 10 : "angelserp", # Minmatar + Gallente, final race depends on the order of skills 12 : "sisters", # Amarr + Gallente + 15 : "concord", 16 : "jove", 32 : "sansha", # Incrusion Sansha 128: "ore", diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 52d11143c..6f3ac84fb 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -189,7 +189,7 @@ class ShipBrowser(wx.Panel): RACE_ORDER = [ "amarr", "caldari", "gallente", "minmatar", - "sisters", "ore", + "sisters", "ore", "concord", "serpentis", "angel", "blood", "sansha", "guristas", "mordu", "jove", "upwell", "triglavian", None ] diff --git a/imgs/gui/race_concord_small.png b/imgs/gui/race_concord_small.png new file mode 100644 index 0000000000000000000000000000000000000000..9815de9f0700feeafa299b3aa2f1588aab70a528 GIT binary patch literal 2868 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 SPQ+6H0000