From 0c6578c229f1a830be1497c491359e87f336cf61 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Sun, 26 Nov 2017 23:20:43 -0500
Subject: [PATCH] Implemented Fortress enemy spawning, added level save display

---
 core/src/io/anuke/mindustry/core/Control.java |   8 +++++-
 .../entities/enemies/BlastEnemy.java          |   1 +
 .../mindustry/entities/enemies/Enemy.java     |   5 ++--
 .../mindustry/entities/enemies/FastEnemy.java |   1 +
 .../entities/enemies/FlamerEnemy.java         |   1 +
 .../entities/enemies/FortressEnemy.java       |   5 ++--
 .../entities/enemies/HealerEnemy.java         |   1 +
 .../entities/enemies/MortarEnemy.java         |   3 ++-
 .../entities/enemies/RapidEnemy.java          |   3 ++-
 .../mindustry/entities/enemies/TankEnemy.java |   2 ++
 .../entities/enemies/TitanEnemy.java          |   3 ++-
 core/src/io/anuke/mindustry/io/SaveIO.java    |  23 +++++++++++++-----
 .../src/io/anuke/mindustry/ui/LoadDialog.java |   5 ++--
 desktop/mindustry-saves/0.mins                | Bin 1399 -> 18939 bytes
 desktop/mindustry-saves/3.mins                | Bin 1502 -> 2801 bytes
 15 files changed, 45 insertions(+), 16 deletions(-)

