Compare commits
3 Commits
Author | SHA1 | Date |
---|---|---|
|
55cb25220e | |
|
350a5b43ea | |
|
0427a40b47 |
|
@ -11,8 +11,10 @@ import javax.swing.BorderFactory;
|
||||||
import com.github.bhlangonijr.chesslib.game.Game;
|
import com.github.bhlangonijr.chesslib.game.Game;
|
||||||
|
|
||||||
import de.hs_mannheim.informatik.chess.model.ChessEngine;
|
import de.hs_mannheim.informatik.chess.model.ChessEngine;
|
||||||
|
import de.hs_mannheim.informatik.chess.model.GameMode;
|
||||||
import de.hs_mannheim.informatik.chess.model.MoveDTO;
|
import de.hs_mannheim.informatik.chess.model.MoveDTO;
|
||||||
import de.hs_mannheim.informatik.chess.model.PieceDTO;
|
import de.hs_mannheim.informatik.chess.model.PieceDTO;
|
||||||
|
import de.hs_mannheim.informatik.chess.model.Timer;
|
||||||
import de.hs_mannheim.informatik.chess.model.BoardDTO;
|
import de.hs_mannheim.informatik.chess.model.BoardDTO;
|
||||||
import de.hs_mannheim.informatik.chess.view.GameGui;
|
import de.hs_mannheim.informatik.chess.view.GameGui;
|
||||||
import de.hs_mannheim.informatik.chess.view.MainGui;
|
import de.hs_mannheim.informatik.chess.view.MainGui;
|
||||||
|
@ -25,12 +27,14 @@ public class GameController {
|
||||||
private boolean gameOver = false;
|
private boolean gameOver = false;
|
||||||
private int selectedRow = -1, selectedCol = -1;
|
private int selectedRow = -1, selectedCol = -1;
|
||||||
private List<int[]> highlightedFields = new ArrayList<>();
|
private List<int[]> highlightedFields = new ArrayList<>();
|
||||||
|
private GameMode gameMode;
|
||||||
|
|
||||||
public GameController(GameGui gui, ChessEngine engine, GameEndCallback callback) {
|
public GameController(GameGui gui, ChessEngine engine, GameEndCallback callback, GameMode gameMode) {
|
||||||
|
this.gameMode = gameMode;
|
||||||
this.gui = gui;
|
this.gui = gui;
|
||||||
this.engine = engine;
|
this.engine = engine;
|
||||||
this.callback = callback;
|
this.callback = callback;
|
||||||
engine.initTimers(3, 0);
|
engine.initTimers(gameMode.minutes, gameMode.incrementSeconds);
|
||||||
time();
|
time();
|
||||||
initListeners();
|
initListeners();
|
||||||
updateGuiBoard();
|
updateGuiBoard();
|
||||||
|
@ -204,6 +208,8 @@ public class GameController {
|
||||||
|
|
||||||
updateGuiBoard();
|
updateGuiBoard();
|
||||||
gui.updateMoveList(engine.getMoveListStringsGrouped());
|
gui.updateMoveList(engine.getMoveListStringsGrouped());
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// ---- HIER ist die Matt/Patt/Remis-Prüfung ----
|
// ---- HIER ist die Matt/Patt/Remis-Prüfung ----
|
||||||
if (engine.isMated()) {
|
if (engine.isMated()) {
|
||||||
|
@ -229,13 +235,26 @@ public class GameController {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void switchTimers() {
|
private void switchTimers() {
|
||||||
if (engine.getCurrentPlayer().equals("WHITE")) {
|
GameMode mode = engine.getGameMode(); // muss Engine speichern
|
||||||
engine.getBlackTimer().stop();
|
Timer whiteTimer = engine.getWhiteTimer();
|
||||||
engine.getWhiteTimer().start();
|
Timer blackTimer = engine.getBlackTimer();
|
||||||
} else {
|
|
||||||
engine.getWhiteTimer().stop();
|
if (engine.getCurrentPlayer().equals("WHITE")) {
|
||||||
engine.getBlackTimer().start();
|
// Der letzte Spieler war Schwarz – ihm ggf. Inkrement geben
|
||||||
}
|
if (mode.incrementSeconds > 0) {
|
||||||
|
blackTimer.addSeconds(mode.incrementSeconds);
|
||||||
|
}
|
||||||
|
blackTimer.stop();
|
||||||
|
whiteTimer.start();
|
||||||
|
} else {
|
||||||
|
// Der letzte Spieler war Weiß – ihm ggf. Inkrement geben
|
||||||
|
if (mode.incrementSeconds > 0) {
|
||||||
|
whiteTimer.addSeconds(mode.incrementSeconds);
|
||||||
|
}
|
||||||
|
whiteTimer.stop();
|
||||||
|
blackTimer.start();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -5,6 +5,7 @@ import de.hs_mannheim.informatik.chess.view.PgnGui;
|
||||||
import de.hs_mannheim.informatik.chess.view.PgnSelectionGui;
|
import de.hs_mannheim.informatik.chess.view.PgnSelectionGui;
|
||||||
import de.hs_mannheim.informatik.chess.view.CreativeGui;
|
import de.hs_mannheim.informatik.chess.view.CreativeGui;
|
||||||
import de.hs_mannheim.informatik.chess.view.GameGui;
|
import de.hs_mannheim.informatik.chess.view.GameGui;
|
||||||
|
import de.hs_mannheim.informatik.chess.view.GameModeSelector;
|
||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
@ -15,6 +16,7 @@ import javax.swing.JOptionPane;
|
||||||
import com.github.bhlangonijr.chesslib.game.Game;
|
import com.github.bhlangonijr.chesslib.game.Game;
|
||||||
|
|
||||||
import de.hs_mannheim.informatik.chess.model.ChessEngine;
|
import de.hs_mannheim.informatik.chess.model.ChessEngine;
|
||||||
|
import de.hs_mannheim.informatik.chess.model.GameMode;
|
||||||
|
|
||||||
public class MainController {
|
public class MainController {
|
||||||
private MainGui mainGui;
|
private MainGui mainGui;
|
||||||
|
@ -28,9 +30,11 @@ public class MainController {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void startNormalMode() {
|
private void startNormalMode() {
|
||||||
|
|
||||||
|
GameMode mode = GameModeSelector.selectGameMode();
|
||||||
mainGui.close();
|
mainGui.close();
|
||||||
GameGui gameGui = new GameGui();
|
GameGui gameGui = new GameGui();
|
||||||
ChessEngine engine = new ChessEngine();
|
ChessEngine engine = new ChessEngine(mode);
|
||||||
GameEndCallback callback = new GameEndCallback() {
|
GameEndCallback callback = new GameEndCallback() {
|
||||||
public void onNewGameRequested() {
|
public void onNewGameRequested() {
|
||||||
startNormalMode();
|
startNormalMode();
|
||||||
|
@ -39,7 +43,7 @@ public class MainController {
|
||||||
new MainController();
|
new MainController();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
new GameController(gameGui, engine, callback);
|
new GameController(gameGui, engine, callback,mode);
|
||||||
}
|
}
|
||||||
|
|
||||||
private void startCreativeMode() {
|
private void startCreativeMode() {
|
||||||
|
|
|
@ -30,9 +30,19 @@ public class ChessEngine {
|
||||||
private int currentMoveIndex = 0;
|
private int currentMoveIndex = 0;
|
||||||
private Timer whiteTimer;
|
private Timer whiteTimer;
|
||||||
private Timer blackTimer;
|
private Timer blackTimer;
|
||||||
|
private final GameMode mode;
|
||||||
|
|
||||||
public ChessEngine() {
|
public ChessEngine() {
|
||||||
logging();
|
this.mode = null;
|
||||||
|
logging();
|
||||||
|
board = new Board();
|
||||||
|
};
|
||||||
|
|
||||||
|
public ChessEngine(GameMode mode) {
|
||||||
|
this.mode = mode;
|
||||||
|
whiteTimer = new Timer(mode.minutes, mode.seconds);
|
||||||
|
blackTimer = new Timer(mode.minutes, mode.seconds);
|
||||||
|
logging();
|
||||||
board = new Board();
|
board = new Board();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -371,5 +381,13 @@ public class ChessEngine {
|
||||||
|
|
||||||
public Timer getWhiteTimer() { return whiteTimer; }
|
public Timer getWhiteTimer() { return whiteTimer; }
|
||||||
public Timer getBlackTimer() { return blackTimer; }
|
public Timer getBlackTimer() { return blackTimer; }
|
||||||
|
|
||||||
|
public GameMode getGameMode() {
|
||||||
|
// TODO Auto-generated method stub
|
||||||
|
return mode;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,26 @@
|
||||||
|
package de.hs_mannheim.informatik.chess.model;
|
||||||
|
|
||||||
|
public enum GameMode {
|
||||||
|
CLASSIC(3, 0, 0),
|
||||||
|
RAPID(5, 0, 0),
|
||||||
|
BULLET(1, 0, 10); // 1 Minute + 10 Sek Inkrement
|
||||||
|
|
||||||
|
public final int minutes;
|
||||||
|
public final int seconds;
|
||||||
|
public final int incrementSeconds;
|
||||||
|
|
||||||
|
GameMode(int minutes, int seconds, int incrementSeconds) {
|
||||||
|
this.minutes = minutes;
|
||||||
|
this.seconds = seconds;
|
||||||
|
this.incrementSeconds = incrementSeconds;
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public String toString() {
|
||||||
|
return switch (this) {
|
||||||
|
case CLASSIC -> "3 Minuten (klassisch)";
|
||||||
|
case RAPID -> "5 Minuten (rapid)";
|
||||||
|
case BULLET -> "1 Minute + 10 Sek Inkrement";
|
||||||
|
};
|
||||||
|
}
|
||||||
|
}
|
|
@ -56,6 +56,10 @@ public class Timer {
|
||||||
public int getSecondsLeft() {
|
public int getSecondsLeft() {
|
||||||
return secondsLeft;
|
return secondsLeft;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void addSeconds(int seconds) {
|
||||||
|
this.secondsLeft += seconds;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -199,8 +199,8 @@ public class GameGui {
|
||||||
JPanel panel = new JPanel(new GridLayout(2, 1));
|
JPanel panel = new JPanel(new GridLayout(2, 1));
|
||||||
panel.setBackground(new Color(0x0d1b2a));
|
panel.setBackground(new Color(0x0d1b2a));
|
||||||
|
|
||||||
whiteTimerLabel = new JLabel("Weiß: 03:00", SwingConstants.CENTER);
|
whiteTimerLabel = new JLabel("Weiß: --:--", SwingConstants.CENTER);
|
||||||
blackTimerLabel = new JLabel("Schwarz: 03:00", SwingConstants.CENTER);
|
blackTimerLabel = new JLabel("Schwarz: --:--", SwingConstants.CENTER);
|
||||||
|
|
||||||
whiteTimerLabel.setFont(new Font("SansSerif", Font.BOLD, 24));
|
whiteTimerLabel.setFont(new Font("SansSerif", Font.BOLD, 24));
|
||||||
whiteTimerLabel.setForeground(Color.WHITE);
|
whiteTimerLabel.setForeground(Color.WHITE);
|
||||||
|
|
|
@ -0,0 +1,23 @@
|
||||||
|
package de.hs_mannheim.informatik.chess.view;
|
||||||
|
|
||||||
|
import javax.swing.*;
|
||||||
|
|
||||||
|
import de.hs_mannheim.informatik.chess.model.GameMode;
|
||||||
|
|
||||||
|
public class GameModeSelector {
|
||||||
|
|
||||||
|
public static GameMode selectGameMode() {
|
||||||
|
GameMode[] options = GameMode.values();
|
||||||
|
GameMode selected = (GameMode) JOptionPane.showInputDialog(
|
||||||
|
null,
|
||||||
|
"Wähle den Spielmodus:",
|
||||||
|
"Spielmodus auswählen",
|
||||||
|
JOptionPane.QUESTION_MESSAGE,
|
||||||
|
null,
|
||||||
|
options,
|
||||||
|
GameMode.CLASSIC
|
||||||
|
);
|
||||||
|
|
||||||
|
return selected != null ? selected : GameMode.CLASSIC;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in New Issue