diff --git a/core/assets-raw/sprites/blocks/environment/ore-wall-graphite1.png b/core/assets-raw/sprites/blocks/environment/ore-wall-graphite1.png new file mode 100644 index 0000000000..42506a971a Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-wall-graphite1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/ore-wall-graphite2.png b/core/assets-raw/sprites/blocks/environment/ore-wall-graphite2.png new file mode 100644 index 0000000000..b1ad32bd59 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-wall-graphite2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/ore-wall-graphite3.png b/core/assets-raw/sprites/blocks/environment/ore-wall-graphite3.png new file mode 100644 index 0000000000..0c54a49527 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-wall-graphite3.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index c23011525f..e15b3696c1 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -65,7 +65,7 @@ public class Blocks{ //new metal floors metalTiles1, metalTiles2, metalTiles3, metalTiles4, metalTiles5, metalTiles6, metalTiles7, metalTiles8, metalTiles9, metalTiles10, metalTiles11, metalTiles12, metalTiles13, //new metal walls - metalWall1, metalWall2, metalWall3, metalWall4, + metalWall1, metalWall2, metalWall3, //colored coloredFloor, coloredWall, @@ -81,7 +81,7 @@ public class Blocks{ oreBeryllium, oreTungsten, oreCrystalThorium, wallOreThorium, //wall ores - wallOreBeryllium, graphiticWall, wallOreTungsten, + wallOreBeryllium, graphiticWall, wallOreGraphite, wallOreTungsten, //crafting siliconSmelter, siliconCrucible, kiln, graphitePress, plastaniumCompressor, multiPress, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer, @@ -1024,7 +1024,10 @@ public class Blocks{ variants = 3; }}; - //TODO merge with standard ore? + wallOreGraphite = new OreBlock("ore-wall-graphite", Items.graphite){{ + wallOre = true; + }}; + wallOreTungsten = new OreBlock("ore-wall-tungsten", Items.tungsten){{ wallOre = true; }};