From cbef6adeb1dd6ca5f22a0b61ca7cb5833475d0e7 Mon Sep 17 00:00:00 2001 From: Anuken Date: Thu, 4 Apr 2019 21:49:45 -0400 Subject: [PATCH] Crafter bugfixes --- core/src/io/anuke/mindustry/content/Blocks.java | 6 ++++-- core/src/io/anuke/mindustry/core/Renderer.java | 2 +- .../mindustry/world/blocks/production/GenericCrafter.java | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index 0bf7edab5e..09e045a227 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -517,18 +517,19 @@ public class Blocks implements ContentList{ cryofluidMixer = new GenericCrafter("cryofluidmixer"){{ requirements(Category.crafting, ItemStack.with(Items.lead, 130, Items.silicon, 80, Items.thorium, 90)); - outputLiquid = new LiquidStack(Liquids.cryofluid, 0.3f); + outputLiquid = new LiquidStack(Liquids.cryofluid, 0.6f); craftTime = 5f; size = 2; hasPower = true; hasItems = true; + hasLiquids = true; rotate = false; solid = true; outputsLiquid = true; consumes.power(1f); consumes.item(Items.titanium); - consumes.liquid(Liquids.water, 0.3f); + consumes.liquid(Liquids.water, 0.6f); int liquidRegion = reg("-liquid"), topRegion = reg("-top"), bottomRegion = reg("-bottom"); @@ -629,6 +630,7 @@ public class Blocks implements ContentList{ health = 320; hasLiquids = true; hasPower = true; + craftEffect = Fx.none; consumes.item(Items.sporePod, 1); consumes.power(0.60f); diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java index 41a37cb3a5..7ae8d05870 100644 --- a/core/src/io/anuke/mindustry/core/Renderer.java +++ b/core/src/io/anuke/mindustry/core/Renderer.java @@ -163,7 +163,7 @@ public class Renderer implements ApplicationListener{ graphics.clear(clearColor); - if(!graphics.isHidden() && (Core.settings.getBool("animatedwater") || Core.settings.getBool("animatedshields")) && shieldBuffer.getWidth() != graphics.getWidth() || shieldBuffer.getHeight() != graphics.getHeight()){ + if(!graphics.isHidden() && (Core.settings.getBool("animatedwater") || Core.settings.getBool("animatedshields")) && (shieldBuffer.getWidth() != graphics.getWidth() || shieldBuffer.getHeight() != graphics.getHeight())){ shieldBuffer.resize(graphics.getWidth(), graphics.getHeight()); } diff --git a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java b/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java index 385f7ce3b2..cd71ea3440 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/GenericCrafter.java @@ -30,7 +30,7 @@ public class GenericCrafter extends Block{ protected LiquidStack outputLiquid; protected float craftTime = 80; - protected Effect craftEffect = Fx.purify; + protected Effect craftEffect = Fx.none; protected Effect updateEffect = Fx.none; protected float updateEffectChance = 0.04f;