diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-1-flat-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-1-flat-autotile.png new file mode 100644 index 0000000000..a5bbed72ea Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-1-flat-autotile.png differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-3-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-3-autotile.png new file mode 100644 index 0000000000..5a30bd7107 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-3-autotile.png differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-4-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-4-autotile.png new file mode 100644 index 0000000000..26d4509d07 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-4-autotile.png differ diff --git a/core/assets-raw/sprites/blocks/environment/pipes.png b/core/assets-raw/sprites/blocks/environment/pipes.png new file mode 100644 index 0000000000..25962a405b Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/pipes.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index b63ed7edf8..461b780be5 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -603,3 +603,4 @@ 63079=crux-floor-1|block-crux-floor-1-ui 63078=crux-floor-2|block-crux-floor-2-ui 63077=crux-floor-3|block-crux-floor-3-ui +63076=crux-floor-4|block-crux-floor-4-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index ad0c194adb..d2136d8652 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -59,7 +59,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, + darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, cruxFloor1, cruxFloor2, cruxFloor3, cruxFloor4, pebbles, tendrils, //ores @@ -833,6 +833,13 @@ public class Blocks{ drawEdgeIn = false; }}; + cruxFloor4 = new Floor("crux-floor-4"){{ + autotile = true; + emitLight = true; + drawEdgeOut = false; + drawEdgeIn = false; + }}; + Seq.with(metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6) .each(b -> b.asFloor().wall = darkMetal); diff --git a/tools/src/mindustry/tools/Generators.java b/tools/src/mindustry/tools/Generators.java index a7c46b41e6..4c5a847e6d 100644 --- a/tools/src/mindustry/tools/Generators.java +++ b/tools/src/mindustry/tools/Generators.java @@ -89,8 +89,9 @@ public class Generators{ if(!iconPath.exists()){ //save the bottom right region as the "main" sprite for previews Pixmap out = new Pixmap(basePath); - Pixmap cropped = out.crop(96, 96, 32, 32); + Pixmap cropped = out.crop(32, 32, 32, 32); iconPath.writePng(cropped); + iconPath.parent().parent().parent().child("editor").child("editor-" + block.name + ".png").writePng(cropped); out.dispose(); gens.put(block, cropped); } @@ -830,7 +831,7 @@ public class Generators{ generate("edges", () -> { content.blocks().each(b -> b instanceof Floor && !(b instanceof OverlayFloor) && !b.isAir(), floor -> { - if(has(floor.name + "-edge") || floor.blendGroup != floor){ + if(has(floor.name + "-edge") || floor.blendGroup != floor || (!floor.drawEdgeOut)){ return; }