Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stealth for totally anonymous armies should work in E3

This commit is contained in:
Enno Rehling 2010-09-23 23:32:15 -07:00
parent fd05fe95e7
commit fbb3234bee
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/kernel/battle.c
View File

@ -3225,18 +3225,16 @@ make_fighter(battle * b, unit * u, side * s1, boolean attack)
if (rule_anon_battle<0) { if (rule_anon_battle<0) {
rule_anon_battle = get_param_int(global.parameters, "rules.stealth.anon_battle", 1); rule_anon_battle = get_param_int(global.parameters, "rules.stealth.anon_battle", 1);
} }
if (rule_anon_battle) {
if (fval(u, UFL_ANON_FACTION)!=0) flags |= SIDE_STEALTH; if (fval(u, UFL_ANON_FACTION)!=0) flags |= SIDE_STEALTH;
}
if (!(AllianceAuto() & HELP_FIGHT) && fval(u, UFL_GROUP)) { if (!(AllianceAuto() & HELP_FIGHT) && fval(u, UFL_GROUP)) {
const attrib * agroup = a_find(u->attribs, &at_group); const attrib * agroup = a_find(u->attribs, &at_group);
if (agroup!=NULL) g = (const group*)agroup->data.v; if (agroup!=NULL) g = (const group*)agroup->data.v;
} }
/* Illusionen und Zauber kaempfen nicht */ /* Illusionen und Zauber kaempfen nicht */
if (fval(u->race, RCF_ILLUSIONARY) || idle(u->faction) || u->number==0) if (fval(u->race, RCF_ILLUSIONARY) || idle(u->faction) || u->number==0) {
return NULL; return NULL;
}
if (s1==NULL) { if (s1==NULL) {
for (s2=b->sides;s2!=b->sides+b->nsides;++s2) { for (s2=b->sides;s2!=b->sides+b->nsides;++s2) {
if (s2->faction == u->faction && s2->group==g) { if (s2->faction == u->faction && s2->group==g) {
@ -3247,7 +3245,10 @@ make_fighter(battle * b, unit * u, side * s1, boolean attack)
int s1flags = flags; int s1flags = flags;
int s2flags = s2->flags; int s2flags = s2->flags;
#endif #endif
if (s1flags==s2flags && s2->stealthfaction==stealthfaction) { if (rule_anon_battle && s2->stealthfaction!=stealthfaction) {
continue;
}
if (s1flags==s2flags) {
s1 = s2; s1 = s2;
break; break;
} }
@ -3257,6 +3258,8 @@ make_fighter(battle * b, unit * u, side * s1, boolean attack)
/* aliances are moved out of make_fighter and will be handled later */ /* aliances are moved out of make_fighter and will be handled later */
if (!s1) { if (!s1) {
s1 = make_side(b, u->faction, g, flags, stealthfaction); s1 = make_side(b, u->faction, g, flags, stealthfaction);
} else if (!stealthfaction) {
s1->stealthfaction = NULL;
} }
/* Zu diesem Zeitpunkt ist attacked noch 0, da die Einheit für noch /* Zu diesem Zeitpunkt ist attacked noch 0, da die Einheit für noch
* keinen Kampf ausgewählt wurde (sonst würde ein fighter existieren) */ * keinen Kampf ausgewählt wurde (sonst würde ein fighter existieren) */