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

fix anims

Browse Source
This commit is contained in:
Cedric Beck
2024-12-10 14:53:16 +01:00
parent 9f8fd9c22f
commit 0c8cb92fe8
4 changed files with 10 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Projekte/mdga/client/src/main/java/pp/mdga/client/MdgaApp.java
View File

@@ -70,7 +70,7 @@ public class MdgaApp extends SimpleApplication {
private final TimerManager timerManager = new TimerManager(); private final TimerManager timerManager = new TimerManager();
public static final int DEBUG_MULTIPLIER = 0; public static final int DEBUG_MULTIPLIER = 1;
public MdgaApp() { public MdgaApp() {
networkConnection = new NetworkSupport(this); networkConnection = new NetworkSupport(this);

6
Projekte/mdga/client/src/main/java/pp/mdga/client/NotificationSynchronizer.java
View File

@@ -120,12 +120,15 @@ private void handleGame(Notification notification) {
app.getAcousticHandler().playSound(MdgaSound.BONUS); app.getAcousticHandler().playSound(MdgaSound.BONUS);
delay = STANDARD_DELAY; delay = STANDARD_DELAY;
} else if(notification instanceof RankingResponceNotification n) { } else if(notification instanceof RankingResponceNotification n) {
guiHandler.hideText();
n.getRankingResults().forEach((c, i) -> { n.getRankingResults().forEach((c, i) -> {
guiHandler.rollRankingResult(c, i); guiHandler.rollRankingResult(c, i);
}); });
delay = STANDARD_DELAY;
} else if (notification instanceof ActivePlayerNotification n) { } else if (notification instanceof ActivePlayerNotification n) {
gameView.getGuiHandler().setActivePlayer(n.getColor()); guiHandler.hideText();
boardHandler.hideDice(); boardHandler.hideDice();
gameView.getGuiHandler().setActivePlayer(n.getColor());
if(n.getColor() != ownColor) boardHandler.showDice(n.getColor()); if(n.getColor() != ownColor) boardHandler.showDice(n.getColor());
app.getAcousticHandler().playSound(MdgaSound.UI90); app.getAcousticHandler().playSound(MdgaSound.UI90);
delay = STANDARD_DELAY; delay = STANDARD_DELAY;
@@ -157,6 +160,7 @@ private void handleGame(Notification notification) {
ceremonyView.addStatisticsRow(name, v1, v2, v3, v4, v5, v6); ceremonyView.addStatisticsRow(name, v1, v2, v3, v4, v5, v6);
} }
} else if (notification instanceof DiceNowNotification) { } else if (notification instanceof DiceNowNotification) {
guiHandler.hideText();
guiHandler.showDice(); guiHandler.showDice();
} else if (notification instanceof DrawCardNotification n) { } else if (notification instanceof DrawCardNotification n) {
guiHandler.drawCard(n.getColor()); guiHandler.drawCard(n.getColor());

8
Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java
View File

@@ -87,8 +87,8 @@ public Game() {
gameStatistics = new Statistic(); gameStatistics = new Statistic();
initializeDrawPile(); initializeDrawPile();
board = new Board(); board = new Board();
die = new Die(1,2, die = new Die(
1,1,6,1,6 //TODO
); );
} }
@@ -97,8 +97,8 @@ public Game() {
*/ */
private void initializeDrawPile() { private void initializeDrawPile() {
this.addBonusCards(new TurboCard(), AMOUNT_OF_TURBO_CARDS); this.addBonusCards(new TurboCard(), AMOUNT_OF_TURBO_CARDS);
// this.addBonusCards(new SwapCard(), AMOUNT_OF_SWAP_CARDS); this.addBonusCards(new SwapCard(), AMOUNT_OF_SWAP_CARDS);
// this.addBonusCards(new ShieldCard(), AMOUNT_OF_SHIELD_CARDS); this.addBonusCards(new ShieldCard(), AMOUNT_OF_SHIELD_CARDS);
Collections.shuffle(this.drawPile); Collections.shuffle(this.drawPile);
} }

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

@@ -56,54 +56,6 @@ public void initializeGame() {
for (var player : this.logic.getGame().getPlayers().values()) { for (var player : this.logic.getGame().getPlayers().values()) {
player.initialize(); player.initialize();
player.addHandCard(this.logic.getGame().draw()); player.addHandCard(this.logic.getGame().draw());
//TODO
player.addHandCard(new ShieldCard());
player.addHandCard(new ShieldCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new TurboCard());
player.addHandCard(new SwapCard());
player.addHandCard(new SwapCard());
player.addHandCard(new SwapCard());
player.addHandCard(new SwapCard());
player.addHandCard(new SwapCard());
player.addHandCard(new SwapCard());
player.addHandCard(new SwapCard());
player.addHandCard(new SwapCard());
player.addHandCard(new SwapCard());
player.addHandCard(new SwapCard());
player.addHandCard(new SwapCard());
player.addHandCard(new SwapCard());
player.addHandCard(new SwapCard());
player.addHandCard(new SwapCard());
player.addHandCard(new SwapCard());
player.addHandCard(new SwapCard());
player.addHandCard(new SwapCard());
player.addHandCard(new SwapCard());
Piece piece = player.getPieces()[0]; Piece piece = player.getPieces()[0];
player.getWaitingArea()[0] = null; player.getWaitingArea()[0] = null;