School-DUT-info/M217-PT-echesstria
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

transformation vide -> new piece et bug réparé

Browse Source
This commit is contained in:
Manon
2019-05-03 19:19:37 +02:00
parent 4eecbc579b
commit 7a021bdfff
3 changed files with 17 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
src/piecesEchiquier/Echiquier.java
View File

@@ -61,14 +61,15 @@ public class Echiquier {
{
{TourN1,CavalierN1,FouN1,RoiN1,ReineN1,FouN2,CavalierN2,TourN2},
{pionN1,pionN2,pionN3,pionN4,pionN5,pionN6,pionN7,pionN8},
{vide,vide,vide,vide,vide,vide,vide,vide},
{vide,vide,vide,vide,vide,vide,vide,vide},
{vide,vide,vide,vide,vide,vide,vide,vide},
{vide,vide,vide,vide,vide,vide,vide,vide},
{new Piece(new Position(1,6)),new Piece(new Position(2,6)),new Piece(new Position(3,6)),new Piece(new Position(4,6)),new Piece(new Position(5,6)),new Piece(new Position(6,6)),new Piece(new Position(7,6)),new Piece(new Position(8,6))},
{new Piece(new Position(1,5)),new Piece(new Position(2,5)),new Piece(new Position(3,5)),new Piece(new Position(4,5)),new Piece(new Position(5,5)),new Piece(new Position(6,5)),new Piece(new Position(7,5)),new Piece(new Position(8,5))},
{new Piece(new Position(1,4)),new Piece(new Position(2,4)),new Piece(new Position(3,4)),new Piece(new Position(4,4)),new Piece(new Position(5,4)),new Piece(new Position(6,4)),new Piece(new Position(7,4)),new Piece(new Position(8,4))},
{new Piece(new Position(1,3)),new Piece(new Position(2,3)),new Piece(new Position(3,3)),new Piece(new Position(4,3)),new Piece(new Position(5,3)),new Piece(new Position(6,3)),new Piece(new Position(7,3)),new Piece(new Position(8,3))},
{pionB1,pionB2,pionB3,pionB4,pionB5,pionB6,pionB7,pionB8},
{TourB1,CavalierB1,FouB1,RoiB1,ReineB1,FouB2,CavalierB2,TourB2}
};
public Echiquier()
{
@@ -106,57 +107,6 @@ public class Echiquier {
}
return echec;
}
/*
public boolean verifierSelection(Joueur J, String A)
{
for (int i = 1; i <9;i++)
{
for (int j = 1; j < 9;j++) {
if (getCodes()[i][j] == A)
{
if (this.getEchiquier()[i][j] == vide)
{
System.out.println("Vous avez choisi une case vide. Recommencez.");
return false;
}
else if (this.getEchiquier()[i][j].getCouleur() != J.getCouleur())
{
System.out.println("Le pion choisi n'est pas de votre faction. Recommencez.");
return false;
}
else
return true;
}
}
}
System.out.println("Un de vos codes est faux. Recommencez.");
return false;
}
public boolean verifierPlacementEtDeplacement(Joueur J, String A)
{
for (int i = 1; i <9;i++)
{
for (int j = 1; j < 9;j++) {
if (getCodes()[i][j] == A)
{
if (this.getEchiquier()[i][j].getCouleur() == J.getCouleur())
{
System.out.println("Le pion que vous voulez manger est de votre faction. Recommencez.");
return false;
}else if (this.getEchiquier()[i][j].deplacable)
{
}
else
return true;
}
}
}
System.out.println("Un de vos codes est faux. Recommencez.");
return false;
}
*/
public boolean VerifFinale(Joueur J, String A, String B)
{