From 782f3cd5908c0843be456db12dc0714b2c6159fc Mon Sep 17 00:00:00 2001
From: DarkPhoenix <phoenix@mail.ru>
Date: Tue, 8 Oct 2013 01:05:46 +0400
Subject: [PATCH] Add support for SoE race. Their ships do not use it yet due
 to wrong skill requirements

---
 eos/gamedata.py              |   1 +
 gui/shipBrowser.py           |   9 ++-------
 icons/race_sisters_small.png | Bin 0 -> 724 bytes
 3 files changed, 3 insertions(+), 7 deletions(-)
 create mode 100644 icons/race_sisters_small.png

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 0000000000000000000000000000000000000000..58e92c26426d5eb1875bb4580299c94fc678da05
GIT binary patch
literal 724
zcmV;_0xSKAP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-3kX40sx)JhEM<i0%1u+
zK~y-6V_={*`1kK0oc;g*f0qCM|8xHT|DOeydK8H(C)P1AF)=Ybym>75?aRk$XAdk>
z;o|20EvKq;^WXpfs~8y=<}flczW?{{9|IE;69WSS0|O&Wvy+V>Lr-Iw(DmC_FMWLf
zR{GYxXAB=ceLcs*%*<eGsb}Ql<;=h<ZGM}TUBHErk?|2$=Y;y&G*sjS|2H>M??jiY
zD~j$}x1i~NUT%&tx>p&N&8$XNtBNOx*#7_j&++T`Urm?*+zXqR_dYeW^jOTr@TL9h
zuiw-7#nomr{CX9{$}M}Jm7V?P-(No***N&4&Kz8RQ$SSiyQ;R0HgX`cT)BKvN?1x>
zZt=Xi*47p#Ue|8T5OH;~GUn#v7nT$kJa_iY6~!ZGo|y2kyu0P#<me8wm<dX={`>cj
zfs2FpPefGY<KO@OGCDfgKM;|U|NH0H@4v?nAN{-c;OVcgU*7%5#KidL`;VUt=mva$
z^Y-I!hX20})~(&Z#Q2|q_vo?XzYp)-{p-Z3^DoX`ynTt6hh2K(o@*b(M1-uEnHitL
z41lKtMkdyU41YeSRJYAj5EBt#h6?8(1z^ge84b~5f^34%p1+!l60{1kQVa|X4BV?`
zSO5F-^WBf%fBr@N|NkFF&DzC1p0j)N|8HN}`G<jlffdCC4<0{b`2YX^S9^0!1AczK
ziw34vOFw`5RvZ%K<)^A3B`hJ#weZ%pO9pS>e`c6CXQTf8^P7Gv8v5akYk`<xht;K7
z!T%W;7(`7CH1y&_9sfI6>a1j7U=YBm3kEpY*a)hjDgXd$((y9qzjEvV0000<MNUMn
GLSTYTscGZ@

literal 0
HcmV?d00001