Add support for SoE race. Their ships do not use it yet due to wrong …

…skill requirements
ryancwilliams · Oct 7, 2013 · 782f3cd · 782f3cd
1 parent b6feb1c
commit 782f3cd
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/eos/gamedata.py b/eos/gamedata.py
@@ -247,6 +247,7 @@ def race(self):
                    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
@@ -681,7 +681,7 @@ def stage1(self, event):
             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 @@ def __init__(self, parent, shipID=None, shipFittingInfo=("Test", 2), itemData=No
 
         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