diff --git a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java index 1ef6010f2b..a8462502ea 100644 --- a/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java +++ b/core/src/mindustry/world/blocks/power/ItemLiquidGenerator.java @@ -29,6 +29,7 @@ public class ItemLiquidGenerator extends PowerGenerator{ public float maxLiquidGenerate = 0.4f; public Effect generateEffect = Fx.generatespark; + public float generateEffectRnd = 3f; public Effect explodeEffect = Fx.generatespark; public Color heatColor = Color.valueOf("ff9b59"); public @Load("@-top") TextureRegion topRegion; @@ -128,12 +129,12 @@ public class ItemLiquidGenerator extends PowerGenerator{ productionEfficiency = baseLiquidEfficiency * used / maximumPossible; if(used > 0.001f && Mathf.chance(0.05 * delta())){ - generateEffect.at(x + Mathf.range(3f), y + Mathf.range(3f)); + generateEffect.at(x + Mathf.range(generateEffectRnd), y + Mathf.range(generateEffectRnd)); } }else if(hasItems){ // No liquids accepted or none supplied, try using items if accepted if(generateTime <= 0f && items.total() > 0){ - generateEffect.at(x + Mathf.range(3f), y + Mathf.range(3f)); + generateEffect.at(x + Mathf.range(generateEffectRnd), y + Mathf.range(generateEffectRnd)); Item item = items.take(); productionEfficiency = getItemEfficiency(item); explosiveness = item.explosiveness; diff --git a/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java b/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java index ff5da52aaa..95919f105b 100644 --- a/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java +++ b/core/src/mindustry/world/blocks/power/SingleTypeGenerator.java @@ -3,6 +3,7 @@ package mindustry.world.blocks.power; import mindustry.type.*; public class SingleTypeGenerator extends ItemLiquidGenerator{ + public boolean useItems = true; public SingleTypeGenerator(String name){ super(name); @@ -11,11 +12,11 @@ public class SingleTypeGenerator extends ItemLiquidGenerator{ @Override protected float getItemEfficiency(Item item){ - return 1f; + return useItems ? 1f : 0f; } @Override protected float getLiquidEfficiency(Liquid liquid){ - return 0f; + return useItems ? 0f : 1f; } }