diff --git a/core/src/io/anuke/mindustry/core/Control.java b/core/src/io/anuke/mindustry/core/Control.java
index 507a847371..11d41b6fc3 100644
--- a/core/src/io/anuke/mindustry/core/Control.java
+++ b/core/src/io/anuke/mindustry/core/Control.java
@@ -111,10 +111,15 @@ public class Control extends Module{
 		
 		spawns = Array.with(
 			new EnemySpawn(TitanEnemy.class){{
-				after = 4;
+				after = 5;
 				spacing = 2;
 				scaling = 5;
 			}},
+			new EnemySpawn(FortressEnemy.class){{
+				after = 12;
+				spacing = 3;
+				scaling = 5;
+			}},
 			new EnemySpawn(HealerEnemy.class){{
 				scaling = 3;
 				spacing = 2;
@@ -442,6 +447,7 @@ public class Control extends Module{
 			
 			if(Inputs.keyUp(Keys.C)){
 				enemyGroup.clear();
+				enemies = 0;
 			}
 			
 			if(Inputs.keyUp(Keys.F)){
diff --git a/core/src/io/anuke/mindustry/entities/enemies/BlastEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/BlastEnemy.java
index 85254a6e80..9bf13cc50d 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/BlastEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/BlastEnemy.java
@@ -13,6 +13,7 @@ public class BlastEnemy extends Enemy{
 		speed = 0.65f;
 		bullet = null;
 		turretrotatespeed = 0f;
+		mass = 0.8f;
 		
 		heal();
 	}
diff --git a/core/src/io/anuke/mindustry/entities/enemies/Enemy.java b/core/src/io/anuke/mindustry/entities/enemies/Enemy.java
index cf29ef468c..539648be3c 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/Enemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/Enemy.java
@@ -36,6 +36,7 @@ public class Enemy extends DestructibleEntity{
 	protected int spawned = 0;
 	protected float angle;
 	protected boolean targetCore = false;
+	protected float mass = 1f;
 
 	public int spawn;
 	public int node = -1;
@@ -80,18 +81,18 @@ public class Enemy extends DestructibleEntity{
 		float avoidSpeed = 0.1f;
 		
 		Entities.getNearby(Entities.getGroup(Enemy.class), x, y, range, other -> {
+			Enemy enemy = (Enemy)other;
 			float dst = other.distanceTo(this);
 			if(other == this)
 				return;
 			
 			if(dst < shiftRange){
-				float scl = Mathf.clamp(1.4f - dst / shiftRange);
+				float scl = Mathf.clamp(1.4f - dst / shiftRange) * enemy.mass * 1f/mass;
 				shift.add((x - other.x) * scl, (y - other.y) * scl);
 			}else if(dst < avoidRange){
 				Tmp.v2.set((x - other.x), (y - other.y)).setLength(avoidSpeed);
 				shift.add(Tmp.v2);
 			}
-
 		});
 
 		shift.limit(1f);
diff --git a/core/src/io/anuke/mindustry/entities/enemies/FastEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/FastEnemy.java
index 1922a421d7..cd71689a20 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/FastEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/FastEnemy.java
@@ -7,6 +7,7 @@ public class FastEnemy extends Enemy{
 		
 		speed = 0.7f;
 		reload = 30;
+		mass = 0.2f;
 		
 		maxhealth = 30;
 		heal();
diff --git a/core/src/io/anuke/mindustry/entities/enemies/FlamerEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/FlamerEnemy.java
index bf2af7ec6e..d2832f1f3a 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/FlamerEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/FlamerEnemy.java
@@ -13,6 +13,7 @@ public class FlamerEnemy extends Enemy{
 		reload = 6;
 		bullet = BulletType.flameshot;
 		shootsound = "flame";
+		mass = 1.5f;
 		
 		range = 40;
 		
diff --git a/core/src/io/anuke/mindustry/entities/enemies/FortressEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/FortressEnemy.java
index 9a387c5c22..94f82ce501 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/FortressEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/FortressEnemy.java
@@ -16,14 +16,15 @@ public class FortressEnemy extends Enemy{
 	public FortressEnemy(int spawn) {
 		super(spawn);
 		
-		speed = 0.1f;
+		speed = 0.12f;
 		reload = 90;
 		maxhealth = 700;
 		range = 70f;
 		bullet = BulletType.yellowshell;
-		hitbox.setSize(9f);
+		hitbox.setSize(10f);
 		turretrotatespeed = rotatespeed = 0.08f;
 		length = 7f;
+		mass = 7f;
 		
 		heal();
 	}
diff --git a/core/src/io/anuke/mindustry/entities/enemies/HealerEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/HealerEnemy.java
index ae3ab9675c..45fe62720a 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/HealerEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/HealerEnemy.java
@@ -24,6 +24,7 @@ public class HealerEnemy extends Enemy{
 		range = 30f;
 		alwaysRotate = false;
 		targetCore = false;
+		mass = 1.1f;
 		
 		heal();
 	}
diff --git a/core/src/io/anuke/mindustry/entities/enemies/MortarEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/MortarEnemy.java
index cd78c201e2..adfac7e879 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/MortarEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/MortarEnemy.java
@@ -12,8 +12,9 @@ public class MortarEnemy extends Enemy{
 		reload = 100f;
 		bullet = BulletType.shell;
 		turretrotatespeed = 0.15f;
-		rotatespeed = 7f;
+		rotatespeed = 0.05f;
 		range = 120f;
+		mass = 1.2f;
 		
 		heal();
 	}
diff --git a/core/src/io/anuke/mindustry/entities/enemies/RapidEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/RapidEnemy.java
index 5e5b7b814a..3f06326a86 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/RapidEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/RapidEnemy.java
@@ -9,11 +9,12 @@ public class RapidEnemy extends Enemy{
 		
 		reload = 8;
 		bullet = BulletType.purple;
-		rotatespeed = 30f;
+		rotatespeed = 0.08f;
 		maxhealth = 260;
 		speed = 0.27f;
 		heal();
 		hitbox.setSize(8f);
+		mass = 3f;
 		
 		range = 70;
 	}
diff --git a/core/src/io/anuke/mindustry/entities/enemies/TankEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/TankEnemy.java
index 153e79471c..265d526c28 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/TankEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/TankEnemy.java
@@ -13,8 +13,10 @@ public class TankEnemy extends Enemy{
 		maxhealth = 350;
 		speed = 0.2f;
 		reload = 90f;
+		rotatespeed = 0.06f;
 		bullet = BulletType.small;
 		length = 3f;
+		mass = 1.4f;
 	}
 	
 	void shoot(){
diff --git a/core/src/io/anuke/mindustry/entities/enemies/TitanEnemy.java b/core/src/io/anuke/mindustry/entities/enemies/TitanEnemy.java
index d8b90e7e58..d2e3d14318 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/TitanEnemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/TitanEnemy.java
@@ -10,12 +10,13 @@ public class TitanEnemy extends Enemy{
 	public TitanEnemy(int spawn) {
 		super(spawn);
 		
-		speed = 0.1f;
+		speed = 0.14f;
 		reload = 30;
 		maxhealth = 400;
 		range = 60f;
 		bullet = BulletType.small;
 		hitbox.setSize(7f);
+		mass = 4f;
 		
 		heal();
 		
diff --git a/core/src/io/anuke/mindustry/io/SaveIO.java b/core/src/io/anuke/mindustry/io/SaveIO.java
index 8358224742..487e249d0c 100644
--- a/core/src/io/anuke/mindustry/io/SaveIO.java
+++ b/core/src/io/anuke/mindustry/io/SaveIO.java
@@ -37,6 +37,7 @@ import io.anuke.ucore.entities.Entities;
  * Wave countdown time (float)
  * 
  * Gamemode Ordinal (byte)
+ * Map ordinal (byte)
  * 
  * Player X (float)
  * Player Y (float)
@@ -63,7 +64,6 @@ import io.anuke.ucore.entities.Entities;
  *   
  * 
  * --MAP DATA--
- * Map ID (byte)
  * Seed (int)
  * Amount of tiles (int)
  * (tile list)
@@ -82,7 +82,7 @@ import io.anuke.ucore.entities.Entities;
  */
 public class SaveIO{
 	/**Save file version ID. Should be incremented every breaking release.*/
-	private static final int fileVersionID = 10;
+	private static final int fileVersionID = 11;
 	
 	//TODO automatic registration of types?
 	private static final Array<Class<? extends Enemy>> enemyIDs = Array.with(
@@ -138,6 +138,7 @@ public class SaveIO{
 			stream.readInt(); //read version
 			stream.readLong(); //read last saved time
 			stream.readByte(); //read the gamemode
+			stream.readByte(); //read the map
 			return stream.readInt(); //read the wave
 		}catch (IOException e){
 			throw new RuntimeException(e);
@@ -155,6 +156,18 @@ public class SaveIO{
 		}
 	}
 	
+	public static Map getMap(int slot){
+		
+		try(DataInputStream stream = new DataInputStream(fileFor(slot).read())){
+			stream.readInt(); //read version
+			stream.readLong(); //read last saved time
+			stream.readByte(); //read the gamemode
+			return Map.values()[stream.readByte()]; //read the map
+		}catch (IOException e){
+			throw new RuntimeException(e);
+		}
+	}
+	
 	public static FileHandle fileFor(int slot){
 		return Gdx.files.local("mindustry-saves/" + slot + ".mins");
 	}
@@ -169,6 +182,7 @@ public class SaveIO{
 			
 			//--GENERAL STATE--
 			stream.writeByte(Vars.control.getMode().ordinal()); //gamemode
+			stream.writeByte(Vars.world.getMap().ordinal()); //map ID
 			
 			stream.writeInt(Vars.control.getWave()); //wave
 			stream.writeFloat(Vars.control.getWaveCountdown()); //wave countdown
@@ -219,9 +233,6 @@ public class SaveIO{
 			
 			//--MAP DATA--
 			
-			//map ID
-			stream.writeByte(Vars.world.getMap().ordinal());
-			
 			//seed
 			stream.writeInt(Vars.world.getSeed());
 			
@@ -286,6 +297,7 @@ public class SaveIO{
 			
 			//general state
 			byte mode = stream.readByte();
+			byte mapid = stream.readByte();
 			
 			int wave = stream.readInt();
 			float wavetime = stream.readFloat();
@@ -364,7 +376,6 @@ public class SaveIO{
 			
 			//map
 			
-			int mapid = stream.readByte();
 			int seed = stream.readInt();
 			int tiles = stream.readInt();
 			
diff --git a/core/src/io/anuke/mindustry/ui/LoadDialog.java b/core/src/io/anuke/mindustry/ui/LoadDialog.java
index 1e69e792f6..6f90cfc2f2 100644
--- a/core/src/io/anuke/mindustry/ui/LoadDialog.java
+++ b/core/src/io/anuke/mindustry/ui/LoadDialog.java
@@ -46,8 +46,9 @@ public class LoadDialog extends FloatingDialog{
 			
 			button.row();
 			
-			Label info = new Label("[gray]" + (!SaveIO.isSaveValid(i) ? "<empty>" : SaveIO.getMode(slot) + ", Wave " +
-					SaveIO.getWave(slot) + "\nLast Saved: " + SaveIO.getTimeString(i)));
+			Label info = new Label("[gray]" + (!SaveIO.isSaveValid(i) ? "<empty>" : SaveIO.getMode(slot) + ", " + 
+					SaveIO.getMap(slot) + 
+			", Wave " + SaveIO.getWave(slot) + "\nLast Saved: " + SaveIO.getTimeString(i)));
 			info.setAlignment(Align.center, Align.center);
 			
 			button.add(info).padBottom(2).padTop(6);
diff --git a/desktop/mindustry-saves/0.mins b/desktop/mindustry-saves/0.mins
index 5df3888dda46cb0f06dc9b5ea5019507a7044e69..fcc59b83e9969a47cea91e1fa1b9d194d2886cef 100644
GIT binary patch
literal 18939
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
I_G1bCKThW)qyPW_

literal 1399
zcmZXTOKTKC5XWmaYeY@l3>%Z6PEW67HrZr-Wff6YvyTMDw>NKI#ETG*K0px^#804p
z0P!N?`-!?qe4v7Y2S0=t2_C&z)ieJJJJW}nU;nGR`aj(>M6{a7JN56{xh3M^%@+Th
znaL5g|8``4npS#bu3znyKoWW+<Rq++ke5I_dWjb2`FWPe-W7q0L?ib=b{sTxA2e14
zna!Z`1JKx3kbMX$D@`bEc!aEZ3@X(?_9>{O6g`7B^&Hgy0yMk}R90=^CA2}M(cRFt
zzXJ8W28}3H_dpwd12RfArJYLlE$T-1f+|YEKJr+tOGXYgc-K8QseIqGRLX7mO2M>S
zQ<g^VVmvBbE_1K<8GUGu-I%0a8YT7QUt&G3ulFQ+nC(mc6QVHPm+Ng@dq8?lN#Ida
zhwC~{VArM*dy=`^o1bChyiD1C*tw99ZCp&qG*fTEx|z>vVe>|^B8;<QBX^R6ZQe{W
zk$ltc^wzgPrWN<%-(=ZQ>z1U&(ZcP7Z0k-!TNVW54uW>dheu29<QFsg?>YVhOj56V
z@ecW4tjG0ro;nX<wlC$cu$y#WuD5Y**U3k1G3Xr5I48^B*N5)8N#)nhV&%X`P@uF)
zvlZ1=eL~&fex=W#3Fk|km@m+Z2SFvJ>Q`vn4uN)j1Jw?L3P(T{rAej!@5uT`K_%4+
b$DsK?K#|g<Qg9sEH77tDl_I6_pK<m-TRv{m

diff --git a/desktop/mindustry-saves/3.mins b/desktop/mindustry-saves/3.mins
index 6b1bf4bd4129aad1f223bdc099228f9aa0995697..2ec9e5b063802809a048b97ff579893d1388f5a5 100644
GIT binary patch
literal 2801
zcmZvbdr(w$6vuz}x}X$->=So!d5O3npu0YJtfP3(s!iphVwfgb5i{lsL|j<#F<Lpj
ztP~%WWkrpzDN9o`E%Oyk4`-~=q$HZkEC*-mpK3&{^ZWho`OOI2Kkk0c_k7PezsFt1
z*qw}N4|caUy{|ER2EZ1^U;txA>!&=fV*O*7_wh9vf5q|_<F9`FrSq3XYAnb!V3rL~
z6FtTo1+hc!;ZCSo@}mrODEr(8i>-?&n>g_bG$yx*P}3mhqkO0tpU6Wmw$kRWfn}Y!
zs<ylXmd&h?W*uf$E`Y^1Dur2NM#;LdP<y1<tTk>`cSCdRT3O2s_s?yxy!()>)gZQX
zJJf}5%32-5@!McY%t0A4BQyR<sL7uvLZ(Bx{}rfxejnB9-)@3MQ{I$WW?1*`hNkL&
zMAm|<nzsm==dQ$1tF$nqc-A3kI?wm3RpO3fV$&eHJX@Ht^Ng|!Q1jd%5#koo*PVsP
zS37y=)pVG)x&!J0RuNjTHoXXzOgn=iwqi!cs2xz>-XUt4W^@<rg2+5^bip_sX761O
z4Tq0%^9$J7U;GZ#zW0M@g>$FhTncp?cq<mfL1p1EEZx6ZWaH4h?+sY>fLW`7o^=+M
zjxLi~4f@5#!>Wqa7-DDK!pS12uUH|nxc%_;5Y+$u8qZeZpzzy&LE|smc{YgmtKaN~
z+J=$RjGs!^(-2)yAk27HIUBD*^RokFEi(eGjnI&HQPwgeKPd=xO@^q&leCnyL;ao<
znbnN{uI`8Bp(>fh4OZ=j$dU6Rt1}}tbO2U9_6&xa1y5r{<vFN7zDk&Jzpe%C5ZPGG
zvwTP8gF;Z(5)fHDXW!;!5Uq0aFc_y9*RRfnx`Um<jORS-aw#-)C5RALrO!A7k=!}L
ztm9`^{scrC7xSz|NAtf^p=sxzBE-(_g_j`u$Yo*1Rb`AD0*x)>dFbVL)b$-ir$%KK
zkKG!DhFb?j78g1F^y|=ExJ8=rB&V;16>CllGh;8F!5*(NR=5d&8M87rwuPv`A;`v9
z0RQCpU^d_)%1S00`Z7_LThVqwSUW-z))pxWddcVBK~yLSD-ttE%anwgPf=<nbspAA
zl&vV^Evg+kl*p4s<X7a%CT;L8BHwO7IL$SJv>ZvOx!)zNFrR$m3P|&gBFghqHt7Iq
zwhxE`2Z_dvBO3f6QNmF{IL%r@<UK~ze>{=%W1>{0rGFwcJZJlH$_|-8ls1vbR?5t~
zXKXl%wiCC<_8$3^6I7X9O5{^ozS2f2ik(D0+a%F@n1%wM#UI<r-kRO?@jUtL(iiM!
zYK}g7Ir`}3l)kCFm!A(7kDakNLl7RW-H=P*u^5Lo|0Tv8MubZkIZid0<TM&h%2f6K
zQ(R)$sYGdZ=&>!GvH7zZo3IDxo$j4$!%uPR7dQ#loBbWq#Xlb%3z-w1GBfs&tjCsW
zy?HmVHni1rIL>S{$r*adBoF^<i&gqUMApefw#hx##I2w8*6gNF%|@SH`hs+=jy`%h
z`sn49zTQ`3n<54W`QrG6*xGK7?LG3|Dcs2~AWczv8)-#i0MBOLMOxyQMBclJ((fS}
z^fi(DUZT`6Q9>Efm~%v)Z-_Ey5RFyjnMs;w7E!7q&wZq&Tp-F(TCUO(D=3?+Xy8TC
zT#5qxYZ0fBa6eH}JCRFip6^LZnM0H~muLw70r0_7OYI;U+)0$HC}}=vZbiPINOL_z
zl&r}4Flhs;h^)U7xgI4-yDZ4c*l48{D;oG4`CO9FH@uoEyjO^FB;h^+ibnlTwShl~
R;ujL-DJtk9?T%}b{s&CsT(STF

literal 1502
zcmZvc%WG3X6vofJNm^2@F^{%Mn)|3}O-<5hpJ0ue$3Vp@T57d!bfF6=ZWKh_NEf2G
z5ZqKPF2#jNMHEC7tF~34A_d=ng1B_yMi<Vx_kM$IGLXsdeBU=`CX<^GQ4^7N?9c6q
z<0MBw+#ss{9G?~8=ZmsFL5%@2FHLJaHSk1oy6j`pdGfm&1&M@jY(+HRIjhNaMOpeM
zhef2i!zncq`piWUI`fN5Q<lED?;>U$aY|nM<FIJ^`(A~ob&)u|?6^S^fd`GkTG=m4
z?Ya!>t)s%2Ipu`?viyBb*dr&|J=#Fp)C;-A6p@jZ??h3ej=P}DJy1?jYYtlCKB!ZX
zorf0d0kzD5x|G&YfY!MM)U_3qeF)mn3ral#W&1!IAA>TAHY@7yhZ`OM#T8`~B?jT9
zo`AZag7Vuy(P2>gGf;RtD6h!aNzPrf(=A`d{Oa0V<M+&?hq22^ZsO&<l85oKRx`aE
z`^cGYuITeLt4=SgPA}Wd?dD#6ys<N4^06zq8*`0KtkO9yWz2eY-Xpto!6UO==cuo1
zHLH9DU0j#HP<>KPcKNF343!!9aco-vnH9H}E(LX>%1yTUL<_e(vMaM5rPbP8g(dFS
z#J^OBjB4%KjKx~b^m702Yr452-x#08s?*D=)5~^qwbyM3XJh$S;5IatR@delzjuj~
z{DFoPW#2$6C<?uWmQ)lPffiTPu4v#L+?;bv=hBv;MHSh5pcO_z(Y>I!qO79iKDdJ)
tK#>EWmN8KJBPciyTCXVdNok)!)<Mv^FQDWEsQD`>d<Ya#TI!pt{R4abeC_}M