diff --git a/core/assets/baseparts/1603219216674.msch b/core/assets/baseparts/1603219216674.msch new file mode 100644 index 0000000000..95e7a00d9a Binary files /dev/null and b/core/assets/baseparts/1603219216674.msch differ diff --git a/core/assets/baseparts/1603219241094.msch b/core/assets/baseparts/1603219241094.msch new file mode 100644 index 0000000000..d80f4f4b19 Binary files /dev/null and b/core/assets/baseparts/1603219241094.msch differ diff --git a/core/assets/baseparts/1603219316221.msch b/core/assets/baseparts/1603219316221.msch new file mode 100644 index 0000000000..7797e76979 Binary files /dev/null and b/core/assets/baseparts/1603219316221.msch differ diff --git a/core/assets/baseparts/1603219367279.msch b/core/assets/baseparts/1603219367279.msch new file mode 100644 index 0000000000..912735de6b --- /dev/null +++ b/core/assets/baseparts/1603219367279.msch @@ -0,0 +1,2 @@ +mschx%m VveZXmv#<pǬ sqJ2ʚQ}EqWmIg^;)l)` P[!Q}uџ]Sk'? 8jŞSŴ/ i-aFaj0 +07 n\& \ No newline at end of file diff --git a/core/assets/baseparts/1603219428262.msch b/core/assets/baseparts/1603219428262.msch new file mode 100644 index 0000000000..6d5b519036 Binary files /dev/null and b/core/assets/baseparts/1603219428262.msch differ diff --git a/core/assets/baseparts/1603219511695.msch b/core/assets/baseparts/1603219511695.msch new file mode 100644 index 0000000000..ad1b208119 Binary files /dev/null and b/core/assets/baseparts/1603219511695.msch differ diff --git a/core/assets/baseparts/1603219540119.msch b/core/assets/baseparts/1603219540119.msch new file mode 100644 index 0000000000..9f68ff76bd --- /dev/null +++ b/core/assets/baseparts/1603219540119.msch @@ -0,0 +1,2 @@ +mschx%Q + _fA@RKFoUaaF@zTKX%$[G k;y-o'0 UjdZjqQkK`c \ No newline at end of file diff --git a/core/assets/baseparts/1603222786081.msch b/core/assets/baseparts/1603222786081.msch new file mode 100644 index 0000000000..1c00bd2e9c --- /dev/null +++ b/core/assets/baseparts/1603222786081.msch @@ -0,0 +1,2 @@ +mschxEOn "[{Op'Ċi^UJr(n tt;ʹlW:ŧ OG +.ۇ0wPk!v>cZrF_\n?2^x(Rv Hg^}N'ς$6r4Tl"=ZނbA4W'&wt3-l`PC?6s}+iyf$15a-~Y/gD>X \ No newline at end of file diff --git a/core/assets/baseparts/1603222833941.msch b/core/assets/baseparts/1603222833941.msch new file mode 100644 index 0000000000..565eecf779 Binary files /dev/null and b/core/assets/baseparts/1603222833941.msch differ diff --git a/core/assets/baseparts/1603222912251.msch b/core/assets/baseparts/1603222912251.msch new file mode 100644 index 0000000000..6b33abac34 Binary files /dev/null and b/core/assets/baseparts/1603222912251.msch differ diff --git a/core/src/mindustry/ai/types/FlyingAI.java b/core/src/mindustry/ai/types/FlyingAI.java index f88a125e93..10aea42e2f 100644 --- a/core/src/mindustry/ai/types/FlyingAI.java +++ b/core/src/mindustry/ai/types/FlyingAI.java @@ -43,8 +43,6 @@ public class FlyingAI extends AIController{ return null; } - //TODO clean up - protected void attack(float circleLength){ vec.set(target).sub(unit); diff --git a/core/src/mindustry/ai/types/FormationAI.java b/core/src/mindustry/ai/types/FormationAI.java index ed175524d8..3226fbc300 100644 --- a/core/src/mindustry/ai/types/FormationAI.java +++ b/core/src/mindustry/ai/types/FormationAI.java @@ -94,7 +94,7 @@ public class FormationAI extends AIController implements FormationMember{ @Override public float formationSize(){ - return unit.hitSize * 1f; + return unit.hitSize * 1.1f; } @Override diff --git a/core/src/mindustry/ai/types/GroundAI.java b/core/src/mindustry/ai/types/GroundAI.java index 0134a424fc..2a711235c9 100644 --- a/core/src/mindustry/ai/types/GroundAI.java +++ b/core/src/mindustry/ai/types/GroundAI.java @@ -13,8 +13,6 @@ import java.util.*; import static mindustry.Vars.*; public class GroundAI extends AIController{ - //static final float commandCooldown = 60f * 10; - //float commandTimer = 60*3; @Override public void updateMovement(){ @@ -57,19 +55,5 @@ public class GroundAI extends AIController{ unit.lookAt(unit.vel().angle()); } - //auto-command works but it's very buggy - /* - if(unit instanceof Commanderc){ - Commanderc c = (Commanderc)unit; - //try to command when missing members - if(c.controlling().size <= unit.type().commandLimit/2){ - commandTimer -= Time.delta; - - if(commandTimer <= 0){ - c.commandNearby(new SquareFormation(), u -> !(u.controller() instanceof FormationAI) && !(u instanceof Commanderc)); - commandTimer = commandCooldown; - } - } - }*/ } } diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 056b94d27b..414fe99d36 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -1186,7 +1186,7 @@ public class Blocks implements ContentList{ requirements(Category.power, with(Items.lead, 100, Items.silicon, 75, Items.phasefabric, 25, Items.plastanium, 75, Items.thorium, 50)); size = 2; powerProduction = 4.5f; - itemDuration = 60 * 15f; + itemDuration = 60 * 18f; }}; solarPanel = new SolarGenerator("solar-panel"){{ diff --git a/core/src/mindustry/entities/comp/CommanderComp.java b/core/src/mindustry/entities/comp/CommanderComp.java index e03147d63c..124eb06d91 100644 --- a/core/src/mindustry/entities/comp/CommanderComp.java +++ b/core/src/mindustry/entities/comp/CommanderComp.java @@ -74,7 +74,7 @@ abstract class CommanderComp implements Entityc, Posc{ void command(Formation formation, Seq units){ clearCommand(); - float spacing = hitSize * 0.65f; + float spacing = hitSize * 0.8f; minFormationSpeed = type.speed; controlling.addAll(units);