diff --git a/bin/META-INF/MANIFEST.MF b/bin/META-INF/MANIFEST.MF
new file mode 100644
index 0000000000000000000000000000000000000000..a7177467aced031d79786f419f2114aeac07f4e5
--- /dev/null
+++ b/bin/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: de.bricked.main.Main
+
diff --git a/bin/de/bricked/resources/textures/paddle/paddle-extra-small.png b/bin/de/bricked/resources/textures/paddle/paddle-extra-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce483cc81df758cb80c62f179fd3cde36751b30b
Binary files /dev/null and b/bin/de/bricked/resources/textures/paddle/paddle-extra-small.png differ
diff --git a/bin/de/bricked/resources/textures/paddle/paddle-large.png b/bin/de/bricked/resources/textures/paddle/paddle-large.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea9e1b66faadad92db44a7678b754054d439c7c7
Binary files /dev/null and b/bin/de/bricked/resources/textures/paddle/paddle-large.png differ
diff --git a/bin/de/bricked/resources/textures/paddle/paddle-medium.png b/bin/de/bricked/resources/textures/paddle/paddle-medium.png
new file mode 100644
index 0000000000000000000000000000000000000000..a89bc4d36afd0905f5e612986533a7a3d0e94960
Binary files /dev/null and b/bin/de/bricked/resources/textures/paddle/paddle-medium.png differ
diff --git a/bin/de/bricked/resources/textures/paddle/paddle-small.png b/bin/de/bricked/resources/textures/paddle/paddle-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..2426677af3217d22c85de8dfd75c81e6586dd8ce
Binary files /dev/null and b/bin/de/bricked/resources/textures/paddle/paddle-small.png differ
diff --git a/bin/de/bricked/resources/textures/paddle/paddle.png b/bin/de/bricked/resources/textures/paddle/paddle.png
deleted file mode 100644
index 37eb898062ed9a5b2597defb7807992c81be5652..0000000000000000000000000000000000000000
Binary files a/bin/de/bricked/resources/textures/paddle/paddle.png and /dev/null differ
diff --git a/notes/textures/Paddle-complete-extra-small.pdn b/notes/textures/Paddle-complete-extra-small.pdn
new file mode 100644
index 0000000000000000000000000000000000000000..763bd65510b0cbe6dfcfbfcfce10cdf4afab6b0f
Binary files /dev/null and b/notes/textures/Paddle-complete-extra-small.pdn differ
diff --git a/notes/textures/Paddle-complete-large.pdn b/notes/textures/Paddle-complete-large.pdn
new file mode 100644
index 0000000000000000000000000000000000000000..a826ddb0862f3017d7ba29e86506fce89f27b5f5
Binary files /dev/null and b/notes/textures/Paddle-complete-large.pdn differ
diff --git a/notes/textures/Paddle-complete-medium.pdn b/notes/textures/Paddle-complete-medium.pdn
new file mode 100644
index 0000000000000000000000000000000000000000..d0136362cb0ca24156ca856f4d39c1febc6f9ef0
Binary files /dev/null and b/notes/textures/Paddle-complete-medium.pdn differ
diff --git a/notes/textures/Paddle-complete-small.pdn b/notes/textures/Paddle-complete-small.pdn
new file mode 100644
index 0000000000000000000000000000000000000000..8a6d1a19da45e5aa6932f876d42f64b1ef8598d6
Binary files /dev/null and b/notes/textures/Paddle-complete-small.pdn differ
diff --git a/notes/textures/Paddle-edge.pdn b/notes/textures/Paddle-edge.pdn
new file mode 100644
index 0000000000000000000000000000000000000000..dc9bbfe1554eede7887d7bd282170bf6c957c0f0
Binary files /dev/null and b/notes/textures/Paddle-edge.pdn differ
diff --git a/notes/textures/Paddle-edge.png b/notes/textures/Paddle-edge.png
new file mode 100644
index 0000000000000000000000000000000000000000..04c0258e1c8ba5930cb54b43bd20b523f6137189
Binary files /dev/null and b/notes/textures/Paddle-edge.png differ
diff --git a/notes/textures/Paddle-middle.pdn b/notes/textures/Paddle-middle.pdn
new file mode 100644
index 0000000000000000000000000000000000000000..3094e14dffe0b84cc84de02d7af951fdc8686a92
Binary files /dev/null and b/notes/textures/Paddle-middle.pdn differ
diff --git a/notes/textures/Paddle-middle.png b/notes/textures/Paddle-middle.png
new file mode 100644
index 0000000000000000000000000000000000000000..1897af0ea5fa1af120adc1a5dc89056c4153b586
Binary files /dev/null and b/notes/textures/Paddle-middle.png differ
diff --git a/src/de/bricked/game/Game.java b/src/de/bricked/game/Game.java
index e42f43a48f904215766816fdc1b250c1225cc222..92b87fa5c5c91e2ab493bd2f577ff613760f69e8 100644
--- a/src/de/bricked/game/Game.java
+++ b/src/de/bricked/game/Game.java
@@ -21,7 +21,7 @@ public class Game
private int points;
private Board board;
private final double speedIncreasePerPaddleHitFactor = 1.05;
- private final double maxTotalSpeed = 9.0;
+ private final double maxTotalSpeed = 8.0;
public Game()
{
diff --git a/src/de/bricked/game/paddle/PaddleSize.java b/src/de/bricked/game/paddle/PaddleSize.java
index cd6e54d15dcac99d982ef3c8d9a78f4f39b05724..73b04a4819b356e36a87ffbe824e6d75463a8b18 100644
--- a/src/de/bricked/game/paddle/PaddleSize.java
+++ b/src/de/bricked/game/paddle/PaddleSize.java
@@ -2,17 +2,19 @@ package de.bricked.game.paddle;
public enum PaddleSize
{
- SMALL(0.1),
- MEDIUM(0.2),
- LARGE(0.3),
- EXTRA_LARGE(0.4);
+ SMALL(0.1, "paddle-small"),
+ MEDIUM(0.2, "paddle-medium"),
+ LARGE(0.3, "paddle-large"),
+ EXTRA_LARGE(0.4, "paddle-large");
private double sizeFactor;
+ private String textureID;
private static PaddleSize[] paddleSizes = PaddleSize.values();
- PaddleSize(double sizeFactor)
+ PaddleSize(double sizeFactor, String textureID)
{
this.sizeFactor = sizeFactor;
+ this.textureID = textureID;
}
public static PaddleSize getPaddleSize(double size)
@@ -31,6 +33,11 @@ public enum PaddleSize
{
return sizeFactor;
}
+
+ public String getTextureID()
+ {
+ return textureID;
+ }
private static int getPaddleIndex(PaddleSize paddleSize)
{
diff --git a/src/de/bricked/resources/textures/paddle/paddle-extra-small.png b/src/de/bricked/resources/textures/paddle/paddle-extra-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..ce483cc81df758cb80c62f179fd3cde36751b30b
Binary files /dev/null and b/src/de/bricked/resources/textures/paddle/paddle-extra-small.png differ
diff --git a/src/de/bricked/resources/textures/paddle/paddle-large.png b/src/de/bricked/resources/textures/paddle/paddle-large.png
new file mode 100644
index 0000000000000000000000000000000000000000..ea9e1b66faadad92db44a7678b754054d439c7c7
Binary files /dev/null and b/src/de/bricked/resources/textures/paddle/paddle-large.png differ
diff --git a/src/de/bricked/resources/textures/paddle/paddle-medium.png b/src/de/bricked/resources/textures/paddle/paddle-medium.png
new file mode 100644
index 0000000000000000000000000000000000000000..a89bc4d36afd0905f5e612986533a7a3d0e94960
Binary files /dev/null and b/src/de/bricked/resources/textures/paddle/paddle-medium.png differ
diff --git a/src/de/bricked/resources/textures/paddle/paddle-small.png b/src/de/bricked/resources/textures/paddle/paddle-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..2426677af3217d22c85de8dfd75c81e6586dd8ce
Binary files /dev/null and b/src/de/bricked/resources/textures/paddle/paddle-small.png differ
diff --git a/src/de/bricked/resources/textures/paddle/paddle.png b/src/de/bricked/resources/textures/paddle/paddle.png
deleted file mode 100644
index 37eb898062ed9a5b2597defb7807992c81be5652..0000000000000000000000000000000000000000
Binary files a/src/de/bricked/resources/textures/paddle/paddle.png and /dev/null differ
diff --git a/src/de/bricked/ui/LevelController.java b/src/de/bricked/ui/LevelController.java
index 86a4799f819349c30242e4b27ea52f24f511ea3d..035991ffa273d3c800f42811518fbe449b4c7ada 100644
--- a/src/de/bricked/ui/LevelController.java
+++ b/src/de/bricked/ui/LevelController.java
@@ -561,26 +561,26 @@ public class LevelController
{
ImageView iv = new ImageView(new Image("de/bricked/resources/textures/bricks/empty.png"));
iv.setFitWidth(30);
- iv.setFitHeight(148 / MAX_LIVES);
+ iv.setFitHeight(120 / MAX_LIVES);
vboxLives.getChildren().add(iv);
if(i > 0)
{
- VBox.setMargin(iv, new Insets(4, 0, 0, 0));
+ VBox.setMargin(iv, new Insets(9, 0, 0, 0));
}
}
for(int i = 0; i < game.getLivesRemaining(); i++)
{
- ImageView iv = new ImageView(new Image("de/bricked/resources/textures/paddle/paddle.png"));
+ ImageView iv = new ImageView(new Image("de/bricked/resources/textures/paddle/paddle-extra-small.png"));
iv.setFitWidth(30);
- iv.setFitHeight(148 / MAX_LIVES);
+ iv.setFitHeight(120 / MAX_LIVES);
vboxLives.getChildren().add(iv);
if(game.getLivesRemaining() == MAX_LIVES)
{
if(i > 0)
{
- VBox.setMargin(iv, new Insets(4, 0, 0, 0));
+ VBox.setMargin(iv, new Insets(9, 0, 0, 0));
}
}
else
@@ -594,9 +594,8 @@ public class LevelController
{
anchorPaneGame.getChildren().remove(labelPaddle);
- paddle = new Paddle(game.getLevel().getInitPadSize(), gamePaneHeight / Board.HEIGHT, gamePaneWidth);
- // create label for paddle
- labelPaddle = new ImageView(new Image("de/bricked/resources/textures/paddle/paddle.png"));
+ paddle = new Paddle(game.getLevel().getInitPadSize(), gamePaneHeight / Board.HEIGHT, gamePaneWidth);
+ labelPaddle = new ImageView(new Image("de/bricked/resources/textures/paddle/" + paddle.getPaddleSize().getTextureID() + ".png"));
labelPaddle.setFitWidth(paddle.getWidth());
labelPaddle.setFitHeight(paddle.getHeight());
labelPaddle.setTranslateX(gamePaneWidth / 2 - paddle.getWidth() / 2);