From 9a5625ce0846456fd792edffaa383923f433ca65 Mon Sep 17 00:00:00 2001 From: sin_sin Date: Thu, 25 Feb 2021 13:18:54 +0800 Subject: [PATCH] Update eLoS score view related: * Update eLoS setting enums * Setting toggled among Cn1 to Cn4 * Cn2 added, Total Sum removed (Sum can be found in another tip) * Default value changed to new Cn1 * Note:old default value point to Cn2 now * Update eLoS icons * Add map id to Fleet Manager fleets name on viewing history * Fix equip page default sorter for heavy bomber type * Update TL pointer --- files/icons/los33.xcf | Bin 3231 -> 3908 bytes src/assets/img/stats/los0.png | Bin 0 -> 608 bytes src/assets/img/stats/los1.png | Bin 608 -> 730 bytes src/assets/img/stats/los2.png | Bin 1459 -> 739 bytes src/assets/img/stats/los3.png | Bin 739 -> 739 bytes src/assets/img/stats/los4.png | Bin 741 -> 737 bytes src/assets/img/stats/ls_f33.png | Bin 0 -> 1459 bytes src/assets/img/stats_p2/los0.png | Bin 0 -> 1675 bytes src/assets/img/stats_p2/los1.png | Bin 1675 -> 1577 bytes src/assets/img/stats_p2/los2.png | Bin 1577 -> 1649 bytes src/data/lang | 2 +- src/data/settings.json | 4 ++-- src/library/managers/ConfigManager.js | 2 +- src/library/objects/Fleet.js | 4 ++-- .../devtools/themes/moonlight/moonlight.js | 1 - .../devtools/themes/natsuiro/natsuiro.js | 3 +-- src/pages/strategy/tabs/fleet/fleet.js | 14 +++++++++++--- src/pages/strategy/tabs/gears/gears.js | 2 ++ 18 files changed, 20 insertions(+), 12 deletions(-) create mode 100644 src/assets/img/stats/los0.png create mode 100644 src/assets/img/stats/ls_f33.png create mode 100644 src/assets/img/stats_p2/los0.png diff --git a/files/icons/los33.xcf b/files/icons/los33.xcf index 3c92570c6ad7bb018205395388ab89a6c58747d7..04d6cd750d4596bd65c5c567b57661d725ec53ae 100644 GIT binary patch delta 618 zcmbO)c|>l49i!Stduv9$=?o0aFBllu>KPa~J~A+HdoeKZWilWDJCMl*#Ed}9WHfmR z;}lLQAd>|oG})9%o6%@6)>-Y2*JddcY*k>V93wF^q-00-+!RF zK!OECFryPJ|3QXvvRRtlfJu$}8>%?S4jxckg8)=NkJRQu&L2!>{2~xxm^d)D U82B|%#rQ2i{CY;0|3D0;0ewGf7ytkO delta 351 zcmX>iH(zps9i!?-duv9)$qWq4w-^}Md>9xwmNGDKADP_GD8XsW00c}xJb5Bp=444G z<;fmQ8jQx93z-xcBicZcK)?>fTtLhMG-4J=00^LB%&R~gS1{yfVEWI*@b5nZBZy!D z5ljq>|JfLR|7T!;iZTM#a7?aaTc*X*3epJ#d_c?r#6Z(oW`YEO04m0^62zITz>&3i z2m2#NHMZX%J`e~&F;EXXKUf4V#xB440H*K#KbXvT@=?VZ Ym>C#&no-4gfC0$BP|xV{ABe#;0PWs0R{#J2 diff --git a/src/assets/img/stats/los0.png b/src/assets/img/stats/los0.png new file mode 100644 index 0000000000000000000000000000000000000000..d7c474a333747a9f21d4cda5681fc9f274609d34 GIT binary patch literal 608 zcmV-m0-ybfP)_s2NV^dPEx7DXaAVzxBI-BjH>e*#um~c! zYJEWwGO4<$5Svz-_-Hb%HIqyxz2ib7HI0#~XLaxS-}~cm&xQXasov=8V8HrHcf}=y z5Bw6v?!A0mTw}2rNU1IQJJHHjF8Ktpu!4yAaKbX|QBaF6x{w%+huJ8U`S4p%N06bS z!+0Xfy&Ex}q>DINhvAB#<8XlaYrQ;Mw)wPL=3=OYb=xJo19Yg3%jGIZ$J)3%6(@Il ziP)<$6N--(;StJJ8OoMOPY;mExx9W`;_Ut~39HP@?I3y6p=UV2gF6SY0P-%Xv&D(1 z%=1=1FPtro=Ur5Qn=#f;26(vX&{LmC4hMKYZ*%_E3T*&ge%68t$%4a(<#0NvV0QUg z1Gt`{eZgit9Au?oYn>qmg~x?`Ej&6C;a%zr?Ta?2JdlnAc{&&&KU<)0#br#9x&PV5 zYzPAAS2?y?WVGGKmJ9_1rSF*u2n99opd1MDIBoH!QENN?QM{G7RY9#(2mtu~l+-Bs zr5wweru9maG_n1>=XtZHY0mlTL78C{WaZUJM3_56~c!iN?gh;$Rfw*v-VniNt7( z)y+G(&_M?~8EG^orp82uYkVcdC_e5|6TAfj)!GM2Z|QAIuYZGLDo|kXO#gg2=lg%> zoG%CdQ`nXR?M-xMva}S62pr(FVYF=KTQo^@Eh1^@(b3F-e2KG;GHo7-a;*c?V~0%= zUZcptvWX_t%f3p;o*l_N2e=ZvUf zE>~oB1<}q1&VS`gbPY5Rx*-z}=(K&v`)gjbBYy%XNkl_s2 zNV^dPEx7DXaAVzxBI-BjH>e*#um~c!YJEWwGO4<$5Svz-_-Hb%HIqyxz2ib7HI0#~ zXLaxS-}~cm&xQXasov=8V8HrHcf}=y5Bw6v?!A0mTw}2rNPnp<`a99eRWA7iv9N-O z_;A89>`_pQF1nByjfdGNl=<*mP)CrVqQiJ1%Do#go}`O7S%=|@pyP0W`D?vATekVM zTIOP?g>~B{y90EnjmzaKN5|T@I~6B)dx_YqG82lA7U2=fRT;{bNKX%t$+^6KTjK2g zFbS*7%k3a}(|@67IKYED2eAP1E~>M|iKxu;RzEMCEsp11RDhc?)=vg_xarVSpGXb| zct3A*{?-a@09}68f(prk!-(Z@I;dcF`B?+Fo}qogW;`5ZrD1EGAqIuVg?%kNIuqet z>I?0QHm5w0js$r+7$HAfpl`)xOp&?&*~V-L0_aycwtre=wB5&+39_ZSkg2Ydii?yp_0BL9J8>0Qmis)F}C-9Lt)f^-7X7vHiT~d9$Wz&iU#=nRPNi zrnWCtVZ;78ZUrWRsYa=GCBrbT=(;}r&maI@*Qe`Y^51}j5HrAtVHnYxx8t$@Bu zk|fP|od diff --git a/src/assets/img/stats/los2.png b/src/assets/img/stats/los2.png index 7ba072540ebdb46116858c449efdb84efba6632e..77aac27d2933ebf52e34359fa397c4ce040ee7a5 100644 GIT binary patch delta 726 zcmV;{0xA8o3*!Zl8Gi-<0036bj#mHx00v@9M??Vs0RI60puMM)00009a7bBm000XU z000XU0RWnu7ytkQgGod|R5;76luKw6Q51&1WI}3kO&@8Ssx&&4N-aKGrFJDKg0veK zqAf1F6Wq8eh$2RJ&dN=*(1lrv4T>NU!7fI8K@qKw*+i(5R)5-P%%j>&nn~J>3tO6| z54-Tdfy;mH`OkmPIb8TpW~&5R8feR8X(|*EIKXMcXxhq;Xp-ngMAFiswUI;ldCogZ z_&pM(Y6qsr4qGI=Mv=oM8$GgzU+FyG*ClFj(`A_Sb=2_Sik}zb2IjO$ccDbX9v7pR zcJXQ=M`9|^Ie$^bOs>fEDx%$WT*%MU-djiLmP|aLdWww%a5Ytr29;_>yJWB^h{yygN2YV5qOb@IksV1KHJ7vQR&nS(B# z%$hV;DzbZAd>hSi=Gr8606r&4x5WFj$?=TIF}K8+&woi0;Bt)mk2(50ZYI~9TBD$| zWN~&|6;DrA^Yz1T>Z3W1T43Aj=4EF!spn~0CX4h+b{_rAF}CjbTfOX?GU%yyuwaKY zCFcHW##NH=rc9(AZk~;2&^EP4axHSEfVWV<1>kft=dB^7$C>!&R%Wx=BauiXsj8|~ zj;pF_MSmg@E1S*UtVprSd{HYaCu>b%7 literal 1459 zcmb_bZA=?w9PfgfWdY+}WZAxW+>*H^ws%)vdr~H}Wt7ocOA|3MaYuW=g<*Wp0Ww)6ia10Wa)caB7H(u{2@%3btTYSQB2n@YD@zy)Ndd|w^C`0&Ug~zk z5M`3XZ^vs;4XYpvs0=$tX4|y}qrK25Gr>nvpkyl!1ZYwqAS->s%;Q!$ysnFbbLbj@ zp>>E*D2Ja0m7~!?3Wg)0cu9iTh+!C%D3f6ENwL!S*B~j1#UrQ;!B8=Z;TVcbQD|eq zz#C`E!}ZGa4PU^L!v%uC;s{byR3s^il`vdBg2`ku1eGFEsTd%{yv-~SRgxPl`If#D1cb0S&F7d;!Bk3dMTWphFtMNSQ;I zhu2ve4X!rx0%10iYNZ?oIueR9;i<}`1S|=SMHO*U3{xefD$&HW1QjM#%2cU|Xj+)7 zWQ-P?Gz(#_=@~a}OKxZ&Xcl-@k{or4G^KM44Xr1RQ(MP^ZK=1xHEkV>bW1J*fHelRmNJvsi_#|>4b#SZ(a zx(nw^&seJ*_Su=K$+2OJ#p3Djb=|&MSz;gQ?{nR{8JL>5f6rU#I6Xc(JTd0E>*_jJ zezvBn%okr)vNw}!Su&(wb!H3W$!h8mGy3eBF0to=kTQoOZQ@A$MoC> z!FF=ZI$+6dif)@f*m0*SGtL>A+%^^nMrsavUVl!vf7eIpcVk`&Y>TR6&$WnK_c|=2 zOZ}M%s|Bu%pLV|>d#tOdc=^ib$68}XQ+|s+E)wJF@h@)N@qna6YL!;mk#@Z7Z-O6o A-~a#s diff --git a/src/assets/img/stats/los3.png b/src/assets/img/stats/los3.png index 8498032613ec76129ac30359c3e1d64a5c80c81b..b6f67e5d8c83970a9b506308363178a76033a8c8 100644 GIT binary patch delta 653 zcmV;80&@N11>*&fVt<>ev^teaEk0VMb|ol+v>O+qEiSVY+_)-;B1U)4%1yJ-g;|LW ziXaieE=GJo5v`BeRH&0y+Gxz9+Dw{B+KdZZI>xqk;ei8}|K9VT|8RaT{HJhK0<8_S zXLB?aO9))xc3?DZ=G%CR@%4zLQ@k)#Z+@t_5#;Jdwr{CvgYSpbZ3cAV`r?*t`_;@v+-~FV1JkMbZ9J{?d z@2V#KG(+oDi9X56gYS99)?9y^pFPtCz4a~@osgl-{C{uFc*+v~w28FM%ae&L+J<~2 z*CJ<&_=`n60B$$){uU=8zQ6hiF)0000*&fVtO+q1()3w+_)-;B1U)4N;g^P!mPv& ziXaieE=GJo5v`BeRH&0y+G?6K)n?L6(q>%PXiS^hg%=K7{=@mte;yq8PtQ>fv^3C` zO4FFjBXEJ+f!Vm3Z(|9@)+3UNpVj~evP%rO3N-s93e_$wpMMiJN%+k?2MZ2*WFOz> zvV5&b)ZnGdwCL-o;oik&o{gJW(-z&i0u8%7jGW)Wi-`>JsVrwi74w-q)2oPf)^Rqw zM0;-?k?S%uA%o@*S^6axRRtR{vqabQBICE)h|T2r_-T<7TYYq-vb-)OaxPdjb$fVt zWjiT=WFEh@%zwTbCogN=yt06M&3n9VR+ar~`*_Dq@d)Vo-A!W;z_e}8GlQ;_f{Eu?K;o{Xo^H?&7` zEpjS{KbOM;;C8dAzWyA!75qxWtA0000Oew0 diff --git a/src/assets/img/stats/los4.png b/src/assets/img/stats/los4.png index 72c66e50e5498ad3a0ab441e5040e37fd5419d5a..68c399aca13f0badd2bae23c8b1ab25e2ef40026 100644 GIT binary patch delta 674 zcmV;T0$u&(1>psdOMih$L_t(I%dM14XcJKshQDM&YI02j`mV-Xo$IsaU->QO|y!03*16_68yAD2(p$7>+T~&F z!VX?c=1F}ma7NTHmoG8B3beCwDA zl=%2*ffHMObbn^9GPmEu zqj{6o%88sl4`0UeoVqea13dJm4k`a4|{a`#b|aFH>u#)-33@ zY))^f;qmcWKEL}#V{)~yV&C8RCEZTLDCsJYwL#0JC`#o|I~I%Cx~|_U zGgls*sZ{Eis;cQ_mkBu8 zH!egAF1stZaa9mSjP9J3ZnDsYS&1DKK_Y@(jQD~gS|78iP$#Xl)jXPNGifGiGcIgP zXie?H1NUDWuH$@uk@ns?qBj+0!Y0k1^7PAYs!9%GW|6Mx1;+2T z5uYjY`O5;QwtxHS$mDrjF65fGY3la!_}We~0O=wDdx--zE?(Dqcw;ZIKV2jMaHW~K zgI=D@+cd4M$mRF)Z6wE;tCQ3Lggm5tGVf2JX|Io$ozd-@hF*Nw4(j30rpK<^whgq za=|Pm7XH+Xw76;9$xyjN!5eZmFu8(lpJfP>EBqU#hCE zOKO_tn5KEBjJ$T?N+c2|bX`xakc1Gc-^|DM8)ZKfrnd1pj{pDw M07*qoM6N<$f*H^ws%)vdr~H}Wt7ocOA|3MaYuW=g<*Wp0Ww)6ia10Wa)caB7H(u{2@%3btTYSQB2n@YD@zy)Ndd|w^C`0&Ug~zk z5M`3XZ^vs;4XYpvs0=$tX4|y}qrK25Gr>nvpkyl!1ZYwqAS->s%;Q!$ysnFbbLbj@ zp>>E*D2Ja0m7~!?3Wg)0cu9iTh+!C%D3f6ENwL!S*B~j1#UrQ;!B8=Z;TVcbQD|eq zz#C`E!}ZGa4PU^L!v%uC;s{byR3s^il`vdBg2`ku1eGFEsTd%{yv-~SRgxPl`If#D1cb0S&F7d;!Bk3dMTWphFtMNSQ;I zhu2ve4X!rx0%10iYNZ?oIueR9;i<}`1S|=SMHO*U3{xefD$&HW1QjM#%2cU|Xj+)7 zWQ-P?Gz(#_=@~a}OKxZ&Xcl-@k{or4G^KM44Xr1RQ(MP^ZK=1xHEkV>bW1J*fHelRmNJvsi_#|>4b#SZ(a zx(nw^&seJ*_Su=K$+2OJ#p3Djb=|&MSz;gQ?{nR{8JL>5f6rU#I6Xc(JTd0E>*_jJ zezvBn%okr)vNw}!Su&(wb!H3W$!h8mGy3eBF0to=kTQoOZQ@A$MoC> z!FF=ZI$+6dif)@f*m0*SGtL>A+%^^nMrsavUVl!vf7eIpcVk`&Y>TR6&$WnK_c|=2 zOZ}M%s|Bu%pLV|>d#tOdc=^ib$68}XQ+|s+E)wJF@h@)N@qna6YL!;mk#@Z7Z-O6o A-~a#s literal 0 HcmV?d00001 diff --git a/src/assets/img/stats_p2/los0.png b/src/assets/img/stats_p2/los0.png new file mode 100644 index 0000000000000000000000000000000000000000..d1db495e924ce845096efdaded98ffeec8b2a6f1 GIT binary patch literal 1675 zcmV;626Xv}P)004R= z004l4008;_004mL004C`008P>0026e000+nl3&F}00009a7bBm000XT000XT0n*)m z`~Uy|7<5HgbW?9;ba!ELWdLwtX>N2bZe?^JG%hhNGWsLU@c;k??MXyIR9HvFm1|HF zR}{yuopDB|pKNVEw4GM{P!R$M7|8C1kPwoP5CRlLKmiqv531l>u?3&?Q59>e9bZ_f z4#g_I3L=6P&<@opID;Sslvh#f0}X;8uhVk_i3=>W9jM)z-(<3Ta{s@*_uLzzS9uYg zRwKm3uwehA(}M$Y4LYy29_~_4juB6gyGzDsyxd2KT^xw*q>qWh-IaKHNC_)(CQkM? z#L2;iOcvP?w<(T9uaOhA%$)$hfS3jJ-bxZ^(Dr3}cE(w#t|*0{PNl-mEgK>BQzOir zKJ8k7L6e9Ap(wzhzy~NWV#oq&l{@j*YxwNUyL16-=+)8v(fJbU@07vSoJ=@+=v&y7 z5C_r5nWX`~+V4>Sb6V7)}{XU}t`ICf4B9_M)4PR*Dyy1k(;B4W=gc&P1qbBFSaITtCDD~#T^+D>V?6k1JZolz z1Qtew1?PuO_0M1b*@}i7Y~skUsVPFi7D!}hP)hpg6R>5&=Pkxr;iixvzdQ_&Q!8aL z7}OQ$r+ez{<&mXT$>*WuM6r{IxVqRAS7-ZitClT#(B5Q%d)1Y2`{oUxZ(MP!2+GTD znR~$)6@E`Gmx+afEs*(95p+S#9ZsjWs;n3?&!xfM-8*1;%)(CGcGm-ZG`l<)w=nT! z5rYB@3QU=7ZzGOd8G9F?3*uKV2TtNrpi?WZSWzkVs@3vwC?FVYfy|p7-UwZ7uNthK z`t)o&9Q<)z6%^!V!?C3OuzUMv*tcgF?EiWf1o(RY5)(bQidH48Spn{>cr*qRD=Gy+ z0rKwz_%xe(wq5_Lt+4^lpZo#7SijaR+#@g!=_i2YgYq{s0PrWSZ$WMjJb!c_uIF8b zm<4lk{q^2y$CC~~ZFvbaKfKpVz$)=i1$y^DBUIxS%Q|-&_F)gKTDlm*LxQrW1saO# z%1hx)>M?M2aj4R3l%=W3NpS7*MR@t_u~|UIPWccK3>gd(fx95%>`B9?t;)D zziWOv^=6eP}J zpdc>?7B8F&3+6;N`*a3*9n_9xFNs(V2E&fyqAUUg1qccd z6d)*I4oBXc9UhufjOTn^Wf`=Yo`C7WALhMYUR-GAepLlFYBM~ny9+7Fhw$uInvY!( z!xagI@)=Y>E_I{4i~Uj4`t%Xj;ki#6lvnY{ub>Eiu{~;o(k-sgE~qi@7po# z9iD`Vkc2nrv%d5a;DrxKfZ`yPy72@6m*pfs*n(A{PdJ4xL9KNOtWz%l{v*=AV#^X( zz^M-GBe9MDoMINxsXT=k>95noMMZ{H8)t``jI(A83_hO`^2r&!w-?tp07F;vCFsoX zpZ6;MFAy<|&;KUi#Io;UGd5YmaY+vMt?Bh;xWVbqd+{D3p(#go~iHf&&Z(5{YE=U|8z<{qS`oc=PoEk}^{Fv!nnYOcF3UM*S$5g` zvMdl6VHNPYsHC9aB`olQmrTX6v{4C@bO=d$7Ex8(EjP+!G9$Nonn=*kJyi6gzrgx zyvL~(K4XNQF2r%l2Sn!MMf`llg!T3y?#>Rx-Nk{p2^@%Msw>f}r9>t1ApkHW76H9R zPC^V?do~y4AA_d)8u;;t9N4;X9VC2Yf|=8&oewss(@`K21sD`~2L;BAT0o`rAwhbz zEn7=ZpTrt^^ndjK>3ss%f3Jme#RafG<10u@O@=tr%$nc;?Kdc}6a}JDAQ}atQ9$~_ z0&*#9E3l=cFdu8W0Uo#Y)A^|Xv(3?Zy$Py+Er*g*c~E%b2%N>gC1(m@&zI?d0$-!R zn^?vhPI*Q^DHRVbKFKlxT*I(qhYmtsZVsO8hR@fp2D~;y!g?89T?8Umhe;x} zj4i6Ks)QwrOt-O!H=IHR+)*F}1thr0I20Ib&?yPB`fNcSJbv^5sw;kh-0ZBLO>0v+ z=FgpJHh+c(7fV=S`m!Z)4Sjt*uxVWi_^bV{&4>u8h&G0oMTP~Ht@&hGYcV!)j4>>m zFW3r+i44uoJ8}p%uKl#bG%Ly+5gJ&E;mInwBp!qMLIQR7H45KCtx_6`l9Pq*0^;TA zOuRgtC$30bbgTQ38E!N+z?DlEf&Sw9%au@9dw&Kn7lmUDnK8ktV{yV z+p}D!lARqyDch-1NhhKJZ?F{-J3Fck`nvvZux{!zFm|~3-IhiuFDZfpnY&^8=Jl{^ z$A321{lzv24$%A@A2+X&R;7Nt418GOYZy!hQOXDkkQWoMrQJL*cF!JNZLM(P@OQ9b z%_@uVfWSoL838OGmJ#j%z@PYh%S(#k;hmdsq4W&IFPK{rq}Svg%-jRbb=A;*`^HlO zgA&gx@N^HfK@*Nx;qfD|3wvP2(!~%J5r0}VEyPgSQda{*tk z_g5+}!u{5JP*rgOE|s5ym5K2k32`R8RlSg$lmOmB*LMRA{J+?V<6H$Cr=-}QBY*x{ zxkrFjo~n{bWO6b0hEm3jMFAq0uq41=;T0OF+ZPoXdaD`lKzV5~EM7Pd7R-%l_t(g9 z)|X$Wjk-B46*LM-Itq-p4{&1H4FZ+}D~{gY@7tcI0t5vJ3J??^C}0UkUY{KmSzLwt zd`m+ubeZpg`PLtnS+A?AuyC`n9)BCP9d5T=h3u>h-23H&+pZHM)(cp++BTfx%(9b5 z6p)HVl((@zu65qOgLSy?(*~teL7UV9Zp(Cgrp=2@Tvl`v^ji7${&0r154PeY5=|La zU?80G7EVaRL+oB3QkagEp$<5Z?VD>$gmlX95>;)1#H4cC4WG1WLY=s z|Ia007fzv%pn32S4BmPk@Qp}c#nwk)&xis#r5_)!2IN ze0Wr^QE;}4TNzfs_QSu${{sID{3inV;)xY7T%r@hCD{rH7$yz(h4{YpWe!Sg8)hD!vLLf)&sX)hRfGAO)0HQR@Q@f*`Nc za|4MBEVLb{-I?EHvU_s>zrFX|8=_Zv5uH{e#Kf>*|D)4`1AlT2I_wCZJ8 zAs9{>Okihzb|%)~)%K#Bj#jfk4ThaPaU9aqQt@Fse7SiY;BODfSl2K|2a%hj&3HGB zg3YcdE`lYCj1RF$Fq}dKoKPSh1!OqL7!(*~(5VQr?n-7lyl8p`C5692T1s-q)(!D3 z^XJSog?|MHh0x`rB%u2q2xrdlZd#w z*b`T0`*Ew5Eqc)2WP*Fum2ms!4WMsaajOW*%YSZ}d%+kLeorlziG_kKkoi#&bV1D> zPN%o3tQa!SrNQ3aJ79Ut!cN?F*8_YsyF3`TF!5v&g8~c+OqpzNBaT}cdl#S!;#V&R zPU2FaQ!B1mQ7QJS)$(yDAQ)_c%$ptF2wiQj8myiA^lUpE{Bd0s6y#>Zv84U5d;4bC zw|{3B?EiWf1o(RY5)(bQidH48Spn{>cr*qRD=Gy+0rKwz_%xe(wq5_Lt+4^lpZo#7 zSijaR+#@g!=_i2YgYq{s0PrWSZ$WMjJb!c_uIF8bm<4lk{q^2y$CC~~ZFvbaKfKpV zz$)=i1$y^DBUIxS%Q|-&_F)gKTDlm*Lw|y@rv(~{>dH&uOzJUkb#bWDYm}v_$w_eS z@+K!-GHYJPoTK)I@~O{3agjJw8TamajH5YZh0(7#Eu{N8D71ytyF3|7*+uvt$)(l zSF21=D`X0#lzU61;6|YUQOa22>*M7bd&v?}U@RTfj%6>2SPllmj^m;%0t5vJ3J??^C}0jp-kcpCnp2GDd|hQ3 zw3(iO>A@f7y95noMMZ{H8)t``jI(A83_hO`^2r&!w-?tp07F;vCFsoXpZ6;MFAy<|&;KUi#Io;U zGd5YmaY+vMt?Bh;xWVbqL`LYhk}cX%SfF1Mr%03*3j)Il5lH8EW6agB#yJA^@4*81$(J<0{`s?!j9o$XuaSd zLj~WsUMQ50orH^^wSof-2NH>7^k7)(`u*^ABY5-m0pu?z8nRs&QV#En00000NkvXX Hu0mjfm5%9p diff --git a/src/assets/img/stats_p2/los2.png b/src/assets/img/stats_p2/los2.png index 261105129cd7dabce9a996633a9cd4cb11ee81a5..3adbd72a6ed02ba2c81c2cb711606def933afe8b 100644 GIT binary patch delta 1613 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 { // According tests, visible LoS bonus from equipment should be added to ship part, // except these pieces for now: SG Radar (Initial Model) - // Untested yet: Swordfish Mk.III Kai (Seaplane Model / Skilled) // https://wikiwiki.jp/kancolle/%E3%83%AB%E3%83%BC%E3%83%88%E5%88%86%E5%B2%90#equipment_bonus const losOnShipBonus = ship.equipmentTotalStats("saku", true, true, true, null, null, null, [315]) || 0; // sum ship's naked LoS diff --git a/src/pages/devtools/themes/moonlight/moonlight.js b/src/pages/devtools/themes/moonlight/moonlight.js index ad4541eeec..a6142a20ec 100644 --- a/src/pages/devtools/themes/moonlight/moonlight.js +++ b/src/pages/devtools/themes/moonlight/moonlight.js @@ -2285,7 +2285,6 @@ $(".summary-eqlos .summary_textf332").text( "x2: {1}".format(f33Cn) ); $(".summary-eqlos .summary_textf333").text( "x3: {2}".format(f33Cn) ); $(".summary-eqlos .summary_textf334").text( "x4: {3}".format(f33Cn) ); - // No reference values for combined fleet yet, only show computed values } else if(selectedFleet === 5){ const mainFleet = PlayerManager.fleets[0], escortFleet = PlayerManager.fleets[1], diff --git a/src/pages/devtools/themes/natsuiro/natsuiro.js b/src/pages/devtools/themes/natsuiro/natsuiro.js index ac5a42d361..923c837124 100644 --- a/src/pages/devtools/themes/natsuiro/natsuiro.js +++ b/src/pages/devtools/themes/natsuiro/natsuiro.js @@ -2144,7 +2144,7 @@ .attr("title", KC3Meta.term("PanelFleetAATip")) .lazyInitTooltip(); $(".summary-speed .summary_text").text(FleetSummary.speed); - if(ConfigManager.elosFormula > 1){ + if(ConfigManager.elosFormula > 0){ // F33 different factors for Phase 1: 6-2(F,H)/6-3(H):x3, 3-5(G)/6-1(E,F):x4 if(selectedFleet < 5){ const f33Cn = Array.numbers(1, 4) @@ -2153,7 +2153,6 @@ "x1={0}\nx2={1}\nx3={2}\nx4={3}" .format(f33Cn) ).lazyInitTooltip(); - // No reference values for combined fleet yet, only show computed values } else if(selectedFleet === 5){ const mainFleet = PlayerManager.fleets[0], escortFleet = PlayerManager.fleets[1], diff --git a/src/pages/strategy/tabs/fleet/fleet.js b/src/pages/strategy/tabs/fleet/fleet.js index 87289ecbc6..5390f94cba 100644 --- a/src/pages/strategy/tabs/fleet/fleet.js +++ b/src/pages/strategy/tabs/fleet/fleet.js @@ -10,6 +10,7 @@ viewType: "", currentFleetsObj: null, suggestedName: "", + sortiedMap: "", /* "fleets" object format: @@ -285,6 +286,7 @@ $("#fleet_description").text("Current Fleets"); this.currentFleetsObj = this.getCurrentFleetsObj(); this.suggestedName = "Fleets (" + new Date().format("yyyy-mm-dd HH:MM:ss") + ")"; + this.sortiedMap = ""; }, showSavedFleets: function(name) { @@ -306,6 +308,7 @@ $("#fleet_description").text("Saved Fleets '" + name + "'"); this.currentFleetsObj = fleetsObj; this.suggestedName = name; + this.sortiedMap = ""; }, showFleetFromSortieId: function(sortieId) { @@ -329,9 +332,14 @@ }); self.currentFleetsObj = fleetsObj; - self.suggestedName = "Sortie #" + sortieId; + self.sortiedMap = [sortieData.world, sortieData.mapnum].join(""); + self.suggestedName = "Sortie #{0} {1}{2}-{3}".format( + sortieId, KC3Meta.isEventWorld(sortieData.world) ? "E" : "W", sortieData.world, sortieData.mapnum + ); self.showAllKCFleets( kcFleets ); - $("#fleet_description").text("Sortie #" + sortieId + " Fleets"); + $("#fleet_description").text("{0}{1} Fleets".format( + self.suggestedName, sortieData.combined ? " Combined" : "" + )); }); }, @@ -391,7 +399,7 @@ )); $(".detail_los .detail_icon img", fleetBox).attr("src", "/assets/img/stats/los"+ConfigManager.elosFormula+".png" ); $(".detail_los .detail_value", fleetBox).text( Math.qckInt("floor", kcFleet.eLoS(), 1) ); - if(ConfigManager.elosFormula > 1) { + if(ConfigManager.elosFormula > 0) { const f33CnHq4 = Array.numbers(1, 5).map(cn => Math.qckInt("floor", kcFleet.eLos4(cn), 1).toLocaleString(undefined, KC3Meta.formatDecimalOptions(1, false) )); diff --git a/src/pages/strategy/tabs/gears/gears.js b/src/pages/strategy/tabs/gears/gears.js index 93fe8c8d88..8a6aac5850 100644 --- a/src/pages/strategy/tabs/gears/gears.js +++ b/src/pages/strategy/tabs/gears/gears.js @@ -102,6 +102,8 @@ "t46": "tp", // ASW land base bomber "t47": "as", + // land base heavy bomber + "t49": "dv", // all types "tall": "type", },