diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index eada479dc9..425b909f02 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -82,7 +82,7 @@ public class Recipes implements ContentList{ new Recipe(distribution, DistributionBlocks.junction, new ItemStack(Items.copper, 2)).setAlwaysUnlocked(true); new Recipe(distribution, DistributionBlocks.router, new ItemStack(Items.copper, 6)).setAlwaysUnlocked(true); - //advanced densealloy transporat + //more advanced transport new Recipe(distribution, DistributionBlocks.distributor, new ItemStack(Items.densealloy, 8), new ItemStack(Items.copper, 8)); new Recipe(distribution, DistributionBlocks.sorter, new ItemStack(Items.densealloy, 4), new ItemStack(Items.copper, 4)); new Recipe(distribution, DistributionBlocks.overflowGate, new ItemStack(Items.densealloy, 4), new ItemStack(Items.copper, 8)); @@ -114,7 +114,6 @@ public class Recipes implements ContentList{ //processing new Recipe(crafting, CraftingBlocks.biomatterCompressor, new ItemStack(Items.lead, 70), new ItemStack(Items.silicon, 60)); new Recipe(crafting, CraftingBlocks.separator, new ItemStack(Items.copper, 60), new ItemStack(Items.densealloy, 50)); - new Recipe(crafting, CraftingBlocks.centrifuge, new ItemStack(Items.copper, 130), new ItemStack(Items.densealloy, 130), new ItemStack(Items.silicon, 60), new ItemStack(Items.titanium, 50)); //POWER new Recipe(power, PowerBlocks.powerNode, new ItemStack(Items.copper, 2), new ItemStack(Items.lead, 6)) @@ -175,7 +174,9 @@ public class Recipes implements ContentList{ new Recipe(units, UnitBlocks.revenantFactory, new ItemStack(Items.plastanium, 300), new ItemStack(Items.titanium, 400), new ItemStack(Items.lead, 300), new ItemStack(Items.silicon, 400), new ItemStack(Items.surgealloy, 100)); new Recipe(units, UnitBlocks.repairPoint, new ItemStack(Items.lead, 30), new ItemStack(Items.copper, 30), new ItemStack(Items.silicon, 30)); - new Recipe(units, UnitBlocks.commandCenter, new ItemStack(Items.lead, 100), new ItemStack(Items.densealloy, 100), new ItemStack(Items.silicon, 200)); + + //removed for testing MOBA-style unit production + //new Recipe(units, UnitBlocks.commandCenter, new ItemStack(Items.lead, 100), new ItemStack(Items.densealloy, 100), new ItemStack(Items.silicon, 200)); //LIQUIDS new Recipe(liquid, LiquidBlocks.conduit, new ItemStack(Items.lead, 1)); diff --git a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java index 84ba6b2709..2d1bf0d05f 100644 --- a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java @@ -12,7 +12,7 @@ import io.anuke.mindustry.world.blocks.production.*; public class CraftingBlocks extends BlockList implements ContentList{ public static Block arcsmelter, siliconsmelter, plastaniumCompressor, phaseWeaver, alloySmelter, pyratiteMixer, blastMixer, - cryofluidmixer, melter, separator, biomatterCompressor, pulverizer, solidifier, incinerator; + cryofluidmixer, melter, separator, biomatterCompressor, pulverizer, incinerator; @Override public void load(){ @@ -36,7 +36,6 @@ public class CraftingBlocks extends BlockList implements ContentList{ liquidCapacity = 60f; craftTime = 60f; output = Items.plastanium; - itemCapacity = 30; powerCapacity = 40f; size = 2; health = 320; @@ -77,7 +76,6 @@ public class CraftingBlocks extends BlockList implements ContentList{ cryofluidmixer = new LiquidMixer("cryofluidmixer"){{ outputLiquid = Liquids.cryofluid; liquidPerItem = 50f; - itemCapacity = 50; size = 2; hasPower = true; @@ -87,7 +85,6 @@ public class CraftingBlocks extends BlockList implements ContentList{ }}; blastMixer = new GenericCrafter("blast-mixer"){{ - itemCapacity = 20; hasItems = true; hasPower = true; hasLiquids = true; @@ -101,7 +98,6 @@ public class CraftingBlocks extends BlockList implements ContentList{ pyratiteMixer = new PowerSmelter("pyratite-mixer"){{ flameColor = Color.CLEAR; - itemCapacity = 20; hasItems = true; hasPower = true; result = Items.pyratite; @@ -116,7 +112,6 @@ public class CraftingBlocks extends BlockList implements ContentList{ health = 200; outputLiquid = Liquids.slag; outputLiquidAmount = 1f; - itemCapacity = 20; craftTime = 10f; size = 2; hasLiquids = hasPower = true; @@ -135,7 +130,6 @@ public class CraftingBlocks extends BlockList implements ContentList{ hasPower = true; filterTime = 15f; - itemCapacity = 60; health = 50 * 4; spinnerLength = 1.5f; spinnerRadius = 3.5f; @@ -149,7 +143,6 @@ public class CraftingBlocks extends BlockList implements ContentList{ biomatterCompressor = new Compressor("biomattercompressor"){{ liquidCapacity = 60f; - itemCapacity = 50; craftTime = 20f; outputLiquid = Liquids.oil; outputLiquidAmount = 2.5f; @@ -162,15 +155,13 @@ public class CraftingBlocks extends BlockList implements ContentList{ }}; pulverizer = new Pulverizer("pulverizer"){{ - itemCapacity = 40; output = Items.sand; - health = 80; craftEffect = BlockFx.pulverize; craftTime = 40f; updateEffect = BlockFx.pulverizeSmall; hasItems = hasPower = true; - consumes.item(Items.stone, 1); + consumes.item(Items.scrap, 1); consumes.power(0.05f); }}; diff --git a/core/src/io/anuke/mindustry/world/BaseBlock.java b/core/src/io/anuke/mindustry/world/BaseBlock.java index d868d9a2d3..22b60c1936 100644 --- a/core/src/io/anuke/mindustry/world/BaseBlock.java +++ b/core/src/io/anuke/mindustry/world/BaseBlock.java @@ -28,7 +28,7 @@ public abstract class BaseBlock extends MappableContent{ public boolean consumesPower = true; public boolean outputsPower; - public int itemCapacity; + public int itemCapacity = 10; public float liquidCapacity = 10f; public float liquidFlowFactor = 4.9f; public float powerCapacity = 10f; diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java index fb3372a975..bf68358ca6 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java @@ -52,7 +52,6 @@ public class ForceProjector extends Block { hasLiquids = true; powerCapacity = 60f; hasItems = true; - itemCapacity = 10; consumes.add(new ConsumeLiquidFilter(liquid -> liquid.temperature <= 0.5f && liquid.flammability < 0.1f, 0.1f)).optional(true).update(false); } diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java index ba90b43967..f8c64ffbb0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java @@ -44,7 +44,6 @@ public class MendProjector extends Block{ update = true; hasPower = true; hasItems = true; - itemCapacity = 10; } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java index 8877c2a3d9..1426dc9bc8 100644 --- a/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java +++ b/core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java @@ -45,7 +45,6 @@ public class OverdriveProjector extends Block{ hasPower = true; hasItems = true; canOverdrive = false; - itemCapacity = 10; } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java b/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java index 5805b23edb..e111b188fd 100644 --- a/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java +++ b/core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java @@ -33,7 +33,6 @@ public abstract class ItemGenerator extends PowerGenerator{ public ItemGenerator(String name){ super(name); - itemCapacity = 20; hasItems = true; consumes.add(new ConsumeItemFilter(item -> getItemEfficiency(item) >= minItemEfficiency)).update(false).optional(true); diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java index 0f11ef6345..c6eca7b8a2 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Drill.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Drill.java @@ -68,7 +68,6 @@ public class Drill extends Block{ update = true; solid = true; layer = Layer.overlay; - itemCapacity = 5; group = BlockGroup.drills; hasLiquids = true; liquidCapacity = 5f; diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java b/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java index ebd4799505..72dbca4222 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Fracker.java @@ -18,7 +18,6 @@ public class Fracker extends SolidPump{ public Fracker(String name){ super(name); hasItems = true; - itemCapacity = 20; singleLiquid = false; consumes.require(ConsumeItem.class); diff --git a/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java b/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java index 71af723295..934416c61b 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java @@ -52,7 +52,6 @@ public class PowerSmelter extends PowerBlock{ hasItems = true; update = true; solid = true; - itemCapacity = 20; } @Override diff --git a/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java b/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java index 985a9f0d75..d8ac64705f 100644 --- a/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java +++ b/core/src/io/anuke/mindustry/world/blocks/production/Smelter.java @@ -40,7 +40,6 @@ public class Smelter extends Block{ update = true; hasItems = true; solid = true; - itemCapacity = 20; consumes.require(ConsumeItems.class); consumes.require(ConsumeItem.class); diff --git a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java index ee9d507bef..ba30d25641 100644 --- a/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java +++ b/core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java @@ -48,7 +48,6 @@ public class UnitFactory extends Block{ hasPower = true; hasItems = true; solid = false; - itemCapacity = 10; flags = EnumSet.of(BlockFlag.producer, BlockFlag.target); consumes.require(ConsumeItems.class);