From d41e25cb8ecae7858d6cca52749819808d0ea73b Mon Sep 17 00:00:00 2001 From: "sigonasr2, Sig, Sigo" Date: Thu, 23 Sep 2021 01:18:49 +0000 Subject: [PATCH] Block merging from the bottom complete --- Meteo_Engine.jar | Bin 11731 -> 11938 bytes src/sig/BlockClump.java | 15 ++++++++------- src/sig/Board.java | 8 ++++++-- src/sig/DebugMode.java | 1 + src/sig/Meteo.java | 2 +- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/Meteo_Engine.jar b/Meteo_Engine.jar index c7d6804667df81716300d07f2e6062c176ad5469..40eda471bfb0fdb76a0ad373b3a98c581220a7c4 100644 GIT binary patch delta 6587 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 delta 6399 zcmZu#1ymf%wj~f`aMuZP86ddJph1Fra1HLR!3G8kE`w`uw?J?R?h@Q>fZ)LrB-khK zzW3L=fBjmkPjz?o?mpFPSMSq1-*84BQ&j=!B_RSD8XCe5S^}mJ;&YU1dyX*5zliIB zFFKL_?61CLfN1K!(_bKZY;-TAjp*%9GYb|+$y&t2M_Gu7Kw9LahVBN+b#V^#VWGPG zWj>0Z9Bc3FBzKrnNOGMqZ?oK5BatBmSNCQ4aYjz(|2tygRda|NS9*r zp`%shhWITtTe@3TdFQ(cmIcQ*$%ON4PBerrsq zO3Zy(kLbgbEZfI@uHj0ZJY=L4OE#P)r!rAi_A!vb#2hvShDAaZyqtu|nv~IJQAdJ8 zdbeZ?PlQjf3oQXfJ_0#Bla@6TX$Niticq0s$aV@|2bbyCiXG7go`8;{rO;;ncXw>l`?V@B1EnN>K%r z=vA*^i_L+4S)j`-e&4RDyNXf5Qr*Ehv&^GKVZD+b_x)AouCBn@Yd+6a2Kc-|kc{Rh zNOahse2o5qH`jo(eXH!5x>Z1`=MiYO77UBoRZ{pSMRqSdvb$K6y3StO9tt}N?>p9s zEBSm-dTU@n-`?uJO5?+M9fk*N(a`Jh)9$a~xhMZR<&1i2d&3$~VxlXrlCLjF6WX!MxIZ~SP;Z&B zBj2ZAd{N~q(R+HH16;R?YG`6vq@Y^7fCFA66Wk>vHWzLox6A6R&{onwXUHcYn>@Ke ziAPiEqn5MFAhj`^sQL!Hy0He6qK{+a(gzBlm*kC}IV=+7CPY^ahM+>l`!E|X5`CjD z>YmV-h{u(#Uqu|^7R{;#qA0KJ?ZTBnvub8>Eg#4)Md z$}c|HX%Bz2NoTxr@UDF-%G2(FnE4YV)JtB7B!+u>MV|%b505xdAXX<#oo(VFVi0Zw zzv`4_HPiD<=NQ-TTGYQ4O_m)z&Jq|z>FwulE7bf()?o=Um;Syt4%%4g4ayejs2|7R zoqt#SH9h7jZ-WpG^2n)oTXnEmGJ_R`1!HgQ~YHlq47)$iMx@YVP(qP5MBSUri z^HZvqvhy!SR!wIk%=J*Td6vp*kcr=)>m(5+CEJp23p&==G69s^3scd-6g7hXY zEJc76*5NX5W&0URW*9>dDAk#%@IfAE6+Db#VxycBXK0*kByKt3BDmMa2C?|s7YOVc1@d{c{W897KsKBx)jOU^pO{LWk!A)V8>WACfR)DdU#rFgB)0TP9&MSbz$FdqI5=C z-18`G2^3kKp^QEeR6ohHk}+dVc<@9$z5hjHfH{+HIz7;mLg!-5tuvmd$;0`E&)qb| zx@O}-rOg0*Gg|K&nRBPwD=je8E~}#aF_`B;I1EDtn#;_m+%-#&9CHWn%?^P?FY4pYhT$qyFF@o+G7Z-OHl7Y+Ge2L5~uM~!(_-OIL-cS@t{q@cn5YTR}u=j+a zs(^}iFqaerMnynKz(PRyZ~1+eS&DiHrry6K_gQ`+5>6(r=4@v6CT?!o+P>a|b3{*T zYfIV3mP5WSB#08;%}YekQVl@g8z{aa0)Z5gb=EQVaQyg0t59a3=DB#0srYOoQ;}?0 zqOC*O2)$H!^6W#VDYZ9?SQi=ig2 z{e}w?IC|zKc3AsXI*y9X{@jESpT$QPq)W=8&f;j1V3}ZI@_Fd2>p^McICD;CjyxagH@ zNp6?ec<)_HQ&iK3z*PURen(yApNhkVF8)eXxfnJdBrAy|OZL}6Y?QF=e%Jqe&eWZ_u3gHvZ^%=5@z0+w^D>jRbud=1NGVz=pK!kP4 zk7#w@&_DGqY1PS;@Lye7sAouX5M>uQ^4S8$X9W->CRNy@22a4J_#$PQ9*F&0^hXP_ zUt?nCj*tscXq6*gJI=$F5AB^wQjAIX~H&K6dEKQK8 zR6LAg@ha)Sdar`YA1udtZFuLZ2D!c*pJ=~?0=_hHS5Hu)3i$>lrwF?`{6cvFfn+8q z4K`GGD2HxHfTN$1rOTDbRCzFVT&<)R4iL7ZV`@ zeQ?q+qV|up=z`8s(CzjIrDk17H~)DeH1#|Z>a?|j-Wgm%)IK6Yl#SjQwLs{Hvr&T4 zu*xwOE!Sc{HRed0!*~Tpr4x`C$5A+Ig;H%{kvTElaIPnw6CjKAPZHh(zfx;Yw(Fy> z4+wFsYo1XClx_Oo%XinD2SGPBduOJWOLR1KiNraCb42!+7cnq?sQ^^8TaWiAL!un3y6of3CYnYs)7$VrwKb3 zcl^}k`*(M)^z!0oC&&v_>;xSXx{l`U!T96 zW)>Q4DX6u(b#9B2DFsk$AYU?XpSxJy6UMEqc%MrCWx`%N$7!f#s3nWSm~O0%iup$5 zvGP54>;9MV!72vGT{LA?@lw9IDX~ZWNXyn>4Zm38xwc@SW$*ql{sXhpaAAt0Y-u{? z#z+2vbv@L{@2~G7hQ}I7=3_YvxEElCU-tBx9rfk!o|3Lo_KfvK)K=b5Av;LXec^hf z=h%ZphBKYtd#1^0SI3H`MjpiF5TdaZZmnt_WK z)v1sR70ksN4wZc~(oF*Jc0H3pTnD1lii1(<@PF=dJbzWk@?PU-B}uw~G_oY+D9dIK zSlL|InXn*9D8k{j-#SWJR6Q{*h+dyAxuGTJC2pfNz&_if!NOgFF!+yO6Cjm{E~?32 zjBleghRa7X;W9-6L%*6I;TE$|_OrUNGvOo&H4_Cz)-_uYJAU}|SDe1dR!ST^1Cf*{QeF$Zrf32$fV9;n%a zV($()+`=oz5u5961D1joJwu zYY_q!*P3d*G1|{L^^x$FNgyT(LAPhQ5B9}QV+V!$1*di3oQC>cNkkCCe|-uc1j-?;pgS$YTP1 zi7Vy_Pe*c(kiakNczb+0^lCOaOpVnU;hjLim4K->{jdC=Ou$g9EIQyp zD{&nbL42F^2|eR*%2HE)xG6hN9aUyO_fL2`f?+$96|VI2qgUyCi{73j81OY(i5Bf0 zxV4P5jDwh8-7*x^&D#-wd@!@NraQx|hqAQP-ZsiAIK|eWI%xSIH9lT;mywKPLd;l_)!gC~%*W>y1z%e9T z->F48oev-OFPlwqwU;kD^%2!AR*#ZV>b#@rwkahYM1P~fNPjSBt-qbSLYTX9bXQZl z-WC_E?MMm_KSQG&cn1O_i8m`x-5t<9CY5=IesX=OOl<()JEh-~Wv9_{uVxobqI#eU1=-0ISV(r2;+j6iH4Z!oy86jyETS|FdE=x5q`czZ*>c$}^m zxYhi~F+9knZt`P34$y z%MT(o=8;0k=!<-ks%$k2<+et7s>Q9kt&nVHVg;oAk2DEF^8vE~@=Y70mfRg3Hg*iZ z(bsG_Lfjk*(${Nw?&9M)CK(xb%QHTF_u~CvtoMo7+`^2ZZ8Eoj_%kN0V`3%0;CQ>o zkOHz6){Juwmp9C<4YL!oJIgA~C(mvA+e!JnH6DJWkY!3vPJQLO{A}y6VUC1VHwuVi z6OU~Td~tRcot?ly#2V``lBmLrYCjXD=CAJ_GEF}&fq=L=7Mch!z(zR!4Br=6i@Lrr-6x8iN~`4|e&bQPM>M5oQvvv-1q}-eK?2Hu za{=W=oPx&8#3j%%5HSIR-k>QOe@Gv0n}KJYOC^;6h?-Gq1k}`mKr1)*iYrDWopyWp zs3?-&t=G}8O9gef*atRz#Fxw6zDzUBE%v&!!)2Q6XlItoV@5Z<4ci=dx%C}q0DZ^( zEEzl3+mDr0HrXjK8(oJE@A8!lGo2sg24S+%h6N7Icc%)SJ32cfw|Ta=`H)KCPhNa) zNN{_2M0*`LR`Z5}+Xy$>@WXFn+Z5I3f0YFp_xUf(m{5zwg!kQvIYl^6XMY#%+24$R zfaa53M7KjaQLluQNIQ3^P)IPYMujmHO?|Dm5x8X-Ke8N z1Hgw>!z~hFado&hxFUm?hD{S^=U_{ADnhSRa(ZSp*AV-x>6}*Ib6!yoGD`dd(`duy zr|17dRJ5&a=lKdG1cZL%|14mXzkS+&d9xJsMlYVd*?M1w!9P7rijf|oW~c&xLntDN zs%LwPYiJvGp^xliiwH2@GLPR3(Avk;tf5q-D+aZ{^{S%SnbCCnp>`VtG`g4485=9)1-h z?y`o{{W0o}A0TbtQ8SnVoHZXO--okk)W34q^PD5PEE2P&$bTmZ(W-RQ2o6G&v@O+_ zq_iXNG*y>Gx4|MSlrvdOm|wbB7L|K;pu2ctz89?>COlki_Ff5Btg!kwrkTu5{~-1+ zkcP0ID5JXta?o-J(ODLw%ix2fgR&U)sR?CHf*&M~iKekEFpXc+_hd-j3)73<)SYRK zpZ6faYc|ya6x*{Q`J0pKY-I)DeFhMNFi2;He8|9QAd8;&J z^h`Lggd1)P_1wz@wDB80Vr#{cer{RWsh3-6zS zOcvk^1z0l+E!Cgl|JDhdzwh?%*aQ2`Liq0t!Rw9T24FZCjjTO6+g}a5*-?qj7P1$8?hzI;Uor>q}pU;w_`x~rk;%H(2|ATM6 u#jv2yz@g_!ll>#nR{Cc!jGGNa{U@XUerE*#xGwlL%!`c blocks; + private List blocks = new ArrayList(); double x,y; //the lower-left origin of this block clump. Every block positions relative to this. double yspd; int[][] collisionColumnRanges; @@ -16,9 +16,7 @@ public class BlockClump { Positive is used for how much landing launch time before being split and falling.*/ public BlockClump(List blockList, double x, double y, double startspd, int width, int launched) { - this.blocks = new ArrayList(); - this.blocks.addAll(blockList); - collisionColumnRanges = new int[width][]; + collisionColumnRanges = new int[width][]; for (int i=0;i