Faction color changes again

core/assets/bundles/bundle.properties

@@ -1449,7 +1449,7 @@ team.crux.name = Crux
 team.sharded.name = Sharded
 team.derelict.name = Derelict
 team.green.name = Green
-team.purple.name = Purple
+team.blue.name = Blue
 
 hint.skip = Skip
 hint.desktopMove = Use [accent][[WASD][] to move.

core/src/mindustry/content/ErekirTechTree.java

@@ -187,7 +187,7 @@ public class ErekirTechTree{
 
                 node(cliffCrusher, () -> {
                     node(siliconArcFurnace, () -> {
-                        node(electrolyzer, Seq.with(new OnSector(two)), () -> {
+                        node(electrolyzer, Seq.with(new OnSector(three)), () -> {
                             node(oxidationChamber, () -> {
                                 node(electricHeater, Seq.with(new OnSector(four)), () -> {
                                     node(heatRedirector, () -> {

core/src/mindustry/content/Planets.java

@@ -6,6 +6,7 @@ import arc.math.*;
 import arc.math.geom.*;
 import arc.struct.*;
 import arc.util.*;
+import mindustry.game.*;
 import mindustry.graphics.*;
 import mindustry.graphics.g3d.*;
 import mindustry.graphics.g3d.PlanetGrid.*;
@@ -68,6 +69,7 @@ public class Planets{
             updateLighting = false;
 
             ruleSetter = r -> {
+                r.waveTeam = Team.malis;
                 r.placeRangeCheck = false; //TODO true or false?
                 r.attributes.set(Attribute.heat, 0.8f);
                 r.showSpawns = true;

core/src/mindustry/content/StatusEffects.java

@@ -161,7 +161,7 @@ public class StatusEffects{
         }};
 
         boss = new StatusEffect("boss"){{
-            color = Team.malis.color;
+            color = Team.crux.color;
             permanent = true;
             damageMultiplier = 1.3f;
             healthMultiplier = 1.5f;

core/src/mindustry/editor/MapView.java

@@ -293,7 +293,7 @@ public class MapView extends Element implements GestureListener{
 
                 //pencil square outline
                 if(tool == EditorTool.pencil && tool.mode == 1){
-                    Lines.square(v.x + scaling/2f, v.y + scaling/2f, scaling * (editor.brushSize + 0.5f));
+                    Lines.square(v.x + scaling/2f, v.y + scaling/2f, scaling * ((editor.brushSize == 1.5f ? 1f : editor.brushSize) + 0.5f));
                 }else{
                     Lines.poly(brushPolygons[index], v.x, v.y, scaling);
                 }

core/src/mindustry/game/MapObjectives.java

@@ -247,7 +247,7 @@ public class MapObjectives{
 
     public static class DestroyBlockObjective extends MapObjective{
         public int x, y;
-        public Team team = Team.malis;
+        public Team team = Team.crux;
         public Block block = Blocks.router;
 
         public DestroyBlockObjective(Block block, int x, int y, Team team){
@@ -447,7 +447,7 @@ public class MapObjectives{
     public static class MinimapMarker extends ObjectiveMarker{
         //in tiles.
         public float x, y, radius = 5f, stroke = 11f;
-        public Color color = Team.malis.color;
+        public Color color = Team.crux.color;
 
         public MinimapMarker(float x, float y){
             this.x = x;

core/src/mindustry/game/Rules.java

@@ -135,7 +135,7 @@ public class Rules{
     /** team of the player by default. */
     public Team defaultTeam = Team.sharded;
     /** team of the enemy in waves/sectors. */
-    public Team waveTeam = Team.malis;
+    public Team waveTeam = Team.crux;
     /** color of clouds that is displayed when the player is landing */
     public Color cloudColor = new Color(0f, 0f, 0f, 0f);
     /** name of the custom mode that this ruleset describes, or null. */

core/src/mindustry/game/Team.java

@@ -29,13 +29,11 @@ public class Team implements Comparable<Team>{
 
     public final static Team
         derelict = new Team(0, "derelict", Color.valueOf("4d4e58")),
-        sharded = new Team(1, "sharded", Pal.accent.cpy(),
+        sharded = new Team(1, "sharded", Pal.accent.cpy(), Color.valueOf("ffd37f"), Color.valueOf("eab678"), Color.valueOf("d4816b")),
-            Color.valueOf("ffd37f"), Color.valueOf("eab678"), Color.valueOf("d4816b")),
+        crux = new Team(2, "crux", Color.valueOf("f25555"), Color.valueOf("fc8e6c"), Color.valueOf("f25555"), Color.valueOf("a04553")),
-        malis = new Team(2, "malis", Color.valueOf("f25555"),
+        malis = new Team(3, "malis", Color.valueOf("995bb0"), Color.valueOf("f08dd5"), Color.valueOf("995bb0"), Color.valueOf("312c63")),
-            Color.valueOf("fc8e6c"), Color.valueOf("f25555"), Color.valueOf("a04553")),
-        crux = new Team(3, "crux", Color.valueOf("6c87fd"), Color.valueOf("85caf9"), Color.valueOf("6c87fd"), Color.valueOf("3b3392")),
         green = new Team(4, "green", Color.valueOf("54d67d"), Color.valueOf("96f58c"), Color.valueOf("54d67d"), Color.valueOf("28785c")),
-        purple = new Team(5, "purple", Color.valueOf("995bb0"), Color.valueOf("f08dd5"), Color.valueOf("995bb0"), Color.valueOf("312c63"));
+        blue = new Team(5, "blue", Color.valueOf("6c87fd"), Color.valueOf("85caf9"), Color.valueOf("6c87fd"), Color.valueOf("3b3392"));
 
     static{
         Mathf.rand.setSeed(8);

core/src/mindustry/game/Teams.java

@@ -30,7 +30,7 @@ public class Teams{
     public Seq<Unit> bosses = new Seq<>();
 
     public Teams(){
-        active.add(get(Team.malis));
+        active.add(get(Team.crux));
     }
 
     @Nullable

core/src/mindustry/ui/dialogs/PlanetDialog.java

@@ -370,11 +370,11 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
                 if(canSelect(sec) || sec.unlocked() || debugSelect){
 
                     Color color =
-                    sec.hasBase() ? Tmp.c2.set(Team.sharded.color).lerp(Team.malis.color, sec.hasEnemyBase() ? 0.5f : 0f) :
+                    sec.hasBase() ? Tmp.c2.set(Team.sharded.color).lerp(Team.crux.color, sec.hasEnemyBase() ? 0.5f : 0f) :
                     sec.preset != null ?
                         sec.preset.unlocked() ? Tmp.c2.set(Team.derelict.color).lerp(Color.white, Mathf.absin(Time.time, 10f, 1f)) :
                         Color.gray :
-                    sec.hasEnemyBase() ? Team.malis.color :
+                    sec.hasEnemyBase() ? Team.crux.color :
                     null;
 
                     if(color != null){
@@ -419,7 +419,7 @@ public class PlanetDialog extends BaseDialog implements PlanetInterfaceRenderer{
                     if(planet.allowSectorInvasion){
                         for(Sector enemy : sec.near()){
                             if(enemy.hasEnemyBase()){
-                                planets.drawArc(planet, enemy.tile.v, sec.tile.v, Team.malis.color.write(Tmp.c2).a(state.uiAlpha), Color.clear, 0.24f, 110f, 25);
+                                planets.drawArc(planet, enemy.tile.v, sec.tile.v, Team.crux.color.write(Tmp.c2).a(state.uiAlpha), Color.clear, 0.24f, 110f, 25);
                             }
                         }
                     }