From 04f52f1f8688e328b1ad1eb228291f352858d9f0 Mon Sep 17 00:00:00 2001
From: blitzmann <ryan.xgamer99@gmail.com>
Date: Wed, 6 Aug 2014 15:16:37 -0400
Subject: [PATCH] Adds Deployables to market / search

---
 service/market.py              |   8 +++++---
 staticdata/icons/icon26_11.png | Bin 0 -> 684 bytes
 staticdata/icons/icon26_12.png | Bin 0 -> 838 bytes
 staticdata/icons/icon26_13.png | Bin 0 -> 885 bytes
 staticdata/icons/icon26_14.png | Bin 0 -> 792 bytes
 staticdata/icons/icon26_15.png | Bin 0 -> 732 bytes
 staticdata/icons/icon26_16.png | Bin 0 -> 829 bytes
 staticdata/icons/icon27_05.png | Bin 0 -> 922 bytes
 8 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 staticdata/icons/icon26_11.png
 create mode 100644 staticdata/icons/icon26_12.png
 create mode 100644 staticdata/icons/icon26_13.png
 create mode 100644 staticdata/icons/icon26_14.png
 create mode 100644 staticdata/icons/icon26_15.png
 create mode 100644 staticdata/icons/icon26_16.png
 create mode 100644 staticdata/icons/icon27_05.png

diff --git a/service/market.py b/service/market.py
index d6a05bcbb..94b25e023 100644
--- a/service/market.py
+++ b/service/market.py
@@ -268,7 +268,8 @@ class Market():
             "QA Remote Armor Repair System - 5 Players": False,
             "QA Shield Transporter - 5 Players": False,
             "Goru's Shuttle": False,
-            "Guristas Shuttle": False}
+            "Guristas Shuttle": False,
+            "Mobile Decoy Unit": False}  # Seems to be left over test mod for deployables
 
         # do not publish anything that we convert
         for name in self.ITEMS_OVERRIDE:
@@ -340,13 +341,14 @@ class Market():
                                      ("faction", frozenset((4, 3))),
                                      ("complex", frozenset((6,))),
                                      ("officer", frozenset((5,)))])
-        self.SEARCH_CATEGORIES = ("Drone", "Module", "Subsystem", "Charge", "Implant")
+        self.SEARCH_CATEGORIES = ("Drone", "Module", "Subsystem", "Charge", "Implant", "Deployable")
         self.ROOT_MARKET_GROUPS = (9,     # Modules
                                    1111,  # Rigs
                                    157,   # Drones
                                    11,    # Ammo
                                    1112,  # Subsystems
-                                   24)    # Implants & Boosters
+                                   24,    # Implants & Boosters
+                                   404)   # Deployables
         # Tell other threads that Market is at their service
         mktRdy.set()
 
