Merge pull request #206 from UQcsse3200/book

Improve Book

Author: thanhnhatquangmai

source/core/assets/configs/tower.json

@@ -1,6 +1,6 @@
 {
   "boneTower": {
-    "name": "bone tower",
+    "name": "Bone",
     "lore": "Crafted by ancient tribes, Bone Towers channel the primal energy of the land. Their flying bone projectiles carry the spirits of long-dead guardians, sending a chilling warning to any who dare approach.",
     "base": {
       "level_A": 1,
@@ -18,7 +18,7 @@
     }
   },
   "dinoTower": {
-    "name": "dino tower",
+    "name": "Dino",
     "locked": true,
     "lore": "Forged from the bones and scales of ancient beasts, Dino Towers launch fireballs that scorch everything in their path. Their ferocious roars echo across the battlefield, intimidating foes before they even reach your defenses.",
     "base": {
@@ -37,7 +37,7 @@
     }
   },
   "cavemenTower": {
-    "name": "cavemen tower",
+    "name": "Cavemen",
     "lore": "Cavemen Towers are staffed by expert marksmen armed with guns salvaged from defeated AI bots. With sharp eyes and steady hands, they make sure nothing slips through their sights.",
     "base": {
       "level_A": 1,
@@ -55,6 +55,8 @@
     }
   },
   "pterodactylTower": {
+    "name": "Pterodactyl",
+    "lore": "Hatched from a relic nest of ancient beasts, the Pterodactyl Tower binds its fierce instincts to modern defense systems. Its wings never tire, and its piercing shrieks echo across the battlefield as it defends its territory with primal fury.",
     "base": {
       "level_A": 1,
       "level_B": 1,
@@ -71,6 +73,8 @@
     }
   },
   "supercavemenTower": {
+    "name": "Super Cavemen",
+    "lore": "Super Cavemen are the result of experimental enhancements on elite hunters. With eyes that burn with laser fury and muscles honed to perfection, they strike fear into all who dare approach their territory.",
     "base": {
       "level_A": 1,
       "level_B": 1,
@@ -87,6 +91,8 @@
     }
   },
   "totemTower": {
+    "name": "Totem",
+    "lore": "Totem Towers are relics of a forgotten civilization, imbued with ancient magic that resonates with nearby machinery. Their mystical aura inspires and empowers all who stand within its influence.",
     "base": {
       "level_A": 1,
       "level_B": 1,
@@ -103,6 +109,8 @@
     }
   },
   "bankTower": {
+    "name": "Bank",
+    "lore": "Bank Towers are fortified vaults staffed by clever financiers. Their mechanisms mint currency from the battlefield itself, ensuring that wealth flows steadily to fund the defense of the realm.",
     "base": {
       "level_A": 1,
       "level_B": 1,
@@ -119,6 +127,8 @@
     }
   },
   "raftTower": {
+    "name": "Raft",
+    "lore": "Raft Towers are crewed by fearless Viking archers who mastered both sea and bow. Their handmade ships drift silently across the water, striking down enemies before they can ever reach the shore.",
     "base": {
       "level_A": 1,
       "level_B": 1,
@@ -135,6 +145,8 @@
     }
   },
   "frozenmamoothskullTower": {
+    "name": "Frozen Mammoth Skull",
+    "lore": "The Frozen Mammoth Skull Tower channels the lingering spirit of a long-extinct titan. Its frosty breath echoes through the ages, freezing all who dare tread near its glacial domain.",
     "base": {
       "level_A": 1,
       "level_B": 1,
@@ -151,6 +163,8 @@
     }
   },
   "bouldercatapultTower": {
+    "name": "Boulder Catapult",
+    "lore": "Constructed under the guidance of ancient village shamans, the Boulder Catapult Tower channels raw strength and earth’s fury. Each stone it launches carries the weight of the mountains themselves, crushing all who stand in its way.",
     "base": {
       "level_A": 1,
       "level_B": 1,
@@ -167,6 +181,9 @@
     }
   },
   "villageshamanTower": {
+    "name": "Village Shaman",
+    "lore": "The Village Shaman Tower draws its strength from ancient spirits and forgotten rituals. Guided by wisdom older than time, its chants summon lightning and energy from the skies, striking down enemies with divine precision.",
+    "locked": true,
     "base": {
       "level_A": 1,
       "level_B": 1,

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

@@ -161,14 +161,16 @@ 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 HERO_BOOK:
+        return new BookScreen(this, BookPage.HERO_PAGE);
       default:
         return null;
     }
   }
 
   public enum ScreenType {
     MAIN_MENU, MAIN_GAME, SETTINGS, SAVE_SELECTION, OPENING_CUTSCENE, VICTORY,
-    MAP_SELECTION, BOOK, CURRENCY_BOOK, ENEMY_BOOK, TOWER_BOOK, UPGRADES
+    MAP_SELECTION, BOOK, CURRENCY_BOOK, ENEMY_BOOK, TOWER_BOOK, UPGRADES, HERO_BOOK
   }
 
   /**

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

@@ -1,12 +1,7 @@
 package com.csse3200.game.components.book;
 
-import com.csse3200.game.components.deck.CurrencyBookDeckComponent;
-import com.csse3200.game.components.deck.DeckComponent;
-import com.csse3200.game.components.deck.EnemyBookDeckComponent;
-import com.csse3200.game.components.deck.TowerBookDeckComponent;
-import com.csse3200.game.entities.configs.CurrencyConfig;
-import com.csse3200.game.entities.configs.EnemyConfig;
-import com.csse3200.game.entities.configs.TowerConfig;
+import com.csse3200.game.components.deck.*;
+import com.csse3200.game.entities.configs.*;
 import com.csse3200.game.files.FileLoader;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -181,4 +176,20 @@ private static List<DeckComponent> createDecks() {
             return decks;
         }
     }
+
+    public static class HeroBookComponent extends BookComponent {
+        public HeroBookComponent() {
+            super("HEROES", createDecks());
+        }
+
+        private static List<DeckComponent> createDecks() {
+            List<DeckComponent> decks = new ArrayList<>();
+
+            decks.add(HeroBookDeckComponent.from("Hero", new HeroConfig()));
+            decks.add(HeroBookDeckComponent.from("Engineer", new EngineerConfig()));
+            decks.add(HeroBookDeckComponent.from("Samurai", new SamuraiConfig()));
+
+            return decks;
+        }
+    }
 }

source/core/src/main/com/csse3200/game/GdxGame.java

@@ -2,6 +2,7 @@
 
 import com.badlogic.gdx.audio.Sound;
 import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.Pixmap;
 import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.NinePatch;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
@@ -50,6 +51,7 @@ public class BookDisplay extends UIComponent {
 
     private DeckComponent deck;
     private boolean hasJustOpenedBook = true;
+    private static final Color borderColor =  new Color(0.38f, 0.26f, 0.04f, 1f);
 
     private Table contentListTable;
     private Table titleTable;
@@ -71,6 +73,9 @@ public BookDisplay(BookPage bookPage) {
         } else if (bookPage == BookPage.TOWER_PAGE) {
             this.book = new BookComponent.TowerBookComponent();
             maxWordsLore = 25;
+        } else if (bookPage == BookPage.HERO_PAGE) {
+            this.book = new BookComponent.HeroBookComponent();
+            maxWordsLore = 15;
         }
         this.decks = book == null ? null : book.getDecks();
     }
@@ -171,8 +176,18 @@ private void renderContentList() {
         Table table = new Table();
         table.setFillParent(true);
 
+        int imagesPerRow = 4;
+        float padLeftFactor = 0.16f;
+        if (decks.size() <= 8) {
+            imagesPerRow = 2;
+            padLeftFactor = 0.2f;
+        } else if (decks.size() <= 15) {
+            imagesPerRow = 3;
+            padLeftFactor = 0.18f;
+        }
+        
         // Left content list
-        table.top().left().padLeft(stageWidth * 0.2f).padTop(stageHeight * 0.2f);
+        table.top().left().padLeft(stageWidth * padLeftFactor).padTop(stageHeight * 0.2f);
 
         // Book title
         Label labelTitle = new Label(this.book.getTitle(), skin, "large");
@@ -184,11 +199,10 @@ private void renderContentList() {
                 .padTop(stageHeight * 0.12f);
         titleTable.add(labelTitle);
 
+        
         // Scale buttons relative to screen width
-        float buttonW = stageWidth * 0.12f;
-        float buttonH = stageHeight * 0.12f;
+        float buttonSize = stageWidth * 0.20f / imagesPerRow;
 
-        int imagesPerRow = 2;
         int count = 0;
 
         for (DeckComponent currentDeck : decks) {
@@ -217,13 +231,68 @@ public void changed(ChangeEvent changeEvent, Actor actor) {
                     }
                 });
             }
-            table.add(button).size(buttonW, buttonH).padRight(stageWidth * 0.01f);
+
+            // Wrap button with a bordered table
+            Table borderedButton = new Table();
+            borderedButton.setBackground(new TextureRegionDrawable(
+                    new TextureRegion(createBorderTexture(borderColor, 2))
+            ));
+            borderedButton.add(button).size(buttonSize, buttonSize).pad(2);
+
+            table.add(borderedButton).padRight(stageWidth * 0.08f / imagesPerRow);
         }
 
         stage.addActor(titleTable);
         stage.addActor(table);
     }
 
+    private Texture createBorderTexture(Color color, int thickness) {
+        int size = 64;
+        Pixmap pixmap = new Pixmap(size, size, Pixmap.Format.RGBA8888);
+
+        // Make everything transparent first
+        pixmap.setColor(0, 0, 0, 0);
+        pixmap.fill();
+
+        // Set border color
+        pixmap.setColor(color);
+
+        // Draw multiple nested rectangles to create the desired thickness
+        for (int i = 0; i < thickness; i++) {
+            pixmap.drawRectangle(i, i, size - 2 * i, size - 2 * i);
+        }
+
+        Texture texture = new Texture(pixmap);
+        pixmap.dispose();
+        return texture;
+    }
+
+    // Create a NinePatchDrawable that is a border (transparent center, colored frame)
+    private NinePatchDrawable createBorderNinePatchDrawable(int size, int thickness, Color color) {
+        Pixmap pixmap = new Pixmap(size, size, Pixmap.Format.RGBA8888);
+        // Fill fully transparent first
+        pixmap.setColor(0, 0, 0, 0);
+        pixmap.fill();
+
+        // Draw border by drawing rectangles of 1px thickness inwards
+        pixmap.setColor(color);
+        for (int i = 0; i < thickness; i++) {
+            pixmap.drawRectangle(i, i, size - 2 * i, size - 2 * i);
+        }
+
+        Texture texture = new Texture(pixmap);
+        pixmap.dispose();
+
+        // Create NinePatch so the center area stretches but border remains intact
+        NinePatch patch = new NinePatch(new TextureRegion(texture),
+                thickness, thickness, thickness, thickness);
+        NinePatchDrawable drawable = new NinePatchDrawable(patch);
+
+        // NOTE: texture will be owned by the patch; dispose later when screen is disposed
+        return drawable;
+    }
+
+
     /**
      * Renders the details of a selected deck on the right-hand panel.
      *
@@ -251,23 +320,37 @@ private void renderRightDeck(DeckComponent deck) {
         // Clear the whole right panel before re-rendering
         rightTable.clear();
 
-        // --- IMAGE ---
+        // --- IMAGE --- (inside renderRightDeck)
         Texture tex = ServiceLocator.getResourceService()
                 .getAsset(stats.get(DeckComponent.StatType.TEXTURE_PATH), Texture.class);
         Image rightImage = new Image(new TextureRegionDrawable(new TextureRegion(tex)));
 
         float imageW = stageWidth * 0.15f;
         float imageH = stageHeight * 0.25f;
-        rightTable.add(rightImage).size(imageW, imageH).center();
+
+        // Create border drawable (size 64, thickness 2 px)
+        int borderSize = 64;
+        int borderThicknessPx = 6;
+        NinePatchDrawable borderDrawable = createBorderNinePatchDrawable(borderSize, borderThicknessPx, borderColor);
+
+        // Wrap the image in a Table so the background is the border drawable
+        Table borderedImage = new Table();
+        borderedImage.setBackground(borderDrawable);
+
+        // Add the image inside the bordered table with a small padding so it doesn't overlap the border
+        float pad = borderThicknessPx; // Scale this using stageWidth/stageHeight if needed
+        borderedImage.add(rightImage).size(imageW - pad * 2, imageH - pad * 2).center();
+        rightTable.add(borderedImage).size(imageW, imageH).center();
         rightTable.row().padTop(stageHeight * 0.01f);
 
+
         // --- NAME ---
         String name = stats.get(DeckComponent.StatType.NAME);
         if (name == null || name.isEmpty()) {
             name = "Unknown";
         }
         Label nameLabel = new Label(name, skin, "large");
-        nameLabel.setFontScale(stageWidth * 0.001f);
+        nameLabel.setFontScale(stageWidth * 0.0008f);
         rightTable.add(nameLabel).center();
         rightTable.row().padTop(stageHeight * 0.01f);
 
@@ -276,7 +359,7 @@ private void renderRightDeck(DeckComponent deck) {
         if (lore != null && !lore.isEmpty()) {
             String trimmedLore = trimWords(lore, maxWordsLore);
             Label loreLabel = new Label(trimmedLore, skin, "small"); // use a smaller style
-            loreLabel.setFontScale(stageWidth * 0.001f);
+            loreLabel.setFontScale(stageWidth * 0.0008f);
             loreLabel.setWrap(true);
             rightTable.add(loreLabel)
                     .width(stageWidth * 0.3f)

source/core/src/main/com/csse3200/game/components/book/BookComponent.java

@@ -8,5 +8,6 @@ public enum BookPage {
     TOWER_PAGE,
     ENEMY_PAGE,
     CURRENCY_PAGE,
+    HERO_PAGE,
     NONE
 }