diff --git a/eos/gamedata.py b/eos/gamedata.py index b69ed5873..6378e9bf0 100755 --- a/eos/gamedata.py +++ b/eos/gamedata.py @@ -247,6 +247,7 @@ class Item(EqBase): 8: "gallente", 9: "guristas", # Caldari + Gallente 10: "angelserp", # Minmatar + Gallente, final race depends on the order of skills + 12: "sisters", # Amarr + Gallente 16: "jove", 32: "sansha", # Incrusion Sansha 128: "ore"} diff --git a/gui/shipBrowser.py b/gui/shipBrowser.py index 94763d5c6..d51fac100 100644 --- a/gui/shipBrowser.py +++ b/gui/shipBrowser.py @@ -681,7 +681,7 @@ class ShipBrowser(wx.Panel): self.raceselect.Show(False) self.Layout() - RACE_ORDER = ["amarr", "caldari", "gallente", "minmatar", "ore", "serpentis", "angel", "blood", "sansha", "guristas", "jove", None] + RACE_ORDER = ["amarr", "caldari", "gallente", "minmatar", "sisters", "ore", "serpentis", "angel", "blood", "sansha", "guristas", "jove", None] def raceNameKey(self, ship): return self.RACE_ORDER.index(ship.race), ship.name @@ -1030,13 +1030,8 @@ class ShipItem(SFItem.SFBrowserItem): self.raceBmp = bitmapLoader.getBitmap("race_%s_small" % self.shipRace, "icons") - if self.shipName == "Apotheosis": - self.raceMBmp = bitmapLoader.getBitmap("race_jove_small","icons") - else: - self.raceMBmp = bitmapLoader.getBitmap("fit_delete_small","icons") - if not self.raceBmp: - self.raceBmp = self.raceMBmp + self.raceBmp = bitmapLoader.getBitmap("fit_delete_small","icons") self.raceDropShadowBmp = drawUtils.CreateDropShadowBitmap(self.raceBmp, 0.2) diff --git a/icons/race_sisters_small.png b/icons/race_sisters_small.png new file mode 100644 index 000000000..58e92c264 Binary files /dev/null and b/icons/race_sisters_small.png differ