diff --git a/staticdata/icons/icon26_11.png b/staticdata/icons/icon26_11.png
new file mode 100644
index 0000000000000000000000000000000000000000..5145548594f786b408db5630bc8eaa4a1b135f8b
GIT binary patch
literal 684
zcmV;d0#p5oP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-UtR000Ees?p*)?0y#-U
zK~y-)?UKDuQ(+iKf6v>NkCt061h~`$N()-0B4yD*i6)LZ=-}o*;O4+Wq9J|+C7S4>
ziE%J)EDnN+I;bdOa8WBNl9bk7$}I&-OTX@gw(sMhxajQUna_3(@E-uc?YnmXz&7@9
z?9hYz_xk?kj9wdYO+0=yaO6P0BNPgeufq!fplx9x`t2qO$GP!|aTGJFu}D1G77PXq
zt7O%+Xc~VChn=g-iKd?5{)I~yM-B%9fz;gmJQDy64h<bVc64B-w=X1X9S)3+j$k?V
zRfgviqE%~!RV*R9k;A@VH*c(^Xj9fce>pjI!q?#~3jk<qR?nm}h3eegESsAa-oBZ^
z`g(@I#7hYS`eK52s4CJ~i;6{)HBH+CpaleoZoi*WNh1cXiiDnoVHj*$CU$z7k<aJJ
zES0!gt<ct{g~dgk6<0la`}^7fxR?QZBpT&hE~l@p7-YBGC>n|2!ti-~cs)UvuMETK
ztfPFP#BRk+D=CA*?_RN|Mbp&=rAbOjHUL;kW;0EV%IOBhrS9I<g_+4`LTlg4Znq+=
ztx9=%YPy`xtjp+^_vBF8tQ*&FU2Rm=&q5$g0MO;_tjTX=dybzvd6u}+{N(A2NUe=l
z&8@OoDOXKFkN{ZN?e#8ay<{n80el3JwcV4zr~$DD5*`o=3={;B`73n=fCL}_*qJ#C
zA`8IJjJ^&pVtO1tZzoA9ZA2tV2nO@-kz(=h?DzS>QWBUE)8qWdZQFPKQ+@!*PY7SU
SPo;YR0000<MNUMnLSTZ0?Jjo!

literal 0
HcmV?d00001

diff --git a/staticdata/icons/icon26_12.png b/staticdata/icons/icon26_12.png
new file mode 100644
index 0000000000000000000000000000000000000000..5f23930d7059bcf1199bf955f4165211d099d505
GIT binary patch
literal 838
zcmV-M1G)T(P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-UtR002uuDMx6iv0@F!E
zK~y-)eUe*9lVKRg|L=F$x9Qx;t=iH#)1V9@%#LPsQ6VLzbizQApzNZXD2j>-?5>+G
z>N-n^gosXP6m~FbUI^uK1+$g8Q*)b}ZJ$oJ@B7{^Qqh_{S1%9$=lAk^cz^}!WJ}ZR
zyP<B!LNPFZH<}vv0RTiXX?gtg;gzecm#&JFvK;`d`2rq<qW=eMtl3%-9SJ?Ue)Co&
z91dMhrc&ok#)9F-#zWl)k2bH{XS2XjY@f}ubBE8IJKNMyzqh;X&h6zN`ai;AF(Vd>
zkqw)-(s=ZzgK&Hc!!YCS&tIH50oKLFQ}-V{T)lpM73u#pKx5GeNyOtgeyj!RJb_eK
z*H8+Y-}B~eTTX?Q4s({KM`?TeU8)h(#Aq;6ju*&C&<~bXqxIrx`mXyK3xJ=Q;pPG)
zVUf?gbUE|gGoVb2`sfp94-7h;>~X(DU!MzSE?gpdokgr%yN>1rgntHufk2Q{Zm1!W
zEMZx3nyNHfvcyqEnk%={!Eb)@{f9rIRcRn*(*G*#s@t8g*_OcNa=~OYVr+^fW?L~a
znF`VQyqg&GT2kgHkBgbKl5>fPP(YA5{)E8uRFbm@_yYh1$uH1Sl}ZKY`(CE2tMkR+
zp!d~33Z?cExV^!!)e?t91n3Pq==6H1^E7lU@r!uB4&s|<0P(S@^t?klP+toG81fAx
z91bMPE7oN4I7yilQ&dceh(sbJHsVL0^R2S~@DWf+@;J)M$qax1z@EBV-K0#JWO8C6
zIU3uw*lNCE)(J)K&mK7|Np#zmD#pHI&99F3d)HY`=n%(6@6hltodp!?O)Oy;Vp>|n
zYj}>01pQ^JR<F9o@%&DP5EPnC{k`vcZ^#+>wX8@!mgAKn-yA@xy@dH|p;XFd3jw+b
z0MBw<g37d);n=BZU1^@e+$yz~{OK_arLw|EDo&A8<E&aODARd5^E&|i2F#)}{{$$z
QP5=M^07*qoM6N<$f{Pc79smFU

literal 0
HcmV?d00001

diff --git a/staticdata/icons/icon26_13.png b/staticdata/icons/icon26_13.png
new file mode 100644
index 0000000000000000000000000000000000000000..e1a9c25b36ac72c5220e3c8d8a54334e1b6dd114
GIT binary patch
literal 885
zcmV-*1B(2KP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-UtQ~It0v}uABe>0|H4z
zK~y-)&67=N9CaLq-`{^GGqXuHAFEq4wM`o_*;>6->j#z^4^l~t@r$DPfgX#f2!fyo
z!D0_8iU^e!k!q|72o;OQekh7bOLpUKR~pwO+w9I{lWdaNI+;oKYbNvas!;E~x92%L
zw-@-|ZaOu3P2bhI<6kWQSKz|b(mvCiyY=Iv$9iwnw>(fN%v-0w`R<WFXJ#({Ge)DM
z-{Zi62Sc+)ZZMm<d|xg*dq2tY&A0E_gG4fk)#c?t)f!>jHi}D&Lf7?F|3iIa_ukX{
z5&#eYynXns6D4c;Sw#&6=KLb|@85?l(Fmf^8@Ny~(X(qe?e2+jc5ap?;z_KoEQ?yL
z^7M)0pO44@P_C3!sX+}=so(kKR}N9N>Y=Hz33u$hi!@c>+}X1j86FmTM+evIo0y)S
z2`sDB3y5!J0NB3srtGPalXPXy;4i-zW<}HJ@h2X`kt6Tm`e+2D(qF8q3eKPZiCx!)
z>$uWNadkpd6j=a3>f$ftIO{xga)>;yN-g0gnvBOWIr$qO`{Yy3X0sq6anG(E==xSF
zmn#UVYJnLQ835Mn*jD#E&P<L|BoakoVTto*0o~o*6mD*0!!Ri`^#}IeeJ3)R3_Ra=
z+21TdkS_tiz(C)Nwr%fRv93~fDjDSGmq=|;;BKrVoxFt202H~d9lr1L;NZg)3Wc<E
zDt%nh)I|XReh`ebwYEwN3-jC+yM=1iI`pkN%)G&tRpRHKe+ExIc@V@bz5m_^b|Rkm
zti8Pr1c16acTmnWn%{imwby?gpE#tcN=s9?8U20zSTAp2;=)A{Pb4<O&8?|gwf6Id
zvo=ja<N->9s6+tJwY^g&q7KJiiwz!p^uv(Wa9irq6dcF7qBJPuR<Rf-5*C0Q2n%4k
z3PH7;kq@M!@4hMzef@*q*4FN-s#0_vcPtj`md>5|@hh%-r>m997(fXEr5S9Jker-p
zc=npj06^oX4%5I3AE6~2Vh{mApn|XsfJ~qjX5N4hUe3t#wLbGVIOl0$#soaJ00000
LNkvXXu0mjfOLCrF

literal 0
HcmV?d00001

diff --git a/staticdata/icons/icon26_14.png b/staticdata/icons/icon26_14.png
new file mode 100644
index 0000000000000000000000000000000000000000..5e9e13d689ab1424ed7fc201da62f77f358dfeba
GIT binary patch
literal 792
zcmV+z1LypSP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-UtQ~J0<|;-Z=mO0;Ner
zK~y-)-ILu*lW`Qszvt(($2QIBG^pIG*&7j2W?{Lqu!86nqT3(>d$|iDs;jUp>9(7$
z>cXP3tke*PpsAISSXMWi<(|1cGn>=3)!y8m(?#!4{Q;e;?-#z`0|!0__<v`hzwL)^
zynLlF@-cP*0Jhd{reAYE%*oRy(AaPZ0C4<hUBT}CySAs3i5-#Xrws;uu4VAqAf&v)
zP{)INhx-SHS^&UdwL$vU*Jm@?+U7gg_ZW0J+wzR2(!}Q|Eal6x&+oU;<cE+}?Oca3
zpTD?dzWHwbxt&AKYUkOSn%cG;0Jw3psYzA+=a(*7wj!Cy=HI&Aj95IyJzbrYNG9;s
z<3VYu1!l7uR-2vs`+Dbe_dIg=N4z%)09LQ9OrJS@CdcD`1--$<Mx%k=z8mGm3l~s9
zK_O&07cQ3zuiYN)V?0I4$%#xVmF`c+Q-{8ukjcL63x+Bx7cSSb@raNm3C{IZ^t9K-
z?Ol(l*kZ?|s)7KKM+7ZDU!I;;RS7gB0f1?~xidWCt(b9EN}-O2T5D@No9s4<#}hD?
z%tPSSFy@w(V?k9F&0DgFy02dI(^z1Lgh-OZW~W#{nRBrI!n?9fTMU8T4!DP2B0MpH
zpgPVQj~o*QokX$maSV5N4NfSkOVa7w%<Kkem;j*MQ6}e?7`N}(v-jS!Cj;8l`w!T6
zv4LJR-==6l4W}ZLy(3DnPu596)_4?v0w4;aG&!s`fQV#Cn!Rex%DT_-<SE5FT2!dd
zeG`f%dSa2tu&k3+X7&=%xW@d6gwVV`g&kJgPmmloyMU$@lMw5*tY!gmm_R-d6flLE
zI87upuTQ}rN&LQqG@ixaA|gsKa|}Xcygr5hhP?RAF>6dnK!_j{O?mxeGhpU_{md6W
W+%>U^mLwbi0000<MNUMnLSTZ@WO$+g

literal 0
HcmV?d00001

diff --git a/staticdata/icons/icon26_15.png b/staticdata/icons/icon26_15.png
new file mode 100644
index 0000000000000000000000000000000000000000..6fcddafeaf096e546af9f1a988fb49aa3e06135e
GIT binary patch
literal 732
zcmV<20wev2P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-UtR00Rk9~j-~(r0%=J^
zK~y-)?UOxBQ(+i|&wFoMT1%lomA25{UTQ274J8s8)HrCupfTz~Vwh1T8Jvhe(LoZC
zIB8-uQNx0RA;O?03TTW${8^NgLZK}}E0)q9dV7KPexHjth@+!tJbBLc9N>Qd0Jrbn
z0RVB}$-sd}5AHSojp;nsVSYL^c<Au{CcWS9C)q6l0B94KotwHvg1&2LcnC@=5uOe&
z+8cK7N`yjlMiRtgd~wlORasi;@pxyiUA=zL=kqNEf<Z1it88?(>wHUjS=oJOt&27J
zoA}GoQEPG`C}>P9p9};|*=)vQt+1A;`BfgCo~)>q>ii!*eSR#vB__m@%iM0WwkK0L
zEfDy^)%7*JdpnL)Izxg^#J6Y^c|}1iu|nBABSlepb#-+;fbAeasFOUxQalz0*Mx=n
zIAXCFSJzZH?N#6aG);r6PDV>)LNh5TW;PkH*Wc&@VCEbU=Asdn&1UD9f5b@1rD-k{
zqDxmU!d2rSpU(%z7*s{Y_$mo)?d@c9)stmgX~bG;sbq{10f61<ahy1QWZb(`b~iWg
z<6|#|sk+9?B#&D#7)v&^!bV{^n=?eFzKS-7M7=$|gIbYwi=r??0N|B8hSf~E;n=B@
zoy3c_XU|7MB_bu%je=S%6xC#UW#jdmvCIAa{dKLaNAZ5*W9H_Kz8$h#VmjF^fpK0i
zTgn4tuSR;n;4tcSIS%B^CY=fsD4AYSzAwcuSgmDZer=u4hGujCwBH`cZVBP}C}hb)
zj4_dj7zqLg=Kz4do^F2nOvfGoZND}l01vm=wrSU&A)+mvUa$W*H~0zOunUpjisMlL
O0000<MNUMnLSTZdqCb5A

