From 64efa599d02417d46990d687d431ef629c1be2d4 Mon Sep 17 00:00:00 2001 From: Anuken Date: Sun, 21 Nov 2021 14:06:18 -0500 Subject: [PATCH] Slag heater block --- .../blocks/production/slag-heater-bottom.png | Bin 0 -> 223 bytes .../blocks/production/slag-heater-heat.png | Bin 0 -> 8577 bytes .../blocks/production/slag-heater-liquid.png | Bin 0 -> 246 bytes .../blocks/production/slag-heater-top.png | Bin 0 -> 159 bytes .../blocks/production/slag-heater-top1.png | Bin 0 -> 459 bytes .../blocks/production/slag-heater-top2.png | Bin 0 -> 465 bytes .../sprites/blocks/production/slag-heater.png | Bin 0 -> 756 bytes core/assets/icons/icons.properties | 1 + core/assets/logicids.dat | Bin 3440 -> 3453 bytes core/src/mindustry/content/Blocks.java | 16 +++++++++++++--- .../world/blocks/heat/HeatProducer.java | 6 ++---- .../mindustry/world/draw/DrawHeatOutput.java | 7 +++++++ 12 files changed, 23 insertions(+), 7 deletions(-) create mode 100644 core/assets-raw/sprites/blocks/production/slag-heater-bottom.png create mode 100644 core/assets-raw/sprites/blocks/production/slag-heater-heat.png create mode 100644 core/assets-raw/sprites/blocks/production/slag-heater-liquid.png create mode 100644 core/assets-raw/sprites/blocks/production/slag-heater-top.png create mode 100644 core/assets-raw/sprites/blocks/production/slag-heater-top1.png create mode 100644 core/assets-raw/sprites/blocks/production/slag-heater-top2.png create mode 100644 core/assets-raw/sprites/blocks/production/slag-heater.png 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 0000000000000000000000000000000000000000..16e718a939271a4350c5a544997bb855ed8e2a51 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|W_r3fhE&XX zd%;ogfC9q-0|$Yc5Ba$#P9*m>#XYzCE^WW9q~RKa>;h8<_6*(&j8V*V;@)E3`hrQo UchRd&Ku0ooy85}Sb4q9e07Sh;OaK4? literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..1b293c32c8e5c4ef6aa3fe146b2fa17ef6c7c31c GIT binary patch literal 8577 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 literal 0 HcmV?d00001 diff --git a/core/assets-raw/sprites/blocks/production/slag-heater-top.png b/core/assets-raw/sprites/blocks/production/slag-heater-top.png new file mode 100644 index 0000000000000000000000000000000000000000..cadd63b0c69f026336249996582a3c724d778ad3 GIT binary patch literal 159 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|B0XIkLn`LH zy%fmj5Fo&OVEeoJ=UccQw%=e_Io-ai?m)C#$7|PJ>=5M)@utis%S2dxehFlNL_A&nT-G@yGywpak~Sv* literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..7a563faa78db942131260c58a96e4bdb084e1ccd GIT binary patch literal 459 zcmV;+0W|)JP)Px$g-Jv~RCt{2n!S<2Fc3yR7y=5oxhAd_TJaEG=#cQ{TA>!Ypn!|)i!@`z8YFAi z-j()+Fo3?NMZX3d$8j9TaT;Z}bpy6yxb`E^sDKb2Xi&g3JW!c{5bl2aBj5k{IzGL& zmu=E|Ona6JI!6@(;<5(PC72gLh0npXfYR^)lYs7A-Vko)2ErKgvj9~E`%|Bs%e(;K zQ9@4ms^Az8)G}QAQ7WMNa*2a;m$+&HbG^(J;BB3Napj-eTKd-A70LV%>NPY1daELKc0Tf(SVO9VaE@0~hY>im~T$>}cOW~Ng zz^@iUrkBD~B=`F21xO!ss1}eCKIamILal(Do-dK0dJt^-KqMf2BxVB1L(ytjDyWKb zD!CXjFF?iBSaPx$i%CR5RCt{2nmvxfFc3yR5NFsUP*Uv?I051uh;qx6lxWWpaRQF8)s}miP(=#a zNwD!uJY&x*L5lo6kNgifj^j9v<5bEjcLQ>9KOQ=uQUQHh_*0N1nj$zMIL8mA}z__e|a0%uGP~l@REg&^Kz$D;wZju|q&D20R#{4WmRl&Z! z1?Ms^0C<)V6TT=o#sjt7kB3ewp!#wd2j?zv)dHq^ol}BZ0kI`dO?w|-mzVj}E`(xw zIdsmaP%8iklaLY~P%Z$FpV!q30AwX>q&~a^`}Vd%oAwP86+ppN6=nr+;R13uAU9?O zaBYs%E``TT1)f_7nO+JHk=*O67a)Dmp;|yl_?Sx&3bg`adOk&h>OrvT1Cbu-BQX<5 z9*P#jyMl@+r<98k^8!>{jh)U-_kC>^mpNDV)Dl_jg-DL@uc+dI1jm$US^$tP!Mp%~ zmJoVhP=o;BSwhTZiMqi{nxY>{hEnxY*&g3pIF92uj#E7kQtyo3+ul)d00000NkvXX Hu0mjflX=2- literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..2ab51c583f0267e5e0cb124d30a0a859beffc010 GIT binary patch literal 756 zcmV-mV0GJvifHQ*9vH+ACHU+Q{5P*yt=vN@xX-1K1Fc!g_ z1kuj646h)-0N&%YW%x)9G61?y=m?CAD*>>ZrS906N05^cY4e)0s!GFCB zR&Ru6276rI`3{`&)vk2$OS3wAU z4tIn{5!NeEB|_Pe7>i)_8+|oUgpxy1_6eEcM%H+AJ}5gDuLiIXyxNDWkqV$JkxF^+Ae>Vedw!e_We+xeJ&8Ie!J& diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 4ff7944899..f3ccaff9c2 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -60,7 +60,7 @@ public class Blocks implements ContentList{ //crafting siliconSmelter, siliconCrucible, siliconArcFurnace, kiln, graphitePress, plastaniumCompressor, multiPress, phaseWeaver, surgeSmelter, pyratiteMixer, blastMixer, cryofluidMixer, melter, separator, disassembler, sporePress, pulverizer, incinerator, coalCentrifuge, - electrolyzer, oxidationChamber, heatReactor, carbideCrucible, slagCentrifuge, surgeCrucible, cyanogenSynthesizer, + electrolyzer, oxidationChamber, slagHeater, heatReactor, carbideCrucible, slagCentrifuge, surgeCrucible, cyanogenSynthesizer, cellSynthesisChamber, //sandbox @@ -1010,6 +1010,17 @@ public class Blocks implements ContentList{ heatOutput = 5f; }}; + slagHeater = new HeatProducer("slag-heater"){{ + requirements(Category.crafting, with(Items.tungsten, 30, Items.graphite, 30)); + + drawer = new DrawMulti(new DrawRegion("-bottom"), new DrawLiquidRegion(Liquids.slag), new DrawRegion("-top"), new DrawHeatOutput(true)); + iconOverride = new String[]{"-bottom", "", "-top"}; + size = 2; + craftTime = 60f * 1f; + heatOutput = 2f; + consumes.liquid(Liquids.slag, 20f / 60f); + }}; + heatReactor = new HeatProducer("heat-reactor"){{ //TODO quadvent? //TODO coolant? @@ -1038,7 +1049,6 @@ public class Blocks implements ContentList{ consumes.power(2f); }}; - //TODO implement - is this even necessary? slagCentrifuge = new GenericCrafter("slag-centrifuge"){{ requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 60, Items.oxide, 40)); @@ -1070,7 +1080,7 @@ public class Blocks implements ContentList{ outputItem = new ItemStack(Items.scrap, 1); }}; - //TODO should have a useful turret ammo byproduct? + //TODO should have a useful turret ammo byproduct? scrap? //original: consumes.items(with(Items.copper, 3, Items.lead, 4, Items.titanium, 2, Items.silicon, 3)); surgeCrucible = new HeatCrafter("surge-crucible"){{ requirements(Category.crafting, with(Items.tungsten, 60, Items.graphite, 60, Items.carbide, 30)); diff --git a/core/src/mindustry/world/blocks/heat/HeatProducer.java b/core/src/mindustry/world/blocks/heat/HeatProducer.java index f4736addf9..b54f4cd5eb 100644 --- a/core/src/mindustry/world/blocks/heat/HeatProducer.java +++ b/core/src/mindustry/world/blocks/heat/HeatProducer.java @@ -15,9 +15,7 @@ public class HeatProducer extends GenericCrafter{ public HeatProducer(String name){ super(name); - drawer = new DrawMulti(new DrawHeatOutput(){{ - drawRegion = true; - }}); + drawer = new DrawHeatOutput(true); rotateDraw = false; rotate = true; canOverdrive = false; @@ -35,7 +33,7 @@ public class HeatProducer extends GenericCrafter{ public void setBars(){ super.setBars(); - bars.add("heat", (HeatProducerBuild entity) -> new Bar("bar.heat", Pal.lightOrange, () -> entity.heat)); + bars.add("heat", (HeatProducerBuild entity) -> new Bar("bar.heat", Pal.lightOrange, () -> entity.heat / heatOutput)); } public class HeatProducerBuild extends GenericCrafterBuild implements HeatBlock{ diff --git a/core/src/mindustry/world/draw/DrawHeatOutput.java b/core/src/mindustry/world/draw/DrawHeatOutput.java index a8591f414e..e88459b417 100644 --- a/core/src/mindustry/world/draw/DrawHeatOutput.java +++ b/core/src/mindustry/world/draw/DrawHeatOutput.java @@ -18,6 +18,13 @@ public class DrawHeatOutput extends DrawBlock{ public float heatPulse = 0.3f, heatPulseScl = 10f, glowMult = 1.2f; public boolean drawRegion = false; + public DrawHeatOutput(){ + } + + public DrawHeatOutput(boolean drawRegion){ + this.drawRegion = drawRegion; + } + @Override public void drawBase(Building build){ if(drawRegion) Draw.rect(build.block.region, build.x, build.y);