From 404ec68570bd8181ec273841047ee3abbe97f2bf Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Fri, 8 Dec 2017 19:59:04 -0500
Subject: [PATCH] Changed pathfinding algorithm slightly, added debugging for
 paths

---
 core/assets/maps/test3.png                    | Bin 6335 -> 1529 bytes
 core/assets/shaders/outline.fragment          |   2 +-
 core/src/io/anuke/mindustry/Vars.java         |   2 +
 core/src/io/anuke/mindustry/ai/Pathfind.java  |  53 +++++++++++++-----
 .../src/io/anuke/mindustry/core/Renderer.java |  21 ++++++-
 core/src/io/anuke/mindustry/core/UI.java      |   6 +-
 .../io/anuke/mindustry/entities/Player.java   |   2 +
 .../mindustry/entities/enemies/Enemy.java     |  19 +++++--
 .../mindustry/ui/MindustrySettingsDialog.java |   2 +-
 .../io/anuke/mindustry/world/SpawnPoint.java  |   1 +
 core/src/io/anuke/mindustry/world/World.java  |   8 ++-
 desktop/mindustry-saves/0.mins                | Bin 3824 -> 6584 bytes
 desktop/mindustry-saves/1.mins                | Bin 3767 -> 6655 bytes
 desktop/mindustry-saves/7.mins                | Bin 2866 -> 5289 bytes
 14 files changed, 91 insertions(+), 25 deletions(-)

