From ea8f6e4ec0150b1654c250c607a8160f495df680 Mon Sep 17 00:00:00 2001 From: Jonathan Harris Date: Tue, 25 Oct 2016 17:56:03 +0100 Subject: [PATCH] Fix for outfitting cabins and fighter hangars --- coriolis-data | 2 +- coriolis.py | 4 ++++ loadout.py | 6 ++++-- modules.p | Bin 21563 -> 21732 bytes outfitting.py | 12 +++++++++--- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/coriolis-data b/coriolis-data index c686af45..d4ffc020 160000 --- a/coriolis-data +++ b/coriolis-data @@ -1 +1 @@ -Subproject commit c686af45cc299a2ba7f7eeace35dd3e898bbb588 +Subproject commit d4ffc0202a929d25eb2056b1af00030a59a4512a diff --git a/coriolis.py b/coriolis.py index 626ec4bc..6290b26a 100755 --- a/coriolis.py +++ b/coriolis.py @@ -79,6 +79,7 @@ fixup_map.update({ 'Enforcer Cannon' : ('Multi-cannon', 'Enforcer'), 'Enhanced Performance Thrusters': ('Thrusters', 'Enhanced Performance'), 'Imperial Hammer Rail Gun' : ('Rail Gun', 'Imperial Hammer'), + 'Luxury Class Passenger Cabin' : ('Luxury Passenger Cabin', None), 'Mining Lance Beam Laser' : ('Mining Laser', 'Mining Lance'), 'Multi-Cannon' : ('Multi-cannon', None), 'Pacifier Frag-Cannon' : ('Fragment Cannon', 'Pacifier'), @@ -335,5 +336,8 @@ if __name__ == "__main__": else: modules[key] = { 'mass': m.get('mass', 0) } # Some modules don't have mass + # not in coriolis-data at time of writing + modules[('Pulse Laser', None, '2', 'E')] = { 'mass': 4 } # Fixed used to be 2F + cPickle.dump(modules, open('modules.p', 'wb'), protocol = cPickle.HIGHEST_PROTOCOL) diff --git a/loadout.py b/loadout.py index 6bd79774..77d123d0 100644 --- a/loadout.py +++ b/loadout.py @@ -45,10 +45,12 @@ ships = cPickle.load(open(join(config.respath, 'ships.p'), 'rb')) def export(data, filename=None): def class_rating(module): - if 'guidance' in module: + if 'guidance' in module: # Missiles return module['class'] + module['rating'] + '/' + module.get('mount', 'F')[0] + module['guidance'][0] + ' ' - elif 'mount' in module: + elif 'mount' in module: # Hardpoints return module['class'] + module['rating'] + '/' + module['mount'][0] + ' ' + elif 'Cabin' in module['name']: # Passenger cabins + return module['class'] + module['rating'] + '/' + module['name'][0] + ' ' else: return module['class'] + module['rating'] + ' ' diff --git a/modules.p b/modules.p index c7c3cd0f25ca6e4c75216d5c07140cb44b951e3b..fcee20f4c4d8a1b0db8f02a7854a93d667603db5 100644 GIT binary patch literal 21732 zcmZ{scbuG6^~Tf7kc0$+DL@zqB@2YQ5D+w*Y${1$Niu})PIe}l+3e2jyfYgJ2t+}O zBGM5otOdJ>4J_Du!GgVu*ibBp6;XfB_dRFc`@X*o{Nd;0bI(2Z+;g6D?zwl~&F*nm zG{!DkRG8IMzoZ=HS5%v=sJeByRgW6u&Mb^Qr7(7R>x#zs!i2$Mv)P!iVa(X(qQXII zimkp%etA?b?$D(5)xn{1E8ktOwW9jKKsjnm)YK(~u`4xoQf0!r9?hA&sa$K;qh@2W zsa>J5DH`i)E~)^XWGhV-l$ZGYjpbrrtGctC-!vR;EB2M8esHMXthUOHTw$NhyN1e( zm*h7`#aeTy9<{XQUWKv87sjrY+G*0URBCgD8Ea)(R4oqVR~EMqlpE6%nHiFqqID*9 z7i+b8t+BUEIKeEQsi6rPnzFIHty(KbyBf1Jcw%AfGU?t&gJU$fe>Xerlb`mm{e2~` z?IS;1^1CHJb5o^S9w_Cz%L4=X<;B{L#(ol#!MOK%5*jC=S*xPrpmtoTZfoUNMB060 zjxCMUTsg5m)QST!Z`~Dz$=im@1B1f@jrpsWUUS)FtM8wEx%5maOdc#=%1~qf)l2_5 zCjPH56<~-EHx5|cHTJ~#zu{ok>asRkB6!Sdmz9M^2-y9dOYe2@O8T-z?DbQiZ)YmI|7rL!;=1{|U( zIZc_mO7`V9ty25GetJ@&L5TR}yCIKhc;Szvcdo3T1nyvi$VpAJDB3QIY z<3xGZ`s(&d>yk46n_o6CP~X+)DCD~9Tccur!;ZD*G>%M&ag?vQmnB5cK(W?p935<0 zT$!-CYl69zm3xKOyQt7ZDJQlpSoh@YsO?flx|tix)!Mdt z)K@O~wmS=x&lw(Q4M*jM%<_aeS>m%KK7Y-y*qO{3EZ15JUf+)5_Htv1?Tw(FB60TC zQ3*MBsxV?deS;z|cMRA1DvHJPHA`tlR-PsarB#LS2}057f>ci`o(gd81#<7wzkZef z9?=MFRIJ(43ni>r$Ma=6^Op)zcq^Tikl0!GfN&;-1ir|}AZ5m^{vjce|dJ2dN4inc4nkWb>PqqTJLC_*WsFz(Bex~apO75Jq1mz{= zOhH$V>*^>>iwo$f`8DO@&RvbO6DDkQJrG`g$EHn!x}?V|5q{q+Ca*gmB8R#&PDEb% zv=tVJoYa^KSs`EHzJheY0e1|#&hZtYh5KrYpb&Mf{nd7OL_;{;y%#m6m>OSrhv|DQDZm14aTg7NsesxqVrO&)l zVfKn@aj;%1ZB;_%S6(_apyi`RIZ?Y!I*ygvTw&s}Qb|MGlc9=+;Lt>^=uW8$YCAN~th&RauTw zcd#O=4>c>*p++m2I4r3xl441vB1yJW5N@O~5|Oa)lFVrkZ`19&RKnPoE9{*#A>G3* zI+b0?B9}?%bP17LuJLkm>-5Yak(@WA*yHUKTQ^RJ#6fm$(gtnYV<+}vX?Bubp~Xb9 z_?%EBA--3-k-dd!tIE;hQhD)uPWHxCiG{l*ak!#2ZzbJMRIgS0)QJs~X@lirlXK)H zTH-j%@0Vu7MdJ8MS4$60r`XAzQ0N*#WE|a}JMCp=PhmehRn?6~!$Wb86`$Xkj z7S~CVO5&{+o4H<4UXY(ANZpXN2WR-=FZacrQOtjZtE3XiYN&FfpmwFz!a%PS#6~&` zxlPql`I2glT)Qc8*sC-S;mB?;8aE5lY22Bj=PW)xLpp zeoe8qy%;qfFkw2>_exkzU);)gQoPSq`sq)s-Y=*}D)*7f=3p_utgo*uip5uj51279 z^@9?_x!$D!Jt(M4keZF<<$>YtMO~Dr?hhp%|Bx>Sf#d;r@L`8?6?w@^_(y~-l%i54 zl%d#Qt%xf1I6N z!J-6=nrY~fQ{WWH?kG{oFbqjhI| z8wgsbpmmS8foU76&8AMv{6-!BjnCK~ar0-Tni_#>XU6BGdR-}VgebY6qdhCkO*c|o zbfM3;&*9HYrBa?%zL3e!xRp}b!l7T(`XgFDR|$8hFA3XUn6sU_^<_caNaiiCF5aT1 zGrr|=Ar3dsuV^{1ge@D_MNrBgX%>J$*YMqw{ z6nsxmT(2v^!0!t?T4Ln4JN5^HFp!yk_WV#whr4IoSS#c#^CJn9f6SLK1pBeipD0LD zto#!}tjwOh>HDc5@_V-KdDU&In0d-y`{wgAn~QUPZYva~cNe4W^@JmjNkSaKhF@eI zLlN;B`MBm1C?c$+LftO~sZ_-^Qc}$Sl^|S&`#phwEeId5EjRc#4wX`V|E)0m-dUKk zu3R3VLvB2g1pjv$ou*L=gEQy%rlc@q6)ytXw3o*x%|P7u2Z>-H99Bf2%pWWM{&m3m z;Y){AT=)FE@h4Nlj6b^)2%#;p%cn9iEX?nTs;a9kwN-xRg@pKvW_jeEmLfd3GAR11 zAQIm@Jaqp}kb)Us`JBLi&j!UKk8S^u@NVCrB0y07DToMgaLH3p=3j!i5ieL-tI!&j z@;&89FA9V43sAU3KVyb5<=>ed#tw8!J}YIM-QH8PC~EHVaL%vaI)7)?Jvu#kKsK1373 z6iTfXs%WB6s_mF;wH?ucGKK?XvYik*7CbXqeUhotP6~5)URk_G4RtA>uJF-h$!Hll zju}&I2H`&5>;;`_C{@utilMoHvZnkbYD9Y(iuXuND;v=?LkWQHDeWSv8#kAsXu3w* zSrpAMQL1QXy3ZP@4yl=n_D;*rG}#4`?I=u)pI)O`X@PxA0BbzF#B$$&-YXkbRzPRR z=<2R%?Q3Ydy;(Li6xEA*i{3P>m*HqX$(n!Er$)~U`q;D8lxU9WOFc3XPh)5_SA)d! zWa1gl<*}n~UhR^E$LEE0*o~!ZG(Vu;tP`{S4TX6WW|0f@07LV!bN5Qx)3s}(12vMw zV1bDdE<)>MKFCm<>9;FoQIrp|ex9+=!9mt9L%8^mAln&^@o1sJGo+Y(SvwRR8dOlA zJP!{ulcVx{OkP z#z{xn$W)EEhjGWzhEmsM2nlPK zdUcDI7|JgFAi}~^Vl*9v&dS+|e^0eJ>of;1I@O+UDC|83}Q z8stWBTzn%4SCi-beL%F&)aSLfCiR(Q^@HOKLm>neLzdvpbqT5;LE?6fTSc^9u!KZ0 zEZUF=#To4d@=QYsPp&ZGtf;RToh2yYO^=OZMsGGR&$bcr#7`hh*%+f~7D7?cjreY| zDG(Pf_))gmP`tZDs7J40XqQmv=4p72p^9l?Zt^y;rZ_mLp0EA79Bq-1rnt+_wJGrq z`!hA?JR70rcq+o^^9_aP^taYwMi&@L+TwU+3LCo6P{QGvf`*HNhTi^+H!rpkyy38WWX(25#7CpVz-}mM6np7Y5y+N6nT<`x7rlUp_Ds2`bJIh3cxBQn?gu(+4z=i zg!qzFehO|g6k7?4p8(rOErF91GnS~>6s+n^73HeI)E?@rG~tW>|F5avS?o!-BPjFh zEVBk|R;mYpNirFi4ce5M;>`5T^=PPEs^@!l4b*EaCmRH%0)v4D`tfm z-Ie0DZON};QN!k|v0;7`3#Lm*XJP8H=8*1I_2E|3)NqnkEmOLm)*`rGc!v#bA19tQ zI}Ig7?p0!aiJ^GaNrNLUH58h5R+6`}XqUlkts}g|M3)5}-VmVU@_$(;$ zs}*%Vl#0xr{(AdNl4yV{c@8h#CT08x?d5a={_RY zpV{w?HcdV$%ug;$dSvgb@6=}w?K^$+%498wb5nLL&+Ati+Rkec64%`vqwz-~ZI7bj z788c2E6s1TCAS(1$-J3h6So=KCDh9Z=6b?m^!tokI^FoP=WHIu!K{l6d zbzWy9aDnPBEy%y#P*Rd-bdUJGhPEBx){Pj-QAp~^EkxlBLP@$(zxQc8G63Zdxa`q?CtG_ju*-q?4Eyzq4*3VqybO9(@DdLxF0oTHEeP`hW%`rn-O+-fLon4C*M5`0IT! znj&1A&^Ds58rmfk|HxuI@sOcpt9ux|A2M{e zP@eK-HnJZ!lvY2}0qR(ht8;~t5`dO1Eklu!}tBIJtnrY2!KUD~Swcl#6n)W9 zw(4yq4)~Ix1P2XDc=q#UL&+d$>Us4QL!m-%>bU-@!TfeY(UgVo|B)C?TbK(^snOSL z4zH=OO3SjVuZIOX`ZLGuH*6%1Q?_^grj5|Dl(Kd2Q5(Sxu+cgCEkhxX_r^Hq+lJq2G5+;gcf<!s@GEQ&1-iq&03$O(f%db9`2EyWj%cCY z{=M~o5}y9dMre6DD#=F%(a#OWvW`@w9}6(2k5|WE7%J_B+3TwM8f;53($@t#MEl~8 zGor^OAaRvrcKyp(JWVF=vKjoT!l@!Tvycw2zMm(xg9FvwTYvY!)tqquM^cnP@0m^6gV!CK-w~kl(GDY$(>`vI#!L zM%rHtxt&vmQcX^af7K2L?1a(3Y9FChoWwcPg*$sw#bU3p1SYxLrWx8Ug!1yTRy1AU z714}%DD4ct8u7lmx6PZRMZA}#@t6!)fXv-=rLfgn}nW;8!fC~liFIa`Dm$!$}pzTsxN#5}as zj@RU3crwq>HeSbjBZSDDI^ii18SA zh@qUq)IBHCLPKFZsqNWusG(#B40YMV48_&{Vu9Yn4TXyOYK`ZT_P3DH5gJPNx5(s< zlpJ36GSp!xR(V%NppG=OODL^}_CeRE3;mHqw8RCP7rTR6oA+BxB5In_`ogom8T&o>lT_ojY;I?doz zPmdj^8%ngO;Zi|5zaXgSNZl=8XfW<2T)y7YAnf^y;x0qk;A4_ii-Y22F`5c(d!MQ! zglf6XqC!#HwR?1R8_K$5tS9*jp=9j3?8RJ_diByL+I=4%cE--}8nDt02)`S6Bf;vc z!a5W}57lZzsXXl3ZCYcf61CrNa}r0%+92*81wF%1g5r4%)7BZ<&T9|rdPCVRtkiZbK+Gr@;@?HSNn_@H- zzjl94a5vi&>|SVgGo=tv?+1`Q$57c)SfDpY{dGpQUejMoH1#)AbjYb+QnpCc?4oR* zo2V=7z0&?1gFl7g?~bDLGLq+;Bs=iL!;KdhN;JK@#>fj}G_|k7oa8Zrzs^bB-7iWO zftnX5ixl=>Rpswy_V^u3^dg(3Sh8HN%~CoS<}5EZ^}WjIhr?pB4zb&stfLEH=6$Kp zMyNWu{!G;_g%ODBfi1^q`V@pXUfs6EgI3+Vx58=LO;bAoy-HMsl7M$+&;0nveAYhU zwx_}DCA5_4 z6Pu=!R+QA%RtR}3tVA`E5z{+b;@(#6Iv%j%Nzn00xgt6c`&`WFXrzkZP}R~Skg(vhX{m5HKuAw&ID zhEm8l;k@YWj?wh*aGlxrtC!fc_Qw{^xtE3|V3&3PyRMGW4PBg6I7ufFuDd1()1GNp zRG*g_nyQMZxHd-9^zuqaz^=0??aJ@R$MuF<7?VFPiEaqOG;dm!&j00xvZ^xyU%n!! z$fbCDqru{BzZV^a9YbDe10;m2N(I6<2b8Q;I8b~`jHbgu zn)N9wohYzs68nvCdQizBUL`7o-?wyiO=}VS4-} zLU=>qBkA!Jgz%AcZ)!)cH)U|9Gy6n%uZ_fCgQYGYBL=hC-t5m*Z?KX09V`2$_{K1Y z5PQ7d6j0ozeZaLh8wyKsu~)tOf^0{Mfo}_>&(_$OlX%`zI@fV%K{O-7U0Kc_>Z*YVi9EzE7~b5Od#e zC_JSB_k-dChQcAgaY4ur8Vb|BDZ;T2#%SU)4dM-D9qJ#lDR8Tlx=(z_;P!n&!uaCD zrYZF?fb)gHkEAqZx%g2V(FMAltgQU7p=`{1P>lW9s3khHeb2{j8jt0(v<=Y&mwv)f zwgIK&CH(P8Lm?V%kSD>X3}s<7c=SIVG(0BMe?8f z>e-h+_I=Axe9&2#mHrb?`wHaS8c%ZRJ0?6`!d`f=@Vkb}^X=2qb$`zW=tNjiAz}01 zH(-I@*eIXk7h=}DFV(d6#d0eTtT`y51%%a9+raTVfm|}nBI|n{Qg@QDP>3g zZX@&yrEDkhk1*1k{SES;HbN04JYGcqWoTX~r?qFnGeYTzJ{kYHb9iXgOYw934H!HV zr(wsxP33N>%%y%pdDdV^=?Q@Fe}ZsFb|?R}5&Y7b3f}(=-Xxf9XifMuW_#`xXahaF$enk7su-d$L!%x zIw7)GuLY*7OS*`jn{$w%nB&RB4)ccY7D_V78>GU)hSH_HMW|{Tkv_ywjsj|>%PtJE z9E?J_mmg{(d;W&TtvSMU;W1AJEMH_Omg8NQ z?Fh2$($nckLq{Zggjo)2jxrR>OQ{cZj}9I8$ic9v3w_rxIWOl0NGfclAvt4=Z$2m0j# z^yGl@Cgb#6VkkT6NVQ6*B*N{-CO`g8wE?K&1q9vC4_b1myYguUbJr-PzK1y7V7`Y~ zXkNs(FEA9VJF;#43&Y3~$-5;>4aE|#-*~kvpqyrYKrS;hFIgxh4OqQAMpGSH`~ie` zjyc^n1-3W=VDyThs3Y}?u+m^`CxQIjS!HPK+w7~^>L5=Nxjk!QG-XfQ_a3XYHj9?( zU|WS9pAlBcrLGw34CYbQ+dJ%EA5?f2;fM`}%KXB-P5Mzl9~_tREA)LC-w5&#m<{VQ z<>*XFX<5;iIcFtv;yR$T!I++)AL{AU!Ix(TSpu%@f^G~b^(A&fv`L_T->@NK>qQ2( z7YxOpMA5VFoES}KUnzS+Z?S3ZKVZQb8z*+8!D%^kw6JhA4TZN@C6v%9HH}{rDHP&g}1~7nxSRB=j>Mtry2=qD6zG zgqN}x1w;NM)Kj9@P&u>Ri#ThGHXt&z>E{`-)dt82Ht+3OpP{s8801tf8A|U!EtDm= zq--cI=}g^Pwiygny{16b?S_)GxokiyHbOvsn^3Q6DA_?R6g$w;Zz!1wDx*PnBxwH@ zwW21Dg#*bz`wRyi3@EJj)2$Xz=;+?A8_FKxy8Hpxhl1?ALiL~l+Ax$OfR_Z%izr6Z z!Srqz%bPZ3x2BY`ty0TIXqCLiAwO&=nM8Ozd3V|psXNj$8dRJi(Zo@s!c1nx!S*P6J07%Gn}<{g|$2nPC81qs? z+ZRAz?`lI?&#izW*BCkyvPQ0sf5)(ac6a7w;My2X$JjZ`y4Ts1F!m4 zud)GL=9dFPbhDwDfoiWnwRv~-JlzwtQ1~U!zFs4g8^=iehehGQ Ld9J7H;bZ;})N<$? literal 21563 zcmZ{scbrt!702m)5EKMKan_2uD0Yn+78Y1=L3e=%YK+OSJ211%?(DqXMKPk-H8F{a zhV+EQn8Z|5OfjbSVv6a#H`5c77-P!s`_7qn-*bUK{P_9ZbI(2Hch0@L)$Fke*8h)tn z+9xU#I_E@_`%70b)R@{iF`CN%4c4zL$Bk(nZR20gzgLV%)yDF`P(2=MOxFshMPu8w z!i>s?? zhqc1YXzZ!x-$Alu+0f!jA)2|if3O@^OSR&v()L=pF)NjsEtx5D`|z%~J~UYF8Lr30 zbyZ0ZYoUSRxL&JC=fM_%RkH68+|z^^>#Ex@YLI0cbArHJ7nrtMP8T=!)a!$dLp6MQ zG z?WKW%`at7w(}2tolEI;W&T@SUaQr2HCm!+?e(p3sknZ}+Rcrl(jXpfc2$VN*{1jyL0zs` z5ZpP|py=Q=<0R)q*i|bH3^x|r z0_5QY*EVHCd0SPU?P{E8J`jYH%%Eu2hH`aaTRrY6_qq$M(d5k|wc(Mt+*p#@f3n19 z%UJ9`$D(kGpf)W($s@c}L&_k^Pt}kjTxqGyOf{V53odMjFb81K>C)lhIYaUaPc+k$ zv!Y&y3ym`+qB!8-S;Qf&%Svk{koIiNR*EXn$_w)xH(+|#NNuRBzz#{N^br`zI{ zmS{#&kmnYa;+?x1%hLF?xp_w#uPN7UQa-xUmYaR>Wkue;X)DU5es`>0Ql5>K(hT2c z8&6hNhlbU;*AC3j`)h zQy-}J?>YbvBF#{vCJvirPiWK?$gPy1Ym0Qz#AdFhcPPzkN(0+VapRJ(+@%tMM1^SL z^4?xKdRc1RGc+_&Ltf4-b-5ry$VQ|rz`|!Pu1xM6Q_-%oXY2Y${&L@w64_UoDo8ub zCV*qR$(>RrsYR;>DwIZVv8x=b8}}!56867A zO%bUurjaKV1a)U(ccu^>ly2tjBf~V!q11?B37sz^y!^=Vh# zN(%M}lK0xTleV&<)U%^;y%~$n8*I4Qh=|vXg4nnzKWE5IE=8x5mrT4_5Jd{LlprSF z;uAe*NZsm?mmJ}|O%Me16BRbzE~qF7DftTYT!)-Y=z5+YRs`}q-XUnLAU}LD@%c6} zI&|I0RU_i?Q}?kKgf(6$QCd)IG;L$Gw|r%FfIf6*8qF7JoE?)uI6Ge~2rl8G6X&ix zaayBEYf2*=8ShRNy+pHQX0&L<$dFDd+Fkd*$L=-TVCYNTHco0D-j@j?FCG%4UM{G) zr;BPpuMot^fK&-0B(D?%AxXRZAeOHZ)bzu<dlsVTC)qQP9*Yj!I9wX& zEycaXmGzz-)q(BFGtUUE?wwNV%)8&+@v5W*-zB3mTQYHXUc6hv@Pblt=sg+8&p+=K zL~-gIx1wAd*7%8uRtZh&gTmCLqUkF} zIBwcO^+9usgX)Jg4ym1VkmezWFkY6zwhs%MB`HYl#(zW*=~W4K?HaD=spzAr*&ox` z0*(0@45c4;4WvmL@Z=Mu>HZ1%Lxq}hN84OGP~>|vfp<=RQp(^Y$~?TELfLs^QFhbS zKkazO9Cm>T>hR;xGHzS)PaS@hrl_gn)TbqZ>-g!r-e&|+LWN3r+WM@pg~Hg;TtZfD-sr4I%LCFB|J%*X%nvbYiJG+I^C6!w?`y>rlg68 z6cD7Z3!+c8R)V?T5Y{TpPeu6p&78T>lnte7t=KU#(D;_Af&$;xG>U>0C~Hjnjv%&b z*M!t}1(6l6Gh+L_Jmo2V`NGKebIVpZ@hU~w{R64tXhPt;a(i9gfm42?ocFPoo3%5xHi2U5;DAj7f9+xsu1 ztWC-wogjSur65R$ewX@{^xLUCsBas6D)%xZEWef#ascFI@Ebt{oc1NVS?aff6pv^@ zS6tQEYq;7o`c~u7VA=1qnYBR@>Omz+NPjOCZ1-LdX#ImAN`(A*{{JY5{Ij+v?oWb> zf?A`Ac6s#YG{S$;5XSqyfX=_>2~f*Cwf{}hG>MjI!o_h?Kdieh(h$KZ9gh!caL`&sJRw0d*Fy>UG({B>Pt+j%>m1c{JC^;nxzBcv z^Pa0o+HAz46tdF|C3~H= zsHhXqNHs(Y){N+QlwMvXSAAWo?vid~3KFwP#A&8Yf>&&!RzmSX0qqX^aXialwq$Iy z%`2WAgz1C|H8vicpxIEjhCL`g#OBPDCdyxaVayz%beMe;Nx?0*o-}U8+6P63u+ACJOVG?&Cpu`A-Scr_#g%A0Um~VPr;7Nn zR86!XeUK9ad+IxNb=W-M#S79&ShO&mlyE~W0u~%@sP*DIo23vRVQ{7$pkh&iW}+C) zQ;l<^OCH{e;Z7?)Qle%sWmGhE_}wnldD)UK63tst8d4h^?ZZ*29#V32(8DGweqh!y zhC<6)G(9~HuU#7-tC7^F<4kO-XIUkK%HxHS<&TZeXZgS6yIx9H8D;U44Q-kv zSz>gGp=`r+AVrQMU1}(i^9Ms#J2lnN=jAE-qWUx&AdM~I5FDSL$|rU>tIr6iH&k?= zX(+oA0aLYL$61E5qrnfama`3Ixz8PaOcqCrg`!l-RIf>QQ}um~~3858xK`$~C_WB_b^kPF5fj-ZV(n!p^Yyjdo*;%*SP{>}0rl+rd)Fw7)Bz0$_ zi8Y@|oEe)8C1HA=Ts|~dTy@o8O*htY9A#&34svckOK&k0`~56VIbD*V**3umTP`zr zX_!Lne6PLCP{KpH+}~#yigDeU#9VGL2OrLfb^?r_X=qVsS*UVL$gVJy++w$HfzL9O z>8QO1V~963mMjNh_IfvZTabko z-s-j+N;6?M_qJOR%6V#OuFa<`)KkNOuof~G1o$O+xU zyu+ptW-L~waJptwG7pHYmGqh??zcJg6{k7m88DPWZ^;~g>IM^4k2MPn1{8vL#u@?j zpkjX4Km#xF|sGc2{50v!MM;A_4XJwvaG92%TfZKA7 zp~SFOc_3A|+u(Zz(}tZ_*BVL@d)LRE>kK73-I<2F$6$OXP)^wE4NcaI=B%ui`ei8( zx}lrgAd%FN8%_QcY2h^BR^MbOB|<$3rDxw9bdxt<@s=R_s8G3r(YG3^y4F6Y8Wcg5(b|xc9=KfrEo@RCfjqG$<$QixMfPrD)D6jZH=a~=ji*3 zk>U8|!c&U8!i45(neIw@T@t_2;CX^+N?xe1O3>_%gBvn}PDF(4X;m7yQL>P9*KJda~$6}ZghIurrA9s z?IHc_Ch3$O@;BH@RH%m>tL`;aR`of(6%8Jv-e?2l%^Nqay~$8qW7m`{^m}uHW*&WX z1Pb>7_t_jO(vN;DGj>`q?9r=39*9ew9VyOJ(ec+hkypV6Y^rFMV0w^|x5@8@CmLlV_QFUE&# zBJ}eU9=Z9jq0rB3lSMvasN9I=r|*f@l=}Pi;-`5T9Dmf*D_HpWF`Gim^+t@Mk0)rF z3k`Nx!ejp@!W_PlQ31ovPZ~G5X_=32Wuzmt5{ zMzoVOxv0iNoqWy)U>(u+#`AeY744+Oxa=2F*=C7r0Moyi4m1-@5WXZdO>{Vd?B|P% zTIM+Yu<2q;r_H;=Up5qjeA^|9Uon)@r?t2>Uk#|23pRdDDAt@$xui9orfBrZ6kd3e zA2E$2xe%_>82aV7n{n6>2;y%IT`aVaxmbGC;HiS)sca+$ zze~_;3_NTM{@$i2@X_22<>rTI*;~FpNWzrCqCc8E4Xu`WQ2CR=+|%+@<5~T)q0PmP>FaEYSt1^-M? zJD&JypG-e)!Y~O-e4GAPP;tGf!0IOq&9Ir}{%t61_Lny_yC)4LbR@w2{*R&fO*Gu# z{~EeaX*pOgDWCH7PW(R&OIQKL;4$Np7Z@;SqEH1NBgP6<%UOR#@UR$?YNDaU8ojPzQqaKuA{5If8`|cwa-P+u z1k|&IKT{1=NRqCmv>-dp(4x>nriP~*Obv5N^yOw4Iz}iN5Q@tMLn$U)_NtkgpxLV7 zOB`2pP?$okDwTLX%TQ8@=WgL_L$RGUvz~L$SMTidk;1 zp_d8uHV=BJp{lv&UMoJJdY%oCL!#=mo^L4GLbZExn4x$=_`F^g7>XIKl?`dhEi{-H zx80eGj>8QWE2BAj6I9)%&s~aq2Ht!QJwgIf?pfNSAD19dhw$U`pD=h7q2N(rg-+8&u#PqqR|$aDg(=4b)N=+gk2Mr)$b-us zm!RnmuR$tDrgE!)yiK9XxO`C5QMA}lqTZc3SDj!mXA&Oo6)*C9VydEf9P))vvH^BA zNUl8NW~-qJWOT^JiaydQ=HA@KOEfNNkzX%w_;YH4W=ja-dA3foDTJUUbEk5;!35s-Mw~sv&?GYXho3WT1bbGQJ;BriO4@aXmNJo%CZFQXq#cz7Rq1dtCi)0gK@p2FLgJL=;tMIn`F%elDIsqLTH>G zD_mdtgOv(jNGmB2yxpdd6hGf#*h)j$Ur3-LM0Qu1qVU6qq*64N=v3RE)2^!*U{8zDCr>kPPlbJ*3VaXvEERQC@@#Wg@%g^ z#g(P*{#P>Ix{@WN6bH zujj~60z6T&PQ=YZX@Q$2cxn8Tm^M z-6s?1OX3&kWrh+^f4vW}o?$2y@>g*b+2w{3W=QC}-7^g(4DK3XxI!qdePK%8wLQ3Y zZ1Yw>^HE~*>?k_YZ=aPe)Z7#`fL+hF0h(nkbF)@5m_+;W0pYEN67yPSC+{(soxE0= znRd!vgZVj^R}JAQCuo)y_~?7!HVw+h&feTpVrOz~{twu7GjVMEfm?W{a6b)odsw@sdDLb1yyCD&)^ zHI%-z)TI4pnlQS}SDP8lkS7t?9Y4oVJmKUhPw@JhfEF_R-fb}aZpj?kt_{-cZtmc9 zhLSd~T|C%hD7DK|ve(n~L4#j>lHwZ-rTWq9b$+9vs`Kcu_FcpEp&tE?bF02YFJ?Zp zjc<~a>8E4dY;#z(HItcJ3?46-Wn~N|-kPAoJ$H6z0`(%B1BEf%i|xgRHVv01vUZoD7}J`+V7l8zc+o~H@Z7&7 zL9^x8oquh#*QU`Zp@A3lOAV#t&}-ESA@0iz#U!>7H}vI(Qv59J8`mogC6<21=IQj6 zhO&+LnH0URO3-Y0NULxAueK?$t0hw{uQ3=~5SF_H`n9GhbN(TsGKs-`VG8$%-rrvr zP^T%fuOFqzY0BU|8ib|~B@Z>>DSi&y-hSVe_<0LDyA9|+6WG7lQ>GnfaBb_uH_@!>{>papxKV?sm7sC*c501swtqK3@Gi@o64sQg@h1G;e#xn4zf7z zl>bbEX8YE34JwM{_Or>L-4V8A9tA!ZRKYuE*yjz^vdwd*ulxlYAaT&iOXZ8HxISu_ zo&8k6UIKqf2oN^kqZU`!d%6?37=z0aoP&aXO+QQi$fmI2bmyP!e{3WCa>s9evHmB9QlM-_@(E9W8c+(u%kXE0HXD!cCqFlo z72&gFG4dCN5AxS?!h)QB_ZU#W`b!;ySP_Y*cid|UE%|2v(M zsF#J<{bYh#cWcdXQjkpS+sbqbZO> zQ>cfr37VZkV&xoD#@Q4lws`_!%6LOL15;RDr4vk1sM2WB2HkDyPoe0KqYUa7?)nAy z>WwRTO>e*4h$m`>8NynVOe^s!WS)a28%)%@`*KZqij6dXnWw@a>{AVe>~smC4xH-ze`5L3`3!(69^3jL)(P5=HGtJ4DxJNz8M^3C>@(1c@Ab7N)B2wU+&E| zScXLN_@%~@HT98!UR?`kK8Ze9G9g-r*bJiOIl!SghC*CSSBl~O+yu?0*uBNCL&Fq4 zLGT_o&rs{Cxfj~=ZG>|4_!6_j3~lc5Ds*%&FqHWE{QyQTG!!F=mp7in4c#ZSmU(e~ zgu%SH?#{gYUSu$=p!B^d9%(4+`9Tr77K3KiQ&6z2#ZaE4k@c({WoR>NqBh@*lnI3h5!ObXos!vSN zY^r^e!{w7~O45-sCxTXki5jg$xx?orhGLCJ81&>ITgcq~o?0? zezs=bPhDs*A36DIXtr31jpu2dP2n&F>UOU;w8XyY*^fFC}H#aC(sQ+wl#mS-Do4Q$}gKp`=$iVmVP0h zv&g2AGjCKZv)NGkApKksLD?2Vi3q47LLM$LR2zTuk;;Q|sSOY+=PsfezsIevF`w-WVtM<{Dh95Tg?_WjavS4uE$2$ELWM8lu56lP~VRR1h;Ic zf}0eN7=!FKL*a&NAU)fI2E6w(VMQp^{6X>q%5aU^#{JZSaE%)NKn$H!DTD`AQ`y{6 z-S57ze0OH^*t7-|FWgzEdud)81iOQ3EI6W|GiXRm4y>5fyMA^LPVdkI) zadv)k(GzmLpHFJ&Meb!ISV1rHz{Q3_UxF-(vHXysB!n7}#W*>fpjjvVr~wm3lELN~ zKK#mXr>P?2@J6Z#`IUxJdTb?%B92{Us50K?kIWLM+wZagHIHa!d!@8(Tl!n?_-YMF zgIYa;&q)NcWc3pc>aQ^^DyQhMRs6BJxIR$r(ccIe;SWUhmrFzX>vr+(R3UBa+EEI- zGe@-ROe04$ZZ}klgkq1O@M*81xO}~#&91NbW77?WW=b5{8x1W=17~)1aN>WHp_zhU zwVMrPHS+3B;ub^q2&LV625$`-IPW;qZ%fc@(EOKp1mO0d9)gHW5ahXra-e`>avZat z7u3_QB#VJ}7>Y9_!?(ug8`^xfmx0K>z|iI{;nnrRpqHC<$#S!Pr=fiC14;cD`yxZ> wNPgjjy)QNtd%q=F>BZi=45gM^@*Bq8HbSWJPr6CKO9DzzeZ{>^bmZj!19D>8>i_@% diff --git a/outfitting.py b/outfitting.py index 6844e7b2..81a25ab1 100644 --- a/outfitting.py +++ b/outfitting.py @@ -187,7 +187,8 @@ rating_map = { '5': 'A', } -# Ratings are messed up for Corrosion Resistant Cargo Rack +# Ratings are weird for the following + corrosion_rating_map = { '1': 'E', '2': 'F', @@ -198,6 +199,10 @@ planet_rating_map = { '2': 'G', } +fighter_rating_map = { + '1': 'D', +} + misc_internal_map = { ('detailedsurfacescanner', 'tiny') : ('Detailed Surface Scanner', 'C'), ('dockingcomputer', 'standard') : ('Standard Docking Computer', 'E'), @@ -224,7 +229,7 @@ internal_map = { 'cargorack' : 'Cargo Rack', 'collection' : 'Collector Limpet Controller', 'corrosionproofcargorack' : 'Corrosion Resistant Cargo Rack', - 'fighterbay' : 'Fighter Bay', + 'fighterbay' : 'Fighter Hangar', 'fsdinterdictor' : 'Frame Shift Drive Interdictor', 'fuelscoop' : 'Fuel Scoop', 'fueltransfer' : 'Fuel Transfer Limpet Controller', @@ -351,7 +356,7 @@ def lookup(module, ship_map, entitled=False): elif name[1] in internal_map: # e.g. Int_CargoRack_Size8_Class1 new['category'] = 'internal' if name[1] == 'passengercabin': - new['name'] = cabin_map[name[1]] + new['name'] = cabin_map[name[3][5:]] else: new['name'] = internal_map[len(name)>4 and (name[1],name[4]) or name[1]] else: @@ -360,6 +365,7 @@ def lookup(module, ship_map, entitled=False): if not name[2].startswith('size') or not name[3].startswith('class'): raise AssertionError('%s: Unknown class/rating "%s/%s"' % (module['id'], name[2], name[3])) new['class'] = str(name[2][4:]) new['rating'] = (name[1]=='buggybay' and planet_rating_map or + name[1]=='fighterbay' and fighter_rating_map or name[1]=='corrosionproofcargorack' and corrosion_rating_map or rating_map)[name[3][5:]]