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

Changements vide => new piece + autres modif annexes

Browse Source
This commit is contained in:
Manon 2019-05-03 23:11:52 +02:00
parent 7a021bdfff
commit 1f47ab7850
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/piecesEchiquier/Echiquier.java
View File

@ -5,14 +5,14 @@ import joueurs.Joueur;
public class Echiquier { public class Echiquier {
private String[][] codes = private String[][] codes =
{ {
{"A8","B8","C8","D8","E8","F8","G8","H8"}, {"A8","B8","C8","D8","E8","F8","G8","H8"},
{"A7","B7","C7","D7","E7","F7","G7","H7"}, {"A7","B7","C7","D7","E7","F7","G7","H7"},
{"A6","B6","C6","D6","E6","F6","G6","H6"}, {"A6","B6","C6","D6","E6","F6","G6","H6"},
{"A5","B5","C5","D5","E5","F5","G5","H5"}, {"A5","B5","C5","D5","E5","F5","G5","H5"},
{"A4","B4","C4","D4","E4","F4","G4","H4"}, {"A4","B4","C4","D4","E4","F4","G4","H4"},
{"A3","B3","C3","D3","E3","F3","G3","H3"}, {"A3","B3","C3","D3","E3","F3","G3","H3"},
{"A2","B2","C2","D2","E2","F2","G2","H2"}, {"A2","B2","C2","D2","E2","F2","G2","H2"},
{"A1","B1","C1","D1","E1","F1","G1","H1"} {"A1","B1","C1","D1","E1","F1","G1","H1"}
}; };
private Pion pionB1 = new Pion("Blanc",codes[6][0],'P',new Position(1,2)); private Pion pionB1 = new Pion("Blanc",codes[6][0],'P',new Position(1,2));
private Pion pionB2 = new Pion("Blanc",codes[6][1],'P',new Position(2,2)); private Pion pionB2 = new Pion("Blanc",codes[6][1],'P',new Position(2,2));
@ -55,7 +55,7 @@ public class Echiquier {
// A choisir soit on enleve abstract de piece pour avoir le vide soit on garde la classe vide // A choisir soit on enleve abstract de piece pour avoir le vide soit on garde la classe vide
//private Vide vide = new Vide(); //private Vide vide = new Vide();
private Piece vide = new Piece(); //private Piece vide = new Piece();
private Piece[][] echiquier = private Piece[][] echiquier =
{ {
@ -122,7 +122,7 @@ public class Echiquier {
j++; j++;
if (getCodes()[i][j].equals(A)) if (getCodes()[i][j].equals(A))
{ {
if (this.getEchiquier()[i][j] == vide) if (this.getEchiquier()[i][j].getClass().getName().equals("Piece"))
{ {
System.out.println("Vous avez choisi une case vide. Recommencez."); System.out.println("Vous avez choisi une case vide. Recommencez.");
return false; return false;
@ -162,8 +162,8 @@ public class Echiquier {
}else }else
{ {
System.out.println("Choix validés. Déplacement en cours."); System.out.println("Choix validés. Déplacement en cours.");
this.getEchiquier()[k][l]=this.getEchiquier()[i][j]; this.getEchiquier()[k][l] = this.getEchiquier()[i][j];
this.getEchiquier()[i][j] = vide; this.getEchiquier()[i][j] = new Piece(new Position(i,j));
return true; return true;
} }

2
src/piecesEchiquier/Piece.java
View File

@ -9,7 +9,7 @@ public class Piece {
private String emp; private String emp;
private char lettre = '.'; private char lettre = '.';
private boolean enVie = true; private boolean enVie = true;
private Position position = new Position(0,0); private Position position;