forked from github/server
Fix CR output for list of regions
Add pvp/pve battle statistics
This commit is contained in:
parent
17e8144757
commit
ba39de9d25
13
src/battle.c
13
src/battle.c
|
@ -3986,6 +3986,7 @@ static void do_battle(region * r) {
|
||||||
battle *b = NULL;
|
battle *b = NULL;
|
||||||
bool fighting;
|
bool fighting;
|
||||||
ship *sh;
|
ship *sh;
|
||||||
|
int i;
|
||||||
|
|
||||||
fighting = start_battle(r, &b);
|
fighting = start_battle(r, &b);
|
||||||
|
|
||||||
|
@ -4007,6 +4008,18 @@ static void do_battle(region * r) {
|
||||||
join_allies(b);
|
join_allies(b);
|
||||||
make_heroes(b);
|
make_heroes(b);
|
||||||
|
|
||||||
|
/* statistics are fun */
|
||||||
|
for (i = 0; i != b->nsides; ++i) {
|
||||||
|
side *s = b->sides + i;
|
||||||
|
if (s->faction->flags & FFL_NPC) {
|
||||||
|
stats_count("battle.pve", 1);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (i == b->nsides) {
|
||||||
|
stats_count("battle.pvp", 1);
|
||||||
|
}
|
||||||
|
|
||||||
/* make sure no ships are damaged initially */
|
/* make sure no ships are damaged initially */
|
||||||
for (sh = r->ships; sh; sh = sh->next)
|
for (sh = r->ships; sh; sh = sh->next)
|
||||||
freset(sh, SF_DAMAGED);
|
freset(sh, SF_DAMAGED);
|
||||||
|
|
|
@ -462,7 +462,7 @@ static int cr_regions(variant var, const char *name, char *buffer, const void *u
|
||||||
z = plane_id(pl);
|
z = plane_id(pl);
|
||||||
wp += sprintf(wp, ", %d %d %d", nx, ny, z);
|
wp += sprintf(wp, ", %d %d %d", nx, ny, z);
|
||||||
}
|
}
|
||||||
wp += sprintf(wp, "\"%s\n", name);
|
wp += sprintf(wp, "\";%s\n", name);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
sprintf(buffer, "\"\";%s\n", name);
|
sprintf(buffer, "\"\";%s\n", name);
|
||||||
|
|
Loading…
Reference in New Issue