diff --git a/core/assets/maps/test3.png b/core/assets/maps/test3.png
index aa0b38402596e7f2a23edcc1877aab3b0defcfec..34e5a233de22e8ccfe7212f9950f302690c60f34 100644
GIT binary patch
literal 1529
zcmZuxc~BE~6n?weBr6H9LL{6LD=HK@3R6@(Sgt}m5Eu<AAklg-MGg@v$h9R=rg)5&
zPE{%rDr0p}NIR9Ihy*NSMTO87<q!=X5P>KW!l5B_1O2nVnVq-ucHjHn?|t8U--d^U
zn3~v{0D!45G$;}Pp<fZeS+t2sy>@^$ti78;f@n*h>A?Ct+AK&3-FXCnV`+R4D86J(
zJK1T%Ey3)5E{@q_lRy5T1z?^K2KjHx=+X2=C-r&~%<zM<MJ~~)QJsgb_e6f!FLQpn
zt6C?>Y@bdn?&1xmhPt%f(;b_+1Ls-^3IGGaTqQsPpg;ia^7XOF&vkq7>xYEFOvB)8
z<76@pEEhva+^jll0gjL_nYsTYEM%dSL*b-ohub1U&*X9*Mt$NK-{MyhI5n+HpFZ4B
z9D|Zsmsk6gj%9aj!XY^MQlcwHHLrS`FHT;JMe1?jH4Y0v)<F;$3jSikXMi~SHc;VT
zW(H*xc$UR@A3`>lPbD0TmNCNhmCI0Z-@ecGNa;_)l$;Xe0&yziQ3*$S6bj=A!WP^&
z)MSd?rA&%*Mj&T`|LA#_e)O*Em{Y$poDEGU3xHA)&V2LK!HBwedD4c{tAF084NM}w
ze^Kx>)2Gf^{wRA`TfN66_s<eZ5mKNT+~?7!D4*K%e7ZZ;I)lK?aEXY2V<??$y4{IT
zM5qZ=_yv$`z(L8xfk15#)s+%|Hk7j{cSr+rFJxFz5tr7VUyozHAUGW1%3#(Vspk@}
z+O%GtDz2=%IZCfaC%kPiCE}b*K%wJzLo%M9dY%o99}X?%MnV+vC5M;Y7OL(DJ0uW3
zE&$4^9hvyxG~)Yy3nX@)s|Ug!?d;{SXwV0USXVGHypatw<S(3SkK+W&2)1mhtkiuj
zHIL3}<eB_vuIc&dZJIGOeS!nNeW-J83Jc1aRHtJAgVYADeRlm`q~6$hWhQ@gV~#H-
zRcT0#?({cJ)kckAKv+W7Orn=e0x38?=i4<tBFfng@v~*-_4KW=B;<y{vr^bEF(b7S
zV~FzRLEj97u1(BqU&r0{?l*I?v89Ru(R6=we2_7~A}SAorWOxSSb@5`EYFUxu4RnA
zX;g86E)NI6QqX%5YM{an9kWx$g4!F~y#RH9E)-CO5B&am%-B8=o#eI!EM}q6^RkZr
zYoL^^S_4W17*z(;$WPU?hW$nu@yBGYF&g4;&hUYV(VH_AYv5G0-gh361pR%sL{a-O
z&jHkMW|N)5hMpK|fI-9c$V1#7@AR{#^%fQ*9lpqySyD$vber4$cAyCQR$|JX1j=k~
zsxtoY7tmr&;xuckH{jV>904|;sTSm>)TkMWQ*I!?a@CKwjSv0v@q*7G4N-=~Zr|!*
z#cOn<aTP<))1Zs>Urs3Q{vzsKvhiATO8K;C2{mD#{<UangALul8-|-qT8upvMYhwA
zkkg5X6r`mHj>KPaA9}dT6<0kC?uZ54&9EFL`7o$;5?~&=`vrpY-hl5OZ>1=@C{ne~
zL&B&VtLIw0Y8&?2K@)+;C|hOUn91JIle=T)ZVd!Lb2~^uG^+ynGHMi*rs6Xu&<Evg
zN}w3>01PRNgVl}-)QSFUp!cf{mP9_^wvmf9#U7|5&#tYxTF$w(^5n&nFSf2{)E@1Z
zqW5E8zshf`VDwMi3b-4y5SsWqi3^tWnvjh$!OV71BdCshGkJ}G_bq=ow$h$g4WXB_
z6IPVV!bh^S&M7O3x}_qTLCfe6nVL!6H$3xy`97iUVd+?}UmT%(_wranuH6ZPCiYZS
zrM%|JttVf0iE<G|+me)^bA4HwS&r#(56Ia2I%j;XSptVZfZLo%&h5tkS(io^6{cq$
Wzi!dW-n{Px&_@^?7E~D^&i@w{axoJC

literal 6335
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
B@e}|6

diff --git a/core/assets/shaders/outline.fragment b/core/assets/shaders/outline.fragment
index 3bd3c1c9ce..2ac6ef52be 100644
--- a/core/assets/shaders/outline.fragment
+++ b/core/assets/shaders/outline.fragment
@@ -30,6 +30,6 @@ void main() {
 	if(any){
 		gl_FragColor = u_color;
 	}else{
-		gl_FragColor = texture2D(u_texture, T);
+		gl_FragColor = texture2D(u_texture, T) * v_color;
 	}
 }
diff --git a/core/src/io/anuke/mindustry/Vars.java b/core/src/io/anuke/mindustry/Vars.java
index ad34385288..84a235031e 100644
--- a/core/src/io/anuke/mindustry/Vars.java
+++ b/core/src/io/anuke/mindustry/Vars.java
@@ -46,6 +46,8 @@ public class Vars{
 	public static boolean infiniteAmmo = false;
 	//whether to show paths of enemies
 	public static boolean showPaths = true;
+	//if false, player is always hidden
+	public static boolean showPlayer = true;
 	//number of save slots-- increasing may lead to layout issues
 	//TODO named save slots, possibly with a scroll dialog
 	public static final int saveSlots = 8;
diff --git a/core/src/io/anuke/mindustry/ai/Pathfind.java b/core/src/io/anuke/mindustry/ai/Pathfind.java
index 4937c13805..22d7dcb58d 100644
--- a/core/src/io/anuke/mindustry/ai/Pathfind.java
+++ b/core/src/io/anuke/mindustry/ai/Pathfind.java
@@ -10,7 +10,9 @@ import io.anuke.mindustry.Vars;
 import io.anuke.mindustry.entities.enemies.Enemy;
 import io.anuke.mindustry.world.SpawnPoint;
 import io.anuke.mindustry.world.Tile;
+import io.anuke.ucore.core.Timers;
 import io.anuke.ucore.util.Angles;
+import io.anuke.ucore.util.Mathf;
 import io.anuke.ucore.util.Tmp;
 
 public class Pathfind{
@@ -30,7 +32,6 @@ public class Pathfind{
 			return vector.set(enemy.x, enemy.y);
 		}else if(enemy.node == -2){
 			enemy.node = -1;
-			enemy.findClosestNode();
 		}
 		
 		Tile[] path = enemy.path;
@@ -43,7 +44,7 @@ public class Pathfind{
 				if(enemy.node > 1)
 					enemy.node = enemy.node - 1;
 			}else{
-				//what's the problem, then?
+				//must be blocked by a playermade block
 			}
 			
 			enemy.idletime = 0;
@@ -100,6 +101,7 @@ public class Pathfind{
 				if(point.finder.search(point.request, ms * 2)){
 					smoother.smoothPath(point.path);
 					point.pathTiles = point.path.nodes.toArray(Tile.class);
+					point.tempTiles = point.path.nodes.toArray(Tile.class);
 				}
 			}
 		}
@@ -112,6 +114,7 @@ public class Pathfind{
 			point.path.clear();
 			
 			point.pathTiles = null;
+			point.tempTiles = null;
 			
 			point.request = new PathFinderRequest<Tile>(point.start, Vars.control.getCore(), heuristic, point.path);
 			point.request.statusChanged = true; //IMPORTANT!
@@ -128,22 +131,44 @@ public class Pathfind{
 		}
 		
 		enemy.path = Vars.control.getSpawnPoints().get(enemy.spawn).pathTiles;
-		Tile[] path = enemy.path;
-		Tile closest = null;
-		float ldst = 0f;
-		int cindex = -1;
 		
-		for(int i = 0; i < path.length; i ++){
-			Tile tile = path[i];
-			float dst = Vector2.dst(tile.worldx(), tile.worldy(), enemy.x, enemy.y);
-			
-			if(closest == null || dst < ldst){
-				ldst = dst;
-				closest = tile;
+		int closest = findClosest(enemy.path, 0, enemy.x, enemy.y);
+		closest = findClosest(enemy.path, closest + 1, enemy.x, enemy.y);
+		//closest ++;
+		
+		closest = Mathf.clamp(closest, 1, enemy.path.length-1);
+		Tile end = enemy.path[closest];
+		enemy.node = closest;
+		
+		//if the enemy can't get to this node, teleport to it
+		if(enemy.node < enemy.path.length - 2 && Vars.world.raycastWorld(enemy.x, enemy.y, end.worldx(), end.worldy()) != null){
+			Timers.run(Mathf.random(20f), () -> enemy.set(end.worldx(), end.worldy()));
+		}
+	}
+	
+	private static int findClosest(Tile[] tiles, int offset, float x, float y){
+		int cindex = -1;
+		float dst = Float.MAX_VALUE;
+
+		for(int i = offset; i < tiles.length; i ++){
+			Tile tile = tiles[i];
+			if(Vector2.dst(tile.worldx(), tile.worldy(), x, y) < dst){
+				dst = Vector2.dst(tile.worldx(), tile.worldy(), x, y);
 				cindex = i;
 			}
 		}
-		enemy.node = Math.max(cindex, 1);
+		
+		return cindex;
+	}
+	
+	private static int indexOf(Tile tile, Tile[] tiles){
+		int i = -1;
+		for(int j = 0; j < tiles.length; j ++){
+			if(tiles[j] == tile){
+				return j;
+			}
+		}
+		return i;
 	}
 	
 	private static boolean onLine(Vector2 vector, float x1, float y1, float x2, float y2){
diff --git a/core/src/io/anuke/mindustry/core/Renderer.java b/core/src/io/anuke/mindustry/core/Renderer.java
index cccd55a5a3..a4cdbe7a6c 100644
--- a/core/src/io/anuke/mindustry/core/Renderer.java
+++ b/core/src/io/anuke/mindustry/core/Renderer.java
@@ -270,6 +270,11 @@ public class Renderer extends RendererModule{
 		Graphics.begin();
 
 		Draw.reset();
+		
+		if(Vars.showPaths){
+			drawPaths();
+		}
+		
 		int rangex = (int) (camera.viewportWidth * camera.zoom / tilesize / 2) + 2;
 		int rangey = (int) (camera.viewportHeight * camera.zoom / tilesize / 2) + 2;
 
@@ -383,6 +388,20 @@ public class Renderer extends RendererModule{
 			cbatch.dispose();
 		cbatch = new CacheBatch(256 * 256 * 3);
 	}
+	
+	void drawPaths(){
+		Draw.color(Color.RED);
+		for(SpawnPoint point : control.spawnpoints){
+			if(point.pathTiles != null){
+				for(int i = 1; i < point.pathTiles.length; i ++){
+					Draw.line(point.pathTiles[i-1].worldx(), point.pathTiles[i-1].worldy(), 
+							point.pathTiles[i].worldx(), point.pathTiles[i].worldy());
+					Draw.circle(point.pathTiles[i-1].worldx(), point.pathTiles[i-1].worldy(), 6f);
+				}
+			}
+		}
+		Draw.reset();
+	}
 
 	void renderPixelOverlay(){
 
@@ -503,7 +522,7 @@ public class Renderer extends RendererModule{
 			drawHealth(entity);
 		}
 
-		if(!Vars.android)
+		if(!Vars.android && Vars.showPlayer)
 			drawHealth(player);
 	}
 
diff --git a/core/src/io/anuke/mindustry/core/UI.java b/core/src/io/anuke/mindustry/core/UI.java
index 38a4df9b3c..dfdaabbd33 100644
--- a/core/src/io/anuke/mindustry/core/UI.java
+++ b/core/src/io/anuke/mindustry/core/UI.java
@@ -112,10 +112,10 @@ public class UI extends SceneModule{
 		Draw.color();
 		
 		TextureRegion back = Draw.region("background");
-		float backscl = 4f;
+		float backscl = 4.5f;
 		
-		Draw.alpha(0.8f);
-		Core.batch.draw(back, w/2 - back.getRegionWidth()*backscl/2, h/2 - back.getRegionHeight()*backscl/2, 
+		Draw.alpha(0.7f);
+		Core.batch.draw(back, w/2 - back.getRegionWidth()*backscl/2 +240f, h/2 - back.getRegionHeight()*backscl/2 + 250f, 
 				back.getRegionWidth()*backscl, back.getRegionHeight()*backscl);
 		
 		float logoscl = (int)Unit.dp.inPixels(7);
diff --git a/core/src/io/anuke/mindustry/entities/Player.java b/core/src/io/anuke/mindustry/entities/Player.java
index 09b687c297..3421334dbf 100644
--- a/core/src/io/anuke/mindustry/entities/Player.java
+++ b/core/src/io/anuke/mindustry/entities/Player.java
@@ -56,6 +56,8 @@ public class Player extends DestructibleEntity{
 	
 	@Override
 	public void draw(){
+		if(!Vars.showPlayer) return;
+		
 		if(Vars.snapCamera && Settings.getBool("smoothcam") && Settings.getBool("pixelate")){
 			Draw.rect("mech-"+mech.name(), (int)x, (int)y, direction.angle()-90);
 		}else{
diff --git a/core/src/io/anuke/mindustry/entities/enemies/Enemy.java b/core/src/io/anuke/mindustry/entities/enemies/Enemy.java
index cb22aefc7f..1d3572a1be 100644
--- a/core/src/io/anuke/mindustry/entities/enemies/Enemy.java
+++ b/core/src/io/anuke/mindustry/entities/enemies/Enemy.java
@@ -18,7 +18,7 @@ import io.anuke.ucore.util.Tmp;
 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;
-	public final static float maxIdle = 60*3f;
+	public final static float maxIdle = 60*1.5f;
 
 	protected float speed = 0.4f;
 	protected float reload = 32;
@@ -142,11 +142,16 @@ public class Enemy extends DestructibleEntity{
 		Bullet out = new Bullet(bullet, this, x + Angles.x(), y + Angles.y(), this.angle + rotation).add();
 		out.damage = (int) (damage * Vars.multiplier);
 	}
-
+	
+	/*
 	public void findClosestNode(){
 		int index = 0;
 		int cindex = -1;
 		float dst = Float.MAX_VALUE;
+		UCore.log("Finding closest.");
+		
+		Tile[] clone = path.clone();
+		UCore.log(clone.length);
 
 		//find closest node index
 		for(Tile tile : path){
@@ -171,7 +176,7 @@ public class Enemy extends DestructibleEntity{
 				set(x2 * Vars.tilesize, y2 * Vars.tilesize);
 			});
 		}
-	}
+	}*/
 
 	@Override
 	public void added(){
@@ -221,7 +226,7 @@ public class Enemy extends DestructibleEntity{
 		xvelocity = (x - lastx) / Timers.delta();
 		yvelocity = (y - lasty) / Timers.delta();
 		
-		float minv = 0.001f;
+		float minv = 0.0001f;
 		
 		if(xvelocity < minv && yvelocity < minv && node > 0){
 			idletime += Timers.delta();
@@ -248,6 +253,12 @@ public class Enemy extends DestructibleEntity{
 		Draw.color();
 		Draw.rect(region, x, y, this.angle - 90);
 
+		if(Vars.showPaths){
+			Draw.color(Color.PURPLE);
+			Draw.line(x, y, x + xvelocity*10f, y + yvelocity*10f);
+			Draw.color();
+		}
+		
 		Graphics.flush();
 
 	}
diff --git a/core/src/io/anuke/mindustry/ui/MindustrySettingsDialog.java b/core/src/io/anuke/mindustry/ui/MindustrySettingsDialog.java
index f4a13053a1..a0f2ee6d12 100644
--- a/core/src/io/anuke/mindustry/ui/MindustrySettingsDialog.java
+++ b/core/src/io/anuke/mindustry/ui/MindustrySettingsDialog.java
@@ -21,7 +21,7 @@ public class MindustrySettingsDialog extends SettingsDialog{
 		content().remove();
 		buttons().remove();
 		
-		ScrollPane pane = new ScrollPane(content());
+		ScrollPane pane = new ScrollPane(content(), "clear");
 		pane.setFadeScrollBars(false);
 		
 		row();
diff --git a/core/src/io/anuke/mindustry/world/SpawnPoint.java b/core/src/io/anuke/mindustry/world/SpawnPoint.java
index 9735946ecd..94a0293203 100644
--- a/core/src/io/anuke/mindustry/world/SpawnPoint.java
+++ b/core/src/io/anuke/mindustry/world/SpawnPoint.java
@@ -8,6 +8,7 @@ import io.anuke.mindustry.ai.SmoothGraphPath;
 public class SpawnPoint{
 	public Tile start;
 	public Tile[] pathTiles;
+	public Tile[] tempTiles;
 	public PathFinder<Tile> finder;
 	public SmoothGraphPath path = new SmoothGraphPath();
 	public PathFinderRequest<Tile> request;
diff --git a/core/src/io/anuke/mindustry/world/World.java b/core/src/io/anuke/mindustry/world/World.java
index 5769a500b2..48a761e4da 100644
--- a/core/src/io/anuke/mindustry/world/World.java
+++ b/core/src/io/anuke/mindustry/world/World.java
@@ -68,6 +68,12 @@ public class World extends Module{
 		return tile == null || tile.solid();
 	}
 	
+	public boolean passable(int x, int y){
+		Tile tile = tile(x, y);
+		
+		return tile != null && tile.passable();
+	}
+	
 	public boolean wallSolid(int x, int y){
 		Tile tile = tile(x, y);
 		return tile == null || tile.block().solid;
@@ -462,7 +468,7 @@ public class World extends Module{
 		int e2;
 		while(true){
 
-			if(solid(x0, y0)){
+			if(!passable(x0, y0)){
 				return Tmp.g1.set(x0, y0);
 			}
 			if(x0 == x1 && y0 == y1) break;
diff --git a/desktop/mindustry-saves/0.mins b/desktop/mindustry-saves/0.mins
index 0a4475541e9d05d5042df983403c454447301758..d6822e9442db8d1a9c773e64ee1aa0982d4a7ada 100644
GIT binary patch
literal 6584
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
G6a61IJwQ7E

literal 3824
zcmZwIYfzL`7zgkNyfo8fO;ck9g1|1jD-76J6U9Asy`fo3c?0tX2nxhxfLQ^e83>4J
z2#W;7hUT@@7}F3;10$A1@Is_{37Vm1`cNOz`p|jb<^Rulhxfzsd;ZTk=RLc7URFdN
z67g6uCI7}<87qn}W}mB>UhfK-wmo#Us@KQ^BEDOiMyZ$l(c)WJFjkYN_A*A5S3ESS
zfof_*sWx9E&0DX%MAChrTq@ZQSq_!uk8HgO$}m%bP^J~y8U*DALmQrk+9M!WEaaRD
zU7iM&+oAb0pe`zECNleM=qwdJ2iZ)jHx60QT<F3}PzO~oA6XUEPNlz$ZXI=<+WZQ-
z9n{_h$TAl~rPQQ&WFb@;HR&~U!>CnM3w34@#$Bb77b9~}=c(tHpgW5iqP&)(Yo~5f
z)@A6XQR}F5s)%Z%tO=M~LZvQ8_6^lXwZ6_SwQL2lE~=l(S&8lr>IdpJWnYDHZPbrc
zKNY4uY$EEJX<h>jCPA)bXj=;O{#vModMp*$cq)r(PD3|k9rPx3lsZRsQaS4}V|+UF
z0+o`%EE9U-4XB$Mq*}Ak-LwJfeGBT$hI(=#pN-Ijw;}&cP|-V3@w<@sdr%maNbSr+
z_X>3>ADLeP6h@U(zMIkYqvEM{%C`{X7Eu=|zb)tne*m4J;){@3iy<2oPg%F4dxUDI
zey6M@7#Bnxp_-`{^<P|F>Lea3gHBU^JCJRpww5D1NZEHHE2K_RLzLHt7&n=kMdefT
zc41s0HAvZZqZ>lSP)*bTmGKc~9H!c+l@;h7qK;CZQ{H<pE?|#%DC@r+HU*QRHXG_G
zoEb|6RO)MlY71#=XqRb(%siZFeT)lqXER0(XO<D>Sx3lh?red!))ei=`lbE_#a8N4
z#~_aKsX}J1a&J|uu?0(2j#jEgtX29`t7NOvpIRle!|>)jC3sr1^i8-S5@_s=7FjYz
ztus%pryiGX^)qd8Y{TmA(UGe3T&!Mf4*f|{_lR?7L$sr7u6EzeQ|s%YTA^D1q_zE3
z>u*WhU$y?0l$KWO!_?enDqyc+&uWNigv>mg-G8@0cQ!*Ut?$4x!aVB;na!OUzK{zd
zk$bVhi8W9_jlRMEPo1GQ8|p7PGvQ;bF}W66My;kSb?8p5hhjg0o@;;_s2<ASsqZch
zA3=bjHW_O3{k1kpyIfBFkNRHxKQ(+C9ugX@e%u0#xtd@yW@@?9%hkCs=A+a}9}s!6
zUlQa&brOwz^_8lFDBZuQ^E2Gj_M@Mv$3^l=#V0jG?k>D4_oDj5!}^rmd1SW?$YJ?I
zI^<!Ak(*L0f66tr`ZMyk42rL0inpZ5kbEsSq*B#c>cpmsOYW%m*l76347JHnn+>(a
zU59dy<J2DS$*r_f@r%!vf1<C;I9rtb`{>Uybnk$S`z1m=yS!xJltXSg%jB=}cJa?w
z4{u|mwu1H~HSL2gQj_;1JMkGb@c>jzB^^Yz<p{LoC}jBpvQkmUkhzXSX(ynyO_1d)
zXeyORMV~@9=?oOp0y(MVR%G>Op;hOg3hEHG|2(=UzlCgVP!Uy6ouXpeF>aE2oYkd1
z-AKw#?W2xU72jb-YX=nmJ(Np1sKicm>!?QRSr@wDR2j94itWO<YO02+rRu1Xi<ptu
t4b@ULmypHvK+}7nn#<6fYtUS(t{>UDpP&ZHc^%oSx1o$*p}Zlt{sa9wvts}N

diff --git a/desktop/mindustry-saves/1.mins b/desktop/mindustry-saves/1.mins
index 86411f17c34e4c89e3e2a7a8e606c83557d2f513..c9e88d8c67f1751963346cf40e518ad41ebe4d65 100644
GIT binary patch
literal 6655
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
F`Y(qRS2F+r

literal 3767
zcmZwJ>r+%^90%}cv9OtXRWlAOuuTX=QD~M}W*3lIxmAD!)F2QMsKs7bF3TdfWtB@H
zf*>?1R6rYouA^z%s#sG}dFg`K<waw?aF|~E2lPDW?Dy-m?7ldDp6~Cu?b+uX6hb^C
zgrR)hgPCDswUA8ToxPmic-Or3=q8VBSBlm53zMfkTwU&ymk(A6Q|DcS)B{3ZrovP~
zc9cVlH_J<o5M_^O?Fb=is4mJGiK@#84N&b-$PQ5@G04hIP}8H(NGvoK2RRa;Nvbaq
z+4vJs_LI;q%0jhK2dIoBjOd`;l$RQO3jJm%@6*U~lcDx?kcV=tM>a@JP^HhHx`&#e
zc5Fbkn(BKNnU^Ym4w;S0+KBA+6sT$wR86J5fXqVmQAP3;$dCN>tuI0qTcDzspmNGV
zWxj%H{;O0fl$QooP{Y&+<=l#XL+Mb7nc4;wWI{#M_H1NU%0U&$(=9*pyQSqqHTh7}
zcIf2-Xz@+xokFORsw+ZPRSdb_f?D5(7D}MYJD_XSBIPMV^-4M9sDPZ5|6OE>m5}E>
z$XNy5q<*7bt46he`iXMyMD;3_y$e|`RY=(=Cv|o=Mx?(F<x|(GB`Tsu7-UcFS5^;t
zWKi1})Xu5Fyk(S)YNR48+PukXa_t3T5E-#Q%K2C3IWayVjDcLu9_TM-<P#R9=jK&`
zJbLALF}W;6OmHsyoAgXOXB*T;w2xDWVv8nu9F10eo2soXEB}qQHmar^5Mz~{HJPkU
z0hz4|>L?de_0(UK(H3+A<e;b!S+uQ7&8Jq=tLl*tE0!0NttU{i+Z5EAM!P<1m~3*t
z_EA+;GuX!hGTA>0$Z1zlV}GF{YJ>J>5a(j$&5jI}%U6prkaJbJ){I;rO3%%*sqH3u
z<#;i<AomrV%l;-k3;J>7mrt!#`&AphO+`4g4c|MZL2YADdvhJ;xIxv`Bg<)k>Zug%
zH&?4>QH7L?N^)Xs1$C2J(oTt*<reiPmFmLSEGnfLSqbH#lJ=llN_A6lE!thlRDBW+
z;aXP_uZP+nN}Q197EBY@8fu6h-g{PM?}QN9<9hannoM6WJZ+8ZUm@1Eg_t!?5C1o7
ze26R|knwQI+0AWg4Rs&$sO)xR2^~-?WpN|3Q@5!*RBb2vxv6CJA2w~Z^;8L!z8BSP
zR0g$^vQu}c%zYSJK{==t?a5c)a+%uLjS>5(80|fv`fZ^~sZQ$QUW{E!RZ&fp@k8|6
zORecc_D?@lyB}&8fEuY0>iGkxMh`*p2casenX(L{+DyfdAajmFgJV#neBH>8yayjs
zbCmTcszcNi)i91~Kh-vYY?gZL6J(!GLOoN^AT>;lPNO<b&3%Tf#S8UQ-p`Q@%s_M0
z#4%(&vrsQ}<OH&5A2fOrI&uo?`vN*db(}$ViaK!)*=eflJTf2k<yXl3RF@ywFy*7B
zFQDqX2sK@TW+*@9oJZ9~wNP%#c^UoAehr<cyx$-@PM!G{*%fO3J7ir8&}qv3J+k>9
zAm3H!5_Rz!vhM3p-VLai>i8MiEH(TqvSZZPBC?Z9ke|9h9lnL?aq95z$oy3HAIJ{=
Gt?NIMNqBSs

diff --git a/desktop/mindustry-saves/7.mins b/desktop/mindustry-saves/7.mins
index c4c689f2255ccf23eb75dad5cea5a72acfc3aefe..ea53bde8d4e87d6cb6ef089a7a89bb00348ced3c 100644
GIT binary patch
literal 5289
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

literal 2866
zcmZwH&2Jk;7zXfhO5uWf;6i$U3zr^Bi}(_V7Nyh*sA);o&I%{NZocCr>yIEPX&Yz~
z+i@HN0ZJ(!6^KHiak7bHr!Jwu0SQ47AOYgaKfxJ^cV_%Nsa#vi`nS*f&g|~&I7+Fz
zl?wD9Y}@;{(x1T5fA`-P9J_iXcxc}ZIUiPcDRqCgwp$LfE&349hdbmjy-Vv(eb57U
zt6=0(Yw+;QZvi>oqg3RieE+A^<^A%lRI5@K9)#8&f-XG*m8jUGCc9Uul9h~IrTQO3
z)uXOhNniYNRL7~FCy<@DlD_<tCKC-lh3c}EWXVIQ`iG%~r=dujk=&n8tyBIHR9|_<
zNakCndXA!+w~}ga5LsV4RI-w4;#th%JqK+bL*Euvqw*c-8$6D_F{*X~S^x9s+w4Sk
z-GLTEtXj$QX2Qq{E)<SHF=~v;Q@)kV;`Cxfgep+QK2w#x=!@uEwUVq5MRlF3QfAMY
zy_VCvPbnGEIbhVPRG4~!nxL)?VnoLfMue!WmCRS6I!4e}wUX-47_yv|WU)B1H7m(_
z#*vk+B#Ta}fTRz|UyEL>*knOBNp@{g!#s^=dd%+FCs9|!xzlhS^*+!eWsaElVO^aG
zGsgjaF+GR=bT!GGdZz2>3)!rFS3L_i8Q0w;b8TjJ(mndZ=F=vdA!%<$pW`Co<g5Br
z+Pag|b-BsYb@e7S^gomV%1Pb+NTJ58MX5H~W_$mUt&qysXY00I`Uh_o-A!T92U5C4
zFZvSYr0sQNs-3${U(|j2Zqrz7H;u&}N$a9{byK(BV^@>Rsb{xdBV@C7ys~hUaotTa
z*JftfAHH?jJ6|$4v$KyH&YgzyiI?#hCr%m3@(-K0q#vz7`IKwkmwrwCR?;_0%~Eq`
zFmsveJBw=+tYqvK<;<WuZzWalHO!Ks&b^LoVMlYwa`Vs@mB}D;vQQtDp%OV%3)HCD
zQF=8dsCjB+5hLPef9bviHA^i~H7Z)f*kNjwa^FDJqek9Dw)ht0E<+pCHr4w!sx``c
z2U(sPeHU4o%AH46q=w!@cJczWKn=ZbGT9rRm41U4(Kl&+MS6w2kB}`<RVw*0s>M&B
zsZSyQGbnu-DpM88{~Xoq7f_xmQ;936`d>n$UqNeBl^VZ_YLS{>L6%sB%2eD(R;4!9
zk>$!ziOO#xt5%?mDpaN7TgW!4Tn*V86~B&b<!dOp4Xu0wt>1uB-$HX#iQ1r+zC&O7
zduWbY_yO6}k5J_&$om;OMP+XyTcj#f?H5$zze3ZLPi_B>>ghkAbJWbA$jX0N{SW>O
BFh2kQ