Merge master and develop (PurpleBananass#86)

Co-authored-by: StableSub <enderbow36@gmail.com>

Author: fkrdud1125

requirements/NOF.md

@@ -20,24 +20,37 @@ The main purpose of our group is to develop “records and achievements”.
 - Changes
   - Rename the High Score menu to Achievement.
 
-- Achievement Additions
-  - Add cumulative score, cumulative playtime, cumulative number of games, highest score, and hit rate achievements.
-  - Create tiered achievements for each category, ranging from the initial achievement to the final achievement.
-  - Requirement: Create a file to store records for each category.
+
+- ACHIEVEMENTS Additions
+  - TOTAL SCORE, TOTAL PLAYTIME, ACHIEVEMENTS STATUS
+
+  
+- ACHIEVEMENTS STATUS Additions
+  - MAX COMBO
+  - PERFECT CLEAR 
+  - FLAWLESS FAILURE 
+  - A TIME OF ETERNITY 
+  
 
 - Achievement Rewards
   - Provide tiered currency benefits for each category, from the initial achievement to the final achievement.
 
 
 
+
 - 변경사항
-  - High Score메뉴를 Achievement로 변경.
+  - 기존 High Score메뉴를 Achievement로 변경.
+  
+
+- "ACHIEVEMENT" 창에 추가할 항목
+  - TOTAL SCORE, TOTAL PLAYTIME, ACHIEVEMENTS STATUS
 
 
-- Achievement에 추가할 항목
-  - 누적점수, 누적 플레이 시간, 누적 판수, 최고 점수, 명중률 달성
-  - 각 항목 별 최초 업적부터 최종 업적까지 단계별 업적 생성
-  - 필요 사항 : 각 항목 별 기록을 담을 파일 생성
+- "ACHIEVEMENTS STATUS"에 추가할 항목
+  - MAX COMBO (최고 콤보)
+  - PERFECT CLEAR (게임 클리어)
+  - FLAWLESS FAILURE (명중률 0으로 게임 오버)
+  - A TIME OF ETERNITY (누적 플레이 시간 10분 이상 달성)
 
 
 - 업적 달성 시 보상

src/engine/AchievementManager.java

@@ -1,7 +1,6 @@
 package engine;
 
 import entity.Achievement;
-import entity.Wallet;
 
 import java.io.IOException;
 import java.util.logging.Logger;
@@ -20,36 +19,38 @@ public class AchievementManager {
     private final int MAX_PERFECT_STAGE = 7;
 
     // Variables related to Accuracy Achievement
-    private double highAccuracy; // List of accuracy achievements
+    private int highMaxCombo; // List of accuracy achievements
 
     // Variables related to Flawless Failure Achievement
     private boolean checkFlawlessFailure;
 
-    // Variables related to Best Friends Achievement
-    private boolean checkBestFriends;
-
     // Coin rewards update
     private int coinReward = 0;
 
-    private final int[] ACCURACY_COIN_REWARD = {500, 1500, 2000, 2500};
+    private final int[] COMBO_COIN_REWARD = {500, 1500, 2000, 2500};
     private final int[] PERFECT_COIN_REWARD = {200, 400, 800, 2000, 3000, 4000, 5000};
     private final int FLAWLESS_FAILURE_COIN = 1000;
-    private final int BEST_FRIENDS_COIN = 1000;
+    private final int PLAY_TIME_COIN = 1000;
+
+    private boolean checkPlayTimeAch;
+
 
     // Variables needed for each achievement are loaded through a file.
     public AchievementManager() throws IOException {
         achievement = FileManager.getInstance().loadAchievement();
         this.currentPerfectLevel = achievement.getPerfectStage();
-        this.highAccuracy = achievement.getHighAccuracy();
+        this.highMaxCombo = achievement.getHighmaxCombo();
         this.checkFlawlessFailure = achievement.getFlawlessFailure();
-        this.checkBestFriends = achievement.getBestFriends();
     }
 
     public int getAchievementReward() {
         return coinReward;
     }
 
     public void updateTotalPlayTime(int playTime) {
+        if (achievement.getTotalPlayTime() < 600 && achievement.getTotalPlayTime() + playTime >= 600) {
+            coinReward += PLAY_TIME_COIN;
+        }
         achievement.setTotalPlayTime(playTime);
     }
 
@@ -60,38 +61,44 @@ public void updateTotalScore(int score) {
     /**
      * Function to update the accuracy achievement.
      */
-    public void updateAccuracy(double accuracy) {
-        if (highAccuracy >= accuracy) {
+    public void updateMaxCombo(int maxCombo) {
+        if (highMaxCombo >= maxCombo) {
             return;
         }
-        int accuracyGoal = (int)(highAccuracy/10)*10+10;
-        highAccuracy = accuracy;
-        if (accuracyGoal < 70) {
-            accuracyGoal = 70;
+        int maxComboGoal = 10;
+        if (highMaxCombo < 10) {
+            maxComboGoal = 10;
+        } else if (highMaxCombo < 15) {
+            maxComboGoal = 15;
+        } else if (highMaxCombo < 20) {
+            maxComboGoal = 20;
+        } else if (highMaxCombo < 25) {
+            maxComboGoal = 25;
         }
-        if (highAccuracy < accuracyGoal) {
-            achievement.setHighAccuracy(highAccuracy);
+        int rewardIndex = highMaxCombo / 5 - 1;
+        highMaxCombo = maxCombo;
+        if (highMaxCombo < maxComboGoal) {
+            achievement.setHighMaxcombo(highMaxCombo);
             return;
         }
-        int rewardIndex = accuracyGoal/10-7;
         // When an accuracy achievement is reached, all lower achievements are achieved together.
-        if (highAccuracy >= 100) {
+        if (highMaxCombo >= 25) {
             for (int i = rewardIndex; i < 4; i++) {
-                coinReward += ACCURACY_COIN_REWARD[i];
+                coinReward += COMBO_COIN_REWARD[i];
             }
-        } else if (highAccuracy >= 90) {
+        } else if (highMaxCombo >= 20) {
             for (int i = rewardIndex; i < 3; i++) {
-                coinReward += ACCURACY_COIN_REWARD[i];
+                coinReward += COMBO_COIN_REWARD[i];
             }
-        } else if (highAccuracy >= 80) {
+        } else if (highMaxCombo >= 15) {
             for (int i = rewardIndex; i < 2; i++) {
-                coinReward += ACCURACY_COIN_REWARD[i];
+                coinReward += COMBO_COIN_REWARD[i];
             }
-        } else if (highAccuracy >= 70) {
-            coinReward += ACCURACY_COIN_REWARD[0];
+        } else if (highMaxCombo >= 10) {
+            coinReward += COMBO_COIN_REWARD[0];
         }
         // Save the updated achievement.
-        achievement.setHighAccuracy(highAccuracy);
+        achievement.setHighMaxcombo(highMaxCombo);
     }
     /**
      * Check if the perfect achievement has been reached.
@@ -113,27 +120,18 @@ public void updateFlawlessFailure(double accuracy) {
         }
     }
 
-    public void updateBestFriends(boolean checkTwoPlayMode) {
-        if (!checkBestFriends && checkTwoPlayMode) {
-            checkBestFriends = true;
-            coinReward += BEST_FRIENDS_COIN;
-            achievement.setBestFriends(true);
-        }
-    }
-
     public void updateAllAchievements() throws IOException {
         FileManager.getInstance().saveAchievement(achievement);
     }
 
-    public void updatePlaying(int playtime, int max_lives, int LivesRemaining, int level ) throws IOException{
+    public void updatePlaying(int maxCombo ,int playtime, int max_lives, int LivesRemaining, int level ) throws IOException{
         updateTotalPlayTime(playtime);
         updatePerfect(max_lives,LivesRemaining,level);
+        updateMaxCombo(maxCombo);
     }
 
-    public void updatePlayed(double accuracy, int score, boolean multiPlay) throws IOException{
-        updateAccuracy(accuracy);
+    public void updatePlayed(double accuracy, int score) throws IOException{
         updateTotalScore(score);
         updateFlawlessFailure(accuracy);
-        updateBestFriends(multiPlay);
     }
 }

src/engine/Core.java

@@ -89,7 +89,7 @@ public static void main(final String[] args) throws IOException {
 		int returnCode = 1;
 		do {
 			MAX_LIVES = wallet.getLives_lv()+2;
-			gameState = new GameState(1, 0, BASE_SHIP, MAX_LIVES, 0, 0, 0, "", 0, 0, 0 ,0);
+			gameState = new GameState(1, 0, BASE_SHIP, MAX_LIVES, 0, 0, 0, "", 0, 0, 0 ,0, 0);
 			achievementManager = new AchievementManager();
 
 			GameSettings gameSetting = new GameSettings(4, 4, 60, 2500);
@@ -132,9 +132,9 @@ public static void main(final String[] args) throws IOException {
 
 					gameState = new GameState(gameState, gameState.getLevel() + 1);
 					endTime = System.currentTimeMillis();
-					achievementManager.updatePlaying((int) (endTime - startTime) / 1000, MAX_LIVES, gameState.getLivesRemaining(), gameState.getLevel()-1);
+					achievementManager.updatePlaying(gameState.getMaxCombo(),(int) (endTime - startTime) / 1000, MAX_LIVES, gameState.getLivesRemaining(), gameState.getLevel()-1);
 				} while (gameState.getLivesRemaining() > 0);
-				achievementManager.updatePlayed(gameState.getAccuracy(), gameState.getScore(), GameSettingScreen.getMultiPlay());
+				achievementManager.updatePlayed(gameState.getAccuracy(), gameState.getScore());
                 achievementManager.updateAllAchievements();
 				LOGGER.info("Starting " + WIDTH + "x" + HEIGHT
 						+ " score screen at " + FPS + " fps, with a score of "