From 7a9b70c271ebbe9b54f86baf1a86d31e4ddadedc Mon Sep 17 00:00:00 2001 From: Joshua Date: Tue, 10 Dec 2024 12:36:34 +0100 Subject: [PATCH] Started making changes to JoinGame etc. --- src/JoinGame.java | 25 ++++++++++++++++++++++++- src/startLocalGame.java | 3 ++- src/startLocalGameLoadingScreen.java | 4 ++-- 3 files changed, 28 insertions(+), 4 deletions(-) diff --git a/src/JoinGame.java b/src/JoinGame.java index b3ac5a0..3251d2d 100644 --- a/src/JoinGame.java +++ b/src/JoinGame.java @@ -1,5 +1,14 @@ import java.awt.*; import javax.swing.*; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; + +/* +TODO: evtl an Lucas: die "JoinGame" muss noch informationen erhalten, welche Spieler erstellt wurden und welches Semester +Also die startMultiplayerGame muss JoinGame mit parametern für (HumanPlayer/AiEasy/AiNormal/AiHard, Semesteranzahl, Spielername) (3 Parameter) erhalten + + */ + public class JoinGame extends JPanel { ImageIcon backButtonIcon = new ImageIcon("graphics/backButton.png"); @@ -51,5 +60,19 @@ public class JoinGame extends JPanel { backButton.addActionListener(e -> frame.showPanel("MultiplayerGame")); losButton.addActionListener(e -> frame.showPanel("Verbinden")); + /* + losButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + frame.showPanel("Verbinden"); + //public static void startOnlineGame(Class localPlayerClass, String localPlayerName, InetSocketAddress + // address, int size) throws IOException { + if(playerType == 1) { //Beispiel (für playertape wäre z.B. 1 humanPlayer etc.) + GameController.startOnlineGame(HumanPlayer.class, playerName, adress); // + } + + } + }); + */ } -} +} \ No newline at end of file diff --git a/src/startLocalGame.java b/src/startLocalGame.java index 27b5b70..cf08aa9 100644 --- a/src/startLocalGame.java +++ b/src/startLocalGame.java @@ -154,6 +154,7 @@ public class startLocalGame extends JPanel { updateTextFields(); } }); + backButton.addActionListener(e -> frame.showPanel("MainMenu")); testButton.addActionListener(e -> frame.showPanelSLG("GameBoard",1,p1,p2)); //startButton.addActionListener(e -> frame.showPanelSLG("GameBoard", semesterCounter,p1, p2)); // TODO ECHTE FUNKTION EINFÜGEN @@ -161,7 +162,7 @@ public class startLocalGame extends JPanel { @Override public void actionPerformed(ActionEvent e) { frame.showPanelSLGLS("startLocalGameLoadingScreen", semesterCounter); //TODO - if (leftPlayerIcon.getIcon() == humanPlayerIcon) {// TODO Diverse KiIcons erstellen für diffs + if (leftPlayerIcon.getIcon() == humanPlayerIcon) {// TODO Wird name wirklich weitergegeben? if (rightPlayerIcon.getIcon() == aiPlayerEasyIcon) { GameController.startLocalGame(HumanPlayer.class, leftPlayerNickname, SpecificAiPlayerEasy.class, GameController.semesterToBoardSize(semesterCounter)); } else if (rightPlayerIcon.getIcon() == aiPlayerNormalIcon) { diff --git a/src/startLocalGameLoadingScreen.java b/src/startLocalGameLoadingScreen.java index 7499e99..c8f180a 100644 --- a/src/startLocalGameLoadingScreen.java +++ b/src/startLocalGameLoadingScreen.java @@ -9,7 +9,7 @@ public class startLocalGameLoadingScreen extends JPanel{ // Label mit dem Text erstellen JLabel loadingLabel = new JLabel("Spiel wird gestartet, bitte warten..."); loadingLabel.setHorizontalAlignment(SwingConstants.CENTER); // Horizontal zentrieren - loadingLabel.setVerticalAlignment(SwingConstants.CENTER); // Vertikal zentrieren + loadingLabel.setVerticalAlignment(SwingConstants.CENTER); // Vertikal zentrieren // Schriftgröße anpassen (optional) loadingLabel.setFont(new Font("Arial", Font.PLAIN, 18)); @@ -17,4 +17,4 @@ public class startLocalGameLoadingScreen extends JPanel{ // Label zum Panel hinzufügen add(loadingLabel, BorderLayout.CENTER); } -} +} \ No newline at end of file