From fd91f56e555c164bf118b8b0c31a3dd4729b471b Mon Sep 17 00:00:00 2001 From: blitzman Date: Wed, 24 Aug 2016 21:46:14 -0400 Subject: [PATCH] Give citadels their own Upwell logo --- eos/gamedata.py | 6 +++++- gui/shipBrowser.py | 2 +- imgs/gui/race_upwell_small.png | Bin 0 -> 389 bytes 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 imgs/gui/race_upwell_small.png diff --git a/eos/gamedata.py b/eos/gamedata.py index 2125cd7e1..5f3f62bb3 100644 --- a/eos/gamedata.py +++ b/eos/gamedata.py @@ -288,8 +288,12 @@ class Item(EqBase): @property def race(self): if self.__race is None: + try: - self.__race = self.factionMap[self.factionID] + if self.category.categoryName == 'Structure': + self.__race = "upwell" + else: + self.__race = self.factionMap[self.factionID] # Some ships (like few limited issue ships) do not have factionID set, # thus keep old mechanism for now except KeyError: diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 94c682101..11cecaa53 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -704,7 +704,7 @@ class ShipBrowser(wx.Panel): "amarr", "caldari", "gallente", "minmatar", "sisters", "ore", "serpentis", "angel", "blood", "sansha", "guristas", "mordu", - "jove", None + "jove", "upwell", None ] def raceNameKey(self, ship): diff --git a/imgs/gui/race_upwell_small.png b/imgs/gui/race_upwell_small.png new file mode 100644 index 0000000000000000000000000000000000000000..43ea6595b6717cb05e6d37bdc8fbbece9922fa33 GIT binary patch literal 389 zcmV;00eb$4P)A%BifLJ`TIGRY}~bA-R2z+L3qjf zT?;^BB)P=6d=>xH#TzzEUAk$5LBVnUxU;#J-{%^So9i4kppa#%^8W^Dbgtcqq25C*Z8!^-lA(kvU0tE?7QeoZ~Pc4AIh zy-8Mat*Hi(4H5&%VQ646^|WU<@lfZr4pkR%j8<3l&zqtWQqrLkT4@