Fix select bug, update TODO

TODO.md

@@ -2,18 +2,20 @@ _Keep in mind that this is just a basic outline of planned features, and will be
 
 ### 3.x Planned
 - New save system: toggleable autosave, named slots, less clunky save UI
+- Optimize for tablets
 - Teleporter UI changes, more colors (?)
-- New building tools: selection-delete, hold to place blocks in a line, one-tap delete mode (mobile). New 'tool' menu (desktop).
-- Refactor `Renderer`, remove code for rendering platform-specific placement and move to 2 different classes
+- [DONE] New building tools: selection-delete, hold to place blocks in a line, one-tap delete mode (mobile). New 'tool' menu (desktop).
+- [DONE] Refactor `Renderer`, remove code for rendering platform-specific placement and move to 2 different classes
 - New map format system. Each new version is a different class, convert between different versions.
 - Underground conduits
 - Minimap
 - More indicators for when the core is damaged and/or under attack
-- Fix bugs with junction not accepting blocks(low FPS)
+- Fix bugs with junction not accepting blocks (low FPS)
 - Fix bugs with tunnel merging and/or removing items (low FPS)
 - Investigate #6
 - Edit descriptions for conveyors to be more clear about how to use them
 - Add link to Mindustry discord everywhere
+- Balancing to slow down progression
 
 ### Major Bugs
 - Black screen when tabbing out on Android

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="31"
-    android:versionName="3.04" >
+    android:versionCode="33"
+    android:versionName="3.1" >
 
     <uses-sdk android:minSdkVersion="9" android:targetSdkVersion="25" />
     <uses-permission android:name="com.android.vending.BILLING" />

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

@@ -9,7 +9,7 @@ import io.anuke.mindustry.entities.Player;
 import io.anuke.ucore.scene.ui.layout.Unit;
 
 public class Vars{
-	public static final boolean testAndroid = false;
+	public static final boolean testAndroid = true;
 	//shorthand for whether or not this is running on android
 	public static final boolean android = (Gdx.app.getType() == ApplicationType.Android) || testAndroid;
 	//shorthand for whether or not this is running on GWT

core/src/io/anuke/mindustry/entities/effect/Fx.java

@@ -1,6 +1,7 @@
 package io.anuke.mindustry.entities.effect;
 
 import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.Colors;
 
 import io.anuke.mindustry.Vars;
 import io.anuke.ucore.core.Draw;
@@ -311,8 +312,11 @@ public class Fx{
 
 	breakBlock = new Effect(12, e -> {
 		Draw.thickness(2f);
-		Draw.color(Color.WHITE, Color.GRAY, e.ifract());
-		Draw.spikes(e.x, e.y, e.ifract() * 5f, 2, 5);
+		Draw.color(Color.WHITE, Colors.get("break"), e.ifract());
+		Draw.spikes(e.x, e.y, e.ifract() * 5f, 2, 5, 90);
+		
+		Draw.thickness(2f - e.ifract() * 2f);
+		Draw.polygon(4, e.x, e.y, Vars.tilesize / 1.6f + e.ifract() * 5f, 45);
 		Draw.reset();
 	}),
 

core/src/io/anuke/mindustry/input/AndroidInput.java

@@ -37,10 +37,12 @@ public class AndroidInput extends InputHandler{
 
 	@Override
 	public boolean touchUp(int screenX, int screenY, int pointer, int button){
-		if(brokeBlock) return false;
+		if(brokeBlock){
+			brokeBlock = false;
+			return false;
+		}
 		
-		brokeBlock = false;
-		if(placing && pointer == 0 && !player.placeMode.pan){
+		if(placing && pointer == 0 && !player.placeMode.pan && player.recipe != null){
 			player.placeMode.released(getBlockX(), getBlockY(), getBlockEndX(), getBlockEndY());
 		}else if(pointer == 0 && !player.breakMode.pan && player.recipe == null && drawPlace()){
 			player.breakMode.released(getBlockX(), getBlockY(), getBlockEndX(), getBlockEndY());