diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-5-autotile.aseprite b/core/assets-raw/sprites/blocks/environment/crux-floor-5-autotile.aseprite new file mode 100644 index 0000000000..1a8af32f19 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-5-autotile.aseprite differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-5-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-5-autotile.png new file mode 100644 index 0000000000..c812412fc0 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-5-autotile.png differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-6-autotile-old.aseprite b/core/assets-raw/sprites/blocks/environment/crux-floor-6-autotile-old.aseprite new file mode 100644 index 0000000000..e3e57b82a4 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-6-autotile-old.aseprite differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-6-autotile.aseprite b/core/assets-raw/sprites/blocks/environment/crux-floor-6-autotile.aseprite new file mode 100644 index 0000000000..5e8b65ea45 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-6-autotile.aseprite differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-6-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-6-autotile.png new file mode 100644 index 0000000000..c5d1af221d Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-6-autotile.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 06c302ee2e..c3f4c0a6cc 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -605,3 +605,5 @@ 63077=crux-floor-3|block-crux-floor-3-ui 63076=crux-floor-4|block-crux-floor-4-ui 63075=colored-floor|block-colored-floor-ui +63074=crux-floor-5|block-crux-floor-5-ui +63073=crux-floor-6|block-crux-floor-6-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 7444472600..483b750426 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -58,7 +58,7 @@ public class Blocks{ shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder, arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystalBlocks, crystalOrbs, crystallineBoulder, redIceBoulder, rhyoliteBoulder, redStoneBoulder, metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall, - darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, cruxFloor1, cruxFloor2, cruxFloor3, cruxFloor4, coloredFloor, + darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, cruxFloor1, cruxFloor2, cruxFloor3, cruxFloor4, cruxFloor5, cruxFloor6, coloredFloor, pebbles, tendrils, //ores @@ -837,10 +837,24 @@ public class Blocks{ drawEdgeIn = false; }}; + cruxFloor5 = new Floor("crux-floor-5"){{ + autotile = true; + drawEdgeOut = false; + drawEdgeIn = false; + }}; + + cruxFloor6 = new Floor("crux-floor-6"){{ + autotile = true; + drawEdgeOut = false; + drawEdgeIn = false; + }}; + coloredFloor = new ColoredFloor("colored-floor"){{ autotile = true; drawEdgeOut = false; drawEdgeIn = false; + //there is no proper support for displaying colors or placing with colors + inEditor = false; }}; Seq.with(metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6) diff --git a/core/src/mindustry/world/blocks/environment/ColoredFloor.java b/core/src/mindustry/world/blocks/environment/ColoredFloor.java index 954ec3e1ef..7e1985907a 100644 --- a/core/src/mindustry/world/blocks/environment/ColoredFloor.java +++ b/core/src/mindustry/world/blocks/environment/ColoredFloor.java @@ -34,7 +34,7 @@ public class ColoredFloor extends Floor{ public void drawBase(Tile tile){ //make sure to mask out the alpha channel - it's generally undesirable, and leads to invisible blocks when the data is not initialized Draw.color(tile.extraData | 0xff); - if((tile.extraData & 0xff) == flagSmoothBlend){ + if((tile.extraData & 0xff) == flagSmoothBlend && autotile){ //Only autotiling is supported right now for the sake of simplicity int bits = 0;