From 61b3ede526c82f62dbc00c18832450f5eca516f9 Mon Sep 17 00:00:00 2001
From: Steve <stephenjsweeney@battleforthesolarsystem.com>
Date: Sun, 10 Apr 2016 08:36:27 +0100
Subject: [PATCH] Wander takes priority over moving to leaders. Don't suddenly
 stop when close to leader during flocking.

---
 src/battle/ai.c | 33 ++++++++++++++++++++++-----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/battle/ai.c b/src/battle/ai.c
index 048c296..e61588d 100644
--- a/src/battle/ai.c
+++ b/src/battle/ai.c
@@ -154,7 +154,7 @@ static void doFighterAI(void)
 		
 		if (!self->target)
 		{
-			/* takes priority over move to player */
+			/* move to leader and wander take priority over move to player */
 			if (self->aiFlags & AIF_MOVES_TO_LEADER)
 			{
 				if (!lookForLeader())
@@ -169,14 +169,14 @@ static void doFighterAI(void)
 					}
 				}
 			}
-			else if (self->aiFlags & AIF_MOVES_TO_PLAYER && player != NULL)
-			{
-				moveToPlayer();
-			}
 			else if (self->aiFlags & AIF_WANDERS)
 			{
 				doWander();
 			}
+			else if (self->aiFlags & AIF_MOVES_TO_PLAYER && player != NULL)
+			{
+				moveToPlayer();
+			}
 			else
 			{
 				applyFighterBrakes();
@@ -704,16 +704,23 @@ static void moveToPlayer(void)
 	int dist = getDistance(self->x, self->y, player->x, player->y);
 	float oldSpeed;
 	
-	if (dist <= 350)
+	if (dist <= 250)
 	{
 		wantedAngle = getAngle(player->x, player->y, player->x + (player->dx * 1000), player->y + (player->dy * 1000));
 		
 		turnToFace(wantedAngle);
 		
-		oldSpeed = self->speed;
-		self->speed = sqrt(player->thrust);
-		applyFighterThrust();
-		self->speed = oldSpeed;
+		if (player->thrust)
+		{
+			oldSpeed = self->speed;
+			self->speed = sqrt(player->thrust);
+			applyFighterThrust();
+			self->speed = oldSpeed;
+		}
+		else
+		{
+			applyFighterBrakes();
+		}
 	}
 	else
 	{
@@ -898,7 +905,7 @@ static void moveToLeader(void)
 	
 	if (dist <= ((self->leader->type != ET_CAPITAL_SHIP) ? 350 : 550))
 	{
-		if (self->leader->thrust > 0)
+		if (self->leader->thrust)
 		{
 			wantedAngle = getAngle(self->leader->x, self->leader->y, self->leader->x + (self->leader->dx * 1000), self->leader->y + (self->leader->dy * 1000));
 			
@@ -912,6 +919,10 @@ static void moveToLeader(void)
 			/* don't all react at once */
 			self->aiActionTime = FPS + (rand() % FPS);
 		}
+		else
+		{
+			applyFighterBrakes();
+		}
 	}
 	else
 	{