Sort custom sheet nations

xdnw · May 14, 2024 · 5b3659a · 5b3659a
1 parent cc5f337
commit 5b3659a
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/...main/java/link/locutus/discord/commands/manager/v2/impl/pw/filter/NationPlaceholders.java b/...main/java/link/locutus/discord/commands/manager/v2/impl/pw/filter/NationPlaceholders.java
@@ -68,6 +68,26 @@ public String getName(DBNation o) {
         return o.getName();
     }
 
+    @Override
+    public Set<DBNation> deserializeSelection(ValueStore store, String input) {
+        Set<DBNation> superSet = super.deserializeSelection(store, input);
+        List<Function<DBNation, Double>> sortCriteria = List.of(
+                n -> (double) n.getAlliance_id(),
+                n -> (double) n.getCities(),
+                n -> (double) n.getId()
+        );
+        return superSet.stream().sorted((n1, n2) -> {
+            for (Function<DBNation, Double> criteria : sortCriteria) {
+                double val1 = criteria.apply(n1);
+                double val2 = criteria.apply(n2);
+                if (val1 != val2) {
+                    return Double.compare(val1, val2);
+                }
+            }
+            return 0;
+        }).collect(Collectors.toCollection(LinkedHashSet::new));
+    }
+
     @NoFormat
     @Command(desc = "Add an alias for a selection of Nations")
     @RolePermission(value = {Roles.INTERNAL_AFFAIRS_STAFF, Roles.MILCOM, Roles.ECON_STAFF, Roles.FOREIGN_AFFAIRS_STAFF, Roles.ECON, Roles.FOREIGN_AFFAIRS}, any = true)

diff --git a/src/main/java/link/locutus/discord/util/task/ia/IACheckup.java b/src/main/java/link/locutus/discord/util/task/ia/IACheckup.java
@@ -857,7 +857,12 @@ public static Map.Entry<Object, String> checkProductionBonus(DBNation nation, Ma
     }
 
     private Map.Entry<Object, String> checkBuyRpc(GuildDB db, DBNation nation, Map<Integer, JavaCity> cities) {
-        if (nation.getCities() > Projects.ACTIVITY_CENTER.maxCities()) return null;
+        if (nation.getCities() > Projects.ACTIVITY_CENTER.maxCities()) {
+            if (nation.hasProject(Projects.ACTIVITY_CENTER)) {
+                return Map.entry("-1", "Go to the projects tab and sell activity center");
+            }
+            return null;
+        }
         if (nation.getProjectTurns() > 0 || nation.getFreeProjectSlots() <= 0) return null;
         return new AbstractMap.SimpleEntry<>("1", "Go to the projects tab and buy the Activity Center");
     }