diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-1-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-1-autotile.png new file mode 100644 index 0000000000..d73a9a72dc Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-1-autotile.png differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-1.png b/core/assets-raw/sprites/blocks/environment/crux-floor-1.png new file mode 100644 index 0000000000..66f26a95bf Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-1.png differ diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 8034be5937..c503a0a1e8 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -600,3 +600,4 @@ 63082=stone-vent|block-stone-vent-ui 63081=basalt-vent|block-basalt-vent-ui 63080=tile-logic-display|block-tile-logic-display-ui +63079=crux-floor-1|block-crux-floor-1-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 4491580f73..f764a59394 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -11,6 +11,7 @@ import mindustry.entities.effect.*; import mindustry.entities.part.DrawPart.*; import mindustry.entities.part.*; import mindustry.entities.pattern.*; +import mindustry.game.*; import mindustry.gen.*; import mindustry.graphics.*; import mindustry.type.*; @@ -58,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, + darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, cruxFloor1, pebbles, tendrils, //ores @@ -808,6 +809,13 @@ public class Blocks{ darkMetal = new StaticWall("dark-metal"); + cruxFloor1 = new Floor("crux-floor-1"){{ + autotile = true; + emitLight = true; + lightRadius = 30f; + lightColor = Team.crux.color.cpy().a(0.3f); + }}; + Seq.with(metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6) .each(b -> b.asFloor().wall = darkMetal); diff --git a/gradle.properties b/gradle.properties index ce43e41c4b..a8e0be2bf0 100644 --- a/gradle.properties +++ b/gradle.properties @@ -26,4 +26,4 @@ org.gradle.caching=true org.gradle.internal.http.socketTimeout=100000 org.gradle.internal.http.connectionTimeout=100000 android.enableR8.fullMode=false -archash=79c4cf021d +archash=9b55a5d628 diff --git a/tools/src/mindustry/tools/ImageTileGenerator.java b/tools/src/mindustry/tools/ImageTileGenerator.java index bc5c01138d..4f9b1e98d8 100644 --- a/tools/src/mindustry/tools/ImageTileGenerator.java +++ b/tools/src/mindustry/tools/ImageTileGenerator.java @@ -56,7 +56,7 @@ public class ImageTileGenerator{ for(int i = 0; i < 47; i++){ int cx = i % 12, cy = i / 12; Pixmap cropped = out.crop(cx * cellSize, cy * cellSize, cellSize, cellSize); - outputDir.child(name + "-" + i).writePng(cropped); + outputDir.child(name + "-" + i + ".png").writePng(cropped); cropped.dispose(); }