Added a few extra blocks, fixed icons

android/AndroidManifest.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="io.anuke.mindustry"
-    android:versionCode="6"
-    android:versionName="1.1.2" >
+    android:versionCode="7"
+    android:versionName="1.1.3" >
 
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="25" />
 

build.gradle

@@ -79,8 +79,8 @@ project(":core") {
     apply plugin: "java"
 
     dependencies {
-    	compile fileTree(dir: '../core/lib', include: '*.jar')
-    	//compile 'com.github.anuken:ucore:1e7163626f'
+    	//compile fileTree(dir: '../core/lib', include: '*.jar')
+        compile 'com.github.anuken:ucore:309fbe900d'
         compile "com.badlogicgames.gdx:gdx:$gdxVersion"
         compile "com.badlogicgames.gdx:gdx-ai:1.8.1"
     }

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

@@ -131,7 +131,8 @@ public class Control extends RendererModule{
 		
 		control.camera.position.set(player.x, player.y, 0);
 		
-		wavetime = waveSpacing();
+		//multiplying by 2 so you start with more time in the beginning
+		wavetime = waveSpacing()*2;
 		
 		if(showedTutorial || !Settings.getBool("tutorial")){
 			GameState.set(State.playing);
@@ -393,9 +394,12 @@ public class Control extends RendererModule{
 			
 			camera.position.set(lastx - deltax, lasty - deltay, 0);
 			
+			if(Vars.debug){
 				record();
 			}
 			
+		}
+		
 		if(!GameState.is(State.paused)){
 			Inputs.update();
 			Timers.update(Gdx.graphics.getDeltaTime()*60f);

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

@@ -9,6 +9,7 @@ import io.anuke.ucore.core.Effects;
 import io.anuke.ucore.graphics.Hue;
 
 public class EffectLoader{
+	static Color lightRed = Hue.mix(Color.WHITE, Color.FIREBRICK, 0.1f);
 	
 	public static void create(){
 		
@@ -25,6 +26,13 @@ public class EffectLoader{
 			Draw.reset();
 		});
 		
+		Effects.create("sparkbig", 11, e -> {
+			Draw.thickness(1f);
+			Draw.color(Hue.mix(lightRed, Color.GRAY, e.ifract()));
+			Draw.spikes(e.x, e.y, e.ifract() * 5f, 2.3f, 8);
+			Draw.reset();
+		});
+		
 		Effects.create("smelt", 10, e -> {
 			Draw.thickness(1f);
 			Draw.color(Hue.mix(Color.YELLOW, Color.RED, e.ifract()));

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

@@ -15,7 +15,7 @@ public class Vars{
 	//respawn time in frames
 	public static final float respawnduration = 60*4;
 	//time between waves in frames
-	public static final float wavespace = 20*60*(android ? 2 : 1);
+	public static final float wavespace = 30*60*(android ? 2 : 1);
 	//how far away from spawn points the player can't place blocks
 	public static final float enemyspawnspace = 65;
 	//scale of the font

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

@@ -79,7 +79,7 @@ import io.anuke.ucore.entities.Entity;
  */
 public class SaveIO{
 	/**Save file version ID. Should be incremented every breaking release.*/
-	private static final int fileVersionID = 3;
+	private static final int fileVersionID = 4;
 	
 	private static FormatProvider provider = null;
 	

core/src/io/anuke/mindustry/resource/Item.java

@@ -1,5 +1,5 @@
 package io.anuke.mindustry.resource;
 
 public enum Item{
-	stone, iron, coal, steel;
+	stone, iron, coal, steel, titanium;
 }

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

@@ -23,14 +23,24 @@ public class Blocks{
 		solid = true;
 	}},
 	
-	stone = new Block("stone"),
+	stone = new Block("stone"){{
+		drops = new ItemStack(Item.stone, 1);
+	}},
+	
+	iron = new Block("iron"){{
+		drops = new ItemStack(Item.iron, 1);
+	}},
+	
+	coal = new Block("coal"){{
+		drops = new ItemStack(Item.coal, 1);
+	}},
+	
+	titanium = new Block("titanium"){{
+		drops = new ItemStack(Item.titanium, 1);
+	}},
 	
 	dirt = new Block("dirt"),
 	
-	iron = new Block("iron"),
-	
-	coal = new Block("coal"),
-	
 	grass = new Block("grass"),
 	
 	stoneblock = new Block("stoneblock"){{

core/src/io/anuke/mindustry/world/blocks/Drill.java

@@ -53,11 +53,4 @@ public class Drill extends Block{
 		Draw.tscl(Vars.fontscale);
 	}
 
-	//@Override
-	public String error(Tile tile){
-		if(tile.floor() != resource)
-			return "Not on iron ore block!";
-		return null;
-	}
-
 }

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

@@ -9,6 +9,7 @@ import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.resource.Item;
 import io.anuke.mindustry.world.Block;
 import io.anuke.mindustry.world.Tile;
+import io.anuke.ucore.core.Effects;
 import io.anuke.ucore.util.Timers;
 
 public class ProductionBlocks{
@@ -145,5 +146,34 @@ public class ProductionBlocks{
 		result = Item.coal;
 	}},
 	
-	end = null;
+	titaniumdrill = new Drill("titaniumdrill"){{
+		resource = Blocks.titanium;
+		result = Item.titanium;
+	}},
+	
+	omnidrill = new Drill("omnidrill"){
+		{
+			time = 4;
+		}
+		
+		@Override
+		public void update(Tile tile){
+
+			if(tile.floor().drops != null && Timers.get(tile, 60 * time)){
+				offloadNear(tile, tile.floor().drops.item);
+				Effects.effect("sparkbig", tile.worldx(), tile.worldy());
+			}
+
+			if(Timers.get(tile.hashCode() + "dump", 30)){
+				tryDump(tile);
+			}
+		}
+		
+		@Override
+		public String description(){
+			return "Mines 1 of any resource every "+time+" seconds.";
+		}
+	}
+	
+	;
 }

core/src/io/anuke/mindustry/world/blocks/RepairTurret.java

@@ -24,9 +24,9 @@ public class RepairTurret extends Turret{
 
 		if(entity.target != null){
 			float target = entity.angleTo(entity.target);
-			entity.rotation = Mathf.slerp(entity.rotation, target, 0.2f*Mathf.delta());
+			entity.rotation = Mathf.slerp(entity.rotation, target, 0.16f*Mathf.delta());
 
-			if(Timers.get(tile, reload) && Angles.angleDist(target, entity.rotation) < 12){
+			if(Timers.get(tile, reload) && Angles.angleDist(target, entity.rotation) < 10){
 				entity.target.health++;
 			}
 		}