From cdc92554b21e9f82b47537c2dea6844fb22faa2c Mon Sep 17 00:00:00 2001
From: MasterPyo <olivier.pillods@gmail.com>
Date: Fri, 28 Apr 2023 22:03:32 +0200
Subject: [PATCH] fix syntax on 4 variants
---
.../MavenChess/src/main/java/model/Giant.java | 18 +++++++-------
.../src/main/java/model/Kamikaze.java | 12 +++++-----
.../MavenChess/src/main/java/model/Nwap.java | 24 +++++++++----------
3 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/MavenChess/MavenChess/src/main/java/model/Giant.java b/MavenChess/MavenChess/src/main/java/model/Giant.java
index 91fd879..edc669a 100644
--- a/MavenChess/MavenChess/src/main/java/model/Giant.java
+++ b/MavenChess/MavenChess/src/main/java/model/Giant.java
@@ -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);
}
}
diff --git a/MavenChess/MavenChess/src/main/java/model/Kamikaze.java b/MavenChess/MavenChess/src/main/java/model/Kamikaze.java
index ff30aaa..1b8909d 100644
--- a/MavenChess/MavenChess/src/main/java/model/Kamikaze.java
+++ b/MavenChess/MavenChess/src/main/java/model/Kamikaze.java
@@ -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;
diff --git a/MavenChess/MavenChess/src/main/java/model/Nwap.java b/MavenChess/MavenChess/src/main/java/model/Nwap.java
index f6f5a4a..e15c448 100644
--- a/MavenChess/MavenChess/src/main/java/model/Nwap.java
+++ b/MavenChess/MavenChess/src/main/java/model/Nwap.java
@@ -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;
--
GitLab