Fix Menace Arena not saving properly

- Added ban module
- Added Ban and Unban commands, supporting banning and unbanning players through various command parameters.
- Added timestamp formatting method in Utils utility class for displaying ban expiration times
- Introduced PlayerErrorCode enum defining various error codes including ErrBan
- Added dual ban checking for both IP and user during player login
- Optimized login failure responses to provide specific error reasons and parameters

.github/workflows/gradle.yml

@@ -0,0 +1,33 @@
+name: Nebula Nightly
+
+on:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v4
+    - name: Set up JDK 21
+      uses: actions/setup-java@v4
+      with:
+        java-version: '21'
+        distribution: 'temurin'
+
+    - name: Setup Gradle
+      uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582
+
+    - name: Build
+      run: |
+            chmod +x gradlew
+            ./gradlew jar
+
+    - name: Upload artifact
+      uses: actions/upload-artifact@v4
+      with:
+        name: Nebula-Nightly
+        path: Nebula.jar

.gitignore

@@ -58,12 +58,13 @@ tmp/
 .DS_Store
 .directory
 
-# Generated/resource/log/plugins folders
+# Generated/resource/log/plugins/etc folders
 /logs
 /plugins
 /proto
 /resources
 /web
+/StellaSoraData
 
 # Compiled
 /*.jar

README.md

@@ -1,12 +1,14 @@
 # Nebula
 
-A work in progress game server emulator for a certain anime game.
+A work in progress game server emulator for a certain anime game. Most features are implemented.
 
 For any extra support, questions, or discussions, check out our [Discord](https://discord.gg/cskCWBqdJk).
 
+Latest nightly compiled server jar: [Nightly](https://nightly.link/Melledy/Nebula/workflows/gradle/main/Nebula-Nightly.zip)
+
 ### Notable features
 - Basic profile features
-- Character system implemented (except for affinity)
+- Character system
 - Inventory/Discs working
 - Energy system
 - Mail system
@@ -15,19 +17,25 @@ For any extra support, questions, or discussions, check out our [Discord](https:
 - Battle pass
 - Gacha
 - Friend system (sending energy not implemented)
-- Shop (using only in-game currency)
+- Shop (only in-game currency supported)
 - Commissions
-- Heartlink (missing advanced affinity related features)
-- Monoliths (completeable but many other features missing)
+- Heartlink
+- Achievements
+- Monoliths (research quests not implemented)
 - Bounty Trials
 - Menance Arena
-- Proving grounds
-- Catacylsm Survivor (talents not fully working, score not calculated properly)
+- Proving Grounds
+- Catacylsm Survivor (talents not fully working)
 - Boss Blitz
+- Events (Only tower defense and trials)
 
-### Not implemented
-- Achievements
-- Events
+### Supported regions
+
+Nebula supports the global PC client by default. If you want to switch regions, you need to change the `region` field in the Nebula config.
+
+Current supported regions (PC): `GLOBAL`, `KR`, `JP`, `TW`, `CN`
+
+You may need to change the data version when switching regions. The `customDataVersion` field should match the the data version of your client, which is usually the last number of your client's version string (top left of your login screen). Example: 1.0.0.42 = data version 42.
 
 # Running the server and client
 
@@ -38,7 +46,7 @@ For any extra support, questions, or discussions, check out our [Discord](https:
 * [MongoDB 4.0+](https://www.mongodb.com/try/download/community)
 
 ### Compiling the server
-1. Open your system terminal, and compile the server with `./gradlew jar`
+1. Open your system terminal, and compile the server with `./gradlew jar` (If you downloaded the server jar from the Nightly link, you can skip this step)
 2. Create a folder named `resources` in your server directory
 3. Download the `bin`, `language` folders from a repository with [datamined game data](https://github.com/Hiro420/StellaSoraData) and place them into your resources folder.
 4. Run the server with `java -jar Nebula.jar` from your system terminal. This server comes with a built-in internal MongoDB server for its database, so no Mongodb installation is required. However, it is highly recommended to install Mongodb anyway. 
@@ -49,34 +57,47 @@ For any extra support, questions, or discussions, check out our [Discord](https:
 3. Copy and paste the following code into the Fiddlerscript tab of Fiddler Classic. Remember to save the fiddler script after you copy and paste it:
 
 ```
-import System;
-import System.Windows.Forms;
 import Fiddler;
-import System.Text.RegularExpressions;
 
 class Handlers
 {
+    static var list = [
+        ".yostarplat.com",
+        ".stellasora.global",
+        ".stellasora.kr",
+        ".stellasora.jp",
+        ".stargazer-games.com",
+        ".yostar.cn"
+    ];
+
     static function OnBeforeRequest(oS: Session) {
-        if (oS.host.EndsWith(".yostarplat.com") || oS.host.EndsWith(".stellasora.global")) {
-            oS.oRequest.headers.UriScheme = "http";
-            oS.host = "localhost"; // This can also be replaced with another IP address.
+        for (var i = 0; i < list.length; i++) {
+            if (oS.host.EndsWith(list[i])) {
+                oS.oRequest.headers.UriScheme = "http";
+                oS.host = "localhost"; // This can also be replaced with another IP address
+            }
         }
     }
 };
 ```
 
 4. If `autoCreateAccount` is set to true in the config, then you can skip this step. Otherwise, type `/account create [account email]` in the server console to create an account.
-5. Login with your account name, the code field is ignored by the server and can be set to anything.
+5. Login with your account email, the code field is ignored by the server and can be set to anything.
 
 ### Server commands
 Server commands need to be run in the server console OR in the signature edit menu of your profile.
 
 ```
 !account {create | delete} [email] (reserved player uid) = Creates or deletes an account.
-!char [all | {characterId}] lv(level) a(ascension) s(skill level) t(talent level) = Changes the properties of the targeted characters.
+!battlepass [free | premium] lv(level) = Modifies the targeted player's battle pass
+!char [all | {characterId}] lv(level) a(ascension) s(skill level) t(talent level) f(affinity level) = Changes the properties of the targeted characters.
+!clean [all | {id} ...] [items|resources] = Removes items/resources from the targeted player.
 !disc [all | {discId}] lv(level) a(ascension) c(crescendo level) = Changes the properties of the targeted discs.
 !give [item id] x[amount] = Gives the targeted player an item through the mail.
 !giveall [characters | discs | materials] = Gives the targeted player items.
-!mail = Sends the targeted player a system mail.
+!help = Displays a list of available commands. (Very spammy in-game)
+!level (level) = Sets the player level
+!mail "subject" "body" [itemId xQty | itemId:qty ...] = Sends the targeted player a system mail.
 !reload = Reloads the server config.
+!remote = Creates a player token for remote api usage
 ```

build.gradle

@@ -29,7 +29,7 @@ java {
     }
 }
 
-version = '1.0.1'
+version = '1.1.3'
 
 var shouldGenerateProto = System.getenv("GENERATE_PROTO") == "true"
 System.out.println(shouldGenerateProto ? "Generating proto files" : "Skipping proto generation")

src/main/java/emu/nebula/Config.java

@@ -17,12 +17,15 @@ public class Config {
 
     public HttpServerConfig httpServer = new HttpServerConfig(80);
     public GameServerConfig gameServer = new GameServerConfig(80);
-    
+
     public ServerOptions serverOptions = new ServerOptions();
     public ServerRates serverRates = new ServerRates();
     public LogOptions logOptions = new LogOptions();
+    public RemoteCommand remoteCommand = new RemoteCommand();
 
     public int customDataVersion = 0;
+    public String region = "global";
+    
     public String resourceDir = "./resources";
     public String webFilesDir = "./web";
     public String patchListPath = "./patchlist.json";
@@ -54,35 +57,35 @@ public class Config {
         public int bindPort;
         public String publicAddress = "127.0.0.1"; // Will return bindAddress if publicAddress is null
         public Integer publicPort; // Will return bindPort if publicPort is null
-        
+
         public ServerConfig(int port) {
             this.bindPort = port;
         }
-        
+
         public String getPublicAddress() {
             if (this.publicAddress != null && !this.publicAddress.isEmpty()) {
                 return this.publicAddress;
             }
-            
+
             return this.bindAddress;
         }
-        
+
         public int getPublicPort() {
             if (this.publicPort != null && this.publicPort != 0) {
                 return this.publicPort;
             }
-            
+
             return this.bindPort;
         }
-        
+
         public String getDisplayAddress() {
             return (useSSL ? "https" : "http") + "://" + getPublicAddress() + ":" + getPublicPort();
         }
     }
-    
+
     @Getter
     public static class HttpServerConfig extends ServerConfig {
-        
+
         public HttpServerConfig(int port) {
             super(port);
         }
@@ -90,52 +93,67 @@ public class Config {
 
     @Getter
     public static class GameServerConfig extends ServerConfig {
-        
+
         public GameServerConfig(int port) {
             super(port);
         }
     }
-    
+
     @Getter
     public static class ServerOptions {
+        // Default permissions for accounts. By default, all commands are allowed. Reccomended to change if making a public server.
         public Set<String> defaultPermissions = Set.of("*");
+        // Automatically creates an account when a player logs in for the first time on a new email.
         public boolean autoCreateAccount = true;
+        // Skips the intro cinematics/stage when starting a new account.
         public boolean skipIntro = false;
+        // Unlocks all instances (Monolith, Bounty Trials, etc) for players to enter without needing to do the previous levels.
         public boolean unlockInstances = true;
+        // How long to wait (in seconds) after the last http request from a session before removing it from the server.
+        public int sessionTimeout = 300;
+        // The offset hour for when daily quests are refreshed in UTC. Example: "dailyResetHour = 4" means dailies will be refreshed at UTC+4 12:00 AM every day.
         public int dailyResetHour = 0;
-        public int leaderboardRefreshTime = 60; // Leaderboard refresh time in seconds
+        // Leaderboard for Boss Blitz refresh time in seconds.
+        public int leaderboardRefreshTime = 60;
+        // The welcome mail to send when a player is created. Set to null to disable.
         public WelcomeMail welcomeMail = new WelcomeMail();
     }
-    
+
     @Getter
     public static class ServerRates {
         public double exp = 1.0;
     }
-    
+
     @Getter
     public static class LogOptions {
         public boolean commands = true;
         public boolean packets = false;
+        public boolean httpDebug = false;
     }
-    
+
+    @Getter
+    public static class RemoteCommand {
+        public boolean useRemoteServices = false;
+        public String serverAdminKey = "HJHASDPIIQWEASDHHAN";
+    }
+
     @Getter
     public static class WelcomeMail {
         public String title;
         public String sender;
         public String content;
         public List<ItemParam> attachments;
-        
+
         public WelcomeMail() {
             this.title = "Welcome to a Nebula server";
             this.sender = "Server";
             this.content = "Welcome to Nebula! Please take these items as a starter gift.";
             this.attachments = List.of(
-                new ItemParam(86009, 1),
-                new ItemParam(86002, 1),
-                new ItemParam(1, 1_000_000),
-                new ItemParam(2, 30_000)
-            );
+                    new ItemParam(86009, 1),
+                    new ItemParam(86002, 1),
+                    new ItemParam(1, 1_000_000),
+                    new ItemParam(2, 30_000));
         }
     }
-    
+
 }

src/main/java/emu/nebula/GameConstants.java

@@ -6,8 +6,26 @@ import emu.nebula.game.inventory.ItemParam;
 import emu.nebula.util.WeightedList;
 
 public class GameConstants {
-    private static final int DATA_VERSION = 51;
-    private static final String VERSION = "1.2.0";
+    public static final String VERSION = "1.3.0";
+    public static int DATA_VERSION = 0;
+    
+    // Set data versions for each region
+    static {
+        RegionConfig.getRegion("global")
+            .setDataVersion(69);
+        
+        RegionConfig.getRegion("kr")
+            .setDataVersion(76);
+        
+        RegionConfig.getRegion("jp")
+            .setDataVersion(72);
+        
+        RegionConfig.getRegion("tw")
+            .setDataVersion(70);
+
+        RegionConfig.getRegion("cn")
+            .setDataVersion(70);
+    }
     
     public static final ZoneId UTC_ZONE = ZoneId.of("UTC");
     
@@ -19,8 +37,8 @@ public class GameConstants {
     public static final int GEM_ITEM_ID = 2;
     public static final int PREM_GEM_ITEM_ID = 3;
     public static final int ENERGY_BUY_ITEM_ID = GEM_ITEM_ID;
-    public static final int STAR_TOWER_GOLD_ITEM_ID = 11;
     public static final int EXP_ITEM_ID = 21;
+    public static final int WEEKLY_ENTRY_ITEM_ID = 28;
     
     public static final int MAX_ENERGY = 240;
     public static final int ENERGY_REGEN_TIME = 360; // Seconds
@@ -29,7 +47,7 @@ public class GameConstants {
     public static final int CHARACTER_MAX_GEM_PRESETS = 3;
     public static final int CHARACTER_MAX_GEM_SLOTS = 3;
     
-    public static final int MAX_FORMATIONS = 5;
+    public static final int MAX_FORMATIONS = 6;
     public static final int MAX_SHOWCASE_IDS = 5;
     
     public static final int BATTLE_PASS_ID = 1;
@@ -37,6 +55,20 @@ public class GameConstants {
     public static final int MAX_FRIENDSHIPS = 50;
     public static final int MAX_PENDING_FRIENDSHIPS = 30;
     
+    public static final int TOWER_COIN_ITEM_ID = 11;
+    public static final int[] TOWER_COMMON_SUB_NOTE_SKILLS = new int[] {
+        90011, 90012, 90013, 90014, 90015, 90016, 90017
+    };
+    public static final int[] TOWER_EVENTS_IDS = new int[] {
+        101, 102, 104, 105, 106, 107, 108, 114, 115, 116, 126, 127, 128
+    };
+    
+    public static int[][] VAMPIRE_SURVIVOR_BONUS_POWER = new int[][] {
+        new int[] {100, 120},
+        new int[] {200, 150},
+        new int[] {300, 200}
+    };
+    
     // Daily gifts (Custom)
     
     public static final WeightedList<ItemParam> DAILY_GIFTS = new WeightedList<>();
@@ -44,13 +76,21 @@ public class GameConstants {
     static {
         DAILY_GIFTS.add(1000, new ItemParam(GOLD_ITEM_ID, 8888));
         DAILY_GIFTS.add(250, new ItemParam(GOLD_ITEM_ID, 18888));
+        DAILY_GIFTS.add(250, new ItemParam(33001, 10));
         DAILY_GIFTS.add(10, new ItemParam(GEM_ITEM_ID, 50));
     }
     
     // Helper functions
     
     public static String getGameVersion() {
-        return VERSION + "." + getDataVersion();
+        // Load data version
+        var region = RegionConfig.getRegion(Nebula.getConfig().getRegion());
+        
+        // Set data version from region
+        GameConstants.DATA_VERSION = region.getDataVersion();
+        
+        // Init game version string
+        return VERSION + "." + getDataVersion() + " (" + region.getName().toUpperCase() + ")";
     }
     
     public static int getDataVersion() {

src/main/java/emu/nebula/Nebula.java

@@ -17,6 +17,7 @@ import emu.nebula.game.GameContext;
 import emu.nebula.net.PacketHelper;
 import emu.nebula.plugin.PluginManager;
 import emu.nebula.server.HttpServer;
+import emu.nebula.util.AeadHelper;
 import emu.nebula.util.Handbook;
 import emu.nebula.util.JsonUtils;
 import lombok.Getter;
@@ -52,6 +53,9 @@ public class Nebula {
         
         boolean generateHandbook = true;
         
+        // Load keys
+        AeadHelper.loadKeys();
+        
         // Load plugin manager
         Nebula.pluginManager = new PluginManager();
 
@@ -107,7 +111,7 @@ public class Nebula {
         
         // Start servers
         try {
-            // Always run http server as it is needed by for dispatch and gateserver
+            // Always run http server as it is needed by for login and game server
             httpServer = new HttpServer(serverType);
             httpServer.start();
         } catch (Exception exception) {
@@ -233,7 +237,8 @@ public class Nebula {
         String input;
         try (BufferedReader br = new BufferedReader(new InputStreamReader(System.in))) {
             while ((input = br.readLine()) != null) {
-                Nebula.getCommandManager().invoke(null, input);
+                var result = Nebula.getCommandManager().invoke(null, input);
+                Nebula.getLogger().info(result.getMessage());
             }
         } catch (Exception e) {
             Nebula.getLogger().error("Console error:", e);

src/main/java/emu/nebula/RegionConfig.java

@@ -0,0 +1,42 @@
+package emu.nebula;
+
+import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter @Setter
+public class RegionConfig {
+    private String name;
+    private int dataVersion;
+    private String serverMetaKey;
+    private String serverGarbleKey;
+    
+    private static Object2ObjectMap<String, RegionConfig> REGIONS = new Object2ObjectOpenHashMap<>();
+    
+    public RegionConfig(String name) {
+        this.name = name;
+        this.serverMetaKey = "";
+        this.serverGarbleKey = "";
+    }
+    
+    public RegionConfig setDataVersion(int i) {
+        this.dataVersion = i;
+        return this;
+    }
+    
+    public RegionConfig setServerMetaKey(String key) {
+        this.serverMetaKey = key;
+        return this;
+    }
+    
+    public RegionConfig setServerGarbleKey(String key) {
+        this.serverGarbleKey = key;
+        return this;
+    }
+    
+    public static RegionConfig getRegion(String name) {
+        String regionName = name.toLowerCase();
+        return REGIONS.computeIfAbsent(regionName, r -> new RegionConfig(regionName));
+    }
+}

src/main/java/emu/nebula/command/CommandArgs.java

@@ -7,8 +7,8 @@ import emu.nebula.game.character.GameCharacter;
 import emu.nebula.game.character.GameDisc;
 import emu.nebula.game.player.Player;
 import emu.nebula.util.Utils;
+import it.unimi.dsi.fastutil.ints.Int2IntLinkedOpenHashMap;
 import it.unimi.dsi.fastutil.ints.Int2IntMap;
-import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import it.unimi.dsi.fastutil.objects.ObjectSet;
 import lombok.Getter;
@@ -26,6 +26,7 @@ public class CommandArgs {
     private int advance = -1;
     private int talent = -1;
     private int skill = -1;
+    private int affinity = -1;
     
     private Int2IntMap map;
     private ObjectSet<String> flags;
@@ -52,6 +53,9 @@ public class CommandArgs {
                     } else if (arg.startsWith("lv")) { // Level
                         this.level = Utils.parseSafeInt(arg.substring(2));
                         it.remove();
+                    } else if (arg.startsWith("lvl")) { // Level
+                        this.level = Utils.parseSafeInt(arg.substring(3));
+                        it.remove();
                     } else if (arg.startsWith("a")) { // Advance
                         this.advance = Utils.parseSafeInt(arg.substring(1));
                         it.remove();
@@ -61,6 +65,9 @@ public class CommandArgs {
                     } else if (arg.startsWith("s")) { // Skill
                         this.skill = Utils.parseSafeInt(arg.substring(1));
                         it.remove();
+                    } else if (arg.startsWith("f")) { // Affinity level
+                        this.affinity = Utils.parseSafeInt(arg.substring(1));
+                        it.remove();
                     }
                 } else if (arg.startsWith("-")) { // Flag
                     if (this.flags == null) this.flags = new ObjectOpenHashSet<>();
@@ -72,7 +79,7 @@ public class CommandArgs {
                         int key = Integer.parseInt(split[0]);
                         int value = Integer.parseInt(split[1]);
                         
-                        if (this.map == null) this.map = new Int2IntOpenHashMap();
+                        if (this.map == null) this.map = new Int2IntLinkedOpenHashMap();
                         this.map.put(key, value);
                         
                         it.remove();
@@ -109,18 +116,6 @@ public class CommandArgs {
         return this.list.get(index);
     }
     
-    /**
-     * Sends a message to the command sender
-     * @param message
-     */
-    public void sendMessage(String message) {
-        if (sender != null) {
-            sender.sendMessage(message);
-        } else {
-            Nebula.getLogger().info(message);
-        }
-    }
-    
     public boolean hasFlag(String flag) {
         if (this.flags == null) return false;
         return this.flags.contains(flag);
@@ -190,6 +185,16 @@ public class CommandArgs {
             
             hasChanged = true;
         }
+
+        if (this.getAffinity() >= 0) {
+            int target = this.getAffinity();
+            if (target > 50) target = 50;
+            if (target < 0) target = 0;
+            if (character.getAffinityLevel() != target) {
+                character.setAffinityLevel(target);
+                hasChanged = true;
+            }
+        }
         
         return hasChanged;
     }

src/main/java/emu/nebula/command/CommandHandler.java

@@ -10,6 +10,6 @@ public interface CommandHandler {
         return getData().label();
     }
     
-    public void execute(CommandArgs args);
+    public String execute(CommandArgs args);
     
 }

src/main/java/emu/nebula/command/CommandManager.java

@@ -108,7 +108,7 @@ public class CommandManager {
         return sender.getAccount().hasPermission("target." + command.permission());
     }
     
