add whatever has been added

Author: Ilya246

build.gradle

@@ -2,7 +2,10 @@ apply plugin: "java"
 
 version '1.0'
 
-sourceSets.main.java.srcDirs = ["src"]
+sourceSets.main{
+    java.srcDirs = ["src"]
+    resources.srcDirs = ["src/resources"]
+}
 
 repositories{
     mavenCentral()

src/crawler_arena/ArenaAI.java

@@ -26,7 +26,7 @@ public void updateUnit(){
 
         if(!Units.invalidateTarget(target, unit, unit.range()) && unit.hasWeapons()){
             rotate = true;
-            shoot = unit.within(target, unit.range() + (target instanceof Building ? 1.5f * Vars.tilesize / 2f : ((Hitboxc) target).hitSize() / 2f));
+            shoot = unit.within(target, unit.type.range + (target instanceof Building ? 1.5f * Vars.tilesize / 2f : ((Hitboxc) target).hitSize() / 2f));
 
             if(unit.type.hasWeapons())
                 unit.aimLook(Predict.intercept(unit, target, unit.type.weapons.first().bullet.speed));

src/crawler_arena/Bundle.java

@@ -5,6 +5,7 @@
 import arc.struct.StringMap;
 import arc.util.Strings;
 import arc.util.Structs;
+import arc.util.Log;
 import mindustry.Vars;
 import mindustry.gen.Groups;
 import mindustry.gen.Iconc;
@@ -95,7 +96,6 @@ public static void sendToChat(String key, Object... values){
 
     public static Locale findLocale(Player player){
         Locale locale = Structs.find(Bundle.supportedLocales, l -> l.toString().equals(player.locale) || player.locale.startsWith(l.toString()));
-        return locale != null ? locale : Bundle.defaultLocale();
+        return locale == null ? Bundle.defaultLocale() : locale;
     }
 }
-

src/crawler_arena/CVars.java

@@ -90,7 +90,7 @@ public class CVars{
         unitCosts.putAll(UnitTypes.nova, 100,
         UnitTypes.pulsar, 300,
         UnitTypes.quasar, 2000,
-        UnitTypes.vela, 15000,
+        UnitTypes.vela, 18000,
         UnitTypes.corvus, 250000,
 
         UnitTypes.dagger, 25,
@@ -99,6 +99,24 @@ public class CVars{
         UnitTypes.scepter, 20000,
         UnitTypes.reign, 250000,
 
+        UnitTypes.merui, 450,
+        UnitTypes.cleroi, 1800,
+        UnitTypes.anthicus, 12000,
+        UnitTypes.tecta, 22000,
+        UnitTypes.collaris, 325000,
+
+        UnitTypes.elude, 500,
+        UnitTypes.avert, 1000,
+        UnitTypes.obviate, 11000,
+        UnitTypes.quell, 25000,
+        UnitTypes.disrupt, 250000,
+
+        UnitTypes.stell, 400,
+        UnitTypes.locus, 2500,
+        UnitTypes.precept, 10000,
+        UnitTypes.vanquish, 22000,
+        UnitTypes.conquer, 250000,
+
         UnitTypes.crawler, 7500,
         UnitTypes.atrax, 250,
         UnitTypes.spiroct, 1500,
@@ -123,7 +141,7 @@ public class CVars{
         UnitTypes.sei, 75000,
         UnitTypes.omura, 1500000,
 
-        UnitTypes.mono, 3750000,
+        UnitTypes.mono, 10000000,
         UnitTypes.poly, 100000,
         UnitTypes.mega, 2500,
         UnitTypes.quad, 25000,

src/crawler_arena/CrawlerArenaMod.java

@@ -8,7 +8,7 @@
 import arc.struct.*;
 import arc.util.*;
 import arc.util.pooling.Pools;
-import mindustry.ai.types.FlyingAI;
+import mindustry.ai.types.*;
 import mindustry.content.*;
 import mindustry.entities.abilities.*;
 import mindustry.entities.bullet.SapBulletType;
@@ -43,18 +43,17 @@ public class CrawlerArenaMod extends Plugin {
 
     @Override
     public void init(){
-        content.units().each(un -> un.controller = u -> new FlyingAI());
-        UnitTypes.crawler.controller = u -> new ArenaAI();
-        UnitTypes.atrax.controller = u -> new ArenaAI();
-        UnitTypes.spiroct.controller = u -> new ArenaAI();
-        UnitTypes.arkyid.controller = u -> new ArenaAI();
-        UnitTypes.toxopid.controller = u -> new ArenaAI();
+        UnitTypes.crawler.controller = u -> !u.type.playerControllable || (u.team.isAI() && !u.team.rules().rtsAi) ? new ArenaAI() : new CommandAI();
+        UnitTypes.atrax.controller = u -> !u.type.playerControllable || (u.team.isAI() && !u.team.rules().rtsAi) ? new ArenaAI() : new CommandAI();
+        UnitTypes.spiroct.controller = u -> !u.type.playerControllable || (u.team.isAI() && !u.team.rules().rtsAi) ? new ArenaAI() : new CommandAI();
+        UnitTypes.arkyid.controller = u -> !u.type.playerControllable || (u.team.isAI() && !u.team.rules().rtsAi) ? new ArenaAI() : new CommandAI();
+        UnitTypes.toxopid.controller = u -> !u.type.playerControllable || (u.team.isAI() && !u.team.rules().rtsAi) ? new ArenaAI() : new CommandAI();
 
         UnitTypes.poly.controller = u -> new SwarmAI();
-        UnitTypes.mega.controller = u -> new ReinforcementAI();
+        UnitTypes.mega.controller = u -> u.team == CVars.reinforcementTeam ? new ReinforcementAI() : !u.type.playerControllable || (u.team.isAI() && !u.team.rules().rtsAi) ? u.type.aiController.get() : new CommandAI();
 
-        UnitTypes.scepter.controller = u -> new ArenaAI();
-        UnitTypes.reign.controller = u -> new ArenaAI();
+        UnitTypes.scepter.controller = u -> !u.type.playerControllable || (u.team.isAI() && !u.team.rules().rtsAi) ? new ArenaAI() : new CommandAI();
+        UnitTypes.reign.controller = u -> !u.type.playerControllable || (u.team.isAI() && !u.team.rules().rtsAi) ? new ArenaAI() : new CommandAI();
 
         UnitTypes.risso.flying = true;
         UnitTypes.minke.flying = true;
@@ -488,7 +487,6 @@ public void setUnit(Unit unit, boolean ultraEligible){
             addUnitAbility(unit, new UnitSpawnAbility(UnitTypes.dagger, ultraDaggerCooldown, 0f, -1f));
             applyStatus(unit, Float.MAX_VALUE, 3, StatusEffects.overclock, StatusEffects.overdrive, StatusEffects.boss);
         }
-        unit.controller(new FlyingAI());
     }
     public void setUnit(Unit unit){
         setUnit(unit, false);
@@ -512,7 +510,7 @@ public void reset(){
 
     @Override
     public void registerClientCommands(CommandHandler handler){
-        handler.<Player>register("upgrade", "<type> [amount]", "Upgrade to another unit", (args, player) -> {
+        handler.<Player>register("upgrade", "<type> [amount]", "Upgrade to another unit. Specifying amount instead buys units to fight alongside you", (args, player) -> {
             UnitType newUnitType = Seq.with(unitCosts.keys()).find(u -> u.name.equalsIgnoreCase(args[0]));
             if(newUnitType == null){
                 Bundle.bundled(player, "commands.upgrade.unit-not-found");
@@ -538,7 +536,7 @@ public void registerClientCommands(CommandHandler handler){
             }
 
             if(money.get(player.uuid()) >= unitCosts.get(newUnitType) * amount){
-                if(!player.dead() && player.unit().type == newUnitType || amount > 1){
+                if(!player.dead() && player.unit().type == newUnitType || args.length == 2){
                     for(int i = 0; i < amount; i++){
                         Unit newUnit = newUnitType.spawn(player.x + Mathf.random(), player.y + Mathf.random());
                         setUnit(newUnit);
@@ -605,6 +603,20 @@ public void registerClientCommands(CommandHandler handler){
             });
             player.sendMessage(upgrades.toString());
         });
+
+        handler.<Player>register("cost", "<type>", "Lookup the cost of a unit", (args, player) -> {
+            int cost = -1;
+            for(ObjectIntMap.Entry<UnitType> pair : unitCosts.entries()){
+                if(pair.key.name.equalsIgnoreCase(args[0])){
+                    cost = pair.value;
+                }
+            }
+            if(cost == -1){
+                Bundle.bundled(player, "commands.upgrade.unit-not-found");
+                return;
+            }
+            player.sendMessage(Integer.toString(cost));
+        });
     }
 
     public void registerServerCommands(CommandHandler handler){

src/resources/bundles/bundle_en.properties

@@ -28,7 +28,7 @@ commands.upgrades.header = [accent]Available units to upgrade:\n[]
 
 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].
-commands.give.money-recieved = [yellow]{0} [green]coins recieved from {1}[green].
+commands.give.money-recieved = [yellow]{0} [green]coins received from {1}[green].
 commands.give.not-enough-money = [scarlet]You don't have enough money.
 
 exceptions.invalid-amount = [scarlet]Invalid amount.
@@ -37,8 +37,9 @@ commands.info = [accent]Money is gained in equal amounts for every player after
 \nMoney can only decrease by buying units.\
 \nYour money is displayed at the top of the screen.\
 \n/upgrades - print available units and their prices.\
-\n/upgrade - upgrade to a unit type.\
-\n/give - give money to another player.\
+\n/cost <type> - lookup unit cost.\
+\n/upgrade <type> [amount] - upgrade to a unit type. Specifying amount instead buys units to fight alongside you.\
+\n/give <amount> <name> - give money to another player.\
 \nUpgrading while you are dead respawns you.\
 \nUpgrading to your own unit type buys an additional unit (does not respawn).\
 \nSurvive 25 waves and kill the boss to win.

src/resources/bundles/bundle_ru.properties

@@ -36,9 +36,11 @@ exceptions.invalid-amount = [scarlet]Неподходящее количеств
 commands.info = [accent]После каждой волны всем игрокам начисляется одинаковое количество монет.\
 \nМонеты можно потратить на прокачку юнитов.\
 \nТвой баланс отображается вверху экрана.\
+\nКоманды принимают типы юнитов на английском языке.\
 \n/upgrades - посмотреть всех доступных юнитов и их стоимость.\
-\n/upgrade - улучшить своего юнита за монеты.\
-\n/give - дать деньги другому игроку.\
+\n/cost <тип> - отобразить стоимость юнита.\
+\n/upgrade <тип> [количество] - улучшить своего юнита за монеты. Если указано количество, новые юниты будут куплены отдельно.\
+\n/give <количество> <имя> - дать деньги другому игроку.\
 \nПрокачка после смерти возрождает тебя.\
 \nПрокачка до своего же юнита покупает дополнительный юнит (не возрождается).\
 \nПродержись 25 волн и убей босса чтобы победить.