HSH/programmieren-projekt
HSH
/
programmieren-projekt
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/lucasjoshua' into lucasjoshua

This commit is contained in:
Joshua 2024-12-10 17:26:58 +01:00
parent bb61a68f24 8a9e7fb4b2
commit 6f9f5c5063
4 changed files with 152 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/BoardDisplay.java
View File

@ -2,14 +2,22 @@ import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.awt.event.MouseAdapter; import java.awt.event.MouseAdapter;
import java.awt.event.MouseEvent; import java.awt.event.MouseEvent;
import java.util.ArrayList;
import java.util.List;
public class BoardDisplay extends JPanel { public class BoardDisplay extends JPanel {
public BoardDisplay(int gridSize, Icon buttonIcon) { private JButton[][] fields;
super(new GridLayout(gridSize + 1, gridSize + 1)); // +1 wegen extra Zeile/Splate private int gridSize;
private List <Ship> ships;
public BoardDisplay(int gridSize, Player player) {
super(new GridLayout(gridSize + 1, gridSize + 1)); // +1 wegen extra Zeile/Splate
this.fields = new JButton[gridSize][gridSize];
// Erstellung von Spielfeld // Erstellung von Spielfeld
for (int i = 0; i <= gridSize; i++) { for (int i = 0; i <= gridSize; i++) {
for (int j = 0; j <= gridSize; j++) { for (int j = 0; j <= gridSize; j++) {
final int x = i; // Temporäre Variable
final int y = j; // Temporäre Variable
if (i == 0 && j == 0) { if (i == 0 && j == 0) {
add(new JLabel(" ")); add(new JLabel(" "));
} else if (i == 0) { } else if (i == 0) {
@ -28,27 +36,71 @@ public class BoardDisplay extends JPanel {
field.setBackground(Color.LIGHT_GRAY); field.setBackground(Color.LIGHT_GRAY);
field.setOpaque(true); field.setOpaque(true);
field.setBorderPainted(true); field.setBorderPainted(true);
fields[i - 1][j - 1] = field;
add(field);
//field.addMouseListener(new MouseAdapter() {
// @Override
//public void mouseClicked(MouseEvent e) {
// if (SwingUtilities.isRightMouseButton(e)) {
// handleFieldClick(field);
// }
// }
//@Override
//public void mouseExited(MouseEvent e) {
// field.setBackground(Color.LIGHT_GRAY);
// }
// });
int finalI = i;
int finalJ = j;
field.addMouseListener(new MouseAdapter() { field.addMouseListener(new MouseAdapter() {
@Override @Override
public void mouseClicked(MouseEvent e) { public void mouseClicked(MouseEvent e) {
if(SwingUtilities.isRightMouseButton(e)) { Point o= new Point(finalI, finalJ);
handleFieldClick(field); handleFieldClick(field, o,player);
}
}
@Override
public void mouseExited(MouseEvent e) {
// field.setBackground(Color.LIGHT_GRAY);
} }
}); });
add(field);
} }
} }
} }
// this.ships = new ArrayList<Ship>();
} }
private void handleFieldClick(JButton field) { private boolean setShip(Ship ship, Point o, boolean horizontal,Player player) {
field.setBackground(Color.RED); //boolean a = true;
if (placeable(ship, ship.getPosition(), horizontal)) {
ship.setPosition(new Point(o.getX(),o.getY()),player.getBoard().getShips(),gridSize);
ship.setHorizontal(horizontal);
ships.add(ship);
List<Point> occupied = ship.getOccupiedPoints();
for(Point p: occupied) {
fields[p.getX()][p.getY()].setBackground(Color.LIGHT_GRAY);
}
return true;
}else{
return false;
}
}
private boolean placeable(Ship ship,Point o, boolean horizontal) {
if (horizontal && (o.getX() + ship.getSize() > gridSize)) {
return false;
}
if (!horizontal && (o.getY() + ship.getSize() > gridSize)) {
return false;
}
return true;
}
private void selectShip(MouseEvent e) {
Ship current = (Ship) e.getSource();
}
private void handleFieldClick(JButton field, Point o,Player player) {
// Beispiel: Setze ein Schiff bei einem Klick
if (setShip(new Ship(3, "TestShip"), o, true,player)) {
field.setBackground(Color.BLUE); // Visualisiere Schiff
}
} }
} }

131
src/GameBoard.java
View File

@ -4,6 +4,9 @@ import javax.swing.*;
import java.awt.*; import java.awt.*;
import java.awt.event.ActionEvent; import java.awt.event.ActionEvent;
import java.awt.event.ActionListener; import java.awt.event.ActionListener;
import java.awt.event.MouseEvent;
import java.awt.event.MouseAdapter;
import java.util.List;
public class GameBoard extends JPanel { public class GameBoard extends JPanel {
// Funktionshilfen // Funktionshilfen
@ -21,24 +24,48 @@ public class GameBoard extends JPanel {
JButton backButton = new JButton(backButtonIcon); JButton backButton = new JButton(backButtonIcon);
// Eigene ModulButtons // Eigene ModulButtons
JToggleButton leftPlayerModul1 = new JToggleButton("Modul 1"); //TODO: Dynamische Namen durch abgleich mit Semester
JToggleButton leftPlayerModul2 = new JToggleButton("Modul 2");
JToggleButton leftPlayerModul3 = new JToggleButton("Modul 3");
JToggleButton leftPlayerModul4 = new JToggleButton("Modul 4");
JToggleButton leftPlayerModul5 = new JToggleButton("Modul 5");
JToggleButton leftPlayerModul6 = new JToggleButton("Modul 6");
JToggleButton leftPlayerModul7 = new JToggleButton("Reset");
// Gegnerische ModulButtons GameBoard(MainFrame frame, int semesterCounter,Player p1, Player p2) {
JToggleButton rightPlayerModul1 = new JToggleButton("Modul 1"); JToggleButton leftPlayerModul1 = new JToggleButton("Modul 1"); //TODO: Dynamische Namen durch abgleich mit Semester
JToggleButton rightPlayerModul2 = new JToggleButton("Modul 2"); JToggleButton leftPlayerModul2 = new JToggleButton("Modul 2");
JToggleButton rightPlayerModul3 = new JToggleButton("Modul 3"); JToggleButton leftPlayerModul3 = new JToggleButton("Modul 3");
JToggleButton rightPlayerModul4 = new JToggleButton("Modul 4"); JToggleButton leftPlayerModul4 = new JToggleButton("Modul 4");
JToggleButton rightPlayerModul5 = new JToggleButton("Modul 5"); JToggleButton leftPlayerModul5 = new JToggleButton("Modul 5");
JToggleButton rightPlayerModul6 = new JToggleButton("Modul 6"); JToggleButton leftPlayerModul6 = new JToggleButton("Modul 6");
JToggleButton rightPlayerModul7 = new JToggleButton("Bereit"); JToggleButton leftPlayerModul7 = new JToggleButton("Reset");
public void buildPanel(MainFrame frame, int semesterCounter) { JToggleButton[] leftPlayerButtons=new JToggleButton[]{
leftPlayerModul1, leftPlayerModul2, leftPlayerModul3, leftPlayerModul4,
leftPlayerModul5, leftPlayerModul6, leftPlayerModul7,
};
// Gegnerische ModulButtons
JToggleButton rightPlayerModul1 = new JToggleButton("Modul 1");
JToggleButton rightPlayerModul2 = new JToggleButton("Modul 2");
JToggleButton rightPlayerModul3 = new JToggleButton("Modul 3");
JToggleButton rightPlayerModul4 = new JToggleButton("Modul 4");
JToggleButton rightPlayerModul5 = new JToggleButton("Modul 5");
JToggleButton rightPlayerModul6 = new JToggleButton("Modul 6");
JToggleButton rightPlayerModul7 = new JToggleButton("Bereit");
JToggleButton[] rightlayerButtons=new JToggleButton[]{
rightPlayerModul1, rightPlayerModul2, rightPlayerModul3, rightPlayerModul4,
rightPlayerModul5, rightPlayerModul6, rightPlayerModul7,
};
buildPanel(frame, semesterCounter,p1,p2,leftPlayerButtons,rightlayerButtons);
List<Ship> shipsP1 =p1.getBoard().getShips();
updateButtonLabels(shipsP1,leftPlayerButtons);
backButton.addActionListener(e -> frame.showPanel("MainMenu"));
}
private void updateButtonLabels(List<Ship> ships,JToggleButton[] buttons) {
for(int i=0;i<buttons.length &&i<ships.size();i++ ) {
Ship ship = ships.get(i);
buttons[i].setText(ship.getName());
}
}
public void buildPanel(MainFrame frame, int semesterCounter,Player p1,Player p2,JToggleButton[] leftButtons,JToggleButton[] rightButtons) {
// Hauptlayout - BorderLayout für die Anordnung der Komponenten // Hauptlayout - BorderLayout für die Anordnung der Komponenten
setLayout(new BorderLayout()); setLayout(new BorderLayout());
@ -51,51 +78,51 @@ public class GameBoard extends JPanel {
// Panel für die Buttons des linken Spielers (ganz links) // Panel für die Buttons des linken Spielers (ganz links)
JPanel leftButtonsPanel = new JPanel(); JPanel leftButtonsPanel = new JPanel();
leftButtonsPanel.setLayout(new GridLayout(7, 1)); // 6 Buttons untereinander leftButtonsPanel.setLayout(new GridLayout(7, 1)); // 6 Buttons untereinander
leftButtonsPanel.add(leftPlayerModul1); leftButtonsPanel.add(leftButtons[0]);
leftButtonsPanel.add(leftPlayerModul2); leftButtonsPanel.add(leftButtons[1]);
leftButtonsPanel.add(leftPlayerModul3); leftButtonsPanel.add(leftButtons[2]);
leftButtonsPanel.add(leftPlayerModul4); leftButtonsPanel.add(leftButtons[3]);
leftButtonsPanel.add(leftPlayerModul5); leftButtonsPanel.add(leftButtons[4]);
leftButtonsPanel.add(leftPlayerModul6); leftButtonsPanel.add(leftButtons[5]);
leftButtonsPanel.add(leftPlayerModul7); leftButtonsPanel.add(leftButtons[6]);
// Panel für die Buttons des rechten Spielers (ganz rechts) // Panel für die Buttons des rechten Spielers (ganz rechts)
JPanel rightButtonsPanel = new JPanel(); JPanel rightButtonsPanel = new JPanel();
rightButtonsPanel.setLayout(new GridLayout(7, 1)); // 6 Buttons untereinander rightButtonsPanel.setLayout(new GridLayout(7, 1)); // 6 Buttons untereinander
rightButtonsPanel.add(rightPlayerModul1); rightButtonsPanel.add(rightButtons[0]);
rightButtonsPanel.add(rightPlayerModul2); rightButtonsPanel.add(rightButtons[1]);
rightButtonsPanel.add(rightPlayerModul3); rightButtonsPanel.add(rightButtons[2]);
rightButtonsPanel.add(rightPlayerModul4); rightButtonsPanel.add(rightButtons[3]);
rightButtonsPanel.add(rightPlayerModul5); rightButtonsPanel.add(rightButtons[4]);
rightButtonsPanel.add(rightPlayerModul6); rightButtonsPanel.add(rightButtons[5]);
rightButtonsPanel.add(rightPlayerModul7); rightButtonsPanel.add(rightButtons[6]);
// Spielfelder erstellen (eigenes und gegnerisches) // Spielfelder erstellen (eigenes und gegnerisches)
int gridSize = GameController.semesterToBoardSize(semesterCounter); // Größe des Spielfelds int gridSize = GameController.semesterToBoardSize(semesterCounter); // Größe des Spielfelds
// Spielfelder werden in BoardDisplay erstellt // Spielfelder werden in BoardDisplay erstellt
//JPanel ownBoardPanel = new JPanel(new GridLayout(gridSize, gridSize)); //JPanel ownBoardPanel = new JPanel(new GridLayout(gridSize, gridSize));
//JPanel opponentBoardPanel = new JPanel(new GridLayout(gridSize, gridSize)); //JPanel opponentBoardPanel = new JPanel(new GridLayout(gridSize, gridSize));
JPanel ownBoardPanel = new BoardDisplay(gridSize, gameBoardEmtpy); JPanel ownBoardPanel = new BoardDisplay(gridSize,p1);
JPanel opponentBoardPanel = new BoardDisplay(gridSize, gameBoardEmtpy); JPanel opponentBoardPanel = new BoardDisplay(gridSize, p2);
//Buttons in eine Gruppe packen damit diese beim drücken eines anderen Buttons wieder entwählt werden //Buttons in eine Gruppe packen damit diese beim drücken eines anderen Buttons wieder entwählt werden
ButtonGroup leftButtonGroup= new ButtonGroup(); ButtonGroup leftButtonGroup= new ButtonGroup();
leftButtonGroup.add(rightPlayerModul1); leftButtonGroup.add(leftButtons[0]);
leftButtonGroup.add(rightPlayerModul2); leftButtonGroup.add(leftButtons[1]);
leftButtonGroup.add(rightPlayerModul3); leftButtonGroup.add(leftButtons[2]);
leftButtonGroup.add(rightPlayerModul4); leftButtonGroup.add(leftButtons[3]);
leftButtonGroup.add(rightPlayerModul5); leftButtonGroup.add(leftButtons[4]);
leftButtonGroup.add(rightPlayerModul6); leftButtonGroup.add(leftButtons[5]);
leftButtonGroup.add(rightPlayerModul7); leftButtonGroup.add(leftButtons[6]);
ButtonGroup rightButtonGroup= new ButtonGroup(); ButtonGroup rightButtonGroup= new ButtonGroup();
rightButtonGroup.add(leftPlayerModul1); rightButtonGroup.add(rightButtons[0]);
rightButtonGroup.add(leftPlayerModul2); rightButtonGroup.add(rightButtons[1]);
rightButtonGroup.add(leftPlayerModul3); rightButtonGroup.add(rightButtons[2]);
rightButtonGroup.add(leftPlayerModul4); rightButtonGroup.add(rightButtons[3]);
rightButtonGroup.add(leftPlayerModul5); rightButtonGroup.add(rightButtons[4]);
rightButtonGroup.add(leftPlayerModul6); rightButtonGroup.add(rightButtons[5]);
rightButtonGroup.add(leftPlayerModul7); rightButtonGroup.add(rightButtons[6]);
// Panel für beide Spielfelder (nebeneinander in der Mitte) // Panel für beide Spielfelder (nebeneinander in der Mitte)
JPanel centerPanel = new JPanel(); JPanel centerPanel = new JPanel();
@ -108,18 +135,6 @@ public class GameBoard extends JPanel {
add(rightButtonsPanel, BorderLayout.EAST); add(rightButtonsPanel, BorderLayout.EAST);
add(headerPanel, BorderLayout.NORTH); add(headerPanel, BorderLayout.NORTH);
add(centerPanel, BorderLayout.CENTER); add(centerPanel, BorderLayout.CENTER);
}
GameBoard(MainFrame frame, int semesterCounter,Player p1, Player p2) {
buildPanel(frame, semesterCounter);
/*
rightPlayerRightButton.addActionListener(new ActionListener() {
@Override
public void actionPerformed(ActionEvent e) {
toggleRightPlayerIcon();
updateTextFields();
}
}); */
backButton.addActionListener(e -> frame.showPanel("MainMenu"));
} }
} }

3
src/Player.java
View File

@ -43,6 +43,9 @@ public abstract class Player {
return this.name; return this.name;
} }
public Board getBoard() {
return this.board;
}
public abstract void receiveCoin(boolean coin); public abstract void receiveCoin(boolean coin);
} }

11
src/Ship.java
View File

@ -159,4 +159,15 @@ public class Ship {
public boolean isSunk() { public boolean isSunk() {
return sunk; return sunk;
} }
public void setHorizontal(boolean horizontal) {
this.horizontal = horizontal;
}
public int getSize() {
return size;
}
public String getName() {
return name;
}
} }