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

merge dev into test #28

Merged
j23f0712 merged 29 commits from development into dev/test 2024-12-01 23:11:24 +01:00
Conversation 2 Commits 29 Files Changed 106 +23 -26
1 changed files with 23 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 63fa692910 - Show all commits

49
Projekte/mdga/client/src/main/java/pp/mdga/client/view/GameView.java
View File

@@ -67,41 +67,38 @@ public void onEnter() {
app.getAcousticHandler().playSound(MdgaSound.START); app.getAcousticHandler().playSound(MdgaSound.START);
//Test //Test
// List<UUID> uuid1 = new ArrayList<>();
// UUID p1 = UUID.randomUUID();
// UUID p2 = UUID.randomUUID();
// uuid1.add(p1);
// uuid1.add(p2);
// uuid1.add(UUID.randomUUID());
// uuid1.add(UUID.randomUUID());
// List<UUID> uuid2 = new ArrayList<>();
// UUID p1_2 = UUID.randomUUID();
// UUID p2_2 = UUID.randomUUID();
// uuid2.add(p1_2);
// uuid2.add(p2_2);
// uuid2.add(UUID.randomUUID());
// uuid2.add(UUID.randomUUID());
List<UUID> uuid1 = new ArrayList<>(); // app.getNotificationSynchronizer().addTestNotification(new PlayerInGameNotification(Color.AIRFORCE, uuid1, "Cedric"));
UUID p1 = UUID.randomUUID(); // app.getNotificationSynchronizer().addTestNotification(new PlayerInGameNotification(Color.NAVY, uuid2, "Test"));
UUID p2 = UUID.randomUUID(); // app.getNotificationSynchronizer().addTestNotification(new MovePieceNotification(p1, 0, true));
uuid1.add(p1); // app.getNotificationSynchronizer().addTestNotification(new MovePieceNotification(p1_2, 30, true));
uuid1.add(p2);
uuid1.add(UUID.randomUUID());
uuid1.add(UUID.randomUUID());
List<UUID> uuid2 = new ArrayList<>();
UUID p1_2 = UUID.randomUUID();
UUID p2_2 = UUID.randomUUID();
uuid2.add(p1_2);
uuid2.add(p2_2);
uuid2.add(UUID.randomUUID());
uuid2.add(UUID.randomUUID());
app.getNotificationSynchronizer().addTestNotification(new PlayerInGameNotification(Color.AIRFORCE, uuid1, "Cedric"));
app.getNotificationSynchronizer().addTestNotification(new PlayerInGameNotification(Color.NAVY, uuid2, "Test"));
app.getNotificationSynchronizer().addTestNotification(new MovePieceNotification(p1, 0, true));
app.getNotificationSynchronizer().addTestNotification(new MovePieceNotification(p1_2, 30, true));
// app.getNotificationSynchronizer().addTestNotification(new SelectableMoveNotification(List.of(p1), List.of(4), List.of(false))); // app.getNotificationSynchronizer().addTestNotification(new SelectableMoveNotification(List.of(p1), List.of(4), List.of(false)));
app.getNotificationSynchronizer().addTestNotification(new AcquireCardNotification(BonusCard.SHIELD)); // app.getNotificationSynchronizer().addTestNotification(new AcquireCardNotification(BonusCard.SHIELD));
// app.getNotificationSynchronizer().addTestNotification(new SelectableCardsNotification(List.of(BonusCard.SHIELD))); // app.getNotificationSynchronizer().addTestNotification(new SelectableCardsNotification(List.of(BonusCard.SHIELD)));
app.getNotificationSynchronizer().addTestNotification(new ShieldActiveNotification(p1)); // app.getNotificationSynchronizer().addTestNotification(new ShieldActiveNotification(p1));
// app.getNotificationSynchronizer().addTestNotification(new ActivePlayerNotification(Color.NAVY)); // app.getNotificationSynchronizer().addTestNotification(new ActivePlayerNotification(Color.NAVY));
app.getNotificationSynchronizer().addTestNotification(new DiceNowNotification()); // app.getNotificationSynchronizer().addTestNotification(new DiceNowNotification());
// app.getNotificationSynchronizer().addTestNotification(new RollDiceNotification(Color.AIRFORCE, 5, true, 2)); // app.getNotificationSynchronizer().addTestNotification(new RollDiceNotification(Color.AIRFORCE, 5, true, 2));
//p1 = p1;
p1 = p1;
} }