walkero
/
tbftss
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Player / Leader following tweaks.

This commit is contained in:
Steve 2016-04-08 10:58:22 +01:00
parent 0abfb672d7
commit f983b7e2f2
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/battle/ai.c
View File

@ -698,21 +698,27 @@ static void moveToPlayer(void)
{ {
int wantedAngle; int wantedAngle;
int dist = getDistance(self->x, self->y, player->x, player->y); int dist = getDistance(self->x, self->y, player->x, player->y);
float oldSpeed;
if (dist <= 350) if (dist <= 350)
{ {
if (fabs(player->dx) >= 1 && fabs(player->dy) >= 1) if (fabs(player->dx) >= 1 || fabs(player->dy) >= 1)
{ {
wantedAngle = getAngle(player->x, player->y, player->x + (player->dx * 1000), player->y + (player->dy * 1000)); wantedAngle = getAngle(player->x, player->y, player->x + (player->dx * 1000), player->y + (player->dy * 1000));
turnToFace(wantedAngle); turnToFace(wantedAngle);
oldSpeed = self->speed;
self->speed = MIN(self->speed, player->speed);
applyFighterThrust(); applyFighterThrust();
self->speed = oldSpeed;
} }
if (dist <= 250) if (dist <= 250)
{ {
applyFighterBrakes(); applyFighterBrakes();
turnToFace(player->angle);
self->aiActionTime = MIN(FPS, self->aiActionTime); self->aiActionTime = MIN(FPS, self->aiActionTime);
} }
@ -896,16 +902,20 @@ static void moveToLeader(void)
{ {
int wantedAngle; int wantedAngle;
int dist = getDistance(self->x, self->y, self->leader->x, self->leader->y); int dist = getDistance(self->x, self->y, self->leader->x, self->leader->y);
float oldSpeed;
if (dist <= 350) if (dist <= ((self->leader->type != ET_CAPITAL_SHIP) ? 350 : 500))
{ {
if (fabs(self->leader->dx) >= 1 && fabs(self->leader->dy) >= 1) if (fabs(self->leader->dx) >= 1 || fabs(self->leader->dy) >= 1)
{ {
wantedAngle = getAngle(self->leader->x, self->leader->y, self->leader->x + (self->leader->dx * 1000), self->leader->y + (self->leader->dy * 1000)); wantedAngle = getAngle(self->leader->x, self->leader->y, self->leader->x + (self->leader->dx * 1000), self->leader->y + (self->leader->dy * 1000));
turnToFace(wantedAngle); turnToFace(wantedAngle);
oldSpeed = self->speed;
self->speed = MIN(self->speed, self->leader->speed);
applyFighterThrust(); applyFighterThrust();
self->speed = oldSpeed;
} }
if (dist <= 250) if (dist <= 250)