diff --git a/src/piecesEchiquier/Cavalier.java b/src/piecesEchiquier/Cavalier.java index 2332ee7..182f440 100755 --- a/src/piecesEchiquier/Cavalier.java +++ b/src/piecesEchiquier/Cavalier.java @@ -2,8 +2,8 @@ package piecesEchiquier; public class Cavalier extends Piece { - public Cavalier(String c, String emp,String l, Position pos) + public Cavalier(String c,String l, Position pos) { - super(c,emp,l,pos); + super(c,l,pos); } } diff --git a/src/piecesEchiquier/Echiquier.java b/src/piecesEchiquier/Echiquier.java index 84f6e1f..85031e8 100755 --- a/src/piecesEchiquier/Echiquier.java +++ b/src/piecesEchiquier/Echiquier.java @@ -14,48 +14,45 @@ public class Echiquier { {"A2","B2","C2","D2","E2","F2","G2","H2"}, {"A1","B1","C1","D1","E1","F1","G1","H1"} }; - private Pion pionB1 = new Pion("Blanc",codes[6][0],"PB",new Position(1,2)); - private Pion pionB2 = new Pion("Blanc",codes[6][1],"PB",new Position(2,2)); - private Pion pionB3 = new Pion("Blanc",codes[6][2],"PB",new Position(3,2)); - private Pion pionB4 = new Pion("Blanc",codes[6][3],"PB",new Position(4,2)); - private Pion pionB5 = new Pion("Blanc",codes[6][4],"PB",new Position(5,2)); - private Pion pionB6 = new Pion("Blanc",codes[6][5],"PB",new Position(6,2)); - private Pion pionB7 = new Pion("Blanc",codes[6][6],"PB",new Position(7,2)); - private Pion pionB8 = new Pion("Blanc",codes[6][7],"PB",new Position(8,2)); + private Pion pionB1 = new Pion("Blanc","PB",new Position(1,2)); + private Pion pionB2 = new Pion("Blanc","PB",new Position(2,2)); + private Pion pionB3 = new Pion("Blanc","PB",new Position(3,2)); + private Pion pionB4 = new Pion("Blanc","PB",new Position(4,2)); + private Pion pionB5 = new Pion("Blanc","PB",new Position(5,2)); + private Pion pionB6 = new Pion("Blanc","PB",new Position(6,2)); + private Pion pionB7 = new Pion("Blanc","PB",new Position(7,2)); + private Pion pionB8 = new Pion("Blanc","PB",new Position(8,2)); - private Pion pionN1 = new Pion("Noir",codes[1][0],"PN",new Position(1,7)); - private Pion pionN2 = new Pion("Noir",codes[1][1],"PN",new Position(2,7)); - private Pion pionN3 = new Pion("Noir",codes[1][2],"PN",new Position(3,7)); - private Pion pionN4 = new Pion("Noir",codes[1][3],"PN",new Position(4,7)); - private Pion pionN5 = new Pion("Noir",codes[1][4],"PN",new Position(5,7)); - private Pion pionN6 = new Pion("Noir",codes[1][5],"PN",new Position(6,7)); - private Pion pionN7 = new Pion("Noir",codes[1][6],"PN",new Position(7,7)); - private Pion pionN8 = new Pion("Noir",codes[1][7],"PN",new Position(8,7)); + private Pion pionN1 = new Pion("Noir","PN",new Position(1,7)); + private Pion pionN2 = new Pion("Noir","PN",new Position(2,7)); + private Pion pionN3 = new Pion("Noir","PN",new Position(3,7)); + private Pion pionN4 = new Pion("Noir","PN",new Position(4,7)); + private Pion pionN5 = new Pion("Noir","PN",new Position(5,7)); + private Pion pionN6 = new Pion("Noir","PN",new Position(6,7)); + private Pion pionN7 = new Pion("Noir","PN",new Position(7,7)); + private Pion pionN8 = new Pion("Noir","PN",new Position(8,7)); - private Tour TourB1 = new Tour("Blanc",codes[7][0],"TB",new Position(1,1)); - private Tour TourB2 = new Tour("Blanc",codes[7][7],"TB",new Position(8,1)); - private Tour TourN1 = new Tour("Noir",codes[0][0],"TN",new Position(1,8)); - private Tour TourN2 = new Tour("Noir",codes[0][7],"TN",new Position(8,8)); + private Tour TourB1 = new Tour("Blanc","TB",new Position(1,1)); + private Tour TourB2 = new Tour("Blanc","TB",new Position(8,1)); + private Tour TourN1 = new Tour("Noir","TN",new Position(1,8)); + private Tour TourN2 = new Tour("Noir","TN",new Position(8,8)); - private Cavalier CavalierB1 = new Cavalier("Blanc",codes[7][1],"CB",new Position(2,1)); - private Cavalier CavalierB2 = new Cavalier("Blanc",codes[7][6],"CB",new Position(7,1)); - private Cavalier CavalierN1 = new Cavalier("Noir",codes[0][1],"CN",new Position(2,8)); - private Cavalier CavalierN2 = new Cavalier("Noir",codes[0][6],"CN",new Position(7,8)); + private Cavalier CavalierB1 = new Cavalier("Blanc","CB",new Position(2,1)); + private Cavalier CavalierB2 = new Cavalier("Blanc","CB",new Position(7,1)); + private Cavalier CavalierN1 = new Cavalier("Noir","CN",new Position(2,8)); + private Cavalier CavalierN2 = new Cavalier("Noir","CN",new Position(7,8)); - private Fou FouB1 = new Fou("Blanc",codes[7][2],"FB",new Position(3,1)); - private Fou FouB2 = new Fou("Blanc",codes[7][5],"FB",new Position(6,1)); - private Fou FouN1 = new Fou("Noir",codes[0][2],"FN",new Position(3,8)); - private Fou FouN2 = new Fou("Noir",codes[0][5],"FN",new Position(6,8)); + private Fou FouB1 = new Fou("Blanc","FB",new Position(3,1)); + private Fou FouB2 = new Fou("Blanc","FB",new Position(6,1)); + private Fou FouN1 = new Fou("Noir","FN",new Position(3,8)); + private Fou FouN2 = new Fou("Noir","FN",new Position(6,8)); - private Reine ReineB1 = new Reine("Blanc",codes[7][4],"RB",new Position(4,1)); - private Reine ReineN1 = new Reine("Noir",codes[0][4],"RN",new Position(4,8)); + private Reine ReineB1 = new Reine("Blanc","RB",new Position(4,1)); + private Reine ReineN1 = new Reine("Noir","RN",new Position(4,8)); - private Roi RoiB1 = new Roi("Blanc",codes[7][3],"KB",new Position(5,1)); - private Roi RoiN1 = new Roi("Noir",codes[0][3],"KN",new Position(5,8)); + private Roi RoiB1 = new Roi("Blanc","KB",new Position(5,1)); + private Roi RoiN1 = new Roi("Noir","KN",new Position(5,8)); - // A choisir soit on enleve abstract de piece pour avoir le vide soit on garde la classe vide - //private Vide vide = new Vide(); - //private Piece vide = new Piece(); private Piece[][] echiquier = { diff --git a/src/piecesEchiquier/Fou.java b/src/piecesEchiquier/Fou.java index ffdd8b4..a6378f0 100755 --- a/src/piecesEchiquier/Fou.java +++ b/src/piecesEchiquier/Fou.java @@ -2,9 +2,9 @@ package piecesEchiquier; public class Fou extends Piece { - public Fou(String c, String emp,String l, Position pos) + public Fou(String c,String l, Position pos) { - super(c,emp,l,pos); + super(c,l,pos); } diff --git a/src/piecesEchiquier/Piece.java b/src/piecesEchiquier/Piece.java index 4fe0d25..710320c 100755 --- a/src/piecesEchiquier/Piece.java +++ b/src/piecesEchiquier/Piece.java @@ -5,12 +5,10 @@ public class Piece { private String couleur; - //private Position emplacementIni; - private String emp; private String lettre = ".."; private boolean enVie = true; private Position position; - + private Position ini; //constructeur par defaut qui devrait probablement remplacer vide @@ -27,13 +25,14 @@ public class Piece { } - public Piece(String couleur,String emp, String l, Position pos) + public Piece(String couleur,String l, Position pos) { this.couleur = couleur; this.lettre = l; //this.emplacementIni = emp; - this.emp = emp; this.position = pos; + this.ini=pos; + } /* //vérifie une éventuelle collision a chaque case @@ -97,6 +96,14 @@ public class Piece { this.position = position; } + public Position getIni() { + return ini; + } + + public void setIni(Position ini) { + this.ini = ini; + } + public boolean deplacable(Piece p) { return true; diff --git a/src/piecesEchiquier/Pion.java b/src/piecesEchiquier/Pion.java index 220271a..f27fe5d 100755 --- a/src/piecesEchiquier/Pion.java +++ b/src/piecesEchiquier/Pion.java @@ -1,9 +1,11 @@ package piecesEchiquier; public class Pion extends Piece { - public Pion(String couleur, String emp,String l, Position pos) { + private boolean verif=false; + + public Pion(String couleur,String l, Position pos) { - super(couleur,emp,l, pos); + super(couleur,l, pos); } @@ -21,5 +23,17 @@ public class Pion extends Piece { return true; } + public boolean aBouge() + { + if(this.getIni() != this.getPosition()) + { + verif=true; + } + if(this.getIni() == this.getPosition() && verif == false) + { + verif=false; + } + return verif; + } } diff --git a/src/piecesEchiquier/Reine.java b/src/piecesEchiquier/Reine.java index 38a965a..568d58d 100755 --- a/src/piecesEchiquier/Reine.java +++ b/src/piecesEchiquier/Reine.java @@ -2,8 +2,8 @@ package piecesEchiquier; public class Reine extends Piece { - public Reine(String c, String emp,String l, Position pos) + public Reine(String c,String l, Position pos) { - super(c,emp,l,pos); + super(c,l,pos); } } diff --git a/src/piecesEchiquier/Roi.java b/src/piecesEchiquier/Roi.java index 8d77f76..150c31f 100755 --- a/src/piecesEchiquier/Roi.java +++ b/src/piecesEchiquier/Roi.java @@ -1,10 +1,11 @@ package piecesEchiquier; public class Roi extends Piece { + private boolean verif=false; - public Roi(String c, String emp,String l, Position pos) + public Roi(String c,String l, Position pos) { - super(c,emp,l,pos); + super(c,l,pos); } /* @@ -15,4 +16,16 @@ public class Roi extends Piece { } */ + public boolean aBouge() + { + if(this.getIni() != this.getPosition()) + { + verif=true; + } + if(this.getIni() == this.getPosition() && verif == false) + { + verif=false; + } + return verif; + } } diff --git a/src/piecesEchiquier/Tour.java b/src/piecesEchiquier/Tour.java index 106314f..d48f872 100755 --- a/src/piecesEchiquier/Tour.java +++ b/src/piecesEchiquier/Tour.java @@ -1,10 +1,23 @@ package piecesEchiquier; public class Tour extends Piece { + private boolean verif=false; - public Tour(String c, String emp,String l, Position pos) + public Tour(String couleur,String l, Position pos) { - super(c,emp,l,pos); + super(couleur,l,pos); + } + + public boolean aBouge() + { + if(this.getIni() != this.getPosition()) + { + verif=true; + } + if(this.getIni() == this.getPosition() && verif == false) + { + verif=false; + } + return verif; } - }