Fix invisible turret and broken RTG generators

TODO.md

@@ -12,7 +12,7 @@ _Keep in mind that this is just a basic outline of planned features, and will be
 - More indicators for when the core is damaged and/or under attack
 - Fix bugs with junction not accepting blocks (low FPS)
 - Fix bugs with tunnel merging and/or removing items (low FPS)
-- Edit descriptions for conveyors to be more clear about how to use them
+- Edit descriptions for conveyor tunnels to be more clear about how to use them
 - [DONE] Add link to Mindustry discord everywhere
 - Balancing to slow down progression
 - Map editor

android/src/io/anuke/mindustry/AndroidLauncher.java

@@ -52,7 +52,7 @@ public class AndroidLauncher extends AndroidApplication{
 		Mindustry.donationsCallable = new Callable(){ @Override public void run(){ showDonations(); } };
 
 		if(doubleScaleTablets && isTablet(this.getContext())){
-			Unit.dp.addition = 0.5f;
+			Unit.dp.addition = 1f;
 		}
 		
 		config.hideStatusBar = true;

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

@@ -59,6 +59,7 @@ public class Control extends Module{
 	Tile core;
 	Array<SpawnPoint> spawnpoints = new Array<>();
 	boolean shouldUpdateItems = false;
+	boolean wasPaused = false;
 	
 	float respawntime;
 	InputHandler input;
@@ -409,6 +410,19 @@ public class Control extends Module{
 		return items;
 	}
 	
+	@Override
+	public void pause(){
+		wasPaused = GameState.is(State.paused);
+		if(GameState.is(State.playing)) GameState.set(State.paused);
+	}
+	
+	@Override
+	public void resume(){
+		if(GameState.is(State.paused) && !wasPaused){
+			GameState.set(State.playing);
+		}
+	}
+	
 	@Override
 	public void init(){
 		Musics.shuffleAll();

core/src/io/anuke/mindustry/entities/enemies/BlastEnemy.java

@@ -46,6 +46,7 @@ public class BlastEnemy extends Enemy{
 		Bullet b = new Bullet(BulletType.blast, this, x, y, 0).add();
 		b.damage = BulletType.blast.damage + (tier-1) * 40;
 		damage(999);
+		remove();
 	}
 
 }

core/src/io/anuke/mindustry/entities/enemies/HealerEnemy.java

@@ -85,6 +85,7 @@ public class HealerEnemy extends Enemy{
 		Bullet b = new Bullet(BulletType.blast, this, x, y, 0).add();
 		b.damage = BulletType.blast.damage + (tier-1) * 30;
 		damage(999);
+		remove();
 	}
 
 }

core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java

@@ -158,6 +158,9 @@ public class Turret extends Block{
 				float targetRot = Angles.predictAngle(tile.worldx(), tile.worldy(), 
 						entity.target.x, entity.target.y, entity.target.xvelocity, entity.target.yvelocity, bullet.speed);
 				
+				if(Float.isNaN(entity.rotation)){
+					entity.rotation = 0;
+				}
 				entity.rotation = Mathf.slerp(entity.rotation, targetRot, 
 						rotatespeed*Timers.delta());
 				

core/src/io/anuke/mindustry/world/blocks/types/distribution/Teleporter.java

@@ -22,7 +22,7 @@ import io.anuke.ucore.util.Mathf;
 //TODO
 public class Teleporter extends Block implements Configurable{
 	public static final int colors = 4;
-	public static final Color[] colorArray = {Color.ROYAL, Color.ORANGE, Color.SCARLET, Color.FOREST};
+	public static final Color[] colorArray = {Color.ROYAL, Color.ORANGE, Color.SCARLET, Color.FOREST, Color.PURPLE, Color.GOLD, Color.PINK};
 	
 	private static Array<Tile> removal = new Array<>();
 	private static Array<Tile> returns = new Array<>();

core/src/io/anuke/mindustry/world/blocks/types/production/ItemPowerGenerator.java

@@ -73,7 +73,7 @@ public class ItemPowerGenerator extends Generator{
 		PowerEntity entity = tile.entity();
 		
 		float maxPower = Math.min(powerCapacity - entity.power, powerOutput * Timers.delta());
-		float mfract = maxPower/(powerOutput * Timers.delta());
+		float mfract = maxPower/(powerOutput);
 		
 		if(entity.time > 0f){
 			entity.time -= 1f/itemDuration*mfract;

desktop/src/io/anuke/mindustry/desktop/DesktopLauncher.java

@@ -23,7 +23,7 @@ public class DesktopLauncher {
 		config.setMaximized(true);
 		config.setWindowedMode(960, 540);
 		config.setWindowIcon("sprites/icon.png");
-		//config.useVsync(false);
+		config.useVsync(false);
 		
 		Mindustry.platforms = new PlatformFunction(){
 			SimpleDateFormat format = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm");