upgrades paging - untested

Author: Ilya246

src/crawler_arena/CVars.java

@@ -10,6 +10,8 @@ public class CVars{
     public static int unitCap = 96;
     public static float tipChance = 1f / 30000f;
 
+    public static int unitsRows = 10;
+
     public static int bossWave = 25;
     public static int crawlersCeiling = 10000000;
     public static int maxUnits = 4000;

src/crawler_arena/CrawlerArenaMod.java

@@ -210,7 +210,7 @@ public void init(){
             }
             if(!waveIsOver){
                 enemyTypes.each(type -> type.speed += enemySpeedBoost * Time.delta * statScaling);
-            }else if(respawnInterval.get(60f)){
+            }else if(respawnInterval.get(120f)){
                 for(int i = 0; i < toRespawn.size; i++){
                     Building b = toRespawn.get(i);
                     Block block = b.block;
@@ -231,6 +231,8 @@ public void init(){
                         b.tile.setNet(block, b.team, b.rotation);
                         toRespawn.remove(b);
                         i--;
+                    }else{
+                        Call.effect(Fx.unitCapKill, b.x, b.y, 1, Color.white);
                     }
                     Call.effect(Fx.placeBlock, b.x, b.y, (float)block.size, Color.white);
                 }
@@ -648,15 +650,37 @@ public void registerClientCommands(CommandHandler handler){
 
         handler.<Player>register("info", "Show info about the Crawler Arena gamemode", (args, player) -> Bundle.bundled(player, "commands.info"));
 
-        handler.<Player>register("upgrades", "Show units you can upgrade to", (args, player) -> {
-            StringBuilder upgrades = new StringBuilder(Bundle.format("commands.upgrades.header", Bundle.findLocale(player)));
+        handler.<Player>register("upgrades", "[page]", "Show units you can upgrade to", (args, player) -> {
+            int page;
+            if(args.length == 0){
+                page = 1;
+            }else{
+                try{
+                    page = Integer.parseInt(args[0]);
+                }catch(NumberFormatException e){
+                    Bundle.bundled(player, "exceptions.invalid-amount");
+                    return;
+                }
+            }
             IntSeq sortedUnitCosts = unitCosts.values().toArray();
+            int maxPage = (sortedUnitCosts.size - 1) / (unitsRows * page) + 1;
+            if(1 > page || page > maxPage){
+                Bundle.bundled(player, "exceptions.invalid-amount");
+                return;
+            }
             sortedUnitCosts.sort();
+            if(page > 1){
+                sortedUnitCosts.removeRange(0, unitsRows * (page - 1) - 1);
+            }
+            sortedUnitCosts.removeRange(unitsRows * page, sortedUnitCosts.size - 1);
             ObjectIntMap<UnitType> unitCostsCopy = new ObjectIntMap<>();
             unitCostsCopy.putAll(unitCosts);
+            int i = 1;
+            StringBuilder upgrades = new StringBuilder(Bundle.format("commands.upgrades.header", Bundle.findLocale(player)));
+            upgrades.append(Bundle.format("commands.upgrades.header", Bundle.findLocale(player), page, maxPage)).append("/n");
             sortedUnitCosts.each((cost) -> {
                 UnitType type = unitCostsCopy.findKey(cost);
-                upgrades.append("[gold] - [accent]").append(type.name).append(" [lightgray](").append(cost).append(")\n");
+                upgrades.append("[gold] - [accent]").append(type.name).append(" [lightgray](").append(cost).append("/n");
                 unitCostsCopy.remove(type);
             });
             player.sendMessage(upgrades.toString());

src/resources/bundles/bundle_en.properties

@@ -25,6 +25,7 @@ commands.upgrade.not-enough-money = [scarlet]You don't have enough money to upgr
 commands.upgrade.too-many-units = [scarlet]There are too many units of that type on the map.
 
 commands.upgrades.header = [accent]Available units to upgrade:\n[]
+commands.upgrades.page = [accent][Page {0}/{1}]
 
 commands.give.player-not-found = [scarlet]Player not found! Note that you don't have to type the full name.
 commands.give.success = [yellow]{0} [green]coins given to {1}[green].

src/resources/bundles/bundle_ru.properties

@@ -25,6 +25,7 @@ commands.upgrade.not-enough-money = [scarlet]На балансе недоста
 commands.upgrade.too-many-units = [scarlet]На карте слишком много юнитов этого типа.
 
 commands.upgrades.header = [accent]Список доступных юнитов для прокачки:\n[]
+commands.upgrades.page = [accent][Страница {0}/{1}]
 
 commands.give.player-not-found = [scarlet]Игрок не найден! Учтите, что писать полное имя не нужно.
 commands.give.success = [yellow]{0} [green]монет передано {1}[green].