From 9cc00937523da8024ebb820c6beba45748ff72a4 Mon Sep 17 00:00:00 2001
From: Anuken <arnukren@gmail.com>
Date: Thu, 4 May 2017 20:43:48 -0400
Subject: [PATCH] Pathfinding fixes

---
 core/src/io/anuke/mindustry/GameState.java                 | 3 +++
 core/src/io/anuke/mindustry/Input.java                     | 2 --
 core/src/io/anuke/mindustry/entities/Enemy.java            | 2 +-
 core/src/io/anuke/mindustry/entities/TileEntity.java       | 2 --
 core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java | 4 ++--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/core/src/io/anuke/mindustry/GameState.java b/core/src/io/anuke/mindustry/GameState.java
index fd047ced62..5894599b0f 100644
--- a/core/src/io/anuke/mindustry/GameState.java
+++ b/core/src/io/anuke/mindustry/GameState.java
@@ -2,6 +2,7 @@ package io.anuke.mindustry;
 
 import static io.anuke.mindustry.Vars.*;
 
+import io.anuke.mindustry.ai.Pathfind;
 import io.anuke.mindustry.entities.*;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.ucore.core.Effects;
@@ -47,6 +48,8 @@ public class GameState{
 		int amount = wave;
 		Sounds.play("spawn");
 		
+		Pathfind.updatePath();
+		
 		for(int i = 0; i < amount; i ++){
 			int pos = i;
 			
diff --git a/core/src/io/anuke/mindustry/Input.java b/core/src/io/anuke/mindustry/Input.java
index 7328a6349a..f59054cf07 100644
--- a/core/src/io/anuke/mindustry/Input.java
+++ b/core/src/io/anuke/mindustry/Input.java
@@ -43,8 +43,6 @@ public class Input{
 			tile.setBlock(recipe.result);
 			tile.rotation = rotation;
 
-			Pathfind.updatePath();
-
 			Effects.effect("place", World.roundx(), World.roundy());
 			Effects.shake(2f, 2f);
 			Sounds.play("place");
diff --git a/core/src/io/anuke/mindustry/entities/Enemy.java b/core/src/io/anuke/mindustry/entities/Enemy.java
index 6404803297..22f24f4265 100644
--- a/core/src/io/anuke/mindustry/entities/Enemy.java
+++ b/core/src/io/anuke/mindustry/entities/Enemy.java
@@ -40,7 +40,7 @@ public class Enemy extends DestructibleEntity{
 		Vector2 vec  = Pathfind.find(this);
 		vec.sub(x, y).setLength(speed);
 		
-		move(vec.x*delta, vec.y*delta);
+		move(vec.x*delta, vec.y*delta, Vars.tilesize-4);
 		
 		if(Timers.get(this, 15)){
 			target = World.findTileTarget(x, y, null, range, false);
diff --git a/core/src/io/anuke/mindustry/entities/TileEntity.java b/core/src/io/anuke/mindustry/entities/TileEntity.java
index 3bf5fe730d..d898116c10 100644
--- a/core/src/io/anuke/mindustry/entities/TileEntity.java
+++ b/core/src/io/anuke/mindustry/entities/TileEntity.java
@@ -3,7 +3,6 @@ package io.anuke.mindustry.entities;
 import com.badlogic.gdx.utils.ObjectMap;
 
 import io.anuke.mindustry.GameState;
-import io.anuke.mindustry.ai.Pathfind;
 import io.anuke.mindustry.resource.Item;
 import io.anuke.mindustry.world.Tile;
 import io.anuke.mindustry.world.blocks.Blocks;
@@ -37,7 +36,6 @@ public class TileEntity extends Entity{
 		}
 		
 		tile.setBlock(Blocks.air);
-		Pathfind.updatePath();
 		Effects.shake(4f, 4f);
 		Effects.effect("explosion", this);
 		
diff --git a/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java b/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java
index f6fe62fd33..0e6dc04621 100644
--- a/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java
+++ b/core/src/io/anuke/mindustry/world/blocks/WeaponBlocks.java
@@ -63,10 +63,10 @@ public class WeaponBlocks{
 		protected void shoot(Tile tile){
 			TurretEntity entity = tile.entity();
 			
-			for(int i = 0; i < 6; i ++)
+			for(int i = 0; i < 7; i ++)
 				Timers.run(i/1.5f, ()->{
 					vector.set(4, 0).setAngle(entity.rotation);
-					bullet(tile, entity.rotation + Mathf.range(16));
+					bullet(tile, entity.rotation + Mathf.range(30));
 				});
 		}
 	},