From 3d5363692c7516d84cefa95d786966754e231a77 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 26 Jun 2025 21:24:56 -0400
Subject: [PATCH] wip crux floor

---
 .../blocks/environment/crux-floor-1-autotile.png | Bin 0 -> 2800 bytes
 .../sprites/blocks/environment/crux-floor-1.png  | Bin 0 -> 121 bytes
 core/assets/icons/icons.properties               |   1 +
 core/src/mindustry/content/Blocks.java           |  10 +++++++++-
 gradle.properties                                |   2 +-
 .../src/mindustry/tools/ImageTileGenerator.java  |   2 +-
 6 files changed, 12 insertions(+), 3 deletions(-)
 create mode 100644 core/assets-raw/sprites/blocks/environment/crux-floor-1-autotile.png
 create mode 100644 core/assets-raw/sprites/blocks/environment/crux-floor-1.png

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 0000000000000000000000000000000000000000..d73a9a72dce29f6ee9dda94c0ba3a8c3a5c82a7c
GIT binary patch
literal 2800
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
W-y{Du2N)O_7(8A5T-G@yGywqO85)oP

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..66f26a95bfd636d9f5418b162307ac982af3710e
GIT binary patch
literal 121
zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4mJh`hT^KKFANL}jKx9jP7LeL$-HD>U@-P{
zaSVxQeS6N3k->oD$bsdTZb|+x>f)K!-57KCx_$TDvz81fz+n<kR2q{Y+cBpokhrI-
KpUXO@geCwNnIF#p

literal 0
HcmV?d00001

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();
             }