From 8c3840b7acfa1677f27dfb64a0a5e14df6c87a54 Mon Sep 17 00:00:00 2001 From: Anuken Date: Fri, 11 Jul 2025 17:51:59 -0400 Subject: [PATCH] More floor stuff --- .../sprites/blocks/environment/grate-detailed.png | Bin 0 -> 359 bytes core/assets/icons/icons.properties | 1 + core/src/mindustry/content/Blocks.java | 9 ++++++++- 3 files changed, 9 insertions(+), 1 deletion(-) create mode 100644 core/assets-raw/sprites/blocks/environment/grate-detailed.png diff --git a/core/assets-raw/sprites/blocks/environment/grate-detailed.png b/core/assets-raw/sprites/blocks/environment/grate-detailed.png new file mode 100644 index 0000000000000000000000000000000000000000..b295bc8169c05ef29126fafe6f4013e16db8168b GIT binary patch literal 359 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U{v&U zaSVxQJsNH;)?^?s=Sd-pT*<<3k&Cu&i)*@ecvbrZzxm|{wDwHUQLJCqY%ufWrrn-5 zK3?!=2-wbRrKs?+%4XrByxB)TzyEA{%=t&mzJQa898be{6?5L*m}}E^{(IC;mhvBJ zvn$kHb~J`eOy0!x>vQJE#(dG1PbWF{9KTp7Yf|&0t#Q($w#G}37!K%Nzb&# z$Jz!BX3e8}d6$T>H+WrJoIf{s_d~IG-=J*y6RcWIuDk(iO*}`wabIPTZu@@3M>Yb!9^K zXU~ZTu5sjWF1aCVUhkME>}NUQGRsYNE5)ATy?oK~3x1sY-gK$_sQuH1i8+&}D;F>@ PFfe$!`njxgN@xNAMoXBU literal 0 HcmV?d00001 diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index c184afb202..b63ed7edf8 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -602,3 +602,4 @@ 63080=tile-logic-display|block-tile-logic-display-ui 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 diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 0ecebafba9..ad0c194adb 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, + darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, cruxFloor1, cruxFloor2, cruxFloor3, pebbles, tendrils, //ores @@ -826,6 +826,13 @@ public class Blocks{ drawEdgeIn = false; }}; + cruxFloor3 = new Floor("crux-floor-3"){{ + 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);