diff --git a/bin/de/bricked/commandLine/_en.properties b/bin/de/bricked/commandLine/_en.properties
index a2504e94e6d427030609f62670918c636311a8a2..dd82de3111c54a9bf70579372e79609f86dacaf2 100644
--- a/bin/de/bricked/commandLine/_en.properties
+++ b/bin/de/bricked/commandLine/_en.properties
@@ -14,7 +14,7 @@ help.finish_level=finish_level - finishes given level\nSYNTAX: finish_level [LEV
help.reset_levels=reset_levels - resets all levels
help.win=win - win current level
help.showFPS=showFPS - toggles FPS counter\nSYNTAX: showFPS 0 or showFPS 1
-help.paddleSize=Changes paddle size
+help.paddleSize=paddleSize - changes paddle size\nSYNTAX: paddleSize [SIZE]\n[SIZE] = 1, 2, 3, ...
error.general=An error occurred.
error.unknown.command=Unknown command. Use \"list\" for a list of possible commands.
diff --git a/bin/de/bricked/resources/textures/powerups/2.png b/bin/de/bricked/resources/textures/powerups/2.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6b278be8b0d167cf02f973d548ef0980ef077cc
Binary files /dev/null and b/bin/de/bricked/resources/textures/powerups/2.png differ
diff --git a/bin/de/bricked/resources/textures/powerups/3.png b/bin/de/bricked/resources/textures/powerups/3.png
new file mode 100644
index 0000000000000000000000000000000000000000..b6b278be8b0d167cf02f973d548ef0980ef077cc
Binary files /dev/null and b/bin/de/bricked/resources/textures/powerups/3.png differ
diff --git a/src/de/bricked/commandLine/_en.properties b/src/de/bricked/commandLine/_en.properties
index a2504e94e6d427030609f62670918c636311a8a2..dd82de3111c54a9bf70579372e79609f86dacaf2 100644
--- a/src/de/bricked/commandLine/_en.properties
+++ b/src/de/bricked/commandLine/_en.properties
@@ -14,7 +14,7 @@ help.finish_level=finish_level - finishes given level\nSYNTAX: finish_level [LEV
help.reset_levels=reset_levels - resets all levels
help.win=win - win current level
help.showFPS=showFPS - toggles FPS counter\nSYNTAX: showFPS 0 or showFPS 1
-help.paddleSize=Changes paddle size
+help.paddleSize=paddleSize - changes paddle size\nSYNTAX: paddleSize [SIZE]\n[SIZE] = 1, 2, 3, ...
error.general=An error occurred.
error.unknown.command=Unknown command. Use \"list\" for a list of possible commands.
diff --git a/src/de/bricked/commandLine/commands/CommandPaddleSize.java b/src/de/bricked/commandLine/commands/CommandPaddleSize.java
index 7d27b433153bab26ce0e1f886895d62aacc7b105..4f5c4192e9882b7a5c32fc72a46552bcf52645b8 100644
--- a/src/de/bricked/commandLine/commands/CommandPaddleSize.java
+++ b/src/de/bricked/commandLine/commands/CommandPaddleSize.java
@@ -1,20 +1,18 @@
package de.bricked.commandLine.commands;
-import de.bricked.game.paddle.Paddle;
import de.bricked.game.paddle.PaddleSize;
import de.bricked.ui.LevelController;
-import logger.LogLevel;
-import logger.Logger;
/**
* Changes the paddle size
+ *
* @author deadlocker8
*
*/
public class CommandPaddleSize extends Command
{
public CommandPaddleSize()
- {
+ {
super.keyword = "paddleSize";
super.numberOfParams = 1;
super.helptText = "help.paddleSize";
@@ -22,24 +20,30 @@ public class CommandPaddleSize extends Command
@Override
public void execute(String[] command, CommandBundle bundle)
- {
+ {
if(!isValid(command))
- {
+ {
bundle.getController().print(bundle.getLanguageBundle().getString("error.invalid.arguments"));
return;
}
- LevelController levelController = bundle.getLevelController();
- if(levelController != null)
- {
- Paddle paddle = levelController.getPaddle();
- bundle.getLevelController().getPaddle().setPaddleSize(PaddleSize.getPaddleSize(Double.parseDouble(command[1])));
- bundle.getLevelController().getLabelPaddle().setFitWidth(paddle.getWidth());
- }
- else
- {
- bundle.getController().print("Can't change paddleSize without a paddle");
- }
- //implement your code here
+ LevelController levelController = bundle.getLevelController();
+ if(levelController != null)
+ {
+ try
+ {
+ int size = Integer.parseInt((command[1]));
+ bundle.getLevelController().initPaddle(PaddleSize.getPaddleSize(size));
+ }
+ catch(Exception e)
+ {
+ bundle.getController().print(bundle.getLanguageBundle().getString("error.invalid.arguments"));
+ }
+ }
+ else
+ {
+ bundle.getController().print("Can't change paddleSize without a paddle");
+ }
+ // implement your code here
}
}
\ No newline at end of file
diff --git a/src/de/bricked/game/Game.java b/src/de/bricked/game/Game.java
index cf8119ba4f60f914d1f6b7a09fdc48d2560b99f6..97b1a3bc166bbbf90391da7d0f13b5987098b928 100644
--- a/src/de/bricked/game/Game.java
+++ b/src/de/bricked/game/Game.java
@@ -149,8 +149,11 @@ public class Game
public void applyMultiplicator()
{
- totalPoints += pointsSinceLastMultiplicatorReset * multiplicator;
- Logger.log(LogLevel.DEBUG, "Applied multiplicator: " + pointsSinceLastMultiplicatorReset + " x" + multiplicator + " = " + totalPoints);
+ if(multiplicator > 1)
+ {
+ totalPoints += pointsSinceLastMultiplicatorReset * multiplicator;
+ Logger.log(LogLevel.DEBUG, "Applied multiplicator: " + pointsSinceLastMultiplicatorReset + " x" + multiplicator + " = " + totalPoints);
+ }
}
public LevelController getLevelController()
diff --git a/src/de/bricked/game/bricks/BrickType.java b/src/de/bricked/game/bricks/BrickType.java
index d8623188d12418ae969d4b7e0272daae9c8bef43..4898ca9734d57d13b45970e42f81981456d6f311 100644
--- a/src/de/bricked/game/bricks/BrickType.java
+++ b/src/de/bricked/game/bricks/BrickType.java
@@ -2,13 +2,13 @@ package de.bricked.game.bricks;
public enum BrickType
{
- NORMAL("N", new String[]{"normal-yellow", "normal-green", "normal-red", "normal-brown", "normal-pink"}, 1, 100),
+ NORMAL("N", new String[]{"normal-yellow", "normal-green", "normal-red", "normal-brown", "normal-pink"}, 1, 10),
AIR("A", new String[]{"empty"}, -1, 0),
SOLID("S", new String[]{"solid"}, -1, 0),
- HARD("H", new String[]{"hard", "hard-hitted"}, 2, 200),
- EXTRA_HARD("E", new String[]{"extra-hard", "extra-hard-hitted", "extra-hard-hitted-twice"}, 3, 300),
- INVISIBLE("I", new String[]{"empty", "normal-yellow"}, 2, 200),
- TNT("T", new String[]{"tnt"}, 1, 100);
+ HARD("H", new String[]{"hard", "hard-hitted"}, 2, 20),
+ EXTRA_HARD("E", new String[]{"extra-hard", "extra-hard-hitted", "extra-hard-hitted-twice"}, 3, 30),
+ INVISIBLE("I", new String[]{"empty", "normal-yellow"}, 2, 20),
+ TNT("T", new String[]{"tnt"}, 1, 10);
private String ID;
private String[] textureIDs;
diff --git a/src/de/bricked/game/paddle/PaddleSize.java b/src/de/bricked/game/paddle/PaddleSize.java
index 73b04a4819b356e36a87ffbe824e6d75463a8b18..d89102f50192618019470b0385c3a3b487fe4a7d 100644
--- a/src/de/bricked/game/paddle/PaddleSize.java
+++ b/src/de/bricked/game/paddle/PaddleSize.java
@@ -2,32 +2,34 @@ package de.bricked.game.paddle;
public enum PaddleSize
{
- SMALL(0.1, "paddle-small"),
- MEDIUM(0.2, "paddle-medium"),
- LARGE(0.3, "paddle-large"),
- EXTRA_LARGE(0.4, "paddle-large");
+ SMALL(1, 0.1, "paddle-small"),
+ MEDIUM(2, 0.2, "paddle-medium"),
+ LARGE(3, 0.3, "paddle-large"),
+ EXTRA_LARGE(4, 0.4, "paddle-large");
+ private int ID;
private double sizeFactor;
private String textureID;
private static PaddleSize[] paddleSizes = PaddleSize.values();
- PaddleSize(double sizeFactor, String textureID)
- {
+ PaddleSize(int ID, double sizeFactor, String textureID)
+ {
+ this.ID = ID;
this.sizeFactor = sizeFactor;
this.textureID = textureID;
}
- public static PaddleSize getPaddleSize(double size)
+ public static PaddleSize getPaddleSize(int size)
{
for(PaddleSize paddleSize : paddleSizes)
{
- if(paddleSize.getSizeFactor() == size)
+ if(paddleSize.ID == size)
{
return paddleSize;
}
}
return PaddleSize.EXTRA_LARGE;
- }
+ }
public double getSizeFactor()
{
diff --git a/src/de/bricked/ui/LevelController.java b/src/de/bricked/ui/LevelController.java
index f0014dab9a07cae56a01b518fd73466a0f5bdc9c..cf93c52988f6049745a371ee0a117e6ff6a0f503 100644
--- a/src/de/bricked/ui/LevelController.java
+++ b/src/de/bricked/ui/LevelController.java
@@ -16,6 +16,7 @@ import de.bricked.game.board.Board;
import de.bricked.game.bricks.Brick;
import de.bricked.game.bricks.BrickType;
import de.bricked.game.paddle.Paddle;
+import de.bricked.game.paddle.PaddleSize;
import de.bricked.game.powerups.PowerUp;
import de.bricked.utils.CountdownTimer;
import fontAwesome.FontIcon;
@@ -291,7 +292,7 @@ public class LevelController
refreshLiveCounter();
- initPaddle();
+ initPaddle(game.getLevel().getInitPadSize());
oldMousePosition = labelPaddle.getScene().getX() - paddle.getWidth() / 2;
heightListener = new ChangeListener<Number>()
@@ -414,7 +415,7 @@ public class LevelController
timer.stop();
// reset paddle and ball
- initPaddle();
+ initPaddle(game.getLevel().getInitPadSize());
initBall(BallType.NORMAL);
initTimer();
}
@@ -597,11 +598,11 @@ public class LevelController
}
}
- private void initPaddle()
+ public void initPaddle(PaddleSize paddleSize)
{
anchorPaneGame.getChildren().remove(labelPaddle);
- paddle = new Paddle(game.getLevel().getInitPadSize(), gamePaneHeight / Board.HEIGHT, gamePaneWidth);
+ paddle = new Paddle(paddleSize, 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());