literal 0
HcmV?d00001

diff --git a/staticdata/icons/icon26_16.png b/staticdata/icons/icon26_16.png
new file mode 100644
index 0000000000000000000000000000000000000000..71fd06ce0867e13dd722dc6e4bb83b788c8056a1
GIT binary patch
literal 829
zcmV-D1H$}?P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-UtQ~I|?#Bvf2Ou0?J85
zK~y-)eUsZulW`cwzt8*b-66}iwVBi0febQTbTmt>n}RNa5~=V)h^V|NNbE>dP=7!W
zUU!17LhL|Yh*3rvWaV@-HnC(|n}@9}b#v|AyZ7lPwS)FtJ^XmSAAX<Tj|W(!PBu5q
z_4WJqEH(z=?}Mhs1^_@RHD!JDq~q%KYnQL5e&p={U@Op}JsSHzpr&r;y4ZO1;f=Oi
z6Jul1D^t_c7tN++!N$hJU5Aby+1gNIg|o~)H!uDkK6CzDQ~iPcUAOPvS@Y4;2dmYB
zcsx$qcI@OtY}82_saX(&v~TcJ&w>EkN>j^&_Kx+{)mz9j;N^I1f|7{@P8@HBeu<81
zYwMW71>G-S-Cj^(t=*F6OoH#-yUzxlo=ipyYa|_wN5T+AJ+579<yW0g1pv})M)NyB
zEG((9l$O)yfR|^!h4^t#H;jda`GD^^dVBkE_R<w{IM=LjIm`140)~c%m2f!1Tet5b
z24k~Zr>3(C6}z_3kxjdK=*w41X9gtzIsln}6e=q!vSnp9ArSC0i16MY7GlXXX(cT`
zdDcmVOAYL<+Asw`UGNQpq42YrnJl^8RrIy%DOV<gtcoI9TQ5*9m&5BfJ>t!_wkUwC
zPOJU*7oy{dQIaQ5$t-dr8lehF;dj$a)02}hnawaRH^M*YGwAhtQzR070RS``cG(>m
z2?eEthYzNLLjyulsY6J~K#_Sl${jXVRf2J)O;}|sj>HqmqSL2Z3;@(Qg^^GYfT;L9
z-ueP#(U?J0h0)<b?tRm(PDDm%V|6uoJs#ET`&9BHlhFcj64Cq(0ARJ<0a?jwa&or3
zYNPvxBuRS#g2iI)&t~Np27~@sE~kioe}F%J=(7X(_6OjX23&RrDY={#%rzj0B#7Th
z<+q`+Q3Eq80LuVmB4S!>O<hhWSYaWr5)))W)JXYx)%p4fpRO}{E~W@f00000NkvXX
Hu0mjfUW|Bo

literal 0
HcmV?d00001

diff --git a/staticdata/icons/icon27_05.png b/staticdata/icons/icon27_05.png
new file mode 100644
index 0000000000000000000000000000000000000000..da39a79ef5721ad6b06bc8887d32788011ef6be3
GIT binary patch
literal 922
zcmV;L17-Y)P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY3ljhU3ljkVnw%H_000McNliru-UtR00x}hP?a2TD11CvD
zK~y-)wUb|LQ*|80&+q<jyW8IW+lFW}x^B@2233JXBP^*zGfjw5vze%wJP-|-pg~?V
z0p<fHCO#RT<b?<>0dz4+;-5aqm@K9Ik=FeK+Ld(8#@5pRw_X3;dw*Xa6dz2~C(qMK
z&L`*T9N_=dnThfLWTbxz9uE$x&d%-~vH9qGXTLpn@%YCd?!TY)`~81$?7lgAeC*-9
zqocu@-=fd<_WE`krr8s{5ykX$7;cYKXj)Aw6iRoVdHSi74yWy>lP4x-=N4uJ1At>6
z9SQk1^*w+6Y8aQp*TwM2ix_%t2vtp^wQPn3wghNHw}(kwK`0br9=F37eQlqo-|uhA
z0H8PZ;I*p}(bc&Dr@r`{ij^9xuQzCLSCHlMY5W>Zu<1wy<zgAzx9^}UmoHfc1~%_$
zHtOH~QDEq^HLd(aI=P6Y^b#A~xeE@D17CeJfmW?Z8+&@0q9`ckvlu&i44ku8qgrip
zZn4M!kiVCKR$j+}g9qvKm*cn{pJUs$J&9;6hIX@#<?k<`$0egI6u4autgfuBSR}b9
z80iuKl&j5dm)n7O;wCd%>&!42&V4-r-zFbw>vb5bNuj6bL`R2(+U*t!`9eXK<stz>
z0)Sq>?~#RtdE8xIK`vj!^e<s@sVcj5D-KPof~*Rkso6=jtIXfmk0WF6cjdDACNU5P
zfZ*<(FBpP(Rf{0mDzmEAVBVgGkXg$RlLXr{@+!PuFWdOQgNP@Rn7S}EtJ>{92vA9S
z?9l+PS1N~Xijs)UFL6_JP$00CRELY+eETid>F&b#=~EIhxxpk(d*2w%y>sZ@U^11`
zBmr={&4xRR>B8bdJnV2ea|2rj27P^A>C#k$hkgvzTdnrRTDf*+_?40Rm1~jBCXvb|
ziBJAKd7@mYl;rd0&(g~;z1~pW&Y9e5c3GIBl3B|RmvZ;QdPBciXy`crso0HZ(#owv
zE2%V1E+%vU6#!tLefkMIboc}MbK_iZx7~(rZnfE!77^}Bl2jr_t<+N51kedU0BBn+
wtZ5iT?C&S)_xm{*aexsBW-6T)|Mte;0ac!YHZ^0kq5uE@07*qoM6N<$f_P!G_5c6?

literal 0
HcmV?d00001