Changed turret outlines / Wall block tweaks

core/assets/shaders/unitbuild.fragment.glsl

@@ -41,15 +41,14 @@ void main() {
     vec2 v = vec2(1.0/u_texsize.x, 1.0/u_texsize.y);
 
 	vec4 c = texture2D(u_texture, v_texCoord.xy);
-	bool outl = cont(t, v);
 
-    if(1.0-abs(coords.x - 0.5)*2.0 < 1.0-u_progress && !outl){
+    if(1.0-abs(coords.x - 0.5)*2.0 < 1.0-u_progress){
         c = vec4(0.0);
     }
 
     if(c.a > 0.01){
         float f = abs(sin(coords.x*2.0 + u_time));
-        if(f > 0.9 || outl)
+        if(f > 0.9)
             f = 1.0;
         else
             f = 0.0;

tools/src/io/anuke/mindustry/Generators.java

@@ -70,7 +70,7 @@ public class Generators{
 
         ImagePacker.generate("block-icons", () -> {
             Image colors = new Image(content.blocks().size, 1);
-            Color outlineColor = new Color(0, 0, 0, 0.3f);
+            Color outlineColor = Color.valueOf("4d4e58");
 
             for(Block block : content.blocks()){
                 TextureRegion[] regions = block.getGeneratedIcons();
@@ -95,7 +95,7 @@ public class Generators{
                 try{
                     Image last = null;
                     if(block.outlineIcon){
-                        int radius = 3;
+                        int radius = 4;
                         GenRegion region = (GenRegion)regions[regions.length - 1];
                         Image base = ImagePacker.get(region);
                         Image out = last = new Image(region.getWidth(), region.getHeight());