diff --git a/core/assets/version.properties b/core/assets/version.properties index 19f6c740fd..a39e19ef5c 100644 --- a/core/assets/version.properties +++ b/core/assets/version.properties @@ -1,7 +1,7 @@ #Autogenerated file. Do not modify. -#Thu Mar 22 19:09:59 EDT 2018 +#Thu Mar 22 20:36:03 EDT 2018 version=release -androidBuildCode=608 +androidBuildCode=612 name=Mindustry code=3.4 build=custom build diff --git a/core/src/io/anuke/mindustry/resource/Recipes.java b/core/src/io/anuke/mindustry/resource/Recipes.java index 6133ad00b5..75da8cc2dc 100644 --- a/core/src/io/anuke/mindustry/resource/Recipes.java +++ b/core/src/io/anuke/mindustry/resource/Recipes.java @@ -14,17 +14,17 @@ public class Recipes { new Recipe(defense, DefenseBlocks.ironwall, stack(Item.iron, 12)), new Recipe(defense, DefenseBlocks.steelwall, stack(Item.steel, 12)), new Recipe(defense, DefenseBlocks.titaniumwall, stack(Item.titanium, 12)), - new Recipe(defense, DefenseBlocks.diriumwall, stack(Item.dirium, 12)), + new Recipe(defense, DefenseBlocks.diriumwall, stack(Item.densealloy, 12)), new Recipe(defense, DefenseBlocks.steelwalllarge, stack(Item.steel, 12*4)), new Recipe(defense, DefenseBlocks.titaniumwalllarge, stack(Item.titanium, 12*4)), - new Recipe(defense, DefenseBlocks.diriumwalllarge, stack(Item.dirium, 12*4)), + new Recipe(defense, DefenseBlocks.diriumwall, stack(Item.densealloy, 12*4)), new Recipe(defense, DefenseBlocks.door, stack(Item.steel, 3), stack(Item.iron, 3*4)).setDesktop(), new Recipe(defense, DefenseBlocks.largedoor, stack(Item.steel, 3*4), stack(Item.iron, 3*4*4)).setDesktop(), new Recipe(defense, DefenseBlocks.titaniumshieldwall, stack(Item.titanium, 16)), new Recipe(distribution, DistributionBlocks.conveyor, stack(Item.iron, 1)), new Recipe(distribution, DistributionBlocks.steelconveyor, stack(Item.steel, 1)), - new Recipe(distribution, DistributionBlocks.pulseconveyor, stack(Item.dirium, 1)), + new Recipe(distribution, DistributionBlocks.pulseconveyor, stack(Item.densealloy, 1)), new Recipe(distribution, DistributionBlocks.router, stack(Item.iron, 2)), new Recipe(distribution, DistributionBlocks.multiplexer, stack(Item.iron, 8)), new Recipe(distribution, DistributionBlocks.junction, stack(Item.iron, 2)), @@ -41,12 +41,12 @@ public class Recipes { new Recipe(weapon, WeaponBlocks.railgunturret, stack(Item.iron, 15), stack(Item.steel, 10)), new Recipe(weapon, WeaponBlocks.laserturret, stack(Item.steel, 12), stack(Item.titanium, 12)), new Recipe(weapon, WeaponBlocks.flakturret, stack(Item.steel, 25), stack(Item.titanium, 15)), - new Recipe(weapon, WeaponBlocks.teslaturret, stack(Item.steel, 20), stack(Item.titanium, 25), stack(Item.dirium, 15)), - new Recipe(weapon, WeaponBlocks.magmaturret, stack(Item.steel, 80), stack(Item.titanium, 70), stack(Item.dirium, 60)), - new Recipe(weapon, WeaponBlocks.chainturret, stack(Item.steel, 50), stack(Item.titanium, 25), stack(Item.dirium, 40)), - new Recipe(weapon, WeaponBlocks.titanturret, stack(Item.steel, 70), stack(Item.titanium, 50), stack(Item.dirium, 55)), - new Recipe(weapon, WeaponBlocks.missileturret, stack(Item.steel, 70), stack(Item.titanium, 50), stack(Item.dirium, 55)), - new Recipe(weapon, WeaponBlocks.fornaxcannon, stack(Item.steel, 70), stack(Item.titanium, 50), stack(Item.dirium, 55)), + new Recipe(weapon, WeaponBlocks.teslaturret, stack(Item.steel, 20), stack(Item.titanium, 25), stack(Item.densealloy, 15)), + new Recipe(weapon, WeaponBlocks.magmaturret, stack(Item.steel, 80), stack(Item.titanium, 70), stack(Item.densealloy, 60)), + new Recipe(weapon, WeaponBlocks.chainturret, stack(Item.steel, 50), stack(Item.titanium, 25), stack(Item.densealloy, 40)), + new Recipe(weapon, WeaponBlocks.titanturret, stack(Item.steel, 70), stack(Item.titanium, 50), stack(Item.densealloy, 55)), + new Recipe(weapon, WeaponBlocks.missileturret, stack(Item.steel, 70), stack(Item.titanium, 50), stack(Item.densealloy, 55)), + new Recipe(weapon, WeaponBlocks.fornaxcannon, stack(Item.steel, 70), stack(Item.titanium, 50), stack(Item.densealloy, 55)), new Recipe(crafting, ProductionBlocks.smelter, stack(Item.iron, 40)), new Recipe(crafting, ProductionBlocks.alloysmelter, stack(Item.titanium, 50), stack(Item.steel, 50)), @@ -66,11 +66,11 @@ public class Recipes { new Recipe(production, ProductionBlocks.coaldrill, stack(Item.iron, 25), stack(Item.iron, 40)), new Recipe(production, ProductionBlocks.titaniumdrill, stack(Item.iron, 50), stack(Item.steel, 50)), new Recipe(production, ProductionBlocks.uraniumdrill, stack(Item.iron, 40), stack(Item.steel, 40)), - new Recipe(production, ProductionBlocks.quartzextractor, stack(Item.titanium, 40), stack(Item.dirium, 40)), - new Recipe(production, ProductionBlocks.cultivator, stack(Item.titanium, 40), stack(Item.dirium, 40)), - new Recipe(production, ProductionBlocks.laserdrill, stack(Item.titanium, 40), stack(Item.dirium, 40)), - new Recipe(production, ProductionBlocks.waterextractor, stack(Item.titanium, 40), stack(Item.dirium, 40)), - new Recipe(production, ProductionBlocks.oilextractor, stack(Item.titanium, 40), stack(Item.dirium, 40)), + new Recipe(production, ProductionBlocks.quartzextractor, stack(Item.titanium, 40), stack(Item.densealloy, 40)), + new Recipe(production, ProductionBlocks.cultivator, stack(Item.titanium, 40), stack(Item.densealloy, 40)), + new Recipe(production, ProductionBlocks.laserdrill, stack(Item.titanium, 40), stack(Item.densealloy, 40)), + new Recipe(production, ProductionBlocks.waterextractor, stack(Item.titanium, 40), stack(Item.densealloy, 40)), + new Recipe(production, ProductionBlocks.oilextractor, stack(Item.titanium, 40), stack(Item.densealloy, 40)), new Recipe(power, ProductionBlocks.coalgenerator, stack(Item.iron, 30)), new Recipe(power, ProductionBlocks.thermalgenerator, stack(Item.steel, 30)), @@ -78,16 +78,16 @@ public class Recipes { new Recipe(power, ProductionBlocks.solarpanel, stack(Item.iron, 30), stack(Item.silicon, 20)), new Recipe(power, ProductionBlocks.largesolarpanel, stack(Item.iron, 30), stack(Item.silicon, 20)), new Recipe(power, ProductionBlocks.rtgenerator, stack(Item.titanium, 20), stack(Item.steel, 20)), - new Recipe(power, ProductionBlocks.nuclearReactor, stack(Item.titanium, 40), stack(Item.dirium, 40), stack(Item.steel, 50)), + new Recipe(power, ProductionBlocks.nuclearReactor, stack(Item.titanium, 40), stack(Item.densealloy, 40), stack(Item.steel, 50)), new Recipe(power, DistributionBlocks.powerlaser, stack(Item.steel, 3), stack(Item.iron, 3)), new Recipe(power, DistributionBlocks.powerlasercorner, stack(Item.steel, 4), stack(Item.iron, 4)), new Recipe(power, DistributionBlocks.powerlaserrouter, stack(Item.steel, 5), stack(Item.iron, 5)), new Recipe(power, DistributionBlocks.battery, stack(Item.steel, 5), stack(Item.iron, 5)), new Recipe(power, DistributionBlocks.batteryLarge, stack(Item.steel, 5), stack(Item.iron, 5)), - new Recipe(power, DefenseBlocks.shieldgenerator, stack(Item.titanium, 30), stack(Item.dirium, 30)), + new Recipe(power, DefenseBlocks.shieldgenerator, stack(Item.titanium, 30), stack(Item.densealloy, 30)), - new Recipe(distribution, DistributionBlocks.teleporter, stack(Item.steel, 30), stack(Item.dirium, 40)), + new Recipe(distribution, DistributionBlocks.teleporter, stack(Item.steel, 30), stack(Item.densealloy, 40)), new Recipe(power, DefenseBlocks.repairturret, stack(Item.iron, 30)), new Recipe(power, DefenseBlocks.megarepairturret, stack(Item.iron, 20), stack(Item.steel, 30)), @@ -100,10 +100,10 @@ public class Recipes { new Recipe(liquid, DistributionBlocks.conduittunnel, stack(Item.titanium, 2), stack(Item.steel, 2)), new Recipe(liquid, ProductionBlocks.pump, stack(Item.steel, 10)), - new Recipe(liquid, ProductionBlocks.fluxpump, stack(Item.steel, 10), stack(Item.dirium, 5)), + new Recipe(liquid, ProductionBlocks.fluxpump, stack(Item.steel, 10), stack(Item.densealloy, 5)), new Recipe(units, DebugBlocks.powerVoid, stack(Item.steel, 10)).setDebug(), - new Recipe(units, DebugBlocks.powerInfinite, stack(Item.steel, 10), stack(Item.dirium, 5)).setDebug() + new Recipe(units, DebugBlocks.powerInfinite, stack(Item.steel, 10), stack(Item.densealloy, 5)).setDebug() ); private static ItemStack stack(Item item, int amount){ diff --git a/core/src/io/anuke/mindustry/resource/UpgradeRecipes.java b/core/src/io/anuke/mindustry/resource/UpgradeRecipes.java index 03566c51ee..7be2113018 100644 --- a/core/src/io/anuke/mindustry/resource/UpgradeRecipes.java +++ b/core/src/io/anuke/mindustry/resource/UpgradeRecipes.java @@ -9,8 +9,8 @@ public class UpgradeRecipes { Weapon.triblaster, list(stack(Item.iron, 60), stack(Item.steel, 80)), Weapon.clustergun, list(stack(Item.iron, 300), stack(Item.steel, 80)), Weapon.vulcan, list(stack(Item.iron, 100), stack(Item.steel, 150), stack(Item.titanium, 80)), - Weapon.beam, list(stack(Item.steel, 260), stack(Item.titanium, 160), stack(Item.dirium, 120)), - Weapon.shockgun, list(stack(Item.steel, 240), stack(Item.titanium, 160), stack(Item.dirium, 160)) + Weapon.beam, list(stack(Item.steel, 260), stack(Item.titanium, 160), stack(Item.densealloy, 120)), + Weapon.shockgun, list(stack(Item.steel, 240), stack(Item.titanium, 160), stack(Item.densealloy, 160)) ); private static final ItemStack[] empty = {}; diff --git a/core/src/io/anuke/mindustry/world/blocks/Blocks.java b/core/src/io/anuke/mindustry/world/blocks/Blocks.java index 95fefbe4fa..e23fd60611 100644 --- a/core/src/io/anuke/mindustry/world/blocks/Blocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/Blocks.java @@ -94,7 +94,7 @@ public class Blocks{ dirt = new Floor("dirt"){}, sand = new Floor("sand"){{ - drops = new ItemStack(Item.quartz, 1); + drops = new ItemStack(Item.silicon, 1); }}, ice = new Floor("ice"){}, diff --git a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java index d9f6b673dc..07583972b0 100644 --- a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java +++ b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java @@ -43,7 +43,7 @@ public class ProductionBlocks{ health = 90; inputs = new Item[]{Item.titanium, Item.steel}; fuel = Item.coal; - result = Item.dirium; + result = Item.densealloy; burnDuration = 45f; craftTime = 25f; } @@ -67,7 +67,7 @@ public class ProductionBlocks{ health = 200; inputLiquid = Liquid.water; outputLiquid = Liquid.cryofluid; - inputItem = Item.quartz; + inputItem = Item.titanium; liquidPerItem = 50f; itemCapacity = 50; powerUse = 0.1f; @@ -90,7 +90,7 @@ public class ProductionBlocks{ titaniumextractor = new LiquidCrafter("titaniumextractor"){ { - input = Item.iron; + input = Item.stone; inputAmount = 8; inputLiquid = Liquid.water; liquidAmount = 40f; @@ -142,7 +142,7 @@ public class ProductionBlocks{ siliconextractor = new LiquidCrafter("siliconextractor"){ { - input = Item.quartz; + input = Item.stone; inputAmount = 5; inputLiquid = Liquid.water; liquidAmount = 18.99f; @@ -229,11 +229,12 @@ public class ProductionBlocks{ } }, - quartzextractor = new Drill("quartzextractor"){ + quartzextractor = new GenericDrill("quartzextractor"){ { + powerUse = 0.1f; resource = Blocks.sand; - result = Item.quartz; - drillTime = 300; + result = Item.silicon; + drillTime = 320; size = 2; } },