Skip to content
Snippets Groups Projects
Commit cdc92554 authored by MasterPyo's avatar MasterPyo
Browse files

fix syntax on 4 variants

parent 5331994e
No related merge requests found
Hide whitespace changes
Inline Side-by-side
MavenChess/MavenChess/src/main/java/model/Giant.java
+ 9
− 9
View file @ cdc92554
......@@ -11,7 +11,7 @@ public class Giant extends Piece{
@Override
public ArrayList<Position> getAvailableMoves(Board b) {
ArrayList<Position> moves = new ArrayList<Position>();
ArrayList<Position> moves = new ArrayList<>();
Position arrival;
int i = 1;
......@@ -25,9 +25,9 @@ public class Giant extends Piece{
//left
arrival = new Position(p.getX() + (i*2), p.getY());
if (Position.isCorrect(arrival)) {
if (arrival.isCorrect()) {
if (!left) {
if (b.isEnnemy(arrival, p) || b.isFree(arrival)) {
if (b.isEnemy(arrival, p) || b.isFree(arrival)) {
moves.add(arrival);
}
......@@ -43,9 +43,9 @@ public class Giant extends Piece{
//right
arrival = new Position(p.getX() - (i*2), p.getY());
if (Position.isCorrect(arrival)) {
if (arrival.isCorrect()) {
if (!right) {
if (b.isEnnemy(arrival, p) || b.isFree(arrival)) {
if (b.isEnemy(arrival, p) || b.isFree(arrival)) {
moves.add(arrival);
}
if (b.isKing(arrival)) {
......@@ -61,9 +61,9 @@ public class Giant extends Piece{
arrival = new Position(p.getX(), p.getY() + (i*2));
if (Position.isCorrect(arrival)) {
if (arrival.isCorrect()) {
if (!top) {
if (b.isEnnemy(arrival, p)|| b.isFree(arrival)) {
if (b.isEnemy(arrival, p)|| b.isFree(arrival)) {
moves.add(arrival);
}
}
......@@ -77,9 +77,9 @@ public class Giant extends Piece{
arrival = new Position(p.getX(), p.getY() - (i*2));
if (Position.isCorrect(arrival)) {
if (arrival.isCorrect()) {
if (!down) {
if (b.isEnnemy(arrival, p)|| b.isFree(arrival)) {
if (b.isEnemy(arrival, p)|| b.isFree(arrival)) {
moves.add(arrival);
}
}
......
MavenChess/MavenChess/src/main/java/model/Kamikaze.java
+ 6
− 6
View file @ cdc92554
......@@ -21,29 +21,29 @@ public class Kamikaze extends Pawn {
if(color == Piece.WHITE) { // black and white have an opposite direction behavior
if(this.p.getID() == this.original.getID()){
if(!hasBeenMoved){
arrival = new Position(p.getX(),p.getY()+2);
if(Position.isCorrect(arrival) && b.isFree(arrival)) {moves.add(arrival);}
if(arrival.isCorrect() && b.isFree(arrival)) {moves.add(arrival);}
}
arrival = new Position(p.getX(),p.getY()+1);
if(Position.isCorrect(arrival) && b.isFree(arrival)) {moves.add(arrival);}
if(arrival.isCorrect() && b.isFree(arrival)) {moves.add(arrival);}
}
else {
if(this.p.getID() == this.original.getID()){
if(!hasBeenMoved){
arrival = new Position(p.getX(),p.getY()-2);
if(Position.isCorrect(arrival) && b.isFree(arrival)) {moves.add(arrival);}
if(arrival.isCorrect() && b.isFree(arrival)) {moves.add(arrival);}
}
arrival = new Position(p.getX(),p.getY()-1);
if(Position.isCorrect(arrival) && b.isFree(arrival)) {moves.add(arrival);}
if(arrival.isCorrect() && b.isFree(arrival)) {moves.add(arrival);}
}
return moves;
......
MavenChess/MavenChess/src/main/java/model/Nwap.java
+ 12
− 12
View file @ cdc92554
......@@ -17,58 +17,58 @@ public class Nwap extends Pawn {
if(color == Piece.WHITE) { // black and white have an opposite direction behavior
if(this.p.getID() == this.original.getID()){
if(!hasBeenMoved){
// up left 2
arrival = new Position(p.getX()-2, p.getY() +2);
if(Position.isCorrect(arrival) && b.isFree(arrival)) { moves.add(arrival); }
if(arrival.isCorrect() && b.isFree(arrival)) { moves.add(arrival); }
// up left 2
arrival = new Position(p.getX()+2, p.getY() +2);
if(Position.isCorrect(arrival) && b.isFree(arrival)) { moves.add(arrival); }
if(arrival.isCorrect() && b.isFree(arrival)) { moves.add(arrival); }
}
// up left 1
arrival = new Position(p.getX()-1, p.getY() +1);
if(Position.isCorrect(arrival) && b.isFree(arrival)) { moves.add(arrival); }
if(arrival.isCorrect() && b.isFree(arrival)) { moves.add(arrival); }
// up left 1
arrival = new Position(p.getX()+1, p.getY() +1);
if(Position.isCorrect(arrival) && b.isFree(arrival)) { moves.add(arrival); }
if(arrival.isCorrect() && b.isFree(arrival)) { moves.add(arrival); }
arrival = new Position(p.getX(),p.getY()+1);
if(b.isEnnemy(arrival,p)) {moves.add(arrival);}
if(b.isEnemy(arrival,p)) {moves.add(arrival);}
}
else {
if(this.p.getID() == this.original.getID()){
if(!hasBeenMoved){
// up left 2
arrival = new Position(p.getX()-2, p.getY() -2);
if(Position.isCorrect(arrival) && b.isFree(arrival)) { moves.add(arrival); }
if(arrival.isCorrect() && b.isFree(arrival)) { moves.add(arrival); }
// up left 2
arrival = new Position(p.getX()+2, p.getY() -2);
if(Position.isCorrect(arrival) && b.isFree(arrival)) { moves.add(arrival); }
if(arrival.isCorrect() && b.isFree(arrival)) { moves.add(arrival); }
}
// up left 1
arrival = new Position(p.getX()-1, p.getY() -1);
if(Position.isCorrect(arrival) && b.isFree(arrival)) { moves.add(arrival); }
if(arrival.isCorrect() && b.isFree(arrival)) { moves.add(arrival); }
// up left 1
arrival = new Position(p.getX()+1, p.getY() -1);
if(Position.isCorrect(arrival) && b.isFree(arrival)) { moves.add(arrival); }
if(arrival.isCorrect() && b.isFree(arrival)) { moves.add(arrival); }
arrival = new Position(p.getX(),p.getY()-1);
if(b.isEnnemy(arrival,p)) {moves.add(arrival);}
if(b.isEnemy(arrival,p)) {moves.add(arrival);}
}
return moves;
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment