mirrors/Mindustry
1
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-12-06 02:40:23 -08:00
Code Issues Projects Releases Wiki Activity

More tile progress

Browse source
This commit is contained in:
Anuken 2025-07-11 19:07:31 -04:00
parent 8c3840b7ac
commit f9b6e3c0a6
7 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

BIN
core/assets-raw/sprites/blocks/environment/crux-floor-1-flat-autotile.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
core/assets-raw/sprites/blocks/environment/crux-floor-3-autotile.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
core/assets-raw/sprites/blocks/environment/crux-floor-4-autotile.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 1.1 KiB

BIN
core/assets-raw/sprites/blocks/environment/pipes.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 296 B

1
core/assets/icons/icons.properties
View file

@ -603,3 +603,4 @@
63079=crux-floor-1|block-crux-floor-1-ui 63079=crux-floor-1|block-crux-floor-1-ui
63078=crux-floor-2|block-crux-floor-2-ui 63078=crux-floor-2|block-crux-floor-2-ui
63077=crux-floor-3|block-crux-floor-3-ui 63077=crux-floor-3|block-crux-floor-3-ui
63076=crux-floor-4|block-crux-floor-4-ui

9
core/src/mindustry/content/Blocks.java
View file

@ -59,7 +59,7 @@ public class Blocks{
shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder, shaleBoulder, sandBoulder, daciteBoulder, boulder, snowBoulder, basaltBoulder, carbonBoulder, ferricBoulder, beryllicBoulder, yellowStoneBoulder,
arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystalBlocks, crystalOrbs, crystallineBoulder, redIceBoulder, rhyoliteBoulder, redStoneBoulder, arkyicBoulder, crystalCluster, vibrantCrystalCluster, crystalBlocks, crystalOrbs, crystallineBoulder, redIceBoulder, rhyoliteBoulder, redStoneBoulder,
metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall, 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, pebbles, tendrils,
//ores //ores
@ -833,6 +833,13 @@ public class Blocks{
drawEdgeIn = false; 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) Seq.with(metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6)
.each(b -> b.asFloor().wall = darkMetal); .each(b -> b.asFloor().wall = darkMetal);

5
tools/src/mindustry/tools/Generators.java
View file

@ -89,8 +89,9 @@ public class Generators{
if(!iconPath.exists()){ if(!iconPath.exists()){
//save the bottom right region as the "main" sprite for previews //save the bottom right region as the "main" sprite for previews
Pixmap out = new Pixmap(basePath); 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.writePng(cropped);
iconPath.parent().parent().parent().child("editor").child("editor-" + block.name + ".png").writePng(cropped);
out.dispose(); out.dispose();
gens.put(block, cropped); gens.put(block, cropped);
} }
@ -830,7 +831,7 @@ public class Generators{
generate("edges", () -> { generate("edges", () -> {
content.blocks().<Floor>each(b -> b instanceof Floor && !(b instanceof OverlayFloor) && !b.isAir(), floor -> { content.blocks().<Floor>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; return;
} }