From 17b24c3389c7c705f92281e8cc57bb4722b19175 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 8 Feb 2019 21:29:32 -0500 Subject: [PATCH] Bugfixes (again) --- core/assets/maps/frozenForest.mmap | Bin 203073 -> 203286 bytes core/src/io/anuke/mindustry/core/Control.java | 12 ++++++++++++ core/src/io/anuke/mindustry/core/World.java | 2 +- .../io/anuke/mindustry/game/GlobalData.java | 1 - tools/src/io/anuke/mindustry/Generators.java | 1 - 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/core/assets/maps/frozenForest.mmap b/core/assets/maps/frozenForest.mmap index 273ddcea84aa0ecbc1aee5d3c311a69c6d6c8975..590c82cccf6d3e0241679933da72a2bacefbc385 100644 GIT binary patch literal 203286 zcmZQzU|?WoV986&O=aLoE6T4*&2!5yN-Zv7U`s45$;dBaU|`@*Ni9w;$}A|!%+F(B zU^oQQl9*YT##6v$H2_MmQGH|A(rWTYZmZTOja51n#7~BlZC5c50JPfSGCHZ-&47?2N$weR~#SDB5 zEXf&(MGX85T*ZlbDY_610t_r59)lnQXGVTbK17!g14m|Zs%~*!emR3M0}GfIVPMWo zPGt~fU`x))OiL?f5My91%1_QNW)KIfhOi|VI6y8iOzrS2rawH!(dmg+ZNx7g^YdK?7C5m_ZX&z?4CYfg>|L zFA?NN25koRjQkQXQ-^^wH!(dIBCgB8mtK@u01m){qSWGI20aGu+|rzqOkD_9pMk$P zGbb}SKTo$fH#G+oeg+II*_kn`9%yy3_JxHiN&e9 z<*A8fsYMLN47`asIr)`v6HFNRl8Y+y({f5PQ*tvaQi~W&8Mu=`X6Zt>W(<4Fdm@}|Jt+!y{EKV&*EJ`fNFJiD{;7SI$whYX(Vh~Qs%+F0MDM>9ta*s6wS3zk` zS!z*cRcaA~4Fh*(UUFt$D#Qd^2Cjnq^3)>Tvi!^x20I2G2(LK5v?w{1!JdITvm`ZF z7s_>D-~@BQY8@GPb21A{GgDx)P7GYd$wi3;y5)&EISkGW0tlXNPGV7dDuW9HKayBR zX?iMyD}ykSPhG4EA6UMB+kC_GI8K$%IA) z*m^GpVH5$VI&TIZP^kinF|aZp1|eiVRFy9S7c>SzKJjA^K=7a{{2924ON-J|Ax;Wl z5J2#tDgqf;Qa}khh=B`4Lq&rb_;OS8QgjQ7^0QKtK~WgOAe>*8T9i_hS(b_<9Lm6- zmS2>NEELATRh*HZoUNM+%J|_79Lf24WvP|?13+$ovGB}JJ@r69+~Gw^~Oo0gMb zuA81%lFE?4z@3{|T&xRrei1_=1AlI6az2jARCtA^YT+t8FCl|ASoWigGN#=12-f(OF%h;A&-GQ37n@Y8S)u; zp-iaK0tS)f{M@9{Vo)&arl-QPRUw05Ne0B52*Dx-!IILVq|CfjB$dSsVkwzvX{kl2 zc_o>NIY=@k47^1p=|}>l4BW-}If+HO1&Mj7ISgeCf=FDbgUT8BVF|h@H4&V`Dj4`O za|;raOLSo(l?(z%(Uek@nUlj%#lT;Xms*;eSdy6xiq4!IhH3`xoW$bPA}F^8R!BiK z)H3jZ%D>!1sB|3zKe!ImO|2*?g4kToz?+|$gAn-Nz`&IZs*8#<5{pv)H!|>pd1?8j zc`1pY5d7c7zylV_D^1QxEiL}v%)nZfSejGvzlDJ_IX@3vZx#J-W#A~y%gIknNiF){ z#=w=6Selodp<9rc^1q#dIi)oJe+L6gMq*~p|4s&$^2D;#|6L4hIf;46sYU<08JH7` zlK=NGuossn7UiZE{qJR9El$iS%m3fUz*dx5P>_@Qzn_6UxiUE?KQHzF1O}G0(&E(r z6B*cx3sRFyicSy<416hx>FKFOa8)y*r5s#f7K1=q zeo+ai=7NjOX5cAGElA8P(k;l(%q#gnhe0?orywIyHzl#CL>CnA;ETrS0Bp`e27!{I%#_r;5`@?y2LAM% zL{NbSSGJfz02J}ik{jG8_`igKA6YChFXjJI1`#A7coXXXG6o4GaabDyV$5;|8C-Ip zM#}#c416H@oYce=U5JjA47>;tkhQBAgx~@QOII_9!9`K6T*DxRT?TC7T8M?o`H4AD z3)ev`gouDFTo17jEP$|Z1H?kGD5`}UAr@lFfGykvF%4b^KzzBGK@j9fgeb`3Ef6c< zf(XmELaczxpgLe1gB+@1;H(G@P_QGmL#@lmF9KDs5I5|AL_4fV0=13*?_>}K8wFK} zaKSDHNn{CB2kd5$#VHB4e-9)zL0S_K+xJ2u0xAUZ{yqj_kSP!mgw6XI#1X=%_8wr6 z#vui^^&pBBpceiKh7%&<3=9mT#Aq0dri0OJFj^FhmV~1v;b=)XS`vJNjO>(j+TU@CE;jEI9d{pmV~1v;b=)XS`vJ zNjO>(j+TU@CE;jEI9d{pmV~1v;b=)XS`vln@FgJ(bp6pe`Z07nm)K!~BUhG}{p^%nMm43t0+`IiV5 zIQf7Hq?9uny4XXPZs7uoMsR$9V+Kqt1&M)K2m-7GiJ+VNMlBk+1OiG2;5Y}TgV8KL zcxq>oas_HMg5wgL#SsKp42=LsJQ6{Ym7|L3lWV1^GJ*k5AmHf6pU<(TlA#^lsNM&M z0d8UtdllplMD!qXH#QbR9himg-$CrlQKykzw15%_IHtjI4ko~v9l=85f+fH@AjFUj zd$`ZR{s4Om8v&L@A_k{_L7qXl9$W6lCWg>~8qhqQ=v|WcSb%G-lL?EIYoTtGA zSPa1ebHM~8MPM^;u#17b3UNK01@;j(0_<}z0hUG6Hu$mu+(+25Gk!6!2f+loFTsWm z_E;TtAD%iM9D}F?IHnOP8_WeqJc0%0LWrRgx>$S(_5#>j2mO&tOG$nJP0xmoi*q@J;EJ?Esnrqh;RXOQ3+yV8mt3h%8+1z z-3%fS9z?LfIhhCop#zfm2c6GB9)vgz!~#1PEj#1nf)#@agaMSZ23-gZD+hrhnesTo zX3CHaCXi>qshEiDjHU#k4a@=)kkB2Rp#kzL*nMD^Vk5wr9h(GL8`X)y8B9alRq#j# z$CfaNi$;JYh$e=1Xdqk<3J7q@M$5z`alr0e4*1@ap>jUxzfCMJSF=m4{ZWC(%04{DW>!oNmO@=C~ng%p_ zKp}~qnm`T`Mi8hqz5#9o^5Lp+@0uyNY94v+)hGCG96u+QQ1BU^68UmRzn$Kyls0L?1Tv(g8MQm=gF`QDaM7U@=f=jOOzJ&*zn( zEZzwsW>PJmgW?w{@l%HjN-uP7(!m{$$kS*nBwrHiKDePsdWjVy){X&C2l4`XB|=yX zJq!lG;X~F+Q0RigkMv+CRtMPlK|s(Wj^M$G+rPv*g9xKYQbMe~v{MInF0m;GO&xle z($1yB&tyu&9xW;cl#8AY;C@4wphq-PVmVH|SR`^A}g?SdU1x=1d-ZyTx(Y6m-#Gf*u;lECji(q&OCBEm;V zZb8+HEhNLt6=YDuMePNrKwx0L>1Z#-phNap@M=NZtq8iqwc!pIuuH*iCV~Jfh7&}%58YlgJK#nUP=}^%luPH#jvhTY|k}c2!zQbu^`SM!g4evxSRno4Rszin*tj5vqwB?{Zd42- zv%`Z9TlAoZDOfSCK*VMMLJY|$Tm}%xM`UUPyBSU(90Xy348@ku!Lmqhh8uw7NQ4+( z7T73~2qb$!?nAPYidkWPU0LI|+EaPuHyATH^KB6J{3fv~`K(3k+Z8Dblpg>VoR zSx9zJ;v={taj!N6E1|@W;infIBp?D?gpwOGxXc6FL9U?`hdszuNS32=!A>KIKr@OY zz1S2ZnMbi#DK-EUIM^IXi5SF#RB;+2i=%BJfYnT6(D z+HoQ7Bi2VWRtE|u>Ub66Es%K-79|dcn}U|b5nM!O2eTkng0)d%?=a8{4g(N@7OPYW zAuJ|iwTLDm39=l?AH;IOZo#4$&EZt!A~_Ol`M?t(?-TGKk%ti=`3+7DtGIl^_TtXHepT zA*&ZxtWq;v;C6rw#g=@)64XrIs8)iFN5nap1r|dh@W&t)^RW4YOfe*9fGxuB78=Wf zT>v5oc!rUF$&HC$26E&4-x~jzyw4cu~vfgLUh1c2-j1>LNk=K0uSyMicCR- z0o*)Fe1yMX`tD~k1z|I(o1Ssgh0fC4aFbgaOA*kamxJ6(? z!FFIHNK50`oQ7%tDm;iGT1iE=(qp%TJj0fw*>LZY1k|e-JK?rP?lOzVR9AXrR1@7rx+Ag;DEpuZ(s=|f@1H(Z37#M%}THsX*DduRj9^;;~bH((O6(v zurtsJgn2};P^|>J9-ScEkwtd_s-Xy3u$vJCIAh}^5bD4zgegd&i_0P;#ULf&507{9<5jL=a#{f(e`%8>a+V8<-%%B5X?Vdx2P4 zh{+^{E)j}RBLHFtSd0k0!(Iv6Vk2<4fCy|+M)jZrS%feYo0VWOq-uxQ_&_xooU+j} zHX0YK1VJEN1z{0kFRGPbZD7|EOMrC{K_DE7Gdts#Ko~%TZ8((>>n&{RAchhVrlU$Q zcA8N!NI)qTcl3Z{sT5HNqu?yu_LAg5xOrfgB2qS5?#9LiD+X&rB8asd)n2dx*nEUd z46GPJ;Is{HJlK(70)L*yCJWXEu?TJ+RxX+|P!(hI0cz?HiV(r?1jjpITAk?)ljej;N*=hW21?I)qx4HHVA>=HZ)mO%dz6noV?KpwA_u23)TTP074LJIow`|HV_w^j}T%Ib;KHvPzN#@ ztQYK3Fo837gJr=4SOg9&UI8%+$X4xyJok%q7wi@jh| z(0qj8f@O&|9I8d zpojuT1sZ`AGax1CNfaywBESg_T*ZJ{5N&97Ah;kMU?pg_A-G^!blVUHpt0cQLA1fS zV7DL$wA_v0B9uT3KrHRG_hN#|%gtIGKU7IG6x)Av*B;5~LTb z4$U?&7c2oGh%^PF7;Y#U7wjr9fymtm7FYsF2YxHD$)ef|_5vD#+jz8@5NyVyiJ{tt zWHOornl_TSaHG)t0p=oEiDoEXZ3Oh988ynKQS}arBXCrp5k$l)IEy0)hz|S_1+opS z4$U?M7c7fj=%X15HwB^?jSE%`7XxQ!1VPPw4z>tPz->eL1I$8lA6VUBCvf?L7|-C< zON;@7J#dD$`#{kHjs-LVYZ3)1Mo1vCIG6>IAR;v2rl47g#)X&%R*Wzd%*93^lz>@S zlpr!Y8Vh0(SR0uH+%_~XfVq?#Po}F#*G7at;7YKT#c)}$&(R1-K){t?HGp(CkLn<* z1pp6r0+9k&hlnk3?nV$03H-qhHwDc$oLq>ZaBWz*L|TcKyTM!}^YEL3CX3dqgu4%$ zKOlCX88Aq=*t!q6JOl9uTo!9Kh09_K2(TEEDT5>oMuszR#SBt>z?GnhA+k7_g_Ln{ z1|8feaGVoMpxKMg#c3Nt0&Xu@FOo|U5(velv*4y+^AXreths`8i|C;PmuDdUfXm|c z5nKuG&;To;hi69ZfY$cl5C;)xk%AtpASGyG;Oqj<;$Q;Ig($%mx^M%~EFzW*F&SS$#}4NV3P-)0J{Z5 z;Pec{;REkd{4M}_0qjz2{s2oL5!5jXzbPYJ79JmnU|!tDUN4;uk-5XBbJ!~ndmhd3Opge1$sIzR;O&;ZGzHx@~foUUPNLv^4rZYdNI?hIK}2YP)FHwi!6L&bgl!;0!3H4AqnHIY4?RV|EdmDw zI49#L!0NyRR`U>EK(KJ;8Mx(OqbT+u5e9%QLMIR|C6)zuI5sOOHy-Q^xE%=d2-pVJ zHcBuc0*n|Iu>l5(4+0SYQi7hr@EZ@(fz42CVqni;lRy&#tHbIHkZoXDaQ>xwKF8)& zxRqdg(Oing1uMZ%py?oji*6n^N8%I%xgMt-5R-B0B}oEg5yU(Yi!N4@LSR0%m;8M6c zBr6Gv;WQLYf+Rx`iqT9#a1lzdmZ$i`1*a_BzX*%4u^^V?G-Xr*c`YoNp#h2t++h!r zB|754ia`W6^AKW?SOuwru)q$7a}ny$SV)S&I?xEX0pRQmCcxD@m<1*v27uL}=_P^- z)&?igoQB3lvIwq&+JT5>CBbsuvvbAiYTHuyMiaNFq>8!R9oC7`o*oS%jt-ZZE=kny{$p zW;8D#xOhE-OdAvyv;rXUofnTL=-VqtR?+!Qnez+3`)v6%-J zgBuDl04zol22P?rJoM0tz0xcRLF$k8$ZwgoztPVs_WD3|QN(hh(5DrIk3mO-p zj>b6!&0dPRNDc@4my!U(uNQ1QoWSXDh=cGOH7ZL~#zqS!c-Vu37%c+8Vn_slXaR6Cn$C0odng&OqaWmC!JEBb*Cz6`JJ~b0Mw=nM^k?fUU&oaIh?d zK=^!=MNY=X7HZ&_1`*gI021sVS=@;MEDI;lOo14H&0cI`xJ&^X3NZ?<1h<2*nM{Nj z!ekH&Y$Z+t;uazdrH&H94#MeDoDvW(fJ~-(NaFM~*ftO`s9c59xx-2V6zt$Q#}@Wr z2_yoW&*27u)uEXJ7K0Gj^kNeOnTKWyf(tPUq=cHO6KozTfv^&d1#tm3htp0BU<((x$p{A_ zSV)F~)nPMWRE+G7J19&MfsJ4x1v}2r1?dH=Luf;=z!Id@et69Tn+!1&tPZEEh>!pq z04KmEVFXX<}}j9APz@087X>DCBS(aL4frlxL_7o42dAtzaWcn zx*o|qkUAvy5o`RYI_yOOC^)eNJ5q?_3_6frusYlZ;M9v#0%RyQ^AKWSDMasVhy$qjLkUT}O6Fo5(30GW)?8JmPNE<>OZUfM)B!UY!8O=~^T!aeUF0%RyS*W%CJ2wAXV1c77`!chDykdkv zsu-KMz+w>NN%0ZbrHJf|lLc0XARrcjT}6a#U?pJ1AOh@C1VM&TVDm-^Xm-XK5Lf~m z9PGq|I7ly89asl80xXL};B*Fl3AjZFqp;bA5JRW~vk($!EU+w67Q*igge(>ZL5u=P zfO7!&&@cQ1SRI%^=tXBCtVFOtcA%-l>MgK3gf{#vkYcb~5X5LcC+=2a`~f>iWI^!@ zPBf$?68b@j1u^VB>KT2rIEELCBJk&%s^*xd6!&5Eq>vbzEwdwJ!8#xWPM2bn0NF;lo3WWZDu%sg2ZcB| zqHqU0TF~Lufz1@K7}yRZ0?km;x#T$m>=rOV6SshK09sDQ&jss1atqj7#D)e~F^B;B z2#r88loa#84niZ)GCM++3_HMXp`x3?=8Y2Ab2lPfKp_r}Ewoeu=7J?41Xu@N#b6!y z35Zc(Q^4j?LV!(y6S(aK*@1TOGLkdE27r`6(jS>DkSXBAk3UbN$%1u&2_y%RuFd0n=$RYx6M$<9MC6tr#hY%>l!Ldak*g@*BDM1s% zX%s>oSP6u{?=)g%K~4jkhp+>Q1u}(h`5c@z(6Td5E?6YMGzn~6usQ^R zO$kB_p^l7{jV%V@UI3enum~xOgR~(e!0I3bNP;3~z%2)72%H%kApuqgCLk^V8$j3@ zf*>Ve0?D~xy&wYNHw23$;~|EEj6%|elM8YSLqR2Kc7P1UZwk5&ur^8vkd+8S@mmg-g(#-PN`zjJ<>0IfCJ=cV8w;!i zOi=6sa6tw(1?(d<0xSU`5H2N_1@aL@FPKHFHk|6frho`EM}oQ3vj=Y=#mc2DcY%GMa5@T(A-dL4?WpmB8%<=X0C{#5TBM^iacZ z2R2!_Q8e@$HhW1D1341SePAw9Xpm&ysA8g8>)>Dlg*_si!NCs6-5^;A3#0@rfl!Ce z0x8CwSV0DWb%0I5Mu24@1b(APl7-s~HW{0}XkuV>xcxz_<*4=|GCRb0R9VVx1G@@j zD4J)$TqG;O>IRe;5{?|u5Tc#sps+_I25{Pdh-x3O5B}2Z)Qt zf|v)AAjUkB?FAc;W+gT*SRIvI0QL+vf>_rRp$=|5ZqI;~AdJF!Wh6ogwOL>nfC!=; zNo^O5aPvT64@ub|7J*m*DM2VEBQL-Wz-AFxj3VQ4#wFZdgz;e8a1s!8IL#YO5+J`3 z@CQf<8L>r0UxHl#BG6n431^T5ghfRwM~y;m)gyu!#3B$2ASD#V2iyQOi_o|bJHU#m z9a~^SK?ItW*tig9P}>F6HV?07AYK3|8TfpTJBSC~ebkPWL1!K~h~WfUR3N1ixDtpM zCH{aLg=QNX7h(}uF(tNP(+f5fM4(xT#-*VPu(^tKF_0I)jzn`ff(w?#N|0_FnL6+~ z63J;~8b7KHx!T4V8t_;Ehd3gEfLUNMtOQQ;h?Rib3$_R+fn+(cCKIa;?gFqK1K|Q< zU5Zm3+zSxbgVaHWRKP5dEJOm81@fX)#gGWwtcLhnGaz|H^>NNxtXh4g%mWB|xKa6n)sK*p1n_u=ND*#YJv*+II=qdExX zX`CShiWG1JAPA(W0LhXT$!HdV4IoS)EXT$|auAyF6mvmN!)7Hy49RkkVv0h8D$WHv z2;n|77FZTcph=L#1si})5bJtyFo6hcRw5Znta+pA$j;q}pu-X$NKpZjB|2q;6;nW9 zOBM(*Bv&C^PbLfQNQCi3u&C(*(j88un~@v|*8vtI!h`sgfK5Rnuz3M)B~GIt24K@W zDn^Cuj4cpxMG7P;;Ibs;bHp+*1Pk3fu*nDqfw^!3X97V;5bYp@9S9aF79p%euppj6 zm`67jVTU6*4Xzj>hJ}mp5$P->L(#ksw+Ne|xV52~GRmcDj>i=#Nbvzyfz8`NsAAVDPSFl+zrm+U;-=#CcsJvWDU4c zV8!6Hfs+6$A;~?KJI;z-iHKdOUJ zCMF_;K+%XTwjhxLk|iePfYgCAF*r|SBfzp?f^?G+IN&{(7yiZC9*!eS^^J3#6vw+&%0u`GnWAQqa_(6|uyfz&}*#M&{cj{3Dd zJQmR62+SoWdf*0tvol&2M{vQi5c9w~NQz6a4mbgJ8d4Sq83hpoDM4c)SqYLQCQpOR z!>SH!0GvRx2*HI|iPIFE5+IWireI@1Oa`fguy7hh4+(@bK&(OUTzUk_ptJ*=Qy}S? zh={`J1(05Fssra_aK=Wkz+5l^76Yq;5ID`lDFL?#Yyh@&g%ATPK__sUOp*j)XCT>& zW-_)`6<7(#P=xETv5*V}DTZ*tdIyw%yM-7x52#B=qUGQ$4ki%!9Gr3p#1_u5f=4$v zJ0l2i76%hxF|ZvF0;f?pCE#{|4M1}#SPY%OX%xj0aJQg21Hnad3x3;3G77GkXyfr) zP90ges}SA?vydDKRze-yMoq!pst4z3Yy>2qgM$tf72xPWBS?!akST~f4Q7D}(o6w6 z2pa)19&8jvj>Kj%>0-Ft0(KhMkq`pE$skj}IOTF$?Twr0>=zmY=OC82?#+%aKep(=s<9Z(2HLQ+$gZC5CoD%_zj@8EXY9! zXP~i=Tm@1G31@^0z+xZ*O&gett{0?^fEdE$0bqgL2X;7uKzHr{xM~<%i7hAN7eh*a zSYittZ%9!#pg}k2+y`whgpB~p;v}%?0E?mPKmPOgBv@h#YrLUpqZ=2O`;d|p-Q0q(2$!p{1|3K-*trNCxDIL*IC`OpKFDOb~;k0z{xi8JLTdng$@$ zK&}G20PGet0xSU`2Eb`xD?#o6L3QzI?%ZI^-@t5 zWG|X$2G&7T^xJ?Ng)>hhB#6n~2!DWL3miRYQHJ1xWl1v>VLT-)kkb&(Kx08%1yV8) zP6K-jY&nQPa~gsRb|iv}jRjVMM1V~uf&kfzqz%CZ>qT&}vA{|wA>f8m(?^szXgKLb zBCzwscKf}MfpNFumkZRiAk z+t6g;mZO;hp71~;(3FsyUQn&X=}RQr(A+%A#XU;~judRU8!QHvrHFt>9)WnHT^td1 z0m5m6Dh-k1aI9W{8$d=3BJ_e-Xc>DcNDNG%NkGDn*ti6l0?~nmh42v?3rPpD7LBT7 z0B2`x1Q}@qXK5K6!jU@np~5QZXHAd``l;N^n7g+?Ih zMHo8DBBLsYL^n->4iu|s@rK5QL?gwPgDe6Yg=Rc9E?6BBL4@US#h=U-w8gf@uxQN2K>7?RIH=7G5oqd);c!^AqAj7Lf@Aa8-W zv<^CWY=NT;8$nStf{X_nfX!rt7+4890SW^G-iI5HNYrTA04#xIG7*NNDS_JoHU;5k z2n(bb98nMgq!=s#R*Xb|)DiFuHYFhQz+M0oXnw=b1?xZ~kQ@Xu87mi;Gr)?$enTU` z5@5eU!T@9d-B@6IhZun~aA@rhP@JPh9vT-Bmqfb-WGGl0no($6uo83vlvD^<1UDX$ zl(D6Iuq=}CM3{`G1a1+U!|`(|vJ&9}kmX=6fC+3KBti_V7mYx2AIJ^}7hx|N3$6s4 zr@?w55+H3jQ!$Mt2&5N~(*|A%{xG16`#^CCi7i|#aD)=$7LWm8#l)BgR}9uclJSVN zi!-$&ln`w^B1ND&4X0GMIddYg(O%9h(I_TjfF57O#;k?$RhlKbN?zr2^tGzIl`+57Jg5IWf6+O zEQnh`=ApCDti;KM>jnD_J;j1#(IiLWiHy(=)NbJKU2pE9PP=pxB6tDr{q)Y^Xl*SRJ5X*wwhUNt@7wilK0Tx3e z5VGjOM6wIO{y-4K`W&nS$r*4Tk>Mb?UWhM2UH~Ui2mz9XNPt*m7!NX!ByA9TLE5mf zNHU6UiU-!EX!Q&@qCf;9-ViMGL<0(ENHBqPfMpSi(O6(v2!YT>5({JpIPDUV(7{T; zipjMSWE+|n5L}3%ASGZHLIS}8OF#mLBwwN_hT8!)59}i_0rnt*K!|}^U;?ZIoj@}l zCs&4n0eOZ9?hJ?rLE4a#El3tDfn*y<3FY3$YYLJJ@T#M+Glrz`peO^!7C7F}2(Sba zfe2lYHZ;WuE>;}~y~MIWc7Tlnr(#4J$HoFH0TW;y5P}Gc;C6s@AiRKJfh8aW*gUun zgc2|dNeNgTB?R0Ku#bo!AeMu*QDQGbFW4v$0rndjfn*y<351K#JIX>XF$Ys{5n(Oi$lMK>AMC^W?gE{!ug zx~t%xfk>b_l3cfd3`O_|!GhQUl7+CSW80`HgCL)SBN-B_@c0Fbp%G|G$W39`;v8-- zx*cE%gbpwljX=mESRf^6uE)kjvJIgZ&cdbxEC$gAS4X9Q0J#}rGJ-{II}ql9>;QWP zjX-h%Lh&ezj@gvrzy?JvI2zHS7R&`pAPBG+8iA07uqbvAngMY4;Wi#k34)6-3M7W+ za5OH&c#t{>3!xW{1yX{h7r~`c?nbkc9$b*Oz&=NK2EhVLKnQxcWz-JpmmqlK7aY^z z_yx1D5nx#eF`&@{_Xor+s9bCgM~I>8Ai^IY;}Hg+v5?Fo!l*%_1mq*I!*P2CtYnZl zchngq76stQgA-_xjGqfm7D&W^hCSR1NDcyt(asCRm^`3CLXzd6umT4inzz7W5P~H0 zMirBo5osJ?@c0GCB~m1V>_wWo1gS%k1#!VTkO+{Dfo-_LU4`aSY+NLVgSC%lCr7=#!ASB+Xptzu>q8M=gW^1u@Qi4pxjrfD{jG z76-ckCsaAiq(RfWfAK2yC{2#gMF|*fwe#0CG6O zePHLJ5eQj|f{EG=A2knmPR1EgNO>9*@n|uP;3CC2NF9Vbpdk)-2EvipSP+-O6+^gG zbU55(Y?gz?sBR_2u7|rB;xrH!>{2uWA&WElj7p#^9;P^EsAm9D#s(RR&LtwwK}sM= z0Av9DVj5vDh=rCWv2h`e1Sv*h(ZtOlJFvL`AqH^)O)MwfP>^#W4uZ1~E=8~)N=P?; zR0kOqE_Lz|dUggy1y(Uo#3N!F%z{KWNCJrkGJrZxgP4M5JT5NSK|~NpE=3qcZ8sy# zgWG}MX-KX@=p6tS+__)}VRJKB0zwRc`$nxKt)Re~lR<%qTLP2>&>|iZ-5?1h7RVGx z4yA;JW+*Bb%^AdUksJv&j}rHhq!(-(h#kUedW>Q&0(PmJ=(66Ni?Bu`t|S0X7U%?-aRj#mY#vft1DS{9dXPFK zSzKJODOd@Rd02f(V+oK;5e_243t%M(9W-<^+-YDdaS{->fPx7rK0sU=I&GL3j}~A9 z#U&=9K#2h@2|ywqBmrTO87XiB(2R$0L53oQ3rI0U0?vY14&vfwflMLBmo!#~#gS;9 z!Nx`M7PZ|6cMvvv5n>P*fGkIf3M||~5X2x?4LWDw4>hptAaFC@!~jVGU?rpnF<2Xj zKqM)27RXR=KtKqPVk9f^b3u9sLHMCL1DBi8eGXEGCI<02nt5b$LB@m4L$d>o3swRq zAQ1qvjR@A@3wDsh2h>&ALTx}Dgl;+B6ah{GNCXkV2{#X{4J};}!3Ar>O%UONfmebW z1_;j(?R`qT0Jj{!Z3tJPr3h>(7MmEFwo&e2ol}Rz3_MwYBOWbnfW@#9XeklZ6tE67 zqrhCS1cCsIp%DmK2n)@kA;u*#TyTd0ntySwo<+3?%{(+NBw)ch(2PgrV$0oVVvsb1 zs%=zkpmRLhA%NiM0Y^8SKuZx|E>g09t3wk5t0RISRvVH!up@^yL0+g49R{eza6jlQm; zuWg_(fcO&50{ff@0-}w+&c$ULBL5Q08qMd_&F7%xgEP@Uk_t!(goP^_X&5OW%W=97 zEHPkCqg!Zz!T{n+5DV;S2mx{dQpQ1*h3Eh&p<(n;YCMwbK}LbOgV?!4(rKV%0Zt5% zL<8a?SYQbx0u&1a;Y*OKz|KH84JT_L+((me!L}>_TR?y;2WJfk0aAhp9B`;X2#~sA z6F8%uA?g$gP-1|@K8S@#7HBMl5(o<|bg`vGG$mBzf?NuA2AU(WaffqyM)xl$h#^@V z%mM`yni6oRArT;T!#RXT{l>t66x~=-1R{Z;sT(Xo2XZsmX$Y6%X3;o3V_P>&Z7bpa zCEC*<9oT{dYydhzZRd`fM^rUSk6;3&18{U>OAH7xuo4JC4_A?72iyx__aWSjpEX#D zDq_6~_a%OBA!LaS4X`>Sf>;NQsv9(!7;jWS8h4=NgGd`_ETq^6sT=fJ1MEl;f#wgK zTyzhD^wLHQZ&VNnSh%Zj`U4?>&GiUboGf&0lsI=(?|>8lq@)r=I)Fs{5Q{SMyo&HN zm<9GZm_;lB)d=$Q5Q{vJ&ku<@e=&2u*>twG`g z&H~2~u>_i4bnY;SLGr={YxsdegUo!6)jYV<(1IPOVr&vr*n@BaEpSNZLIRO`=8@zA zB+Ds|1yZ~)tP=>uAxW$Opb#f1x`|Ls%@jebKL)WnP!J;p2`OB(z^0BVXoh0r;vMQWf&&a3bZ7)v0-Ye%_)&G_OoG581uZJTT%@QNIiU;oIZgr+BqJv@$ennArz=Q+ zVdIVlA~_kB^iV?$d$g2|9zCQRKV)@)!UZif(72Gm8L}Rvo5MjN2?;9%i*A;WS_Cad z;9-xJiosl@=ox7NhBsVBdf<$-#4xn|3s1`6>3!I1>tIP&x&tPHnM!O4ha`{_#tseQyrmHHyT3p4k36t#ht~$N=9P_IcC5?f{hprCgflm4UIt)8t}vl z$>;FyCYU=~N5N`wY$+BVbdX@eresuX&?NK`9u@G!3eMPQ1SA22m5lIU8uk8YhGoE4 z=nshm0?x@ei6P;IQAdtu#G#)N>EQ)z`J5j1j@mJrLq~Jy=s@?7Z!L`$WTOSyXhAkw zkc}2(qb1>JNjO>(j+TU@CE;jEI9d{pmV~1v;b=)XS`vT##6v$H2_MmQGH|A(rWTYZmZTOja51n#7~BlZC5c50JPfSGCHZ-&47?2N$weR~#SDB5 zEXf&(MGX85T*ZlbDY_610t_r59)lnQXGVTbK17!g14m|Zs%~*!emR3M0}GfIVPMWo zPGt~fU`;PdEG}jcV_-|p$xKTtW)Np!Ey_>ME@qGbYlE;Q88}l)^HL!kDF&8;%)C?v zX$JoCjLec$-IAizRNa)+#1sY@1}=mUgDeAYaY24js%~;lX)(xSatyr1C5f4NsVTY; zqvR0+5VtBY2%@OaElN#cP(%oVRe=SS7(`H2R;K3UtT@Xff~XxS_mZcUkXfyC8=H%p8!cEX& z;7cy5%umZH%}mM7tVk_l&}HCG0-2=?;p#E)6;u`_mVkm5BBIa02DRRRfwMTZAh9U1 zB)^EkkU=;pGe0-6q$ITn$puCXTm_{$WvNA(RjEY`#tht!3?}0$EM}vm+Ph{mZUO- zFmUH478mP+onOQd%D|tSnw*iCmzkWHqgzm#Tfh*;z+IGIl2}v;;f8}EAhjqLCLO`R zo}8bTQkq%95Xrz>P?}Q=b|Y9I3Z7P=u8C&gh9;hp#Jp^V7zTbQ7w*wm20nyG!G^>! z@WTBG7Kn$X-MsviRE7iw0Z7^f@t~2E$iSWi&JL9fNesMDCR8q&K_odpH>tE36t24I zsjwW8!XQ|Z0r3|?FqJ{Dq_ik0GcOfMWf}u-QAs+IKsp0=aehu>k#0d^UTO|Q27@3H z7iw)L13xUC7NsVF6HXQbUs`E#W`3S7OeC8@04elSiZXL@7;+f+3-VG+a}!H4lR>eR zlf#h9z@3v=oLU6s=E2Ghh=zOy9#D~#n+TOIVBiPW3c9HkB}EXM3mJIxGjosxiWs<( zK?PnJxIigp;7SIS*Tor$MJWs=4E$hTT7GF>N+KxK7)lvMRx)tqB$nnSXXq9rrZ7}7FsGE}GgLFMWF%(h zFw`)xlqZ&@GSo7#_@Qzlni8xiUE?KQHxvGXqOnX>scR76$g>g4E=aqSXJb3>=`sG9|w}?|&NuUvWWZ zQD%v58aMzd|F<*n7i1*nmE`Bbg*q7c%8L>+OETahoeaF`8Tq9-aDgrcfuhv1)V#zz zgh|~Dd?|_P>8V9@7 zRY1#baIN}(CIdgRSYlqv|5*$oNJ8-T$N$+35=i2(N*H3y90nO&a-drN|6B$>kbF*R zVu~(A$2vd><*Oi8z-3S! zu$n;*)i7{Ag$5|t5o@5QAQ1r-0(pNkgD}VxhzP>wEezraVN`p!GDzc)0@=!Ng5iXS z1Oo%ZC@~raqv>EY8;lkOqb1>JNjO>(j+TU@CE;jEI9d{pmV~1v;b=)XS`vJNjO>(j+TU@CE;jEI9d{pmV~1v;b=)XS`vJNjO>(j+TU@CE;jEI9d{pmV~1v;b=)naY+c;q$@%!L9uP428jPK_ckpzEO(?E`fm30XWXV>0mUA51!hYq+Ed-jo`QhXK@4p z7DFSz5syTWWaX%0`s7+^s*GU369_oE@#k}_sbpwJH>&r+VSt+$#9jsY0}(xl+>MQe zPzPqA`*#rga@1*L7cHO!0*+~LoP!B)W=F8lxL^se4hS)1!yfK)us^`w!bX5)k%+f8XMuf$jR5-`On_z4v<<#&0QV8L?2KOw>_ISr?n|(tgFRM9-G`@+2ge{P0gh=z z$_8`65szSjxe#LLgf13eg1rFt7J>l#987@4z$`EU=7I^ZHV853ybtmv*pXlYf5t|W z1?xZ%5D$XPLuU;-Pmgd1VT&WM7$RK2TvURXmH%q>K$#4AurFAb|ri3c?!f zL4t58oQ2gNa9P~mLQ?|b;!j*)S%`Tc#SqqD53s@MK1BF|Sm1yqlYqnm$P@@`aQc@L zSAqNnPU8pyoQa7b5IVrDAsIp-??W7plSM@6qUt3gt)W{7Hj?*2_G0DYbU1zqRP%`N5mw7lO+iwE-||se zTF;;3j8JeKfn~ugiV3h$WD>Y7$Dcs(4+DM=;R{DCkJi!6Rufn|}L zhQ$DEvS4jw64=axh~f1IWSRr+K4LA0m<-njF$G}}n1zrd>MGEQXChQ-_<2(|!0Q;I2oQjLjKX#Xu$_CT$T0AhAG7uqHj65?CCBWFA}=tAjwY zXc7>;IBf$;bozjOe~iOlfg=eH4mWU2nRt}AVaa`bFeIuo8bl^IT9g;mjyP8Bm&7^ko%CVq#_s9 z%_O;xOvOmv0$WbHXTaKU5~Q0qGIYQL3}?I{#S9Ta0x}P$QD6zu%p<}|l9Yhl2X+D2 zEu<4*y$}LyFWfwc7>G-{p$HuaQy?s`9W*9DZid(fXCWL!MHZ4Bl=uklNZhLp!AdBx zWBBO>2MLJ47NO+E3@-D)c93f*#bFO}6_VwsT(HwfBG8N?NiR0VNaj)ORf-J&1r9bx zQX&TNAXS`($l_>Q2q1QVTn}MUY};@#03IaRVh|EmU?rsc7o-iFp$IXE@uZtfx(<+A zAhwahLb#M3EQtF^_Zv-gfP#rSo`!e}WFCY?taEYBUxJJR=Wa9tk@q1Mfz&}*#9BF= z)xkppEmk2R1ePV!`(V8w0?lMJF2o`-?I2bg$QcleNM@lqmv&r;`-t@sjn#pIi8@|| zcnf46ghh$N;ijNvaRe8U*}*J`m0)d@*gFjLg2Mnrpv5YcLI{h=SS_MSNP;X!@&~b8 zuv@SwMsqk7xk!!#TR!jv$om95NaSGzNPYtuO3`>C$N+HuMPzJjEU*#;K}{D7e9VyP z0#ML_0|G5p!D0}COp_7XaM^*dl1dg~u@Yi3$OYhtM{u#S5C(u*AZ^&xAskLI3!Cv2 z#Cj;}LNVW`V_!2>daK#XM~OAX5y<8DNX>yM@NGU>AT00-j+c?l1ys`VHhN zuzBDZMC56lEU-E-0oDc~XdHfn(|CB$p~WgBNWikxaX8p05P@b9f(x;dV%tD=K#YR3 zz%dObmVm^-EHD94N34|~y$~I67Q*$Eu+R)8t-yo3g(6cBVE{Le5+5P-Qpr_d_ko-S zjyEuYGj}5-!0M>!0ta7Py643L|#vcT@cA`A8cm;m340w%y* z1c7cI*eGlS7URKsvHA$4m?R0XQ4j)~6F_$da3 z6*wTU#T!@xiJ;i~aNEF!VzUw~Mp_Mva22ZY;5bKQY%~^F7VHdk0%0BzEL1DOu16;b zcVy9BfNCg07VKsO0nXSs34}T@3tnNij$Xx{pW}Lo$zuFeO$A$QfY2feEl3 z2o{(NA&50^II9DN6*x4o#U)q*iJ(qEz^w$EjMZK;ErOd2j&3l4mb=loU?pGz>=pOcD)&?esun3zH{9Yhd7Gg3bw%7<9E+7J1lu^zYB@hM>VH-{*#Ci*xI*6e}gz2afjGbmw3=&X^#T`8$St>;o z!YDWkx4k5J5N;mWrHGV`mb zvB`q9K`ershn0)w3{=I~yg;lNl5J>qjB;t2vC%>o6rnhyjOuX&vJGJ;llBh-OR2I~d86indE-C$WT0oDN_ z5JnNfg4+hxi*P-d1s20efR$h)kaQ5?f>9;ZF9krciY;cqV#Gub$N(gDU@p#x0?Wb) zupMXwl2JHKL6d-+htLa7=wJd{#zqqZt3&7|P^2L&$6_zo6f_?pxL{eLjmK*d*v;4o zh#hE7Ll{K_3so<|^Hup46Ik^kOc`ZSKX;>rDJY`AQGrGv#SBOZdJ+YT zfe3Jd16MI%7DOAG9SAN+2UrQ3Z3r${7Tq?40cb3^c@S-IF4!#y0xfqVxCkW>1JI1e z$%R`4(FW%t{DH=TsKaR<5fX4aAVz_>VAmtK=qw@(MNqH!VSffXYR1#__x2qj<^7A1(xj>dvm1lC3-0k;j! z3t%qg#*^tP(zOxc54aMnWieb9>~k~%5)g1DSPdZE&7(SqY5~B5oj|0()gfXFoVyVO zL;`=X!%ac64JQ|&12>CEE75W{n2Tg6epAq7(R!75y#=uY&459|#nyemT32+ui5Lgw1wZV0u zSws>S$#}4NV3P-)0J{Z5;Pec{;REkd{4M}_0qjz2{s2oL5!5jXzbPYJ79JmnU|!tDUN4;uk-5XBbJ!~ndmhd3Opge1$sIzR;O z&;ZGzHx@~foUUPNLv^4rZYdNI?hIK}2YP)FHwi!6L&bgl!;0 z!3H4AqnHIY4?RV|EdmDwI49#L!0NyRR`U>EK(KJ;8Mx(OqbT+u5e9%QLMIR|C6)zu zI5sOOHy-Q^xE%=d2-pVJHcBuc0*n|Iu>l5(4+0SYQi7hr@EZ@(fz42CVqni;lRy&# ztHbIHkZoXDaQ>xwKF8)&xRqdg(Oing1uMZ%py?oji*6n^N8%I%xgMt-5R-B0B}oEg z5yU(Yi!N4@LSR0%m;8M6cBr6Gv;WQLYf+Rx`iqT9#a1lzdmZ$i`1*a_BzX*%4u^^V? zG-Xr*x(t?*fB;1W?yv{R5*_hi#UKKkc?dB`tb)`*SYX$~xd?S=EF{HX9cTpH0C08& z6X5C{%mNb-1HkIg^b)}ZYl9PLPDA4&Sp?TX?Lb7cl435Bn~4Ywl9a&10H-4%mXl=Y zsA3ZHJ}4F_j{uM=FP@MKsB7x*) zkR7-SP&5aT&IKC}C$PC0;ug|P9@Rlqc|b(igO%V9POuU;iDG0^*S#YDsbqjvuiI9c60PJ%#XP|MxN@$q75zYm<3e9qg zxe(WbOs1O`z*gdPI9L`!AbdW`A}3>G3pH>|g9vO9010-GEbhbrmW2~&ra%n9W-m4| zT&92xg%|}_g4;pZOeR7MVKRsXwh|`+aSIWKQb!442jO%nP6>z?KqgZ?ByoBgY#WFe zRIbA5++igF3U+XuV+(t*1QLPG=WqkS>d;I9i$Mr%da;Rt%tJE;!G#zFQbNtt2{sRv zKv;>!g17*i!)Yf5avGX5(7A+n_@e26_yc4zHA9k!FaTQ#BG4QJ<|4TYq=e2+Bf|AV zTL~yk!QqTX5EJYmy$E%<4InmzK<1&Dg5V-7g0P4+6sJ0nZ4jg2EQD=nEHrg=NrZ4$ zfh|XK5E7Tj9li)1VDlgZ&cFdnpt=B}10e=hLOKC50O1xi7M1KE-BrV02PoLVp-V=H z!}Ss{fTTbK8H(l>1Q%=(5Pmm1dA9`u!RfUWQ2ndEF?q0>aZCwDn@q49TcXBz(%l;f*oh*g7kvbA+#Y_UR)^D7L`Z-QfD>Sou@OkN!4*Tqh_HhaC8)Mxa~kPl5Qn3hj1)bn65u?I zAi#PNTrdkPhC~qSUywyOU5{iQNF9>P$f>;Pc(O3v21Xws-K(PeKeF)3Z+($YWVH8dlIRAnP z#HBW9EU+vZ0Wpsx|APF6%?l8tK(Y`PNrsLpM$Y1BIRF%<jAqHZBb1fn}<7a^tg9&sy z5XR$YfvhCpX8Z<>%3|bX{6RuVh=cTkW12QmhSzwatt4y;*b5K>e^`NK;pRbfAh=*z zFo6&wf(6zACWugsMG3Zm0E^*vAJ{eo0WuVvYw_o9ge+Jwf;jRKpDp8%_a5MV3e24K?$Q3qB6R!jr| zR!o>cWCNTmB+Ch#ht$+SRgBGBU@?gCr1%KzQbcyf$pWiG5D<&Nt|G!VuoAFh5CL{6 zf*`{vuz8~dG&|!A2rPjO4t8Qf9HbYl4y*$k0hUD~a5@9O1l%HoQP^xlh#}O0SqKR< z7FZT33*mPLLKcgIAVz^Cz&QYX=ofwhtPV^d^rEv6Rw7s+JJ8f&^%htiLK}V-NHN$g z2x2s!GZ4x>_``HC$%5h+oM=c(D!8%0&YgrG0G*B zlktZTD8#|BMIhKg>aZz66T@i~LLFEMguw4KVr4;21Dl7i1BnGPg>LyAoHfw0Gfpm8 zG1%b{0_0LMiW|J%hnNgjLWJ>Pb#MaVJ_HNNJg_<<3`J7{(uNd0a4zL0qggb{#V8p- zfej94vx(={5N(hjZ2t)B(4wi)| zro>8wUXbPBtP3U(c^VrFtOQI@>;iB>1~vukBQydm0U;1BC6)#95kxPTMXWZQ>cFOe z2sB56xzw}>rwc~71Sssm;S3IOVhOMgbOI5QL>h`@075S%EV#X3lZo&QSRENP6PhF8 z_JZ>-m>?#LgSDX5a5+Me+7i=<`ZD?Gu5(q(r z$@rDP?FHv^oCL%+xMK8B!*2&RS-4R&^cyyNNfHA&63u;JE>dWaWZtM^qFU?VU;>3b zBAmg&4$0jhSqKZH1T2A2ht2{i#+_I}27q;dO~FQhWg!H9qezm4+Y2@so4sgaV0F0t zL9FGd_98Mn#CTL$%54L?3S=mnXTV$}E5Ygplo%3@9MBM=o#mjgMAT0q8&+X7mRT8Kw%F_*&r5ySO6(OC?+E>zzx7=5m<~O<8j6% z++Kw7VB2sK5Op}s8%z=)zY*{UNC_FSMMYnNT>v7`TnY(ikOYK9MJq>*LT=R~f*8ai z5DOqB6vYSJ05prxxDY$Qim4r2U_(I!nw8kN5NA-^1=KbVuV)}$04W*xe2zPa2i|?u zj+8-X9yo~M1X@%er4qOjh!`dQfE$Ho8yXj45m+%Lwqer?HWWmlS&7D_p$o9NigYoM z7r>50b2x$vmc>etZX208@H!I7X=EBdstvi?#u*y$SOAAOB7uNeU@@!&PVpOnPNbWW90}I}79+xg z_?3W7K_aku0d6HuqaX%g(>p3gh3t$i5OGBcBr4#tB;|9&GB5-S-8`_#2nT_=Z~|un zK}ZnoAcP$V7AY1XtVFONo#)6*nLfc$~qxum%YWFABZh=t!|G+Bf;oGdgQU@nqkl6*d@n6hk-D}G6f50EKf z9f;fw&f;JKECwdPN(f{PxKUum;Ix6004pKMJg^R&=7A-^N)QBC3?~6mM~_4Z4;N~> z1#T$BA6U3JZ39b?qzy?iJpydh4&;&n6t& zK@`JTXzoLBA?gr@!gW9-;9P_boGdgQ2rfP+x)#1*-!Q;OvZ+#lc*#1ek!B4AzF9 z0GS6-3}S(k3Qhu{4vmFV2bu($HY87jECbgHR?WB7{KEh%L4tkphw>Cgp(Cfip2UPh%s%vS5OAlMyih=CKX(d8}HkKn?1#$-14uq8? zvA}vE1j5i!78UX@v4My;28oUtkSX9yj4g|U#lW&)0%9mg2hq6#tQbxpr7(~$$y^?S z_D&}wt>_^Sj3u4i8_#N2p8aIL0kpW z0b!xpI{Kz5C{{Z_>L|AjVK1>PguNgZ zn$ys@5ch%9L0H7vF{+OGwLLr*(BcTpB_?{{27t3OS{6re!LktZz&c2ZORx?&0d^Wv z76%yx5d$efV_LGN681j(SZ1DsPJ>6wU#!s!K&UT~@d=VWlkMzFwKFaZ_=tAh|Y&BG}Hw+L(i zwseIM11mu%aGFe#1Yu_&*^6c}wpJBb3CK`{>#?zr3Z2yhk$6JRm09S{PiQ8*>wc7P2)b17I1oxo`n#S(D0 zpg9A8;1Q@}c~5fB4F zN{C_Mw}{5FAV;Ek0o~0scEN}>9$Uu7CI-pupojv;3|ee~xnKzhK}2xEje_VvaEZ{1 zUkThOu&WRRl12CpptdZ?K?rA{v5;H^QU?iVgbTo8AOcMrn2W9#q>g|X!sG#9f!qgn zID$ZT?f|%I7+Z-gC*v1GN`F{l3mk7qQ8u7KH|X34au7Ihz`=x#0L$Veu;~Dcq3b{d zJKRciB?t+GV!E+FmV+IRAkf`MH@6I9i}2@UG+CsKjTR(WVhd}$p=qNV7nl2xk`&$C zg0KjetFQ(gNHN&C2w5~1SQd#uScJxc8-=78A%>=y#$1rS1pEO~f;;Ka*nLCac(hE6 zlS@nxgQEgOphX#&iR)R!;O(uc>*^8tN!3FC@ zaIvw#N+==VhEmf5o&vT)1MOaV`Lpb=i9_8YmB?Cta zw%iRC1ItoGz$1@9ywNU>2)h8`v_X}INO3q;FTf2TBL)$AK`gY4JqsiTCeS1x;YVy- zf=q$vz`{cK2#tlLgIJ43)iHpxGd6;Zw1G1?QKJzp-Vj_!4B|9}bP2e<2s?1HAeO^* z5bb@04m1|&&PCIKY95lqLF$mA45SV$i|z%G1kwHg846Jh)&?TbGBG$~qY(%tU!QMh6kn|!99c7VGl|!PNCP4>^RkV0R<3gg5V#`4mfsH~l9vc^| z4v8Sba=7teZQ$gMAi!b}f(WBAU!G|uM;&w%qUu>?XJ#QUgTAX5y<=OFXI zT!>MifS_Sw9Ztq0r5BL5z+74f9Xz(cQHG76C>lY=gAKrDGC~Zj1f2kd0RivBjYlME zv}^#DKr)#KL(!DL?EssCa5IDjQVfnL2mw+ImH;b8B0%a0cm|sika=J)fC)6e;pc*N zpbPIsr;51T2CZk4Vbc(mhxf$#^16MpFW}2+iU6xfEH6Z~@42uou7tHV+aZ z2G)y4Ah{1@2ZW2T7mWp1g3Z%ly$}hIHk_%L#u5b53&?2$uLOS>(8YbAxP-(OE*3aK ziE#_a0I*_W%!4Zi>mbQ^MB2rf+7U{KHXe~8P@RU;Ghma^WWiz(0%0EMERYMpUcl)= z{1RZjXavMnAd}HqINgV;7|p9lT#y0ylQP|8iAhKx=h9ale(%%SEudIMiaaaK7Hqt^8tOG9O?FGqV z6Qhac6dQ`orC>3NO(w$tM3iA+A*B*f5ThH9MF%AI;SvN4z-A~y3}gz}0B}+!f{1z>+52x5H>)`8>r%9O1{_f!0ugTr7J8xqg)=0WKsvy(2*qeD zuq=c?Xd{UQvICrUiAd;RC1AzmS_!fZ%?k)F#88kDFbg4pV1XqdfkTon(Gunq`8 zghg;Wz&a3KK(N3P5CUu-Tn9o4n1!SStd0@_ZU@*$L=X_m!P+RX7oity6o>%(4UIsu z4WtCZMd%%6A(xngDKy}*g%+V;E+iVkN)T=aalx`^1d?Kq63UA{kSU0S4$k5TE|`UG zB}fNE4B=dCEVw!}FQ9QDMu8Qhnu4Yd%%$AFU^~FJVIjc&MG#0%LnsCtKrsO~59}>8 z0^MGUZ5uU!jwJ&qYSAJT%teY-aD0H&fyKbGXaraSLVy)hOu%geCvULH2o{)2fWYPg zxS?pSN8_TKjA|5`Vg#4QnH}9#aL+&_P#sCGTR?^)e1u>@>;TC^Sk$p?)RaMx&%u!l ziB)*~g2m7XG$rJwFl=!Sw-?k04S=b1$EQA=)=z;qK;ucgcHisj`&~*^u50LQ)1JGDV z<`H4kAW;JH5!m6lJp)!UNSr(B3=)e1aOA-Wv`EI!1t$w6VnD+l?gb$hna!^=-gAUDGU@-_ml6j+wNz8~e4lsE9g5we?l0o(&O!&VNXNi7 zT;Z-lb1611lEcB;NOwI*8#a>>Vh}q>H+cYbfII_sF2eO-7FY~I41lXft)y0I0gqpB zT!Nz(LV$u8XFdljMj}9p2R4g?T>$b7#PxVtNDc?7BiG?zy&wXol}HwW-G?C1)-53< z27m?f0>Y(eoqfsky7Y}Ihi=Pur`q2C`!O! zQ$PeZ+rVN-R#I#mwG99{9N|8&bI}NdEJeXYZHJGVhdU?Zj3}f$4T^ZQm_~4s;vA$7 z!X3~MhdTq|NNg;KOW}$kTq-&oZZbB@!D3Xml494x-3)OWhzoWp8iA0-nS4eiP!5$7N!kR$*yfPOKJuouKaOOx2R5J!R(Be7`WW{@4&T!0XRxPT^> zlWr);xey1zSqPURSP&(o8$YUpj0%@J`3OBbgQ5bf7%1WqF%4!xq8lWE!~z*W9j8G| zK{Fl~7wjM+2qc#xjH0%i5$3_|!0$99S0VHc01NJ1u!FF<87u)I2EcuzR+3gwV9m*( zK*TKpN&;vR4~cG&1QH8m3M7Y8!a_3?m5b&KV!23;1e-^R`$*CYwhcrO;ZlerNiv=~ zib3v!SPo}lb1p;)b*voOrr^$Mpm3p^EK*(tMLg~}2gyQWAIt(d5=k%VT(Bvq1UAcw z6+?0w!cfv(MTriCy&x7D4yVL&V)cTY1`aFy?xQGbiFM1cQ%AR4ORPm$qY+mU04ED{ zg3LIA+W|HYDXoFbLvlSx9g-|AF4z>T1jszBzNE1P$fXDe5#a@}5`+#Kx*6^?u$4Fo zh+9CxgcKhjE)AVFOpHehuz}(d6H%bVfR+Rx5f74pu*i%QxB+O!L%1MAk-`O}7$N~@ zK`aMxakD_C5aUZ4tHa_*G|yn;B6*A2?t?oBo4p7zhzmfLBSi%k?jQ(akgEorGw_ER zSauM&8E;~MBmuAz(t{YR4MZT46gmrJC^#S>1V}NGmH4?Jy@Me9(42wG&FDS{sY4Tk z_#DkVGPxk*!RDdafyMAAj^8$ftI$#ewiJs^3{Bf8cd*W>Lt+M= zEWi#`2qjIt3ZZt7S8bZ}JDmKtL9_O4Z-2IN|v9_%>1kC1?b8aB_sO#v%G=)lGTD}fN$j3O+CEqCJ-Lr-RejUUxP z(}IGOq=GH^;1`3WD^xp>A`~P+v;o5^sepWrAn=C)SQerfEeznMfR*4RAbP=y(F`D& zi!)_C-ga>hk0YU$Kcg2qBpN9CZyma(ykVU2StyJgf4f`tM+t)V3llDJ5z32q*`82+dQX~StHl2Q0g z8H%zXpCfq?#Kjp92nmD^gcuqNp@bgU09zJE6QhSSM(x0nmZ!~nT$UvBe{Tdem zfg}}>5(o=dG}16qK$hclA6R0*oJP0M0EGd>mmn6{(+~pW0;G(CDhts8QbNP%!D&3m zEkw8g$@L(kz}$gwF39rXYA-x0Ac+RVMX(@o1QLU=1}Y%nE^fk+l;ETmKdR*V+J*is^z5-M`RE&vf| zj>N_t&glT%zn~z7WN|PHO9&B&Mv%7Q9AG2UZ=iI5hVD};1jGslrFr`Td!F`F}TL@WVLj$Z1iJ*z=M-3gY91m&Sfszj*ZJ@D`VjrY# z&}R*>BS8e3KX7uUf z#G;HmuOd7RW`TVUW)Vw(br4OE6sDy32)_%+@C->V9aT*4+zm<_#KtO`I`pJ6#3B#m zbA%Vr{6-NM6cCUG5SRtBh*pnxFF}EXH!%w zv6+W1hRu{wF`8G~s1XH@RrHtvDIr1(cM=#@(Fh6+a4>-hBEki?5>U8MJD=mW4dihA zvS1%!B|t7kk6$z~knsq;_$>l^nt*v|#*cDIEDBKLgXow6X+w)VgkA^>Eh<1dhIL$m zJqRbz0*7=iBoL`*9!V}hvK%cMN#~N{g<+jQNDn$Pb$~*gr06C>F*Q>Jncf;q+CV{! z6eOf@(E^(~rl1*$jf>kNDh4cSKwxtQM2w17jzps%fd~q0idl3?79%K*a77AIIO7Zr zkX|HpROI5ck`f72_u)>7l-MzH^@2hdcbF0>ic01|hY2Gam| z3ly+8V}Y6>4zh@v=20iC;I5)e7*NN}gV+>MaN-O}galGL0O>&I4q^`uMW?}o7!d&o z)<_C_ya53Y5=dwa#Ym>Fo8ch|4lr=gp%GvSbb`K)9BH<}BLyugz+9xL7&+kr_Bl=h z5+oxhG{~KJfTt@+fMMf~1|o@5l4J%LYS^QtZ1m_M(~hC24HPbDp@GJQ1kO_dXUN9th;%qSDT7n&Xi`Qw zp@eYYfCCI1bP!@hrlCr16r88g2&AMu8eq@>0|x{=)R005EC!Yx zC6L2vG&BZ7Xn<2Eh=62qcy|-bMM}k^v4s&^pimnPq0!d*kjNVF#0t*XXvAnL9!1+GX|z}xEtW=$rO}dbv?LrY2}eu9(UNeqBpfXXM@z!dl5n&n N94!e)OTqyx2?5YgS|I=c diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java index eb7936d6ac..01d6962af4 100644 --- a/core/src/io/anuke/mindustry/core/Control.java +++ b/core/src/io/anuke/mindustry/core/Control.java @@ -28,7 +28,9 @@ import io.anuke.mindustry.input.InputHandler; import io.anuke.mindustry.input.MobileInput; import io.anuke.mindustry.maps.Map; import io.anuke.mindustry.net.Net; +import io.anuke.mindustry.type.Item; import io.anuke.mindustry.ui.dialogs.FloatingDialog; +import io.anuke.mindustry.world.Tile; import java.io.IOException; @@ -301,6 +303,16 @@ public class Control implements ApplicationListener{ input.update(); } + if(world.isZone()){ + for(Tile tile : state.teams.get(players[0].getTeam()).cores){ + for(Item item : content.items()){ + if(tile.entity.items.has(item)){ + data.unlockContent(item); + } + } + } + } + //autosave global data every second if it's modified if(timer.get(1, 60)){ data.checkSave(); diff --git a/core/src/io/anuke/mindustry/core/World.java b/core/src/io/anuke/mindustry/core/World.java index 1e889c78e9..48572dc653 100644 --- a/core/src/io/anuke/mindustry/core/World.java +++ b/core/src/io/anuke/mindustry/core/World.java @@ -185,7 +185,7 @@ public class World implements ApplicationListener{ addDarkness(tiles); - EntityQuery.resizeTree(-finalWorldBounds, -finalWorldBounds, tiles.length * tilesize + finalWorldBounds, tiles[0].length + finalWorldBounds); + EntityQuery.resizeTree(-finalWorldBounds, -finalWorldBounds, tiles.length * tilesize + finalWorldBounds, tiles[0].length * tilesize + finalWorldBounds); generating = false; Events.fire(new WorldLoadEvent()); diff --git a/core/src/io/anuke/mindustry/game/GlobalData.java b/core/src/io/anuke/mindustry/game/GlobalData.java index d8cb461884..a17767175b 100644 --- a/core/src/io/anuke/mindustry/game/GlobalData.java +++ b/core/src/io/anuke/mindustry/game/GlobalData.java @@ -94,7 +94,6 @@ public class GlobalData{ modified = true; content.onUnlock(); Events.fire(new UnlockEvent(content)); - save(); } } diff --git a/tools/src/io/anuke/mindustry/Generators.java b/tools/src/io/anuke/mindustry/Generators.java index e97e4f8b4c..0ec0ff1784 100644 --- a/tools/src/io/anuke/mindustry/Generators.java +++ b/tools/src/io/anuke/mindustry/Generators.java @@ -63,7 +63,6 @@ public class Generators { out.draw(x, y, outlineColor); } } - } }