peet/Gruppe-01-fin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

merge dev into test #33

Merged
j23f0712 merged 36 commits from development into dev/test 2024-12-02 17:37:00 +01:00
Conversation 2 Commits 36 Files Changed 60 +1192 -388
49 changed files with 1192 additions and 388 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4561a962d4 - Show all commits

17
Projekte/mdga/client/src/main/java/pp/mdga/client/view/LobbyView.java
View File

@@ -152,23 +152,6 @@ public void setTaken(Color color, boolean isTaken, boolean isSelf, String name)
if(isTaken) { if(isTaken) {
if(isSelf) { if(isSelf) {
/*if(own != null) {
switch (color) {
case CYBER:
cyberButton.setTaken(LobbyButton.Taken.NOT, name);
break;
case AIRFORCE:
airforceButton.setTaken(LobbyButton.Taken.NOT, name);
break;
case ARMY:
armyButton.setTaken(LobbyButton.Taken.NOT, name);
break;
case NAVY:
navyButton.setTaken(LobbyButton.Taken.NOT, name);
break;
}
}*/
own = color; own = color;
taken = LobbyButton.Taken.SELF; taken = LobbyButton.Taken.SELF;
} else { } else {

3
Projekte/mdga/model/src/main/java/pp/mdga/client/dialogState/LobbyState.java
View File

@@ -106,7 +106,8 @@ public void received(LobbyPlayerJoinedMessage msg){
if (msg.isHost() && msg.getId() == parent.getOwnPlayerId()){ if (msg.isHost() && msg.getId() == parent.getOwnPlayerId()){
logic.setHost(true); logic.setHost(true);
} }
logic.addNotification(new TskSelectNotification(msg.getPlayer().getColor(), msg.getPlayer().getName(), parent.getOwnPlayerId()== msg.getId()));
logic.addNotification(new TskSelectNotification(msg.getPlayer().getColor(), msg.getPlayer().getName(), msg.getPlayer().getName().equals(parent.getOwnPlayerName())));
logic.getGame().getPlayers().put(msg.getId(), msg.getPlayer()); logic.getGame().getPlayers().put(msg.getId(), msg.getPlayer());
} }

2
Projekte/mdga/model/src/main/java/pp/mdga/server/automaton/LobbyState.java
View File

@@ -63,7 +63,7 @@ public void initializeGame() {
@Override @Override
public void received(JoinedLobbyMessage msg, int from) { public void received(JoinedLobbyMessage msg, int from) {
Player player = new Player(msg.getName()); Player player = new Player(msg.getName());
player.setColor(Color.getColorByIndex(this.logic.getGame().getPlayers().size())); player.setColor(Color.NONE);
this.logic.getGame().addPlayer(from, player); this.logic.getGame().addPlayer(from, player);
for (Map.Entry<Integer, Player> entry : this.logic.getGame().getPlayers().entrySet()) { for (Map.Entry<Integer, Player> entry : this.logic.getGame().getPlayers().entrySet()) {
this.logic.getServerSender().broadcast(new LobbyPlayerJoinedMessage(entry.getKey(), entry.getValue(), entry.getKey() == this.logic.getGame().getHost())); this.logic.getServerSender().broadcast(new LobbyPlayerJoinedMessage(entry.getKey(), entry.getValue(), entry.getKey() == this.logic.getGame().getHost()));