cleanup-work #22

Merged
lgc merged 12 commits from cleanup-work into main 2024-12-22 23:06:00 +00:00
4 changed files with 25 additions and 7 deletions
Showing only changes of commit 7f610b4a90 - Show all commits

View File

@ -212,4 +212,14 @@ public class GameBoard extends JPanel {
this.ownBoardPanel.refresh(); this.ownBoardPanel.refresh();
this.opponentBoardPanel.refresh(); this.opponentBoardPanel.refresh();
} }
/**
* Getter für Player1
* @return Player 1
* @author Peer Ole Wachtel
*/
public Player getP1() {
return p1;
}
} }

View File

@ -24,7 +24,7 @@ public class LocalPlayer extends Player {
switch (hitResponse.getType()) { switch (hitResponse.getType()) {
case HIT, SUNK -> this.myTurn = false; case HIT, SUNK -> this.myTurn = false;
case MISS -> this.myTurn = true; 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(); GameController.getMainFrame().refreshGameBoard();
} }
@ -35,7 +35,7 @@ public class LocalPlayer extends Player {
switch (hitResponse.getType()) { switch (hitResponse.getType()) {
case HIT, SUNK -> this.myTurn = true; case HIT, SUNK -> this.myTurn = true;
case MISS -> this.myTurn = false; 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(); GameController.getMainFrame().refreshGameBoard();
} }

View File

@ -127,9 +127,13 @@ public class MainFrame extends JFrame {
/** /**
* Spezifische ShowPanel für WinScreen Klasse * Spezifische ShowPanel für WinScreen Klasse
* @param panelName Name des anzuzeigenden Panels * @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); WinScreen winScreen = new WinScreen(this);
mainPanel.add(winScreen, panelName); mainPanel.add(winScreen, panelName);
mainPanel.revalidate(); mainPanel.revalidate();
@ -140,9 +144,13 @@ public class MainFrame extends JFrame {
/** /**
* Spezifische ShowPanel für LooseScreen Klasse * Spezifische ShowPanel für LooseScreen Klasse
* @param panelName Name des anzuzeigenden Panels * @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); LooseScreen looseScreen = new LooseScreen(this);
mainPanel.add(looseScreen,panelName); mainPanel.add(looseScreen,panelName);
mainPanel.revalidate(); mainPanel.revalidate();

View File

@ -200,7 +200,7 @@ public class startLocalGame extends JPanel {
testButton.addActionListener(new ActionListener() { testButton.addActionListener(new ActionListener() {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
frame.showPanelWin("WinPanel"); //frame.showPanelWin("WinPanel");
} }
}); });