diff --git a/core/src/io/anuke/mindustry/content/Blocks.java b/core/src/io/anuke/mindustry/content/Blocks.java index a01af9f7b1..5ce4ee6276 100644 --- a/core/src/io/anuke/mindustry/content/Blocks.java +++ b/core/src/io/anuke/mindustry/content/Blocks.java @@ -768,7 +768,6 @@ public class Blocks implements ContentList{ }}; thruster = new Wall("thruster"){{ - requirements(Category.defense, () -> state.rules.infiniteResources, ItemStack.with()); health = 55 * 16 * wallHealthMultiplier; size = 4; }}; @@ -1079,12 +1078,12 @@ public class Blocks implements ContentList{ 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; + itemDuration = 60f; hasLiquids = true; size = 3; consumes.item(Items.pyratite).optional(true, false); - consumes.liquid(Liquids.cryofluid, 0.2f); + consumes.liquid(Liquids.cryofluid, 0.18f); }}; rtgGenerator = new DecayGenerator("rtg-generator"){{ diff --git a/core/src/io/anuke/mindustry/world/Block.java b/core/src/io/anuke/mindustry/world/Block.java index 1963f72871..cb546d8e02 100644 --- a/core/src/io/anuke/mindustry/world/Block.java +++ b/core/src/io/anuke/mindustry/world/Block.java @@ -584,7 +584,7 @@ public class Block extends BlockStorage{ public void displayConsumption(Tile tile, Table table){ table.left(); for(Consume cons : consumes.all()){ - if(cons.isOptional()) continue; + if(cons.isOptional() && cons.isBoost()) continue; cons.build(tile, table); } } diff --git a/core/src/io/anuke/mindustry/world/consumers/Consume.java b/core/src/io/anuke/mindustry/world/consumers/Consume.java index 98ead521d7..be5d0d6af8 100644 --- a/core/src/io/anuke/mindustry/world/consumers/Consume.java +++ b/core/src/io/anuke/mindustry/world/consumers/Consume.java @@ -48,6 +48,10 @@ public abstract class Consume{ return optional; } + public boolean isBoost(){ + return booster; + } + public boolean isUpdate(){ return update; }