diff --git a/src/de/bricked/game/balls/BallType.java b/src/de/bricked/game/balls/BallType.java index 55428f55937daa88323f6cf17b9ca1178cb73c0c..e4458a741cab36ec05f27f2be64f6ed8f608903f 100644 --- a/src/de/bricked/game/balls/BallType.java +++ b/src/de/bricked/game/balls/BallType.java @@ -2,19 +2,19 @@ package de.bricked.game.balls; public enum BallType { - NORMAL("N", "normal", 10, 4), - EXPLOSIVE("A","explosive", 10, 6), - NO_COLLISION("S","no_collision", 10, 8); + NORMAL("N", "#9CD8FF", 10, 4), + EXPLOSIVE("A","#CC2E2E", 10, 6), + NO_COLLISION("S","#2828CC", 10, 8); private String ID; - private String textureID; + private String color; private double radius; private double speedFactor; - private BallType(String ID, String textureID, double radius, double speedFactor) + private BallType(String ID, String color, double radius, double speedFactor) { this.ID = ID; - this.textureID = textureID; + this.color = color; this.radius = radius; this.speedFactor = speedFactor; } @@ -24,9 +24,9 @@ public enum BallType return ID; } - public String getTextureID() + public String getColor() { - return textureID; + return color; } public double getRadius() diff --git a/src/de/bricked/ui/LevelController.java b/src/de/bricked/ui/LevelController.java index 035991ffa273d3c800f42811518fbe449b4c7ada..f7e227e069490a542ac82228aa7ee3066ee2c85d 100644 --- a/src/de/bricked/ui/LevelController.java +++ b/src/de/bricked/ui/LevelController.java @@ -607,10 +607,10 @@ public class LevelController { anchorPaneGame.getChildren().remove(stackPaneBall); - game.setBall(new Ball(BallType.NORMAL)); + game.setBall(new Ball(BallType.NO_COLLISION)); // create circle for ball - final Circle circle = new Circle(game.getBall().getBallRadius(), Color.rgb(156, 216, 255)); + final Circle circle = new Circle(game.getBall().getBallRadius(), Color.web(game.getBall().getType().getColor())); circle.setEffect(new Lighting()); stackPaneBall = new StackPane(); stackPaneBall.getChildren().addAll(circle);