From 0c7030659a630a013c2cfcce2ffdae7511f3ae04 Mon Sep 17 00:00:00 2001 From: Cedric Beck Date: Tue, 10 Dec 2024 13:00:03 +0100 Subject: [PATCH] removed fadeControl --- .../src/main/java/pp/mdga/client/board/BoardHandler.java | 7 +------ Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java | 6 +++--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java index aaf07489..346e0483 100644 --- a/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java +++ b/Projekte/mdga/client/src/main/java/pp/mdga/client/board/BoardHandler.java @@ -848,12 +848,7 @@ private void throwMatrix(UUID uuid) { app.getAcousticHandler().playSound(MdgaSound.MATRIX); Spatial piece = pieces.get(uuid).getSpatial(); piece.addControl(new MatrixAnimation(app, radarPos,()-> { - piece.addControl(new FadeControl(1,1,0, - () -> { - throwPiece(uuid); - piece.addControl(new FadeControl(1,0,1)); - } - )); + throwPieceAnim(uuid); })); } diff --git a/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java b/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java index 6a16a760..9a7e4d94 100644 --- a/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java +++ b/Projekte/mdga/model/src/main/java/pp/mdga/game/Game.java @@ -87,9 +87,9 @@ public Game() { gameStatistics = new Statistic(); initializeDrawPile(); board = new Board(); - die = new Die(1,2,3, - 5,1,1, //SHIELD - 3); //MODIFIER + die = new Die(1,2,3,4, + 5, 1,1,1 + ); } /**