From cd7d49ad87e00598263b889e9e009c5013a46396 Mon Sep 17 00:00:00 2001 From: MasterPyo <olivier.pillods@gmail.com> Date: Sat, 29 Apr 2023 10:49:11 +0200 Subject: [PATCH] enpassant resets only if we move something --- .../src/main/java/controller/Main.java | 24 +++++++++--------- .../target/classes/controller/Main.class | Bin 9258 -> 9272 bytes 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/MavenChess/MavenChess/src/main/java/controller/Main.java b/MavenChess/MavenChess/src/main/java/controller/Main.java index c1f1957..0bc61bb 100644 --- a/MavenChess/MavenChess/src/main/java/controller/Main.java +++ b/MavenChess/MavenChess/src/main/java/controller/Main.java @@ -162,24 +162,24 @@ public class Main extends Application { } public void clickTile(TileView clickedTile) { - // --- Resets enPassant --- - for(int j = 1 ; j <= 8 ; j++) { - for(int i = 1 ; i <= 8 ; i++) { - Position p = new Position(i, j); - if (board.isPawn(p)) { - ((Pawn) board.getPiece(p)).setEnPassant(false); - } - if (board.isNwap(p)) { - ((Nwap) board.getPiece(p)).setEnPassant(false); - } - } - } // --- Analyses the clicked tile type, and executes related actions --- int state = clickedTile.getState(); Position selected = board.getSelected(); Position arrival = clickedTile.getPosition(); if(state != TileView.NORMAL && state != TileView.SELECTED) { + // --- Resets enPassant --- + for(int j = 1 ; j <= 8 ; j++) { + for(int i = 1 ; i <= 8 ; i++) { + Position p = new Position(i, j); + if (board.isPawn(p)) { + ((Pawn) board.getPiece(p)).setEnPassant(false); + } + if (board.isNwap(p)) { + ((Nwap) board.getPiece(p)).setEnPassant(false); + } + } + } // --- ALL SPECIAL MOVES --- if(state == TileView.SPECIAL) { if(board.isPawn(selected) || board.isNwap(selected)) { diff --git a/MavenChess/MavenChess/target/classes/controller/Main.class b/MavenChess/MavenChess/target/classes/controller/Main.class index 8d4ad131fcbb83edbee5e5d469a9676cc242489a..b3df3d8666f86150ecee53900be5105cf57c6643 100644 GIT binary patch delta 864 zcmY*YTS!z<6kY4wbMH(uV@;0NM~<a|rlzD25ta1Siy(UtAwgj^NDunR>7#-MOQPrj z5d=l_F4MBt)M$tqiS<*aVp$(0*@Gf`SQcfb?Xmg@4u`eZ+Iye97xz}puAO~(k*5$x z80VplI>K2J2rdd12LmoFWrBx^xK6mEWMExjWiYVHg(C>N=w`Bqes~B^X&^Xb{ruw6 z(&F_&7rjglpY-e<5qbm@PCyrokI+|;eGSVZjGre#(iH7Kq*MI*m`>D_OxyH2Phpv! zWZ6~}&8tIAk!{fPa9v@XdJ!OuhR{ljgy=r$r8^)DXyU-OEVQtq}`F?glil>0<D z>~A7{;Z39Km^@UL8-Y~CMmq?UhF&d22MSXsgeqk2bBIADe5isS7m$H!<l!O;a0zp8 z8AZ5?0K(WP{1(y6P>UV7A;#26M!noO(ToOk;5ItZh;B6D8}87+Ju&${Gtta^JYWG@ zxB#tOjyA4AJA-)0tsy+&E<EKPJmW!h@-UvW5?u`A1?%yWckzm?c+GaaVJEuTh4*}i z5B!Kv97K<D;j^;wMU6qP%EDKbgYPOIKh#w8sk!*6mY`pi;FsEr0kvKDJ+#z*I@D=8 zRW)5IR7;O)WQ=OzaMi&Ps)t^~&5=erV~y$b8AXgUN@*K=8E>3ng3-W4<1zilTc#Mj z9IXwe>fub&DNNVnn4$AIUQc5V%K$_WD=tpvQ67K;Sy;$pvaE$MSi$3hOxhu==0TB7 zu_l)%1X<$644xd4E0M`lLtGbT{pALc{fAQ%v6wrfd9r{lT}}&Xp_6BL7M3hSR*33| zew5tC?J`glo#Sp0rk>17QD-W|=sZ@*BL;jro96{-?vvcLNE?(<EeDbu^2<0-BZojg VhOr+LB<MqOA51x;!nI>J@Hab_*1-S( delta 813 zcmY*XTS$~a7(Hj^UtQL}cJpqorbZU7)l*uAzJw$cT@W8EDkLQWGthkqBDRZIVMJgE zLTF{}sue_Qt0Hzq5iLur2f>OmrKrSikk|U`1`XfLobQ~ud~=xAoTi-Xxn>4K7;Z8G zCSjHpxwA{Q6qJ<}l(=nlFx-Z7j5ZmAcEY-+$ersha2MIIov|jJRr}3If4zCi?&*dF zR=`L%GMx@<J+>KHadY#=cC_TjIa_FC7%9!z8Dj)6RfDj<c;F60bb$Zz+5a_%Xp!Zb zz8}ryN=C0Mz^Kf*%>gdlBuQL`;jGcE7N=3C{r)y*CmH4U#J7`SRcjMs7+IB<u+rm| z+I(=J0kLSrQZykQSFsM)kSlyXyx0Xl3ek*W+(an?IEYppMjNWpE;~Aey@hVvMnCRh z5ce^PPK=`qGk8Ed9x@4ibm0-x@t7OX&wLE95KmcxXFTA+AdlfWEAWD6@RDcoiuHKS zYZzt=-taC)*o#s2;VlR8fkXJn5sdL2#yNpc%D`u3#}^fYuWB*AsbqXtE=;IZm{i%A zQd=>t3NWMGm{o^_uV9d>WU#8GRrzRBo*Oh(2j{6C&R6}ktM_zh3m51`4ApBGrgIst z_c1~rXQZxUlx}0R9-vbXGfs~&Ue7SWurkqz;u0f~$%czABaNv%0*F_k;_7PFvI+)l z*vvYfgoeTno)@HO_h2upMYf1F%XvXika&^Jiy~XZiDj(+#SLNoA8rCEzd5x6c|0+< zP96{;r(6=$Ln|-Siy(On=@T`0?(6ZWxGYUj11muk>L+XzHA|sb_p(VY(J0lOyducp iX<54)iPKWzG=in42BT#Xv6HY!%p#4FOZdBzO8FD-Ma}>K -- GitLab