From 7ef04711c39ba11cdd79844a93d44f20be51fa84 Mon Sep 17 00:00:00 2001 From: ole Date: Fri, 20 Dec 2024 17:29:37 +0100 Subject: [PATCH 1/4] add getter for Player 1 --- src/GameBoard.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/GameBoard.java b/src/GameBoard.java index a645f9e..b6aa09c 100644 --- a/src/GameBoard.java +++ b/src/GameBoard.java @@ -212,4 +212,14 @@ public class GameBoard extends JPanel { this.ownBoardPanel.refresh(); this.opponentBoardPanel.refresh(); } + + /** + * Getter für Player1 + * @return Player 1 + * @author Peer Ole Wachtel + */ + public Player getP1() { + return p1; + } + } From f4cf28f4bf1c5f04279e7f64ac59fb81f68f11b5 Mon Sep 17 00:00:00 2001 From: ole Date: Fri, 20 Dec 2024 17:30:21 +0100 Subject: [PATCH 2/4] add endScreen machanic --- src/LocalPlayer.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/LocalPlayer.java b/src/LocalPlayer.java index f3e434b..6c001e8 100644 --- a/src/LocalPlayer.java +++ b/src/LocalPlayer.java @@ -22,7 +22,7 @@ public class LocalPlayer extends Player { switch (hitResponse.getType()) { case HIT, SUNK -> this.myTurn = false; case MISS -> this.myTurn = true; - case VICTORY -> System.out.println("Game Over"); //TODO Was halt bei victory passiert ist hier wurder verloheren + case VICTORY -> GameController.getMainFrame().showPanelLoose("", this); //TODO Was halt bei victory passiert ist hier wurder verloheren } GameController.getMainFrame().refreshGameBoard(); } @@ -33,7 +33,7 @@ public class LocalPlayer extends Player { switch (hitResponse.getType()) { case HIT, SUNK -> this.myTurn = true; case MISS -> this.myTurn = false; - case VICTORY -> System.out.println("Win"); // TODO was halt beim victory passier ist hier wurde gewonnen + case VICTORY -> GameController.getMainFrame().showPanelWin("", this); // TODO was halt beim victory passier ist hier wurde gewonnen } GameController.getMainFrame().refreshGameBoard(); } From 3370975e579ce73026394845ae429e0eacf948cc Mon Sep 17 00:00:00 2001 From: ole Date: Fri, 20 Dec 2024 17:31:32 +0100 Subject: [PATCH 3/4] change parameta from showPanelWin and loos to check the request --- src/MainFrame.java | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/src/MainFrame.java b/src/MainFrame.java index 79454d4..6d0b533 100644 --- a/src/MainFrame.java +++ b/src/MainFrame.java @@ -127,9 +127,13 @@ public class MainFrame extends JFrame { /** * Spezifische ShowPanel für WinScreen Klasse * @param panelName Name des anzuzeigenden Panels - * @author Lucas Bronson + * @param player Player von dem die funktion aufgerufen worden ist + * @author Lucas Bronson, Peer Ole Wachtel */ - public void showPanelWin(String panelName){ + public void showPanelWin(String panelName, Player player){ + if(player != gameBoard.getP1()){ + return; + } WinScreen winScreen = new WinScreen(this); mainPanel.add(winScreen, panelName); mainPanel.revalidate(); @@ -140,9 +144,13 @@ public class MainFrame extends JFrame { /** * Spezifische ShowPanel für LooseScreen Klasse * @param panelName Name des anzuzeigenden Panels - * @author Lucas Bronson + * @param player Player von dem die funktion aufgerufen worden ist + * @author Lucas Bronson, Peer Ole Wachtel */ - public void showPanelLoose(String panelName){ + public void showPanelLoose(String panelName, Player player){ + if(player != gameBoard.getP1()){ + return; + } LooseScreen looseScreen = new LooseScreen(this); mainPanel.add(looseScreen,panelName); mainPanel.revalidate(); From bfb25dfe2c2189d1033ca8c41ad9ffb1ab07a75b Mon Sep 17 00:00:00 2001 From: ole Date: Fri, 20 Dec 2024 17:32:53 +0100 Subject: [PATCH 4/4] disable testButton --- src/startLocalGame.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/startLocalGame.java b/src/startLocalGame.java index 5253c78..1af1fa1 100644 --- a/src/startLocalGame.java +++ b/src/startLocalGame.java @@ -200,7 +200,7 @@ public class startLocalGame extends JPanel { testButton.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - frame.showPanelWin("WinPanel"); + //frame.showPanelWin("WinPanel"); } });