From d3f5421808d1502d336bc6bc6746f7f6acdddb68 Mon Sep 17 00:00:00 2001 From: Joshua Date: Sat, 14 Dec 2024 17:26:46 +0100 Subject: [PATCH] Added kontextText variations. Added functionality to "Ready" Button. --- src/BoardDisplay.java | 2 +- src/GameBoard.java | 22 ++++++++++++++++++++-- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/src/BoardDisplay.java b/src/BoardDisplay.java index af7975b..d1db8b2 100644 --- a/src/BoardDisplay.java +++ b/src/BoardDisplay.java @@ -28,7 +28,7 @@ public class BoardDisplay extends JPanel { this.ships = new ArrayList<>(); this.player = player; this.gridSize = gridSize; - + System.out.println("Name in Boarddisplay: " + player.getName());//Testausgabe // Erstellung von Spielfeld for (int i = 0; i <= gridSize; i++) { for (int j = 0; j <= gridSize; j++) { diff --git a/src/GameBoard.java b/src/GameBoard.java index f65b101..69e252b 100644 --- a/src/GameBoard.java +++ b/src/GameBoard.java @@ -23,9 +23,19 @@ public class GameBoard extends JPanel { ImageIcon gameBoardEmtpy = new ImageIcon("graphics/gameboardempty.png"); ImageIcon gameBoardX = new ImageIcon("graphics/gameboardx.png"); + // kontextText Text-Strings + String kT1 = "Bitte Schiffe setzten"; + String kT2 = "Warte auf Gegner"; + String kT3 = "Du fängst an"; + String kT4 = "Dein Gegner fängt an"; + String kT5 = "Du bist am Zug"; + String kT6 = "Dein Gegner ist am Zug"; + String kT7 = "Du hast das Spiel gewonnen"; + String kT8 = "Du hast das Spiel verloren"; + // Labels JLabel frameTitle = new JLabel("GameBoard"); - JLabel kontextText = new JLabel("Bitte Schiffe setzten"); + JLabel kontextText = new JLabel(kT1); JButton backButton = new JButton(backButtonIcon); // Eigene ModulButtons @@ -143,6 +153,14 @@ public class GameBoard extends JPanel { ownBoardPanel.resetAllShips(); } }); + + rightPlayerModul7.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + //TODO richtige funktion einfügen + kontextText.setText(kT2); + } + }); // Panel für die Buttons des rechten Spielers (ganz rechts) //JPanel ownBoardPanel = new JPanel(new GridLayout(gridSize, gridSize)); @@ -159,7 +177,7 @@ public class GameBoard extends JPanel { playerNamesPanel.setLayout(new GridLayout(1, 2)); // Zwei Labels nebeneinander JLabel player1NameLabel = new JLabel(p1.getName(), SwingConstants.CENTER); JLabel player2NameLabel = new JLabel(p2.getName(), SwingConstants.CENTER); - System.out.println(player2NameLabel.getText()); + System.out.println("Name in Gameboard: " + player1NameLabel.getText()); // Schrift und Formatierung der Labels player1NameLabel.setFont(new Font("Roboto", Font.BOLD, 18));