diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/BGAnimation.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/BGAnimation.java index dc9ca5c..37dca0f 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/BGAnimation.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/BGAnimation.java @@ -9,20 +9,25 @@ import javafx.util.Duration; public class BGAnimation extends Transition { private ImageView bgView; private ImageView fgView; + private ImageView crop; private int index; private int lastIndex; - public BGAnimation(Duration duration, ImageView bgView, ImageView fgView) { + public BGAnimation(Duration duration, ImageView bgView, ImageView fgView, ImageView imageCrop) { index = 0; lastIndex = 1034; this.bgView = bgView; this.fgView = fgView; + this.crop = imageCrop; bgView.setFitHeight(1950); bgView.setFitWidth(6667.968); bgView.setImage(Sprites.getBg()); fgView.setFitHeight(1950); fgView.setFitWidth(6667.968); fgView.setImage(Sprites.getFg()); + imageCrop.setFitHeight(1950); + imageCrop.setFitWidth(6667.968); + imageCrop.setImage(Sprites.getCrop()); setCycleDuration(duration); setInterpolator(Interpolator.DISCRETE); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/DayNightChangeListener.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/DayNightChangeListener.java index 6508178..d5b0622 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/DayNightChangeListener.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/DayNightChangeListener.java @@ -30,7 +30,7 @@ public class DayNightChangeListener implements Runnable { @Override public void run() { try{ - Thread.sleep(1000); //TODO(Seraina): test! + gameStateModel.setDayClone(false); while(!gameStateModel.isGameOver()) { if(gameStateModel.getDayClone()) { //its Day LoungeSceneViewController.getTrainAnimationDayController().dontShowFullWagon(); @@ -46,6 +46,8 @@ public class DayNightChangeListener implements Runnable { try { if (gameStateModel.getYourRoleFromPosition(position).equals("")) { LoungeSceneViewController.getTrainAnimationDayController().showFullWagon(); + } else if (gameStateModel.getYourRoleFromPosition(position).equals("g")) { + LoungeSceneViewController.getTrainAnimationDayController().dontShowFullWagon(); } } catch (Exception e) { e.getMessage(); diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/Sprites.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/Sprites.java index 74559a9..23b8030 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/Sprites.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/Sprites.java @@ -20,6 +20,7 @@ public class Sprites { private static Image[] wheels = new Image[26]; private static Image[] bells = new Image[17]; private static Image fg; + private static Image crop; public static Image getBg() { return bg; @@ -69,6 +70,10 @@ public class Sprites { return fg; } + public static Image getCrop() { + return crop; + } + /** * Sets all Images of this class to the Day Version */ @@ -85,6 +90,7 @@ public class Sprites { wheels = SpritesDay.wheels; bells = SpritesDay.bells; fg = SpritesDay.fg; + crop = SpritesDay.crop; } catch (Exception e) { System.out.println(e.getMessage()); e.printStackTrace(); @@ -114,6 +120,7 @@ public class Sprites { wheels = SpritesNight.wheels; bells = SpritesNight.bells; fg = SpritesNight.fg; + crop = SpritesNight.crop; } public static void updateNightRoomSprites(String[] roles, boolean[] kickedOff) { diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/SpritesDay.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/SpritesDay.java index 900f3dd..ea3914f 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/SpritesDay.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/SpritesDay.java @@ -27,6 +27,7 @@ public class SpritesDay { public static final Image[] wheels = new Image[26]; public static final Image[] bells = new Image[17]; public static final Image fg = new Image(path + "Foreground_small.png"); + public static final Image crop = new Image("ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/background_crop.png"); public static void setWheels() { try { diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/SpritesNight.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/SpritesNight.java index 2e809c6..d1bfc8b 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/SpritesNight.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/SpritesNight.java @@ -33,6 +33,6 @@ public class SpritesNight { public static final Image[] wheels = SpritesDay.wheels; public static final Image[] bells = SpritesDay.bells; public static final Image fg = new Image(path + "Foreground_small.png"); - + public static final Image crop = SpritesDay.crop; } diff --git a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/TrainAnimationDayController.java b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/TrainAnimationDayController.java index bf6a7b2..62ab6cd 100644 --- a/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/TrainAnimationDayController.java +++ b/src/main/java/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/TrainAnimationDayController.java @@ -20,6 +20,8 @@ public class TrainAnimationDayController implements Initializable { public static final Logger LOGGER = LogManager.getLogger(TrainAnimationDayController.class); public static final BudaLogConfig l = new BudaLogConfig(LOGGER); + @FXML + private ImageView backgroundCropView; @FXML private ImageView wagonWallImageView; @FXML @@ -256,7 +258,7 @@ public class TrainAnimationDayController implements Initializable { Animation wheels = new WheelsAnimation(Duration.millis(866.666), wheelsImageView); wheels.setCycleCount(Animation.INDEFINITE); wheels.play(); - Animation backGround = new BGAnimation(Duration.millis(17), backGroundAnimationImageView, foreGroundAnimationImageView1); + Animation backGround = new BGAnimation(Duration.millis(17), backGroundAnimationImageView, foreGroundAnimationImageView1, backgroundCropView); backGround.setCycleCount(Animation.INDEFINITE); backGround.play(); } diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/TrainAnimationViewDay.fxml b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/TrainAnimationViewDay.fxml index 761ee42..681d17b 100644 --- a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/TrainAnimationViewDay.fxml +++ b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/TrainAnimationViewDay.fxml @@ -80,6 +80,7 @@ + diff --git a/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/background crop.png b/src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/background_crop.png similarity index 100% rename from src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/background crop.png rename to src/main/resources/ch/unibas/dmi/dbis/cs108/multiplayer/client/gui/game/background_crop.png