Added core miner drone, massive amount of balancing/setup

build.gradle

@@ -27,7 +27,7 @@ allprojects {
         gdxVersion = '1.9.8'
         roboVMVersion = '2.3.0'
         aiVersion = '1.8.1'
-        uCoreVersion = '5b1e6a'
+        uCoreVersion = '405d949619'
 
         getVersionString = {
             String buildVersion = getBuildVersion()

core/assets/bundles/bundle_pt_BR.properties

@@ -330,7 +330,7 @@ block.steelconveyor.fulldescription=Bloco de transporte avançado. Movimenta ite
 #Advanced item transport block. Moves items faster than standard conveyors.
 block.poweredconveyor.name=Esteira de Impulso
 block.poweredconveyor.fulldescription=O Bloco supremo de transporte. Movimenta itens mais rapidamente que esteiras de aço.
-#The ultimate item transport block. Moves items faster than steel conveyors.
+#The ultimate item transport block. Moves items faster than carbide conveyors.
 block.router.name=Roteador
 block.router.fulldescription=Aceita itens de uma direção e os redireciona para as outras 3 direções. Pode guardar uma certa quantidade de itens. Útil para dividir materiais entre várias torres.
 block.router.description=Divide materiais em 3 direções.
@@ -399,7 +399,7 @@ block.stonedrill.description=Gera 1 pedra a cada 4 segundos.
 #Mines 1 stone every 4 seconds.
 block.irondrill.name=Broca de Ferro
 block.irondrill.fulldescription=Uma broca básica. Quando colocada sobre uma jazida de ferro, lentamente gera ferro.
-#A basic drill. When placed on iron ore tiles, outputs iron at a slow pace indefinitely.
+#A basic drill. When placed on tungsten ore tiles, outputs tungsten at a slow pace indefinitely.
 block.irondrill.description=Gera 1 ferro a cada 5 segundos.
 block.coaldrill.name=Broca de Carvão
 block.coaldrill.fulldescription=Uma broca básica. Quando colocada sobre uma jazida de carvão, lentamente gera carvão.

core/src/io/anuke/mindustry/ai/BlockIndexer.java

@@ -6,6 +6,7 @@ import com.badlogic.gdx.utils.IntMap;
 import com.badlogic.gdx.utils.ObjectMap;
 import com.badlogic.gdx.utils.ObjectSet;
 import io.anuke.mindustry.content.Items;
+import io.anuke.mindustry.content.blocks.Blocks;
 import io.anuke.mindustry.entities.TileEntity;
 import io.anuke.mindustry.game.EventType.TileChangeEvent;
 import io.anuke.mindustry.game.EventType.WorldLoadEvent;
@@ -18,6 +19,7 @@ import io.anuke.ucore.core.Events;
 import io.anuke.ucore.entities.trait.Entity;
 import io.anuke.ucore.function.Predicate;
 import io.anuke.ucore.util.EnumSet;
+import io.anuke.ucore.util.Geometry;
 import io.anuke.ucore.util.Mathf;
 
 import static io.anuke.mindustry.Vars.*;
@@ -27,12 +29,12 @@ import static io.anuke.mindustry.Vars.*;
 /**Class used for indexing special target blocks for AI.*/
 public class BlockIndexer {
     /**Size of one ore quadrant.*/
-    private final static int oreQuadrantSize = 12;
+    private final static int oreQuadrantSize = 20;
     /**Size of one structure quadrant.*/
     private final static int structQuadrantSize = 12;
 
     /**Set of all ores that are being scanned.*/
-    private final ObjectSet<Item> scanOres = ObjectSet.with(Items.iron, Items.coal, Items.lead, Items.thorium, Items.titanium);
+    private final ObjectSet<Item> scanOres = ObjectSet.with(Items.tungsten, Items.coal, Items.lead, Items.thorium, Items.titanium);
     /**Stores all ore quadtrants on the map.*/
     private ObjectMap<Item, ObjectSet<Tile>> ores = new ObjectMap<>();
 
@@ -138,6 +140,24 @@ public class BlockIndexer {
         return ores.get(item, emptyArray);
     }
 
+    /**Find the closest ore block relative to a position.*/
+    public Tile findClosestOre(float xp, float yp, Item item){
+        Tile tile  = Geometry.findClosest(xp, yp, world.indexer().getOrePositions(item));
+
+        if(tile == null) return null;
+
+        for (int x = Math.max(0, tile.x - oreQuadrantSize/2); x < tile.x + oreQuadrantSize/2 && x < world.width(); x++) {
+            for (int y = Math.max(0, tile.y - oreQuadrantSize/2); y < tile.y + oreQuadrantSize/2 && y < world.height(); y++) {
+                Tile res = world.tile(x, y);
+                if(res.block() == Blocks.air && res.floor().drops != null && res.floor().drops.item == item){
+                    return res;
+                }
+            }
+        }
+
+        return null;
+    }
+
     private void process(Tile tile){
         if(tile.block().flags != null &&
                 tile.getTeam() != Team.none){
@@ -222,7 +242,7 @@ public class BlockIndexer {
                 Tile tile = world.tile(x, y);
 
                 //add position of quadrant to list when an ore is found
-                if(tile.floor().drops != null && scanOres.contains(tile.floor().drops.item)){
+                if(tile.floor().drops != null && scanOres.contains(tile.floor().drops.item) && tile.block() == Blocks.air){
                     ores.get(tile.floor().drops.item).add(world.tile(
                             //make sure to clamp quadrant middle position, since it might go off bounds
                             Mathf.clamp(qx * oreQuadrantSize + oreQuadrantSize /2, 0, world.width() - 1),

core/src/io/anuke/mindustry/content/AmmoTypes.java

@@ -8,14 +8,17 @@ import io.anuke.mindustry.type.AmmoType;
 import io.anuke.mindustry.type.ContentList;
 
 public class AmmoTypes implements ContentList {
-    public static AmmoType bulletIron, bulletLead, bulletSteel, bulletThorium, bulletSilicon, bulletThermite, flakLead, flakExplosive, flakPlastic, flakSurge, missileExplosive, missileIncindiary, missileSurge, artilleryLead, artilleryThorium, artilleryPlastic, artilleryHoming, artilleryIncindiary, basicFlame, lancerLaser, lightning, spectreLaser, meltdownLaser, fuseShotgun, oil, water, lava, cryofluid;
+    public static AmmoType bulletIron, bulletLead, bulletSteel, bulletThorium, bulletSilicon, bulletThermite,
+            flakLead, flakExplosive, flakPlastic, flakSurge, missileExplosive, missileIncindiary, missileSurge,
+            artilleryLead, artilleryThorium, artilleryPlastic, artilleryHoming, artilleryIncindiary,
+            basicFlame, lancerLaser, lightning, spectreLaser, meltdownLaser, fuseShotgun, oil, water, lava, cryofluid;
 
     @Override
     public void load() {
 
         //bullets
 
-        bulletIron = new AmmoType(Items.iron, StandardBullets.iron, 3) {{
+        bulletIron = new AmmoType(Items.tungsten, StandardBullets.iron, 3) {{
             shootEffect = ShootFx.shootSmall;
             smokeEffect = ShootFx.shootSmallSmoke;
         }};
@@ -25,7 +28,7 @@ public class AmmoTypes implements ContentList {
             smokeEffect = ShootFx.shootSmallSmoke;
         }};
 
-        bulletSteel = new AmmoType(Items.steel, StandardBullets.steel, 3) {{
+        bulletSteel = new AmmoType(Items.carbide, StandardBullets.steel, 3) {{
             shootEffect = ShootFx.shootSmall;
             smokeEffect = ShootFx.shootSmallSmoke;
         }};
@@ -127,7 +130,7 @@ public class AmmoTypes implements ContentList {
 
         meltdownLaser = new AmmoType(TurretBullets.lancerLaser);
 
-        fuseShotgun = new AmmoType(Items.iron, TurretBullets.fuseShot, 0.1f);
+        fuseShotgun = new AmmoType(Items.tungsten, TurretBullets.fuseShot, 0.1f);
 
         //liquid
 

core/src/io/anuke/mindustry/content/Items.java

@@ -8,7 +8,8 @@ import io.anuke.mindustry.type.Item;
 import io.anuke.mindustry.type.ItemType;
 
 public class Items implements ContentList{
-    public static Item stone, iron, lead, coal, steel, titanium, thorium, silicon, plasteel, phasematter, surgealloy, biomatter, sand, blastCompound, thermite;
+    public static Item stone, tungsten, lead, coal, carbide, titanium, thorium, silicon, plasteel, phasematter, surgealloy,
+            biomatter, sand, blastCompound, thermite;
 
     @Override
     public void load() {
@@ -17,7 +18,7 @@ public class Items implements ContentList{
             hardness = 3;
         }};
 
-        iron = new Item("iron", Color.valueOf("bc8271")) {{
+        tungsten = new Item("tungsten", Color.valueOf("a0b0c8")) {{
             type = ItemType.material;
             hardness = 1;
         }};
@@ -33,7 +34,7 @@ public class Items implements ContentList{
             hardness = 2;
         }};
 
-        steel = new Item("steel", Color.valueOf("e2e2e2")) {{
+        carbide = new Item("carbide", Color.valueOf("e2e2e2")) {{
             type = ItemType.material;
         }};
 

core/src/io/anuke/mindustry/content/Recipes.java

@@ -13,46 +13,77 @@ public class Recipes implements ContentList{
 
     @Override
 	public void load (){
-        new Recipe(defense, DefenseBlocks.ironwall, new ItemStack(Items.iron, 12));
-        new Recipe(defense, DefenseBlocks.ironwalllarge, new ItemStack(Items.iron, 12*4));
+        //WALLS
+        new Recipe(defense, DefenseBlocks.tungstenWall, new ItemStack(Items.tungsten, 12));
+        new Recipe(defense, DefenseBlocks.tungstenWallLarge, new ItemStack(Items.tungsten, 12*4));
 
-        new Recipe(weapon, WeaponBlocks.duo, new ItemStack(Items.iron, 12));
-        new Recipe(weapon, WeaponBlocks.scatter, new ItemStack(Items.iron, 8), new ItemStack(Items.lead, 6));
-        new Recipe(weapon, WeaponBlocks.scorch, new ItemStack(Items.iron, 12), new ItemStack(Items.lead, 8));
-        new Recipe(weapon, WeaponBlocks.hail, new ItemStack(Items.iron, 12), new ItemStack(Items.lead, 12), new ItemStack(Items.steel, 6));
+        //TURRETS
+        new Recipe(weapon, WeaponBlocks.duo, new ItemStack(Items.tungsten, 20));
+        new Recipe(weapon, WeaponBlocks.scorch, new ItemStack(Items.tungsten, 25), new ItemStack(Items.carbide, 20));
+        new Recipe(weapon, WeaponBlocks.hail, new ItemStack(Items.tungsten, 25), new ItemStack(Items.carbide, 25));
 
-        new Recipe(distribution, DistributionBlocks.conveyor, new ItemStack(Items.iron, 1));
-        new Recipe(distribution, DistributionBlocks.titaniumconveyor, new ItemStack(Items.iron, 2), new ItemStack(Items.titanium, 1));
-        new Recipe(distribution, DistributionBlocks.router, new ItemStack(Items.iron, 2), new ItemStack(Items.lead, 4));
-        new Recipe(distribution, DistributionBlocks.multiplexer, new ItemStack(Items.iron, 8), new ItemStack(Items.lead, 8));
-        new Recipe(distribution, DistributionBlocks.junction, new ItemStack(Items.iron, 2));
-        new Recipe(distribution, DistributionBlocks.sorter, new ItemStack(Items.iron, 4), new ItemStack(Items.lead, 4));
-        new Recipe(distribution, DistributionBlocks.splitter, new ItemStack(Items.iron, 2), new ItemStack(Items.lead, 4));
-        new Recipe(distribution, DistributionBlocks.overflowgate, new ItemStack(Items.steel, 4));
-        new Recipe(distribution, DistributionBlocks.bridgeconveyor, new ItemStack(Items.steel, 8), new ItemStack(Items.iron, 8));
+        new Recipe(weapon, WeaponBlocks.lancer, new ItemStack(Items.tungsten, 25), new ItemStack(Items.lead, 25), new ItemStack(Items.silicon, 25));
+        new Recipe(weapon, WeaponBlocks.arc, new ItemStack(Items.tungsten, 25), new ItemStack(Items.lead, 30), new ItemStack(Items.silicon, 30));
 
-        new Recipe(crafting, CraftingBlocks.smelter, new ItemStack(Items.iron, 40), new ItemStack(Items.lead, 30));
-        new Recipe(crafting, CraftingBlocks.siliconsmelter, new ItemStack(Items.iron, 60), new ItemStack(Items.steel, 60), new ItemStack(Items.lead, 50));
-        new Recipe(crafting, CraftingBlocks.arcsmelter, new ItemStack(Items.iron, 60), new ItemStack(Items.steel, 60), new ItemStack(Items.lead, 50));
+        //DISTRIBUTION
+        new Recipe(distribution, DistributionBlocks.conveyor, new ItemStack(Items.lead, 1));
 
-        new Recipe(power, PowerBlocks.powernode, new ItemStack(Items.iron, 2), new ItemStack(Items.lead, 6));
-        //new Recipe(power, PowerBlocks.powernodelarge, new ItemStack(Items.steel, 3), new ItemStack(Items.iron, 3));
-        new Recipe(power, PowerBlocks.battery, new ItemStack(Items.iron, 8), new ItemStack(Items.lead, 30));
-        //new Recipe(power, PowerBlocks.batteryLarge, new ItemStack(Items.steel, 5), new ItemStack(Items.iron, 5));
-        new Recipe(power, PowerBlocks.combustiongenerator, new ItemStack(Items.iron, 30), new ItemStack(Items.lead, 30));
+        new Recipe(distribution, DistributionBlocks.titaniumconveyor, new ItemStack(Items.lead, 2), new ItemStack(Items.titanium, 1));
 
-        //new Recipe(distribution, StorageBlocks.vault, new ItemStack(Items.steel, 50));
-        //new Recipe(distribution, StorageBlocks.core, new ItemStack(Items.steel, 50));
-        //new Recipe(distribution, StorageBlocks.unloader, new ItemStack(Items.steel, 5));
-        //new Recipe(distribution, StorageBlocks.sortedunloader, new ItemStack(Items.steel, 5));
+        //starter tungsten transporation
+        new Recipe(distribution, DistributionBlocks.junction, new ItemStack(Items.lead, 2));
+        new Recipe(distribution, DistributionBlocks.splitter, new ItemStack(Items.lead, 2));
 
-        new Recipe(production, ProductionBlocks.ironDrill, new ItemStack(Items.iron, 15));
-        new Recipe(production, ProductionBlocks.reinforcedDrill, new ItemStack(Items.iron, 20), new ItemStack(Items.lead, 20));
-        new Recipe(production, ProductionBlocks.steelDrill, new ItemStack(Items.iron, 40), new ItemStack(Items.lead, 25), new ItemStack(Items.steel, 25));
-        new Recipe(production, ProductionBlocks.titaniumDrill, new ItemStack(Items.iron, 40), new ItemStack(Items.titanium, 40), new ItemStack(Items.steel, 40));
+        //advanced carbide transporation
+        new Recipe(distribution, DistributionBlocks.router, new ItemStack(Items.carbide, 2), new ItemStack(Items.tungsten, 2));
+        new Recipe(distribution, DistributionBlocks.multiplexer, new ItemStack(Items.carbide, 8), new ItemStack(Items.tungsten, 8));
+        new Recipe(distribution, DistributionBlocks.sorter, new ItemStack(Items.carbide, 4), new ItemStack(Items.tungsten, 4));
+        new Recipe(distribution, DistributionBlocks.overflowgate, new ItemStack(Items.carbide, 4), new ItemStack(Items.tungsten, 8));
+        new Recipe(distribution, DistributionBlocks.bridgeconveyor, new ItemStack(Items.carbide, 8), new ItemStack(Items.tungsten, 8));
 
-        new Recipe(units, UnitBlocks.droneFactory, new ItemStack(Items.iron, 50), new ItemStack(Items.lead, 50));
-        new Recipe(units, UnitBlocks.repairPoint, new ItemStack(Items.lead, 20), new ItemStack(Items.steel, 10));
+        //CRAFTING
+        new Recipe(crafting, CraftingBlocks.smelter, new ItemStack(Items.tungsten, 40));
+        new Recipe(crafting, CraftingBlocks.siliconsmelter, new ItemStack(Items.tungsten, 60), new ItemStack(Items.lead, 50));
+        new Recipe(crafting, CraftingBlocks.arcsmelter, new ItemStack(Items.tungsten, 60), new ItemStack(Items.carbide, 60), new ItemStack(Items.lead, 50));
+
+        new Recipe(crafting, CraftingBlocks.pulverizer, new ItemStack(Items.tungsten, 50), new ItemStack(Items.lead, 50));
+
+        //POWER
+        new Recipe(power, PowerBlocks.powernode, new ItemStack(Items.tungsten, 2), new ItemStack(Items.lead, 6));
+        new Recipe(power, PowerBlocks.powernodelarge, new ItemStack(Items.carbide, 5), new ItemStack(Items.lead, 20), new ItemStack(Items.silicon, 6));
+        new Recipe(power, PowerBlocks.battery, new ItemStack(Items.tungsten, 8), new ItemStack(Items.lead, 30), new ItemStack(Items.silicon, 4));
+        new Recipe(power, PowerBlocks.batteryLarge, new ItemStack(Items.carbide, 16), new ItemStack(Items.tungsten, 16), new ItemStack(Items.lead, 80), new ItemStack(Items.silicon, 20));
+        new Recipe(power, PowerBlocks.combustiongenerator, new ItemStack(Items.tungsten, 30), new ItemStack(Items.lead, 30));
+
+        //new Recipe(distribution, StorageBlocks.vault, new ItemStack(Items.carbide, 50));
+        //new Recipe(distribution, StorageBlocks.core, new ItemStack(Items.carbide, 50));
+        //new Recipe(distribution, StorageBlocks.unloader, new ItemStack(Items.carbide, 5));
+        //new Recipe(distribution, StorageBlocks.sortedunloader, new ItemStack(Items.carbide, 5));
+
+        //DRILLS, PRODUCERS
+        new Recipe(production, ProductionBlocks.tungstenDrill, new ItemStack(Items.tungsten, 30));
+        new Recipe(production, ProductionBlocks.carbideDrill, new ItemStack(Items.tungsten, 40), new ItemStack(Items.carbide, 40));
+
+        new Recipe(production, ProductionBlocks.waterextractor, new ItemStack(Items.tungsten, 50), new ItemStack(Items.carbide, 50), new ItemStack(Items.lead, 40));
+
+        //UNITS
+        new Recipe(units, UnitBlocks.droneFactory, new ItemStack(Items.tungsten, 30), new ItemStack(Items.lead, 50), new ItemStack(Items.silicon, 30));
+        new Recipe(units, UnitBlocks.repairPoint, new ItemStack(Items.lead, 30), new ItemStack(Items.tungsten, 30), new ItemStack(Items.silicon, 20));
+
+        //LIQUIDS
+        new Recipe(liquid, LiquidBlocks.conduit, new ItemStack(Items.lead, 1));
+
+        new Recipe(liquid, LiquidBlocks.pulseconduit, new ItemStack(Items.titanium, 1), new ItemStack(Items.lead, 1));
+
+        new Recipe(liquid, LiquidBlocks.liquidrouter, new ItemStack(Items.carbide, 4), new ItemStack(Items.lead, 4));
+        new Recipe(liquid, LiquidBlocks.liquidtank, new ItemStack(Items.titanium, 50), new ItemStack(Items.lead, 50), new ItemStack(Items.carbide, 20));
+        new Recipe(liquid, LiquidBlocks.liquidjunction, new ItemStack(Items.carbide, 4), new ItemStack(Items.lead, 4));
+        new Recipe(liquid, LiquidBlocks.bridgeconduit, new ItemStack(Items.carbide, 8), new ItemStack(Items.lead, 8));
+        //new Recipe(liquid, LiquidBlocks.laserconduit, new ItemStack(Items.titanium, 2), new ItemStack(Items.lead, 2), new ItemStack(Items.phasematter, 10));
+
+        new Recipe(liquid, LiquidBlocks.mechanicalPump, new ItemStack(Items.tungsten, 10), new ItemStack(Items.lead, 10), new ItemStack(Items.silicon, 10));
+        //new Recipe(liquid, LiquidBlocks.rotaryPump, new ItemStack(Items.carbide, 10), new ItemStack(Items.surgealloy, 5));
+        //new Recipe(liquid, LiquidBlocks.thermalPump, new ItemStack(Items.carbide, 10), new ItemStack(Items.surgealloy, 5));
 
         /*
         new Recipe(production, ProductionBlocks.laserdrill, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));
@@ -64,57 +95,56 @@ public class Recipes implements ContentList{
 
 
 
-        //new Recipe(distribution, DistributionBlocks.laserconveyor, new ItemStack(Items.steel, 5));
-        //new Recipe(distribution, DistributionBlocks.massdriver, new ItemStack(Items.steel, 1));
+        //new Recipe(distribution, DistributionBlocks.laserconveyor, new ItemStack(Items.carbide, 5));
+        //new Recipe(distribution, DistributionBlocks.massdriver, new ItemStack(Items.carbide, 1));
 
 
         /*
 
-        new Recipe(defense, DefenseBlocks.steelwall, new ItemStack(Items.steel, 12));
+        new Recipe(defense, DefenseBlocks.steelwall, new ItemStack(Items.carbide, 12));
         new Recipe(defense, DefenseBlocks.titaniumwall, new ItemStack(Items.titanium, 12));
         new Recipe(defense, DefenseBlocks.diriumwall, new ItemStack(Items.surgealloy, 12));
-        new Recipe(defense, DefenseBlocks.steelwalllarge, new ItemStack(Items.steel, 12 * 4));
+        new Recipe(defense, DefenseBlocks.steelwalllarge, new ItemStack(Items.carbide, 12 * 4));
         new Recipe(defense, DefenseBlocks.titaniumwalllarge, new ItemStack(Items.titanium, 12 * 4));
         new Recipe(defense, DefenseBlocks.diriumwall, new ItemStack(Items.surgealloy, 12 * 4));
-        new Recipe(defense, DefenseBlocks.door, new ItemStack(Items.steel, 3), new ItemStack(Items.iron, 3 * 4));
-        new Recipe(defense, DefenseBlocks.largedoor, new ItemStack(Items.steel, 3 * 4), new ItemStack(Items.iron, 3 * 4 * 4));
+        new Recipe(defense, DefenseBlocks.door, new ItemStack(Items.carbide, 3), new ItemStack(Items.tungsten, 3 * 4));
+        new Recipe(defense, DefenseBlocks.largedoor, new ItemStack(Items.carbide, 3 * 4), new ItemStack(Items.tungsten, 3 * 4 * 4));
         new Recipe(defense, DefenseBlocks.deflectorwall, new ItemStack(Items.titanium, 1));
         new Recipe(defense, DefenseBlocks.deflectorwalllarge, new ItemStack(Items.titanium, 1));
         new Recipe(defense, DefenseBlocks.phasewall, new ItemStack(Items.titanium, 1));
         new Recipe(defense, DefenseBlocks.phasewalllarge, new ItemStack(Items.titanium, 1));
 
+        new Recipe(weapon, WeaponBlocks.wave, new ItemStack(Items.tungsten, 1));
+        new Recipe(weapon, WeaponBlocks.lancer, new ItemStack(Items.tungsten, 1));
+        new Recipe(weapon, WeaponBlocks.arc, new ItemStack(Items.tungsten, 1));
+        new Recipe(weapon, WeaponBlocks.swarmer, new ItemStack(Items.tungsten, 1));
+        new Recipe(weapon, WeaponBlocks.ripple, new ItemStack(Items.tungsten, 1));
+        new Recipe(weapon, WeaponBlocks.fuse, new ItemStack(Items.tungsten, 1));
+        new Recipe(weapon, WeaponBlocks.ripple, new ItemStack(Items.tungsten, 1));
+        new Recipe(weapon, WeaponBlocks.cyclone, new ItemStack(Items.tungsten, 1));
+        new Recipe(weapon, WeaponBlocks.spectre, new ItemStack(Items.tungsten, 1));
+        new Recipe(weapon, WeaponBlocks.meltdown, new ItemStack(Items.tungsten, 1));
 
-        new Recipe(weapon, WeaponBlocks.wave, new ItemStack(Items.iron, 1));
-        new Recipe(weapon, WeaponBlocks.lancer, new ItemStack(Items.iron, 1));
-        new Recipe(weapon, WeaponBlocks.arc, new ItemStack(Items.iron, 1));
-        new Recipe(weapon, WeaponBlocks.swarmer, new ItemStack(Items.iron, 1));
-        new Recipe(weapon, WeaponBlocks.ripple, new ItemStack(Items.iron, 1));
-        new Recipe(weapon, WeaponBlocks.fuse, new ItemStack(Items.iron, 1));
-        new Recipe(weapon, WeaponBlocks.ripple, new ItemStack(Items.iron, 1));
-        new Recipe(weapon, WeaponBlocks.cyclone, new ItemStack(Items.iron, 1));
-        new Recipe(weapon, WeaponBlocks.spectre, new ItemStack(Items.iron, 1));
-        new Recipe(weapon, WeaponBlocks.meltdown, new ItemStack(Items.iron, 1));
+        new Recipe(crafting, CraftingBlocks.alloysmelter, new ItemStack(Items.titanium, 50), new ItemStack(Items.carbide, 50));
+        new Recipe(crafting, CraftingBlocks.alloyfuser, new ItemStack(Items.carbide, 30), new ItemStack(Items.tungsten, 30));
 
-        new Recipe(crafting, CraftingBlocks.alloysmelter, new ItemStack(Items.titanium, 50), new ItemStack(Items.steel, 50));
-        new Recipe(crafting, CraftingBlocks.alloyfuser, new ItemStack(Items.steel, 30), new ItemStack(Items.iron, 30));
+        new Recipe(crafting, CraftingBlocks.phaseweaver, new ItemStack(Items.carbide, 30), new ItemStack(Items.tungsten, 30));
+        new Recipe(crafting, CraftingBlocks.separator, new ItemStack(Items.carbide, 30), new ItemStack(Items.tungsten, 30));
+        new Recipe(crafting, CraftingBlocks.centrifuge, new ItemStack(Items.carbide, 30), new ItemStack(Items.tungsten, 30));
+        new Recipe(crafting, CraftingBlocks.siliconsmelter, new ItemStack(Items.carbide, 30), new ItemStack(Items.tungsten, 30));
+        new Recipe(crafting, CraftingBlocks.oilRefinery, new ItemStack(Items.carbide, 15), new ItemStack(Items.tungsten, 15));
+        new Recipe(crafting, CraftingBlocks.biomatterCompressor, new ItemStack(Items.carbide, 15), new ItemStack(Items.tungsten, 15));
+        new Recipe(crafting, CraftingBlocks.plasteelcompressor, new ItemStack(Items.carbide, 30), new ItemStack(Items.titanium, 15));
+        new Recipe(crafting, CraftingBlocks.cryofluidmixer, new ItemStack(Items.carbide, 30), new ItemStack(Items.titanium, 15));
+        new Recipe(crafting, CraftingBlocks.pulverizer, new ItemStack(Items.carbide, 10), new ItemStack(Items.tungsten, 10));
+        new Recipe(crafting, CraftingBlocks.stoneFormer, new ItemStack(Items.carbide, 10), new ItemStack(Items.tungsten, 10));
+        new Recipe(crafting, CraftingBlocks.melter, new ItemStack(Items.carbide, 30), new ItemStack(Items.titanium, 15));
+        new Recipe(crafting, CraftingBlocks.incinerator, new ItemStack(Items.carbide, 60), new ItemStack(Items.tungsten, 60));
 
-        new Recipe(crafting, CraftingBlocks.phaseweaver, new ItemStack(Items.steel, 30), new ItemStack(Items.iron, 30));
-        new Recipe(crafting, CraftingBlocks.separator, new ItemStack(Items.steel, 30), new ItemStack(Items.iron, 30));
-        new Recipe(crafting, CraftingBlocks.centrifuge, new ItemStack(Items.steel, 30), new ItemStack(Items.iron, 30));
-        new Recipe(crafting, CraftingBlocks.siliconsmelter, new ItemStack(Items.steel, 30), new ItemStack(Items.iron, 30));
-        new Recipe(crafting, CraftingBlocks.oilRefinery, new ItemStack(Items.steel, 15), new ItemStack(Items.iron, 15));
-        new Recipe(crafting, CraftingBlocks.biomatterCompressor, new ItemStack(Items.steel, 15), new ItemStack(Items.iron, 15));
-        new Recipe(crafting, CraftingBlocks.plasteelcompressor, new ItemStack(Items.steel, 30), new ItemStack(Items.titanium, 15));
-        new Recipe(crafting, CraftingBlocks.cryofluidmixer, new ItemStack(Items.steel, 30), new ItemStack(Items.titanium, 15));
-        new Recipe(crafting, CraftingBlocks.pulverizer, new ItemStack(Items.steel, 10), new ItemStack(Items.iron, 10));
-        new Recipe(crafting, CraftingBlocks.stoneFormer, new ItemStack(Items.steel, 10), new ItemStack(Items.iron, 10));
-        new Recipe(crafting, CraftingBlocks.melter, new ItemStack(Items.steel, 30), new ItemStack(Items.titanium, 15));
-        new Recipe(crafting, CraftingBlocks.incinerator, new ItemStack(Items.steel, 60), new ItemStack(Items.iron, 60));
-
-        new Recipe(production, ProductionBlocks.ironDrill, new ItemStack(Items.iron, 25));
-        new Recipe(production, ProductionBlocks.reinforcedDrill, new ItemStack(Items.iron, 25));
-        new Recipe(production, ProductionBlocks.steelDrill, new ItemStack(Items.iron, 25));
-        new Recipe(production, ProductionBlocks.titaniumDrill, new ItemStack(Items.iron, 25));
+        new Recipe(production, ProductionBlocks.tungstenDrill, new ItemStack(Items.tungsten, 25));
+        new Recipe(production, ProductionBlocks.reinforcedDrill, new ItemStack(Items.tungsten, 25));
+        new Recipe(production, ProductionBlocks.carbideDrill, new ItemStack(Items.tungsten, 25));
+        new Recipe(production, ProductionBlocks.titaniumDrill, new ItemStack(Items.tungsten, 25));
         new Recipe(production, ProductionBlocks.laserdrill, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));
         new Recipe(production, ProductionBlocks.nucleardrill, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));
         new Recipe(production, ProductionBlocks.plasmadrill, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));
@@ -122,56 +152,57 @@ public class Recipes implements ContentList{
         new Recipe(production, ProductionBlocks.waterextractor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));
         new Recipe(production, ProductionBlocks.oilextractor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40));
 
-        new Recipe(power, PowerBlocks.powernode, new ItemStack(Items.steel, 3), new ItemStack(Items.iron, 3));
-        new Recipe(power, PowerBlocks.powernodelarge, new ItemStack(Items.steel, 3), new ItemStack(Items.iron, 3));
-        new Recipe(power, PowerBlocks.battery, new ItemStack(Items.steel, 5), new ItemStack(Items.iron, 5));
-        new Recipe(power, PowerBlocks.batteryLarge, new ItemStack(Items.steel, 5), new ItemStack(Items.iron, 5));
-        new Recipe(power, PowerBlocks.combustiongenerator, new ItemStack(Items.iron, 1));
-        new Recipe(power, PowerBlocks.turbinegenerator, new ItemStack(Items.iron, 1));
-        new Recipe(power, PowerBlocks.thermalgenerator, new ItemStack(Items.steel, 1));
-        new Recipe(power, PowerBlocks.rtgenerator, new ItemStack(Items.titanium, 1), new ItemStack(Items.steel, 1));
-        new Recipe(power, PowerBlocks.solarpanel, new ItemStack(Items.iron, 30), new ItemStack(Items.silicon, 20));
-        new Recipe(power, PowerBlocks.largesolarpanel, new ItemStack(Items.iron, 30), new ItemStack(Items.silicon, 20));
-        new Recipe(power, PowerBlocks.nuclearReactor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40), new ItemStack(Items.steel, 50));
-        new Recipe(power, PowerBlocks.fusionReactor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40), new ItemStack(Items.steel, 50));
+        new Recipe(power, PowerBlocks.powernode, new ItemStack(Items.carbide, 3), new ItemStack(Items.tungsten, 3));
+        new Recipe(power, PowerBlocks.powernodelarge, new ItemStack(Items.carbide, 3), new ItemStack(Items.tungsten, 3));
+        new Recipe(power, PowerBlocks.battery, new ItemStack(Items.carbide, 5), new ItemStack(Items.tungsten, 5));
+        new Recipe(power, PowerBlocks.batteryLarge, new ItemStack(Items.carbide, 5), new ItemStack(Items.tungsten, 5));
+        new Recipe(power, PowerBlocks.combustiongenerator, new ItemStack(Items.tungsten, 1));
 
-        new Recipe(distribution, PowerBlocks.warpgate, new ItemStack(Items.steel, 1));
+        new Recipe(power, PowerBlocks.turbinegenerator, new ItemStack(Items.tungsten, 1));
+        new Recipe(power, PowerBlocks.thermalgenerator, new ItemStack(Items.carbide, 1));
+        new Recipe(power, PowerBlocks.rtgenerator, new ItemStack(Items.titanium, 1), new ItemStack(Items.carbide, 1));
+        new Recipe(power, PowerBlocks.solarpanel, new ItemStack(Items.tungsten, 30), new ItemStack(Items.silicon, 20));
+        new Recipe(power, PowerBlocks.largesolarpanel, new ItemStack(Items.tungsten, 30), new ItemStack(Items.silicon, 20));
+        new Recipe(power, PowerBlocks.nuclearReactor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40), new ItemStack(Items.carbide, 50));
+        new Recipe(power, PowerBlocks.fusionReactor, new ItemStack(Items.titanium, 40), new ItemStack(Items.surgealloy, 40), new ItemStack(Items.carbide, 50));
 
-        new Recipe(liquid, LiquidBlocks.conduit, new ItemStack(Items.steel, 1));
-        new Recipe(liquid, LiquidBlocks.pulseconduit, new ItemStack(Items.titanium, 1), new ItemStack(Items.steel, 1));
-        new Recipe(liquid, LiquidBlocks.liquidrouter, new ItemStack(Items.steel, 2));
-        new Recipe(liquid, LiquidBlocks.liquidtank, new ItemStack(Items.steel, 2));
-        new Recipe(liquid, LiquidBlocks.liquidjunction, new ItemStack(Items.steel, 2));
-        new Recipe(liquid, LiquidBlocks.bridgeconduit, new ItemStack(Items.titanium, 2), new ItemStack(Items.steel, 2));
-        new Recipe(liquid, LiquidBlocks.laserconduit, new ItemStack(Items.titanium, 2), new ItemStack(Items.steel, 2));
+        new Recipe(distribution, PowerBlocks.warpgate, new ItemStack(Items.carbide, 1));
 
-        new Recipe(liquid, LiquidBlocks.mechanicalPump, new ItemStack(Items.steel, 10));
-        new Recipe(liquid, LiquidBlocks.rotaryPump, new ItemStack(Items.steel, 10), new ItemStack(Items.surgealloy, 5));
-        new Recipe(liquid, LiquidBlocks.thermalPump, new ItemStack(Items.steel, 10), new ItemStack(Items.surgealloy, 5));
+        new Recipe(liquid, LiquidBlocks.conduit, new ItemStack(Items.carbide, 1));
+        new Recipe(liquid, LiquidBlocks.pulseconduit, new ItemStack(Items.titanium, 1), new ItemStack(Items.carbide, 1));
+        new Recipe(liquid, LiquidBlocks.liquidrouter, new ItemStack(Items.carbide, 2));
+        new Recipe(liquid, LiquidBlocks.liquidtank, new ItemStack(Items.carbide, 2));
+        new Recipe(liquid, LiquidBlocks.liquidjunction, new ItemStack(Items.carbide, 2));
+        new Recipe(liquid, LiquidBlocks.bridgeconduit, new ItemStack(Items.titanium, 2), new ItemStack(Items.carbide, 2));
+        new Recipe(liquid, LiquidBlocks.laserconduit, new ItemStack(Items.titanium, 2), new ItemStack(Items.carbide, 2));
 
-        new Recipe(units, UnitBlocks.repairPoint, new ItemStack(Items.steel, 10));
-        new Recipe(units, UnitBlocks.dropPoint, new ItemStack(Items.steel, 10));
-        new Recipe(units, UnitBlocks.resupplyPoint, new ItemStack(Items.steel, 10));
+        new Recipe(liquid, LiquidBlocks.mechanicalPump, new ItemStack(Items.carbide, 10));
+        new Recipe(liquid, LiquidBlocks.rotaryPump, new ItemStack(Items.carbide, 10), new ItemStack(Items.surgealloy, 5));
+        new Recipe(liquid, LiquidBlocks.thermalPump, new ItemStack(Items.carbide, 10), new ItemStack(Items.surgealloy, 5));
 
-        new Recipe(units, UnitBlocks.droneFactory, new ItemStack(Items.iron, 50));
-        new Recipe(units, UnitBlocks.reconstructor, new ItemStack(Items.iron, 1));
+        new Recipe(units, UnitBlocks.repairPoint, new ItemStack(Items.carbide, 10));
+        new Recipe(units, UnitBlocks.dropPoint, new ItemStack(Items.carbide, 10));
+        new Recipe(units, UnitBlocks.resupplyPoint, new ItemStack(Items.carbide, 10));
 
-        new Recipe(units, UnitBlocks.overdriveProjector, new ItemStack(Items.iron, 1));
-        new Recipe(units, UnitBlocks.shieldProjector, new ItemStack(Items.iron, 1));
+        new Recipe(units, UnitBlocks.droneFactory, new ItemStack(Items.tungsten, 50));
+        new Recipe(units, UnitBlocks.reconstructor, new ItemStack(Items.tungsten, 1));
 
-        new Recipe(units, UpgradeBlocks.omegaFactory, new ItemStack(Items.iron, 1));
-        new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.iron, 1));
-        new Recipe(units, UpgradeBlocks.tauFactory, new ItemStack(Items.iron, 1));
+        new Recipe(units, UnitBlocks.overdriveProjector, new ItemStack(Items.tungsten, 1));
+        new Recipe(units, UnitBlocks.shieldProjector, new ItemStack(Items.tungsten, 1));
 
-        new Recipe(units, UpgradeBlocks.tridentFactory, new ItemStack(Items.iron, 1));
-        new Recipe(units, UpgradeBlocks.javelinFactory, new ItemStack(Items.iron, 1));
-        new Recipe(units, UpgradeBlocks.halberdFactory, new ItemStack(Items.iron, 1));
+        new Recipe(units, UpgradeBlocks.omegaFactory, new ItemStack(Items.tungsten, 1));
+        new Recipe(units, UpgradeBlocks.deltaFactory, new ItemStack(Items.tungsten, 1));
+        new Recipe(units, UpgradeBlocks.tauFactory, new ItemStack(Items.tungsten, 1));
 
-        new Recipe(units, DebugBlocks.itemSource, new ItemStack(Items.steel, 10)).setDebug();
-        new Recipe(units, DebugBlocks.itemVoid, new ItemStack(Items.steel, 10)).setDebug();
-        new Recipe(units, DebugBlocks.liquidSource, new ItemStack(Items.steel, 10)).setDebug();
-        new Recipe(units, DebugBlocks.powerVoid, new ItemStack(Items.steel, 10)).setDebug();
-        new Recipe(units, DebugBlocks.powerInfinite, new ItemStack(Items.steel, 10), new ItemStack(Items.surgealloy, 5)).setDebug();*/
+        new Recipe(units, UpgradeBlocks.tridentFactory, new ItemStack(Items.tungsten, 1));
+        new Recipe(units, UpgradeBlocks.javelinFactory, new ItemStack(Items.tungsten, 1));
+        new Recipe(units, UpgradeBlocks.halberdFactory, new ItemStack(Items.tungsten, 1));
+
+        new Recipe(units, DebugBlocks.itemSource, new ItemStack(Items.carbide, 10)).setDebug();
+        new Recipe(units, DebugBlocks.itemVoid, new ItemStack(Items.carbide, 10)).setDebug();
+        new Recipe(units, DebugBlocks.liquidSource, new ItemStack(Items.carbide, 10)).setDebug();
+        new Recipe(units, DebugBlocks.powerVoid, new ItemStack(Items.carbide, 10)).setDebug();
+        new Recipe(units, DebugBlocks.powerInfinite, new ItemStack(Items.carbide, 10), new ItemStack(Items.surgealloy, 5)).setDebug();*/
     }
 
     @Override

core/src/io/anuke/mindustry/content/UnitTypes.java

@@ -19,6 +19,7 @@ public class UnitTypes implements ContentList {
             drag = 0.01f;
             speed = 0.2f;
             maxVelocity = 0.8f;
+            ammoCapacity = 0;
             range = 50f;
         }};
 

core/src/io/anuke/mindustry/content/blocks/Blocks.java

@@ -101,8 +101,8 @@ public class Blocks extends BlockList implements ContentList{
             drops = new ItemStack(Items.stone, 1);
         }};
 
-        iron = new Ore("iron") {{
-            drops = new ItemStack(Items.iron, 1);
+        iron = new Ore("tungsten") {{
+            drops = new ItemStack(Items.tungsten, 1);
         }};
 
         lead = new Ore("lead") {{

core/src/io/anuke/mindustry/content/blocks/CraftingBlocks.java

@@ -17,9 +17,9 @@ public class CraftingBlocks extends BlockList implements ContentList {
     public void load() {
         smelter = new Smelter("smelter") {{
             health = 70;
-            inputs = new Item[]{Items.iron};
+            inputs = new Item[]{Items.tungsten};
             fuel = Items.coal;
-            result = Items.steel;
+            result = Items.carbide;
             craftTime = 35f;
             useFlux = true;
         }};
@@ -27,8 +27,8 @@ public class CraftingBlocks extends BlockList implements ContentList {
         arcsmelter = new PowerSmelter("arc-smelter") {{
             health = 90;
             craftEffect = BlockFx.smeltsmoke;
-            inputs = new ItemStack[]{new ItemStack(Items.coal, 1), new ItemStack(Items.iron, 1)};
-            result = Items.steel;
+            inputs = new ItemStack[]{new ItemStack(Items.coal, 1), new ItemStack(Items.tungsten, 1)};
+            result = Items.carbide;
             powerUse = 0.1f;
             craftTime = 25f;
             size = 2;
@@ -51,7 +51,7 @@ public class CraftingBlocks extends BlockList implements ContentList {
 
         plasteelcompressor = new PlasteelCompressor("plasteel-compressor") {{
             inputLiquid = Liquids.oil;
-            inputItem = new ItemStack(Items.steel, 1);
+            inputItem = new ItemStack(Items.carbide, 1);
             liquidUse = 0.3f;
             liquidCapacity = 60f;
             powerUse = 0.5f;
@@ -130,7 +130,7 @@ public class CraftingBlocks extends BlockList implements ContentList {
                     null, null, null, null, null, null, null, null, null, null,
                     Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand,
                     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.tungsten, Items.tungsten, Items.tungsten, Items.tungsten,
                     Items.lead, Items.lead,
                     Items.coal, Items.coal,
                     Items.titanium
@@ -148,7 +148,7 @@ public class CraftingBlocks extends BlockList implements ContentList {
                     null, null, null, null, null, null, null, null, null, null, null, null, null,
                     Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand, Items.sand,
                     Items.stone, Items.stone, 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.iron,
+                    Items.tungsten, Items.tungsten, Items.tungsten, Items.tungsten, Items.tungsten,
                     Items.lead, Items.lead, Items.lead,
                     Items.coal, Items.coal, Items.coal,
                     Items.titanium, Items.titanium,

core/src/io/anuke/mindustry/content/blocks/DefenseBlocks.java

@@ -9,46 +9,37 @@ import io.anuke.mindustry.world.blocks.defense.Door;
 import io.anuke.mindustry.world.blocks.defense.PhaseWall;
 
 public class DefenseBlocks extends BlockList implements ContentList {
-    public static Block ironwall, ironwalllarge, steelwall, titaniumwall, diriumwall, steelwalllarge, titaniumwalllarge, diriumwalllarge, door, largedoor, deflectorwall, deflectorwalllarge,
+    public static Block tungstenWall, tungstenWallLarge, carbideWall, carbideWallLarge, thoriumWall, thoriumWallLarge, door, largedoor, deflectorwall, deflectorwalllarge,
         phasewall, phasewalllarge;
 
     @Override
     public void load() {
         int wallHealthMultiplier = 4;
 
-        ironwall = new Wall("ironwall") {{
+        tungstenWall = new Wall("tungsten-wall") {{
             health = 80 * wallHealthMultiplier;
         }};
 
-        ironwalllarge = new Wall("ironwall-large") {{
+        tungstenWallLarge = new Wall("tungsten-wall-large") {{
             health = 80 * 4 * wallHealthMultiplier;
             size = 2;
         }};
 
-        steelwall = new Wall("steelwall") {{
+        carbideWall = new Wall("carbide-wall") {{
             health = 110 * wallHealthMultiplier;
         }};
 
-        titaniumwall = new Wall("titaniumwall") {{
-            health = 150 * wallHealthMultiplier;
-        }};
-
-        diriumwall = new Wall("duriumwall") {{
-            health = 190 * wallHealthMultiplier;
-        }};
-
-        steelwalllarge = new Wall("steelwall-large") {{
-            health = 110 * 4 * wallHealthMultiplier;
+        carbideWallLarge = new Wall("carbide-wall-large") {{
+            health = 110 * wallHealthMultiplier*4;
             size = 2;
         }};
 
-        titaniumwalllarge = new Wall("titaniumwall-large") {{
-            health = 150 * 4 * wallHealthMultiplier;
-            size = 2;
+        thoriumWall = new Wall("thorium-wall") {{
+            health = 110 * wallHealthMultiplier;
         }};
 
-        diriumwalllarge = new Wall("duriumwall-large") {{
-            health = 190 * 4 * wallHealthMultiplier;
+        thoriumWallLarge = new Wall("thorium-wall-large") {{
+            health = 110 * wallHealthMultiplier*4;
             size = 2;
         }};
 

core/src/io/anuke/mindustry/content/blocks/ProductionBlocks.java

@@ -12,41 +12,31 @@ import io.anuke.mindustry.world.blocks.production.Fracker;
 import io.anuke.mindustry.world.blocks.production.SolidPump;
 
 public class ProductionBlocks extends BlockList implements ContentList {
-    public static Block ironDrill, reinforcedDrill, steelDrill, titaniumDrill, laserdrill, nucleardrill, plasmadrill, waterextractor, oilextractor, cultivator;
+    public static Block tungstenDrill, carbideDrill, laserdrill, blastdrill, plasmadrill, waterextractor, oilextractor, cultivator;
 
     @Override
     public void load() {
-        ironDrill = new Drill("irondrill") {{
-            tier = 1;
+        tungstenDrill = new Drill("tungsten-drill") {{
+            tier = 2;
             drillTime = 360;
         }};
 
-        reinforcedDrill = new Drill("reinforceddrill") {{
-            tier = 2;
-            drillTime = 320;
-        }};
-
-        steelDrill = new Drill("steeldrill") {{
+        carbideDrill = new Drill("carbide-drill") {{
             tier = 3;
             drillTime = 280;
         }};
 
-        titaniumDrill = new Drill("titaniumdrill") {{
-            tier = 4;
-            drillTime = 240;
-        }};
-
-        laserdrill = new Drill("laserdrill") {{
+        laserdrill = new Drill("laser-drill") {{
             drillTime = 180;
             size = 2;
             powerUse = 0.2f;
             hasPower = true;
-            tier = 5;
+            tier = 4;
             updateEffect = BlockFx.pulverizeMedium;
             drillEffect = BlockFx.mineBig;
         }};
 
-        nucleardrill = new Drill("nucleardrill") {{
+        blastdrill = new Drill("blast-drill") {{
             drillTime = 120;
             size = 3;
             powerUse = 0.5f;
@@ -60,7 +50,7 @@ public class ProductionBlocks extends BlockList implements ContentList {
             warmupSpeed = 0.01f;
         }};
 
-        plasmadrill = new Drill("plasmadrill") {{
+        plasmadrill = new Drill("plasma-drill") {{
             heatColor = Color.valueOf("ff461b");
             drillTime = 90;
             size = 4;
@@ -76,7 +66,7 @@ public class ProductionBlocks extends BlockList implements ContentList {
             warmupSpeed = 0.005f;
         }};
 
-        waterextractor = new SolidPump("waterextractor") {{
+        waterextractor = new SolidPump("water-extractor") {{
             result = Liquids.water;
             powerUse = 0.2f;
             pumpAmount = 0.1f;
@@ -85,7 +75,7 @@ public class ProductionBlocks extends BlockList implements ContentList {
             rotateSpeed = 1.4f;
         }};
 
-        oilextractor = new Fracker("oilextractor") {{
+        oilextractor = new Fracker("oil-extractor") {{
             result = Liquids.oil;
             inputLiquid = Liquids.water;
             updateEffect = BlockFx.pulverize;

core/src/io/anuke/mindustry/content/blocks/UnitBlocks.java

@@ -17,7 +17,7 @@ public class UnitBlocks extends BlockList implements ContentList {
             produceTime = 300;
             size = 2;
             requirements = new ItemStack[]{
-                new ItemStack(Items.iron, 20)
+                new ItemStack(Items.tungsten, 20)
             };
         }};
 

core/src/io/anuke/mindustry/content/blocks/WeaponBlocks.java

@@ -13,7 +13,7 @@ import io.anuke.ucore.util.Mathf;
 import io.anuke.ucore.util.Strings;
 
 public class WeaponBlocks extends BlockList implements ContentList {
-	public static Block duo, scatter, scorch, hail, wave, lancer, arc, swarmer, salvo, fuse, ripple, cyclone, spectre, meltdown;
+	public static Block duo, /*scatter,*/ scorch, hail, wave, lancer, arc, swarmer, salvo, fuse, ripple, cyclone, spectre, meltdown;
 
 	@Override
 	public void load() {
@@ -23,7 +23,7 @@ public class WeaponBlocks extends BlockList implements ContentList {
 			restitution = 0.03f;
 			ammoUseEffect = ShootFx.shellEjectSmall;
 		}};
-
+/*
 		scatter = new BurstTurret("scatter") {{
 			ammoTypes = new AmmoType[]{AmmoTypes.flakLead, AmmoTypes.flakExplosive, AmmoTypes.flakPlastic};
 			ammoPerShot = 1;
@@ -34,23 +34,23 @@ public class WeaponBlocks extends BlockList implements ContentList {
 			burstSpacing = 1f;
 			inaccuracy = 7f;
 			ammoUseEffect = ShootFx.shellEjectSmall;
-		}};
-
-		scorch = new LiquidTurret("scorch") {{
-			ammoTypes = new AmmoType[]{AmmoTypes.basicFlame};
-			recoil = 0f;
-			reload = 5f;
-			shootCone = 50f;
-			ammoUseEffect = ShootFx.shellEjectSmall;
-
-			drawer = (tile, entity) -> Draw.rect(entity.target != null ? name + "-shoot" : name, tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90);
-		}};
+		}};*/
 
 		hail = new ItemTurret("hail") {{
 			ammoTypes = new AmmoType[]{AmmoTypes.artilleryLead, AmmoTypes.artilleryHoming, AmmoTypes.artilleryIncindiary};
 			reload = 40f;
 		}};
 
+        scorch = new LiquidTurret("scorch") {{
+            ammoTypes = new AmmoType[]{AmmoTypes.basicFlame};
+            recoil = 0f;
+            reload = 5f;
+            shootCone = 50f;
+            ammoUseEffect = ShootFx.shellEjectSmall;
+
+            drawer = (tile, entity) -> Draw.rect(entity.target != null ? name + "-shoot" : name, tile.drawx() + tr2.x, tile.drawy() + tr2.y, entity.rotation - 90);
+        }};
+
 		wave = new LiquidTurret("wave") {{
 			ammoTypes = new AmmoType[]{AmmoTypes.water, AmmoTypes.lava, AmmoTypes.cryofluid, AmmoTypes.oil};
 			size = 2;

core/src/io/anuke/mindustry/content/bullets/TurretBullets.java

@@ -74,7 +74,7 @@ public class TurretBullets extends BulletList implements ContentList {
             }
         };
 
-        basicFlame = new BulletType(2f, 0) {
+        basicFlame = new BulletType(2f, 5) {
             {
                 hitsize = 7f;
                 lifetime = 30f;

core/src/io/anuke/mindustry/core/Control.java

@@ -353,7 +353,7 @@ public class Control extends Module{
             }
 
             //check unlocks every 2 seconds
-			if(Timers.get("timerCheckUnlock", 120)){
+			if(!state.mode.infiniteResources && !state.mode.disableWaveTimer && Timers.get("timerCheckUnlock", 120)){
 				checkUnlockableBlocks();
 
 				//save if the db changed

core/src/io/anuke/mindustry/core/Logic.java

@@ -57,7 +57,8 @@ public class Logic extends Module {
                         }
                     }
                 }else{
-                    tile.entity.items.addItem(Items.iron, 100);
+                    tile.entity.items.addItem(Items.tungsten, 50);
+                    tile.entity.items.addItem(Items.lead, 20);
                 }
             }
         }