Merge branch 'master' into im-yuuki-patch-2

# Conflicts:
#	client/src/main/java/io/exterminator3618/client/screens/GameScreen.java

Author: im-yuuki

client/src/main/java/io/exterminator3618/client/Constants.java

@@ -36,13 +36,6 @@ public class Constants {
     public static final double MAX_BOUNCE_ANGLE = 65;
     public static final double BALL_EPSILON = 50;
 
-    /**
-     * Audio file paths.
-     */
-    public static final String TEST_LONG_MUSIC_2 = "sound/test_bgr2.wav";
-    public static final String BACKGROUND_MUSIC = "sound/test_bgr.mp3";
-    public static final String BUFF_SOUND = "sound/buff_sound.mp3";
-
     /**
      * Path to backgounds
      */
@@ -56,27 +49,10 @@ public class Constants {
     /**
      * Brick texture region names.
      */
-    public static final String NORMAL_BLUE_BRICK = "normal_blue_brick";
     public static final String NORMAL_GREEN_BRICK = "normal_green_brick";
     public static final String NORMAL_ORANGE_BRICK = "normal_orange_brick";
-    public static final String NORMAL_PURPLE_BRICK = "normal_purple_brick";
-    public static final String NORMAL_RED_BRICK = "normal_red_brick";
     public static final String NORMAL_YELLOW_BRICK = "normal_yellow_brick";
-
-    public static final String SQUARE_BLUE_BRICK = "square_blue_brick";
-    public static final String SQUARE_GREEN_BRICK = "square_green_brick";
-    public static final String SQUARE_ORANGE_BRICK = "square_orange_brick";
-    public static final String SQUARE_PURPLE_BRICK = "square_purple_brick";
-    public static final String SQUARE_RED_BRICK = "square_red_brick";
-    public static final String SQUARE_YELLOW_BRICK = "square_yellow_brick";
-
     public static final String THICK_BLUE_BRICK = "thick_blue_brick";
-    public static final String THICK_GREEN_BRICK = "thick_green_brick";
-    public static final String THICK_ORANGE_BRICK = "thick_orange_brick";
-    public static final String THICK_PURPLE_BRICK = "thick_purple_brick";
-    public static final String THICK_RED_BRICK = "thick_red_brick";
-    public static final String THICK_YELLOW_BRICK = "thick_yellow_brick";
-
     public static final String MULTIBALL_BRICK = "normal_purple_brick";
     /**
      * Brick dimensions and layout.
@@ -85,8 +61,7 @@ public class Constants {
     public static final int BRICK_HEIGHT = 32;
     public static final int BRICK_SPACING = 5;
     public static final int BRICK_START_X = 80;
-    public static final int BRICK_START_Y = 100;
-    public static final int BRICK_ROW_HEIGHT = BRICK_HEIGHT;
+    public static final int BRICK_START_Y = 120;
 
     /**
      * Paddle dimensions and layout.
@@ -96,28 +71,13 @@ public class Constants {
     public static final int PADDLE_START_X = WINDOW_WIDTH / 2 - PADDLE_WIDTH / 2;
     public static final int PADDLE_START_Y = 100;
     public static final String PADDLE_REGION_NAME = "red_paddle";
-    public static final int PADDLE_SPEED = 900;
-
-    public enum GameState {
-        MENU,
-        PLAYING,
-        PAUSED,
-        GAME_OVER,
-        VICTORY,
-        LOSE
-    }
 
     /**
      * FOR POWERUP
      */
     public static final int POWERUP_WIDTH = 32;
     public static final int POWERUP_HEIGHT = 32;
-    public static final double POWERUP_FALL_SPEED = 1000.0;
-    // PowerUp texture regions
-    public static final String POWERUP_BALLS_FROM_PADDLE = "big_purple_ball"; //KHÔNG CÓ ASSET POWERUP, DÙNG TẠM
-    
-    // PowerUp duration constants
-    public static final float WIDEN_PADDLE_DURATION = 5.0f; // 5 seconds
+    public static final float POWERUP_FALL_SPEED = 200.0f;
 
     public static final String BUTTON_LEFT_REGION = "tile_82";
     public static final String BUTTON_MIDDLE_REGION = "tile_83";

client/src/main/java/io/exterminator3618/client/components/Ball.java

@@ -70,6 +70,7 @@ public void resetToCenter(Paddle paddle) {
         isStuckToPaddle = true;
         stuckOffsetX = 0; // Reset offset to center
         setVelocity(0,0);
+
     }
 
     /**

client/src/main/java/io/exterminator3618/client/components/BrickFactory.java

@@ -6,7 +6,7 @@
 public class ExtraLifePowerUp extends PowerUp {
 
     public ExtraLifePowerUp(int x, int y) {
-        super("Extra Life", 0.0f , x, y, Constants.POWERUP_WIDTH, Constants.POWERUP_HEIGHT, "extra_life_power_up");
+        super("Extra Life", 0.0f , x, y, Constants.POWERUP_WIDTH, Constants.POWERUP_HEIGHT, "extra_live_power_up");
     }
 
     @Override

client/src/main/java/io/exterminator3618/client/components/ExtraLifePowerUp.java

@@ -2,13 +2,14 @@
 
 import static java.lang.Math.random;
 
+import static io.exterminator3618.client.Constants.POWERUP_FALL_SPEED;
 import io.exterminator3618.client.screens.GameScreen;
 
 public abstract class PowerUp extends MovableObject {
     private String type;
     private float duration;
     private float remainingDuration;
-    private float fallSpeed = 200f;
+    private final float fallSpeed = POWERUP_FALL_SPEED;
 
     public PowerUp(String type, float duration, int x, int y, int width, int height, String regionName) {
         super(x, y, width, height, regionName);
@@ -57,7 +58,11 @@ public void update(float deltaTime) {
     }
 
     public static PowerUp createRandomPowerUp(int x, int y){
-        switch ((int) (random() * 6)) {
+
+        int randomIndex = (int) (random() * 6);
+
+        
+        switch (randomIndex) {
             case 0:
                 return new WidenPaddlePowerUp(x, y);
             case 1:
@@ -71,7 +76,8 @@ public static PowerUp createRandomPowerUp(int x, int y){
             case 5:
                 return new SlowBallPowerUp(x, y);
             default:
-                return null;
+                // Safety fallback
+                return new WidenPaddlePowerUp(x, y);
         }
     }
 

client/src/main/java/io/exterminator3618/client/components/PowerUp.java

@@ -15,6 +15,6 @@ public class PowerUpBrick extends Brick {
      * @param y initial Y position in pixels
      */
     public PowerUpBrick(int x, int y) {
-        super(x, y, Constants.BRICK_WIDTH, Constants.BRICK_HEIGHT, Constants.NORMAL_YELLOW_BRICK, 1, "powerup_widen_paddle");
+        super(x, y, Constants.BRICK_WIDTH, Constants.BRICK_HEIGHT, Constants.NORMAL_YELLOW_BRICK, 1, "powerup_brick");
     }
 }

client/src/main/java/io/exterminator3618/client/components/PowerUpBrick.java

@@ -10,7 +10,7 @@
 public class WidenPaddlePowerUp extends PowerUp {
 
     public WidenPaddlePowerUp(int x, int y) {
-        super("Widen Paddle", 10.0f, x, y, Constants.POWERUP_WIDTH, Constants.POWERUP_HEIGHT, "extend_paddle_power_up");
+        super("Widen Paddle", 10.0f, x, y, Constants.POWERUP_WIDTH, Constants.POWERUP_HEIGHT, "expand_paddle_power_up");
     }
 
     @Override