Astronand/Mindustry
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added sprites for all new crafting blocks, fixed seprator

Browse Source
This commit is contained in:
Anuken
2018-03-26 22:49:33 -04:00
parent 707e57e72d
commit 17bc8fd9ed
19 changed files with 366 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/io/anuke/mindustry/content/Recipes.java
+1 -1
View File
@@ -60,7 +60,7 @@ public class Recipes {
new Recipe(crafting, CraftingBlocks.separator, stack(Items.steel, 30), stack(Items.iron, 30)),
new Recipe(crafting, CraftingBlocks.centrifuge, stack(Items.steel, 30), stack(Items.iron, 30)),
new Recipe(crafting, CraftingBlocks.oilRefinery, stack(Items.steel, 15), stack(Items.iron, 15)),
new Recipe(crafting, CraftingBlocks.biomassCompressor, stack(Items.steel, 15), stack(Items.iron, 15)),
new Recipe(crafting, CraftingBlocks.biomatterCompressor, stack(Items.steel, 15), stack(Items.iron, 15)),
new Recipe(crafting, CraftingBlocks.stoneFormer, stack(Items.steel, 10), stack(Items.iron, 10)),
new Recipe(crafting, CraftingBlocks.plasticFormer, stack(Items.steel, 30), stack(Items.titanium, 15)),
new Recipe(crafting, CraftingBlocks.cryofluidmixer, stack(Items.steel, 30), stack(Items.titanium, 15)),
core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java
+7 -6
View File
@@ -60,20 +60,21 @@ public class CraftingBlocks {
size = 2;
}},
separator = new Filtrator("separator") {{
separator = new Separator("separator") {{
liquid = Liquids.water;
item = Items.stone;
results = new Item[]{
null, null, null, null, null,
Items.stone, Items.stone, Items.stone, Items.stone,
Items.iron, Items.iron, Items.iron,
null, null, null, null, null, null, null, null, null, null, null, null,
Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone, Items.stone,
Items.iron, Items.iron, Items.iron, Items.iron,
Items.lead, Items.lead,
Items.coal, Items.coal,
Items.titanium
};
liquidUse = 0.1f;
liquidUse = 0.2f;
filterTime = 40f;
itemCapacity = 40;
health = 50;
}},
@@ -111,7 +112,7 @@ public class CraftingBlocks {
hasPower = hasLiquids = true;
}},
biomassCompressor = new PowerCrafter("biomasscompressor") {{
biomatterCompressor = new PowerCrafter("biomattercompressor") {{
input = new ItemStack(Items.biomatter, 1);
liquidCapacity = 60f;
powerUse = 0.05f;
core/src/io/anuke/mindustry/content/blocks/LiquidBlocks.java
+2 -2
View File
@@ -11,11 +11,11 @@ public class LiquidBlocks {
public static final Block
pump = new Pump("pump") {{
pumpAmount = 0.8f;
pumpAmount = 0.1f;
}},
fluxpump = new Pump("fluxpump") {{
pumpAmount = 1.2f;
pumpAmount = 0.2f;
}},
conduit = new Conduit("conduit") {{