game start fixes & AI Player Names
This commit is contained in:
parent
8e4a516e2c
commit
f7d2e14196
|
@ -1,4 +1,9 @@
|
||||||
|
|
||||||
public class SpecificAiPlayerEasy extends AiPlayer{
|
public class SpecificAiPlayerEasy extends AiPlayer{
|
||||||
|
|
||||||
|
public SpecificAiPlayerEasy() {
|
||||||
|
super();
|
||||||
|
this.setName("AI Player Easy");
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -11,6 +11,8 @@ public class SpecificAiPlayerHard extends AiPlayer{
|
||||||
private int nextChessCol;
|
private int nextChessCol;
|
||||||
|
|
||||||
public SpecificAiPlayerHard() {
|
public SpecificAiPlayerHard() {
|
||||||
|
super();
|
||||||
|
this.setName("AI Player Hard");
|
||||||
/*this.gridSize = super.board.getSize();
|
/*this.gridSize = super.board.getSize();
|
||||||
this.shotsFired = new boolean[gridSize][gridSize];*/
|
this.shotsFired = new boolean[gridSize][gridSize];*/
|
||||||
this.gridSize = 0;
|
this.gridSize = 0;
|
||||||
|
|
|
@ -6,6 +6,7 @@ public class SpecificAiPlayerMedium extends AiPlayer{
|
||||||
private List<Point> hitsQueue = new ArrayList<>();
|
private List<Point> hitsQueue = new ArrayList<>();
|
||||||
|
|
||||||
public SpecificAiPlayerMedium() {
|
public SpecificAiPlayerMedium() {
|
||||||
|
super();
|
||||||
this.setName("AI Player Medium");
|
this.setName("AI Player Medium");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
import javax.swing.*;
|
import javax.swing.*;
|
||||||
import java.awt.event.ActionEvent;
|
import java.awt.event.ActionEvent;
|
||||||
import java.awt.event.ActionListener;
|
import java.awt.event.ActionListener;
|
||||||
|
import java.util.HashMap;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Das startLocalGame Panel dient dem Erstellen eines lokalen Spiels.
|
* Das startLocalGame Panel dient dem Erstellen eines lokalen Spiels.
|
||||||
|
@ -203,42 +204,59 @@ public class startLocalGame extends JPanel {
|
||||||
|
|
||||||
// Um zum startLocalGameLoadingScreen zu wechseln und Daten an Backend weiterzureichen.
|
// Um zum startLocalGameLoadingScreen zu wechseln und Daten an Backend weiterzureichen.
|
||||||
startButton.addActionListener(new ActionListener() {
|
startButton.addActionListener(new ActionListener() {
|
||||||
|
@SuppressWarnings("unchecked")
|
||||||
@Override
|
@Override
|
||||||
public void actionPerformed(ActionEvent e) {
|
public void actionPerformed(ActionEvent e) {
|
||||||
|
HashMap<ImageIcon, Class<? extends LocalPlayer>> playerClassMap = new HashMap<>();
|
||||||
|
playerClassMap.put(humanPlayerIcon, HumanPlayer.class);
|
||||||
|
playerClassMap.put(aiPlayerEasyIcon, SpecificAiPlayerEasy.class);
|
||||||
|
playerClassMap.put(aiPlayerNormalIcon, SpecificAiPlayerMedium.class);
|
||||||
|
playerClassMap.put(aiPlayerHardIcon, SpecificAiPlayerHard.class);
|
||||||
|
|
||||||
|
|
||||||
frame.showPanelSLGLS("startLocalGameLoadingScreen", semesterCounter); //TODO
|
frame.showPanelSLGLS("startLocalGameLoadingScreen", semesterCounter); //TODO
|
||||||
if (leftPlayerIcon.getIcon() == humanPlayerIcon) {// TODO Wird name wirklich weitergegeben?
|
|
||||||
if (rightPlayerIcon.getIcon() == aiPlayerEasyIcon) {
|
Class<? extends LocalPlayer> leftPlayerClass = playerClassMap.get(leftPlayerIcon.getIcon());
|
||||||
GameController.startLocalGame(HumanPlayer.class, leftPlayerNickname, SpecificAiPlayerEasy.class, GameController.semesterToBoardSize(semesterCounter));
|
Class<? extends AiPlayer> rightPlayerClass = (Class<? extends AiPlayer>) playerClassMap.get(rightPlayerIcon.getIcon());
|
||||||
} else if (rightPlayerIcon.getIcon() == aiPlayerNormalIcon) {
|
GameController.startLocalGame(
|
||||||
GameController.startLocalGame(HumanPlayer.class, leftPlayerNickname, SpecificAiPlayerMedium.class, GameController.semesterToBoardSize(semesterCounter));
|
leftPlayerClass, leftPlayerNickname,
|
||||||
} else if (rightPlayerIcon.getIcon() == aiPlayerHardIcon) {
|
rightPlayerClass,
|
||||||
GameController.startLocalGame(HumanPlayer.class, leftPlayerNickname, SpecificAiPlayerHard.class, GameController.semesterToBoardSize(semesterCounter));
|
GameController.semesterToBoardSize(semesterCounter)
|
||||||
}
|
);
|
||||||
} else if (leftPlayerIcon.getIcon() == aiPlayerEasyIcon) {
|
|
||||||
if (rightPlayerIcon.getIcon() == aiPlayerEasyIcon) {
|
// if (leftPlayerIcon.getIcon() == humanPlayerIcon) {// TODO Wird name wirklich weitergegeben?
|
||||||
GameController.startLocalGame(SpecificAiPlayerEasy.class, leftPlayerNickname, SpecificAiPlayerEasy.class, GameController.semesterToBoardSize(semesterCounter));
|
// if (rightPlayerIcon.getIcon() == aiPlayerEasyIcon) {
|
||||||
} else if (rightPlayerIcon.getIcon() == aiPlayerNormalIcon) {
|
// GameController.startLocalGame(HumanPlayer.class, leftPlayerNickname, SpecificAiPlayerEasy.class, GameController.semesterToBoardSize(semesterCounter));
|
||||||
GameController.startLocalGame(SpecificAiPlayerEasy.class, leftPlayerNickname, SpecificAiPlayerMedium.class, GameController.semesterToBoardSize(semesterCounter));
|
// } else if (rightPlayerIcon.getIcon() == aiPlayerNormalIcon) {
|
||||||
} else if (rightPlayerIcon.getIcon() == aiPlayerHardIcon) {
|
// GameController.startLocalGame(HumanPlayer.class, leftPlayerNickname, SpecificAiPlayerMedium.class, GameController.semesterToBoardSize(semesterCounter));
|
||||||
GameController.startLocalGame(SpecificAiPlayerEasy.class, leftPlayerNickname, SpecificAiPlayerHard.class, GameController.semesterToBoardSize(semesterCounter));
|
// } else if (rightPlayerIcon.getIcon() == aiPlayerHardIcon) {
|
||||||
}
|
// GameController.startLocalGame(HumanPlayer.class, leftPlayerNickname, SpecificAiPlayerHard.class, GameController.semesterToBoardSize(semesterCounter));
|
||||||
} else if (rightPlayerIcon.getIcon() == aiPlayerNormalIcon) {
|
// }
|
||||||
if (rightPlayerIcon.getIcon() == aiPlayerEasyIcon) {
|
// } else if (leftPlayerIcon.getIcon() == aiPlayerEasyIcon) {
|
||||||
GameController.startLocalGame(SpecificAiPlayerMedium.class, leftPlayerNickname, SpecificAiPlayerEasy.class, GameController.semesterToBoardSize(semesterCounter));
|
// if (rightPlayerIcon.getIcon() == aiPlayerEasyIcon) {
|
||||||
} else if (rightPlayerIcon.getIcon() == aiPlayerNormalIcon) {
|
// GameController.startLocalGame(SpecificAiPlayerEasy.class, leftPlayerNickname, SpecificAiPlayerEasy.class, GameController.semesterToBoardSize(semesterCounter));
|
||||||
GameController.startLocalGame(SpecificAiPlayerMedium.class, leftPlayerNickname, SpecificAiPlayerMedium.class, GameController.semesterToBoardSize(semesterCounter));
|
// } else if (rightPlayerIcon.getIcon() == aiPlayerNormalIcon) {
|
||||||
} else if (rightPlayerIcon.getIcon() == aiPlayerHardIcon) {
|
// GameController.startLocalGame(SpecificAiPlayerEasy.class, leftPlayerNickname, SpecificAiPlayerMedium.class, GameController.semesterToBoardSize(semesterCounter));
|
||||||
GameController.startLocalGame(SpecificAiPlayerMedium.class, leftPlayerNickname, SpecificAiPlayerHard.class, GameController.semesterToBoardSize(semesterCounter));
|
// } else if (rightPlayerIcon.getIcon() == aiPlayerHardIcon) {
|
||||||
}
|
// GameController.startLocalGame(SpecificAiPlayerEasy.class, leftPlayerNickname, SpecificAiPlayerHard.class, GameController.semesterToBoardSize(semesterCounter));
|
||||||
} else if (rightPlayerIcon.getIcon() == aiPlayerHardIcon) {
|
// }
|
||||||
if (rightPlayerIcon.getIcon() == aiPlayerEasyIcon) {
|
// } else if (rightPlayerIcon.getIcon() == aiPlayerNormalIcon) {
|
||||||
GameController.startLocalGame(SpecificAiPlayerHard.class, leftPlayerNickname, SpecificAiPlayerEasy.class, GameController.semesterToBoardSize(semesterCounter));
|
// if (rightPlayerIcon.getIcon() == aiPlayerEasyIcon) {
|
||||||
} else if (rightPlayerIcon.getIcon() == aiPlayerNormalIcon) {
|
// GameController.startLocalGame(SpecificAiPlayerMedium.class, leftPlayerNickname, SpecificAiPlayerEasy.class, GameController.semesterToBoardSize(semesterCounter));
|
||||||
GameController.startLocalGame(SpecificAiPlayerHard.class, leftPlayerNickname, SpecificAiPlayerMedium.class, GameController.semesterToBoardSize(semesterCounter));
|
// } else if (rightPlayerIcon.getIcon() == aiPlayerNormalIcon) {
|
||||||
} else if (rightPlayerIcon.getIcon() == aiPlayerHardIcon) {
|
// GameController.startLocalGame(SpecificAiPlayerMedium.class, leftPlayerNickname, SpecificAiPlayerMedium.class, GameController.semesterToBoardSize(semesterCounter));
|
||||||
GameController.startLocalGame(SpecificAiPlayerHard.class, leftPlayerNickname, SpecificAiPlayerHard.class, GameController.semesterToBoardSize(semesterCounter));
|
// } else if (rightPlayerIcon.getIcon() == aiPlayerHardIcon) {
|
||||||
}
|
// GameController.startLocalGame(SpecificAiPlayerMedium.class, leftPlayerNickname, SpecificAiPlayerHard.class, GameController.semesterToBoardSize(semesterCounter));
|
||||||
}
|
// }
|
||||||
|
// } else if (rightPlayerIcon.getIcon() == aiPlayerHardIcon) {
|
||||||
|
// if (rightPlayerIcon.getIcon() == aiPlayerEasyIcon) {
|
||||||
|
// GameController.startLocalGame(SpecificAiPlayerHard.class, leftPlayerNickname, SpecificAiPlayerEasy.class, GameController.semesterToBoardSize(semesterCounter));
|
||||||
|
// } else if (rightPlayerIcon.getIcon() == aiPlayerNormalIcon) {
|
||||||
|
// GameController.startLocalGame(SpecificAiPlayerHard.class, leftPlayerNickname, SpecificAiPlayerMedium.class, GameController.semesterToBoardSize(semesterCounter));
|
||||||
|
// } else if (rightPlayerIcon.getIcon() == aiPlayerHardIcon) {
|
||||||
|
// GameController.startLocalGame(SpecificAiPlayerHard.class, leftPlayerNickname, SpecificAiPlayerHard.class, GameController.semesterToBoardSize(semesterCounter));
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue