seb/NightTrainToBudapest
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Seraina 2022-04-30 18:49:08 +02:00
commit c066763f97
4 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/Client.java
View File

@ -345,22 +345,22 @@ public class Client {
} }
break; break;
case GuiParameters.listOfLobbies: case GuiParameters.listOfLobbies:
updateListOfLobbies(data); //updateListOfLobbies(data); (commented out due to compiling error)
//TODO //TODO
break; break;
case GuiParameters.listOfPLayers: case GuiParameters.listOfPLayers:
updateListOfClients(data); updateListOfClients(data);
//TODO //TODO
break; break;
case GuiParameters.viewChangeToGame: //case GuiParameters.viewChangeToGame: (commented out due to compiling error)
//TODO //TODO
break; //break; (commented out due to compiling error)
case GuiParameters.viewChangeToStart: //case GuiParameters.viewChangeToStart: (commented out due to compiling error)
//TODO //TODO
break; //break; (commented out due to compiling error)
case GuiParameters.viewChangeToLobby: //case GuiParameters.viewChangeToLobby: (commented out due to compiling error)
//TODO //TODO
break; //break; (commented out due to compiling error)
default: default:
notificationTextDisplay(data); notificationTextDisplay(data);
//TODO(Sebi,Seraina): should the gameController be in the Application just like the ChatController? //TODO(Sebi,Seraina): should the gameController be in the Application just like the ChatController?

2
src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/lounge/LoungeSceneViewController.java
View File

@ -65,7 +65,7 @@ public class LoungeSceneViewController implements Initializable {
} }
public void addLobby(LobbyListItem lobby) { public void addLobby(LobbyListItem lobby) {
LobbyTreeView. //TODO fix/complete following code: LobbyTreeView. (commented out due to compiling error)
} }
public void addClientToList(ClientListItem player) { public void addClientToList(ClientListItem player) {

4
src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/server/JServerProtocolParser.java
View File

@ -100,7 +100,7 @@ public class JServerProtocolParser {
break; break;
case Protocol.leaveLobby: case Protocol.leaveLobby:
h.leaveLobby(); h.leaveLobby();
h.sendMsgToClient(Protocol.printToGUI + "$" + GuiParameters.viewChangeToStart + "$"); //h.sendMsgToClient(Protocol.printToGUI + "$" + GuiParameters.viewChangeToStart + "$"); (commented out due to compiling error)
break; break;
case Protocol.votedFor: case Protocol.votedFor:
LOGGER.debug("Made it here"); LOGGER.debug("Made it here");
@ -109,7 +109,7 @@ public class JServerProtocolParser {
break; break;
case Protocol.startANewGame: case Protocol.startANewGame:
h.startNewGame(); h.startNewGame();
h.sendMsgToClientsInLobby(Protocol.printToGUI + "$" + GuiParameters.viewChangeToGame + "$"); //h.sendMsgToClientsInLobby(Protocol.printToGUI + "$" + GuiParameters.viewChangeToGame + "$"); (commented out due to compiling error)
break; break;
case Protocol.listGames: case Protocol.listGames:
h.listGames(); h.listGames();

2
src/test/java/ch/unibas/dmi/dbis/cs108/gamelogic/NoiseHandlerTest.java
View File

@ -10,7 +10,7 @@ import static org.junit.jupiter.api.Assertions.*;
* Tests the noise handling of the game: will the passengers the ghost(s) walk(ed) by while going to * Tests the noise handling of the game: will the passengers the ghost(s) walk(ed) by while going to
* their victim receive the right amount of noise notifications? Since the noises heard by * their victim receive the right amount of noise notifications? Since the noises heard by
* passengers are stored in designated noiseAmount arrays, the following tests check if the content * passengers are stored in designated noiseAmount arrays, the following tests check if the content
* of those arrays match expected values. Different cases are being analyzed: ghost infects victim * of those arrays matches expected values. Different cases are being analyzed: ghost infects victim
* while being on his right / on his left; two ghosts infect a victim while coming from the same * while being on his right / on his left; two ghosts infect a victim while coming from the same
* side / from different sides; four ghosts dispersed all over the train infect a victim. * side / from different sides; four ghosts dispersed all over the train infect a victim.
*/ */