Loading jeuAssemblage/output.png −108 B (514 B) Loading image diff... jeuAssemblage/src/bot/Move.java +1 −0 Changes for jeuAssemblage/src/bot/Move.java: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ package bot; import piece.Piece; public class Move { protected Piece p; protected int x; protected int y; Loading jeuAssemblage/src/bot/interfaces/IBot.java +2 −1 Changes for jeuAssemblage/src/bot/interfaces/IBot.java: 2 added lines, 1 removed line. Original line number Diff line number Diff line package bot.interfaces; public interface IBot { public void setDifficulty(); public abstract void setDifficulty(); } jeuAssemblage/src/bot/interfaces/IStrategyBot.java +2 −1 Changes for jeuAssemblage/src/bot/interfaces/IStrategyBot.java: 2 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -3,5 +3,6 @@ package bot.interfaces; import bot.Move; public interface IStrategyBot { public Move nextMove(); public abstract Move nextMove(); } jeuAssemblage/src/model/PlayBoard.java +12 −7 Changes for jeuAssemblage/src/model/PlayBoard.java: 12 added lines, 7 removed lines. Original line number Diff line number Diff line Loading @@ -5,6 +5,7 @@ import java.awt.Point; import java.awt.Color; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.List; Loading Loading @@ -195,9 +196,11 @@ public class PlayBoard extends AbstractListenableHM implements Listener, IPlayBo Point pointP2 = getUpperLeftPieceCornerById(id2); if (canBeSwapped(pointP2.x, pointP2.y, p1, id2) && canBeSwapped(pointP1.x, pointP1.y, p2, id1)) { removePieceFromBoardWithoutRegistration(p1); placePieceAsId(pointP1.x, pointP1.y, p2, id2); placePieceAsId(pointP2.x, pointP2.y, p1, id1); return true; } Loading Loading @@ -406,7 +409,10 @@ public class PlayBoard extends AbstractListenableHM implements Listener, IPlayBo throw new IllegalStateException("Piece not found"); } public Map<Integer, Piece> getPieces() { return this.piecesMap; } public Map<Integer, Piece> getPieces() { return new HashMap<>(piecesMap); } public Point getLowerRightPieceCorner() { return new Point(getUpperPieceX(), getUpperPieceY()); } public Point getUpperLeftPieceCornerById(int pieceId) { return new Point(getLowerPieceXById(pieceId), getLowerPieceYById(pieceId)); } Loading Loading @@ -514,17 +520,16 @@ public class PlayBoard extends AbstractListenableHM implements Listener, IPlayBo return colorList; } private final List<IPlayBoardListener> listeners = new ArrayList<>(); @Override public void addPlayBoardListener(IPlayBoardListener listener) { this.listeners.add(listener); // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'addPlayBoardListener'"); } @Override public void removePlayBoardListener(IPlayBoardListener listener) { this.listeners.remove(listener); // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'removePlayBoardListener'"); } } Loading
jeuAssemblage/src/bot/Move.java +1 −0 Changes for jeuAssemblage/src/bot/Move.java: 1 added line, 0 removed lines. Original line number Diff line number Diff line Loading @@ -3,6 +3,7 @@ package bot; import piece.Piece; public class Move { protected Piece p; protected int x; protected int y; Loading
jeuAssemblage/src/bot/interfaces/IBot.java +2 −1 Changes for jeuAssemblage/src/bot/interfaces/IBot.java: 2 added lines, 1 removed line. Original line number Diff line number Diff line package bot.interfaces; public interface IBot { public void setDifficulty(); public abstract void setDifficulty(); }
jeuAssemblage/src/bot/interfaces/IStrategyBot.java +2 −1 Changes for jeuAssemblage/src/bot/interfaces/IStrategyBot.java: 2 added lines, 1 removed line. Original line number Diff line number Diff line Loading @@ -3,5 +3,6 @@ package bot.interfaces; import bot.Move; public interface IStrategyBot { public Move nextMove(); public abstract Move nextMove(); }
jeuAssemblage/src/model/PlayBoard.java +12 −7 Changes for jeuAssemblage/src/model/PlayBoard.java: 12 added lines, 7 removed lines. Original line number Diff line number Diff line Loading @@ -5,6 +5,7 @@ import java.awt.Point; import java.awt.Color; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; import java.util.List; Loading Loading @@ -195,9 +196,11 @@ public class PlayBoard extends AbstractListenableHM implements Listener, IPlayBo Point pointP2 = getUpperLeftPieceCornerById(id2); if (canBeSwapped(pointP2.x, pointP2.y, p1, id2) && canBeSwapped(pointP1.x, pointP1.y, p2, id1)) { removePieceFromBoardWithoutRegistration(p1); placePieceAsId(pointP1.x, pointP1.y, p2, id2); placePieceAsId(pointP2.x, pointP2.y, p1, id1); return true; } Loading Loading @@ -406,7 +409,10 @@ public class PlayBoard extends AbstractListenableHM implements Listener, IPlayBo throw new IllegalStateException("Piece not found"); } public Map<Integer, Piece> getPieces() { return this.piecesMap; } public Map<Integer, Piece> getPieces() { return new HashMap<>(piecesMap); } public Point getLowerRightPieceCorner() { return new Point(getUpperPieceX(), getUpperPieceY()); } public Point getUpperLeftPieceCornerById(int pieceId) { return new Point(getLowerPieceXById(pieceId), getLowerPieceYById(pieceId)); } Loading Loading @@ -514,17 +520,16 @@ public class PlayBoard extends AbstractListenableHM implements Listener, IPlayBo return colorList; } private final List<IPlayBoardListener> listeners = new ArrayList<>(); @Override public void addPlayBoardListener(IPlayBoardListener listener) { this.listeners.add(listener); // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'addPlayBoardListener'"); } @Override public void removePlayBoardListener(IPlayBoardListener listener) { this.listeners.remove(listener); // TODO Auto-generated method stub throw new UnsupportedOperationException("Unimplemented method 'removePlayBoardListener'"); } }