diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index ad037bdd0d..b0713ed049 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -351,7 +351,7 @@ zone.desolateRift.name = Desolate Rift zone.nuclearComplex.name = Nuclear Production Complex zone.overgrowth.name = Overgrowth zone.tarFields.name = Tar Fields -zone.saltFlats.name = Salt Flats +zone.saltFlats.name = Salt Flats [scarlet][[WIP] settings.language = Language settings.reset = Reset to Defaults diff --git a/core/src/io/anuke/mindustry/entities/type/Unit.java b/core/src/io/anuke/mindustry/entities/type/Unit.java index 8e10bfcadc..b36e8dde83 100644 --- a/core/src/io/anuke/mindustry/entities/type/Unit.java +++ b/core/src/io/anuke/mindustry/entities/type/Unit.java @@ -266,7 +266,7 @@ public abstract class Unit extends DestructibleEntity implements SaveTrait, Targ } //repel player out of bounds - final float warpDst = 230f; + final float warpDst = 180f; if(x < 0) velocity.x += (-x/warpDst); if(y < 0) velocity.y += (-y/warpDst); diff --git a/core/src/io/anuke/mindustry/graphics/Pal.java b/core/src/io/anuke/mindustry/graphics/Pal.java index aa4ca6f7e7..29614a7cd3 100644 --- a/core/src/io/anuke/mindustry/graphics/Pal.java +++ b/core/src/io/anuke/mindustry/graphics/Pal.java @@ -11,6 +11,8 @@ public class Pal{ bulletYellow = Color.valueOf("ffeec9"), bulletYellowBack = Color.valueOf("f9c87a"), + darkMetal = Color.valueOf("6e7080"), + missileYellow = Color.valueOf("ffd2ae"), missileYellowBack = Color.valueOf("e58956"), diff --git a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java index 3e691dc8da..f081b7c98c 100644 --- a/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java +++ b/core/src/io/anuke/mindustry/world/blocks/storage/CoreBlock.java @@ -88,7 +88,7 @@ public class CoreBlock extends StorageBlock{ Draw.rect(region, tile.drawx(), tile.drawy()); if(entity.heat > 0){ - Draw.colorl(0.25f); + Draw.color(Pal.darkMetal); Lines.stroke(2f * entity.heat); Lines.poly(tile.drawx(), tile.drawy(), 4, 8f * entity.heat); Draw.reset();