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

Must use AIF_ASSASSIN, to prevent other missions breaking.

This commit is contained in:
Steve 2016-05-05 14:04:55 +01:00
parent 66093a5618
commit a2736e1533
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/battle/ai.c
View File

@ -347,8 +347,7 @@ static int canAttack(Entity *e)
if (!(self->aiFlags & AIF_ASSASSIN)) if (!(self->aiFlags & AIF_ASSASSIN))
{ {
/* Pandorans will ignore the disable flag - Prisoners will not be taken, lives will not be spared */ if (e->flags & EF_MUST_DISABLE)
if (e->flags & EF_MUST_DISABLE && e->side != SIDE_PANDORAN)
{ {
return e->systemPower > 0; return e->systemPower > 0;
} }

4
src/battle/capitalShips.c
View File

@ -652,6 +652,10 @@ void updateCapitalShipComponentProperties(Entity *parent, long flags)
case ET_COMPONENT_GUN: case ET_COMPONENT_GUN:
sprintf(e->name, _("%s (Gun)"), parent->name); sprintf(e->name, _("%s (Gun)"), parent->name);
e->flags &= ~EF_AI_IGNORE; e->flags &= ~EF_AI_IGNORE;
if (parent->aiFlags & AIF_ASSASSIN)
{
e->aiFlags |= AIF_ASSASSIN;
}
break; break;
} }