diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-10-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-10-autotile.png new file mode 100644 index 0000000000..f6c0d9b491 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-10-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 deleted file mode 100644 index e3e57b82a4..0000000000 Binary files a/core/assets-raw/sprites/blocks/environment/crux-floor-6-autotile-old.aseprite and /dev/null differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 14f185c521..0904a6a2a9 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -610,3 +610,4 @@ 63072=crux-floor-7|block-crux-floor-7-ui 63071=crux-floor-8|block-crux-floor-8-ui 63070=crux-floor-9|block-crux-floor-9-ui +63069=crux-floor-10|block-crux-floor-10-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index b0ccdff4b3..b3c746c071 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, cruxFloor4, cruxFloor5, cruxFloor6, cruxFloor7, cruxFloor8, cruxFloor9, coloredFloor, + darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, cruxFloor1, cruxFloor2, cruxFloor3, cruxFloor4, cruxFloor5, cruxFloor6, cruxFloor7, cruxFloor8, cruxFloor9, cruxFloor10, coloredFloor, pebbles, tendrils, //ores @@ -869,6 +869,12 @@ public class Blocks{ drawEdgeIn = false; }}; + cruxFloor10 = new Floor("crux-floor-10"){{ + autotile = true; + drawEdgeOut = false; + drawEdgeIn = false; + }}; + coloredFloor = new ColoredFloor("colored-floor"){{ autotile = true; drawEdgeOut = false;