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

lucasjoshua #26

Merged
lgc merged 4 commits from lucasjoshua into main 2024-12-23 19:46:04 +00:00
Conversation 0 Commits 4 Files Changed 9 +11 -10
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit be46f3587e - Show all commits

3
src/JoinGame.java
View File

@ -13,7 +13,7 @@ import java.net.InetSocketAddress;
public class JoinGame extends JPanel { public class JoinGame extends JPanel {
// Funktionshilfen // Funktionshilfen
String standardPort = "1234"; String standardPort = "51525";
// Grafiken // Grafiken
ImageIcon backButtonIcon = new ImageIcon("graphics/backButton.png"); ImageIcon backButtonIcon = new ImageIcon("graphics/backButton.png");
@ -56,6 +56,7 @@ public class JoinGame extends JPanel {
* @author Lucas Bronson, Joshua Kuklok * @author Lucas Bronson, Joshua Kuklok
*/ */
private void buildPanel(MainFrame frame,int g,int playerType,String playerName, int semesterCounter) { private void buildPanel(MainFrame frame,int g,int playerType,String playerName, int semesterCounter) {
System.out.println("semesterzahl in JoinGame" + semesterCounter);
if(g==1){ if(g==1){
spielBeitretenLabel= new JLabel("Spiel beitreten"); spielBeitretenLabel= new JLabel("Spiel beitreten");
}else{ }else{

2
src/MainFrame.java
View File

@ -80,7 +80,7 @@ public class MainFrame extends JFrame {
* @param playerName Name des Spielers * @param playerName Name des Spielers
* @author Lucas Bronson, Joshua Kuklok * @author Lucas Bronson, Joshua Kuklok
*/ */
public void showPanelSMG(String panelName, int num, int playerType,String playerName) { public void showPanelSMG(String panelName, int num, int playerType,String playerName, int semesterCounter) {
this.localMult = num; this.localMult = num;
JoinGame joinGame = new JoinGame(this, localMult, playerType, playerName, semesterCounter); JoinGame joinGame = new JoinGame(this, localMult, playerType, playerName, semesterCounter);

16
src/startMultiplayerGame.java
View File

@ -154,13 +154,13 @@ public class startMultiplayerGame extends JPanel {
@Override @Override
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
if (PlayerIcon.getIcon() == humanPlayerIcon) { if (PlayerIcon.getIcon() == humanPlayerIcon) {
frame.showPanelSMG("JoinGame",1,0, PlayerNickname); frame.showPanelSMG("JoinGame",1,0, PlayerNickname, semesterCounter);
} else if ( PlayerIcon.getIcon() == aiPlayerEasyIcon) { } else if ( PlayerIcon.getIcon() == aiPlayerEasyIcon) {
frame.showPanelSMG("JoinGame",1,1, PlayerNickname); frame.showPanelSMG("JoinGame",1,1, PlayerNickname, semesterCounter);
} else if ( PlayerIcon.getIcon() == aiPlayerNormalIcon) { } else if ( PlayerIcon.getIcon() == aiPlayerNormalIcon) {
frame.showPanelSMG("JoinGame",1,2, PlayerNickname); frame.showPanelSMG("JoinGame",1,2, PlayerNickname, semesterCounter);
} else if ( PlayerIcon.getIcon() == aiPlayerHardIcon) { } else if ( PlayerIcon.getIcon() == aiPlayerHardIcon) {
frame.showPanelSMG("JoinGame",1,3, PlayerNickname); frame.showPanelSMG("JoinGame",1,3, PlayerNickname, semesterCounter);
} }
} }
}); });
@ -171,13 +171,13 @@ public class startMultiplayerGame extends JPanel {
public void actionPerformed(ActionEvent e) { public void actionPerformed(ActionEvent e) {
//Parameter -> panelName, Spiel erstellen oder beitreten (int), Spielertyp(int 0-3), Spielername //Parameter -> panelName, Spiel erstellen oder beitreten (int), Spielertyp(int 0-3), Spielername
if (PlayerIcon.getIcon() == humanPlayerIcon) { if (PlayerIcon.getIcon() == humanPlayerIcon) {
frame.showPanelSMG("JoinGame",0,0, PlayerNickname); frame.showPanelSMG("JoinGame",0,0, PlayerNickname, semesterCounter);
} else if ( PlayerIcon.getIcon() == aiPlayerEasyIcon) { } else if ( PlayerIcon.getIcon() == aiPlayerEasyIcon) {
frame.showPanelSMG("JoinGame",0,1, PlayerNickname); frame.showPanelSMG("JoinGame",0,1, PlayerNickname, semesterCounter);
} else if ( PlayerIcon.getIcon() == aiPlayerNormalIcon) { } else if ( PlayerIcon.getIcon() == aiPlayerNormalIcon) {
frame.showPanelSMG("JoinGame",0,2, PlayerNickname); frame.showPanelSMG("JoinGame",0,2, PlayerNickname, semesterCounter);
} else if ( PlayerIcon.getIcon() == aiPlayerHardIcon) { } else if ( PlayerIcon.getIcon() == aiPlayerHardIcon) {
frame.showPanelSMG("JoinGame",0,3, PlayerNickname); frame.showPanelSMG("JoinGame",0,3, PlayerNickname, semesterCounter);
} }
} }
}); });