undo last merge

devUi
dstuck 2025-06-21 15:54:17 +02:00 committed by stuckd
parent 724cde3fd0
commit d5cfa77e09
1 changed files with 28 additions and 58 deletions

View File

@ -238,48 +238,19 @@ public class SpielFrame extends JFrame {
selectables = game.getLegalMoveableSquares(selectedSquare); selectables = game.getLegalMoveableSquares(selectedSquare);
for ( for (Square square : selectables) {
JButton b = buttons.get(mirrowedGrid(square.ordinal()));
Square square : selectables) { final Move move = new Move(selectedSquare, square);
JButton b = buttons.get(mirrowedGrid(square.ordinal())); b.setEnabled(true);
final Move move = new Move(selectedSquare, square); b.setBackground(new Color(230, 100, 100));
b.setEnabled(true); b.addActionListener(new ButtonMovePieceListener(this, this.game, move));
b.setBackground(new Color(230, 100, 100)); }
for (ActionListener al : b.getActionListeners()) { break;
b.removeActionListener(al); case finished:
} clearButtons();
b.addActionListener(new ActionListener() { break;
@Override default:
public void actionPerformed(ActionEvent e) { break;
if(game.isPromotionMove(move)) {
game.doPromotionMove(showPromotion(), selectedSquare, square);
} else {
game.playMove(move);
}
if (game.isDraw()) {
game.stopClock();
mode = BoardMode.finished;
showDraw();
} else if (game.isMate()) {
game.stopClock();
mode = BoardMode.finished;
showWin(game.getActivePlayer());
}
mode = BoardMode.normal;
setCursor(null);
erstelleBrett();
}
});
}
break;
case finished:
clearButtons();
break;
default:
break;
} }
@ -323,24 +294,23 @@ public class SpielFrame extends JFrame {
dialog.setLayout(new GridLayout(2, 2)); dialog.setLayout(new GridLayout(2, 2));
dialog.setSize(300, 200); dialog.setSize(300, 200);
int[] pictures = {81, 82, 66, 78, 113, 114, 98, 110}; int[] pictures = { 81, 82, 66, 78, 113, 114, 98, 110 };
for (int i = 0; i < 4; i++) { for (int i = 0; i < 4; i++) {
int index = (game.getActivePlayer() - 1) * 4 + i; int index = (game.getActivePlayer() - 1) * 4 + i;
JButton jb = new JButton(); JButton jb = new JButton();
jb.setIcon(new ImageIcon("src/main/resources/" + pictures[index] + ".png")); jb.setIcon(new ImageIcon("src/main/resources/" + pictures[index] + ".png"));
int selectedPiece = index; int selectedPiece = index;
jb.addActionListener(e -> { jb.addActionListener(e -> {
System.out.println("Test"); System.out.println("Test");
result[0] = selectedPiece; result[0] = selectedPiece;
dialog.dispose(); dialog.dispose();
}); });
dialog.add(jb); dialog.add(jb);
} }
dialog.setLocationRelativeTo(null); dialog.setLocationRelativeTo(null);
dialog.setVisible(true); dialog.setVisible(true);
return result[0]; return result[0];
} }