Merge pull request #66 from sdp24-2-CodingPing/develop

Merge/v1.1.2

Author: PIut0

.github/workflows/lint-on-pr.yml

@@ -0,0 +1,38 @@
+name: Lint on PR
+
+on:
+  pull_request:
+    branches:
+      - '**'
+
+jobs:
+  lint:
+    name: Lint Code
+    runs-on: ubuntu-latest
+
+    steps:
+      # 1. 코드 체크아웃
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      # 2. Java 환경 설정
+      - name: Set up JDK 21
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: '21'
+
+      # 3. Gradle 캐시 활성화
+      - name: Cache Gradle dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle
+
+      # 4. Spotless
+      - name: Run Spotless Check
+        run: ./gradlew spotlessCheck

src/engine/Core.java

@@ -89,14 +89,13 @@ public static void main(final String[] args) throws IOException {
     AchievementManager achievementManager;
     Wallet wallet = Wallet.getWallet();
 
-    boolean isGotoMainMenu = false;
-
     int returnCode = 1;
     do {
       MAX_LIVES = wallet.getLives_lv() + 2;
       GameState gameState = new GameState(1, 0, 0, BASE_SHIP, 0, 0, 0, 0, 0, 0, 0, 0);
       GameSettings gameSetting = new GameSettings(4, 4, 60, 2500);
       achievementManager = new AchievementManager();
+      boolean isGotoMainMenu = false;
 
       switch (returnCode) {
         case 1:
@@ -127,48 +126,29 @@ public static void main(final String[] args) throws IOException {
             frame.setScreen(currentScreen);
             LOGGER.info("Closing game screen.");
 
-            if (((GameScreen) currentScreen).getIsGotoMainMenu()) {
-              if (!gameState.getPlayerShip().isDestroyed()) {
-                isGotoMainMenu = true;
-                break;
-              }
+            isGotoMainMenu = ((GameScreen) currentScreen).getIsGotoMainMenu();
+            if (isGotoMainMenu) {
+              break;
             }
 
             gameState = ((GameScreen) currentScreen).getGameState();
 
-            // 게임 오버 시 ScoreScreen으로 전환
-            if (!gameState.getPlayerShip().isDestroyed()) {
-              // 다음 레벨 진행
-              gameState = new GameState(gameState, gameState.getGameLevel() + 1);
-              endTime = System.currentTimeMillis();
-              achievementManager.updatePlaying(
-                  gameState.getMaxCombo(),
-                  (int) (endTime - startTime) / 1000,
-                  MAX_LIVES,
-                  gameState.getPlayerShip().getPlayerHP(),
-                  gameState.getGameLevel() - 1);
-            } else {
-              // ScoreScreen으로 전환하여 게임오버 화면 표시
-              currentScreen =
-                  new ScoreScreen(
-                      GameSettingScreen.getName(),
-                      width,
-                      height,
-                      FPS,
-                      gameState,
-                      wallet,
-                      achievementManager,
-                      false);
-              returnCode = frame.setScreen(currentScreen);
-              LOGGER.info("Closing score screen.");
-              break;
-            }
+            // 다음 레벨 진행
+            gameState.setGameLevel(gameState.getGameLevel() + 1);
+            endTime = System.currentTimeMillis();
+            achievementManager.updatePlaying(
+                gameState.getMaxCombo(),
+                (int) (endTime - startTime) / 1000,
+                MAX_LIVES,
+                gameState.getPlayerShip().getPlayerHP(),
+                gameState.getGameLevel() - 1);
           } while (!gameState.getPlayerShip().isDestroyed());
 
           if (isGotoMainMenu) {
             returnCode = 1;
             break;
           }
+
           achievementManager.updatePlayed(gameState.getAccuracy(), gameState.getScore());
           achievementManager.updateAllAchievements();
           LOGGER.info(

src/engine/DrawManager.java

@@ -78,6 +78,9 @@ public class DrawManager {
   protected static BufferedImage img_coin;
   protected static BufferedImage img_coingain;
   protected static BufferedImage img_shotinterval;
+  protected static BufferedImage img_movespeed;
+  protected static BufferedImage img_attackdamage;
+  protected static BufferedImage img_bulletscount;
 
   /** Sprite types. */
   public static enum SpriteType {
@@ -186,15 +189,19 @@ protected DrawManager() {
       logger.warning("Font formating failed.");
     }
 
-    /** Shop image load */
+    /** image load */
     try {
       img_additionallife = ImageIO.read(new File("res/image/additional life.jpg"));
       img_bulletspeed = ImageIO.read(new File("res/image/bullet speed.jpg"));
       img_coin = ImageIO.read(new File("res/image/coin.jpg"));
       img_coingain = ImageIO.read(new File("res/image/coin gain.jpg"));
       img_shotinterval = ImageIO.read(new File("res/image/shot interval.jpg"));
+      img_movespeed = ImageIO.read(new File("res/image/card/move_speed.png"));
+      img_attackdamage = ImageIO.read(new File("res/image/card/attack_damage.png"));
+      img_bulletscount = ImageIO.read(new File("res/image/card/bullets_count.png"));
+
     } catch (IOException e) {
-      logger.info("Shop image loading failed");
+      logger.info("Image loading failed");
     }
   }
 

src/engine/SoundManager.java

@@ -187,15 +187,13 @@ private void setVolume(int volume) {
     }
     // Apply to soundClips (including background music)
     for (Clip clip : soundClips.values()) {
-        try {
-          FloatControl volumeControl =
-                  (FloatControl) clip.getControl(FloatControl.Type.MASTER_GAIN);
-          volumeControl.setValue(newVolume);
-        } catch (IllegalArgumentException e) {
-          logger.warning("Failed to set volume: " + e.getMessage());
-        }
+      try {
+        FloatControl volumeControl = (FloatControl) clip.getControl(FloatControl.Type.MASTER_GAIN);
+        volumeControl.setValue(newVolume);
+      } catch (IllegalArgumentException e) {
+        logger.warning("Failed to set volume: " + e.getMessage());
+      }
     }
-
   }
 
   /**

src/engine/drawmanager/GameDrawManager.java

@@ -4,10 +4,11 @@
 import engine.DrawManager;
 import engine.Score;
 import entity.Entity;
-import entity.ShipFactory;
+import entity.player.PlayerLevel;
 import entity.player.PlayerShip;
 import java.awt.*;
 import java.awt.geom.AffineTransform;
+import java.awt.image.BufferedImage;
 import java.util.List;
 import screen.Screen;
 
@@ -36,20 +37,6 @@ public static void drawAlertMessage(final Screen screen, final String alertMessa
         alertMessage, (screen.getWidth() - fontRegularMetrics.stringWidth(alertMessage)) / 2, 65);
   }
 
-  /**
-   * Draws number of remaining lives on screen.
-   *
-   * @param screen Screen to draw on.
-   * @param lives Current lives.
-   */
-  public void drawLives(final Screen screen, final int lives, final PlayerShip.ShipType shipType) {
-    backBufferGraphics.setFont(fontRegular);
-    backBufferGraphics.setColor(Color.WHITE);
-    backBufferGraphics.drawString(Integer.toString(lives), 20, 25);
-    PlayerShip dummyPlayerShip = ShipFactory.create(shipType, 0, 0);
-    for (int i = 0; i < lives; i++) drawEntity(dummyPlayerShip, 40 + 35 * i, 10);
-  }
-
   /**
    * Draws level on screen.
    *
@@ -218,6 +205,21 @@ public static void drawHorizontalLine(final Screen screen, final int positionY)
     backBufferGraphics.drawLine(0, positionY + 1, screen.getWidth(), positionY + 1);
   }
 
+  /**
+   * Draw a background box for HUD.
+   *
+   * @param screen Screen to draw on.
+   * @param x X coordinate of the box.
+   * @param y Y coordinate of the box.
+   * @param w Width of the box.
+   * @param h Height of the box.
+   */
+  public static void drawHudPanel(
+      final Screen screen, final int x, final int y, final int w, final int h) {
+    backBufferGraphics.setColor(Color.BLACK);
+    backBufferGraphics.fillRect(x, y, w, h);
+  }
+
   /**
    * Draws a horizontal bar composed of multiple box segments.
    *
@@ -234,15 +236,17 @@ public static void drawSegmentedBar(
     int basicWidth = w / maximumValue; // Basic width of each box
     int remainingWidth = w % maximumValue; // Remaining width to be distributed
 
-    // Draw filled and empty boxes
+    int filledBoxes = (int) ((double) currentValue / maximumValue * w);
+
     int startX = x; // Initial x coordinate for the first box
     for (int i = 0; i < maximumValue; i++) {
       int boxWidth = basicWidth;
+
       if (i < remainingWidth) {
         boxWidth += 1; // Distribute the remaining width to the first few boxes
       }
 
-      if (i < currentValue) {
+      if (startX < x + filledBoxes) {
         backBufferGraphics.setColor(color); // Color for filled boxes
       } else {
         backBufferGraphics.setColor(Color.GRAY); // Color for empty boxes
@@ -253,33 +257,50 @@ public static void drawSegmentedBar(
     }
   }
 
-  /**
-   * Draws a thicker box outline by drawing two overlapping boxes.
-   *
-   * @param screen Screen to draw on.
-   * @param x X coordinate of the upper-left corner of the inner box.
-   * @param y Y coordinate of the upper-left corner of the inner box.
-   * @param w Width of the inner box.
-   * @param h Height of the inner box.
-   * @param thickness Thickness of the outer box.
-   */
-  public static void drawThickBox(
-      final Screen screen,
-      final int x,
-      final int y,
-      final int w,
-      final int h,
-      final int thickness) {
-    // Ensure thickness is not greater than the width or height
-    if (thickness * 2 > w || thickness * 2 > h) {
-      throw new IllegalArgumentException("Thickness is too large for the given width or height");
-    }
+  /** Draws a stat value */
+  public static void drawStat(final Screen screen, final int stat, int x, int y) {
+    int BOX_WIDTH = 48;
+    int BOX_HEIGHT = 48;
+    backBufferGraphics.setColor(Color.WHITE);
+    String statText = Integer.toString(stat);
 
-    backBufferGraphics.setColor(Color.GREEN);
-    backBufferGraphics.fillRect(x, y, w, h); // Outer box
-    backBufferGraphics.setColor(Color.BLACK);
-    backBufferGraphics.fillRect(
-        x + thickness, y + thickness, w - 2 * thickness, h - 2 * thickness); // Draw inner box
+    FontMetrics metrics = backBufferGraphics.getFontMetrics(fontBig);
+    int textWidth = metrics.stringWidth(statText);
+    int textHeight = metrics.getHeight();
+
+    int drawX = x + (BOX_WIDTH - textWidth) / 2;
+    int drawY = y + (BOX_HEIGHT + textHeight) / 2;
+
+    backBufferGraphics.drawString(statText, drawX, drawY);
+  }
+
+  /** Draws a stat icon */
+  public static void drawStatIcon(Screen screen, int num, int x, int y) {
+    BufferedImage[] statImages =
+        new BufferedImage[] {
+          img_movespeed,
+          img_bulletspeed,
+          img_attackdamage,
+          img_shotinterval,
+          img_bulletscount,
+          img_additionallife
+        };
+    backBufferGraphics.drawImage(statImages[num], x, y, 25, 18, null);
+  }
+
+  /** Draws a player level */
+  public static void drawPlayerLevel(final Screen screen, final PlayerLevel level, int x, int y) {
+    backBufferGraphics.setFont(fontBig);
+    backBufferGraphics.setColor(Color.WHITE);
+
+    int levelValue = level.getLevel();
+    if (levelValue < 10) {
+      String scoreString = String.format("lv.0%d", levelValue);
+      backBufferGraphics.drawString(scoreString, x, y);
+    } else {
+      String scoreString = String.format("lv.%d", levelValue);
+      backBufferGraphics.drawString(scoreString, x, y);
+    }
   }
 
   /**

src/entity/BulletPool.java

@@ -51,4 +51,16 @@ public static Bullet getBullet(
   public static void recycle(final Set<Bullet> bullet) {
     pool.addAll(bullet);
   }
+
+  public static boolean isPoolEmpty() {
+    return pool.isEmpty();
+  }
+
+  public static int getPoolSize() {
+    return pool.size();
+  }
+
+  public static void clearPool() {
+    pool.clear();
+  }
 }

src/entity/player/PlayerCardStatus.java

@@ -21,47 +21,47 @@ public static void reset() {
     moveSpeedLevel = 0;
   }
 
-  public int getAttackDamageLevel() {
+  public static int getAttackDamageLevel() {
     return attackDamage;
   }
 
   public void attackDamageLevelUp() {
     attackDamage++;
   }
 
-  public int getIntervalLevel() {
+  public static int getIntervalLevel() {
     return intervalLevel;
   }
 
   public void intervalLevelUp() {
     intervalLevel++;
   }
 
-  public int getBulletsCountLevel() {
+  public static int getBulletsCountLevel() {
     return bulletsCountLevel;
   }
 
   public void bulletsCountLevelUp() {
     bulletsCountLevel++;
   }
 
-  public int getBulletsSpeedLevel() {
+  public static int getBulletsSpeedLevel() {
     return bulletsSpeedLevel;
   }
 
   public void bulletsSpeedLevelUp() {
     bulletsSpeedLevel++;
   }
 
-  public int getHpLevel() {
+  public static int getHpLevel() {
     return hpLevel;
   }
 
   public void hpLevelUp() {
-    hpLevel += 5;
+    hpLevel++;
   }
 
-  public int getMoveSpeedLevel() {
+  public static int getMoveSpeedLevel() {
     return moveSpeedLevel;
   }