Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

more floors

Browse Source
This commit is contained in:
Anuken
2025-07-13 01:29:18 -04:00
parent 88b2f9c2bc
commit b3ee9884ab
8 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/mindustry/content/Blocks.java
View File

@@ -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)

2
core/src/mindustry/world/blocks/environment/ColoredFloor.java
View File

@@ -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;