diff --git a/core/src/mindustry/content/Blocks.java b/core/src/mindustry/content/Blocks.java index 3ea76eed2e..ff1bbbebe8 100644 --- a/core/src/mindustry/content/Blocks.java +++ b/core/src/mindustry/content/Blocks.java @@ -6497,7 +6497,7 @@ public class Blocks{ regionSuffix = "-dark"; size = 3; - configurable = false; + showAllCommands = false; consumePower(3f); consumeLiquid(Liquids.hydrogen, 3f / 60f); consumeItems(with(Items.silicon, 40, Items.tungsten, 30)); @@ -6515,7 +6515,7 @@ public class Blocks{ regionSuffix = "-dark"; size = 3; - configurable = false; + showAllCommands = false; consumePower(2.5f); consumeLiquid(Liquids.hydrogen, 3f / 60f); consumeItems(with(Items.silicon, 60, Items.tungsten, 40)); @@ -6534,7 +6534,7 @@ public class Blocks{ regionSuffix = "-dark"; size = 3; - configurable = false; + showAllCommands = false; consumePower(2.5f); consumeLiquid(Liquids.hydrogen, 3f / 60f); consumeItems(with(Items.silicon, 50, Items.tungsten, 40)); @@ -6547,7 +6547,6 @@ public class Blocks{ ); }}; - //yes very silly name primeRefabricator = new Reconstructor("prime-refabricator"){{ requirements(Category.units, with(Items.thorium, 250, Items.oxide, 200, Items.tungsten, 200, Items.silicon, 400)); regionSuffix = "-dark"; @@ -6555,7 +6554,7 @@ public class Blocks{ researchCostMultipliers.put(Items.thorium, 0.2f); size = 5; - configurable = false; + showAllCommands = false; consumePower(4.5f); consumeLiquid(Liquids.nitrogen, 10f / 60f); consumeItems(with(Items.thorium, 80, Items.silicon, 100)); diff --git a/core/src/mindustry/world/blocks/units/Reconstructor.java b/core/src/mindustry/world/blocks/units/Reconstructor.java index f02fcf384c..0432cad986 100644 --- a/core/src/mindustry/world/blocks/units/Reconstructor.java +++ b/core/src/mindustry/world/blocks/units/Reconstructor.java @@ -39,6 +39,7 @@ public class Reconstructor extends UnitBlock{ public Sound createSound = Sounds.unitCreate; public float createSoundVolume = 1f; + public boolean showAllCommands = true; public Reconstructor(String name){ super(name); @@ -187,7 +188,7 @@ public class Reconstructor extends UnitBlock{ if(build != null && build.team == this.team){ commandPos.set(build); } - } + } } @Override @@ -197,7 +198,7 @@ public class Reconstructor extends UnitBlock{ public boolean canSetCommand(){ var output = unit(); - return output == null || output.allowChangeCommands; + return showAllCommands ? (output == null || output.allowChangeCommands) : output != null && output.commands.size > 1; } @Override @@ -214,6 +215,8 @@ public class Reconstructor extends UnitBlock{ public void buildConfiguration(Table table){ var unit = unit(); + if(!showAllCommands && unit == null) return; + var group = new ButtonGroup(); group.setMinCheckCount(0); int i = 0, columns = 5;