Merge pull request #254 from UQcsse3200/team-7-sprint-3

Team 7 sprint 3

Author: Alex118099

source/core/assets/images/book/achievements_book.png

@@ -163,6 +163,8 @@ private Screen newScreen(ScreenType screenType, boolean isContinue, String saveF
         return new BookScreen(this, BookPage.ENEMY_PAGE);
       case TOWER_BOOK:
         return new BookScreen(this, BookPage.TOWER_PAGE);
+      case ACHIEVEMENT_BOOK:
+        return new BookScreen(this, BookPage.ACHIEVEMENT_PAGE);
       case HERO_BOOK:
         return new BookScreen(this, BookPage.HERO_PAGE);
       default:
@@ -172,7 +174,7 @@ private Screen newScreen(ScreenType screenType, boolean isContinue, String saveF
 
   public enum ScreenType {
     MAIN_MENU, MAIN_GAME, SETTINGS, SAVE_SELECTION, OPENING_CUTSCENE, VICTORY, DEFEAT,
-    MAP_SELECTION, BOOK, CURRENCY_BOOK, ENEMY_BOOK, TOWER_BOOK, UPGRADES, HERO_BOOK
+    MAP_SELECTION, BOOK, CURRENCY_BOOK, ENEMY_BOOK, TOWER_BOOK, ACHIEVEMENT_BOOK, UPGRADES, HERO_BOOK
   }
 
   public void setOpeningCutsceneWithBackground(int backgroundIndex) {

source/core/assets/images/leaderboard background.png

@@ -2,6 +2,7 @@
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import com.csse3200.game.services.ServiceLocator;
 
 /**
  * Holds the player's points and notifies the HUD on change.
@@ -26,6 +27,17 @@ public void addPoints(int points) {
         int oldScore = totalScore;
         totalScore += points;
         logger.info("Added {} points to player score: {} -> {}", points, oldScore, totalScore);
+        
+        // 更新GameScoreService的缓存
+        try {
+            var scoreService = ServiceLocator.getGameScoreService();
+            if (scoreService != null && scoreService.isGameInProgress()) {
+                scoreService.setCurrentScore(totalScore);
+            }
+        } catch (Exception e) {
+            logger.debug("Could not update GameScoreService cache: {}", e.getMessage());
+        }
+        
         if (entity != null) {
             entity.getEvents().trigger("updateScore", totalScore);
         }

source/core/assets/images/name system background.png

@@ -3,6 +3,8 @@
 import com.csse3200.game.components.deck.*;
 import com.csse3200.game.entities.configs.*;
 import com.csse3200.game.files.FileLoader;
+import com.csse3200.game.services.AchievementService;
+import com.csse3200.game.services.ServiceLocator;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -177,6 +179,70 @@ private static List<DeckComponent> createDecks() {
         }
     }
 
+    /**
+     * A book component containing achievement decks.
+     */
+    public static class AchievementBookComponent extends BookComponent {
+        /** Constructs an achievement book component with all achievements. */
+        public AchievementBookComponent() {
+            super("ACHIEVEMENTS", createDecks());
+        }
+
+        /**
+         * Creates a list of achievement deck components.
+         *
+         * @return a list of {@link DeckComponent} for all achievements
+         */
+        private static List<DeckComponent> createDecks() {
+            List<DeckComponent> decks = new ArrayList<>();
+            
+            // Get achievement service
+            AchievementService achievementService = ServiceLocator.getAchievementService();
+            
+            // Achievement definitions with descriptions and images
+            addAchievement(decks, achievementService, 
+                AchievementService.TOUGH_SURVIVOR,
+                "Tough Survivor",
+                "Survive with minimal damage and prove your resilience.",
+                "images/tough survivor.jpg");
+            
+            addAchievement(decks, achievementService,
+                AchievementService.SPEED_RUNNER,
+                "Speed Runner",
+                "Complete the level in record time.",
+                "images/speed runner.jpg");
+            
+            addAchievement(decks, achievementService,
+                AchievementService.SLAYER,
+                "Slayer",
+                "Defeat a massive number of enemies.",
+                "images/slayer.jpg");
+            
+            addAchievement(decks, achievementService,
+                AchievementService.PERFECT_CLEAR,
+                "Perfect Clear",
+                "Complete a level without taking any damage.",
+                "images/perfect clear.jpg");
+            
+            addAchievement(decks, achievementService,
+                AchievementService.PARTICIPATION,
+                "Participation",
+                "Join the game and start your journey.",
+                "images/participation.jpg");
+
+            return decks;
+        }
+
+        /**
+         * Helper method to add an achievement deck to the list.
+         */
+        private static void addAchievement(List<DeckComponent> decks, AchievementService service,
+                                          String achievementId, String name, String description, String image) {
+            boolean locked = service == null || !service.isUnlocked(achievementId);
+            decks.add(new AchievementBookDeckComponent(name, description, image, locked));
+        }
+    }
+
     public static class HeroBookComponent extends BookComponent {
         public HeroBookComponent() {
             super("HEROES", createDecks());