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-05-18 15:34:59 +02:00
commit 450bb682d9
7 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Meilenstein V/Diary.txt
View File

@ -366,3 +366,6 @@ Habe Highscore und Players in Lobbies auf die einfachst mögliche Art mit Textfl
16.5.2022 - Jonas
Have been working on implementing all sound effects over the last couple of days
17. & 18.5.2022 - Jonas
Working on outreach stuff and presentation.

5
Meilenstein V/Slides - Link.url Normal file
View File

@ -0,0 +1,5 @@
[{000214A0-0000-0000-C000-000000000046}]
Prop3=19,11
[InternetShortcut]
IDList=
URL=https://docs.google.com/presentation/d/1T7PLc8qiEpnYKalaZmuOcyfptfxlVOvj-Pl5uHh6AGo/edit?usp=sharing

BIN
Meilenstein V/Slides.pdf Normal file
View File

Binary file not shown.

1
OgGhostWinners.txt
View File

@ -10,3 +10,4 @@ Jonas
Jonas
Jonas
Jonas, the French delegate
Jonas

8
src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/ClientGameInfoHandler.java
View File

@ -29,10 +29,10 @@ public class ClientGameInfoHandler {
//just messages
public static final String youGotGhostyfied = "You are now a ghost!";
public static final String youGotKickedOff = "Bye bye - you've been kicked off";
public static final String humansVotedFor = "Humans voted for: ";
public static final String isAHuman = " but they're a human!";
public static final String gotKickedOff = " is a Ghost and got kicked off";
public static final String youGotKickedOff = "Bye bye - you've been kicked off.";
public static final String humansVotedFor = "Humans voted for ";
public static final String isAHuman = ", but they're a human!";
public static final String gotKickedOff = " is a Ghost and got kicked off.";
public static final String gotGhostyfied = " is now also a ghost!";

8
src/main/java/ch/unibas/dmi/dbis/cs108/gamelogic/VoteHandler.java
View File

@ -89,7 +89,7 @@ public class VoteHandler {
ghostification. */
int[] noiseAmount = new int[6];
for (int i = 0; i < passengers.length; i++) {
if (passengers[i].getIsGhost() && i != newGhostPosition) {
if (passengers[i].getIsGhost() && !passengers[i].getKickedOff() && i != newGhostPosition) {
NoiseHandler n = new NoiseHandler();
noiseAmount = n.noiseNotifier(passengers[i], g, noiseAmount);
}
@ -170,7 +170,7 @@ public class VoteHandler {
.getIsGhost()) { // if player with most votes is human, notify everyone about it
for (Passenger passenger : passengers) {
passenger.send(
ClientGameInfoHandler.humansVotedFor + voteIndex + ClientGameInfoHandler.isAHuman, game);
ClientGameInfoHandler.humansVotedFor + passengers[voteIndex].getName() + ClientGameInfoHandler.isAHuman, game);
}
for (ClientHandler c: game.getLobby().getLobbyClients()) { //send human vote sound to clients
@ -184,6 +184,10 @@ public class VoteHandler {
if (passengers[voteIndex].getIsGhost()) { // if player is a ghost
if (passengers[voteIndex].getIsOG()) { // if ghost is OG --> end game, humans win
for (Passenger passenger : passengers) {
passenger.send(
ClientGameInfoHandler.humansVotedFor + passengers[voteIndex].getName() + ", the Original Ghost!", game);
}
System.out.println(ClientGameInfoHandler.gameOverHumansWin);
return ClientGameInfoHandler.gameOverHumansWin;
} else {

1
src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/chat/ChatController.java
View File

@ -15,7 +15,6 @@ import javafx.beans.value.ObservableValue;
import javafx.collections.ListChangeListener;
import javafx.fxml.FXML;
import javafx.fxml.Initializable;
import javafx.geometry.Pos;
import javafx.scene.Group;
import javafx.scene.Node;
import javafx.scene.control.Button;