diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-bottom.png b/core/assets-raw/sprites/blocks/production/slag-heater-bottom.png new file mode 100644 index 0000000000..1500ec39a0 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-heater-bottom.png differ diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-heat.png b/core/assets-raw/sprites/blocks/production/slag-heater-heat.png new file mode 100644 index 0000000000..e6b68412df Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-heater-heat.png differ diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-top1.png b/core/assets-raw/sprites/blocks/production/slag-heater-top1.png new file mode 100644 index 0000000000..25c3155f75 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-heater-top1.png differ diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-top2.png b/core/assets-raw/sprites/blocks/production/slag-heater-top2.png new file mode 100644 index 0000000000..a0ba5f8446 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-heater-top2.png differ diff --git a/core/assets-raw/sprites/blocks/production/slag-heater.png b/core/assets-raw/sprites/blocks/production/slag-heater.png new file mode 100644 index 0000000000..1dbf8eb644 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/slag-heater.png differ diff --git a/core/assets/bundles/bundle.properties b/core/assets/bundles/bundle.properties index c8840e415b..6c2c48e5ce 100644 --- a/core/assets/bundles/bundle.properties +++ b/core/assets/bundles/bundle.properties @@ -1945,6 +1945,7 @@ block.electrolyzer.name = Electrolyzer block.atmospheric-concentrator.name = Atmospheric Concentrator block.oxidation-chamber.name = Oxidation Chamber block.electric-heater.name = Electric Heater +block.slag-heater.name = Slag Heater block.phase-heater.name = Phase Heater block.heat-redirector.name = Heat Redirector block.slag-incinerator.name = Slag Incinerator diff --git a/core/assets/contributors b/core/assets/contributors index c84d992f91..774513644c 100644 --- a/core/assets/contributors +++ b/core/assets/contributors @@ -138,4 +138,5 @@ Jerzy Paciorkiewicz YozoZChomutova Qendolin Goobrr +BlueWolf [Error_27] diff --git a/core/assets/icons/icons.properties b/core/assets/icons/icons.properties index c539d3255b..e0de3ab0ae 100755 --- a/core/assets/icons/icons.properties +++ b/core/assets/icons/icons.properties @@ -563,3 +563,4 @@ 63121=tank-refabricator|block-tank-refabricator-ui 63120=mech-refabricator|block-mech-refabricator-ui 63119=ship-refabricator|block-ship-refabricator-ui +63118=slag-heater|block-slag-heater-ui diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index a8c354b4d4..6efe28243a 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -71,7 +71,7 @@ public class Blocks{ melter, separator, disassembler, sporePress, pulverizer, incinerator, coalCentrifuge, //erekir - siliconArcFurnace, electrolyzer, oxidationChamber, atmosphericConcentrator, electricHeater, phaseHeater, heatRedirector, slagIncinerator, + siliconArcFurnace, electrolyzer, oxidationChamber, atmosphericConcentrator, electricHeater, slagHeater, phaseHeater, heatRedirector, slagIncinerator, carbideCrucible, slagCentrifuge, surgeCrucible, cyanogenSynthesizer, phaseSynthesizer, heatReactor, //sandbox @@ -1251,6 +1251,20 @@ public class Blocks{ regionRotated1 = 1; consumePower(50f / 60f); }}; + + slagHeater = new HeatProducer("slag-heater"){{ + requirements(Category.crafting, with(Items.tungsten, 50, Items.oxide, 20, Items.beryllium, 20)); + + researchCostMultiplier = 4f; + + drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidTile(Liquids.slag), new DrawDefault(), new DrawHeatOutput()); + size = 3; + liquidCapacity = 40f; + rotateDraw = false; + regionRotated1 = 1; + consumeLiquid(Liquids.slag, 40f / 60f); + heatOutput = 6f; + }}; phaseHeater = new HeatProducer("phase-heater"){{ requirements(Category.crafting, with(Items.oxide, 30, Items.carbide, 30, Items.beryllium, 30)); diff --git a/core/src/mindustry/content/ErekirTechTree.java b/core/src/mindustry/content/ErekirTechTree.java index c3e0c06a9d..0ba1f44c57 100644 --- a/core/src/mindustry/content/ErekirTechTree.java +++ b/core/src/mindustry/content/ErekirTechTree.java @@ -197,6 +197,10 @@ public class ErekirTechTree{ }); }); + node(slagHeater, () -> { + + }); + node(atmosphericConcentrator, Seq.with(new OnSector(four)), () -> { node(cyanogenSynthesizer, Seq.with(new OnSector(four)), () -> {