From 68b9bfe9078f00872c054a185a5ee7e707b443dd Mon Sep 17 00:00:00 2001 From: Anuken Date: Sat, 22 Feb 2020 19:30:39 -0500 Subject: [PATCH] Cleanup --- core/assets/planets/TODO.dat | Bin 17487 -> 17469 bytes core/src/mindustry/graphics/Pal.java | 2 -- 2 files changed, 2 deletions(-) diff --git a/core/assets/planets/TODO.dat b/core/assets/planets/TODO.dat index 1c56a7398dcc1168106983ed885dd053002f0895..1e45afd783d7fcb5da00d1cdb50c8bd69c54fbe5 100644 GIT binary patch delta 4690 zcmZWsYjjlA89nFDBr}uDBqS3unV8As!9ZY$VTfS}B!L9#GU5YJfwbuN7L#;7?f36-ee~Xl%l-+Lr5C0r$u2Kad zHAN}cmuj|Imjkjs3q@%p%UmZa+_Fs%!+GZcvdqw9#OQ!2Jl zO)?of3ExBb<78|h{5qBn7q>p)KdtUl%2-3p9Mx*7ma%G}#2OEWe5yvN^kiV-zQ(F9 z_>sT6$W|>c8LRy5be~1$CTca3El;X#$AfeDmzh)J75VF>#r~gg zJQN*wtEr~9vE+G=Rgbdjc2-?Wwo*A!;O*EI<28a45rA_!T91v=P8{s3zp?aPIp+xI z0*QA%*(U>oa zx`k}g8g>o5s7yKGTH*4~yCep_S?j3r;- zR2v~|cL8r4QT68Utq|4|S$m#UAIoFzNuE7G+V(KZt#ZX(A8t^SP3t~n>HQaT9fvBj z7V6`e?g26^ly#mB(VgHA_EGc980+BE7*4j;RJ@P1H?ua4RrBb4y3{3%@;ppGld-Du zWq(3vv>ASqs-f;a33X=z6~86sBjPt$42;s+&_iWkVrD|>SCCK4L4mPO&Lu{|mqFoP zj+SiK)7AnSnn1dfT|{`?u9wOl`y!c;5B&;Nt`_36DcMP}RjjfaxRuQm%Fv{nJZ|9Q zqQs}k<4L_TQk+P|lMF-7PboPGVmd~(%CV#unqGlWWHLtWFN3}0_dyc-Au4Qc2VgZ#WIE1j?o%^$sFif%a3Gxg?^KPn_Ix5d8xMBMICyg} zBUdY<;@P9#qMtT0{!+%Kh9Vvy6Yj!1iAvi&$QQJ z%IItU3TV-KP-Jg^G|ex;w5>W{4y09v3o-rpxd6D@z;3Ukn+4EN$H;z^jEyqH9}b>C z2H}m^V;S@5cs=sa53y=-#|pnq>(q|c^r6Q1b;vomkJtvT_aLA3ei=j78`x=50xNGfod?C)@W1v^{FE~_LxaGjZ-sp_4`ZInpXGen*y=2PNVQK4KO42%ih2BiKC zm~~c{3v+_%D`FZ_VNiE!d|{t^UdA0iB8VS;h?YIG^Nd{ zm{!fn16X0Obvs°U9S%u>7b$nxo3l9#o?yA<~0{lGhYShd^aSXRW``sQD(v&&{3 z{g){98Ld6V*lKCErrYL?huVNz*e$pX9R7ZAk<1MlTf>IGXDH9I?Lx-XlT2@ryB&Pe zl0Dz^EY~8ysn^7w6RG8PGA>{f>RE_f-NM*L(pz3PCkfCEj)oIIH;Q@eo4vZ5;mUCi z@!9zJ*{ZSejI~tz3mx{7O*uYYD?4*aJZ}LXvjr|}edS6{sdh_g?j3rwJelirY^3u- zc{z7{crX;*OW@08-GTm2cb|Y?J;^?-Bd9{kd-*+^fOpj}hh&-6E1=6|Wv}P8O9qDu z9L>zQS{8=FWA@^S3@GrVP9^7gu8v`1*RlKJZr#V@*eE-Wy68;k*!y$CRItAuay}H$ zQzfBydpL*(+g%54+W~UFOTL3hOD(2?^}4I>IMw@%)?4IAUaq$%q5Ej#Hil3ov3=|H zMQP|;so#^meW&OvlHG5Fe>+AHGo2gCI!hm76b-VpUsYL8Zt$cpp_a4=P;*Y^9&*!# z&WDT+Q|2fr)SGm)gOc}3Qg~@(0;+~)VKsIfYHb@htw#1*ONKaB?PAqE@^W}W_%o!^ za~5)n{e&I=lPzthinYV7The$L+5chh7C209!m8si`8Ud`{xADCW8T`vv@UYe9b}s= zd-8q5`gEHLdrcUOsd(;0?#>y|kNF&~V{+)%dh^%O>10W{dTrEFdY%|q8d6P?=o!iVv+OpW-82XyO^SAx*1Tt9@#7}jg6p(|bN zs^`dkkL-xlhgSfTIS8z-G2E#sbP-SdNA$jc`09>P19SD17ZG1v6{+v$QDE(=GYsee zLz%#`n^|`459eYmlJsnairz&2#a$V$HeC&3w*BO-!j@1r=!dr>r?@+~M>f(`6{>U` ziI>UZYfc9{F-O-vvTdVSbLHx zud}w3waeK-_tz2c!#N|-vxE0B%{0|HaF`k3>o-a!>o%A5L$@7shIn-JPDGl(PhYza z4cHDr%;u%_d9+ePnzw1?5XpWmJBIqBH^Q_x0EXlSJmL1|8BiOmtdG!b;8E76sC6N$ z7F{we^dQ=Ha9Fl1;{QP8VXADWO1rd{%nUxpSYINhFBH|kiL{=XDdH*pI`Rp|?M=k0 zI|IAW*~Sy+23EaE&U38#6PdS3q-&x?MR^2Q8%O`{`0%?>Gb1U0R0fYJnjauWFCC`+v3iG;?(g`OiVLGvHw2iE~ z7I_H?FI|6O+v5PckO!-nxsyS$D>pe%QID zFTQBKXTgP&Z=`WStc%J-9d5twAhh#Ng^s5H@Lr4orB8TGtE J#R@tp`XBL0d({8{ delta 4751 zcmZ8ld303O8NYXCl39{Tm`t{bB$I70$pFb9;}DXN07^l$EENbLtO0~Th!N0GEJ0;U z)r9b&$Wjok=2S&#BWQ~#2$-U@sL;~VQVtwk(1HshiO`^o za{gD<8oVCB>L4^_%F`NVR;awx0Ia@R!--4yV^pA`7XIDOI+BeIoVe%PQNI zU?v>xkE!WKwz1TCi`-_iCQ_k{++y*#lREZBc`Qbcj0QMbPWG7twUL-NDZG^?gH@XxbDW4cF`|!m1DjU~ymUG#pybL7v^_ou3RjRw{sr=@~ktEt&Q)+j1eF!M}uXGlZbNVhQ06g*W0ayYKj z-->mB=^->g0TyX<5(EcQbUp4EFro?E&7EMtn%NcyfDs zZ=eTm26CLG@nk-ZSDWPDo>%n&X-i14A46bk4|ydaWn?QY7GPTHj&6J03Hh7Wp`Y=; zN5J^sLCbQKam=&fd4^iRP`8W6yUJh7DV$`XU$XzRn4^T4{j%HZZ*oA*c7keyp|4wr zk73c@Q}d6^RYz7;w_Gt`mz+Qi!IQ|?GZ~%L>`QZ%97N0Ef8;o`9$d%a@6M|8y*jlzSQYAxh68{ubi%q;HZh zv=c!cJK&e!_x~rL;Z2apdJ*B0J&>?%C3zX6 z45dW2WTdw1ki3&RBAAP{5pxf?&h;?1jbN-tz*T=I_XC&*!PsyT%g6P;~@zWg1@i$By;VXDTM1eic}4 zzOh!2v54ubBrSb-umP^##aszrQ1v{OJ|*T9@y&F&T^>&#<2SeHRw(PVt`x@7P#1`q zA^%Gc*%x-{hcn8{T8Y{~7T5 zAb&YU$8E%HCVs87`F%~zQ1*xBM%$q0(D3_ znvw7=igSF#m=TCs5<${+5YQot?W4eRC{E2)lApQWyA}TtJr6at zj@vkSJiQ{*Lkg9mV*~`_OU6L?nv(2z5m9^`(1}JqM>M=D)R-?ePwJaVQIJ%G$YIn=jaFOYCyjvgQ$hgaqouGjgZi_+aosJDo?z7j0* z2d|)#tgld;s|6XYcj1ko2eGFPs-GdgP8Jt+HeKc#=lN}$gI?J3k;B4wgu1_5FV-3z z$?w($-bMm1knu65X<1I6TKeo{Z(pXH`M&=d^@jbRA$vj-gY&@5xD{yUSY)=jsbco; zU*s&L%CwI1emQ#DKD6CcO~b`_1!{90o@XQXv3XUbjUui5hl4j79d~bqi++|V`8ro+ zT^+}Xl`n7KvMLY{`HCIrr>lmmZ3|P;O1miBD0Tfm^&i6gorkH$TeyM7>M_l8Wl=a3 zn1nuCXCb)uG3E;5ClfiEY6Iona7OR)C{$EB7Gq0`X3&*@YV)%6URQPa{415jTR#u- z){}e*NC%g>?Kp!j=YryeQ@u-rWhkj<8If;MKZhOr2a(Unf=Ec8m8T;) z#VtRK%kbpL`>jB8QdVMQ345r)?;PC*Ph%QL_q2Q;IUOlL;c4TrEmBtiAGZ)mov~yc zp>rvdnjb9($bCr?ir;N&L-QlOpx~bgRunIzmLBAqSJF=6cT>Uq6rK8$yoPi3IOMgP zx4y+}`~_$zbCvL|tFqbIOzQce(J^kIS4Vna#l&62tOFQ=pJ_(H_&)!T z0!JvYUbdC^A_EcH+Xo8931kGZ?O=m`Nv?Ssv@?$ReQRD1r^y#3GXmRDw*4Liw`LN* zi^!vN*-00X`%7p0&9=TyOkX&vZ;3Sb%zXK-^it>o#_f&A)7UK3;%MVZW!@UiWB&qK zuTlB8;vdwWH3;|^#mwWVpTd*!1~E&F@0U*oEeY&`cKkz7wO=NRH#^PSf^i~aF|^9c z@<3!R^xW;-3m;I`gWjmm!BWTB#mAW95msq_j)mn+dBA&~tOxkid;>o!zKUP;j@TiZ zT*^jWhn(?sha+qxL@gE&x>n?Gj*@2PEM4VE!Oy`h<4W!9h@X?@5_ qfr2GWm)TtkIGzrY)htg8o#0*vyn!)X)Dv=TXvBSpBQalq;r|2q_={Ko diff --git a/core/src/mindustry/graphics/Pal.java b/core/src/mindustry/graphics/Pal.java index 4eaaa1fbfc..982b77c80b 100644 --- a/core/src/mindustry/graphics/Pal.java +++ b/core/src/mindustry/graphics/Pal.java @@ -24,8 +24,6 @@ public class Pal{ lightFlame = Color.valueOf("ffdd55"), darkFlame = Color.valueOf("db401c"), - power2 = Color.valueOf("ff9f6c"), - lightPyraFlame = Color.valueOf("ffb855"), darkPyraFlame = Color.valueOf("db661c"),