diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-1.png b/core/assets-raw/sprites/blocks/environment/crux-floor-1.png index 66f26a95bf..d20970e1fa 100644 Binary files a/core/assets-raw/sprites/blocks/environment/crux-floor-1.png and b/core/assets-raw/sprites/blocks/environment/crux-floor-1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-11.png b/core/assets-raw/sprites/blocks/environment/crux-floor-11.png new file mode 100644 index 0000000000..31720bc1b9 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-11.png differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-12.png b/core/assets-raw/sprites/blocks/environment/crux-floor-12.png new file mode 100644 index 0000000000..f514f879fe Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/crux-floor-12.png differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-4-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-4-autotile.png index ed83b0e931..f3bbc7bbc3 100644 Binary files a/core/assets-raw/sprites/blocks/environment/crux-floor-4-autotile.png and b/core/assets-raw/sprites/blocks/environment/crux-floor-4-autotile.png differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-8-autotile.png b/core/assets-raw/sprites/blocks/environment/crux-floor-8-autotile.png index f3bbc7bbc3..ed83b0e931 100644 Binary files a/core/assets-raw/sprites/blocks/environment/crux-floor-8-autotile.png and b/core/assets-raw/sprites/blocks/environment/crux-floor-8-autotile.png differ diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-4-mid-2.png b/core/assets-raw/sprites/blocks/environment/crux-floor-8-mid-2.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-4-mid-2.png rename to core/assets-raw/sprites/blocks/environment/crux-floor-8-mid-2.png diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index a7164a71db..9034485d7a 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1680,7 +1680,7 @@ block.metal-floor-3.name = Metal Floor 3 block.metal-floor-4.name = Metal Floor 4 block.metal-floor-5.name = Metal Floor 5 block.metal-floor-damaged.name = Damaged Metal Floor -block.colored-floor.name = Colored Floor +block.colored-floor.name = Colored Floor block.colored-wall.name = Colored Wall block.character-overlay.name = Character Overlay block.character-overlay-white.name = Character Overlay (White) diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 5a7c4e3b20..39c646818c 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -62,7 +62,6 @@ public class Blocks{ metalFloor, metalFloorDamaged, metalFloor2, metalFloor3, metalFloor4, metalFloor5, basalt, magmarock, hotrock, snowWall, saltWall, //old metal floors darkPanel1, darkPanel2, darkPanel3, darkPanel4, darkPanel5, darkPanel6, darkMetal, - //new metal floors cruxFloor1, cruxFloor2, cruxFloor3, cruxFloor4, cruxFloor5, cruxFloor6, cruxFloor7, cruxFloor8, cruxFloor9, cruxFloor10, cruxFloor11, cruxFloor12, @@ -843,7 +842,6 @@ public class Blocks{ autotile = true; drawEdgeOut = false; drawEdgeIn = false; - autotileMidVariants = 2; }}; cruxFloor5 = new Floor("crux-floor-5"){{ @@ -873,6 +871,7 @@ public class Blocks{ autotile = true; drawEdgeOut = false; drawEdgeIn = false; + autotileMidVariants = 2; }}; cruxFloor9 = new Floor("crux-floor-9"){{