Handle more achievements

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

@@ -14,7 +14,7 @@ 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 isTotalAchievementSet = new IntOpenHashSet();
+    private static IntSet incrementalAchievementSet = new IntOpenHashSet();
     
     @Getter
     private static Int2ObjectMap<List<AchievementDef>> cache = new Int2ObjectOpenHashMap<>();
@@ -25,8 +25,8 @@ public class AchievementHelper {
     
     //
     
-    public static boolean isTotalAchievement(int condition) {
-        return isTotalAchievementSet.contains(condition);
+    public static boolean isIncrementalAchievement(int condition) {
+        return incrementalAchievementSet.contains(condition);
     }
     
     // Fix params
@@ -35,12 +35,14 @@ public class AchievementHelper {
         // Cache total achievements
         for (var condition : AchievementCondition.values()) {
             if (condition.name().endsWith("Total")) {
-                isTotalAchievementSet.add(condition.getValue());
+                incrementalAchievementSet.add(condition.getValue());
             }
         }
         
-        isTotalAchievementSet.add(AchievementCondition.ItemsAdd.getValue());
-        isTotalAchievementSet.add(AchievementCondition.ItemsDeplete.getValue());
+        incrementalAchievementSet.remove(AchievementCondition.AchievementTotal.getValue());
+        
+        incrementalAchievementSet.add(AchievementCondition.ItemsAdd.getValue());
+        incrementalAchievementSet.add(AchievementCondition.ItemsDeplete.getValue());
         
         // Fix params
         fixParams();
@@ -58,6 +60,33 @@ public class AchievementHelper {
         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
+        addParam(393, 1, 0);
+        addParam(394, 1, 0);
+        addParam(395, 1, 0);
+        addParam(396, 1, 0);
+        addParam(397, 1, 0);
+        addParam(398, 1, 0);
+        
+        // Disc count
+        addParam(382, 1, 0);
+        addParam(383, 1, 0);
+        addParam(384, 1, 0);
+        addParam(385, 1, 0);
+        addParam(386, 1, 0);
+        addParam(387, 1, 0);
     }
     
     private static void addParam(int achievementId, int param1, int param2) {

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

@@ -85,7 +85,7 @@ public class AchievementManager extends PlayerManager implements GameDatabaseObj
         // Parse events
         for (var event : events.getList()) {
             // Check id
-            if (event.getId() != 200) {
+            if (event.getId() != AchievementCondition.ClientReport.getValue()) {
                 continue;
             }
             
@@ -157,7 +157,7 @@ public class AchievementManager extends PlayerManager implements GameDatabaseObj
         }
         
         // Check what type of achievement condition this is
-        boolean isTotal = AchievementHelper.isTotalAchievement(condition);
+        boolean isTotal = AchievementHelper.isIncrementalAchievement(condition);
         boolean hasCompleted = false;
         
         // Parse achievements

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

@@ -75,11 +75,11 @@ public class GameAchievement {
         var data = this.getData();
         if (data == null) return false;
         
-        if ((data.hasParam1() || param1 != 0) && data.getParam1() != param1) {
+        if (data.hasParam1(param1) && data.getParam1() != param1) {
             return false;
         }
         
-        if ((data.hasParam2() || param2 != 0) && data.getParam2() != param2) {
+        if (data.hasParam2(param2) && data.getParam2() != param2) {
             return false;
         }