diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-1-autotile.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-1-autotile.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-1-autotile.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-1-autotile.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-1.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-1.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-1.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-1.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-10-autotile.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-10-autotile.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-10-autotile.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-10-autotile.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-11-autotile1.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-11-autotile1.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-11-autotile1.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-11-autotile1.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-11-autotile2.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-11-autotile2.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-11-autotile2.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-11-autotile2.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-11-autotile3.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-11-autotile3.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-11-autotile3.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-11-autotile3.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-11.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-11.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-11.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-11.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-12-autotile1.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-12-autotile1.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-12-autotile1.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-12-autotile1.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-12-autotile2.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-12-autotile2.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-12-autotile2.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-12-autotile2.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-12-autotile3.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-12-autotile3.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-12-autotile3.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-12-autotile3.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-12-autotile4.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-12-autotile4.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-12-autotile4.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-12-autotile4.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-12.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-12.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-12.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-12.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-2-autotile.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-2-autotile.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-2-autotile.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-2-autotile.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-3-autotile.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-3-autotile.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-3-autotile.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-3-autotile.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-4-autotile.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-4-autotile.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-4-autotile.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-4-autotile.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-5-autotile.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-5-autotile.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-5-autotile.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-5-autotile.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-6-autotile.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-6-autotile.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-6-autotile.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-6-autotile.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-7-autotile.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-7-autotile.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-7-autotile.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-7-autotile.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-7-mid-2.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-2.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-7-mid-2.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-2.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-7-mid-3.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-3.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-7-mid-3.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-3.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-7-mid-4.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-4.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-7-mid-4.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-4.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-7-mid-5.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-5.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-7-mid-5.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-5.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-7-mid-6.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-6.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-7-mid-6.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-6.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-7-mid-7.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-7.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-7-mid-7.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-7.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-7-mid-8.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-8.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-7-mid-8.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-8.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-7-mid-9.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-9.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-7-mid-9.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-7-mid-9.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-8-autotile.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-8-autotile.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-8-autotile.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-8-autotile.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-8-mid-2.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-8-mid-2.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-8-mid-2.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-8-mid-2.png diff --git a/core/assets-raw/sprites/blocks/environment/crux-floor-9-autotile.png b/core/assets-raw/sprites/blocks/environment/metal-tiles-9-autotile.png similarity index 100% rename from core/assets-raw/sprites/blocks/environment/crux-floor-9-autotile.png rename to core/assets-raw/sprites/blocks/environment/metal-tiles-9-autotile.png diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index 9034485d7a..3dd7ba580b 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1680,6 +1680,18 @@ 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.metal-tiles-1.name = Metal Tiles 1 +block.metal-tiles-2.name = Metal Tiles 2 +block.metal-tiles-3.name = Metal Tiles 3 +block.metal-tiles-4.name = Metal Tiles 4 +block.metal-tiles-5.name = Metal Tiles 5 +block.metal-tiles-6.name = Metal Tiles 6 +block.metal-tiles-7.name = Metal Tiles 7 +block.metal-tiles-8.name = Metal Tiles 8 +block.metal-tiles-9.name = Metal Tiles 9 +block.metal-tiles-10.name = Metal Tiles 10 +block.metal-tiles-11.name = Metal Tiles 11 +block.metal-tiles-12.name = Metal Tiles 12 block.colored-floor.name = Colored Floor block.colored-wall.name = Colored Wall block.character-overlay.name = Character Overlay diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index 83d7bd996c..ff3282c8fa 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -600,19 +600,19 @@ 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 -63078=crux-floor-2|block-crux-floor-2-ui -63077=crux-floor-3|block-crux-floor-3-ui -63076=crux-floor-4|block-crux-floor-4-ui +63079=metal-tiles-1|block-metal-tiles-1-ui +63078=metal-tiles-2|block-metal-tiles-2-ui +63077=metal-tiles-3|block-metal-tiles-3-ui +63076=metal-tiles-4|block-metal-tiles-4-ui 63075=colored-floor|block-colored-floor-ui -63074=crux-floor-5|block-crux-floor-5-ui -63073=crux-floor-6|block-crux-floor-6-ui -63072=crux-floor-7|block-crux-floor-7-ui -63071=crux-floor-8|block-crux-floor-8-ui -63070=crux-floor-9|block-crux-floor-9-ui -63069=crux-floor-10|block-crux-floor-10-ui +63074=metal-tiles-5|block-metal-tiles-5-ui +63073=metal-tiles-6|block-metal-tiles-6-ui +63072=metal-tiles-7|block-metal-tiles-7-ui +63071=metal-tiles-8|block-metal-tiles-8-ui +63070=metal-tiles-9|block-metal-tiles-9-ui +63069=metal-tiles-10|block-metal-tiles-10-ui 63068=colored-wall|block-colored-wall-ui -63067=crux-floor-11|block-crux-floor-11-ui -63066=crux-floor-12|block-crux-floor-12-ui +63067=metal-tiles-11|block-metal-tiles-11-ui +63066=metal-tiles-12|block-metal-tiles-12-ui 63065=character-overlay|block-character-overlay-ui 63064=character-overlay-white|block-character-overlay-white-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 39c646818c..f1e98cd80d 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -63,7 +63,7 @@ public class Blocks{ //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, + metalTiles1, metalTiles2, metalTiles3, metalTiles4, metalTiles5, metalTiles6, metalTiles7, metalTiles8, metalTiles9, metalTiles10, metalTiles11, metalTiles12, //colored coloredFloor, coloredWall, @@ -820,37 +820,37 @@ public class Blocks{ darkMetal = new StaticWall("dark-metal"); - cruxFloor1 = new Floor("crux-floor-1"){{ + metalTiles1 = new Floor("metal-tiles-1"){{ autotile = true; drawEdgeOut = false; drawEdgeIn = false; }}; - cruxFloor2 = new Floor("crux-floor-2"){{ + metalTiles2 = new Floor("metal-tiles-2"){{ autotile = true; drawEdgeOut = false; drawEdgeIn = false; }}; - cruxFloor3 = new Floor("crux-floor-3"){{ + metalTiles3 = new Floor("metal-tiles-3"){{ autotile = true; drawEdgeOut = false; drawEdgeIn = false; }}; - cruxFloor4 = new Floor("crux-floor-4"){{ + metalTiles4 = new Floor("metal-tiles-4"){{ autotile = true; drawEdgeOut = false; drawEdgeIn = false; }}; - cruxFloor5 = new Floor("crux-floor-5"){{ + metalTiles5 = new Floor("metal-tiles-5"){{ autotile = true; drawEdgeOut = false; drawEdgeIn = false; }}; - cruxFloor6 = new Floor("crux-floor-6"){{ + metalTiles6 = new Floor("metal-tiles-6"){{ autotile = true; drawEdgeOut = false; drawEdgeIn = false; @@ -860,40 +860,40 @@ public class Blocks{ lightColor = Team.crux.color.cpy().a(0.3f); }}; - cruxFloor7 = new Floor("crux-floor-7"){{ + metalTiles7 = new Floor("metal-tiles-7"){{ autotile = true; drawEdgeOut = false; drawEdgeIn = false; autotileMidVariants = 9; }}; - cruxFloor8 = new Floor("crux-floor-8"){{ + metalTiles8 = new Floor("metal-tiles-8"){{ autotile = true; drawEdgeOut = false; drawEdgeIn = false; autotileMidVariants = 2; }}; - cruxFloor9 = new Floor("crux-floor-9"){{ + metalTiles9 = new Floor("metal-tiles-9"){{ autotile = true; drawEdgeOut = false; drawEdgeIn = false; }}; - cruxFloor10 = new Floor("crux-floor-10"){{ + metalTiles10 = new Floor("metal-tiles-10"){{ autotile = true; drawEdgeOut = false; drawEdgeIn = false; }}; - cruxFloor11 = new Floor("crux-floor-11"){{ + metalTiles11 = new Floor("metal-tiles-11"){{ autotile = true; drawEdgeOut = false; drawEdgeIn = false; autotileVariants = 3; }}; - cruxFloor12 = new Floor("crux-floor-12"){{ + metalTiles12 = new Floor("metal-tiles-12"){{ autotile = true; drawEdgeOut = false; drawEdgeIn = false;