diff --git a/core/assets-raw/sprites/blocks/environment/ore-wall-thorium1.png b/core/assets-raw/sprites/blocks/environment/ore-wall-thorium1.png new file mode 100644 index 0000000000..474c51942c Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-wall-thorium1.png differ diff --git a/core/assets-raw/sprites/blocks/environment/ore-wall-thorium2.png b/core/assets-raw/sprites/blocks/environment/ore-wall-thorium2.png new file mode 100644 index 0000000000..4ea1ec3065 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-wall-thorium2.png differ diff --git a/core/assets-raw/sprites/blocks/environment/ore-wall-thorium3.png b/core/assets-raw/sprites/blocks/environment/ore-wall-thorium3.png new file mode 100644 index 0000000000..266b53f814 Binary files /dev/null and b/core/assets-raw/sprites/blocks/environment/ore-wall-thorium3.png differ diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index bef9ebc7cb..a99ce0931f 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -46,7 +46,6 @@ public class Blocks{ redmat, bluemat, stoneWall, dirtWall, sporeWall, iceWall, daciteWall, sporePine, snowPine, pine, shrubs, whiteTree, whiteTreeDead, sporeCluster, redweed, purbush, yellowCoral, - //TODO rename steamvent to rhyolite vent, maybe add red vent or crystal vent rhyoliteVent, carbonVent, arkyicVent, yellowStoneVent, redStoneVent, regolithWall, yellowStoneWall, rhyoliteWall, carbonWall, redIceWall, ferricStoneWall, beryllicStoneWall, arkyicWall, crystallineStoneWall, redStoneWall, redDiamondWall, ferricStone, ferricCraters, carbonStone, beryllicStone, crystallineStone, crystalFloor, yellowStonePlates, @@ -60,7 +59,7 @@ public class Blocks{ //ores oreCopper, oreLead, oreScrap, oreCoal, oreTitanium, oreThorium, - oreTungsten, oreCrystalThorium, + oreTungsten, oreCrystalThorium, wallOreThorium, //wall ores wallOreBeryl, graphiticWall, wallOreTungsten, @@ -828,6 +827,10 @@ public class Blocks{ oreCrystalThorium = new OreBlock("ore-crystal-thorium", Items.thorium); + wallOreThorium = new OreBlock("ore-wall-thorium", Items.thorium){{ + wallOre = true; + }}; + wallOreBeryl = new OreBlock("ore-wall-beryllium", Items.beryllium){{ wallOre = true; }}; diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index ecf770ee3e..b9115dbf5a 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -93,7 +93,7 @@ public class ErekirTechTree{ //TODO move into turbine condenser? node(plasmaBore, () -> { node(impactDrill, Seq.with(new OnSector(aware)), () -> { - node(largePlasmaBore, Seq.with(new OnSector(four)), () -> { + node(largePlasmaBore, Seq.with(new OnSector(five)), () -> { node(eruptionDrill, () -> { }); @@ -203,7 +203,7 @@ public class ErekirTechTree{ node(sublimate, () -> { //TODO implement - node(titan, () -> { + node(titan, Seq.with(new OnSector(five)), () -> { });