diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index c1e25e1677..a29988cb38 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -1045,7 +1045,7 @@ public class Blocks implements ContentList{ size = 2; }}; - differentialGenerator = new ItemLiquidGenerator(true, true, "differential-generator"){{ + differentialGenerator = new SingleTypeGenerator(true, false, "differential-generator"){{ requirements(Category.power, ItemStack.with(Items.copper, 140, Items.titanium, 100, Items.lead, 200, Items.silicon, 130, Items.metaglass, 100)); powerProduction = 16f; itemDuration = 50f; diff --git a/core/src/io/anuke/mindustry/content/Mechs.java b/core/src/io/anuke/mindustry/content/Mechs.java index 060e0916b4..cad54f3588 100644 --- a/core/src/io/anuke/mindustry/content/Mechs.java +++ b/core/src/io/anuke/mindustry/content/Mechs.java @@ -50,7 +50,7 @@ public class Mechs implements ContentList{ @Override public void updateAlt(Player player){ - player.healBy(Time.delta() * 0.4f); + player.healBy(Time.delta() * 0.1f); } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java index bb2e35f4f1..79ad2cc897 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/ItemLiquidGenerator.java @@ -79,6 +79,11 @@ public class ItemLiquidGenerator extends PowerGenerator{ //Power amount is delta'd by PowerGraph class already. float calculationDelta = entity.delta(); + if(!entity.cons.valid()){ + entity.productionEfficiency = 0.0f; + return; + } + Liquid liquid = null; for(Liquid other : content.liquids()){ if(hasLiquids && entity.liquids.get(other) >= 0.001f && getLiquidEfficiency(other) >= minLiquidEfficiency){ diff --git a/core/src/io/anuke/mindustry/world/blocks/power/SingleTypeGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/SingleTypeGenerator.java new file mode 100644 index 0000000000..9caf39dc5c --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/power/SingleTypeGenerator.java @@ -0,0 +1,20 @@ +package io.anuke.mindustry.world.blocks.power; + +import io.anuke.mindustry.type.Item; +import io.anuke.mindustry.type.Liquid; + +public class SingleTypeGenerator extends ItemLiquidGenerator{ + public SingleTypeGenerator(boolean hasItems, boolean hasLiquids, String name){ + super(hasItems, hasLiquids, name); + } + + @Override + protected float getItemEfficiency(Item item){ + return 1f; + } + + @Override + protected float getLiquidEfficiency(Liquid liquid){ + return 0f; + } +}