-    public void invoke(Player sender, String message) {
+    public CommandResult invoke(Player sender, String message) {
         // Parse message into arguments
         List<String> args = Arrays.stream(message.split(" ")).collect(Collectors.toCollection(ArrayList::new));
         
@@ -122,6 +122,9 @@ public class CommandManager {
         
         // Get command handler
         CommandHandler handler = this.commands.get(label);
+        
+        // Create result object
+        var result = CommandResult.builder();
 
         // Execute command
         if (handler != null) {
@@ -131,8 +134,8 @@ public class CommandManager {
             // Check if sender has permission to run the command.
             if (sender != null && !this.checkPermission(sender, command)) {
                 // We have a double null check here just in case
-                sender.sendMessage("You do not have permission to use this command.");
-                return;
+                result.message("Error - You do not have permission to use this command");
+                return result.build();
             }
             
             // Build command arguments
@@ -140,14 +143,14 @@ public class CommandManager {
             
             // Check targeted permission
             if (sender != cmdArgs.getTarget() && !this.checkTargetPermission(sender, command)) {
-                cmdArgs.sendMessage("You do not have permission to use this command on another player.");
-                return;
+                result.message("Error - You do not have permission to use this command on another player");
+                return result.build();
             }
             
             // Make sure our command has a target
             if (command.requireTarget() && cmdArgs.getTarget() == null) {
-                cmdArgs.sendMessage("Error: Targeted player not found or offline");
-                return;
+                result.message("Error - Targeted player not found or offline");
+                return result.build();
             }
             
             // Log
@@ -156,13 +159,20 @@ public class CommandManager {
             }
             
             // Run command
-            handler.execute(cmdArgs);
-        } else {
-            if (sender != null) {
-                sender.sendMessage("Invalid Command!");
-            } else {
-                Nebula.getLogger().info("Invalid Command!");
+            String commandMessage = handler.execute(cmdArgs);
+            
+            // Parse out last newline
+            if (commandMessage.endsWith("\n")) {
+                commandMessage = commandMessage.substring(0, commandMessage.length() - 1);
             }
+            
+            // Set result data
+            result.command(handler);
+            result.message(commandMessage);
+        } else {
+            result.message("Invalid Command!");
         }
+        
+        return result.build();
     }
 }

src/main/java/emu/nebula/command/CommandResult.java

@@ -0,0 +1,19 @@
+package emu.nebula.command;
+
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder
+public class CommandResult {
+    private CommandHandler command;
+    private String message;
+    
+    public boolean isCommandTypeOf(Class<? extends CommandHandler> handler) {
+        if (command == null) {
+            return false;
+        }
+        
+        return command.getClass().equals(handler);
+    }
+}

src/main/java/emu/nebula/command/commands/AccountCommand.java

@@ -6,14 +6,13 @@ import emu.nebula.command.CommandHandler;
 import emu.nebula.game.account.AccountHelper;
 import emu.nebula.util.Utils;
 
-@Command(label = "account", permission = "admin.account", desc = "/account {create | delete} [email] (reserved player uid). Creates or deletes an account.")
+@Command(label = "account", permission = "admin.account", desc = "!account {create | delete} [email] (reserved player uid). Creates or deletes an account.")
 public class AccountCommand implements CommandHandler {
 
     @Override
-    public void execute(CommandArgs args) {
+    public String execute(CommandArgs args) {
         if (args.size() < 2) {
-            args.sendMessage("Invalid amount of args");
-            return;
+            return "Invalid amount of args";
         }
         
         String command = args.get(0).toLowerCase();
@@ -29,19 +28,22 @@ public class AccountCommand implements CommandHandler {
                 }
     
                 if (AccountHelper.createAccount(username, null, reservedUid) != null) {
-                    args.sendMessage("Account created");
+                    return "Account created";
                 } else {
-                    args.sendMessage("Account already exists");
+                    return "Account already exists";
                 }
             }
             case "delete" -> {
                 if (AccountHelper.deleteAccount(username)) {
-                    args.sendMessage("Account deleted");
+                    return "Account deleted";
                 } else {
-                    args.sendMessage("Account doesnt exist");
+                    return "Account doesnt exist";
                 }
             }
         }
+        
+        // Fallback
+        return "Account sub command not found";
     }
 
 }

src/main/java/emu/nebula/command/commands/BanCommand.java

@@ -0,0 +1,115 @@
+package emu.nebula.command.commands;
+
+import emu.nebula.Nebula;
+import emu.nebula.command.Command;
+import emu.nebula.command.CommandArgs;
+import emu.nebula.command.CommandHandler;
+import emu.nebula.game.player.Player;
+import emu.nebula.util.Utils;
+
+import java.util.Locale;
+
+@Command(label = "ban",
+        permission = "admin.ban",
+        desc = """
+                !ban {all | ip | uid} [player uid | ip] (end timestamp) (reason) - Ban a player\
+                
+                - all mode bans both the player object and their IP address by UID, so the next parameter should be UID instead of IP
+                - ip mode can only ban IP addresses, so the next parameter should be an IP
+                - uid mode can only ban UIDs, so the next parameter should be a UID
+                - If you don't fill in the end timestamp, it will be permanently banned by default\
+                """)
+public class BanCommand implements CommandHandler {
+
+    @Override
+    public String execute(CommandArgs args) {
+        if (args.size() < 2) {
+            return "Invalid amount of args";
+        }
+
+        int bannedUid = 0;
+        long banEndTime = 0;
+        String bannedIp = null;
+        String reason = null;
+
+        String mode = args.get(0).toLowerCase(Locale.ROOT);
+
+        switch (args.size()) {
+            case 4:
+                reason = args.get(3);
+            case 3: {
+                try {
+                    banEndTime = Long.parseLong(args.get(2));
+                } catch (NumberFormatException ignored) {
+                    return "Unable to parse timestamp.";
+                }
+            }
+            case 2: {
+                if (mode.equals("ip")) {
+                    bannedIp = args.get(1);
+                } else {
+                    try {
+                        bannedUid = Integer.parseInt(args.get(1));
+                    } catch (NumberFormatException ignored) {
+                        return "Unable to parse uid.";
+                    }
+                }
+            }
+            case 1: {
+                if (!mode.equals("all") && !mode.equals("uid") && !mode.equals("ip"))
+                    return "Unable to parse mode.";
+            }
+            default: break;
+        }
+
+        if (banEndTime != 0 && banEndTime < System.currentTimeMillis()) {
+            return "Failed, the end timestamp must be greater than the current time";
+        }
+
+        var banModule = Nebula.getGameContext().getBanModule();
+
+        Player player;
+        if (!mode.equals("ip")) {
+            player = Nebula.getGameContext().getPlayerModule().getPlayer(bannedUid);
+
+            if (player == null) {
+                return "Failed, player not found.";
+            }
+        }
+
+        switch (mode) {
+            case "all" -> {
+                banModule.banPlayer(
+                        bannedUid,
+                        banEndTime,
+                        reason,
+                        true,
+                        args.getSender() != null ? String.valueOf(args.getSender().getUid()) : "Console");
+                return "Banned player all mode " + bannedUid + " until " + Utils.formatTimestamp(banEndTime) +
+                        (reason != null ? " (" + reason + ")" : "");
+            }
+            case "ip" -> {
+                banModule.banIp(
+                        bannedIp,
+                        banEndTime,
+                        reason,
+                        args.getSender() != null ? String.valueOf(args.getSender().getUid()) : "Console");
+                return "Banned ip " + bannedIp + " until " + Utils.formatTimestamp(banEndTime) +
+                        (reason != null ? " (" + reason + ")" : "");
+            }
+            case "uid" -> {
+                banModule.banPlayer(
+                        bannedUid,
+                        banEndTime,
+                        reason,
+                        false,
+                        args.getSender() != null ? String.valueOf(args.getSender().getUid()) : "Console");
+                return "Banned player " + bannedUid + " until " + Utils.formatTimestamp(banEndTime) +
+                        (reason != null ? " (" + reason + ")" : "");
+            }
+            default -> {
+                return "Ban sub command not found";
+            }
+        }
+    }
+}

src/main/java/emu/nebula/command/commands/BattlePassCommand.java

@@ -0,0 +1,61 @@
+package emu.nebula.command.commands;
+
+import emu.nebula.command.Command;
+import emu.nebula.command.CommandArgs;
+import emu.nebula.command.CommandHandler;
+import emu.nebula.net.NetMsgId;
+
+@Command(label = "battlepass", aliases = {"bp"}, permission = "player.battlepass", desc = "!battlepass [free | premium] lv(level) = Modifies the targeted player's battle pass")
+public class BattlePassCommand implements CommandHandler {
+
+    @Override
+    public String execute(CommandArgs args) {
+        // Get target
+        var target = args.getTarget();
+        var battlepass = target.getBattlePassManager().getBattlePass();
+        boolean changed = false;
+        
+        // Check if we are changing premium status
+        int mode = -1;
+        
+        for (var arg : args.getList()) {
+            if (arg.equalsIgnoreCase("free")) {
+                mode = 0;
+            } else if (arg.equalsIgnoreCase("premium")) {
+                mode = 2;
+            }
+        }
+        
+        if (mode >= 0 && battlepass.getMode() != mode) {
+            battlepass.setMode(mode);
+            changed = true;
+        }
+        
+        // Set level
+        int level = Math.min(args.getLevel(), 50);
+        
+        if (level >= 0 && battlepass.getLevel() != level) {
+            battlepass.setLevel(level);
+            changed = true;
+        }
+        
+        // Check if we have made any changes
+        if (changed) {
+            // Save battle pass to the database
+            battlepass.save();
+            
+            // Send package to notify the client that the battle pass needs updating
+            target.addNextPackage(
+                NetMsgId.battle_pass_info_succeed_ack, 
+                battlepass.toProto()
+            );
+            
+            // Success message
+            return "Changed the battle pass successfully.";
+        }
+        
+        // Result message
+        return "No changes were made to the battle pass.";
+    }
+
+}

src/main/java/emu/nebula/command/commands/BuildCommand.java

@@ -0,0 +1,182 @@
+package emu.nebula.command.commands;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import emu.nebula.command.Command;
+import emu.nebula.command.CommandArgs;
+import emu.nebula.command.CommandHandler;
+import emu.nebula.data.GameData;
+import emu.nebula.game.character.GameCharacter;
+import emu.nebula.game.character.GameDisc;
+import emu.nebula.game.player.Player;
+import emu.nebula.game.tower.StarTowerBuild;
+import emu.nebula.net.NetMsgId;
+import emu.nebula.util.Utils;
+import lombok.Getter;
+
+@Command(
+    label = "build", 
+    aliases = {"b", "record", "r"}, 
+    permission = "player.build", 
+    requireTarget = true,
+    desc = "!build [char ids...] [disc ids...] [potential ids...] [melody ids...]"
+)
+public class BuildCommand implements CommandHandler {
+
+    @Override
+    public String execute(CommandArgs args) {
+        // Create record
+        var target = args.getTarget();
+        var builder = new StarTowerBuildData(target);
+        
+        // Parse items
+        for (String arg : args.getList()) {
+            int id = Utils.parseSafeInt(arg);
+            int count = 1;
+            
+            this.parseItem(builder, id, count);
+        }
+        
+        if (args.getMap() != null) {
+            for (var entry : args.getMap().int2IntEntrySet()) {
+                int id = entry.getIntKey();
+                int count = entry.getIntValue();
+                
+                this.parseItem(builder, id, count);
+            }
+        }
+        
+        // Check if build is valid
+        if (builder.getCharacters().size() != 3) {
+            return "Record must have 3 different characters";
+        }
+        
+        if (builder.getDiscs().size() < 3 || builder.getDiscs().size() > 6) {
+            return "Record must have 3-6 different discs";
+        }
+        
+        // Create record
+        var build = builder.toBuild();
+        
+        // Add to star tower manager
+        target.getStarTowerManager().getBuilds().put(build.getUid(), build);
+        
+        // Save to database
+        build.save();
+        
+        // Send package to player
+        target.addNextPackage(NetMsgId.st_import_build_notify, build.toProto());
+            
+        // Send result to player
+        return "Created record for " + target.getName() + " (This command make take time to update on the client)";
+    }
+    
+    private void parseItem(StarTowerBuildData builder, int id, int count) {
+        // Get item data
+        var itemData = GameData.getItemDataTable().get(id);
+        if (itemData == null) {
+            return;
+        }
+        
+        // Clamp
+        count = Math.max(count, 1);
+        
+        // Parse by item id
+        switch (itemData.getItemSubType()) {
+            case Char -> {
+                var character = builder.getPlayer().getCharacters().getCharacterById(id);
+                if (character == null || !character.getData().isAvailable()) {
+                    break;
+                }
+                
+                builder.addCharacter(character);
+            }
+            case Disc -> {
+                var disc = builder.getPlayer().getCharacters().getDiscById(id);
+                if (disc == null || !disc.getData().isAvailable()) {
+                    break;
+                }
+                
+                builder.addDisc(disc);
+            }
+            case Potential, SpecificPotential -> {
+                var potentialData = GameData.getPotentialDataTable().get(id);
+                if (potentialData == null) break;
+                
+                int level = Math.min(count, potentialData.getMaxLevel());
+                builder.getBuild().getPotentials().add(id, level);
+            }
+            case SubNoteSkill -> {
+                builder.getBuild().getSubNoteSkills().add(id, count);
+            }
+            default -> {
+                // Ignored
+            }
+        }
+    }
+
+    @Getter
+    private static class StarTowerBuildData {
+        private Player player;
+        private StarTowerBuild build;
+        private List<GameCharacter> characters;
+        private List<GameDisc> discs;
+        
+        public StarTowerBuildData(Player player) {
+            this.player = player;
+            this.build = new StarTowerBuild(player);
+            this.characters = new ArrayList<>();
+            this.discs = new ArrayList<>();
+        }
+        
+        public void addCharacter(GameCharacter character) {
+            if (this.characters.contains(character)) {
+                return;
+            }
+            
+            this.characters.add(character);
+        }
+        
+        public void addDisc(GameDisc disc) {
+            if (this.discs.contains(disc)) {
+                return;
+            }
+            
+            this.discs.add(disc);
+        }
+        
+        public StarTowerBuild toBuild() {
+            // Set characters and discs
+            build.setChars(this.getCharacters());
+            build.setDiscs(this.getDiscs());
+            
+            // Clear character potential cache
+            build.getCharPots().clear();
+            
+            for (int charId : build.getCharIds()) {
+                build.getCharPots().put(charId, 0);
+            }
+            
+            // Add potentials to character potential cache
+            var it = build.getPotentials().iterator();
+            while (it.hasNext()) {
+                var potential = it.next();
+                
+                var data = GameData.getPotentialDataTable().get(potential.getIntKey());
+                if (data == null || !build.getCharPots().containsKey(data.getCharId())) {
+                    it.remove();
+                    continue;
+                }
+                
+                build.getCharPots().add(data.getCharId(), 1);
+            }
+            
+            // Calculate score
+            build.calculateScore();
+            
+            // Return build
+            return build;
+        }
+    }
+}

src/main/java/emu/nebula/command/commands/CharacterCommand.java

@@ -16,13 +16,13 @@ import emu.nebula.command.CommandHandler;
         label = "character", 
         aliases = {"c", "char"}, 
         permission = "player.character", 
-        requireTarget = true, 
-        desc = "!c [all | {characterId}] lv(level) a(ascension) s(skill level) t(talent level)"
+        requireTarget = true,
+        desc = "!c [all | {characterId}] lv(level) a(ascension) s(skill level) t(talent level) f(affinity level)"
 )
 public class CharacterCommand implements CommandHandler {
 
     @Override
-    public void execute(CommandArgs args) {
+    public String execute(CommandArgs args) {
         // Init
         var player = args.getTarget();
         var characters = new HashSet<GameCharacter>();
@@ -51,7 +51,7 @@ public class CharacterCommand implements CommandHandler {
         
         // Sanity check
         if (characters.isEmpty()) {
-            return;
+            return "Error: No characters selected";
         }
         
         // List of modified characters that we send to the client for updates
@@ -72,7 +72,7 @@ public class CharacterCommand implements CommandHandler {
         }
         
         if (modified.isEmpty()) {
-            return;
+            return "No changes applied";
         }
         
         // Encode and send
@@ -83,5 +83,6 @@ public class CharacterCommand implements CommandHandler {
         }
         
         player.addNextPackage(NetMsgId.chars_final_notify, proto);
+        return "Updated " + modified.size() + " character(s)";
     }
 }

src/main/java/emu/nebula/command/commands/CleanCommand.java

@@ -0,0 +1,129 @@
+package emu.nebula.command.commands;
+
+import emu.nebula.command.Command;
+import emu.nebula.command.CommandArgs;
+import emu.nebula.command.CommandHandler;
+import emu.nebula.data.GameData;
+import emu.nebula.data.resources.ItemDef;
+import emu.nebula.game.inventory.GameItem;
+import emu.nebula.game.inventory.GameResource;
+import emu.nebula.game.inventory.ItemParamMap;
+import emu.nebula.game.inventory.ItemType;
+import emu.nebula.game.player.PlayerChangeInfo;
+import emu.nebula.net.NetMsgId;
+import emu.nebula.util.Utils;
+
+import java.util.HashSet;
+
+@Command(
+        label = "clean",
+        aliases = {"cl", "clear"},
+        permission = "player.inventory",
+        requireTarget = true,
+        desc = "!clean [all | {id} ...] [items|resources] = Removes items/resources from the targeted player."
+)
+public class CleanCommand implements CommandHandler {
+
+    @Override
+    public String execute(CommandArgs args) {
+        var player = args.getTarget();
+        var inv = player.getInventory();
+
+        boolean doItems = true;
+        boolean doResources = true;
+        boolean all = false;
+
+        var ids = new HashSet<Integer>();
+
+        for (String arg : args.getList()) {
+            arg = arg.toLowerCase();
+
+            switch (arg) {
+                case "items" -> {
+                    doResources = false;
+                    continue;
+                }
+                case "resources", "res" -> {
+                    doItems = false;
+                    continue;
+                }
+                case "all" -> {
+                    all = true;
+                    continue;
+                }
+            }
+
+            int id = Utils.parseSafeInt(arg);
+            if (id > 0) {
+                ids.add(id);
+            }
+        }
+
+        var change = new PlayerChangeInfo();
+        var removeMap = new ItemParamMap();
+
+        if (all) {
+            if (doItems) {
+                for (GameItem item : inv.getItems().values()) {
+                    removeMap.add(item.getItemId(), item.getCount());
+                }
+            }
+
+            if (doResources) {
+                for (GameResource res : inv.getResources().values()) {
+                    removeMap.add(res.getResourceId(), res.getCount());
+                }
+            }
+        } else {
+            for (int id : ids) {
+                ItemDef data = GameData.getItemDataTable().get(id);
+                if (data == null) continue;
+                
+                ItemType type = data.getItemType();
+
+                switch (type) {
+                    case Res -> {
+                        if (doResources) {
+                            int count = inv.getResourceCount(id);
+                            if (count > 0) removeMap.add(id, count);
+                        }
+                    }
+                    case Item -> {
+                        if (doItems) {
+                            int count = inv.getItemCount(id);
+                            if (count > 0) removeMap.add(id, count);
+                        }
+                    }
+                    case Disc, Char, CharacterSkin, Title, Honor -> {
+                        
+                    }
+                    default -> {
+                        if (doItems) {
+                            int count = inv.getItemCount(id);
+                            if (count > 0) {
+                                removeMap.add(id, count);
+                                break;
+                            }
+                        }
+                        if (doResources) {
+                            int count = inv.getResourceCount(id);
+                            if (count > 0) removeMap.add(id, count);
+                        }
+                    }
+                }
+            }
+        }
+
+        if (!removeMap.isEmpty()) {
+            change = inv.removeItems(removeMap, change);
+        }
+
+        if (change.isEmpty()) {
+            return "No items/resources removed";
+        }
+
+        player.addNextPackage(NetMsgId.items_change_notify, change.toProto());
+        
+        return "Inventory cleaned";
+    }
+}

src/main/java/emu/nebula/command/commands/DiscCommand.java

@@ -21,7 +21,7 @@ import emu.nebula.command.CommandHandler;
 public class DiscCommand implements CommandHandler {
 
     @Override
-    public void execute(CommandArgs args) {
+    public String execute(CommandArgs args) {
         // Init
         var player = args.getTarget();
         var discs = new HashSet<GameDisc>();
@@ -50,7 +50,7 @@ public class DiscCommand implements CommandHandler {
         
         // Sanity check
         if (discs.isEmpty()) {
-            return;
+            return "No discs selected";
         }
         
         // List of modified characters that we send to the client for updates
@@ -71,12 +71,15 @@ public class DiscCommand implements CommandHandler {
         }
         
         if (modified.isEmpty()) {
-            return;
+            return "No discs changed";
         }
         
         // Encode and send
         for (var disc : modified) {
             player.addNextPackage(NetMsgId.disc_reset_notify, disc.toProto());
         }
+        
+        // Return message
+        return "Changed " + modified.size() + " discs";
     }
 }

src/main/java/emu/nebula/command/commands/GiveAllCommand.java

@@ -31,15 +31,14 @@ public class GiveAllCommand implements CommandHandler {
     );
 
     @Override
-    public void execute(CommandArgs args) {
+    public String execute(CommandArgs args) {
         Player target = args.getTarget();
         String type = args.get(0).toLowerCase();
         
-        
         var change = new PlayerChangeInfo();
+        var message = new StringBuilder();
 
         switch (type) {
-            default -> args.sendMessage("Error: Invalid type");
             case "m", "materials", "mats" -> {
                 // Create items map
                 var items = new ItemParamMap();
@@ -66,7 +65,7 @@ public class GiveAllCommand implements CommandHandler {
                 target.getInventory().addItems(items, change);
 
                 // Send message
-                args.sendMessage("Giving " + target.getName() + " " + items.size() + " items");
+                message.append("Giving " + target.getName() + " " + items.size() + " items.\n");
             }
             case "d", "discs" -> {
                 // Get all discs
@@ -85,14 +84,18 @@ public class GiveAllCommand implements CommandHandler {
                     var disc = target.getCharacters().addDisc(data.getId());
                     
                     // Set properties
-                    args.setProperties(disc);
+                    boolean shouldSave = args.setProperties(disc);
+                    
+                    if (shouldSave) {
+                        disc.save();
+                    }
                     
                     // Add to change info
                     change.add(disc.toProto());
                 }
 
                 // Send message
-                args.sendMessage("Giving " + target.getName() + " all discs");
+                message.append("Giving " + target.getName() + " all discs.\n");
             }
             case "c", "characters", "trekkers", "t" -> {
                 // Get all characters
@@ -111,23 +114,33 @@ public class GiveAllCommand implements CommandHandler {
                     var character = target.getCharacters().addCharacter(data.getId());
                     
                     // Set properties
-                    args.setProperties(character);
+                    boolean shouldSave = args.setProperties(character);
+                    
+                    if (shouldSave) {
+                        character.save();
+                    }
                     
                     // Add to change info
                     change.add(character.toProto());
                 }
 
                 // Send message
-                args.sendMessage("Giving " + target.getName() + " all characters");
+                message.append("Giving " + target.getName() + " all characters.\n");
+            }
+            default -> {
+                // Ignored
             }
         }
         
         if (change.isEmpty()) {
-            return;
+            return "No items given to the player";
         }
         
         // Encode and send
         target.addNextPackage(NetMsgId.items_change_notify, change.toProto());
+        
+        // Complete
+        return message.toString();
     }
 
 }

src/main/java/emu/nebula/command/commands/GiveCommand.java

@@ -12,12 +12,12 @@ import emu.nebula.command.CommandHandler;
         aliases = {"g", "item"}, 
         permission = "player.give", 
         requireTarget = true, 
-        desc = "/give [item id] x(amount). Gives the targeted player an item."
+        desc = "!give [item id] x(amount). Gives the targeted player an item."
 )
 public class GiveCommand implements CommandHandler {
 
     @Override
-    public void execute(CommandArgs args) {
+    public String execute(CommandArgs args) {
         // Setup mail
         var mail = new GameMail("System", "Give Command Result", "");
         
@@ -31,18 +31,17 @@ public class GiveCommand implements CommandHandler {
             
             var itemData = GameData.getItemDataTable().get(itemId);
             if (itemData == null) {
-                args.sendMessage("Item \"" + arg + "\" does not exist!");
                 continue;
             }
             
             // Add
             mail.addAttachment(itemId, amount);
-            
-            // Log
-            args.sendMessage("Giving " + args.getTarget().getName() + " " + amount + " of " + itemId);
         }
         
         // Add mail
         args.getTarget().getMailbox().sendMail(mail);
+        
+        //
+        return "Give command success, check your mail";
     }
 }

src/main/java/emu/nebula/command/commands/HelpCommand.java

@@ -5,12 +5,14 @@ import emu.nebula.command.Command;
 import emu.nebula.command.CommandArgs;
 import emu.nebula.command.CommandHandler;
 
-@Command(label = "help", permission = "player.help", desc = "/help. Displays a list of available commands.")
+@Command(label = "help", permission = "player.help", desc = "!help = Displays a list of available commands. (Very spammy in-game)")
 public class HelpCommand implements CommandHandler {
 
     @Override
-    public void execute(CommandArgs args) {
-        args.sendMessage("Displaying list of commands:");
+    public String execute(CommandArgs args) {
+        var message = new StringBuilder();
+        
+        message.append("Displaying list of commands:\n");
 
         // Sort command names
         var labels = Nebula.getCommandManager().getLabels().keySet().stream().sorted().toList();
@@ -21,9 +23,11 @@ public class HelpCommand implements CommandHandler {
 
             // Only send command description if the sender has permission to use the command
             if (Nebula.getCommandManager().checkPermission(args.getSender(), command)) {
-                args.sendMessage(command.desc());
+                message.append(command.desc());
+                message.append("\n");
             }
         }
+        
+        return message.toString();
     }
-
 }

src/main/java/emu/nebula/command/commands/LevelCommand.java

@@ -0,0 +1,41 @@
+package emu.nebula.command.commands;
+
+import emu.nebula.command.Command;
+import emu.nebula.command.CommandArgs;
+import emu.nebula.command.CommandHandler;
+import emu.nebula.data.GameData;
+import emu.nebula.net.NetMsgId;
+import emu.nebula.proto.NotifyGm.GmWorldClass;
+import emu.nebula.util.Utils;
+
+@Command(label = "setlevel", aliases = {"level", "l"}, permission = "player.level", requireTarget = true, desc = "!level [level] = Set's the targeted player's level")
+public class LevelCommand implements CommandHandler {
+
+    @Override
+    public String execute(CommandArgs args) {
+        // Get target
+        var target = args.getTarget();
+        
+        // Parse level
+        int level = Utils.parseSafeInt(args.get(0));
+        
+        // Check to make sure world class data exists for this level
+        var data = GameData.getWorldClassDataTable().get(level);
+        if (data == null) {
+            return "The game does not support level " + level;
+        }
+        
+        target.setLevel(level);
+        target.setExp(0);
+        
+        // Update
+        target.addNextPackage(
+            NetMsgId.world_class_number_notify,
+            GmWorldClass.newInstance()
+                .setFinalClass(target.getLevel())
+                .setLastExp(target.getExp())
+        );
+        
+        return "Level set to " + level;
+    }
+}

src/main/java/emu/nebula/command/commands/MailCommand.java

@@ -14,44 +14,39 @@ import emu.nebula.util.Utils;
     aliases = {"m"},
     permission = "player.mail",
     requireTarget = true,
-    desc = "/mail \"subject\" \"body\" [itemId xQty | itemId:qty ...]. Sends the targeted player a system mail."
+    desc = "!mail \"subject\" \"body\" [itemId xQty | itemId:qty ...] = Sends the targeted player a system mail."
 )
 public class MailCommand implements CommandHandler {
-
+    private static final String USAGE_TEXT = "Usage: /mail \"subject\" \"body\" [itemId xQty | itemId:qty ...]";
     private static final Pattern QUOTED_TEXT = Pattern.compile("\"([^\"]*)\"");
 
     @Override
-    public void execute(CommandArgs args) {
+    public String execute(CommandArgs args) {
         var target = args.getTarget();
         if (target == null) {
-            args.sendMessage("Error: Targeted player not found or offline");
-            return;
+            return "Error - Targeted player not found or offline";
         }
 
         String rawInput = args.getRaw() == null ? "" : args.getRaw().trim();
         if (rawInput.isEmpty()) {
-            sendUsage(args);
-            return;
+            return USAGE_TEXT;
         }
 
         Matcher matcher = QUOTED_TEXT.matcher(rawInput);
         if (!matcher.find()) {
-            sendUsage(args);
-            return;
+            return USAGE_TEXT;
         }
 
         String subject = matcher.group(1).trim();
         if (!matcher.find()) {
-            args.sendMessage("Mail body must be wrapped in quotes after the subject.");
-            return;
+            return "Mail body must be wrapped in quotes after the subject.";
         }
 
         String body = matcher.group(1).trim();
         int attachmentStartIndex = matcher.end();
 
         if (subject.isEmpty()) {
-            args.sendMessage("Mail subject cannot be empty.");
-            return;
+            return "Mail subject cannot be empty.";
         }
 
         if (body.isEmpty()) {
@@ -68,7 +63,7 @@ public class MailCommand implements CommandHandler {
         parseAttachments(attachmentSection, mail, args);
         
         target.getMailbox().sendMail(mail);
-        args.sendMessage("Mail sent to " + target.getName() + " with subject \"" + subject + "\".");
+        return "Mail sent to " + target.getName() + " with subject \"" + subject + "\".";
     }
 
     private void parseAttachments(String attachmentSection, GameMail mail, CommandArgs args) {
@@ -93,7 +88,7 @@ public class MailCommand implements CommandHandler {
 
             if (token.startsWith("x") && token.length() > 1) {
                 if (pendingItemId == null) {
-                    args.sendMessage("Quantity token '" + token + "' must follow an item id.");
+                    //args.sendMessage("Quantity token '" + token + "' must follow an item id.");
                     continue;
                 }
 
@@ -110,7 +105,7 @@ public class MailCommand implements CommandHandler {
 
                 int itemId = Utils.parseSafeInt(token);
                 if (itemId <= 0) {
-                    args.sendMessage("Invalid item id '" + token + "'.");
+                    //args.sendMessage("Invalid item id '" + token + "'.");
                     pendingItemId = null;
                     continue;
                 }
@@ -119,7 +114,7 @@ public class MailCommand implements CommandHandler {
                 continue;
             }
 
-            args.sendMessage("Ignoring attachment token '" + token + "'.");
+            //args.sendMessage("Ignoring attachment token '" + token + "'.");
         }
 
         if (pendingItemId != null) {
@@ -129,7 +124,7 @@ public class MailCommand implements CommandHandler {
 
     private void addAttachment(GameMail mail, CommandArgs args, int itemId, int quantity) {
         if (itemId <= 0) {
-            args.sendMessage("Item id must be positive.");
+            //args.sendMessage("Item id must be positive.");
             return;
         }
 
@@ -145,8 +140,4 @@ public class MailCommand implements CommandHandler {
         }
         return !token.isEmpty();
     }
-
-    private void sendUsage(CommandArgs args) {
-        args.sendMessage("Usage: /mail \"subject\" \"body\" [itemId xQty | itemId:qty ...]");
-    }
 }

src/main/java/emu/nebula/command/commands/ReloadCommand.java

@@ -5,18 +5,21 @@ import emu.nebula.command.Command;
 import emu.nebula.command.CommandArgs;
 import emu.nebula.command.CommandHandler;
 
-@Command(label = "reload", permission = "admin.reload", desc = "/reload. Reloads the server config.")
+@Command(label = "reload", permission = "admin.reload", desc = "!reload = Reloads the server config.")
 public class ReloadCommand implements CommandHandler {
 
     @Override
-    public void execute(CommandArgs args) {
+    public String execute(CommandArgs args) {
+        // Reload config first
         Nebula.loadConfig();
         
+        // Reload patch list if the server is running
         if (Nebula.getHttpServer() != null) {
             Nebula.getHttpServer().loadPatchList();
         }
         
-        args.sendMessage("Reloaded the server config");
+        // Result message
+        return "Reloaded the server config";
     }
 
 }

src/main/java/emu/nebula/command/commands/RemoteKeyCommand.java

@@ -0,0 +1,32 @@
+package emu.nebula.command.commands;
+
+import emu.nebula.Nebula;
+import emu.nebula.command.Command;
+import emu.nebula.command.CommandArgs;
+import emu.nebula.command.CommandHandler;
+
+import java.util.Random;
+
+@Command(label = "remote", permission = "player.remote", requireTarget = true, desc = "!remote = Creates a player token for remote api usage")
+public class RemoteKeyCommand implements CommandHandler {
+    private final String characters = "ABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789";
+
+    @Override
+    public String execute(CommandArgs args) {
+        if (Nebula.getConfig().getRemoteCommand().useRemoteServices) {
+            StringBuilder sb = new StringBuilder();
+            Random random = new Random();
+
+            for (int i = 0; i < 8; i++) {
+                int index = random.nextInt(characters.length());
+                sb.append(characters.charAt(index));
+            }
+
+            args.getTarget().setRemoteToken(sb.toString());
+            return "Key Generated: " + sb.toString();
+        } else {
+            args.getTarget().setRemoteToken(null);
+            return "Remote Command Disabled on Server";
+        }
+    }
+}

src/main/java/emu/nebula/command/commands/StatusCommand.java

@@ -0,0 +1,101 @@
+package emu.nebula.command.commands;
+
+import emu.nebula.GameConstants;
+import emu.nebula.Nebula;
+import emu.nebula.command.Command;
+import emu.nebula.command.CommandArgs;
+import emu.nebula.command.CommandHandler;
+
+import java.io.File;
+import java.lang.management.ManagementFactory;
+
+@Command(label = "status", permission = "admin.status", desc = "!status = Displays server runtime status.")
+public class StatusCommand implements CommandHandler {
+
+    @Override
+    public String execute(CommandArgs args) {
+        var sb = new StringBuilder();
+
+        if (args.getRaw().contains("@")) {
+            if (args.getTarget() == null || !args.getTarget().hasSession()) {
+                return "Error - Targeted player not found or offline";
+            }
+        }
+
+        var runtime = Runtime.getRuntime();
+        var uptimeMs = ManagementFactory.getRuntimeMXBean().getUptime();
+
+        double usedMem = (runtime.totalMemory() - runtime.freeMemory()) / 1048576.0;
+        double maxMem = runtime.maxMemory() / 1048576.0;
+
+        int players = 0;
+        if (Nebula.getGameContext() != null) {
+            players = Nebula.getGameContext().getPlayerModule().getCachedPlayers().size();
+        }
+
+        var http = Nebula.getHttpServer();
+        String addr = "-";
+        String scheme = "http";
+        int port = 0;
+        if (http != null) {
+            addr = http.getServerConfig().getPublicAddress();
+            port = http.getServerConfig().getPublicPort();
+            scheme = http.getServerConfig().isUseSSL() ? "https" : "http";
+        }
+
+        sb.append("Server Status\n");
+        sb.append("Git: ").append(Nebula.getGitHash()).append('\n');
+        sb.append("Game: ").append(GameConstants.getGameVersion()).append('\n');
+        sb.append("HTTP: ").append(scheme).append("://").append(addr).append(":").append(port).append('\n');
+        sb.append("Uptime: ").append(formatUptime(uptimeMs)).append('\n');
+        sb.append("CPU: ").append(getCpu()).append('\n');
+        sb.append("Load: ").append(getLoad()).append('\n');
+        sb.append("Disk: ").append(getDisk()).append('\n');
+        sb.append("Memory: ").append(String.format("%.1fMB (max %.1fMB)", usedMem, maxMem)).append('\n');
+        sb.append("Players: ").append(players);
+
+        return sb.toString();
+    }
+
+    private static String formatUptime(long ms) {
+        long s = ms / 1000;
+        long h = s / 3600;
+        long m = (s % 3600) / 60;
+        long sec = s % 60;
+        return String.format("%02dh:%02dm:%02ds", h, m, sec);
+    }
+
+    private static String getCpu() {
+        var os = ManagementFactory.getOperatingSystemMXBean();
+        double v = -1;
+        if (os instanceof com.sun.management.OperatingSystemMXBean) {
+            v = ((com.sun.management.OperatingSystemMXBean) os).getProcessCpuLoad();
+        }
+        return v >= 0 ? String.format("%.1f%%", v * 100.0) : "-";
+    }
+
+    private static String getLoad() {
+        var os = ManagementFactory.getOperatingSystemMXBean();
+        double v = -1;
+        if (os instanceof com.sun.management.OperatingSystemMXBean csm) {
+            v = csm.getCpuLoad();
+        }
+        if (v < 0) {
+            double avg = os.getSystemLoadAverage();
+            if (avg > 0) {
+                int cores = Runtime.getRuntime().availableProcessors();
+                v = Math.min(1.0, avg / cores);
+            }
+        }
+        return v >= 0 ? String.format("%.1f%%", v * 100.0) : "-";
+    }
+
+    private static String getDisk() {
+        var root = new File(".");
+        long total = root.getTotalSpace();
+        long usable = root.getUsableSpace();
+        if (total <= 0) return "-";
+        double usedPercent = (double) (total - usable) / (double) total * 100.0;
+        return String.format("%.1f%%", usedPercent);
+    }
+}

src/main/java/emu/nebula/command/commands/UnbanCommand.java

@@ -0,0 +1,81 @@
+package emu.nebula.command.commands;
+
+import emu.nebula.Nebula;
+import emu.nebula.command.Command;
+import emu.nebula.command.CommandArgs;
+import emu.nebula.command.CommandHandler;
+import emu.nebula.game.ban.BanInfo;
+import emu.nebula.game.player.Player;
+
+import java.util.Locale;
+
+@Command(label = "unban", permission = "admin.ban", desc = """
+        !unban {all | ip | uid} [player uid | ip]\
+        
+        - all mode unbans both the player object and their IP address by UID, so the next parameter should be UID instead of IP
+        - ip mode can only unban IP addresses, so the next parameter should be an IP
+        - uid mode can only unban UIDs, so the next parameter should be a UID\
+        """)
+public class UnbanCommand implements CommandHandler {
+
+    @Override
+    public String execute(CommandArgs args) {
+        if (args.size() < 2) {
+            return "Invalid amount of args";
+        }
+
+        int unbannedUid = 0;
+        String unbannedIp = null;
+
+        String mode = args.get(0).toLowerCase(Locale.ROOT);
+
+        if (!mode.equals("all") && !mode.equals("uid") && !mode.equals("ip"))
+            return "Unable to parse mode.";
+
+        if (mode.equals("ip")) {
+            unbannedIp = args.get(1);
+        } else {
+            try {
+                unbannedUid = Integer.parseInt(args.get(1));
+            } catch (NumberFormatException ignored) {
+                return "Unable to parse uid.";
+            }
+        }
+
+        var banModule = Nebula.getGameContext().getBanModule();
+
+        Player player = null;
+        if (!mode.equals("ip")) {
+            player = Nebula.getGameContext().getPlayerModule().getPlayer(unbannedUid);
+
+            if (player == null) {
+                return "Failed, player not found.";
+            }
+        }
+
+        switch (mode) {
+            case "all" -> {
+                BanInfo banInfo = banModule.getPlayerBanInfo(player.getUid());
+
+                banModule.unbanPlayer(player.getUid());
+
+                if (banInfo != null) {
+                    unbannedIp = banInfo.getIpAddress();
+                    if (unbannedIp != null)
+                        banModule.unbanIp(unbannedIp);
+                }
+                return "Unban a player all mode " + unbannedUid;
+            } case "uid" -> {
+                banModule.unbanPlayer(player.getUid());
+                return "Unban a player " + unbannedUid;
+            } case "ip" -> {
+                banModule.unbanIp(unbannedIp);
+                return "Unban a ip " + unbannedIp;
+            }
+            default -> {
+                // Fallback
+                return "Unban sub command not found";
+            }
+        }
+    }
+}

src/main/java/emu/nebula/data/GameData.java

@@ -11,14 +11,14 @@ import java.util.stream.Collectors;
 import it.unimi.dsi.fastutil.ints.*;
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
-
+import emu.nebula.data.custom.CharGemAttrGroupDef;
 import emu.nebula.data.resources.*;
 
 import lombok.Getter;
 
 @SuppressWarnings("unused")
 public class GameData {
-    // Characters
+    // ===== Characters =====
     @Getter private static DataTable<CharacterDef> CharacterDataTable = new DataTable<>();
     @Getter private static DataTable<CharacterAdvanceDef> CharacterAdvanceDataTable = new DataTable<>();
     @Getter private static DataTable<CharacterSkillUpgradeDef> CharacterSkillUpgradeDataTable = new DataTable<>();
@@ -28,29 +28,43 @@ public class GameData {
     @Getter private static DataTable<TalentGroupDef> TalentGroupDataTable = new DataTable<>();
     @Getter private static DataTable<TalentDef> TalentDataTable = new DataTable<>();
     
+    // Characters: Emblems
     @Getter private static DataTable<CharGemDef> CharGemDataTable = new DataTable<>();
     @Getter private static DataTable<CharGemSlotControlDef> CharGemSlotControlDataTable = new DataTable<>();
     @Getter private static DataTable<CharGemAttrGroupDef> CharGemAttrGroupDataTable = new DataTable<>();
-    @Getter private static DataTable<CharGemAttrTypeDef> CharGemAttrTypeDataTable = new DataTable<>();
     @Getter private static DataTable<CharGemAttrValueDef> CharGemAttrValueDataTable = new DataTable<>();
     
+    // Characters: Affinity
+    @Getter private static DataTable<AffinityLevelDef> AffinityLevelDataTable = new DataTable<>();
+    @Getter private static DataTable<AffinityGiftDef> AffinityGiftDataTable = new DataTable<>();
+    @Getter private static DataTable<PlotDef> PlotDataTable = new DataTable<>();
+    
+    // Characters: Phone
     @Getter private static DataTable<ChatDef> ChatDataTable = new DataTable<>();
     
-    // Discs
+    // Characters: Dating
+    @Getter private static DataTable<DatingLandmarkDef> DatingLandmarkDataTable = new DataTable<>();
+    @Getter private static DataTable<DatingLandmarkEventDef> DatingLandmarkEventDataTable = new DataTable<>();
+    @Getter private static DataTable<DatingCharacterEventDef> DatingCharacterEventDataTable = new DataTable<>();
+    
+    // ===== Discs =====
     @Getter private static DataTable<DiscDef> DiscDataTable = new DataTable<>();
     @Getter private static DataTable<DiscStrengthenDef> DiscStrengthenDataTable = new DataTable<>();
     @Getter private static DataTable<DiscItemExpDef> DiscItemExpDataTable = new DataTable<>();
     @Getter private static DataTable<DiscPromoteDef> DiscPromoteDataTable = new DataTable<>();
     @Getter private static DataTable<DiscPromoteLimitDef> DiscPromoteLimitDataTable = new DataTable<>();
     
-    // Items
+    // Discs: Melody items
+    @Getter private static DataTable<SecondarySkillDef> SecondarySkillDataTable = new DataTable<>();
+    
+    // ===== Items =====
     @Getter private static DataTable<ItemDef> ItemDataTable = new DataTable<>();
     @Getter private static DataTable<ProductionDef> ProductionDataTable = new DataTable<>();
     @Getter private static DataTable<PlayerHeadDef> PlayerHeadDataTable = new DataTable<>();
     @Getter private static DataTable<TitleDef> titleDataTable = new DataTable<>();
     @Getter private static DataTable<HonorDef> honorDataTable = new DataTable<>();
     
-    // Shops
+    // ===== Shops =====
     @Getter private static DataTable<MallMonthlyCardDef> MallMonthlyCardDataTable = new DataTable<>();
     @Getter private static DataTable<MallPackageDef> MallPackageDataTable = new DataTable<>();
     @Getter private static DataTable<MallShopDef> MallShopDataTable = new DataTable<>();
@@ -59,20 +73,39 @@ public class GameData {
     @Getter private static DataTable<ResidentShopDef> ResidentShopDataTable = new DataTable<>();
     @Getter private static DataTable<ResidentGoodsDef> ResidentGoodsDataTable = new DataTable<>();
     
-    // Battle Pass
+    // ===== Battle Pass =====
     @Getter private static DataTable<BattlePassDef> BattlePassDataTable = new DataTable<>();
     @Getter private static DataTable<BattlePassLevelDef> BattlePassLevelDataTable = new DataTable<>();
     @Getter private static DataTable<BattlePassQuestDef> BattlePassQuestDataTable = new DataTable<>();
     @Getter private static DataTable<BattlePassRewardDef> BattlePassRewardDataTable = new DataTable<>();
     
-    // Commissions
+    // ===== Commissions =====
     @Getter private static DataTable<AgentDef> AgentDataTable = new DataTable<>();
     
-    // Dictionary
+    // ===== Dictionary =====
     @Getter private static DataTable<DictionaryTabDef> DictionaryTabDataTable = new DataTable<>();
     @Getter private static DataTable<DictionaryEntryDef> DictionaryEntryDataTable = new DataTable<>();
     
-    // Instances
+    // ===== Gacha =====
+    @Getter private static DataTable<GachaDef> GachaDataTable = new DataTable<>();
+    @Getter private static DataTable<GachaStorageDef> GachaStorageDataTable = new DataTable<>();
+    
+    // ===== Story =====
+    @Getter private static DataTable<StoryDef> StoryDataTable = new DataTable<>();
+    @Getter private static DataTable<StorySetSectionDef> StorySetSectionDataTable = new DataTable<>();
+    @Getter private static DataTable<StoryEvidenceDef> StoryEvidenceDataTable = new DataTable<>();
+    
+    // ===== Daily Quests =====
+    @Getter private static DataTable<DailyQuestDef> DailyQuestDataTable = new DataTable<>();
+    @Getter private static DataTable<DailyQuestActiveDef> DailyQuestActiveDataTable = new DataTable<>();
+    
+    // ===== Achievements =====
+    @Getter private static DataTable<AchievementDef> AchievementDataTable = new DataTable<>();
+    
+    // ===== Tutorials =====
+    @Getter private static DataTable<TutorialLevelDef> TutorialLevelDataTable = new DataTable<>();
+    
+    // ===== Instances =====
     @Getter private static DataTable<DailyInstanceDef> DailyInstanceDataTable = new DataTable<>();
     @Getter private static DataTable<DailyInstanceRewardGroupDef> DailyInstanceRewardGroupDataTable = new DataTable<>();
     @Getter private static DataTable<RegionBossLevelDef> RegionBossLevelDataTable = new DataTable<>();
@@ -80,41 +113,60 @@ public class GameData {
     @Getter private static DataTable<CharGemInstanceDef> CharGemInstanceDataTable = new DataTable<>();
     @Getter private static DataTable<WeekBossLevelDef> WeekBossLevelDataTable = new DataTable<>();
     
-    @Getter private static DataTable<GachaDef> GachaDataTable = new DataTable<>();
-    @Getter private static DataTable<GachaStorageDef> GachaStorageDataTable = new DataTable<>();
-    
-    @Getter private static DataTable<WorldClassDef> WorldClassDataTable = new DataTable<>();
-    @Getter private static DataTable<GuideGroupDef> GuideGroupDataTable = new DataTable<>();
-    @Getter private static DataTable<HandbookDef> HandbookDataTable = new DataTable<>();
-    @Getter private static DataTable<StoryDef> StoryDataTable = new DataTable<>();
-    @Getter private static DataTable<StorySetSectionDef> StorySetSectionDataTable = new DataTable<>();
-    
-    // Daily quests
-    @Getter private static DataTable<DailyQuestDef> DailyQuestDataTable = new DataTable<>();
-    @Getter private static DataTable<DailyQuestActiveDef> DailyQuestActiveDataTable = new DataTable<>();
-    
-    // Tutorial
-    @Getter private static DataTable<TutorialLevelDef> TutorialLevelDataTable = new DataTable<>();
-    
-    // Star tower
+    // ===== Star Tower =====
     @Getter private static DataTable<StarTowerDef> StarTowerDataTable = new DataTable<>();
     @Getter private static DataTable<StarTowerStageDef> StarTowerStageDataTable = new DataTable<>();
     @Getter private static DataTable<StarTowerGrowthNodeDef> StarTowerGrowthNodeDataTable = new DataTable<>();
-    @Getter private static DataTable<PotentialDef> PotentialDataTable = new DataTable<>();
+    @Getter private static DataTable<StarTowerFloorExpDef> StarTowerFloorExpDataTable = new DataTable<>();
+    @Getter private static DataTable<StarTowerTeamExpDef> StarTowerTeamExpDataTable = new DataTable<>();
+    @Getter private static DataTable<StarTowerEventDef> StarTowerEventDataTable = new DataTable<>();
     @Getter private static DataTable<SubNoteSkillPromoteGroupDef> SubNoteSkillPromoteGroupDataTable = new DataTable<>();
     
+    @Getter private static DataTable<PotentialDef> PotentialDataTable = new DataTable<>();
+    @Getter private static DataTable<CharPotentialDef> CharPotentialDataTable = new DataTable<>();
+    
     @Getter private static DataTable<StarTowerBookFateCardBundleDef> StarTowerBookFateCardBundleDataTable = new DataTable<>();
     @Getter private static DataTable<StarTowerBookFateCardQuestDef> StarTowerBookFateCardQuestDataTable = new DataTable<>();
     @Getter private static DataTable<StarTowerBookFateCardDef> StarTowerBookFateCardDataTable = new DataTable<>();
     @Getter private static DataTable<FateCardDef> FateCardDataTable = new DataTable<>();
-    
-    // Infinity Tower
+
+    // ===== Infinity Tower =====
     @Getter private static DataTable<InfinityTowerLevelDef> InfinityTowerLevelDataTable = new DataTable<>();
+    @Getter private static DataTable<InfinityTowerDifficultyDef> InfinityTowerDifficultyDataTable = new DataTable<>();
     
-    // Vampire survivor
+    // ===== Vampire Survivor =====
     @Getter private static DataTable<VampireSurvivorDef> VampireSurvivorDataTable = new DataTable<>();
     @Getter private static DataTable<VampireTalentDef> VampireTalentDataTable = new DataTable<>();
     
-    // Score boss
+    // ===== Score Boss =====
     @Getter private static DataTable<ScoreBossControlDef> ScoreBossControlDataTable = new DataTable<>();
-}
+    @Getter private static DataTable<ScoreBossRewardDef> ScoreBossRewardDataTable = new DataTable<>();
+    
+    // ===== Misc =====
+    @Getter private static DataTable<WorldClassDef> WorldClassDataTable = new DataTable<>();
+    @Getter private static DataTable<GuideGroupDef> GuideGroupDataTable = new DataTable<>();
+    @Getter private static DataTable<HandbookDef> HandbookDataTable = new DataTable<>();
+    @Getter private static DataTable<SignInDef> SignInDataTable = new DataTable<>();
+    
+    // ===== Activity =====
+    @Getter private static DataTable<ActivityDef> ActivityDataTable = new DataTable<>();
+
+    // Activity: Tower Defense
+    @Getter private static DataTable<TowerDefenseLevelDef> TowerDefenseLevelDataTable = new DataTable<>();
+    
+    // Activity: Trials
+    @Getter private static DataTable<TrialControlDef> TrialControlDataTable = new DataTable<>();
+    @Getter private static DataTable<TrialGroupDef> TrialGroupDataTable = new DataTable<>();
+    
+    // Activity: Levels
+    @Getter private static DataTable<ActivityLevelsLevelDef> ActivityLevelsLevelDataTable = new DataTable<>();
+    
+    // Activity: Task
+    @Getter private static DataTable<ActivityTaskDef> ActivityTaskDataTable = new DataTable<>();
+    @Getter private static DataTable<ActivityTaskGroupDef> ActivityTaskGroupDataTable = new DataTable<>();
+    
+    // Activity: Shop
+    @Getter private static DataTable<ActivityShopDef> ActivityShopDataTable = new DataTable<>();
+    @Getter private static DataTable<ActivityShopControlDef> ActivityShopControlDataTable = new DataTable<>();
+    @Getter private static DataTable<ActivityGoodsDef> ActivityGoodsDataTable = new DataTable<>();
+}

src/main/java/emu/nebula/data/ResourceLoader.java

@@ -1,5 +1,6 @@
 package emu.nebula.data;
 
+import java.io.InputStreamReader;
 import java.lang.reflect.Field;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -9,6 +10,7 @@ import org.reflections.Reflections;
 import emu.nebula.util.JsonUtils;
 import emu.nebula.util.Utils;
 import emu.nebula.Nebula;
+import emu.nebula.game.achievement.AchievementHelper;
 
 public class ResourceLoader {
     private static boolean loaded = false;
@@ -21,6 +23,9 @@ public class ResourceLoader {
         // Load
         loadResources();
         
+        // Add hardcoded achievements params
+        AchievementHelper.init();
+        
         // Done
         loaded = true;
         Nebula.getLogger().info("Resource loading complete");
@@ -54,9 +59,26 @@ public class ResourceLoader {
         int count = 0;
         
         try {
-            var json = JsonUtils.loadToMap(Nebula.getConfig().resourceDir + "/bin/" + type.name(), String.class, resourceClass);
+            // Init defs collection
+            Iterable<?> defs = null;
+            
+            // Load resource file
+            if (type.useInternal()) {
+                // Load from internal resources in jar
+                try (var in = ResourceLoader.class.getResourceAsStream("/defs/" + type.name()); var reader = new InputStreamReader(in)) {
+                    defs = JsonUtils.loadToList(reader, resourceClass);
+                } catch (Exception e) {
+                    // Ignored
+                }
+            } else {
+                // Load json from ./resources/bin/ folder
+                var json = JsonUtils.loadToMap(Nebula.getConfig().resourceDir + "/bin/" + type.name(), String.class, resourceClass);
+                
+                // Get json values
+                defs = json.values();
+            }
 
-            for (Object o : json.values()) {
+            for (Object o : defs) {
                 BaseDef res = (BaseDef) o;
 
                 if (res == null) {

src/main/java/emu/nebula/data/ResourceType.java

@@ -10,13 +10,15 @@ public @interface ResourceType {
     String name();
 
     /**
-     * Load priority - dictates which order to load this resource, with "highest"
-     * being loaded first
+     * Load priority - dictates which order to load this resource, with "highest" being loaded first
      */
     LoadPriority loadPriority() default LoadPriority.NORMAL;
 
-    Class<?> keyType() default int.class;
-
+    /**
+     * Loads the resource file from inside the jar (./resources/defs/) if set to true
+     */
+    boolean useInternal() default false;
+    
     public enum LoadPriority {
         HIGHEST(4), HIGH(3), NORMAL(2), LOW(1), LOWEST(0);
 

src/main/java/emu/nebula/data/custom/CharGemAttrGroupDef.java

@@ -1,32 +1,37 @@
-package emu.nebula.data.resources;
+package emu.nebula.data.custom;
 
 import java.util.List;
+import java.util.Map;
 
 import emu.nebula.data.BaseDef;
 import emu.nebula.data.GameData;
 import emu.nebula.data.ResourceType;
-import emu.nebula.data.ResourceType.LoadPriority;
-import emu.nebula.util.JsonUtils;
+import emu.nebula.data.resources.CharGemAttrValueDef;
 import emu.nebula.util.WeightedList;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntList;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;
 import lombok.Getter;
 
 @Getter
-@ResourceType(name = "CharGemAttrGroup.json", loadPriority = LoadPriority.HIGH)
+@ResourceType(name = "CharGemAttrGroups.json", useInternal = true)
 public class CharGemAttrGroupDef extends BaseDef {
-    private int GroupId;
-    private int GroupType;
+    private int Id;
     private int Weight;
-    private String UniqueAttrNumWeight;
+    private IntArrayList AttrTypes;
+    private Map<Integer, Integer> UniqueAttrNumWeights;
     
     private transient WeightedList<Integer> uniqueAttrNum;
-    private transient List<CharGemAttrTypeDef> attributeTypes;
+    private transient List<CharGemAttrTypeData> attributeTypes;
+    
+    public CharGemAttrGroupDef() {
+        this.AttrTypes = new IntArrayList();
+    }
     
     @Override
     public int getId() {
-        return GroupId;
+        return Id;
     }
     
     public int getRandomUniqueAttrNum() {
@@ -37,7 +42,7 @@ public class CharGemAttrGroupDef extends BaseDef {
         return this.uniqueAttrNum.next();
     }
     
-    public CharGemAttrTypeDef getRandomAttributeType(IntList list) {
+    public CharGemAttrTypeData getRandomAttributeType(IntList list) {
         // Setup blacklist to prevent the same attribute from showing up twice
         var blacklist = new IntOpenHashSet();
         
@@ -50,7 +55,7 @@ public class CharGemAttrGroupDef extends BaseDef {
         }
         
         // Create random generator
-        var random = new WeightedList<CharGemAttrTypeDef>();
+        var random = new WeightedList<CharGemAttrTypeData>();
         
         for (var type : this.getAttributeTypes()) {
             if (blacklist.contains(type.getId())) {
@@ -65,15 +70,44 @@ public class CharGemAttrGroupDef extends BaseDef {
     
     @Override
     public void onLoad() {
+        // Init unique attribute weights
         this.uniqueAttrNum = new WeightedList<>();
-        this.attributeTypes = new ObjectArrayList<>();
         
-        if (this.UniqueAttrNumWeight != null) {
-            var json = JsonUtils.decodeMap(this.UniqueAttrNumWeight, Integer.class, Integer.class);
-            
-            for (var entry : json.entrySet()) {
+        if (this.UniqueAttrNumWeights != null) {
+            for (var entry : this.UniqueAttrNumWeights.entrySet()) {
                 this.uniqueAttrNum.add(entry.getValue(), entry.getKey());
             }
         }
+        
+        // Init attribute types
+        this.attributeTypes = new ObjectArrayList<>();
+        
+        for (int id : this.getAttrTypes()) {
+            var type = new CharGemAttrTypeData(id);
+            this.attributeTypes.add(type);
+        }
+    }
+    
+    @Getter
+    public static class CharGemAttrTypeData {
+        private int id;
+        private WeightedList<CharGemAttrValueDef> values;
+        
+        public CharGemAttrTypeData(int id) {
+            this.id = id;
+            this.values = new WeightedList<>();
+        }
+        
+        public void addValue(CharGemAttrValueDef value) {
+            this.values.add(value.getRarity(), value);
+        }
+        
+        public CharGemAttrValueDef getRandomValueData() {
+            return this.getValues().next();
+        }
+        
+        public int getRandomValue() {
+            return this.getRandomValueData().getId();
+        }
     }
 }

src/main/java/emu/nebula/data/resources/AchievementDef.java

@@ -0,0 +1,68 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+import emu.nebula.game.achievement.AchievementHelper;
+import it.unimi.dsi.fastutil.objects.ObjectArrayList;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "Achievement.json")
+public class AchievementDef extends BaseDef {
+    private int Id;
+    private int Type;
+    private int CompleteCond;
+    private int AimNumShow;
+    private int[] Prerequisites;
+    
+    // Reward
+    private int Tid1;
+    private int Qty1;
+    
+    // Custom params
+    private transient int param1; // -1 == any, 0 = no param, 1+ = param required
+    private transient int param2; // -1 == any, 0 = no param, 1+ = param required
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+
+    public void setParams(int param1, int param2) {
+        this.param1 = param1;
+        this.param2 = param2;
+    }
+
+    /**
+     * Checks if this achievement requires params to match
+     */
+    public boolean hasParam1(int param) {
+        if (this.param1 < 0) {
+            return false;
+        } else if (this.param1 == 0) {
+            return param != 0;
+        } else {
+            return true;
+        }
+    }
+    
+    /**
+     * Checks if this achievement requires params to match
+     */
+    public boolean hasParam2(int param) {
+        if (this.param2 < 0) {
+            return false;
+        } else if (this.param2 == 0) {
+            return param != 0;
+        } else {
+            return true;
+        }
+    }
+
+    @Override
+    public void onLoad() {
+        // Add to cached achievement list
+        var list = AchievementHelper.getCache().computeIfAbsent(this.CompleteCond, i -> new ObjectArrayList<>());
+        list.add(this);
+    }
+}

src/main/java/emu/nebula/data/resources/ActivityDef.java

@@ -0,0 +1,25 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "Activity.json")
+public class ActivityDef extends BaseDef {
+    private int Id;
+    private int ActivityType;
+    
+    private transient emu.nebula.game.activity.ActivityType type;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+
+    @Override
+    public void onLoad() {
+        this.type = emu.nebula.game.activity.ActivityType.getByValue(this.ActivityType);
+    }
+}

src/main/java/emu/nebula/data/resources/ActivityGoodsDef.java

@@ -0,0 +1,38 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.GameData;
+import emu.nebula.data.ResourceType;
+import emu.nebula.data.ResourceType.LoadPriority;
+import emu.nebula.game.inventory.ItemParamMap;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "ActivityGoods.json", loadPriority = LoadPriority.LOW)
+public class ActivityGoodsDef extends BaseDef {
+    private int Id;
+    private int ShopId;
+    
+    private int ItemId;
+    private int ItemQuantity;
+    private int MaximumLimit;
+    private int Price;
+    
+    private transient ItemParamMap items;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+
+    @Override
+    public void onLoad() {
+        var shop = GameData.getActivityShopDataTable().get(this.getShopId());
+        if (shop != null) {
+            shop.getGoods().put(this.getId(), this);
+        }
+        
+        this.items = new ItemParamMap();
+        this.items.add(this.ItemId, this.ItemQuantity);
+    }
+}

src/main/java/emu/nebula/data/resources/ActivityLevelsLevelDef.java

@@ -0,0 +1,65 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+import emu.nebula.game.instance.InstanceData;
+import emu.nebula.game.inventory.ItemRewardList;
+import emu.nebula.game.inventory.ItemRewardParam;
+import emu.nebula.util.JsonUtils;
+
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "ActivityLevelsLevel.json")
+public class ActivityLevelsLevelDef extends BaseDef implements InstanceData {
+    private int Id;
+    private int ActivityId;
+    private int EnergyConsume;
+    private String CompleteRewardPreview;
+    
+    private transient ItemRewardList firstRewards;
+    private transient ItemRewardList rewards;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+
+    @Override
+    public int getNeedWorldClass() {
+        return 0;
+    }
+    
+    @Override
+    public void onLoad() {
+        // Init reward lists
+        this.firstRewards = new ItemRewardList();
+        this.rewards = new ItemRewardList();
+        
+        // Parse rewards
+        var awards = JsonUtils.decodeList(this.CompleteRewardPreview, int[].class);
+        if (awards == null) {
+            return;
+        }
+        
+        for (int[] award : awards) {
+            int itemId = award[0];
+            int min = award[1];
+            int max = award.length >= 4 ? award[2] : min;
+            boolean isFirst = award[award.length - 1] == 1;
+            
+            if (min == -1) {
+                min = 0;
+                max = 1;
+            }
+            
+            var reward = new ItemRewardParam(itemId, min, max);
+            
+            if (isFirst) {
+                this.firstRewards.add(reward);
+            } else {
+                this.rewards.add(reward);
+            }
+        }
+    }
+}

src/main/java/emu/nebula/data/resources/ActivityShopControlDef.java

@@ -0,0 +1,18 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "ActivityShopControl.json")
+public class ActivityShopControlDef extends BaseDef {
+    private int Id;
+    private int[] ShopIds;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+}

src/main/java/emu/nebula/data/resources/ActivityShopDef.java

@@ -0,0 +1,28 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "ActivityShop.json")
+public class ActivityShopDef extends BaseDef {
+    private int Id;
+    private int CurrencyItemId;
+    private int ExchangeItemId;
+    private double Rate;
+    
+    private Int2ObjectMap<ActivityGoodsDef> goods;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+
+    @Override
+    public void onLoad() {
+        this.goods = new Int2ObjectOpenHashMap<>();
+    }
+}

src/main/java/emu/nebula/data/resources/ActivityTaskDef.java

@@ -0,0 +1,40 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+import emu.nebula.game.inventory.ItemParamMap;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "ActivityTask.json")
+public class ActivityTaskDef extends BaseDef {
+    private int Id;
+    private int ActivityTaskGroupId;
+    
+    private int CompleteCond;
+    private int AimNumShow;
+    
+    private int Tid1;
+    private int Qty1;
+    private int Tid2;
+    private int Qty2;
+    
+    private transient ItemParamMap rewards;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+    
+    @Override
+    public void onLoad() {
+        this.rewards = new ItemParamMap();
+        
+        if (this.Tid1 > 0) {
+            this.rewards.add(this.Tid1, this.Qty1);
+        }
+        if (this.Tid2 > 0) {
+            this.rewards.add(this.Tid2, this.Qty2);
+        }
+    }
+}

src/main/java/emu/nebula/data/resources/ActivityTaskGroupDef.java

@@ -0,0 +1,57 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+import emu.nebula.game.inventory.ItemParamMap;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "ActivityTaskGroup.json")
+public class ActivityTaskGroupDef extends BaseDef {
+    private int Id;
+    private int ActivityId;
+    
+    private int Reward1;
+    private int RewardQty1;
+    private int Reward2;
+    private int RewardQty2;
+    private int Reward3;
+    private int RewardQty3;
+    private int Reward4;
+    private int RewardQty4;
+    private int Reward5;
+    private int RewardQty5;
+    private int Reward6;
+    private int RewardQty6;
+    
+    private transient ItemParamMap rewards;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+    
+    @Override
+    public void onLoad() {
+        this.rewards = new ItemParamMap();
+        
+        if (this.Reward1 > 0) {
+            this.rewards.add(this.Reward1, this.RewardQty1);
+        }
+        if (this.Reward2 > 0) {
+            this.rewards.add(this.Reward2, this.RewardQty2);
+        }
+        if (this.Reward3 > 0) {
+            this.rewards.add(this.Reward3, this.RewardQty3);
+        }
+        if (this.Reward4 > 0) {
+            this.rewards.add(this.Reward4, this.RewardQty4);
+        }
+        if (this.Reward5 > 0) {
+            this.rewards.add(this.Reward5, this.RewardQty5);
+        }
+        if (this.Reward6 > 0) {
+            this.rewards.add(this.Reward6, this.RewardQty6);
+        }
+    }
+}

src/main/java/emu/nebula/data/resources/AffinityGiftDef.java

@@ -0,0 +1,20 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "AffinityGift.json")
+public class AffinityGiftDef extends BaseDef {
+    private int Id;
+    private int BaseAffinity;
+    private int[] Tags;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+    
+}

src/main/java/emu/nebula/data/resources/AffinityLevelDef.java

@@ -0,0 +1,19 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "AffinityLevel.json")
+public class AffinityLevelDef extends BaseDef {
+    private int AffinityLevel;
+    private int NeedExp;
+    
+    @Override
+    public int getId() {
+        return AffinityLevel;
+    }
+
+}

src/main/java/emu/nebula/data/resources/AgentDef.java

@@ -1,10 +1,15 @@
 package emu.nebula.data.resources;
 
+import java.util.List;
+
 import emu.nebula.data.BaseDef;
 import emu.nebula.data.ResourceType;
+import emu.nebula.game.character.GameCharacter;
 import emu.nebula.game.inventory.ItemRewardList;
 import emu.nebula.game.inventory.ItemRewardParam;
 import emu.nebula.util.JsonUtils;
+
+import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import lombok.Getter;
@@ -35,6 +40,8 @@ public class AgentDef extends BaseDef {
     private String BonusPreview4;
     
     private transient Int2ObjectMap<AgentDurationDef> durations;
+    private transient Int2IntOpenHashMap tags;
+    private transient Int2IntOpenHashMap extraTags;
     
     @Override
     public int getId() {
@@ -45,14 +52,83 @@ public class AgentDef extends BaseDef {
         this.durations.put(duration.getTime(), duration);
     }
     
+    public boolean hasTags(List<GameCharacter> characters) {
+        // Get character tags
+        var characterTags = new Int2IntOpenHashMap();
+        
+        for (var character : characters) {
+            var data = character.getData().getDes();
+            
+            for (int tag : data.getTag()) {
+                characterTags.addTo(tag, 1);
+            }
+        }
+        
+        // Validate that we have the tags
+        for (var entry : this.tags.int2IntEntrySet()) {
+            int reqTagId = entry.getIntKey();
+            int reqTagCount = entry.getIntValue();
+            
+            // Get amount of tags that we have from our characters
+            int characterTagCount = characterTags.get(reqTagId);
+            
+            if (reqTagCount > characterTagCount) {
+                return false;
+            }
+        }
+        
+        return true;
+    }
+    
+    public boolean hasExtraTags(List<GameCharacter> characters) {
+        // Get character tags
+        var characterTags = new Int2IntOpenHashMap();
+        
+        for (var character : characters) {
+            var data = character.getData().getDes();
+            
+            for (int tag : data.getTag()) {
+                characterTags.addTo(tag, 1);
+            }
+        }
+        
+        // Validate that we have the tags
+        for (var entry : this.extraTags.int2IntEntrySet()) {
+            int reqTagId = entry.getIntKey();
+            int reqTagCount = entry.getIntValue();
+            
+            // Get amount of tags that we have from our characters
+            int characterTagCount = characterTags.get(reqTagId);
+            
+            if (reqTagCount > characterTagCount) {
+                return false;
+            }
+        }
+        
+        return true;
+    }
+    
     @Override
     public void onLoad() {
+        // Cache durations
         this.durations = new Int2ObjectOpenHashMap<>();
         
         this.addDuration(new AgentDurationDef(this.Time1, this.RewardPreview1, this.BonusPreview1));
         this.addDuration(new AgentDurationDef(this.Time2, this.RewardPreview2, this.BonusPreview2));
         this.addDuration(new AgentDurationDef(this.Time3, this.RewardPreview3, this.BonusPreview3));
         this.addDuration(new AgentDurationDef(this.Time4, this.RewardPreview4, this.BonusPreview4));
+        
+        // Cache tags
+        this.tags = new Int2IntOpenHashMap();
+        this.extraTags = new Int2IntOpenHashMap();
+        
+        for (int tag : this.Tags) {
+            this.tags.addTo(tag, 1);
+        }
+        
+        for (int tag : this.ExtraTags) {
+            this.extraTags.addTo(tag, 1);
+        }
     }
     
     @Getter

src/main/java/emu/nebula/data/resources/CharGemAttrTypeDef.java

@@ -1,39 +0,0 @@
-package emu.nebula.data.resources;
-
-import emu.nebula.data.BaseDef;
-import emu.nebula.data.GameData;
-import emu.nebula.data.ResourceType;
-import emu.nebula.util.WeightedList;
-import lombok.Getter;
-
-@Getter
-@ResourceType(name = "CharGemAttrType.json")
-public class CharGemAttrTypeDef extends BaseDef {
-    private int Id;
-    private int GroupId;
-    
-    private transient WeightedList<CharGemAttrValueDef> values;
-    
-    @Override
-    public int getId() {
-        return Id;
-    }
-    
-    public CharGemAttrValueDef getRandomValueData() {
-        return this.getValues().next();
-    }
-    
-    public int getRandomValue() {
-        return this.getRandomValueData().getId();
-    }
-    
-    @Override
-    public void onLoad() {
-        this.values = new WeightedList<>();
-        
-        var data = GameData.getCharGemAttrGroupDataTable().get(this.GroupId);
-        if (data != null) {
-            data.getAttributeTypes().add(this);
-        }
-    }
-}

src/main/java/emu/nebula/data/resources/CharGemAttrValueDef.java

@@ -12,8 +12,6 @@ public class CharGemAttrValueDef extends BaseDef {
     private int Id;
     private int TypeId;
     private int AttrType;
-    private int AttrTypeFirstSubtype;
-    private int AttrTypeSecondSubtype;
     private int Rarity;
     
     @Override
@@ -23,9 +21,18 @@ public class CharGemAttrValueDef extends BaseDef {
     
     @Override
     public void onLoad() {
-        var data = GameData.getCharGemAttrTypeDataTable().get(this.TypeId);
-        if (data != null) {
-            data.getValues().add(this.getRarity(), this);
+        // Cache attribute values into attribute group defs
+        // Honestly a horrible/inefficient way of doing this
+        for (var data : GameData.getCharGemAttrGroupDataTable()) {
+            for (var type : data.getAttributeTypes()) {
+                // Skip if type id doesnt match
+                if (type.getId() != this.getTypeId()) {
+                    continue;
+                }
+                
+                // Add
+                type.addValue(this);
+            }
         }
     }
 }

src/main/java/emu/nebula/data/resources/CharGemSlotControlDef.java

@@ -3,7 +3,9 @@ package emu.nebula.data.resources;
 import emu.nebula.data.BaseDef;
 import emu.nebula.data.GameData;
 import emu.nebula.data.ResourceType;
+import emu.nebula.data.custom.CharGemAttrGroupDef;
 import emu.nebula.util.CustomIntArray;
+import emu.nebula.util.Utils;
 import emu.nebula.util.WeightedList;
 import it.unimi.dsi.fastutil.ints.IntList;
 import lombok.Getter;
@@ -19,16 +21,15 @@ public class CharGemSlotControlDef extends BaseDef {
     private int GeneratenCostQty;
     private int RefreshCostQty;
     
-    private int UniqueAttrGroupProb;
-    private int UniqueAttrGroupId;
-    private int GuaranteeCount;
-    
-    private int[] AttrGroupId;
-    
     private int LockableNum;
     private int LockItemTid;
     private int LockItemQty;
     
+    // These have to be hardcoded now
+    private transient int UniqueAttrGroupProb;
+    private transient int UniqueAttrGroupId;
+    private transient int[] AttrGroupId;
+    
     @Override
     public int getId() {
         return Id;
@@ -38,9 +39,15 @@ public class CharGemSlotControlDef extends BaseDef {
         return this.generateAttributes(new CustomIntArray());
     }
     
+    // Check if we should add unique attributes based on the probablity
+    private boolean shouldAddUniqueAttr() {
+        int random = Utils.randomRange(1, 10000);
+        return random <= this.UniqueAttrGroupProb;
+    }
+    
     public IntList generateAttributes(CustomIntArray list) {
         // Add unique attributes
-        if (this.UniqueAttrGroupId > 0) {
+        if (this.UniqueAttrGroupId > 0 && this.shouldAddUniqueAttr()) {
             var group = GameData.getCharGemAttrGroupDataTable().get(this.UniqueAttrGroupId);
             int num = group.getRandomUniqueAttrNum();
             
@@ -49,7 +56,7 @@ public class CharGemSlotControlDef extends BaseDef {
                 list.add(attributeType.getRandomValue());
             }
             
-            if (list.size() >= this.MaxAlterNum) {
+            if (list.getValueCount() >= this.MaxAlterNum) {
                 return list;
             }
         }
@@ -76,4 +83,25 @@ public class CharGemSlotControlDef extends BaseDef {
         // Complete
         return list;
     }
+    
+    @Override
+    public void onLoad() {
+        // Hard coded values
+        switch (this.Id) {
+            case 3:
+                this.UniqueAttrGroupProb = 3300;
+                this.UniqueAttrGroupId = 12;
+                this.AttrGroupId = new int[] {9, 10};
+                break;
+            case 2:
+                this.UniqueAttrGroupProb = 4000;
+                this.UniqueAttrGroupId = 11;
+                this.AttrGroupId = new int[] {5, 6, 7, 8};
+                break;
+            case 1:
+            default:
+                this.AttrGroupId = new int[] {1, 2, 3, 4};
+                break;
+        }
+    }
 }

src/main/java/emu/nebula/data/resources/CharPotentialDef.java

@@ -0,0 +1,22 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "CharPotential.json")
+public class CharPotentialDef extends BaseDef {
+    private int Id;
+    
+    private int[] MasterSpecificPotentialIds;
+    private int[] AssistSpecificPotentialIds;
+    private int[] CommonPotentialIds;
+    private int[] MasterNormalPotentialIds;
+    private int[] AssistNormalPotentialIds;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+}

src/main/java/emu/nebula/data/resources/CharacterDef.java

@@ -1,5 +1,6 @@
 package emu.nebula.data.resources;
 
+import java.util.Arrays;
 import java.util.List;
 
 import emu.nebula.data.BaseDef;
@@ -31,6 +32,7 @@ public class CharacterDef extends BaseDef {
     
     private int[] GemSlots;
     
+    private transient CharacterDesDef des;
     private transient ElementType elementType;
     private transient List<ChatDef> chats;
     
@@ -38,6 +40,10 @@ public class CharacterDef extends BaseDef {
     public int getId() {
         return Id;
     }
+    
+    protected void setDes(CharacterDesDef des) {
+        this.des = des;
+    }
 
     public int getSkillsUpgradeGroup(int index) {
         if (index < 0 || index >= this.SkillsUpgradeGroup.length) {
@@ -56,5 +62,8 @@ public class CharacterDef extends BaseDef {
     public void onLoad() {
         this.elementType = ElementType.getByValue(this.EET);
         this.chats = new ObjectArrayList<>();
+        
+        // Sort gem slots
+        this.GemSlots = Arrays.stream(this.GemSlots).sorted().toArray();
     }
 }

src/main/java/emu/nebula/data/resources/CharacterDesDef.java

@@ -0,0 +1,60 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.GameData;
+import emu.nebula.data.ResourceType;
+import emu.nebula.data.ResourceType.LoadPriority;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "CharacterDes.json", loadPriority = LoadPriority.LOW)
+public class CharacterDesDef extends BaseDef {
+    private int Id;
+    private int[] Tag;
+    private IntOpenHashSet PreferTags;
+    private IntOpenHashSet HateTags;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+    
+    public boolean isPreferGift(AffinityGiftDef gift) {
+        if (this.getPreferTags() == null) {
+            return false;
+        }
+        
+        for (int i = 0; i < gift.getTags().length; i++) {
+            int tag = gift.getTags()[i];
+            if (this.getPreferTags().contains(tag)) {
+                return true;
+            }
+        }
+        
+        return false;
+    }
+    
+    public boolean isHateGift(AffinityGiftDef gift) {
+        if (this.getHateTags() == null) {
+            return false;
+        }
+        
+        for (int i = 0; i < gift.getTags().length; i++) {
+            int tag = gift.getTags()[i];
+            if (this.getHateTags().contains(tag)) {
+                return true;
+            }
+        }
+        
+        return false;
+    }
+    
+    @Override
+    public void onLoad() {
+        var character = GameData.getCharacterDataTable().get(this.getId());
+        if (character != null) {
+            character.setDes(this);
+        }
+    }
+}

src/main/java/emu/nebula/data/resources/DatingBranchDef.java

@@ -0,0 +1,32 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+import emu.nebula.data.ResourceType.LoadPriority;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "DatingBranch.json", loadPriority = LoadPriority.LOW)
+public class DatingBranchDef extends BaseDef {
+    private int Id;
+    private int DatingEventType;
+    private int[] DatingEventParams;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+    
+    public int getLandmarkId() {
+        if (this.DatingEventParams.length <= 0) {
+            return 0;
+        }
+        
+        return this.DatingEventParams[0];
+    }
+    
+    @Override
+    public void onLoad() {
+        
+    }
+}

src/main/java/emu/nebula/data/resources/DatingCharacterEventDef.java

@@ -0,0 +1,11 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.ResourceType;
+import emu.nebula.data.ResourceType.LoadPriority;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "DatingCharacterEvent.json", loadPriority = LoadPriority.LOW)
+public class DatingCharacterEventDef extends DatingLandmarkEventDef {
+    
+}

src/main/java/emu/nebula/data/resources/DatingLandmarkDef.java

@@ -0,0 +1,61 @@
+package emu.nebula.data.resources;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+import emu.nebula.game.dating.DatingEvent;
+import emu.nebula.util.Utils;
+import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
+import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "DatingLandmark.json")
+public class DatingLandmarkDef extends BaseDef {
+    private int Id;
+    
+    private transient List<DatingEvent> afterBranches;
+    private transient Object2ObjectMap<String, List<DatingEvent>> characterEvents;
+    private transient Object2ObjectMap<String, List<DatingEvent>> landmarkEvents;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+    
+    public int getRandomAfterBranchId() {
+        var event = Utils.randomElement(this.afterBranches);
+        
+        if (event == null) {
+            return 0;
+        }
+        
+        return event.getId();
+    }
+    
+    public int getRandomCharacterEventId() {
+        var list = new ArrayList<DatingEvent>();
+        
+        for (var events : this.characterEvents.values()) {
+            list.addAll(events);
+        }
+        
+        // Get random event
+        var event = Utils.randomElement(list);
+        
+        if (event == null) {
+            return 0;
+        }
+        
+        return event.getId();
+    }
+
+    @Override
+    public void onLoad() {
+        this.afterBranches = new ArrayList<>();
+        this.characterEvents = new Object2ObjectOpenHashMap<>();
+        this.landmarkEvents = new Object2ObjectOpenHashMap<>();
+    }
+}

src/main/java/emu/nebula/data/resources/DatingLandmarkEventDef.java

@@ -0,0 +1,66 @@
+package emu.nebula.data.resources;
+
+import java.util.ArrayList;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.GameData;
+import emu.nebula.data.ResourceType;
+import emu.nebula.data.ResourceType.LoadPriority;
+import emu.nebula.game.dating.DatingEvent;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "DatingLandmarkEvent.json", loadPriority = LoadPriority.LOW)
+public class DatingLandmarkEventDef extends BaseDef implements DatingEvent {
+    private int Id;
+    private int DatingEventType;
+    private int Affinity;
+    private int[] DatingEventParams;
+    private String Response;
+    
+    private transient emu.nebula.game.dating.DatingEventType type;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+    
+    public int getLandmarkId() {
+        if (this.DatingEventParams.length <= 0) {
+            return 0;
+        }
+        
+        return this.DatingEventParams[0];
+    }
+    
+    @Override
+    public void onLoad() {
+        // Cache dating event type
+        this.type = emu.nebula.game.dating.DatingEventType.getByValue(this.getDatingEventType());
+        
+        // Add to landmark data
+        var data = GameData.getDatingLandmarkDataTable().get(this.getLandmarkId());
+        if (data == null) {
+            return;
+        }
+        
+        switch (this.getType()) {
+            case Landmark -> {
+                data.getLandmarkEvents()
+                    .computeIfAbsent(this.getResponse(), s -> new ArrayList<>())
+                    .add(this);
+            }
+            case Regular -> {
+                data.getCharacterEvents()
+                    .computeIfAbsent(this.getResponse(), s -> new ArrayList<>())
+                    .add(this);
+            }
+            case AfterBranch -> {
+                data.getAfterBranches().add(this);
+            }
+            default -> {
+                // Ignored
+            }
+        }
+    }
+}

src/main/java/emu/nebula/data/resources/DiscDef.java

@@ -18,6 +18,9 @@ public class DiscDef extends BaseDef {
     private int TransformItemId;
     private int[] MaxStarTransformItem;
     private int[] ReadReward;
+    
+    private int SecondarySkillGroupId1;
+    private int SecondarySkillGroupId2;
     private int SubNoteSkillGroupId;
     
     private transient ElementType elementType;

src/main/java/emu/nebula/data/resources/DropPkgDef.java

@@ -0,0 +1,40 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+import emu.nebula.util.Utils;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntList;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "DropPkg.json")
+public class DropPkgDef extends BaseDef {
+    private int PkgId;
+    private int ItemId;
+    
+    private static Int2ObjectMap<IntList> PACKAGES = new Int2ObjectOpenHashMap<>();
+    
+    @Override
+    public int getId() {
+        return PkgId;
+    }
+    
+    @Override
+    public void onLoad() {
+        var packageList = PACKAGES.computeIfAbsent(this.PkgId, i -> new IntArrayList());
+        packageList.add(this.ItemId);
+    }
+    
+    public static int getRandomDrop(int packageId) {
+        var packageList = PACKAGES.get(packageId);
+        
+        if (packageList == null) {
+            return 0;
+        }
+        
+        return Utils.randomElement(packageList);
+    }
+}

src/main/java/emu/nebula/data/resources/EventOptionsDef.java

@@ -0,0 +1,34 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.GameData;
+import emu.nebula.data.ResourceType;
+import emu.nebula.data.ResourceType.LoadPriority;
+
+import lombok.Getter;
+
+/**
+ * We don't need a DataTable for this, since we are only using this class to verify event options for the client
+ */
+@Getter
+@ResourceType(name = "EventOptions.json", loadPriority = LoadPriority.LOW)
+public class EventOptionsDef extends BaseDef {
+    private int Id;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+    
+    @Override
+    public void onLoad() {
+        // Get event
+        var event = GameData.getStarTowerEventDataTable().get(this.Id / 100);
+        if (event == null) {
+            return;
+        }
+        
+        // Add to avaliable options
+        event.getOptionIds().add(this.getId());
+    }
+}

src/main/java/emu/nebula/data/resources/InfinityTowerDifficultyDef.java

@@ -0,0 +1,19 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "InfinityTowerDifficulty.json")
+public class InfinityTowerDifficultyDef extends BaseDef {
+    private int Id;
+    private int TowerId;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+    
+}

src/main/java/emu/nebula/data/resources/InfinityTowerLevelDef.java

@@ -4,6 +4,7 @@ import java.util.ArrayList;
 import java.util.List;
 
 import emu.nebula.data.BaseDef;
+import emu.nebula.data.GameData;
 import emu.nebula.data.ResourceType;
 import emu.nebula.game.inventory.ItemParamMap;
 import emu.nebula.game.inventory.ItemRewardParam;
@@ -25,8 +26,13 @@ public class InfinityTowerLevelDef extends BaseDef {
         return Id;
     }
     
-    public int getEnergyConsume() {
-        return 0;
+    public int getTowerId() {
+        var diff = GameData.getInfinityTowerDifficultyDataTable().get(this.DifficultyId);
+        if (diff == null) {
+            return 0;
+        }
+        
+        return diff.getTowerId();
     }
     
     public ItemParamMap generateRewards() {

src/main/java/emu/nebula/data/resources/PlotDef.java

@@ -0,0 +1,31 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+import emu.nebula.game.inventory.ItemParamMap;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "Plot.json")
+public class PlotDef extends BaseDef {
+    private int Id;
+    private int Char;
+    private int UnlockAffinityLevel;
+    private String Rewards;
+    
+    private transient ItemParamMap rewards;
+    
+    @Override
+    public int getId() {
+        return this.Id;
+    }
+    
+    public ItemParamMap getRewards() {
+        return this.rewards;
+    }
+    
+    @Override
+    public void onLoad() {
+        this.rewards = ItemParamMap.fromJsonString(this.Rewards);
+    }
+}

src/main/java/emu/nebula/data/resources/PotentialDef.java

@@ -2,6 +2,7 @@ package emu.nebula.data.resources;
 
 import emu.nebula.data.BaseDef;
 import emu.nebula.data.ResourceType;
+import emu.nebula.game.tower.StarTowerGame;
 import lombok.Getter;
 
 @Getter
@@ -10,11 +11,48 @@ public class PotentialDef extends BaseDef {
     private int Id;
     private int CharId;
     private int Build;
+    private int BranchType;
     private int MaxLevel;
     private int[] BuildScore;
     
+    private String BriefDesc;
+    
     @Override
     public int getId() {
         return Id;
     }
+
+    public boolean isRare() {
+        return this.BranchType != 3;
+    }
+    
+    public int getMaxLevel() {
+        // Check if regular potential
+        if (this.BranchType == 3) {
+            return this.BuildScore.length;
+        }
+        
+        // Special potential should always have a max level of 1
+        return this.MaxLevel;
+    }
+    
+    public int getMaxLevel(StarTowerGame game) {
+        // Check if regular potential
+        if (this.BranchType == 3) {
+            return this.MaxLevel + game.getModifiers().getExtraMaxPotentialLevel();
+        }
+        
+        // Special potential should always have a max level of 1
+        return this.MaxLevel;
+    }
+
+    public int getBuildScore(int level) {
+        int index = level - 1;
+        
+        if (index >= this.BuildScore.length) {
+            index = this.BuildScore.length - 1;
+        }
+        
+        return this.BuildScore[index];
+    }
 }

src/main/java/emu/nebula/data/resources/ScoreBossRewardDef.java

@@ -0,0 +1,19 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "ScoreBossReward.json")
+public class ScoreBossRewardDef extends BaseDef {
+    private int StarNeed;
+    private int RewardItemId1;
+    private int RewardNum1;
+    
+    @Override
+    public int getId() {
+        return StarNeed;
+    }
+}

src/main/java/emu/nebula/data/resources/SecondarySkillDef.java

@@ -0,0 +1,118 @@
+package emu.nebula.data.resources;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.GameData;
+import emu.nebula.data.ResourceType;
+import emu.nebula.game.inventory.ItemParamMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "SecondarySkill.json")
+public class SecondarySkillDef extends BaseDef {
+    private int Id;
+    private int GroupId;
+    private int Score;
+    private String NeedSubNoteSkills;
+    
+    private transient ItemParamMap reqSubNotes;
+    
+    @Getter
+    private static transient Int2ObjectMap<List<SecondarySkillDef>> groups = new Int2ObjectOpenHashMap<>();
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+    
+    public boolean match(ItemParamMap subNotes) {
+        for (var item : this.reqSubNotes) {
+            int reqId = item.getIntKey();
+            int reqCount = item.getIntValue();
+            
+            int curCount = subNotes.get(reqId);
+            if (curCount < reqCount) {
+                return false;
+            }
+        }
+        
+        return true;
+    }
+    
+    @Override
+    public void onLoad() {
+        // Setup required subnotes
+        this.reqSubNotes = ItemParamMap.fromJsonString(this.NeedSubNoteSkills);
+        
+        // Add to group cache
+        var group = groups.computeIfAbsent(this.GroupId, id -> new ArrayList<>());
+        group.add(this);
+        
+        // Clear to save memory
+        this.NeedSubNoteSkills = null;
+    }
+    
+    // Static sub note skill group group
+
+    public static List<SecondarySkillDef> getGroup(int id) {
+        return groups.get(id);
+    }
+    
+    public static IntSet calculateSecondarySkills(int[] discIds, ItemParamMap subNotes) {
+        var secondarySkills = new IntOpenHashSet();
+        
+        // Get first 3 discs
+        for (int i = 0; i < 3; i++) {
+            // Disc id
+            int discId = discIds[i];
+            
+            // Get disc data
+            var data = GameData.getDiscDataTable().get(discId);
+            if (data == null) continue;
+            
+            // Add secondary skills
+            int s1= getSecondarySkill(subNotes, data.getSecondarySkillGroupId1());
+            if (s1 > 0) {
+                secondarySkills.add(s1);
+            }
+            
+            int s2 = getSecondarySkill(subNotes, data.getSecondarySkillGroupId2());
+            if (s2 > 0) {
+                secondarySkills.add(s2);
+            }
+        }
+        
+        return secondarySkills;
+    }
+    
+    private static int getSecondarySkill(ItemParamMap subNotes, int groupId) {
+        // Check group id
+        if (groupId <= 0) {
+            return 0;
+        }
+        
+        // Get group
+        var group = SecondarySkillDef.getGroup(groupId);
+        if (group == null) {
+            return 0;
+        }
+        
+        // Reverse iterator to try and match highest secondary skill first
+        for (int i = group.size() - 1; i >= 0; i--) {
+            var data = group.get(i);
+            
+            if (data.match(subNotes)) {
+                return data.getId();
+            }
+        }
+        
+        // Failure
+        return 0;
+    }
+}

src/main/java/emu/nebula/data/resources/SignInDef.java

@@ -0,0 +1,20 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "SignIn.json")
+public class SignInDef extends BaseDef {
+    private int Group;
+    private int Day;
+    private int ItemId;
+    private int ItemQty;
+    
+    @Override
+    public int getId() {
+        return (this.Group << 16) + this.Day;
+    }
+}

src/main/java/emu/nebula/data/resources/StarTowerDef.java

@@ -10,6 +10,8 @@ import lombok.Getter;
 @ResourceType(name = "StarTower.json")
 public class StarTowerDef extends BaseDef {
     private int Id;
+    private int GroupId;
+    private int Difficulty;
     private int[] FloorNum;
     
     private transient int maxFloors;
@@ -19,8 +21,8 @@ public class StarTowerDef extends BaseDef {
         return Id;
     }
 
-    public int getMaxFloor(int stage) {
-        int index = stage - 1;
+    public int getMaxFloor(int stageNum) {
+        int index = stageNum - 1;
         
         if (index < 0 || index >= this.FloorNum.length) {
             return 0;

src/main/java/emu/nebula/data/resources/StarTowerEventDef.java

@@ -0,0 +1,35 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntList;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "StarTowerEvent.json")
+public class StarTowerEventDef extends BaseDef {
+    private int Id;
+    private int[] RelatedNPCs;
+    
+    private transient IntList optionIds;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+    
+    /**
+     * Returns a deep copy of our option ids
+     */
+    public IntList getClonedOptionIds() {
+        var list = new IntArrayList();
+        list.addAll(this.getOptionIds());
+        return list;
+    }
+    
+    @Override
+    public void onLoad() {
+        this.optionIds = new IntArrayList();
+    }
+}

src/main/java/emu/nebula/data/resources/StarTowerFloorExpDef.java

@@ -0,0 +1,22 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "StarTowerFloorExp.json")
+public class StarTowerFloorExpDef extends BaseDef {
+    private int Id;
+    private int StarTowerId;
+    private int Stage;
+    private int NormalExp;
+    private int EliteExp;
+    private int BossExp;
+    private int FinalBossExp;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+}

src/main/java/emu/nebula/data/resources/StarTowerStageDef.java

@@ -1,7 +1,10 @@
 package emu.nebula.data.resources;
 
+import com.google.gson.annotations.SerializedName;
+
 import emu.nebula.data.BaseDef;
 import emu.nebula.data.ResourceType;
+import emu.nebula.game.tower.room.RoomType;
 import lombok.Getter;
 
 @Getter
@@ -10,10 +13,19 @@ public class StarTowerStageDef extends BaseDef {
     private int Id;
     private int Stage;
     private int Floor;
-    private int RoomType;
+    private int InteriorCurrencyQuantity;
+    @SerializedName("RoomType")
+    private int RoomTypeValue;
+    
+    private transient RoomType roomType;
     
     @Override
     public int getId() {
         return Id;
     }
+    
+    @Override
+    public void onLoad() {
+        this.roomType = RoomType.getByValue(this.RoomTypeValue);
+    }
 }

src/main/java/emu/nebula/data/resources/StarTowerTeamExpDef.java

@@ -0,0 +1,19 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "StarTowerTeamExp.json")
+public class StarTowerTeamExpDef extends BaseDef {
+    private int Id;
+    private int GroupId;
+    private int Level;
+    private int NeedExp;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+}

src/main/java/emu/nebula/data/resources/StoryEvidenceDef.java

@@ -0,0 +1,17 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "StoryEvidence.json")
+public class StoryEvidenceDef extends BaseDef {
+    private int Id;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+}

src/main/java/emu/nebula/data/resources/TowerDefenseLevelDef.java

@@ -0,0 +1,33 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+import emu.nebula.game.inventory.ItemParamMap;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "TowerDefenseLevel.json")
+public class TowerDefenseLevelDef extends BaseDef {
+    private int Id;
+    private int Condition2;
+    private int Condition3;
+    private int Item1;
+    private int Qty1;
+    private int Item2;
+    private int Qty2;
+
+    private transient ItemParamMap rewards;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+
+    @Override
+    public void onLoad() {
+        // Parse rewards
+        this.rewards = new ItemParamMap();
+        this.rewards.add(this.Item1, this.Qty1);
+        this.rewards.add(this.Item2, this.Qty2);
+    }
+}

src/main/java/emu/nebula/data/resources/TrialControlDef.java

@@ -0,0 +1,18 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "TrialControl.json")
+public class TrialControlDef extends BaseDef {
+    private int Id;
+    private IntOpenHashSet GroupIds;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+}

src/main/java/emu/nebula/data/resources/TrialGroupDef.java

@@ -0,0 +1,41 @@
+package emu.nebula.data.resources;
+
+import emu.nebula.data.BaseDef;
+import emu.nebula.data.ResourceType;
+import emu.nebula.game.inventory.ItemParamMap;
+import lombok.Getter;
+
+@Getter
+@ResourceType(name = "TrialGroup.json")
+public class TrialGroupDef extends BaseDef {
+    private int Id;
+    
+    private int RewardId1;
+    private int Qty1;
+    private int RewardId2;
+    private int Qty2;
+    private int RewardId3;
+    private int Qty3;
+    
+    private transient ItemParamMap rewards;
+    
+    @Override
+    public int getId() {
+        return Id;
+    }
+
+    @Override
+    public void onLoad() {
+        this.rewards = new ItemParamMap();
+        
+        if (this.RewardId1 > 0) {
+            this.rewards.add(this.RewardId1, this.Qty1);
+        }
+        if (this.RewardId2 > 0) {
+            this.rewards.add(this.RewardId2, this.Qty2);
+        }
+        if (this.RewardId3 > 0) {
+            this.rewards.add(this.RewardId3, this.Qty3);
+        }
+    }
+}

src/main/java/emu/nebula/data/resources/VampireSurvivorDef.java

@@ -12,6 +12,18 @@ public class VampireSurvivorDef extends BaseDef {
     private int NeedWorldClass;
     private int[] FateCardBundle;
     
+    private int NormalScore1;
+    private int EliteScore1;
+    private int BossScore1;
+    private int TimeScore1;
+    private int TimeLimit1;
+    
+    private int NormalScore2;
+    private int EliteScore2;
+    private int BossScore2;
+    private int TimeScore2;
+    private int TimeLimit2;
+    
     @Override
     public int getId() {
         return Id;

src/main/java/emu/nebula/data/resources/WeekBossLevelDef.java

@@ -1,7 +1,9 @@
 package emu.nebula.data.resources;
 
 import emu.nebula.data.BaseDef;
+import emu.nebula.data.GameData;
 import emu.nebula.data.ResourceType;
+import emu.nebula.data.ResourceType.LoadPriority;
 import emu.nebula.game.instance.InstanceData;
 import emu.nebula.game.inventory.ItemRewardList;
 import emu.nebula.game.inventory.ItemRewardParam;
@@ -10,9 +12,10 @@ import emu.nebula.util.JsonUtils;
 import lombok.Getter;
 
 @Getter
-@ResourceType(name = "WeekBossLevel.json")
+@ResourceType(name = "WeekBossLevel.json", loadPriority = LoadPriority.LOW)
 public class WeekBossLevelDef extends BaseDef implements InstanceData {
     private int Id;
+    private int Difficulty;
     private int PreLevelId;
     private int NeedWorldClass;
     private String BaseAwardPreview;
@@ -44,14 +47,33 @@ public class WeekBossLevelDef extends BaseDef implements InstanceData {
         for (int[] award : awards) {
             int itemId = award[0];
             int min = award[1];
-            int max = award.length >= 4 ? award[2] : min;
+            int max = award[1];
             boolean isFirst = award[award.length - 1] == 1;
             
+            // Set reward count based on difficulty
             if (min == -1) {
-                min = 0;
-                max = 1;
+                min = this.Difficulty;
+                max = this.Difficulty;
+                
+                var item = GameData.getItemDataTable().get(itemId);
+                if (item != null) {
+                    switch (item.getRarity()) {
+                        case 2:
+                            max = this.Difficulty * 3;
+                            break;
+                        case 3:
+                            min = this.Difficulty * 2;
+                            max = this.Difficulty * 6;
+                            break;
+                        case 4:
+                            min = this.Difficulty * 3;
+                            max = this.Difficulty * 9;
+                            break;
+                    }
+                }
             }
             
+            // Create reward param
             var reward = new ItemRewardParam(itemId, min, max);
             
             if (isFirst) {

src/main/java/emu/nebula/database/DatabaseManager.java

@@ -26,7 +26,6 @@ import de.bwaldvogel.mongo.backend.h2.H2Backend;
 import de.bwaldvogel.mongo.backend.memory.MemoryBackend;
 import dev.morphia.*;
 import dev.morphia.annotations.Entity;
-import dev.morphia.mapping.Mapper;
 import dev.morphia.mapping.MapperOptions;
 import dev.morphia.query.FindOptions;
 import dev.morphia.query.Sort;
@@ -84,7 +83,7 @@ public final class DatabaseManager {
                 .stream()
                 .filter(cls -> {
                     Entity e = cls.getAnnotation(Entity.class);
-                    return e != null && !e.value().equals(Mapper.IGNORED_FIELDNAME);
+                    return e != null;
                 })
                 .toList();
 
@@ -164,12 +163,16 @@ public final class DatabaseManager {
         return getDatastore().find(cls).stream();
     }
     
-    public <T> List<T> getSortedObjects(Class<T> cls, String filter, int limit) {
+    public <T> List<T> getSortedObjects(Class<T> cls, String filter, int value, String sortBy, int limit) {
         var options = new FindOptions()
-                .sort(Sort.descending(filter))
+                .sort(Sort.descending(sortBy))
                 .limit(limit);
         
-        return getDatastore().find(cls).iterator(options).toList();
+        return getDatastore()
+                .find(cls)
+                .filter(Filters.eq(filter, value))
+                .iterator(options)
+                .toList();
     }
 
     public <T> void save(T obj) {

src/main/java/emu/nebula/game/GameContext.java

@@ -8,12 +8,14 @@ import java.util.concurrent.TimeUnit;
 
 import emu.nebula.GameConstants;
 import emu.nebula.Nebula;
+import emu.nebula.game.activity.ActivityModule;
+import emu.nebula.game.ban.BanModule;
 import emu.nebula.game.gacha.GachaModule;
 import emu.nebula.game.player.PlayerModule;
 import emu.nebula.game.scoreboss.ScoreBossModule;
 import emu.nebula.game.tutorial.TutorialModule;
 import emu.nebula.net.GameSession;
-
+import emu.nebula.util.Utils;
 import it.unimi.dsi.fastutil.objects.Object2ObjectMap;
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 
@@ -27,13 +29,17 @@ public class GameContext implements Runnable {
     private final PlayerModule playerModule;
     private final GachaModule gachaModule;
     private final TutorialModule tutorialModule;
+    private final ActivityModule activityModule;
     private final ScoreBossModule scoreBossModule;
+    private final BanModule banModule;
     
     // Game loop
     private final ScheduledExecutorService scheduler;
     
     // Daily
     private long epochDays;
+    private int epochWeeks;
+    private int epochMonths;
     
     public GameContext() {
         this.sessions = new Object2ObjectOpenHashMap<>();
@@ -42,7 +48,9 @@ public class GameContext implements Runnable {
         this.playerModule = new PlayerModule(this);
         this.gachaModule = new GachaModule(this);
         this.tutorialModule = new TutorialModule(this);
+        this.activityModule = new ActivityModule(this);
         this.scoreBossModule = new ScoreBossModule(this);
+        this.banModule = new BanModule(this);
         
         // Run game loop
         this.scheduler = Executors.newScheduledThreadPool(1);
@@ -77,7 +85,9 @@ public class GameContext implements Runnable {
     // TODO add timeout to config
     public synchronized void cleanupInactiveSessions() {
         var it = this.getSessions().entrySet().iterator();
-        long timeout = System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(600); // 10 minutes
+        
+        int time = Nebula.getConfig().getServerOptions().sessionTimeout;
+        long timeout = System.currentTimeMillis() - TimeUnit.SECONDS.toMillis(time);
         
         while (it.hasNext()) {
             var session = it.next().getValue();
@@ -99,11 +109,17 @@ public class GameContext implements Runnable {
         var instant = Instant.now().plusSeconds(offset);
         var date = LocalDate.ofInstant(instant, GameConstants.UTC_ZONE);
         
+        // Update epoch days
         long lastEpochDays = this.epochDays;
         this.epochDays = date.toEpochDay();
         
         // Check if the day was changed
         if (this.epochDays > lastEpochDays) {
+            // Update epoch weeks/months
+            this.epochWeeks = Utils.getWeeks(this.epochDays);
+            this.epochMonths = Utils.getMonths(this.epochDays);
+            
+            // Reset dailies for players
             this.resetDailies();
         }
         

src/main/java/emu/nebula/game/achievement/AchievementCondition.java

@@ -0,0 +1,159 @@
+package emu.nebula.game.achievement;
+
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import lombok.Getter;
+
+public enum AchievementCondition {
+    AchievementSpecific                                          (1),
+    AchievementTotal                                             (2),
+    BattleTotal                                                  (3),
+    CharacterAcquire                                             (5),
+    CharacterAcquireQuantityRarityAndAdvancement                 (6),
+    CharacterAdvanceTotal                                        (7),
+    CharacterSkillUpTotal                                        (8),
+    CharacterSkillWithSpecificUpTotal                            (9),
+    CharacterSpecific                                            (10),
+    CharacterUpLevel                                             (11),
+    CharacterUpTotal                                             (12),
+    CharacterWithSpecificAdvance                                 (13),
+    CharacterWithSpecificAffinity                                (14),
+    CharacterWithSpecificUpLevel                                 (15),
+    CharactersWithSpecificLevelAndQuantity                       (16),
+    CharactersWithSpecificNumberLevelAndAttributes               (17),
+    CharactersWithSpecificPlot                                   (18),
+    CharactersWithSpecificQuantityAdvancementCountAndAttribute   (19),
+    CharactersWithSpecificQuantityAndRarity                      (20),
+    CharactersWithSpecificQuantityRarityAndAdvancement           (21),
+    CharactersWithSpecificQuantityRarityAndLevel                 (22),
+    ChatTotal                                                    (23),
+    DailyInstanceClearSpecificDifficultyAndTotal                 (24),
+    DailyInstanceClearSpecificTypeAndTotal                       (25),
+    DailyInstanceClearTotal                                      (26),
+    DateSpecific                                                 (27),
+    DiscAcquire                                                  (28),
+    DiscAcquireSpecificQuantityAndRarity                         (29),
+    DiscAcquireQuantityLevelAndRarity                            (30),
+    DiscAcquireQuantityPhaseAndRarity                            (31),
+    DiscAcquireQuantityStarAndRarity                             (32),
+    DiscLimitBreakTotal                                          (33),
+    DiscPromoteTotal                                             (34),
+    DiscStrengthenTotal                                          (35),
+    DiscWithSpecificQuantityLevelAndRarity                       (36),
+    DiscWithSpecificQuantityPhaseAndRarity                       (37),
+    DiscWithSpecificQuantityStarAndRarity                        (38),
+    GachaCharacterNotSSRTotal                                    (40),
+    GachaCharacterTenModeSSRTotal                                (41),
+    GachaCharacterTotal                                          (42),
+    GachaTenModeAcquireQuantityAndRarityItems                    (43),
+    GachaTotal                                                   (44),
+    GiftGiveTotal                                                (45),
+    InfinityTowerClearSpecificFloor                              (46),
+    InfinityTowerClearTotal                                      (47),
+    ItemsAdd                                                     (48),
+    ItemsDeplete                                                 (49),
+    ItemsProductTotal                                            (50),
+    LoginTotal                                                   (51),
+    QuestTravelerDuelChallengeTotal                              (52),
+    QuestTourGuideSpecific                                       (53),
+    QuestTravelerDuelSpecific                                    (54),
+    QuestWithSpecificType                                        (55),
+    RegionBossClearSpecificFullStarWithBossIdAndDifficulty       (56),
+    RegionBossClearSpecificLevelWithDifficultyAndTotal           (57),
+    RegionBossClearSpecificTotal                                 (58),
+    RegionBossClearTotal                                         (59),
+    SkillsWithSpecificQuantityAndLevel                           (60),
+    SkinAcquire                                                  (61),
+    StageClearSpecificStars                                      (62),
+    StoryClear                                                   (63),
+    TravelerDuelChallengeSpecificBoosLevelWithDifficultyAndTotal (64),
+    TravelerDuelClearBossTotal                                   (65),
+    TravelerDuelClearSpecificBossIdAndDifficulty                 (66),
+    TravelerDuelChallengeClearSpecificBossLevelAndAffix          (67),
+    TravelerDuelClearSpecificBossLevelWithDifficultyAndTotal     (68),
+    TravelerDuelClearSpecificBossTotal                           (69),
+    TravelerDuelChallengeRankUploadTotal                         (70),
+    WorldClassSpecific                                           (71),
+    RegionBossClearSpecificTypeWithTotal                         (72),
+    CharactersWithSpecificDatingCount                            (73),
+    CharactersDatingTotal                                        (74),
+    VampireSurvivorScoreTotal                                    (75),
+    VampireSurvivorSpecificLevelWithSpecificScore                (76),
+    VampireSurvivorPassedSpecificLevel                           (77),
+    CharacterParticipateTowerNumber                              (78),
+    CharacterAllSkillReachSpecificLevel                          (79),
+    TravelerDuelPlayTotal                                        (80),
+    VampireClearTotal                                            (81),
+    VampireWithSpecificClearTotal                                (82),
+    AgentFinishTotal                                             (83),
+    AgentWithSpecificFinishTotal                                 (84),
+    ActivityMiningEnterLayer                                     (86),
+    ActivityMiningDestroyGrid                                    (87),
+    BossRushTotalStars                                           (88),
+    InfinityTowerClearSpecificDifficultyAndTotal                 (89),
+    SkillInstanceClearTotal                                      (90),
+    VampireSurvivorSpecificPassedLevel                           (91),
+    WeekBoosClearSpecificDifficultyAndTotal                      (92),
+    NpcAffinityWithSpecificLevel                                 (93),
+    CharacterPassedWithSpecificTowerAndCount                     (94),
+    JointDrillScoreTotal                                         (95),
+    CharGemInstanceClearTotal                                    (104),
+    DailyShopReceiveShopTotal                                    (105),
+    AgentApplyTotal                                              (106),
+    DiscSpecific                                                 (114),
+    ClientReport                                                 (200),
+    TowerBattleTimes                                             (501),
+    TowerBossChallengeSpecificHighRewardWithTotal                (502),
+    TowerBuildSpecificCharacter                                  (503),
+    TowerBuildSpecificScoreWithTotal                             (504),
+    TowerClearSpecificCharacterTypeWithTotal                     (505),
+    TowerClearSpecificGroupIdAndDifficulty                       (506),
+    TowerClearSpecificLevelWithDifficultyAndTotal                (507),
+    TowerClearTotal                                              (508),
+    TowerEnterRoom                                               (509),
+    TowerEventTimes                                              (511),
+    TowerFateTimes                                               (512),
+    TowerItemsGet                                                (513),
+    TowerSpecificDifficultyShopBuyTimes                          (514),
+    TowerGrowthSpecificNote                                      (515),
+    TowerClearSpecificLevelWithDifficultyAndTotalHistory         (516),
+    TowerBookWithSpecificEvent                                   (517),
+    TowerBookWithSpecificFateCard                                (518),
+    TowerBookWithSpecificPotential                               (520),
+    TowerBuildSpecificDifficultyAndScoreWithTotal                (521),
+    TowerSpecificDifficultyStrengthenMachineTotal                (522),
+    TowerSpecificDifficultyKillBossTotal                         (524),
+    TowerBookSpecificCharWithPotentialTotal                      (525),
+    TowerBuildSpecificCharSpecificScoreWithTotal                 (526),
+    TowerGrowthWithSpecificNote                                  (527),
+    TowerSpecificFateCardReRollTotal                             (528),
+    TowerSpecificPotentialReRollTotal                            (529),
+    TowerSpecificShopReRollTotal                                 (530),
+    TowerSpecificNoteActivateTotal                               (531),
+    TowerSpecificNoteLevelTotal                                  (532),
+    TowerSpecificPotentialBonusTotal                             (533),
+    TowerSpecificPotentialLuckyTotal                             (534),
+    TowerSpecificShopBuyDiscountTotal                            (535),
+    TowerSpecificSecondarySkillActivateTotal                     (536),
+    TowerSpecificGetExtraNoteLvTotal                             (537),
+    TowerSweepTimes                                              (539),
+    TowerSweepTotal                                              (540);
+
+    @Getter
+    private final int value;
+    private final static Int2ObjectMap<AchievementCondition> map = new Int2ObjectOpenHashMap<>();
+
+    static {
+        for (AchievementCondition type : AchievementCondition.values()) {
+            map.put(type.getValue(), type);
+        }
+    }
+
+    private AchievementCondition(int value) {
+        this.value = value;
+    }
+
+    public static AchievementCondition getByValue(int value) {
+        return map.get(value);
+    }
+}

src/main/java/emu/nebula/game/achievement/AchievementHelper.java

@@ -0,0 +1,166 @@
+package emu.nebula.game.achievement;
+
+import java.util.List;
+
+import emu.nebula.GameConstants;
+import emu.nebula.data.GameData;
+import emu.nebula.data.resources.AchievementDef;
+import emu.nebula.game.tower.room.RoomType;
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
+import lombok.Getter;
+
+// Because achievements in the data files do not have params, we will hardcode them here
+public class AchievementHelper {
+    // Cache
+    private static IntSet incrementalAchievementSet = new IntOpenHashSet();
+    
+    @Getter
+    private static Int2ObjectMap<List<AchievementDef>> cache = new Int2ObjectOpenHashMap<>();
+    
+    public static List<AchievementDef> getAchievementsByCondition(int condition) {
+        return cache.get(condition);
+    }
+    
+    //
+    
+    public static boolean isIncrementalAchievement(int condition) {
+        return incrementalAchievementSet.contains(condition);
+    }
+    
+    // Fix params
+    
+    public static void init() {
+        // Cache total achievements
+        for (var condition : AchievementCondition.values()) {
+            if (condition.name().endsWith("Total") || condition.name().endsWith("Times")) {
+                incrementalAchievementSet.add(condition.getValue());
+            }
+        }
+        
+        incrementalAchievementSet.remove(AchievementCondition.AchievementTotal.getValue());
+        
+        incrementalAchievementSet.add(AchievementCondition.ItemsAdd.getValue());
+        incrementalAchievementSet.add(AchievementCondition.ItemsDeplete.getValue());
+        
+        incrementalAchievementSet.add(AchievementCondition.TowerItemsGet.getValue());
+        incrementalAchievementSet.add(AchievementCondition.TowerEnterRoom.getValue());
+        
+        // Fix params
+        fixParams();
+    }
+    
+    private static void fixParams() {
+        // Clear "Misstep On One"
+        addParam(56, 401, 0); // Custom trigger
+        
+        // Clear "Currents and Shadows"
+        addParam(57, 102, 0);
+        addParam(58, 103, 0);
+        addParam(59, 104, 0);
+        addParam(60, 105, 0);
+        addParam(61, 106, 0);
+        addParam(62, 107, 0);
+        addParam(63, 108, 0);
+        
+        // Clear "Dust and Flames"
+        addParam(64, 202, 0);
+        addParam(65, 203, 0);
+        addParam(66, 204, 0);
+        addParam(67, 205, 0);
+        addParam(68, 206, 0);
+        addParam(69, 207, 0);
+        addParam(70, 208, 0);
+        
+        // Clear "Storm and Thunder"
+        addParam(71, 302, 0);
+        addParam(72, 303, 0);
+        addParam(73, 304, 0);
+        addParam(74, 305, 0);
+        addParam(75, 306, 0);
+        addParam(76, 307, 0);
+        addParam(77, 308, 0);
+        
+        // First Ascension
+        addParam(498, 0, 1);
+        
+        // Monolith Conqueror
+        addParam(78, 2, 0);
+        addParam(79, 4, 0);
+        addParam(80, 6, 0);
+        addParam(81, 7, 0);
+        
+        // Money
+        addParam(25, GameConstants.GOLD_ITEM_ID, 0);
+        addParam(26, GameConstants.GOLD_ITEM_ID, 0);
+        addParam(27, GameConstants.GOLD_ITEM_ID, 0);
+        addParam(28, GameConstants.GOLD_ITEM_ID, 0);
+        addParam(29, GameConstants.GOLD_ITEM_ID, 0);
+        
+        // Ininfite tower
+        for (int diff = 10, id = 270; diff <= 60; diff += 10) {
+            addParam(id++, 11000 + diff, 0); // Infinite Arena
+            addParam(id++, 51000 + diff, 0); // Shake the Floor
+            addParam(id++, 41000 + diff, 0); // Elegance and Flow
+            addParam(id++, 71000 + diff, 0); // Upbeat Party
+            addParam(id++, 31000 + diff, 0); // Thrilling Beat
+            addParam(id++, 21000 + diff, 0); // Flames and Beats
+            addParam(id++, 61000 + diff, 0); // Sinister Ritual
+        }
+        
+        // Character count
+        addParams(393, 398, 1, 0);
+        
+        // Disc count
+        addParams(382, 387, 1, 0);
+        
+        // Star Tower team clear
+        addParams(95, 98, 1, 0);   // Aqua team clear
+        addParams(99, 102, 2, 0);  // Fire team clear
+        addParams(103, 106, 3, 0); // Earth team clear
+        addParams(107, 110, 4, 0); // Wind team clear
+        addParams(111, 114, 5, 0); // Light team clear
+        addParams(115, 118, 6, 0); // Dark team clear
+        
+        // Star tower items
+        addParams(139, 144, GameConstants.TOWER_COIN_ITEM_ID, 0);
+        
+        addParams(145, 149, 90011, 0);
+        addParams(150, 154, 90012, 0);
+        addParams(155, 159, 90013, 0);
+        addParams(160, 164, 90014, 0);
+        addParams(165, 169, 90015, 0);
+        addParams(170, 174, 90016, 0);
+        addParams(175, 179, 90017, 0);
+        
+        addParams(180, 184, 90018, 0);
+        addParams(185, 189, 90019, 0);
+        addParams(190, 194, 90020, 0);
+        addParams(195, 199, 90021, 0);
+        addParams(200, 204, 90022, 0);
+        addParams(205, 209, 90023, 0);
+        
+        // Star tower rooms
+        addParams(210, 216, RoomType.BattleRoom.getValue() + 1, 0);
+        addParams(217, 223, RoomType.EliteBattleRoom.getValue() + 1, 0);
+        addParams(224, 230, RoomType.BossRoom.getValue() + 1, 0);
+        addParams(231, 237, RoomType.FinalBossRoom.getValue() + 1, 0);
+        addParams(238, 244, RoomType.ShopRoom.getValue() + 1, 0);
+        addParams(245, 251, RoomType.EventRoom.getValue() + 1, 0);
+    }
+    
+    private static void addParam(int achievementId, int param1, int param2) {
+        var data = GameData.getAchievementDataTable().get(achievementId);
+        if (data == null) return;
+        
+        data.setParams(param1, param2);
+    }
+    
+    private static void addParams(int start, int end, int param1, int param2) {
+        for (int id = start; id <= end; id++) {
+            addParam(id, param1, param2);
+        }
+    }
+}

src/main/java/emu/nebula/game/achievement/AchievementManager.java

@@ -0,0 +1,282 @@
+package emu.nebula.game.achievement;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import dev.morphia.annotations.Entity;
+import dev.morphia.annotations.Id;
+
+import emu.nebula.Nebula;
+import emu.nebula.data.GameData;
+import emu.nebula.data.resources.AchievementDef;
+import emu.nebula.database.GameDatabaseObject;
+import emu.nebula.game.inventory.ItemParamMap;
+import emu.nebula.game.player.Player;
+import emu.nebula.game.player.PlayerChangeInfo;
+import emu.nebula.game.player.PlayerManager;
+import emu.nebula.net.NetMsgId;
+import emu.nebula.proto.Public.Achievements;
+import emu.nebula.proto.Public.Events;
+
+import lombok.Getter;
+import us.hebi.quickbuf.RepeatedInt;
+
+@Getter
+@Entity(value = "achievements", useDiscriminator = false)
+public class AchievementManager extends PlayerManager implements GameDatabaseObject {
+    @Id
+    private int uid;
+    
+    // Achievement data
+    private Map<Integer, GameAchievement> achievements;
+    
+    // Flags
+    private transient boolean queueSave;
+    private transient boolean hasCompleted;
+    
+    @Deprecated // Morphia only
+    public AchievementManager() {
+        
+    }
+    
+    public AchievementManager(Player player) {
+        super(player);
+        this.uid = player.getUid();
+        this.achievements = new HashMap<>();
+        
+        this.save();
+    }
+    
+    public synchronized int getCompletedAchievementsCount() {
+        return (int) this.getAchievements().values().stream()
+                .filter(GameAchievement::isComplete)
+                .count();
+    }
+    
+    /**
+     * Returns true if there are any unclaimed achievements
+     */
+    public synchronized boolean hasNewAchievements() {
+        for (var achievement : this.getAchievements().values()) {
+            if (achievement.isClaimable()) {
+                return true;
+            }
+        }
+        
+        return false;
+    }
+    
+    public synchronized GameAchievement getAchievement(AchievementDef data) {
+        // Try and get achievement normally
+        var achievement = this.getAchievements().get(data.getId());
+        
+        // Create achievement if it doesnt exist
+        if (achievement == null) {
+            achievement = new GameAchievement(data);
+            
+            this.getAchievements().put(achievement.getId(), achievement);
+        }
+        
+        return achievement;
+    }
+    
+    public synchronized void handleClientEvents(Events events) {
+        // Parse events
+        for (var event : events.getList()) {
+            // Check id
+            if (event.getId() != AchievementCondition.ClientReport.getValue()) {
+                continue;
+            }
+            
+            // Sanity check
+            if (event.getData().length() < 2) {
+                continue;
+            }
+            
+            // Get achievement id and progress
+            int id = event.getData().get(1);
+            int progress = event.getData().get(0);
+            
+            if (progress <= 0) {
+                continue;
+            }
+            
+            // Get achievement data
+            var data = GameData.getAchievementDataTable().get(id);
+            if (data == null) continue;
+            
+            // Make sure achivement can be completed by the client
+            if (data.getCompleteCond() != AchievementCondition.ClientReport.getValue()) {
+                continue;
+            }
+            
+            // Get achievement
+            var achievement = this.getAchievement(data);
+            
+            // Update achievement
+            boolean changed = achievement.trigger(true, progress, 0, 0);
+            
+            // Sync with client if achievement was changed
+            if (changed) {
+                this.syncAchievement(achievement);
+            }
+        }
+        
+        // Update total achievements
+        if (this.hasCompleted) {
+            this.hasCompleted = false;
+            this.getPlayer().trigger(AchievementCondition.AchievementTotal, this.getCompletedAchievementsCount());
+        }
+    }
+    
+    public synchronized void trigger(AchievementCondition condition, int progress) {
+        this.trigger(condition.getValue(), progress, 0, 0);
+    }
+    
+    public synchronized void trigger(AchievementCondition condition, int progress, int param1, int param2) {
+        this.trigger(condition.getValue(), progress, param1, param2);
+    }
+    
+    public synchronized void trigger(int condition, int progress, int param1, int param2) {
+        // Sanity check
+        if (progress <= 0) {
+            return;
+        }
+        
+        // Blacklist
+        if (condition == AchievementCondition.ClientReport.getValue()) {
+            return;
+        }
+        
+        // Get achievements to trigger
+        var triggerList = AchievementHelper.getAchievementsByCondition(condition);
+        
+        if (triggerList == null) {
+            return;
+        }
+        
+        // Check what type of achievement condition this is
+        boolean isTotal = AchievementHelper.isIncrementalAchievement(condition);
+
+        // Parse achievements
+        for (var data : triggerList) {
+            // Get achievement
+            var achievement = this.getAchievement(data);
+            
+            // Update achievement
+            boolean changed = achievement.trigger(isTotal, progress, param1, param2);
+
+            // Sync with client if achievement was changed
+            if (changed) {
+                this.syncAchievement(achievement);
+            }
+        }
+        
+        // Update total achievements
+        if (this.hasCompleted) {
+            this.hasCompleted = false;
+            this.getPlayer().trigger(AchievementCondition.AchievementTotal, this.getCompletedAchievementsCount());
+        }
+    }
+    
+    public synchronized void triggerOne(int id, int progress, int param1, int param2) {
+        // Get achievement data
+        var data = GameData.getAchievementDataTable().get(id);
+        if (data == null) return;
+        
+        // Get achievement
+        var achievement = this.getAchievement(data);
+        
+        // Check what type of achievement condition this is
+        boolean isTotal = AchievementHelper.isIncrementalAchievement(data.getCompleteCond());
+        
+        // Update achievement
+        boolean changed = achievement.trigger(isTotal, progress, param1, param2);
+
+        // Sync with client if achievement was changed
+        if (changed) {
+            this.syncAchievement(achievement);
+        }
+        
+        // Update total achievements
+        if (this.hasCompleted) {
+            this.hasCompleted = false;
+            this.getPlayer().trigger(AchievementCondition.AchievementTotal, this.getCompletedAchievementsCount());
+        }
+    }
+    
+    /**
+     * Update this achievement on the player client
+     */
+    private void syncAchievement(GameAchievement achievement) {
+        if (!getPlayer().hasSession()) {
+            return;
+        }
+        
+        // Set save flag
+        this.queueSave = true;
+        
+        // Check if achievement was completed
+        if (achievement.isComplete()) {
+            this.hasCompleted = true;
+        }
+        
+        // Send update to player
+        getPlayer().addNextPackage(
+            NetMsgId.achievement_change_notify, 
+            achievement.toProto()
+        );
+    }
+   
+    public synchronized PlayerChangeInfo recvRewards(RepeatedInt ids) {
+        // Sanity check
+        if (ids.length() <= 0) {
+            return null;
+        }
+        
+        // Init variables
+        var rewards = new ItemParamMap();
+        
+        // Claim achievements
+        for (int id : ids) {
+            // Get achievement
+            var achievement = this.getAchievements().get(id);
+            if (achievement == null) continue;
+            
+            // Check if we can claim this achievement
+            if (achievement.isClaimable()) {
+                // Claim
+                achievement.setClaimed(true);
+                
+                // Add rewards
+                rewards.add(achievement.getData().getTid1(), achievement.getData().getQty1());
+                
+                // Save
+                this.queueSave = true;
+            }
+        }
+        
+        // Success
+        return this.getPlayer().getInventory().addItems(rewards);
+    }
+    
+    // Proto
+    
+    public synchronized Achievements toProto() {
+        var proto = Achievements.newInstance();
+        
+        for (var achievement : this.getAchievements().values()) {
+            proto.addList(achievement.toProto());
+        }
+        
+        return proto;
+    }
+    
+    // Database
+    
+    @Override
+    public void save() {
+        Nebula.getGameDatabase().save(this);
+        this.queueSave = false;
+    }
+}

src/main/java/emu/nebula/game/achievement/GameAchievement.java

@@ -0,0 +1,122 @@
+package emu.nebula.game.achievement;
+
+import dev.morphia.annotations.Entity;
+import emu.nebula.Nebula;
+import emu.nebula.data.GameData;
+import emu.nebula.data.resources.AchievementDef;
+import emu.nebula.proto.Public.Achievement;
+import emu.nebula.proto.Public.QuestProgress;
+import lombok.Getter;
+
+@Getter
+@Entity(useDiscriminator = false)
+public class GameAchievement {
+    private int id;
+    private int curProgress;
+    private long completed;
+    private boolean claimed;
+    
+    private transient AchievementDef data;
+    
+    @Deprecated // Morphia only
+    public GameAchievement() {
+        
+    }
+    
+    public GameAchievement(AchievementDef data) {
+        this.id = data.getId();
+        this.data = data;
+    }
+    
+    public AchievementDef getData() {
+        if (this.data == null) {
+            this.data = GameData.getAchievementDataTable().get(this.getId());
+        }
+        
+        return this.data;
+    }
+    
+    public int getMaxProgress() {
+        return this.getData().getAimNumShow();
+    }
+
+    public boolean isComplete() {
+        return this.completed > 0;
+    }
+    
+    public boolean isClaimable() {
+        return !this.isClaimed() && this.isComplete();
+    }
+    
+    public void setClaimed(boolean claimed) {
+        this.claimed = claimed;
+    }
+    
+    public int getStatus() {
+        if (this.isClaimed()) {
+            return 2;
+        } else if (this.isComplete()) {
+            return 1;
+        }
+        
+        return 0;
+    }
+    
+    /**
+     * Returns true if achievement was updated
+     */
+    public boolean trigger(boolean isTotal, int progress, int param1, int param2) {
+        // Sanity check
+        if (this.isComplete()) {
+            return false;
+        }
+        
+        // Check param conditions
+        var data = this.getData();
+        if (data == null) return false;
+        
+        if (data.hasParam1(param1) && data.getParam1() != param1) {
+            return false;
+        }
+        
+        if (data.hasParam2(param2) && data.getParam2() != param2) {
+            return false;
+        }
+        
+        // Set previous progress
+        int prevProgress = this.curProgress;
+        
+        // Update progress
+        if (isTotal) {
+            this.curProgress += progress;
+        } else {
+            this.curProgress = progress;
+        }
+        
+        // Check if completed
+        if (this.getCurProgress() >= this.getMaxProgress()) {
+            this.curProgress = this.getMaxProgress();
+            this.completed = Nebula.getCurrentTime();
+            return true;
+        }
+        
+        // Check if progress was changed
+        return prevProgress != this.curProgress;
+    }
+    
+    // Proto
+    
+    public Achievement toProto() {
+        var progress = QuestProgress.newInstance()
+                .setCur(this.getCurProgress())
+                .setMax(this.getMaxProgress());
+        
+        var proto = Achievement.newInstance()
+                .setId(this.getId())
+                .setCompleted(this.getCompleted())
+                .setStatus(this.getStatus())
+                .addProgress(progress);
+        
+        return proto;
+    }
+}

src/main/java/emu/nebula/game/activity/ActivityManager.java

@@ -0,0 +1,132 @@
+package emu.nebula.game.activity;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import dev.morphia.annotations.Entity;
+import dev.morphia.annotations.Id;
+
+import emu.nebula.Nebula;
+import emu.nebula.data.GameData;
+import emu.nebula.database.GameDatabaseObject;
+import emu.nebula.game.activity.type.*;
+import emu.nebula.game.player.Player;
+import emu.nebula.game.player.PlayerManager;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Entity(value = "activity", useDiscriminator = false)
+public class ActivityManager extends PlayerManager implements GameDatabaseObject {
+    @Id
+    private int uid;
+    
+    // Achievement data
+    private Map<Integer, GameActivity> activities;
+    
+    @Setter
+    private transient boolean queueSave;
+    
+    @Deprecated // Morphia only
+    public ActivityManager() {
+        
+    }
+    
+    public ActivityManager(Player player) {
+        super(player);
+        this.uid = player.getUid();
+        this.activities = new HashMap<>();
+    }
+    
+    public <T extends GameActivity> T getActivity(Class<T> activityClass, int id) {
+        // Get activity first
+        var activity = this.getActivities().get(id);
+        if (activity == null) return null;
+        
+        // Check activity type
+        if (activityClass.isInstance(activity)) {
+            return activityClass.cast(activity);
+        }
+        
+        // Failure
+        return null;
+    }
+    
+    /**
+     * This needs to be called after being loaded from the database
+     */
+    public synchronized void init() {
+        // Check if any activities
+        var it = this.getActivities().entrySet().iterator();
+        while (it.hasNext()) {
+            var entry = it.next();
+            var activity = entry.getValue();
+            
+            // Validate the activity to make sure it exists
+            var data = GameData.getActivityDataTable().get(activity.getId());
+            if (data == null) {
+                it.remove();
+                this.queueSave = true;
+            }
+            
+            // Set data
+            activity.setData(data);
+            activity.setManager(this);
+        }
+        
+        // Load activities
+        for (var id : Nebula.getGameContext().getActivityModule().getActivities()) {
+            // Check if we already have this activity
+            if (this.getActivities().containsKey(id)) {
+                continue;
+            }
+            
+            // Create activity
+            var activity = this.createActivity(id);
+            
+            if (activity == null) {
+                continue;
+            }
+            
+            // Add activity
+            this.getActivities().put(id, activity);
+            
+            // Set save flag
+            this.queueSave = true;
+        }
+        
+        // Save if any activities were changed
+        if (this.queueSave) {
+            this.save();
+        }
+    }
+    
+    private GameActivity createActivity(int id) {
+        // Get activity data first
+        var data = GameData.getActivityDataTable().get(id);
+        if (data == null) {
+            return null;
+        }
+        
+        // TODO improve activity creation
+        GameActivity activity = switch (data.getType()) {
+            case TowerDefense -> new TowerDefenseActivity(this, data);
+            case Trial -> new TrialActivity(this, data);
+            case Levels -> new LevelsActivity(this, data);
+            case Task -> new TaskActivity(this, data);
+            case Shop -> new ShopActivity(this, data);
+            default -> null;
+        };
+        
+        return activity;
+    }
+
+    // Database
+    
+    @Override
+    public void save() {
+        Nebula.getGameDatabase().save(this);
+        this.queueSave = false;
+    }
+}

src/main/java/emu/nebula/game/activity/ActivityModule.java

@@ -0,0 +1,37 @@
+package emu.nebula.game.activity;
+
+import emu.nebula.game.GameContext;
+import emu.nebula.game.GameContextModule;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntList;
+import lombok.Getter;
+
+@Getter
+public class ActivityModule extends GameContextModule {
+    private IntList activities;
+
+    public ActivityModule(GameContext context) {
+        super(context);
+        this.activities = new IntArrayList();
+        
+        // Hardcode these activities for now
+        // TODO make an activity json file to read activity ids from
+        
+        // Trial activities
+        this.activities.add(700104);
+        this.activities.add(700107);
+        this.activities.add(700108);
+
+        // Tower defense activity
+        this.activities.add(102001);
+        
+        // 
+        this.activities.add(1010201);
+        this.activities.add(1010203);
+        this.activities.add(1010204);
+        
+        //this.activities.add(101002);
+        //this.activities.add(101003);
+    }
+    
+}

src/main/java/emu/nebula/game/activity/ActivityTaskQuest.java

@@ -0,0 +1,93 @@
+package emu.nebula.game.activity;
+
+import dev.morphia.annotations.Entity;
+
+import emu.nebula.data.resources.ActivityTaskDef;
+import emu.nebula.proto.Public.Quest;
+import emu.nebula.proto.Public.QuestProgress;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Entity(useDiscriminator = false)
+public class ActivityTaskQuest {
+    private int id;
+    private int cond;
+    
+    private int curProgress;
+    private int maxProgress;
+    
+    @Setter
+    private boolean claimed;
+    
+    @Deprecated
+    public ActivityTaskQuest() {
+        
+    }
+    
+    public ActivityTaskQuest(ActivityTaskDef data) {
+        this.id = data.getId();
+        this.cond = data.getCompleteCond();
+        this.maxProgress = data.getAimNumShow();
+    }
+
+    public void resetProgress() {
+        this.curProgress = 0;
+        this.claimed = false;
+    }
+    
+    public boolean isComplete() {
+        return this.curProgress >= this.maxProgress;
+    }
+    
+    private int getStatus() {
+        if (this.isClaimed()) {
+            return 2;
+        } else if (this.isComplete()) {
+            return 1;
+        }
+        
+        return 0;
+    }
+
+    public boolean trigger(int condition, int progress, int param1, int param2) {
+        // Sanity check
+        if (this.isComplete()) {
+            return false;
+        }
+        
+        // Skip if not the correct condition
+        if (this.cond != condition) {
+            return false;
+        }
+        
+        // Check quest param TODO
+        
+        // Get new progress
+        int newProgress = Math.min(this.curProgress + progress, this.maxProgress);
+        
+        // Set
+        if (this.curProgress != newProgress) {
+            this.curProgress = newProgress;
+            return true;
+        }
+        
+        return false;
+    }
+    
+    // Proto
+
+    public Quest toProto() {
+        var progress = QuestProgress.newInstance()
+                .setCur(this.getCurProgress())
+                .setMax(this.getMaxProgress());
+        
+        var proto = Quest.newInstance()
+                .setId(this.getId())
+                .setStatus(this.getStatus())
+                .addProgress(progress);
+        
+        return proto;
+    }
+}

src/main/java/emu/nebula/game/activity/ActivityType.java

@@ -0,0 +1,40 @@
+package emu.nebula.game.activity;
+
+import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
+import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
+import lombok.Getter;
+
+public enum ActivityType {
+    None          (0),
+    PeriodicQuest (1),
+    LoginReward   (2),
+    Mining        (3),
+    Cookie        (4),
+    TowerDefense  (5),
+    Trial         (6),
+    JointDrill    (7),
+    CG            (8),
+    Levels        (9),
+    Avg           (10),
+    Task          (11),
+    Shop          (12),
+    Advertise     (13);
+
+    @Getter
+    private final int value;
+    private final static Int2ObjectMap<ActivityType> map = new Int2ObjectOpenHashMap<>();
+
+    static {
+        for (ActivityType type : ActivityType.values()) {
+            map.put(type.getValue(), type);
+        }
+    }
+
+    private ActivityType(int value) {
+        this.value = value;
+    }
+
+    public static ActivityType getByValue(int value) {
+        return map.get(value);
+    }
+}

src/main/java/emu/nebula/game/activity/GameActivity.java

@@ -0,0 +1,65 @@
+package emu.nebula.game.activity;
+
+import dev.morphia.annotations.Entity;
+import emu.nebula.Nebula;
+import emu.nebula.data.resources.ActivityDef;
+import emu.nebula.game.player.Player;
+import emu.nebula.proto.ActivityDetail.ActivityMsg;
+import emu.nebula.proto.Public.Activity;
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Entity(useDiscriminator = true)
+public abstract class GameActivity {
+    private int id;
+    
+    @Setter private transient ActivityManager manager;
+    @Setter private transient ActivityDef data;
+    
+    @Deprecated // Morhpia only
+    public GameActivity() {
+        
+    }
+    
+    public GameActivity(ActivityManager manager, ActivityDef data) {
+        this.id = data.getId();
+        this.manager = manager;
+        this.data = data;
+    }
+    
+    public Player getPlayer() {
+        return this.getManager().getPlayer();
+    }
+    
+    public void save() {
+        Nebula.getGameDatabase().update(
+            this.getManager(),
+            this.getManager().getPlayerUid(),
+            "activities." + this.getId(), 
+            this
+        );
+    }
+    
+    // Proto
+    
+    public Activity toProto() {
+        var proto = Activity.newInstance()
+                .setId(this.getId())
+                .setStartTime(1)
+                .setEndTime(Integer.MAX_VALUE);
+        
+        return proto;
+    }
+    
+    public ActivityMsg toMsgProto() {
+        var proto = ActivityMsg.newInstance()
+                .setId(this.getId());
+        
+        this.encodeActivityMsg(proto);
+        
+        return proto;
+    }
+    
+    public abstract void encodeActivityMsg(ActivityMsg msg);
+}

src/main/java/emu/nebula/game/activity/type/LevelsActivity.java

@@ -0,0 +1,209 @@
+package emu.nebula.game.activity.type;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
+import dev.morphia.annotations.Entity;
+
+import emu.nebula.GameConstants;
+import emu.nebula.data.GameData;
+import emu.nebula.data.resources.ActivityDef;
+import emu.nebula.data.resources.ActivityLevelsLevelDef;
+import emu.nebula.game.activity.ActivityManager;
+import emu.nebula.game.activity.GameActivity;
+import emu.nebula.game.instance.InstanceSettleData;
+import emu.nebula.game.inventory.ItemParamMap;
+import emu.nebula.game.player.PlayerChangeInfo;
+import emu.nebula.game.quest.QuestCondition;
+import emu.nebula.proto.ActivityDetail.ActivityMsg;
+import emu.nebula.proto.Public.ActivityLevel;
+
+import lombok.Getter;
+import lombok.Setter;
+
+@Getter
+@Entity
+public class LevelsActivity extends GameActivity {
+    private Map<Integer, ActivityLevelInfo> levels;
+    
+    // Apply level data
+    private transient ActivityLevelsLevelDef level;
+    private transient long buildId;
+    
+    @Deprecated // Morphia only
+    public LevelsActivity() {
+        
+    }
+    
+    public LevelsActivity(ActivityManager manager, ActivityDef data) {
+        super(manager, data);
+        this.levels = new HashMap<>();
+    }
+
+    public boolean apply(int levelId, long buildId) {
+        // Verify level
+        var level = GameData.getActivityLevelsLevelDataTable().get(levelId);
+        
+        if (level == null || level.getActivityId() != this.getId()) {
+            return false;
+        }
+        
+        // Verify build
+        var build = this.getPlayer().getStarTowerManager().getBuildById(buildId);
+        
+        if (build == null) {
+            return false;
+        }
+        
+        // Set
+        this.level = level;
+        this.buildId = buildId;
+        
+        // Success
+        return true;
+    }
+    
+    public PlayerChangeInfo settle(int star) {
+        // Check energy
+        if (!this.getLevel().hasEnergy(this.getPlayer(), 1)) {
+            return null;
+        }
+        
+        // Calculate settle data
+        var settleData = new InstanceSettleData();
+        
+        settleData.setWin(star > 0);
+        settleData.setFirst(settleData.isWin() && !this.getLevels().containsKey(this.getLevel().getId()));
+        
+        // Init player change info
+        var change = new PlayerChangeInfo();
+        
+        // Handle win
+        if (settleData.isWin()) {
+            // Calculate energy and exp
+            settleData.setExp(this.getLevel().getEnergyConsume());
+            getPlayer().consumeEnergy(settleData.getExp(), change);
+            
+            // Calculate rewards
+            settleData.generateRewards(this.getLevel());
+            
+            // Add to inventory
+            getPlayer().getInventory().addItem(GameConstants.EXP_ITEM_ID, settleData.getExp(), change);
+            getPlayer().getInventory().addItems(settleData.getRewards(), change);
+            getPlayer().getInventory().addItems(settleData.getFirstRewards(), change);
+            
+            // Log
+            var level = getLevels().computeIfAbsent(this.getLevel().getId(), i -> new ActivityLevelInfo());
+            
+            level.setStar(star);
+            level.setBuildId(this.getBuildId());
+            
+            // Save to database
+            this.save();
+            
+            // Quest triggers
+            this.getPlayer().trigger(QuestCondition.BattleTotal, 1);
+        }
+        
+        // Set extra data
+        change.setExtraData(settleData);
+        
+        // Success
+        return change;
+    }
+
+    public PlayerChangeInfo sweep(ActivityLevelsLevelDef data, int count) {
+        // Sanity check count
+        if (count <= 0) {
+            return null;
+        }
+        
+        // Check if we have 3 starred this instance
+        var level = this.getLevels().get(data.getId());
+        
+        if (level == null || level.getStar() != 3) {
+            return null;
+        }
+        
+        // Check energy cost
+        int energyCost = data.getEnergyConsume() * count;
+        
+        if (this.getPlayer().getEnergy() < energyCost) {
+            return null;
+        }
+        
+        // Init variables
+        var change = new PlayerChangeInfo();
+        var list = new ArrayList<ItemParamMap>();
+        
+        // Consume exp
+        getPlayer().consumeEnergy(energyCost, change);
+        getPlayer().getInventory().addItem(GameConstants.EXP_ITEM_ID, energyCost, change);
+        
+        // Calculate total rewards
+        var totalRewards = new ItemParamMap();
+        
+        for (int i = 0; i < count; i++) {
+            // Generate rewards for each settle count
+            var rewards = data.getRewards().generate();
+            
+            // Add to reward list
+            list.add(rewards);
+            
+            // Add to total rewards
+            totalRewards.add(rewards);
+        }
+        
+        // Add total rewards to inventory
+        getPlayer().getInventory().addItems(totalRewards, change);
+        
+        // Set reward list in change info so we can serialize it in the response proto later
+        change.setExtraData(list);
+        
+        // Quest triggers
+        this.getPlayer().trigger(QuestCondition.BattleTotal, count);
+        
+        // Success
+        return change.setSuccess(true);
+    }
+    
+    // Proto
+
+    @Override
+    public void encodeActivityMsg(ActivityMsg msg) {
+        var proto = msg.getMutableLevels();
+        
+        for (var entry : this.getLevels().entrySet()) {
+            int id = entry.getKey();
+            var level = entry.getValue();
+            
+            var info = level.toProto()
+                    .setId(id);
+            
+            proto.addLevels(info);
+        }
+    }
+
+    @Setter
+    @Getter
+    @Entity(useDiscriminator = false)
+    public static class ActivityLevelInfo {
+        private int star;
+        private long buildId;
+        
+        public ActivityLevelInfo() {
+            
+        }
+        
+        // Proto
+        
+        public ActivityLevel toProto() {
+            var proto = ActivityLevel.newInstance()
+                    .setStar(this.getStar())
+                    .setBuildId(this.getBuildId());
+            
+            return proto;
+        }
+    }
+}

src/main/java/emu/nebula/game/activity/type/ShopActivity.java

@@ -0,0 +1,152 @@
+package emu.nebula.game.activity.type;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import dev.morphia.annotations.Entity;
+
+import emu.nebula.data.GameData;
+import emu.nebula.data.resources.ActivityDef;
+import emu.nebula.data.resources.ActivityShopControlDef;
+import emu.nebula.data.resources.ActivityShopDef;
+import emu.nebula.game.activity.ActivityManager;
+import emu.nebula.game.activity.GameActivity;
+import emu.nebula.game.inventory.ItemParamMap;
+import emu.nebula.game.player.PlayerChangeInfo;
+import emu.nebula.proto.ActivityDetail.ActivityMsg;
+import emu.nebula.proto.Public.BoughtGoods;
+import emu.nebula.proto.Public.ResidentShop;
+
+import lombok.Getter;
+
+@Getter
+@Entity
+public class ShopActivity extends GameActivity {
+    private Map<Integer, ActivityShopInfo> shops;
+    
+    @Deprecated // Morphia only
+    public ShopActivity() {
+        
+    }
+    
+    public ShopActivity(ActivityManager manager, ActivityDef data) {
+        super(manager, data);
+        this.shops = new HashMap<>();
+        
+        // Load shops
+        var control = GameData.getActivityShopControlDataTable().get(data.getId());
+        if (control != null) {
+            this.initShops(control);
+        }
+    }
+    
+    private void initShops(ActivityShopControlDef control) {
+        for (int id : control.getShopIds()) {
+            var data = GameData.getActivityShopDataTable().get(id);
+            if (data == null) {
+                continue;
+            }
+            
+            // Create resident shop
+            var shop = new ActivityShopInfo(data);
+            
+            // Add
+            this.getShops().put(data.getId(), shop);
+        }
+    }
+
+    public PlayerChangeInfo buy(int shopId, int goodsId, int count) {
+        // Get shop
+        var shop = this.getShops().get(shopId);
+        if (shop == null) return null;
+        
+        // Get shop data
+        var data = GameData.getActivityShopDataTable().get(shopId);
+        if (data == null) return null;
+        
+        // Get goods
+        var goods = data.getGoods().get(goodsId);
+        if (goods == null) return null;
+        
+        // Check limit
+        if (goods.getMaximumLimit() > 0) {
+            var limit = goods.getMaximumLimit() - shop.getBoughtCount(goodsId);
+            
+            if (count > limit) {
+                return null;
+            }
+        }
+        
+        // Purchase
+        var change = getPlayer().getInventory().buyItem(data.getCurrencyItemId(), goods.getPrice(), goods.getItems(), count);
+        
+        // Purchase failed
+        if (change == null) {
+            return null;
+        }
+        
+        // Set log
+        shop.getBoughtGoods().add(goodsId, count);
+        
+        // Save
+        this.save();
+        
+        // Set extra data
+        change.setExtraData(shop);
+        
+        // Success
+        return change;
+    }
+
+    // Proto
+
+    @Override
+    public void encodeActivityMsg(ActivityMsg msg) {
+        var proto = msg.getMutableShop();
+        
+        for (var entry : this.getShops().entrySet()) {
+            var id = entry.getKey();
+            var shop = entry.getValue();
+            
+            var info = shop.toProto()
+                    .setId(id);
+            
+            proto.addShops(info);
+        }
+    }
+
+    @Getter
+    @Entity(useDiscriminator = false)
+    public static class ActivityShopInfo {
+        private ItemParamMap boughtGoods;
+        
+        @Deprecated // Morphia only
+        public ActivityShopInfo() {
+            
+        }
+        
+        public ActivityShopInfo(ActivityShopDef data) {
+            this.boughtGoods = new ItemParamMap();
+        }
+        
+        public int getBoughtCount(int goodsId) {
+            return this.getBoughtGoods().get(goodsId);
+        }
+        
+        // Proto
+
+        public ResidentShop toProto() {
+            var proto = ResidentShop.newInstance();
+            
+            for (var item : this.getBoughtGoods().int2IntEntrySet()) {
+                var info = BoughtGoods.newInstance()
+                        .setId(item.getIntKey())
+                        .setNumber(item.getIntValue());
+                
+                proto.addInfos(info);
+            }
+            
+            return proto;
+        }
+    }
+}

src/main/java/emu/nebula/game/activity/type/TaskActivity.java

@@ -0,0 +1,72 @@
+package emu.nebula.game.activity.type;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import dev.morphia.annotations.Entity;
+import emu.nebula.data.GameData;
+import emu.nebula.data.resources.ActivityDef;
+import emu.nebula.game.activity.ActivityManager;
+import emu.nebula.game.activity.ActivityTaskQuest;
+import emu.nebula.game.activity.GameActivity;
+import emu.nebula.proto.ActivityDetail.ActivityMsg;
+
+import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
+
+import lombok.Getter;
+
+@Getter
+@Entity
+public class TaskActivity extends GameActivity {
+    private Map<Integer, ActivityTaskQuest> quests;
+    private IntSet completedGroups;
+    
+    @Deprecated // Morphia only
+    public TaskActivity() {
+        
+    }
+    
+    public TaskActivity(ActivityManager manager, ActivityDef data) {
+        super(manager, data);
+        this.quests = new HashMap<>();
+        this.completedGroups = new IntOpenHashSet();
+        
+        var groupSet = new IntOpenHashSet();
+        for (var group : GameData.getActivityTaskGroupDataTable()) {
+            if (group.getActivityId() != this.getId()) {
+                continue;
+            }
+            
+            groupSet.add(group.getId());
+        }
+        
+        for (var task : GameData.getActivityTaskDataTable()) {
+            if (!groupSet.contains(task.getActivityTaskGroupId())) {
+                continue;
+            }
+            
+            var quest = new ActivityTaskQuest(task);
+            
+            this.getQuests().put(quest.getId(), quest);
+        }
+    }
+    
+    // Proto
+
+    @Override
+    public void encodeActivityMsg(ActivityMsg msg) {
+        var proto = msg.getMutableTask();
+        
+        for (int id : this.getCompletedGroups()) {
+            proto.addGroupIds(id);
+        }
+        
+        var tasks = proto.getMutableActivityTasks();
+        
+        for (var quest : this.getQuests().values()) {
+            tasks.addList(quest.toProto());
+        }
+    }
+
+}

src/main/java/emu/nebula/game/activity/type/TowerDefenseActivity.java

@@ -0,0 +1,104 @@
+package emu.nebula.game.activity.type;
+
+import dev.morphia.annotations.Entity;
+
+import emu.nebula.data.GameData;
+import emu.nebula.data.resources.ActivityDef;
+import emu.nebula.game.activity.ActivityManager;
+import emu.nebula.game.activity.GameActivity;
+import emu.nebula.game.player.PlayerChangeInfo;
+import emu.nebula.proto.ActivityDetail.ActivityMsg;
+import emu.nebula.proto.Public.ActivityQuest;
+import emu.nebula.proto.Public.ActivityTowerDefenseLevel;
+
+import it.unimi.dsi.fastutil.ints.Int2IntMap;
+import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
+import lombok.Getter;
+
+@Getter
+@Entity
+public class TowerDefenseActivity extends GameActivity {
+    private Int2IntMap completedStages;
+    private Int2IntMap completedQuests;
+    
+    @Deprecated // Morphia only
+    public TowerDefenseActivity() {
+        
+    }
+    
+    public TowerDefenseActivity(ActivityManager manager, ActivityDef data) {
+        super(manager, data);
+        this.completedStages = new Int2IntOpenHashMap();
+        this.completedQuests = new Int2IntOpenHashMap();
+    }
+
+    public PlayerChangeInfo claimReward(int level) {
+        // Get rewards
+        var rewards = GameData.getTowerDefenseLevelDataTable().get(level).getRewards();
+
+        // Add rewards
+        return getPlayer().getInventory().addItems(rewards);
+    }
+    
+    // public PlayerChangeInfo claimReward(int groupId) {
+    //     // Create change info
+    //     var change = new PlayerChangeInfo();
+        
+    //     // Make sure we haven't completed this group yet
+    //     if (this.getCompleted().contains(groupId)) {
+    //         return change;
+    //     }
+        
+    //     // Get trial control
+    //     var control = GameData.getTrialControlDataTable().get(this.getId());
+    //     if (control == null) return change;
+        
+    //     // Get group
+    //     var group = GameData.getTrialGroupDataTable().get(groupId);
+    //     if (group == null) return change;
+        
+    //     // Set as completed
+    //     this.getCompleted().add(groupId);
+        
+    //     // Save to database
+    //     this.save();
+        
+    //     // Add rewards
+    //     return getPlayer().getInventory().addItems(group.getRewards(), change);
+    // }
+    
+    // Proto
+
+    @Override
+    public void encodeActivityMsg(ActivityMsg msg) {
+        var proto = msg.getMutableTowerDefense();
+
+        // Add completed stages
+        for (int id : this.completedStages.keySet()) {
+            // Create proto
+            var level = ActivityTowerDefenseLevel.newInstance();
+
+            // Set proto params
+            level.setId(id);
+            level.setStar(this.completedStages.get(id));
+
+            // Add to final msg proto
+            proto.addLevels(level);
+        }
+
+        // Add completed quests
+        for (int id : this.completedStages.keySet()) {
+            // Create proto
+            var quest = ActivityQuest.newInstance();
+
+            // Set proto params
+            quest.setActivityId(this.getId());
+            quest.setId(id);
+            quest.setStatus(2);     // TODO: properly handle event quests
+
+            // Add to final msg proto
+            proto.addQuests(quest);
+        }
+    }
+
+}

src/main/java/emu/nebula/game/activity/type/TrialActivity.java

@@ -0,0 +1,67 @@
+package emu.nebula.game.activity.type;
+
+import dev.morphia.annotations.Entity;
+import emu.nebula.data.GameData;
+import emu.nebula.data.resources.ActivityDef;
+import emu.nebula.game.activity.ActivityManager;
+import emu.nebula.game.activity.GameActivity;
+import emu.nebula.game.player.PlayerChangeInfo;
+import emu.nebula.proto.ActivityDetail.ActivityMsg;
+import it.unimi.dsi.fastutil.ints.IntArrayList;
+import it.unimi.dsi.fastutil.ints.IntList;
+import lombok.Getter;
+
+@Getter
+@Entity
+public class TrialActivity extends GameActivity {
+    private IntList completed;
+    
+    @Deprecated // Morphia only
+    public TrialActivity() {
+        
+    }
+    
+    public TrialActivity(ActivityManager manager, ActivityDef data) {
+        super(manager, data);
+        this.completed = new IntArrayList();
+    }
+    
+    public PlayerChangeInfo claimReward(int groupId) {
+        // Create change info
+        var change = new PlayerChangeInfo();
+        
+        // Make sure we haven't completed this group yet
+        if (this.getCompleted().contains(groupId)) {
+            return change;
+        }
+        
+        // Get trial control
+        var control = GameData.getTrialControlDataTable().get(this.getId());
+        if (control == null) return change;
+        
+        // Get group
+        var group = GameData.getTrialGroupDataTable().get(groupId);
+        if (group == null) return change;
+        
+        // Set as completed
+        this.getCompleted().add(groupId);
+        
+        // Save to database
+        this.save();
+        
+        // Add rewards
+        return getPlayer().getInventory().addItems(group.getRewards(), change);
+    }
+    
+    // Proto
+
+    @Override
+    public void encodeActivityMsg(ActivityMsg msg) {
+        var proto = msg.getMutableTrial();
+        
+        for (int id : this.getCompleted()) {
+            proto.addCompletedGroupIds(id);
+        }
+    }
+
+}

src/main/java/emu/nebula/game/agent/AgentManager.java

@@ -8,10 +8,12 @@ import dev.morphia.annotations.Entity;
 import dev.morphia.annotations.Id;
 import emu.nebula.data.GameData;
 import emu.nebula.database.GameDatabaseObject;
+import emu.nebula.game.achievement.AchievementCondition;
+import emu.nebula.game.character.GameCharacter;
 import emu.nebula.game.player.Player;
 import emu.nebula.game.player.PlayerChangeInfo;
 import emu.nebula.game.player.PlayerManager;
-import emu.nebula.game.quest.QuestCondType;
+import emu.nebula.game.quest.QuestCondition;
 import lombok.Getter;
 import us.hebi.quickbuf.RepeatedInt;
 
@@ -58,13 +60,23 @@ public class AgentManager extends PlayerManager implements GameDatabaseObject {
         }
         
         // Make sure we own the characters
+        var characters = new ArrayList<GameCharacter>();
+        
         for (int charId : charIds) {
-            if (!getPlayer().getCharacters().hasCharacter(charId)) {
+            var character = getPlayer().getCharacters().getCharacterById(charId);
+            
+            // Also check if character fits the commission level requirement
+            if (character == null || character.getLevel() < data.getLevel()) {
                 return null;
             }
+            
+            characters.add(character);
         }
         
-        // TODO verify char tags for rewards
+        // Check char tags
+        if (!data.hasTags(characters)) {
+            return null;
+        }
         
         // Create agent
         var agent = new Agent(data, processTime, charIds.toArray());
@@ -73,7 +85,7 @@ public class AgentManager extends PlayerManager implements GameDatabaseObject {
         this.getAgents().put(agent.getId(), agent);
         
         // Quest
-        this.getPlayer().triggerQuest(QuestCondType.AgentApplyTotal, 1);
+        this.getPlayer().trigger(QuestCondition.AgentApplyTotal, 1);
         
         // Success
         return agent;
@@ -139,12 +151,30 @@ public class AgentManager extends PlayerManager implements GameDatabaseObject {
                 continue;
             }
             
-            // Create rewards
-            var rewards = duration.getRewards().generate();
-            result.setRewards(rewards);
+            // Check if we had extra tags
+            var characters = new ArrayList<GameCharacter>();
             
-            // Add to inventory
-            this.getPlayer().getInventory().addItems(rewards, change);
+            for (int charId : agent.getCharIds()) {
+                var character = getPlayer().getCharacters().getCharacterById(charId);
+                if (character == null) continue;
+                
+                characters.add(character);
+            }
+            
+            // Create rewards
+            result.setRewards(duration.getRewards().generate());
+            
+            // Add rewards to inventory
+            this.getPlayer().getInventory().addItems(result.getRewards(), change);
+            
+            // Add bonus rewards if we meet the requirements
+            if (data.hasExtraTags(characters)) {
+                // Get bonus rewards
+                result.setBonus(duration.getBonus().generate());
+                
+                // Add rewards to inventory
+                this.getPlayer().getInventory().addItems(result.getBonus(), change);
+            }
         }
         
         // Set results in change info
@@ -153,8 +183,9 @@ public class AgentManager extends PlayerManager implements GameDatabaseObject {
         // Save to database
         this.save();
         
-        // Quest
-        this.getPlayer().triggerQuest(QuestCondType.AgentFinishTotal, list.size());
+        // Quest + Achievements
+        getPlayer().trigger(QuestCondition.AgentFinishTotal, list.size());
+        getPlayer().trigger(AchievementCondition.AgentWithSpecificFinishTotal, list.size());
         
         // Success
         return change.setSuccess(true);

src/main/java/emu/nebula/game/ban/BanInfo.java

@@ -0,0 +1,63 @@
+package emu.nebula.game.ban;
+
+import dev.morphia.annotations.Entity;
+import dev.morphia.annotations.Id;
+import emu.nebula.database.GameDatabaseObject;
+import emu.nebula.game.player.PlayerErrorCode;
+import emu.nebula.proto.Public.Error;
+import emu.nebula.util.Utils;
+import lombok.Getter;
+
+@Getter
+@Entity(value = "bans", useDiscriminator = false)
+public class BanInfo implements GameDatabaseObject {
+    @Id
+    private String id;
+    
+    private int playerUid;
+    private long startTime;
+    private long endTime;
+    private String reason;
+    private String bannedBy;
+    private String ipAddress;
+
+    @Deprecated // Morphia only
+    public BanInfo() {
+    }
+    
+    public BanInfo(int playerUid, long endTime, String reason, String bannedBy, String ipAddress) {
+        this.playerUid = playerUid;
+        this.startTime = System.currentTimeMillis();
+        this.endTime = endTime;
+        this.reason = reason;
+        this.bannedBy = bannedBy;
+        this.ipAddress = ipAddress;
+        // Generate ID based on either player UID or IP address
+        this.id = (ipAddress != null && !ipAddress.isEmpty() && playerUid == 0) ? "ip_" + ipAddress :
+                "player_" + playerUid;
+    }
+    
+    public boolean isExpired() {
+        return endTime != 0 && endTime < System.currentTimeMillis();
+    }
+    
+    public String getExpirationDateString() {
+        if (endTime == 0) {
+            return "Never";
+        }
+        return Utils.formatTimestamp(this.endTime);
+    }
+    
+    @Override
+    public void save() {
+        GameDatabaseObject.super.save();
+    }
+
+    public Error toProto() {
+        return Error.newInstance()
+                .setCode(PlayerErrorCode.ErrBan.getValue())
+                .addArguments(
+                        getExpirationDateString() + "\n" +
+                                (this.reason != null ? "\n (" + this.reason + ")" : "\n" + this.id));
+    }
+}

src/main/java/emu/nebula/game/ban/BanModule.java

@@ -0,0 +1,242 @@
+package emu.nebula.game.ban;
+
+import emu.nebula.Nebula;
+import emu.nebula.game.player.Player;
+import emu.nebula.game.GameContext;
+import emu.nebula.game.GameContextModule;
+
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+public class BanModule extends GameContextModule {
+    private final Map<String, BanInfo> cachedIpBans = new ConcurrentHashMap<>();
+    private final Map<Integer, BanInfo> cachedPlayerBans = new ConcurrentHashMap<>();
+    
+    public BanModule(GameContext context) {
+        super(context);
+    }
+    
+    /**
+     * Ban a player by UID
+     * @param uid Player UID
+     * @param endTime Ban expiration time (0 = permanent)
+     * @param isBanIp Ban Ip
+     * @param reason Ban reason
+     * @param bannedBy Who banned the player
+     */
+    public void banPlayer(int uid, long endTime, String reason, boolean isBanIp, String bannedBy) {
+        Player player = getGameContext().getPlayerModule().getPlayer(uid);
+
+        // It is only used as a supplement to find the banned IP when unblocking a player
+        String playerBindIp = null;
+
+        if (isBanIp) {
+            if (player != null && player.getSession() != null) {
+                String ipAddress = player.getSession().getIpAddress();
+                if (ipAddress != null && !ipAddress.isEmpty()) {
+                    playerBindIp = ipAddress;
+                    banIp(ipAddress, endTime, reason, bannedBy);
+                }
+            }
+        }
+
+        BanInfo banInfo = new BanInfo(uid, endTime, reason, bannedBy, playerBindIp);
+        cachedPlayerBans.put(uid, banInfo);
+        banInfo.save();
+
+        // Kick player
+        if (player != null && player.isLoaded()) {
+            player.setSession(null);
+        }
+    }
+
+    /**
+     * Ban an IP address
+     * <p>
+     * Please be cautious about disabling IPs
+     * in some regions where IPs are scarce, many people may share a public IP
+     * and restarting the optical cat device will reassign a new IP
+     *
+     * @param ipAddress IP address to ban
+     * @param endTime Ban expiration time (0 = permanent)
+     * @param reason Ban reason
+     * @param bannedBy Who banned the IP
+     */
+    public void banIp(String ipAddress, long endTime, String reason, String bannedBy) {
+        BanInfo banInfo = new BanInfo(0, endTime, reason, bannedBy, ipAddress);
+        cachedIpBans.put(ipAddress, banInfo);
+        banInfo.save();
+
+        List<Player> playerList = Nebula.getGameContext().getPlayerModule().getCachedPlayers()
+                .values().stream().toList();
+
+        String playerIpAddress;
+        for (Player player : playerList) {
+            playerIpAddress = player.getSession().getIpAddress();
+            if (playerIpAddress == null) {
+                return;
+            }
+
+            // Kick player
+            if (playerIpAddress.equals(ipAddress)) {
+                player.setSession(null);
+            }
+        }
+    }
+
+    /**
+     * Unban a player
+     * @param uid Player UID
+     */
+    public void unbanPlayer(int uid) {
+        BanInfo banInfo = cachedPlayerBans.remove(uid);
+        if (banInfo == null) {
+            banInfo = getPlayerBanInfo(uid);
+        }
+
+        if (banInfo == null) {
+            return;
+        }
+
+        deleteBan(banInfo);
+    }
+    
+    /**
+     * Unban an IP address
+     * @param ipAddress IP address to unban
+     */
+    public void unbanIp(String ipAddress) {
+        BanInfo banInfo = cachedIpBans.remove(ipAddress);
+        if (banInfo == null) {
+            banInfo = getIpBanInfo(ipAddress);
+        }
+
+        if (banInfo == null) {
+            return;
+        }
+
+        deleteBan(banInfo);
+    }
+    
+    /**
+     * Check if a player is banned
+     * @param uid Player UID
+     * @return True if banned, false otherwise
+     */
+    public boolean isPlayerBanned(int uid) {
+        BanInfo banInfo = cachedPlayerBans.get(uid);
+        if (banInfo == null) {
+            banInfo = loadPlayerBanFromDatabase(uid);
+            if (banInfo == null) {
+                return false;
+            }
+            cachedPlayerBans.put(uid, banInfo);
+        }
+        
+        // Check if ban has expired
+        if (banInfo.isExpired()) {
+            unbanPlayer(uid);
+            return false;
+        }
+        
+        return true;
+    }
+    
+    /**
+     * Check if an IP address is banned
+     * @param ipAddress IP address
+     * @return True if banned, false otherwise
+     */
+    public boolean isIpBanned(String ipAddress) {
+        BanInfo banInfo = cachedIpBans.get(ipAddress);
+        if (banInfo == null) {
+            banInfo = loadIpBanFromDatabase(ipAddress);
+            if (banInfo == null) {
+                return false;
+            }
+            cachedIpBans.put(ipAddress, banInfo);
+        }
+        
+        // Check if ban has expired
+        if (banInfo.isExpired()) {
+            unbanIp(ipAddress);
+            return false;
+        }
+        
+        return true;
+    }
+    
+    /**
+     * Get ban info for a player
+     * @param uid Player UID
+     * @return BanInfo or null if not banned
+     */
+    public BanInfo getPlayerBanInfo(int uid) {
+        BanInfo banInfo = cachedPlayerBans.get(uid);
+        if (banInfo == null) {
+            banInfo = loadPlayerBanFromDatabase(uid);
+            if (banInfo != null) {
+                cachedPlayerBans.put(uid, banInfo);
+            }
+        }
+        return banInfo;
+    }
+    
+    /**
+     * Get ban info for an IP
+     * @param ipAddress IP address
+     * @return BanInfo or null if not banned
+     */
+    public BanInfo getIpBanInfo(String ipAddress) {
+        BanInfo banInfo = cachedIpBans.get(ipAddress);
+        if (banInfo == null) {
+            banInfo = loadIpBanFromDatabase(ipAddress);
+            if (banInfo != null) {
+                cachedIpBans.put(ipAddress, banInfo);
+            }
+        }
+        return banInfo;
+    }
+    
+    /**
+     * Delete ban from database
+     */
+    private void deleteBan(BanInfo banInfo) {
+        try {
+            Nebula.getGameDatabase().delete(banInfo);
+        } catch (Exception e) {
+            Nebula.getLogger().error("Failed to delete ban info from database", e);
+        }
+    }
+    
+    /**
+     * Load player ban from database
+     */
+    private BanInfo loadPlayerBanFromDatabase(int uid) {
+        if (uid == 0)
+            return null;
+
+        try {
+            return Nebula.getGameDatabase().getObjectByField(BanInfo.class, "playerUid", uid);
+        } catch (Exception e) {
+            Nebula.getLogger().error("Failed to load player ban from database", e);
+        }
+        return null;
+    }
+    
+    /**
+     * Load IP ban from database
+     */
+    private BanInfo loadIpBanFromDatabase(String ipAddress) {
+        if (ipAddress == null || ipAddress.isEmpty())
+            return null;
+
+        try {
+            return Nebula.getGameDatabase().getObjectByField(BanInfo.class, "ipAddress", ipAddress);
+        } catch (Exception e) {
+            Nebula.getLogger().error("Failed to load IP ban from database", e);
+        }
+        return null;
+    }
+}

src/main/java/emu/nebula/game/battlepass/BattlePass.java

@@ -16,7 +16,6 @@ import emu.nebula.game.inventory.ItemParamMap;
 import emu.nebula.game.player.Player;
 import emu.nebula.game.player.PlayerChangeInfo;
 import emu.nebula.game.quest.GameQuest;
-import emu.nebula.game.quest.QuestCondType;
 import emu.nebula.game.quest.QuestType;
 import emu.nebula.net.NetMsgId;
 import emu.nebula.proto.BattlePassInfoOuterClass.BattlePassInfo;
@@ -31,7 +30,7 @@ public class BattlePass implements GameDatabaseObject {
     private int uid;
     private transient BattlePassManager manager;
     
-    private int battlePassId;
+    private int battlePassId; // Season id
     private int mode;
     private int level;
     private int exp;
@@ -72,6 +71,13 @@ public class BattlePass implements GameDatabaseObject {
         return manager.getPlayer();
     }
     
+    /**
+     * Sets the mode directly
+     */
+    public synchronized void setMode(int mode) {
+        this.mode = mode;
+    }
+    
     public boolean isPremium() {
         return this.mode > 0;
     }
@@ -80,6 +86,14 @@ public class BattlePass implements GameDatabaseObject {
         return GameData.getBattlePassRewardDataTable().get((this.getBattlePassId() << 16) + level);
     }
     
+    /**
+     * Sets the level directly, use getMaxExp() instead if adding exp.
+     */
+    public synchronized void setLevel(int level) {
+        this.level = level;
+        this.exp = 0;
+    }
+    
     public int getMaxExp() {
         var data = GameData.getBattlePassLevelDataTable().get(this.getLevel() + 1);
         return data != null ? data.getExp() : 0; 
@@ -101,6 +115,32 @@ public class BattlePass implements GameDatabaseObject {
         }
     }
     
+    /**
+     * Returns true if any rewards or quests are claimable
+     */
+    public synchronized boolean hasNew() {
+        // Check if any quests are complete but unclaimed
+        for (var quest : getQuests().values()) {
+            if (quest.isComplete() && !quest.isClaimed()) {
+                return true;
+            }
+        }
+        
+        // Check if we have any pending rewards
+        for (int i = 1; i <= this.getLevel(); i++) {
+            if (!this.getBasicReward().isSet(i)) {
+                return true;
+            }
+            
+            if (this.isPremium() && !this.getPremiumReward().isSet(i)) {
+                return true;
+            }
+        }
+        
+        // No claimable things
+        return false;
+    }
+    
     public synchronized void resetDailyQuests(boolean resetWeekly) {
         // Reset daily quests
         for (var data : GameData.getBattlePassQuestDataTable()) {
@@ -119,14 +159,19 @@ public class BattlePass implements GameDatabaseObject {
             this.syncQuest(quest);
         }
         
+        // Reset weekly limit for exp
+        if (resetWeekly) {
+            this.expWeek = 0;
+        }
+        
         // Persist to database
         this.save();
     }
     
-    public synchronized void trigger(QuestCondType condition, int progress, int param) {
+    public synchronized void trigger(int condition, int progress, int param1, int param2) {
         for (var quest : getQuests().values()) {
             // Try to trigger quest
-            boolean result = quest.trigger(condition, progress, param);
+            boolean result = quest.trigger(condition, progress, param1, param2);
             
             // Skip if quest progress wasn't changed
             if (!result) {

src/main/java/emu/nebula/game/battlepass/BattlePassManager.java

@@ -12,6 +12,10 @@ public class BattlePassManager extends PlayerManager {
     public BattlePassManager(Player player) {
         super(player);
     }
+
+    public boolean hasNew() {
+        return this.getBattlePass().hasNew();
+    }
     
     // Database
     

src/main/java/emu/nebula/game/character/CharacterContact.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import dev.morphia.annotations.Entity;
 import emu.nebula.Nebula;
 import emu.nebula.data.resources.ChatDef;
+import emu.nebula.game.achievement.AchievementCondition;
 import emu.nebula.game.player.PlayerChangeInfo;
 import emu.nebula.net.NetMsgId;
 import emu.nebula.proto.Public.Contacts;
@@ -125,6 +126,9 @@ public class CharacterContact {
             );
         }
         
+        // Trigger quest/achievement
+        this.getCharacter().getPlayer().trigger(AchievementCondition.ChatTotal, 1);
+        
         // Success
         return change.setSuccess(true);
     }

src/main/java/emu/nebula/game/character/CharacterStorage.java

@@ -8,19 +8,29 @@ import emu.nebula.data.GameData;
 import emu.nebula.data.resources.CharacterDef;
 import emu.nebula.data.resources.DiscDef;
 import emu.nebula.game.player.PlayerManager;
+import emu.nebula.net.NetMsgId;
 import emu.nebula.proto.Public.HandbookInfo;
 import emu.nebula.util.Bitset;
+import emu.nebula.game.achievement.AchievementCondition;
 import emu.nebula.game.player.Player;
 import emu.nebula.game.player.PlayerChangeInfo;
 import it.unimi.dsi.fastutil.ints.Int2ObjectMap;
 import it.unimi.dsi.fastutil.ints.Int2ObjectOpenHashMap;
 import lombok.Getter;
+import lombok.Setter;
 
 @Getter
 public class CharacterStorage extends PlayerManager {
     private final Int2ObjectMap<GameCharacter> characters;
     private final Int2ObjectMap<GameDisc> discs;
     
+    // Flags
+    @Setter private boolean hasAddedChar;
+    @Setter private boolean hasAddedDisc;
+    
+    @Setter private boolean updateCharHandbook;
+    @Setter private boolean updateDiscHandbook;
+    
     public CharacterStorage(Player player) {
         super(player);
         
@@ -48,15 +58,25 @@ public class CharacterStorage extends PlayerManager {
             return null;
         }
         
-        return this.addCharacter(GameData.getCharacterDataTable().get(charId));
+        // Get data
+        var data = GameData.getCharacterDataTable().get(charId);
+        if (data == null) return null;
+        
+        // Add character
+        return this.addCharacter(data);
     }
 
-    private GameCharacter addCharacter(CharacterDef data) {
+    public GameCharacter addCharacter(CharacterDef data) {
         // Sanity check to make sure we dont have this character already
         if (this.hasCharacter(data.getId())) {
             return null;
         }
         
+        // Prevent players from getting unavliable characters
+        if (!data.isAvailable()) {
+            return null;
+        }
+        
         // Create character
         var character = new GameCharacter(this.getPlayer(), data);
         
@@ -65,6 +85,12 @@ public class CharacterStorage extends PlayerManager {
         
         // Add to characters
         this.characters.put(character.getCharId(), character);
+        
+        // Set flags for player to update character skins in their handbook
+        this.setUpdateCharHandbook(true);
+        this.setHasAddedChar(true);
+        
+        // Return character
         return character;
     }
     
@@ -72,18 +98,6 @@ public class CharacterStorage extends PlayerManager {
         return this.getCharacters().values();
     }
     
-    public int getNewPhoneMessageCount() {
-        int count = 0;
-        
-        for (var character : this.getCharacterCollection()) {
-            if (character.getContact().hasNew()) {
-                count++;
-            }
-        }
-        
-        return count;
-    }
-    
     public HandbookInfo getCharacterHandbook() {
         var bitset = new Bitset();
         
@@ -123,15 +137,25 @@ public class CharacterStorage extends PlayerManager {
             return null;
         }
         
-        return this.addDisc(GameData.getDiscDataTable().get(discId));
+        // Get data
+        var data = GameData.getDiscDataTable().get(discId);
+        if (data == null) return null;
+        
+        // Add disc
+        return this.addDisc(data);
     }
 
-    private GameDisc addDisc(DiscDef data) {
-        // Sanity check to make sure we dont have this character already
+    public GameDisc addDisc(DiscDef data) {
+        // Sanity check to make sure we dont have this disc already
         if (this.hasDisc(data.getId())) {
             return null;
         }
         
+        // Prevent players from getting unavliable discs
+        if (!data.isAvailable()) {
+            return null;
+        }
+        
         // Create disc
         var disc = new GameDisc(this.getPlayer(), data);
         
@@ -140,6 +164,12 @@ public class CharacterStorage extends PlayerManager {
         
         // Add to discs
         this.discs.put(disc.getDiscId(), disc);
+        
+        // Set flags for player to update discs in their handbook
+        this.setUpdateDiscHandbook(true);
+        this.setHasAddedDisc(true);
+        
+        // Return disc
         return disc;
     }
     
@@ -205,6 +235,73 @@ public class CharacterStorage extends PlayerManager {
         return change.setExtraData(modifiedDiscs);
     }
     
+    // Contacts
+    
+    public int getNewPhoneMessageCount() {
+        int count = 0;
+        
+        for (var character : this.getCharacterCollection()) {
+            if (character.getContact().hasNew()) {
+                count++;
+            }
+        }
+        
+        return count;
+    }
+    
+    //
+
+    /**
+     * Checks if we should add next packages for player
+     */
+    public void checkPlayerState() {
+        // Check if we need to trigger character achievements
+        if (this.hasAddedChar) {
+            this.hasAddedChar = false;
+            this.getPlayer().trigger(
+                AchievementCondition.CharactersWithSpecificQuantityAndRarity,
+                getCharacters().size()
+            );
+            this.getPlayer().trigger(
+                AchievementCondition.CharactersWithSpecificQuantityAndRarity,
+                (int) getCharacters().values().stream().filter(GameCharacter::isMaster).count(),
+                1,
+                0
+            );
+        }
+        
+        // Check if we need to send handbook update to player
+        if (this.updateCharHandbook) {
+            this.updateCharHandbook = false;
+            this.getPlayer().addNextPackage(
+                NetMsgId.handbook_change_notify,
+                this.getPlayer().getCharacters().getCharacterHandbook());
+        }
+        
+        // Check if we need to trigger disc achievements
+        if (this.hasAddedChar) {
+            this.hasAddedChar = false;
+            this.getPlayer().trigger(
+                AchievementCondition.DiscAcquireSpecificQuantityAndRarity, 
+                this.getDiscs().size()
+            );
+            this.getPlayer().trigger(
+                AchievementCondition.DiscAcquireSpecificQuantityAndRarity,
+                (int) getDiscs().values().stream().filter(GameDisc::isMaster).count(),
+                1, 
+                0
+            );
+        }
+        
+        // Check if we need to send handbook update to player
+        if (this.updateDiscHandbook) {
+            this.updateDiscHandbook = false;
+            this.getPlayer().addNextPackage(
+                NetMsgId.handbook_change_notify,
+                this.getPlayer().getCharacters().getDiscHandbook());
+        }
+    }
+    
     // Database
     
     public void loadFromDatabase() {

src/main/java/emu/nebula/game/character/ElementType.java

@@ -7,10 +7,10 @@ import lombok.Getter;
 @Getter
 public enum ElementType {
     INHERIT     (0),
-    WIND        (1, 90020),
+    AQUA        (1, 90018),
     FIRE        (2, 90019),
     EARTH       (3, 90021),
-    AQUA        (4, 90018),
+    WIND        (4, 90020),
     LIGHT       (5, 90022),
     DARK        (6, 90023),
     NONE        (7);

src/main/java/emu/nebula/game/character/GameCharacter.java

@@ -18,23 +18,27 @@ import emu.nebula.data.GameData;
 import emu.nebula.data.resources.CharacterDef;
 import emu.nebula.data.resources.TalentGroupDef;
 import emu.nebula.database.GameDatabaseObject;
+import emu.nebula.game.achievement.AchievementCondition;
 import emu.nebula.game.inventory.ItemParamMap;
 import emu.nebula.game.player.Player;
 import emu.nebula.game.player.PlayerChangeInfo;
-import emu.nebula.game.quest.QuestCondType;
+import emu.nebula.game.quest.QuestCondition;
 import emu.nebula.net.NetMsgId;
 import emu.nebula.proto.Notify.Skin;
 import emu.nebula.proto.Notify.SkinChange;
+import emu.nebula.proto.Public.AffinityInfo;
 import emu.nebula.proto.Public.Char;
 import emu.nebula.proto.Public.CharGemPreset;
 import emu.nebula.proto.Public.CharGemSlot;
 import emu.nebula.proto.Public.UI32;
 import emu.nebula.proto.PublicStarTower.StarTowerChar;
 import emu.nebula.proto.PublicStarTower.StarTowerCharGem;
+import emu.nebula.server.error.ServerException;
 import emu.nebula.util.Bitset;
 import emu.nebula.util.CustomIntArray;
 import it.unimi.dsi.fastutil.ints.IntArrayList;
 import it.unimi.dsi.fastutil.ints.IntOpenHashSet;
+import it.unimi.dsi.fastutil.ints.IntSet;
 import lombok.Getter;
 import us.hebi.quickbuf.RepeatedInt;
 
@@ -53,9 +57,12 @@ public class GameCharacter implements GameDatabaseObject {
     private int advance;
     private int level;
     private int exp;
+    private int affinityLevel;
+    private int affinityExp;
     private int skin;
     private int[] skills;
     private Bitset talents;
+    private IntSet plots;
     private long createTime;
     
     private int gemPresetIndex;
@@ -112,6 +119,10 @@ public class GameCharacter implements GameDatabaseObject {
         }
     }
     
+    public boolean isMaster() {
+        return this.getData().getGrade() == 1;
+    }
+    
     public void setLevel(int level) {
         this.level = level;
     }
@@ -119,7 +130,12 @@ public class GameCharacter implements GameDatabaseObject {
     public void setAdvance(int advance) {
         this.advance = advance;
     }
-    
+
+    public void setAffinityLevel(int level) {
+        this.affinityLevel = Math.max(level, 0);
+        this.affinityExp = 0;
+    }
+
     public int getMaxGainableExp() {
         if (this.getLevel() >= this.getMaxLevel()) {
             return 0;
@@ -176,7 +192,7 @@ public class GameCharacter implements GameDatabaseObject {
         // Check if we leveled up
         if (this.level > oldLevel) {
             // Trigger quest
-            this.getPlayer().triggerQuest(QuestCondType.CharacterUpTotal, this.level - oldLevel);
+            this.getPlayer().trigger(QuestCondition.CharacterUpTotal, this.level - oldLevel);
         }
         
         // Save to database
@@ -245,7 +261,7 @@ public class GameCharacter implements GameDatabaseObject {
             // Set advance skin
             this.skin = this.getData().getAdvanceSkinId();
             
-            // Send packets
+            // Add next packages
             this.getPlayer().addNextPackage(
                 NetMsgId.character_skin_gain_notify, 
                 Skin.newInstance().setNew(UI32.newInstance().setValue(this.getSkin()))
@@ -254,11 +270,17 @@ public class GameCharacter implements GameDatabaseObject {
                 NetMsgId.character_skin_change_notify, 
                 SkinChange.newInstance().setCharId(this.getCharId()).setSkinId(this.getSkin())
             );
+            
+            // Set flag for player to update character skins in their handbook
+            this.getPlayer().getCharacters().setUpdateCharHandbook(true);
         }
         
         // Save to database
         this.save();
         
+        // Trigger quest/achievement
+        this.getPlayer().trigger(AchievementCondition.CharacterAdvanceTotal, 1);
+        
         // Success
         return changes.setSuccess(true);
     }
@@ -375,6 +397,121 @@ public class GameCharacter implements GameDatabaseObject {
         return true;
     }
     
+    // Affinity
+    
+    public int getMaxAffinityExp() {
+        var data = GameData.getAffinityLevelDataTable().get(this.affinityLevel + 1);
+        return data != null ? data.getNeedExp() : 0;
+    }
+    
+    public void addAffinityExp(int amount) {
+        // Setup
+        int expRequired = this.getMaxAffinityExp();
+
+        // Add exp
+        this.affinityExp += amount;
+
+        // Check for level ups
+        while (this.affinityExp >= expRequired && expRequired > 0) {
+            this.affinityLevel += 1;
+            this.affinityExp -= expRequired;
+            
+            expRequired = this.getMaxAffinityExp();
+        }
+        
+        // Clamp exp
+        if (expRequired <= 0) {
+            this.affinityExp = 0;
+        }
+        
+        // Save to database
+        this.save();
+    }
+
+    public PlayerChangeInfo sendGift(ItemParamMap items) {
+        // Verify that the player has the items
+        if (!this.getPlayer().getInventory().hasItems(items)) {
+            return null;
+        }
+        
+        // Caluclate amount of exp to gain
+        var charDescription = this.getData().getDes();
+        int exp = 0;
+        int count = 0;
+        
+        for (var item : items) {
+            // Get data
+            var gift = GameData.getAffinityGiftDataTable().get(item.getIntKey());
+            if (gift == null) {
+                return null;
+            }
+            
+            // Calculate amount
+            double amount = gift.getBaseAffinity() * item.getIntValue();
+            
+            if (charDescription.isPreferGift(gift)) {
+                amount = amount * 1.5D;
+            } else if (charDescription.isHateGift(gift)) {
+                amount = amount * 0.8D;
+            }
+            
+            // Add
+            exp += (int) amount;
+            count += item.getIntValue();
+        }
+        
+        // Sanity check
+        if (exp <= 0) {
+            return null;
+        }
+        
+        // Add affinity exp
+        this.addAffinityExp(exp);
+        
+        // Trigger quest/achievement
+        this.getPlayer().trigger(QuestCondition.GiftGiveTotal, count);
+        
+        // Remove items
+        var change = this.getPlayer().getInventory().removeItems(items);
+        
+        // Success
+        return change;
+    }
+    
+    public PlayerChangeInfo recvPlotReward(int plotId) {
+        // Create change info
+        var change = new PlayerChangeInfo();
+        
+        // Sanity check to prevent players from recving rewards over and over again from the same plot
+        if (this.getPlots() != null && this.getPlots().contains(plotId)) {
+            return change;
+        }
+        
+        // Get data
+        var plot = GameData.getPlotDataTable().get(plotId);
+        
+        // Sanity check to make sure we can complete this plot quest
+        if (plot == null || plot.getChar() != this.getCharId() || plot.getUnlockAffinityLevel() > this.getAffinityLevel()) {
+            return change;
+        }
+        
+        // Complete plot
+        if (this.plots == null) {
+            this.plots = new IntOpenHashSet();
+        }
+        
+        this.getPlots().add(plotId);
+        
+        // Update to database
+        this.save();
+        
+        // Add items
+        this.getPlayer().getInventory().addItems(plot.getRewards(), change);
+        
+        // Success
+        return change;
+    }
+    
     // Gems
     
     public boolean hasGemPreset(int index) {
@@ -524,16 +661,16 @@ public class GameCharacter implements GameDatabaseObject {
         return true;
     }
 
-    public synchronized PlayerChangeInfo generateGem(int slotId) {
+    public synchronized PlayerChangeInfo generateGem(int slotId) throws ServerException {
         // Get gem slot
         var slot = this.getGemSlot(slotId);
         if (slot == null) {
-            return null;
+            throw new ServerException(110105, "Emblem slot doesn't exist");
         }
         
         // Skip if slot is full
         if (slot.isFull()) {
-            return null;
+            throw new ServerException(110105, "Emblem slots are full");
         }
         
         // Get gem data
@@ -542,12 +679,12 @@ public class GameCharacter implements GameDatabaseObject {
         
         // Check character level
         if (this.getLevel() < gemControl.getUnlockLevel()) {
-            return null;
+            throw new ServerException(110105, "Trekker needs to be at least level " + gemControl.getUnlockLevel());
         }
         
         // Make sure the player has the materials to craft the emblem
         if (!getPlayer().getInventory().hasItem(gemData.getGenerateCostTid(), gemControl.getGeneratenCostQty())) {
-            return null;
+            throw new ServerException(119903);
         }
         
         // Generate attributes and create gem
@@ -571,10 +708,12 @@ public class GameCharacter implements GameDatabaseObject {
     }
     
     @SuppressWarnings("deprecation")
-    public synchronized PlayerChangeInfo refreshGem(int slotId, int gemIndex, RepeatedInt lockedAttributes) {
+    public synchronized PlayerChangeInfo refreshGem(int slotId, int gemIndex, RepeatedInt lockedAttributes) throws ServerException {
         // Get gem from slot
         var gem = this.getGemFromSlot(slotId, gemIndex);
-        if (gem == null) return null;
+        if (gem == null) {
+            throw new ServerException(111609);
+        }
         
         // Get gem data
         var gemData = this.getData().getCharGemData(slotId);
@@ -582,12 +721,12 @@ public class GameCharacter implements GameDatabaseObject {
         
         // Check character level
         if (this.getLevel() < gemControl.getUnlockLevel()) {
-            return null;
+            throw new ServerException(110105, "Trekker needs to be at least level " + gemControl.getUnlockLevel());
         }
         
         // Get locked attributes
         if (lockedAttributes.length() > gemControl.getLockableNum()) {
-            return null;
+            throw new ServerException(110105, "You can only lock up to " + gemControl.getLockableNum() + " attributes");
         }
         
         // Calculate the materials we need
@@ -659,6 +798,8 @@ public class GameCharacter implements GameDatabaseObject {
                 .setLevel(this.getLevel())
                 .setSkin(this.getSkin())
                 .setAdvance(this.getAdvance())
+                .setAffinityLevel(this.getAffinityLevel())
+                .setAffinityExp(this.getAffinityExp())
                 .setTalentNodes(this.getTalents().toByteArray())
                 .addAllSkillLvs(this.getSkills())
                 .setCreateTime(this.getCreateTime());
@@ -694,6 +835,12 @@ public class GameCharacter implements GameDatabaseObject {
         // Affinity quests
         proto.getMutableAffinityQuests();
         
+        // Encode plots
+        if (this.getPlots() != null) {
+            this.getPlots().forEach(proto::addPlots);
+        }
+        
+        // Finish
         return proto;
     }
     
@@ -702,6 +849,7 @@ public class GameCharacter implements GameDatabaseObject {
                 .setId(this.getCharId())
                 .setAdvance(this.getAdvance())
                 .setLevel(this.getLevel())
+                .setAffinityLevel(this.getAffinityLevel())
                 .setTalentNodes(this.getTalents().toByteArray())
                 .addAllSkillLvs(this.getSkills());
         
@@ -725,6 +873,15 @@ public class GameCharacter implements GameDatabaseObject {
         return proto;
     }
     
+    public AffinityInfo getAffinityProto() {
+        var proto = AffinityInfo.newInstance()
+                .setCharId(this.getCharId())
+                .setAffinityLevel(this.getAffinityLevel())
+                .setAffinityExp(this.getAffinityExp());
+        
+        return proto;
+    }
+    
     // Database fix
     
     @PreLoad

src/main/java/emu/nebula/game/character/GameDisc.java

@@ -11,10 +11,11 @@ import emu.nebula.data.GameData;
 import emu.nebula.data.resources.DiscDef;
 import emu.nebula.data.resources.SubNoteSkillPromoteGroupDef;
 import emu.nebula.database.GameDatabaseObject;
+import emu.nebula.game.achievement.AchievementCondition;
 import emu.nebula.game.inventory.ItemParamMap;
 import emu.nebula.game.player.Player;
 import emu.nebula.game.player.PlayerChangeInfo;
-import emu.nebula.game.quest.QuestCondType;
+import emu.nebula.game.quest.QuestCondition;
 import emu.nebula.proto.Public.Disc;
 import emu.nebula.proto.PublicStarTower.StarTowerDisc;
 
@@ -70,6 +71,10 @@ public class GameDisc implements GameDatabaseObject {
         }
     }
     
+    public boolean isMaster() {
+        return GameData.getItemDataTable().get(this.getDiscId()).getRarity() == 1;
+    }
+    
     public void setLevel(int level) {
         this.level = level;
     }
@@ -145,7 +150,7 @@ public class GameDisc implements GameDatabaseObject {
         // Check if we leveled up
         if (this.level > oldLevel) {
             // Trigger quest
-            this.getPlayer().triggerQuest(QuestCondType.DiscStrengthenTotal, this.level - oldLevel);
+            this.getPlayer().trigger(QuestCondition.DiscStrengthenTotal, this.level - oldLevel);
         }
         
         // Save to database
@@ -215,6 +220,9 @@ public class GameDisc implements GameDatabaseObject {
         // Save to database
         this.save();
         
+        // Trigger quest/achievement
+        this.getPlayer().trigger(AchievementCondition.DiscPromoteTotal, 1);
+        
         // Success
         return change.setSuccess(true);
     }
@@ -237,9 +245,11 @@ public class GameDisc implements GameDatabaseObject {
         // Remove items
         var change = this.getPlayer().getInventory().removeItems(materials, null);
         
-        // Add star
+        // Cache old star value
         int old = this.star;
-        this.star = Math.max(this.star + count, 5);
+        
+        // Add star
+        this.star = Math.min(this.star + count, 5);
         
         // Save to database if star count changed
         if (this.star != old) {