diff --git a/core/assets-raw/sprites/blocks/production/oilrefinery.png b/core/assets-raw/sprites/blocks/production/oilrefinery.png index acfe53f47f..445c57ece3 100644 Binary files a/core/assets-raw/sprites/blocks/production/oilrefinery.png and b/core/assets-raw/sprites/blocks/production/oilrefinery.png differ diff --git a/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png b/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png new file mode 100644 index 0000000000..f9e5ab3537 Binary files /dev/null and b/core/assets-raw/sprites/blocks/production/pulverizer-rotator.png differ diff --git a/core/assets-raw/sprites/blocks/production/pulverizer.png b/core/assets-raw/sprites/blocks/production/pulverizer.png index a2b061a198..194c4176b4 100644 Binary files a/core/assets-raw/sprites/blocks/production/pulverizer.png and b/core/assets-raw/sprites/blocks/production/pulverizer.png differ diff --git a/core/assets-raw/sprites/blocks/production/stoneformer.png b/core/assets-raw/sprites/blocks/production/stoneformer.png index 1b0ef659cc..cd8753ce53 100644 Binary files a/core/assets-raw/sprites/blocks/production/stoneformer.png and b/core/assets-raw/sprites/blocks/production/stoneformer.png differ diff --git a/core/assets/sprites/sprites.png b/core/assets/sprites/sprites.png index 4414ff56a7..29388e542d 100644 Binary files a/core/assets/sprites/sprites.png and b/core/assets/sprites/sprites.png differ diff --git a/core/assets/version.properties b/core/assets/version.properties index 566c8dd3f5..9a6d4314a9 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Fri Mar 30 23:22:00 EDT 2018 +#Sat Mar 31 11:49:22 EDT 2018 version=release -androidBuildCode=748 +androidBuildCode=750 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/content/Recipes.java b/core/src/io/anuke/mindustry/content/Recipes.java index 4d0bb1accb..ba282c3dd6 100644 --- a/core/src/io/anuke/mindustry/content/Recipes.java +++ b/core/src/io/anuke/mindustry/content/Recipes.java @@ -57,13 +57,14 @@ public class Recipes { new Recipe(crafting, CraftingBlocks.alloysmelter, stack(Items.titanium, 50), stack(Items.steel, 50)), new Recipe(crafting, CraftingBlocks.powersmelter, stack(Items.steel, 30), stack(Items.iron, 30)), new Recipe(crafting, CraftingBlocks.poweralloysmelter, stack(Items.steel, 30), stack(Items.iron, 30)), - new Recipe(crafting, CraftingBlocks.siliconsmelter, stack(Items.steel, 30), stack(Items.iron, 30)), 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.siliconsmelter, 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.biomatterCompressor, stack(Items.steel, 15), stack(Items.iron, 15)), 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)), + new Recipe(crafting, CraftingBlocks.pulverizer, stack(Items.steel, 10), stack(Items.iron, 10)), new Recipe(crafting, CraftingBlocks.stoneFormer, stack(Items.steel, 10), stack(Items.iron, 10)), new Recipe(crafting, CraftingBlocks.melter, stack(Items.steel, 30), stack(Items.titanium, 15)), new Recipe(crafting, CraftingBlocks.weaponFactory, stack(Items.steel, 60), stack(Items.iron, 60)).setDesktop(), diff --git a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java index 3a2be82c68..87c07ace7a 100644 --- a/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java +++ b/core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java @@ -157,14 +157,27 @@ public class CraftingBlocks { hasLiquids = true; }}, + pulverizer = new GenericCrafter("pulverizer") {{ + inputItem = new ItemStack(Items.stone, 2); + itemCapacity = 40; + powerUse = 0.2f; + output = Items.sand; + health = 80; + craftEffect = Fx.pulverize; + craftTime = 70f; + updateEffect = Fx.pulverizeSmall; + hasInventory = hasPower = true; + }}, + oilRefinery = new GenericCrafter("oilrefinery") {{ inputLiquid = Liquids.oil; + powerUse = 0.05f; liquidUse = 0.1f; liquidCapacity = 56f; output = Items.coal; health = 80; craftEffect = Fx.purifyoil; - hasInventory = hasLiquids = true; + hasInventory = hasLiquids = hasPower = true; }}, stoneFormer = new GenericCrafter("stoneformer") {{ diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/Pulverizer.java b/core/src/io/anuke/mindustry/world/blocks/types/production/Pulverizer.java new file mode 100644 index 0000000000..daf9d2a5eb --- /dev/null +++ b/core/src/io/anuke/mindustry/world/blocks/types/production/Pulverizer.java @@ -0,0 +1,25 @@ +package io.anuke.mindustry.world.blocks.types.production; + +import com.badlogic.gdx.graphics.g2d.TextureRegion; +import io.anuke.mindustry.world.Tile; +import io.anuke.ucore.graphics.Draw; + +public class Pulverizer extends GenericCrafter { + + public Pulverizer(String name) { + super(name); + } + + @Override + public void draw(Tile tile) { + GenericCrafterEntity entity = tile.entity(); + + Draw.rect(name, tile.drawx(), tile.drawy()); + Draw.rect(name + "-rotator", tile.drawx(), tile.drawy(), entity.totalProgress * 2f); + } + + @Override + public TextureRegion[] getIcon() { + return new TextureRegion[]{Draw.region(name), Draw.region(name + "-rotator")}; + } +}