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

Reworked canAttack logic.

This commit is contained in:
Steve 2016-03-29 07:09:26 +01:00
parent ce8f1fed93
commit e6ea4bff06
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/battle/ai.c
View File

@ -50,6 +50,7 @@ static void doGunAI(void);
static void moveToLeader(void); static void moveToLeader(void);
static void wander(void); static void wander(void);
static void doWander(void); static void doWander(void);
static int selectWeaponForTarget(Entity *e);
void doAI(void) void doAI(void)
{ {
@ -302,7 +303,7 @@ static void findTarget(void)
for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i]) for (i = 0, e = candidates[i] ; e != NULL ; e = candidates[++i])
{ {
if (e->active && (e->flags & EF_TAKES_DAMAGE) && (!(e->flags & EF_DISABLED)) && e->side != self->side && e->health > 0 && canAttack(e)) if (canAttack(e))
{ {
dist = getDistance(self->x, self->y, e->x, e->y); dist = getDistance(self->x, self->y, e->x, e->y);
@ -317,7 +318,15 @@ static void findTarget(void)
static int canAttack(Entity *e) static int canAttack(Entity *e)
{ {
self->selectedGunType = self->guns[0].type; if (!e->active || e->side == self->side || e->health <= 0)
{
return 0;
}
if (!(e->flags & EF_TAKES_DAMAGE))
{
return 0;
}
if (!(e->flags & EF_AI_TARGET)) if (!(e->flags & EF_AI_TARGET))
{ {
@ -330,6 +339,13 @@ static int canAttack(Entity *e)
} }
} }
return selectWeaponForTarget(e);
}
static int selectWeaponForTarget(Entity *e)
{
self->selectedGunType = self->guns[0].type;
if (e->flags & EF_MUST_DISABLE) if (e->flags & EF_MUST_DISABLE)
{ {
if (e->systemPower > 0) if (e->systemPower > 0)
@ -437,7 +453,7 @@ static void preAttack(void)
if (!(self->aiFlags & AIF_MISSILE_BOAT)) if (!(self->aiFlags & AIF_MISSILE_BOAT))
{ {
/* force weapon selection, otherwise we'll keep using lasers / mag */ /* force weapon selection, otherwise we'll keep using lasers / mag */
canAttack(self->target); selectWeaponForTarget(self->target);
if (self->guns[0].type && (self->missiles == 0 || rand() % 50 > 0)) if (self->guns[0].type && (self->missiles == 0 || rand() % 50 > 0))
{ {