Sprite updates

core/assets/bundles/bundle.properties

@@ -618,6 +618,7 @@ block.snowrock.name = Snow Rock
 block.shale.name = Shale
 block.shale-boulder.name = Shale Boulder
 block.moss.name = Moss
+block.shrubs.name = Shrubs
 block.spore-moss.name = Spore Moss
 block.shalerocks.name = Shale Rocks
 block.scrap-wall.name = Scrap Wall

core/src/io/anuke/mindustry/content/Blocks.java

@@ -255,13 +255,11 @@ public class Blocks implements ContentList{
             dragMultiplier = 1f;
             speedMultiplier = 1f;
             attributes.set(Attribute.water, 0.4f);
-            edgeStyle = "blocky";
         }};
 
         iceSnow = new Floor("ice-snow"){{
             variants = 3;
             attributes.set(Attribute.water, 0.3f);
-            edgeStyle = "blocky";
         }};
 
         cliffs = new StaticWall("cliffs"){{
@@ -351,7 +349,6 @@ public class Blocks implements ContentList{
         sporeMoss = new Floor("spore-moss"){{
             variants = 3;
             attributes.set(Attribute.spores, 0.3f);
-            edgeStyle = "blocky";
         }};
 
         metalFloor = new Floor("metal-floor"){{
@@ -359,7 +356,7 @@ public class Blocks implements ContentList{
         }};
 
         metalFloorDamaged = new Floor("metal-floor-damaged"){{
-            variants = 6;
+            variants = 3;
         }};
 
         metalFloor2 = new Floor("metal-floor-2"){{
@@ -1117,7 +1114,7 @@ public class Blocks implements ContentList{
             itemDuration = 40f;
             consumes.power(25f);
             consumes.item(Items.blastCompound);
-            consumes.liquid(Liquids.cryofluid, 0.3f);
+            consumes.liquid(Liquids.cryofluid, 0.26f);
         }};
 
         //endregion power

core/src/io/anuke/mindustry/world/Block.java

@@ -210,7 +210,7 @@ public class Block extends BlockStorage{
         if(!tile.entity.damaged()) return;
         int id = tile.pos();
         TextureRegion region = cracks[size - 1][Mathf.clamp((int)((1f - tile.entity.healthf()) * crackRegions), 0, crackRegions-1)];
-        Draw.colorl(0.1f, 0.1f + (1f - tile.entity.healthf())* 0.7f);
+        Draw.colorl(0.2f, 0.1f + (1f - tile.entity.healthf())* 0.6f);
         Draw.rect(region, tile.drawx(), tile.drawy(), (id%4)*90);
         Draw.color();
     }

core/src/io/anuke/mindustry/world/blocks/Floor.java

@@ -45,8 +45,6 @@ public class Floor extends Block{
     public boolean isLiquid;
     /** if true, this block cannot be mined by players. useful for annoying things like sand. */
     public boolean playerUnmineable = false;
-    /** Style of the edge stencil. Loaded by looking up "edge-stencil-{name}". */
-    public String edgeStyle = "smooth";
     /** Group of blocks that this block does not draw edges on. */
     public Block blendGroup = this;
     /** Effect displayed when randomly updated. */
@@ -155,7 +153,7 @@ public class Floor extends Block{
     }
 
     protected boolean doEdge(Floor other, boolean sameLayer){
-        return (other.blendGroup.id > blendGroup.id || edges() == null) && other.edgeOnto(this) && (other.cacheLayer.ordinal() > this.cacheLayer.ordinal() || !sameLayer);
+        return (other != this) && (other.cacheLayer.ordinal() > this.cacheLayer.ordinal() || !sameLayer);
     }
 
     protected boolean edgeOnto(Floor other){

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

@@ -25,7 +25,7 @@ public class Generators{
     public static void generate(){
 
         ImagePacker.generate("cracks", () -> {
-            RidgedPerlin r = new RidgedPerlin(1, 2);
+            RidgedPerlin r = new RidgedPerlin(1, 3);
             for(int size = 1; size <= Block.maxCrackSize; size++){
                 int dim = size * 32;
                 int steps = Block.crackRegions;
@@ -291,7 +291,7 @@ public class Generators{
 
                 try{
                     Image image = ImagePacker.get(floor.generateIcons()[0]);
-                    Image edge = ImagePacker.get("edge-stencil-" + floor.edgeStyle);
+                    Image edge = ImagePacker.get("edge-stencil");
                     Image result = new Image(edge.width, edge.height);
 
                     for(int x = 0; x < edge.width; x++){