From 19a4dd41e3d5995c59666df76dc04c20a3da87f2 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 3 Dec 2017 12:02:48 -0500
Subject: [PATCH] Balanced all enemies, tweaked waves

---
 core/src/io/anuke/mindustry/Vars.java         |   2 +-
 core/src/io/anuke/mindustry/core/Control.java |  72 +------
 .../anuke/mindustry/entities/BulletType.java  |   4 +-
 .../anuke/mindustry/entities/EnemySpawn.java  |  12 +-
 .../anuke/mindustry/entities/WaveCreator.java | 201 ++++++++++++++++++
 .../entities/enemies/BlastEnemy.java          |   5 +-
 .../mindustry/entities/enemies/EmpEnemy.java  |   3 +-
 .../mindustry/entities/enemies/Enemy.java     |   6 +-
 .../mindustry/entities/enemies/FastEnemy.java |   9 +-
 .../entities/enemies/FlamerEnemy.java         |   3 +-
 .../entities/enemies/FortressEnemy.java       |   8 +-
 .../entities/enemies/HealerEnemy.java         |   3 +-
 .../entities/enemies/MortarEnemy.java         |   5 +-
 .../entities/enemies/RapidEnemy.java          |   5 +-
 .../mindustry/entities/enemies/TankEnemy.java |   5 +-
 .../entities/enemies/TargetEnemy.java         |   5 +-
 .../mindustry/entities/enemies/TestEnemy.java |   3 +-
 .../entities/enemies/TitanEnemy.java          |  11 +-
 .../entities/enemies/flying/FlyingEnemy.java  |  11 +
 core/src/io/anuke/mindustry/input/Input.java  |   4 +-
 core/src/io/anuke/mindustry/io/SaveIO.java    |   3 +-
 .../anuke/mindustry/resource/ItemStack.java   |   4 +
 .../io/anuke/mindustry/resource/Recipe.java   |  36 ++--
 .../src/io/anuke/mindustry/ui/LoadDialog.java |   2 +-
 .../io/anuke/mindustry/world/Generator.java   |   6 +-
 .../world/blocks/ProductionBlocks.java        |   1 +
 .../mindustry/world/blocks/WeaponBlocks.java  |   4 +-
 .../mindustry/world/blocks/types/Wall.java    |   2 +-
 .../world/blocks/types/defense/Turret.java    |   1 +
 .../world/blocks/types/production/Drill.java  |   4 +-
 .../blocks/types/production/Generator.java    |   2 +-
 desktop/mindustry-saves/0.mins                | Bin 3828 -> 8862 bytes
 desktop/mindustry-saves/1.mins                | Bin 3707 -> 13400 bytes
 desktop/mindustry-saves/2.mins                | Bin 3663 -> 17639 bytes
 34 files changed, 304 insertions(+), 138 deletions(-)
 create mode 100644 core/src/io/anuke/mindustry/entities/WaveCreator.java
 create mode 100644 core/src/io/anuke/mindustry/entities/enemies/flying/FlyingEnemy.java

diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java
index ad34385288..3403d4d2cc 100644
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/io/anuke/mindustry/Vars.java
@@ -43,7 +43,7 @@ public class Vars{
 	//whether to draw chunk borders
 	public static boolean debugChunks = false;
 	//whether turrets have infinite ammo (only with debug)
-	public static boolean infiniteAmmo = false;
+	public static boolean infiniteAmmo = true;
 	//whether to show paths of enemies
 	public static boolean showPaths = true;
 	//number of save slots-- increasing may lead to layout issues
diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java
index 2b96963d48..63dc8719f6 100644
--- a/core/src/io/anuke/mindustry/core/Control.java
+++ b/core/src/io/anuke/mindustry/core/Control.java
@@ -9,14 +9,15 @@ import com.badlogic.gdx.input.GestureDetector;
 import com.badlogic.gdx.utils.Array;
 import com.badlogic.gdx.utils.ObjectMap;
 import com.badlogic.gdx.utils.reflect.ClassReflection;
-import com.badlogic.gdx.utils.reflect.Constructor;
 
 import io.anuke.mindustry.Mindustry;
 import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.entities.effect.Fx;
-import io.anuke.mindustry.entities.enemies.*;
+import io.anuke.mindustry.entities.enemies.BlastEnemy;
+import io.anuke.mindustry.entities.enemies.Enemy;
+import io.anuke.mindustry.entities.enemies.HealerEnemy;
 import io.anuke.mindustry.input.AndroidInput;
 import io.anuke.mindustry.input.GestureHandler;
 import io.anuke.mindustry.input.Input;
@@ -113,61 +114,8 @@ public class Control extends Module{
 		
 		player = new Player();
 		
-		spawns = Array.with(
-			new EnemySpawn(TitanEnemy.class){{
-				after = 5;
-				spacing = 2;
-				scaling = 5;
-			}},
-			new EnemySpawn(FortressEnemy.class){{
-				after = 12;
-				spacing = 3;
-				scaling = 5;
-			}},
-			new EnemySpawn(HealerEnemy.class){{
-				scaling = 3;
-				spacing = 2;
-				after = 8;
-			}},
-			new EnemySpawn(Enemy.class){{
-				scaling = 3;
-				tierscaleback = 3;
-			}},
-			new EnemySpawn(FastEnemy.class){{
-				after = 2;
-				scaling = 3;
-			}},
-			new EnemySpawn(FlamerEnemy.class){{
-				after = 14;
-				spacing = 5;
-				scaling = 2;
-			}},
-			new EnemySpawn(BlastEnemy.class){{
-				after = 12;
-				spacing = 2;
-				scaling = 3;
-			}},
-			new EnemySpawn(RapidEnemy.class){{
-				after = 7;
-				spacing = 3;
-				scaling = 3;
-			}},
-			new EnemySpawn(EmpEnemy.class){{
-				after = 19;
-				spacing = 3;
-				scaling = 5;
-			}},
-			new EnemySpawn(TankEnemy.class){{
-				after = 4;
-				spacing = 2;
-				scaling = 3;
-			}},
-			new EnemySpawn(MortarEnemy.class){{
-				after = 20;
-				spacing = 3;
-				scaling = 5;
-			}}
-		);
+		spawns = WaveCreator.getSpawns();
+		WaveCreator.testWaves(1, 30);
 	}
 	
 	public void reset(){
@@ -290,9 +238,9 @@ public class Control extends Module{
 					
 					Timers.run(index*50f, ()->{
 						try{
-							Constructor c = ClassReflection.getConstructor(spawn.type, int.class);
-							Enemy enemy = (Enemy)c.newInstance(fl);
+							Enemy enemy = ClassReflection.newInstance(spawn.type);
 							enemy.set(tile.worldx() + Mathf.range(range), tile.worldy() + Mathf.range(range));
+							enemy.spawn = fl;
 							enemy.tier = spawn.tier(wave, fl);
 							Effects.effect(Fx.spawn, enemy);
 							enemy.add(enemyGroup);
@@ -466,15 +414,15 @@ public class Control extends Module{
 			
 			if(Inputs.keyUp(Keys.Y)){
 				if(Inputs.keyDown(Keys.SHIFT_LEFT)){
-					new HealerEnemy(0).set(player.x, player.y).add();
+					new HealerEnemy().set(player.x, player.y).add();
 				}else{
 					float px = player.x, py = player.y;
-					Timers.run(30f, ()->new BlastEnemy(0).set(px, py).add());
+					Timers.run(30f, ()->new BlastEnemy().set(px, py).add());
 				}
 			}
 		}
 		
-		if(shouldUpdateItems && Timers.get("updateItems", 8)){
+		if(shouldUpdateItems && (Timers.get("updateItems", 8) || GameState.is(State.paused))){
 			ui.updateItems();
 			shouldUpdateItems = false;
 		}
diff --git a/core/src/io/anuke/mindustry/entities/BulletType.java b/core/src/io/anuke/mindustry/entities/BulletType.java
index 12de2f69d5..23818dfb76 100644
--- a/core/src/io/anuke/mindustry/entities/BulletType.java
+++ b/core/src/io/anuke/mindustry/entities/BulletType.java
@@ -232,14 +232,14 @@ public abstract class BulletType  extends BaseBulletType<Bullet>{
 		}
 		public void draw(Bullet b){}
 	},
-	small = new BulletType(1.5f, 1){
+	small = new BulletType(1.5f, 2){
 		public void draw(Bullet b){
 			Draw.color(glowy);
 			Draw.rect("shot", b.x, b.y, b.angle() - 45);
 			Draw.reset();
 		}
 	},
-	smallSlow = new BulletType(1.2f, 1){
+	smallSlow = new BulletType(1.2f, 2){
 		public void draw(Bullet b){
 			Draw.color("orange");
 			Draw.rect("shot", b.x, b.y, b.angle() - 45);
diff --git a/core/src/io/anuke/mindustry/entities/EnemySpawn.java b/core/src/io/anuke/mindustry/entities/EnemySpawn.java
index 1e47e49094..27805bc200 100644
--- a/core/src/io/anuke/mindustry/entities/EnemySpawn.java
+++ b/core/src/io/anuke/mindustry/entities/EnemySpawn.java
@@ -4,14 +4,24 @@ import io.anuke.mindustry.entities.enemies.Enemy;
 import io.anuke.ucore.util.Mathf;
 
 public class EnemySpawn{
+	/**The enemy type spawned*/
 	public final Class<? extends Enemy> type;
+	/**When this spawns should end*/
 	protected int before = Integer.MAX_VALUE;
+	/**When this spawns should start*/
 	protected int after;
+	/**The spacing, in waves, of spawns. 2 = spawns every other wave*/
 	protected int spacing = 1;
+	/**How many waves need to pass after the start of this spawn for the tier to increase by one*/
 	protected int tierscale = 15;
+	/**How many less enemies there are, every time the tier increases*/
 	protected int tierscaleback = 1;
+	/**Maximum amount of enemies that spawn*/
 	protected int max = 17;
+	/**How many waves need to pass before the amount of enemies increases by 1*/
 	protected float scaling = 9999f;
+	/**Amount of enemies spawned initially, with no scaling*/
+	protected int amount = 1;
 	
 	public EnemySpawn(Class<? extends Enemy> type){
 		this.type = type;
@@ -21,7 +31,7 @@ public class EnemySpawn{
 		if(wave < after || wave > before || (wave - after) % spacing != 0){
 			return 0;
 		}
-		return Math.min(1 * Math.max((int)((wave / spacing) / scaling), 1) - (tier(wave, lane)-1) * tierscaleback, max);
+		return Math.min(amount-1 + 1 * Math.max((int)((wave / spacing) / scaling), 1) - (tier(wave, lane)-1) * tierscaleback, max);
 	}
 	
 	public int tier(int wave, int lane){
diff --git a/core/src/io/anuke/mindustry/entities/WaveCreator.java b/core/src/io/anuke/mindustry/entities/WaveCreator.java
new file mode 100644
index 0000000000..bdc7a1fc6b
--- /dev/null
+++ b/core/src/io/anuke/mindustry/entities/WaveCreator.java
@@ -0,0 +1,201 @@
+package io.anuke.mindustry.entities;
+
+import com.badlogic.gdx.utils.Array;
+import com.badlogic.gdx.utils.reflect.ClassReflection;
+
+import io.anuke.mindustry.entities.enemies.*;
+
+public class WaveCreator{
+	
+	public static Array<EnemySpawn> getSpawns(){
+		//TODO
+		//Gdx.app.exit();
+		return Array.with(
+			new EnemySpawn(Enemy.class){{
+				scaling = 1;
+				before = 3;
+			}},
+			
+			new EnemySpawn(FastEnemy.class){{
+				scaling = 1;
+				after = 3;
+				spacing = 5;
+				amount = 4;
+				tierscaleback = 0;
+			}},
+			
+			new EnemySpawn(BlastEnemy.class){{
+				after = 4;
+				amount = 3;
+				spacing = 5;
+				scaling = 1;
+				tierscaleback = 0;
+			}},
+			
+			new EnemySpawn(TankEnemy.class){{
+				after = 5;
+				spacing = 5;
+				scaling = 1;
+				amount = 2;
+			}},
+			
+			new EnemySpawn(RapidEnemy.class){{
+				after = 7;
+				spacing = 5;
+				scaling = 2;
+				amount = 3;
+			}},
+			
+			new EnemySpawn(HealerEnemy.class){{
+				after = 5;
+				spacing = 5;
+				scaling = 1;
+				amount = 1;
+			}},
+			
+			new EnemySpawn(TitanEnemy.class){{
+				after = 6;
+				amount = 2;
+				spacing = 5;
+				scaling = 3;
+			}},
+			
+			new EnemySpawn(FlamerEnemy.class){{
+				after = 12;
+				amount = 3;
+				spacing = 5;
+				scaling = 2;
+			}},
+			
+			new EnemySpawn(BlastEnemy.class){{
+				after = 4 + 5 + 5;
+				amount = 3;
+				spacing = 5;
+				scaling = 1;
+				tierscaleback = 0;
+			}},
+			//boss wave
+			new EnemySpawn(FortressEnemy.class){{
+				after = 16;
+				amount = 2;
+				spacing = 5;
+				scaling = 1;
+			}},
+			
+			new EnemySpawn(TitanEnemy.class){{
+				after = 16;
+				amount = 2;
+				spacing = 5;
+				scaling = 3;
+				tierscaleback = 0;
+			}},
+			
+			new EnemySpawn(HealerEnemy.class){{
+				after = 16;
+				spacing = 5;
+				scaling = 1;
+				amount = 2;
+			}},
+			//end boss wave
+			
+			//enchanced boss wave
+			new EnemySpawn(MortarEnemy.class){{
+				after = 16 + 5;
+				amount = 1;
+				spacing = 5;
+				scaling = 1;
+			}},
+			
+			new EnemySpawn(EmpEnemy.class){{
+				after = 16 + 5;
+				amount = 1;
+				spacing = 5;
+				scaling = 1;
+			}}
+			//end enchanced boss wave
+		);
+	}
+	
+	public static Array<EnemySpawn> getSpawnsOld(){
+		return Array.with(
+			new EnemySpawn(Enemy.class){{
+				scaling = 2;
+				before = 4;
+			}},
+			new EnemySpawn(Enemy.class){{
+				scaling = 3;
+				tierscaleback = 3;
+				spacing = 2;
+				after = 4;
+			}},
+			new EnemySpawn(TitanEnemy.class){{
+				after = 5;
+				spacing = 2;
+				scaling = 5;
+			}},
+			new EnemySpawn(FortressEnemy.class){{
+				after = 12;
+				spacing = 3;
+				scaling = 5;
+			}},
+			new EnemySpawn(HealerEnemy.class){{
+				scaling = 3;
+				spacing = 2;
+				after = 8;
+			}},
+			new EnemySpawn(FastEnemy.class){{
+				after = 2;
+				scaling = 3;
+			}},
+			new EnemySpawn(FlamerEnemy.class){{
+				after = 14;
+				spacing = 5;
+				scaling = 2;
+			}},
+			new EnemySpawn(BlastEnemy.class){{
+				after = 12;
+				spacing = 2;
+				scaling = 3;
+			}},
+			new EnemySpawn(RapidEnemy.class){{
+				after = 7;
+				spacing = 3;
+				scaling = 3;
+			}},
+			new EnemySpawn(EmpEnemy.class){{
+				after = 19;
+				spacing = 3;
+				scaling = 5;
+			}},
+			new EnemySpawn(TankEnemy.class){{
+				after = 4;
+				spacing = 2;
+				scaling = 3;
+			}},
+			new EnemySpawn(MortarEnemy.class){{
+				after = 20;
+				spacing = 3;
+				scaling = 5;
+			}}
+		);
+	}
+	
+	public static void testWaves(int from, int to){
+		Array<EnemySpawn> spawns = getSpawns();
+		for(int i = from; i <= to; i ++){
+			System.out.print(i+": ");
+			int total = 0;
+			for(EnemySpawn spawn : spawns){
+				int a = spawn.evaluate(i, 0);
+				int t = spawn.tier(i, 0);
+				total += a;
+				
+				if(a > 0){
+					System.out.print(a+"x" + ClassReflection.getSimpleName(spawn.type) + "-" + t + " ");
+				}
+			}
+			System.out.print(" (" + total + ")");
+			System.out.println();
+		}
+	}
+}
diff --git a/core/src/io/anuke/mindustry/entities/enemies/BlastEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/BlastEnemy.java
index 9a40debd03..8b174a5b68 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/BlastEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/BlastEnemy.java
@@ -7,10 +7,9 @@ import io.anuke.mindustry.entities.TileEntity;
 
 public class BlastEnemy extends Enemy{
 
-	public BlastEnemy(int spawn) {
-		super(spawn);
+	public BlastEnemy() {
 		maxhealth = 30;
-		speed = 0.65f;
+		speed = 0.7f;
 		bullet = null;
 		turretrotatespeed = 0f;
 		mass = 0.8f;
diff --git a/core/src/io/anuke/mindustry/entities/enemies/EmpEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/EmpEnemy.java
index cd9424a791..5215719e37 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/EmpEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/EmpEnemy.java
@@ -4,8 +4,7 @@ import io.anuke.mindustry.entities.BulletType;
 
 public class EmpEnemy extends Enemy{
 
-	public EmpEnemy(int spawn) {
-		super(spawn);
+	public EmpEnemy() {
 		
 		speed = 0.27f;
 		reload = 70;
diff --git a/core/src/io/anuke/mindustry/entities/enemies/Enemy.java b/core/src/io/anuke/mindustry/entities/enemies/Enemy.java
index e87552cb22..88d4660797 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/Enemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/Enemy.java
@@ -22,7 +22,7 @@ public class Enemy extends DestructibleEntity{
 	public final static Color[] tierColors = { Color.valueOf("ffe451"), Color.valueOf("f48e20"), Color.valueOf("ff6757"), Color.valueOf("ff2d86") };
 	public final static int maxtier = 4;
 
-	protected float speed = 0.3f;
+	protected float speed = 0.4f;
 	protected float reload = 32;
 	protected float range = 60;
 	protected float length = 4;
@@ -47,9 +47,7 @@ public class Enemy extends DestructibleEntity{
 	public Entity target;
 	public int tier = 1;
 
-	public Enemy(int spawn) {
-		this.spawn = spawn;
-
+	public Enemy() {
 		hitbox.setSize(5f);
 		hitboxTile.setSize(4f);
 
diff --git a/core/src/io/anuke/mindustry/entities/enemies/FastEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/FastEnemy.java
index cd71689a20..01d80d0524 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/FastEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/FastEnemy.java
@@ -2,14 +2,13 @@ package io.anuke.mindustry.entities.enemies;
 
 public class FastEnemy extends Enemy{
 
-	public FastEnemy(int spawn) {
-		super(spawn);
+	public FastEnemy() {
 		
-		speed = 0.7f;
-		reload = 30;
+		speed = 0.73f;
+		reload = 25;
 		mass = 0.2f;
 		
-		maxhealth = 30;
+		maxhealth = 40;
 		heal();
 	}
 
diff --git a/core/src/io/anuke/mindustry/entities/enemies/FlamerEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/FlamerEnemy.java
index d2832f1f3a..3c85c450a3 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/FlamerEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/FlamerEnemy.java
@@ -4,8 +4,7 @@ import io.anuke.mindustry.entities.BulletType;
 
 public class FlamerEnemy extends Enemy{
 
-	public FlamerEnemy(int spawn) {
-		super(spawn);
+	public FlamerEnemy() {
 		
 		speed = 0.35f;
 		
diff --git a/core/src/io/anuke/mindustry/entities/enemies/FortressEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/FortressEnemy.java
index 94f82ce501..a925814e1c 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/FortressEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/FortressEnemy.java
@@ -13,10 +13,9 @@ public class FortressEnemy extends Enemy{
 	float spawnTime = 240;
 	boolean deployed;
 
-	public FortressEnemy(int spawn) {
-		super(spawn);
+	public FortressEnemy() {
 		
-		speed = 0.12f;
+		speed = 0.2f;
 		reload = 90;
 		maxhealth = 700;
 		range = 70f;
@@ -38,7 +37,8 @@ public class FortressEnemy extends Enemy{
 			if(Timers.get(this, "spawn", spawnTime) && spawned < maxSpawn){
 				Angles.translation(angle, 20f);
 				
-				FastEnemy enemy = new FastEnemy(spawn);
+				FastEnemy enemy = new FastEnemy();
+				enemy.spawn = spawn;
 				enemy.tier = this.tier;
 				enemy.spawner = this;
 				enemy.set(x + Angles.x(), y + Angles.y());
diff --git a/core/src/io/anuke/mindustry/entities/enemies/HealerEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/HealerEnemy.java
index 45fe62720a..886662d797 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/HealerEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/HealerEnemy.java
@@ -13,8 +13,7 @@ import io.anuke.ucore.util.Angles;
 
 public class HealerEnemy extends Enemy{
 
-	public HealerEnemy(int spawn) {
-		super(spawn);
+	public HealerEnemy() {
 		
 		speed = 0.2f;
 		reload = 14;
diff --git a/core/src/io/anuke/mindustry/entities/enemies/MortarEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/MortarEnemy.java
index adfac7e879..9df78bf784 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/MortarEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/MortarEnemy.java
@@ -4,11 +4,10 @@ import io.anuke.mindustry.entities.BulletType;
 
 public class MortarEnemy extends Enemy{
 
-	public MortarEnemy(int spawn) {
-		super(spawn);
+	public MortarEnemy() {
 		
 		maxhealth = 200;
-		speed = 0.2f;
+		speed = 0.25f;
 		reload = 100f;
 		bullet = BulletType.shell;
 		turretrotatespeed = 0.15f;
diff --git a/core/src/io/anuke/mindustry/entities/enemies/RapidEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/RapidEnemy.java
index 3f06326a86..44948908eb 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/RapidEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/RapidEnemy.java
@@ -4,14 +4,13 @@ import io.anuke.mindustry.entities.BulletType;
 
 public class RapidEnemy extends Enemy{
 
-	public RapidEnemy(int spawn) {
-		super(spawn);
+	public RapidEnemy() {
 		
 		reload = 8;
 		bullet = BulletType.purple;
 		rotatespeed = 0.08f;
 		maxhealth = 260;
-		speed = 0.27f;
+		speed = 0.33f;
 		heal();
 		hitbox.setSize(8f);
 		mass = 3f;
diff --git a/core/src/io/anuke/mindustry/entities/enemies/TankEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/TankEnemy.java
index 265d526c28..4ca5a514ed 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/TankEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/TankEnemy.java
@@ -7,11 +7,10 @@ import io.anuke.ucore.util.Angles;
 
 public class TankEnemy extends Enemy{
 
-	public TankEnemy(int spawn) {
-		super(spawn);
+	public TankEnemy() {
 		
 		maxhealth = 350;
-		speed = 0.2f;
+		speed = 0.24f;
 		reload = 90f;
 		rotatespeed = 0.06f;
 		bullet = BulletType.small;
diff --git a/core/src/io/anuke/mindustry/entities/enemies/TargetEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/TargetEnemy.java
index a2e319e27a..5ec216e001 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/TargetEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/TargetEnemy.java
@@ -9,8 +9,7 @@ import io.anuke.ucore.core.Timers;
 
 public class TargetEnemy extends Enemy{
 	
-	public TargetEnemy(int spawn){
-		super(0);
+	public TargetEnemy(){
 		speed = 0f;
 		maxhealth = 10;
 	}
@@ -48,7 +47,7 @@ public class TargetEnemy extends Enemy{
 	public void onDeath(){
 		super.onDeath();
 		Timers.run(100f, ()->{
-			new TargetEnemy(0).set(x, y).add();
+			new TargetEnemy().set(x, y).add();
 		});
 	}
 }
diff --git a/core/src/io/anuke/mindustry/entities/enemies/TestEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/TestEnemy.java
index cd1a714bbf..56da2fdcfa 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/TestEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/TestEnemy.java
@@ -5,8 +5,7 @@ import io.anuke.ucore.core.Timers;
 public class TestEnemy extends Enemy{
 	boolean dir = false;
 
-	public TestEnemy(int spawn) {
-		super(spawn);
+	public TestEnemy() {
 		maxhealth = 99999;
 		heal();
 	}
diff --git a/core/src/io/anuke/mindustry/entities/enemies/TitanEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/TitanEnemy.java
index d2e3d14318..d7c78920d5 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/TitanEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/TitanEnemy.java
@@ -7,12 +7,11 @@ import io.anuke.ucore.util.Mathf;
 
 public class TitanEnemy extends Enemy{
 
-	public TitanEnemy(int spawn) {
-		super(spawn);
+	public TitanEnemy() {
 		
-		speed = 0.14f;
+		speed = 0.22f;
 		reload = 30;
-		maxhealth = 400;
+		maxhealth = 421;
 		range = 60f;
 		bullet = BulletType.small;
 		hitbox.setSize(7f);
@@ -27,7 +26,7 @@ public class TitanEnemy extends Enemy{
 	
 	@Override
 	void updateShooting(){
-		Timers.get(this, "salvo", 250);
+		Timers.get(this, "salvo", 240);
 		
 		if(Timers.getTime(this, "salvo") < 60){
 			if(Timers.get(this, "salvoShoot", 6)){
@@ -35,7 +34,7 @@ public class TitanEnemy extends Enemy{
 			}
 		}
 		
-		if(Timers.get(this, "shotgun", 90)){
+		if(Timers.get(this, "shotgun", 80)){
 			Angles.shotgun(5, 10f, 0f, f->{
 				shoot(BulletType.smallSlow, f);
 			});
diff --git a/core/src/io/anuke/mindustry/entities/enemies/flying/FlyingEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/flying/FlyingEnemy.java
new file mode 100644
index 0000000000..2fbb27ff14
--- /dev/null
+++ b/core/src/io/anuke/mindustry/entities/enemies/flying/FlyingEnemy.java
@@ -0,0 +1,11 @@
+package io.anuke.mindustry.entities.enemies.flying;
+
+import io.anuke.mindustry.entities.enemies.Enemy;
+
+public class FlyingEnemy extends Enemy{
+
+	public FlyingEnemy() {
+		
+	}
+
+}
diff --git a/core/src/io/anuke/mindustry/input/Input.java b/core/src/io/anuke/mindustry/input/Input.java
index f2092fc956..7dc2c67d96 100644
--- a/core/src/io/anuke/mindustry/input/Input.java
+++ b/core/src/io/anuke/mindustry/input/Input.java
@@ -7,6 +7,8 @@ import com.badlogic.gdx.Input.Keys;
 import com.badlogic.gdx.math.Vector2;
 
 import io.anuke.mindustry.Vars;
+import io.anuke.mindustry.core.GameState;
+import io.anuke.mindustry.core.GameState.State;
 import io.anuke.mindustry.resource.ItemStack;
 import io.anuke.mindustry.resource.Weapon;
 import io.anuke.mindustry.world.Tile;
@@ -23,7 +25,7 @@ public class Input{
 		//player is dead
 		if(player.health <= 0) return;
 		
-		if(Inputs.scrolled()){
+		if(Inputs.scrolled() && GameState.is(State.playing)){
 			Vars.renderer.scaleCamera(Inputs.scroll());
 		}
 
diff --git a/core/src/io/anuke/mindustry/io/SaveIO.java b/core/src/io/anuke/mindustry/io/SaveIO.java
index d812253195..b1e5b2d6c6 100644
--- a/core/src/io/anuke/mindustry/io/SaveIO.java
+++ b/core/src/io/anuke/mindustry/io/SaveIO.java
@@ -357,7 +357,8 @@ public class SaveIO{
 				int health = stream.readInt();
 				
 				try{
-					Enemy enemy = (Enemy)ClassReflection.getConstructor(enemyIDs.get(type), int.class).newInstance(lane);
+					Enemy enemy = ClassReflection.newInstance(enemyIDs.get(type));
+					enemy.spawn = lane;
 					enemy.health = health;
 					enemy.x = x;
 					enemy.y = y;
diff --git a/core/src/io/anuke/mindustry/resource/ItemStack.java b/core/src/io/anuke/mindustry/resource/ItemStack.java
index c402284766..9d6bceb017 100644
--- a/core/src/io/anuke/mindustry/resource/ItemStack.java
+++ b/core/src/io/anuke/mindustry/resource/ItemStack.java
@@ -9,4 +9,8 @@ public class ItemStack{
 		this.item = item;
 		this.amount = amount;
 	}
+	
+	public boolean equals(ItemStack other){
+		return other != null && other.item == item && other.amount == amount;
+	}
 }
diff --git a/core/src/io/anuke/mindustry/resource/Recipe.java b/core/src/io/anuke/mindustry/resource/Recipe.java
index 636931ee74..06c6295380 100644
--- a/core/src/io/anuke/mindustry/resource/Recipe.java
+++ b/core/src/io/anuke/mindustry/resource/Recipe.java
@@ -19,7 +19,7 @@ public enum Recipe{
 	duriumwalllarge(defense, DefenseBlocks.diriumwalllarge, stack(Item.dirium, 8)),
 	door(defense, DefenseBlocks.door, stack(Item.steel, 3), stack(Item.iron, 3)),
 	largedoor(defense, DefenseBlocks.largedoor, stack(Item.steel, 3*4), stack(Item.iron, 3*4)),
-	titaniumshieldwall(defense, DefenseBlocks.titaniumshieldwall, stack(Item.titanium, 2)),
+	titaniumshieldwall(defense, DefenseBlocks.titaniumshieldwall, stack(Item.titanium, 3)),
 	
 	conveyor(distribution, DistributionBlocks.conveyor, stack(Item.stone, 1)),
 	steelconveyor(distribution, DistributionBlocks.steelconveyor, stack(Item.steel, 1)),
@@ -43,36 +43,36 @@ public enum Recipe{
 	mortarturret(weapon, WeaponBlocks.mortarturret, stack(Item.steel, 20), stack(Item.titanium, 15)),
 	teslaturret(weapon, WeaponBlocks.teslaturret, stack(Item.steel, 10), stack(Item.titanium, 15), stack(Item.dirium, 15)),
 	plasmaturret(weapon, WeaponBlocks.plasmaturret, stack(Item.steel, 10), stack(Item.titanium, 10), stack(Item.dirium, 15)),
-	chainturret(weapon, WeaponBlocks.chainturret, stack(Item.steel, 10), stack(Item.titanium, 10), stack(Item.dirium, 15)),
-	titanturret(weapon, WeaponBlocks.titanturret, stack(Item.steel, 10), stack(Item.titanium, 10), stack(Item.dirium, 15)),
+	chainturret(weapon, WeaponBlocks.chainturret, stack(Item.steel, 35), stack(Item.titanium, 25), stack(Item.dirium, 35)),
+	titanturret(weapon, WeaponBlocks.titanturret, stack(Item.steel, 50), stack(Item.titanium, 45), stack(Item.dirium, 55)),
 	
 	smelter(crafting, ProductionBlocks.smelter, stack(Item.stone, 40), stack(Item.iron, 40)),
 	crucible(crafting, ProductionBlocks.crucible, stack(Item.titanium, 40), stack(Item.steel, 40)),
 	coalpurifier(crafting, ProductionBlocks.coalpurifier, stack(Item.steel, 10), stack(Item.iron, 10)),
 	titaniumpurifier(crafting, ProductionBlocks.titaniumpurifier, stack(Item.steel, 30), stack(Item.iron, 30)),
-	oilrefinery(crafting, ProductionBlocks.oilrefinery, stack(Item.steel, 30), stack(Item.iron, 30)),
-	stoneformer(crafting, ProductionBlocks.stoneformer, stack(Item.steel, 30), stack(Item.iron, 30)),
-	lavasmelter(crafting, ProductionBlocks.lavasmelter, stack(Item.steel, 30), stack(Item.iron, 30)),
+	oilrefinery(crafting, ProductionBlocks.oilrefinery, stack(Item.steel, 15), stack(Item.iron, 15)),
+	stoneformer(crafting, ProductionBlocks.stoneformer, stack(Item.steel, 10), stack(Item.iron, 10)),
+	lavasmelter(crafting, ProductionBlocks.lavasmelter, stack(Item.steel, 20), stack(Item.iron, 20), stack(Item.titanium, 10)),
 	
 	stonedrill(production, ProductionBlocks.stonedrill, stack(Item.stone, 12)),
 	irondrill(production, ProductionBlocks.irondrill, stack(Item.stone, 25)),
 	coaldrill(production, ProductionBlocks.coaldrill, stack(Item.stone, 25), stack(Item.iron, 40)),
 	titaniumdrill(production, ProductionBlocks.titaniumdrill, stack(Item.iron, 40), stack(Item.steel, 40)),
-	uraniumdrill(production, ProductionBlocks.uraniumdrill, stack(Item.titanium, 20), stack(Item.steel, 40)),
-	omnidrill(production, ProductionBlocks.omnidrill, stack(Item.titanium, 20), stack(Item.dirium, 20)),
+	uraniumdrill(production, ProductionBlocks.uraniumdrill, stack(Item.iron, 40), stack(Item.steel, 40)),
+	omnidrill(production, ProductionBlocks.omnidrill, stack(Item.titanium, 30), stack(Item.dirium, 20)),
 	
-	coalgenerator(power, ProductionBlocks.coalgenerator, stack(Item.titanium, 10), stack(Item.dirium, 10)),
-	thermalgenerator(power, ProductionBlocks.thermalgenerator, stack(Item.titanium, 10), stack(Item.dirium, 10)),
-	combustiongenerator(power, ProductionBlocks.combustiongenerator, stack(Item.titanium, 10), stack(Item.dirium, 10)),
-	rtgenerator(power, ProductionBlocks.rtgenerator, stack(Item.titanium, 10), stack(Item.dirium, 10)),
-	nuclearreactor(power, ProductionBlocks.nuclearReactor, stack(Item.titanium, 10), stack(Item.dirium, 10)),
-	powerbooster(power, DistributionBlocks.powerbooster, stack(Item.titanium, 10), stack(Item.dirium, 10)),
-	powerlaser(power, DistributionBlocks.powerlaser, stack(Item.titanium, 10), stack(Item.dirium, 10)),
-	powerlaserrouter(power, DistributionBlocks.powerlaserrouter, stack(Item.titanium, 10), stack(Item.dirium, 10)),
+	coalgenerator(power, ProductionBlocks.coalgenerator, stack(Item.iron, 30), stack(Item.stone, 20)),
+	thermalgenerator(power, ProductionBlocks.thermalgenerator, stack(Item.steel, 30), stack(Item.iron, 30)),
+	combustiongenerator(power, ProductionBlocks.combustiongenerator, stack(Item.iron, 30), stack(Item.stone, 20)),
+	rtgenerator(power, ProductionBlocks.rtgenerator, stack(Item.titanium, 20), stack(Item.steel, 20)),
+	nuclearreactor(power, ProductionBlocks.nuclearReactor, stack(Item.titanium, 40), stack(Item.dirium, 40), stack(Item.steel, 50)),
+	powerbooster(power, DistributionBlocks.powerbooster, stack(Item.steel, 8), stack(Item.iron, 8)),
+	powerlaser(power, DistributionBlocks.powerlaser, stack(Item.steel, 3), stack(Item.iron, 3)),
+	powerlaserrouter(power, DistributionBlocks.powerlaserrouter, stack(Item.steel, 5), stack(Item.iron, 5)),
 	
-	shieldgenerator(power, DefenseBlocks.shieldgenerator, stack(Item.titanium, 10), stack(Item.dirium, 10)),
+	shieldgenerator(power, DefenseBlocks.shieldgenerator, stack(Item.titanium, 30), stack(Item.dirium, 40)),
 	
-	teleporter(distribution, DistributionBlocks.teleporter, stack(Item.titanium, 10), stack(Item.dirium, 10)),
+	teleporter(distribution, DistributionBlocks.teleporter, stack(Item.steel, 20), stack(Item.dirium, 15)),
 	
 	healturret(power, DefenseBlocks.repairturret, stack(Item.iron, 30)),
 	megahealturret(power, DefenseBlocks.megarepairturret, stack(Item.iron, 20), stack(Item.steel, 30)),
diff --git a/core/src/io/anuke/mindustry/ui/LoadDialog.java b/core/src/io/anuke/mindustry/ui/LoadDialog.java
index f1d8d69bfb..5baf7f27d9 100644
--- a/core/src/io/anuke/mindustry/ui/LoadDialog.java
+++ b/core/src/io/anuke/mindustry/ui/LoadDialog.java
@@ -52,7 +52,7 @@ public class LoadDialog extends FloatingDialog{
 		for(int i = 0; i < Vars.saveSlots; i++){
 			final int slot = i;
 
-			TextButton button = new TextButton("[orange]Slot " + (i + 1));
+			TextButton button = new TextButton("[accent]Slot " + (i + 1));
 			button.pad(Unit.dp.inPixels(12));
 			button.getLabelCell().top().left().growX();
 			
diff --git a/core/src/io/anuke/mindustry/world/Generator.java b/core/src/io/anuke/mindustry/world/Generator.java
index a1b29667be..b6109f5243 100644
--- a/core/src/io/anuke/mindustry/world/Generator.java
+++ b/core/src/io/anuke/mindustry/world/Generator.java
@@ -86,11 +86,11 @@ public class Generator{
 						floor = Blocks.coal;
 					}
 					
-					if(Noise.nnoise(x + 9999, y + 9999, 8, 1) > 0.253){
+					if(Noise.nnoise(x + 9999, y + 9999, 8, 1) > 0.264){
 						floor = Blocks.titanium;
 					}
 					
-					if(Noise.nnoise(x + 99999, y + 99999, 7, 1) > 0.258){
+					if(Noise.nnoise(x + 99999, y + 99999, 7, 1) > 0.259){
 						floor = Blocks.uranium;
 					}
 				}
@@ -112,7 +112,7 @@ public class Generator{
 				}
 				
 				if(color == Hue.rgb(Color.PURPLE)){
-					if(!Vars.android) new TargetEnemy(0).set(x * Vars.tilesize, y * Vars.tilesize).add();
+					if(!Vars.android) new TargetEnemy().set(x * Vars.tilesize, y * Vars.tilesize).add();
 					floor = Blocks.stone;
 				}
 				
diff --git a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java
index a76c189a28..bfb64aff8f 100644
--- a/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java
+++ b/core/src/io/anuke/mindustry/world/blocks/ProductionBlocks.java
@@ -151,6 +151,7 @@ public class ProductionBlocks{
 	stonedrill = new Drill("stonedrill"){{
 		resource = Blocks.stone;
 		result = Item.stone;
+		time = 4;
 		formalName = "stone drill";
 		description = "Mines 1 "+resource.name+" every "+time+" seconds.";
 		fullDescription = "The essential drill. When placed on stone tiles, outputs stone at a slow pace indefinitely.";
diff --git a/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java b/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java
index 67b43d0ca0..3e315e9c0e 100644
--- a/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java
+++ b/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java
@@ -74,8 +74,8 @@ public class WeaponBlocks{
 			bullet = BulletType.iron;
 			ammo = Item.iron;
 			health = 70;
-			shots = 7;
-			inaccuracy = 30f;
+			shots = 5;
+			inaccuracy = 15f;
 			shotDelayScale = 0.7f;
 			fullDescription = "A standard turret. Uses iron for ammo. Shoots a spread of 7 bullets. "
 					+ "Lower range, but higher damage output than the gattling turret.";
diff --git a/core/src/io/anuke/mindustry/world/blocks/types/Wall.java b/core/src/io/anuke/mindustry/world/blocks/types/Wall.java
index e2f2afefc7..f5f15533e5 100644
--- a/core/src/io/anuke/mindustry/world/blocks/types/Wall.java
+++ b/core/src/io/anuke/mindustry/world/blocks/types/Wall.java
@@ -11,7 +11,7 @@ public class Wall extends Block{
 	}
 	
 	public boolean canReplace(Block other){
-		return other instanceof Wall;
+		return other instanceof Wall && health > other.health;
 	}
 
 }
diff --git a/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java b/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java
index 32ef2ec8e8..b0cb9402f8 100644
--- a/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java
+++ b/core/src/io/anuke/mindustry/world/blocks/types/defense/Turret.java
@@ -228,6 +228,7 @@ public class Turret extends Block{
 				bullet(tile, entity.rotation + Mathf.range(inaccuracy));
 			}else{
 				Timers.run(i * shotDelayScale, ()->{
+					Angles.translation(entity.rotation, width * Vars.tilesize / 2f);
 					bullet(tile, entity.rotation + Mathf.range(inaccuracy));
 				});
 			}
diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/Drill.java b/core/src/io/anuke/mindustry/world/blocks/types/production/Drill.java
index 72cb20bdd2..f9a67be841 100644
--- a/core/src/io/anuke/mindustry/world/blocks/types/production/Drill.java
+++ b/core/src/io/anuke/mindustry/world/blocks/types/production/Drill.java
@@ -33,7 +33,7 @@ public class Drill extends Block{
 	@Override
 	public void update(Tile tile){
 		
-		if(tile.floor() == resource && Timers.get(tile, "drill", 60 * time) && tile.entity.totalItems() < capacity){
+		if((tile.floor() == resource || (resource.drops.equals(tile.floor().drops))) && Timers.get(tile, "drill", 60 * time) && tile.entity.totalItems() < capacity){
 			offloadNear(tile, result);
 			Effects.effect(Fx.spark, tile.worldx(), tile.worldy());
 		}
@@ -45,7 +45,7 @@ public class Drill extends Block{
 	
 	@Override
 	public void drawOver(Tile tile){
-		if(tile.floor() != resource && resource != null){
+		if(tile.floor() != resource && !(resource.drops.equals(tile.floor().drops)) && resource != null){
 			Draw.colorl(0.85f + Mathf.absin(Timers.time(), 6f, 0.15f));
 			Draw.rect("cross", tile.worldx(), tile.worldy());
 			Draw.color();
diff --git a/core/src/io/anuke/mindustry/world/blocks/types/production/Generator.java b/core/src/io/anuke/mindustry/world/blocks/types/production/Generator.java
index 70a4b931ab..c8061930f0 100644
--- a/core/src/io/anuke/mindustry/world/blocks/types/production/Generator.java
+++ b/core/src/io/anuke/mindustry/world/blocks/types/production/Generator.java
@@ -58,7 +58,7 @@ public class Generator extends PowerBlock{
 				Effects.effect(Fx.shockwave, x, y);
 
 				Timers.run(12f + Mathf.random(20f), () -> {
-					tile.damageNearby(3, 40, 0f);
+					tile.damageNearby(4, 40, 0f);
 				});
 
 				Effects.sound(explosionSound, x, y);
diff --git a/desktop/mindustry-saves/0.mins b/desktop/mindustry-saves/0.mins
index 2badafeb22c63fda688f9b25b507b3b3efeffda2..bffadbd2494854ad53ae60fd1427d420c474720c 100644
GIT binary patch
literal 8862
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

literal 3828
zcmZQzVBlt8U`&vR>iy2Z#=yY9=(23?JC|i9G0sy0<})xbq%g2EGRU>0GJ^;f2Dz37
zRuI7iA{ZFtTBfo=SRk#Aq6`d-;S3C^(hMLV#lVm)17a{pF)-xH!dPW+Rt21uDF>4+
zg0u1!VPfTQR)!KxtV9{c%2$E0s?=bta%~tZQ5VLlg0t%2tQtL-Y^gqs)nEW)oic&3
z&YHqlN6cZYvvAfi3z*m`IP0txOzeOSjCIxy#yaBwV_kEEu}(O_SQp?dXLp#`5f2#a
znkS59=L2Ke`@&cWaMo-;nAie1Yo<R;tS<n@Iss=z2f@Vp;H+D4)@?ZJ4xF_=1g0Y~
z6vny%XC;Th#9YH+EcFN&t1%MB>W8y*qF`cna8?(bbr{YPkA|s}fU`W{ta3Q(3Y;Y!
z1JmIKXI+J}9Ae?Ja8@gvbs5eQi-V~vfU_FmtmAN&R6I=GX*la5oaL4Pll6eJCcs&-
zi7?sFBp53R&UyuB1t!B}gW#;gaMoowOCklPP72P-gR>66S^H99>h{A~r{JvmG??r`
zIO|3_Ow2t4#@d|;V;zOF!n0svWpLI$IO{N+bpg)01!p~gv&6Guri8&+hvBT#aF%5b
zOx->>>oJ^lAQvY4Bp=3lS^#66EP}D(ieaoZaMmU`Yd@TI56-$@0@IOJ3S%vSvzEbG
zr{JtxaMoiuYgHLcZ%jFiRRd=&g|iM;z+{(K!dQt_FxDM7>rgdJ>`)DibrR0%s)dOy
zfU{)lU}6z))`EJtSObhT2hO_Q2osys1Y=EwvyQ@9GR-hqBRFd<oOJ@ul5c^jGlsLK
zw!*}=!C5=uEY)_HYzUmS7S7rMXQ_9<)NO^cHg&?pmUO{c-7wZRIBRteOl%XJCD{uT
z3xKl}`(R>Q;4GbfnAl4=OJM>`Oc~B{fU|PoEQN_Mbt-U{_9U2C3Y_%<&QhEVlU0JV
z^x-UjILl}XOkMm`7|VDXj8z9`wZmCT(-{~U7#N&EYBU%a7?jcYDrkJA8DRCgAWb0k
zAbrYM#8jYSAbFTNRfw1~GXnzyNK6gFM=?tsi<kyP3|!M0fh-0Y3Nj&j2ACzqz>olE
zsmz2p5F`V#1VpRN1m`kF1_t$+;9SPYz@RY`oXZ#)7#wDT)PR~a&T!URI7?*~#5|C_
zVDp$5=5QG@WHKZ(FsP!-u`)2kCo?ce|72kJn8CoXhk=1%k}U&++AMH-1=$bLVadS2
zzyzu{HD-a+DkB5Ko>?$gsLY1g$OH{0kht3H=^zSZ!fdctK|Yubb|fPML*Q(XB*+Jg
z;H(vJmdqTOtkN8a$#B1bA{>jD3RDc)1*#A+XP90!2p=`_u!w0u#4sao0o++j;Vh-O
zU<V>nBN|@?jlW|q%xiKBV5}}UYd4%Fxd<jJ4`=Oyvy>LYWLw~@1#s5&B`{f)rC`@-
zg81Nuiz>Q+8oEH#QjlU$%v^`FZo*j#%V4r9%g~KR5nyCsP(u-5U|>jsYu*WGsVqk~
z23<f6U7&S2%ndCoV65|S)|Qnpv0HGK(rTEP8k}_l&eB=~lTBO;WA(3xu};HT3L9Wz
z*;`<&b8wd0R+yMSoOKb-^4<oMP2LV;dF+I-+IGQMc6(v03^;4`ewbL-AsEZyFpO1j
z1jdRz3S&)&vu40qoyTCZ%iyfV$6;b?;H<rHR>29F>@+xQC!E!H5+*wt&RPm*IiG^b
zmcv=g;VhfeFj)sUYswjz*mO8+`B|8l%Q+Zp5}Y*`&RPLyIi829TMB0_x&RZ~3}?-{
x2oqZmXL($PiTT1=esGrWRhVquH5hBz4Hzr<9*h+NXRW*s6H9pnW2HZZumGJKoh$$V

diff --git a/desktop/mindustry-saves/1.mins b/desktop/mindustry-saves/1.mins
index a5297efc389d47732d2b95726b74057c5bcebdeb..d780fe1229eabf6ba381cf818af4c7686244dd96 100644
GIT binary patch
literal 13400
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
W%1xNMy>Qmz+c2?1aMsp)5HSGaiH>~$

literal 3707
zcmZQzVBlt8U`&t*G5E>A#=yY9=)%SR)n!8C4HqG&6b1%{6b5!i2Dz37W(K(y0~Q9k
z7AsZ;xt1g*kQf7lT+0$R2n(b&csBzBqXz>+p$r2ENHH*EDuNgcQVa|wN-$QEDvVX7
z4r5ho!B~m9Fjl!fjFoEuXBom+#YQmJ1rr$SqB)Fp%o4`BXa!^KwuP~-*~3_ionWlP
zE-=;!IO~ENOw8UL#&UtPg5j)l9x&O<aF&ucOw19^viF6FU4*kv`oY9z_`_HV0Wg*!
zoHYr~x(sJ!2g1}{hO-KSU}C*+)*(1cEf^-N3um2zvr<A}vPz*aRt%h#0B0q_S@+?r
zCvcWj7));`ob>?C>I#R+-hi{ZBVl64;4FzKn3xir<qBsNz*$z&Fm;}ARu7!z90QZ>
zfwN}9SyHhuSx-32D-I@B2xr}evr^(=vb}KD6*$W$0VW#@XQjbeWpGwnB23)@IO`^y
zbsx^kOM<EEhqErjS)$1>*$_A@0?s-MXWfId#6cOF0hAl>!da4OFjE@gtetSyVL0m&
zoF$eH(;)+A6~I{yaF%oiOr0g1WesQD%!J9_fwO9}VPY5ItUGX)R1Qow3eI|*3lq!C
zgRzdmSr_wRVwd2o0|hX#=Wy2gLYUaTA{c9VF^pAH3S*syvmV1)CS@?$$Z{AfxdO&I
zQ3+$+fwRuk!o*DLU@XIW7;6rkwHVHt-w2aE0%uKYf{7i4v!q*KV&~zkjjb@T`E4+k
zQag+_4bIvKXN7dYWVgdvQr$2y4LEBPoTbqNlhuN=mcdy&;H<rHmUJIX$38gArXMEe
z-46~*Mg|6-esEASGBEh|g9DI}fx&wM*r_1d2@H%33=E*MlqrG{RC}>Fs^tIu&tRWs
zx`%<mcS0w~L`DXN4HG~NP{LQ42xECqoDO1wjF~tC%JQ8!6Us`1tILM7R>4_2;4JS+
zU?=D@F)%P_fb=pjF!*2*^F<e9WMjDG$iQGe8LUZ)fx!XJ@}3Mf6I}UdfV~AW6q}$g
zL=ar*z*Q!}4Qhh3lBd9|NrAKErozNF!&%1DU}BDN)>b&{7@Vav9qdGBkZO>(mC^Vr
zXnY-TSc4+K7tUG>XDQ79o2CnjOps|HQ<c%h7#SGml`}A?K*d37z-pNo7<B(JZ0D+A
zU{Hm~IWt2eLk+@5n9In(pmCFdK^<Kjq#hy$u7iz04gp!fP{F{E3{D&%r%Qno2Z*II
z6XIZy8n7c67#P%M!V<0eOjx4Tm<da?PH??avp~AQrp$tv0<sNeiYgW{wOOzPuMUv~
zHEx(9K#raTOX1rQrp|_#iku=<XT$7Nn+*<iMg|7;*<g=>f@C(>af}QM7I1YQaF!>W
z)dOcK&4Ji~>~dvvF-8W48H@}JDo}B_dzcs)G@=+nSfd#jR3UQCFmu!(e3S^&m1AH~
zM;8bA9U_JnVKxj5$#Y<y-2!JR%>_FckzUdGDrkJwxiB-#;jAri)}nbZ*`08f`h1v}
z8=SQW&e{uSX)b`NyS)g;TCfbpS_WrnE{BOl!ddg-tle<d!WA%eTj4CNl`yezI7@96
zOiX??jHL!=ZGp2?*1=@e;Vex!D`7oM_6(eL6V6iG2$OZ&1Y@0sv(9aXiCu!TF2h+@
z;H<>0Fm<upVXUMbFjmtp7|VDMjMW5ZwZU1(_QPaT55ZWThheM<2-Z=U*a|pn4V>k9
z3?|zJXU&AO_Q6@(j>FZRfUy?9S<B$8$){klQ{XJi(=f4#aF+R5n3x@$Wqb}M=5Zdz
zngeI8yZ{qhbrHt$y9{IbUWKum;H>#@);c&V@ET0rA~<U)oHhMAOxFJfj8%OT#)`QO
VV<q2(v6eo7v6ei9v5H<nSOA6Gj=%r_

diff --git a/desktop/mindustry-saves/2.mins b/desktop/mindustry-saves/2.mins
index e8eda1212daabccc621c10cd78f325872c9d2ed5..94eac02a1470253bdd576aebabc2e301d4696806 100644
GIT binary patch
literal 17639
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%0D~I?3xgt~
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

literal 3663
zcmZQzVBlt8U`&t*3lC;sV_;xlbou6b%4J5)V&~nrmoqRhq%g2EGRU=*FoOsd2Dz37
zRuI7iA{ZFtTH4qkECvP!hR#|B21YLihIDBVk3ouop$g8*k%ft+%E4G=a8`vpOsqx`
z#;R9=v1(Oetb8>XD^C-~s?mnADs^D28eJHx0nR#U3KP3%4r86SfUyo)!&tj*VXP&N
zFxC|(7;CXJjCITv#<~J$1-ik+PQzIt?l7^d9x&D=PZ-P03&y$zXSsXB#JYW8tT}L&
zhA&La7|y!u4-?Z1fUz3jtjloLq#&4VK`@LJ9|B|b!C5!qtb|aQtYR39)d6SeMZv_X
z;jCG3)@?ZJ9-QS84byP~&bk3-Imf_c)8VW#ILjptCR+e!6~)8E&cj*P;Vkh4m~0H3
zl>uj6fwM9bVd@URS(QmJv6N&O%RL3gx(H{9r^3X}!daqeFfk7}>kyo^EgdE+nE_*2
z!CA-PtRq=4*;8=VbvUae8z#E~&N>TcU4yfZ<-pY4fwSs!VPd=CtW$87cpgl4Z$6A=
zUjSomfU{1+S!snZ*^O}4Q8?=~oOJ=tvMPe<*av5=EQX1lfwQbjU}6v9EYnh$SRI_T
z1kPFwXVsL!)R|PkSVomF*0L%XYdM@{Pz@71R0Crju7$BK!dd2ZFtLenmUKN#Or`<G
zQh>AO!db?RFxg3P)=4-ktO+I?(F|kBw!m0&aMrn2nAoN^80#pUrP>Y?i-NP}!&xig
zthpU9b>f{cRuG(}+6@!4fwSJgS?WD7Sxq?09L`z~XB~&Lw)MhvY=^UU!C9~1tinE+
zx{`hvYYm*W3C`LJXT629Y$w2Us7{2jbl|L1II9KD+6iZwO@ir=pA2J}!&#fAz{Cuv
z!dRQ&Ec<CNvGs7)E;vhRIs+pE0|U73&|qL-P)6gcpz$@P!%T~Zvy^6l&CmrI1Tq7p
zLK%yg3RDav4^yWK5p!l{U|;}=sX_QCW~pNl(}0M9YZoJs#UMi&L>L(KAQIq87*w|F
zqw$?*fK^H{Fsy^KHo#f3GhwnSGa;S=@j(s)@tFQHFsRKe2MIAUFsRQ2=Uqky2925E
zyvxYIpa;=~upN!>2sdAD7RVS-Q$%GJ$ZQ6LmsuFz*KA`D4a#PCXAs4}z&o3PK^0vM
z69dEFI}8lRlNcD(W`T1J$VCuUmJAFGOc9^}odwP@j0_A;aNE4$tZq1KE1ab=8{!rw
zkZzCz85tPZ%@`QeW`koJWXEi9V1ax+8|)cI28QU_Af+I`bir9lb08*x;szXkpu~km
zOa&?iw~>K?K@}qA4AZLy;Uhwbfq_9Ci<kyP3^P&a&Ve~l56<d<vsS`cTj8uzaF)Vc
zm|ms1U@sx^3L0MpjjuWnrc(>f3V^e=!&zPPVd^v&z*u+TEXjp1F?~484$g9ivosdN
z)M>$4W^h&qoF%surY;%Ix&dch1~si2KvB7U1x(#VIP1nLn3&pX80!+8rMwm<7O)P+
z>V>oV*2BbFHo{o0n_w)pEihIroRzl?CYH1v#>$4X*6xOhb?t?*R_ueZmh6YIOb)<U
z_HdTzL73PEIBVr0n3(Zl7|Q|9>W8z=!&$aRVd|#CS!duZ+hZ_UH#loKoMnF;COZwz
znh9swoP^2t!&&a9U}6(b!&nF5EXOl2F;_Ti@mZLd$vGIy5zeZBvn<cUWUb*WXE<vP
zoMn0erp_78ii5N2;j9igYbBhu4$ktt2s33KoV6OxS_fy%zXVga?h1^x@D_}<0?tag
Q2NPQaXDx%XBJV?F0b;X`xc~qF