mirrors/Mindustry
1
0
Fork 0
mirror of https://github.com/Anuken/Mindustry.git synced 2025-01-19 16:57:15 +07:00
Code Issues Packages Projects Releases Wiki Activity

Standardized item capacity across blocks

Browse Source
This commit is contained in:
Anuken 2019-01-03 12:00:14 -05:00
parent 120e0f6971
commit dc12d58054
12 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
core/src/io/anuke/mindustry/content/Recipes.java
View File

@ -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));

13
core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
View File

@ -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);
}};

2
core/src/io/anuke/mindustry/world/BaseBlock.java
View File

@ -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;

1
core/src/io/anuke/mindustry/world/blocks/defense/ForceProjector.java
View File

@ -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);
}

1
core/src/io/anuke/mindustry/world/blocks/defense/MendProjector.java
View File

@ -44,7 +44,6 @@ public class MendProjector extends Block{
update = true;
hasPower = true;
hasItems = true;
itemCapacity = 10;
}
@Override

1
core/src/io/anuke/mindustry/world/blocks/defense/OverdriveProjector.java
View File

@ -45,7 +45,6 @@ public class OverdriveProjector extends Block{
hasPower = true;
hasItems = true;
canOverdrive = false;
itemCapacity = 10;
}
@Override

1
core/src/io/anuke/mindustry/world/blocks/power/ItemGenerator.java
View File

@ -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);

1
core/src/io/anuke/mindustry/world/blocks/production/Drill.java
View File

@ -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;

1
core/src/io/anuke/mindustry/world/blocks/production/Fracker.java
View File

@ -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);

1
core/src/io/anuke/mindustry/world/blocks/production/PowerSmelter.java
View File

@ -52,7 +52,6 @@ public class PowerSmelter extends PowerBlock{
hasItems = true;
update = true;
solid = true;
itemCapacity = 20;
}
@Override

1
core/src/io/anuke/mindustry/world/blocks/production/Smelter.java
View File

@ -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);

1
core/src/io/anuke/mindustry/world/blocks/units/UnitFactory.java
View File

@ -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);