(coun): Last access used to report last login time.

Counter-intuitive.  Report last connection time range instead.
Unfortunately, this requires a change in output format.

(coun): Report on all countries even to mortals.  This used to be
done, and was most probably changed because it gave away too much
information.  Carefully limit the information given to mortals, as
follows.  Limit last access information to whether deities or allies
are logged on right now, no longer report connection time for deities
that are not logged on.  Remove column time for mortals, rename it to
BTU for deities.  Report status, but with less detail if HIDDEN is
enabled.
This commit is contained in:
Markus Armbruster 2005-10-30 14:59:39 +00:00
parent ada0ed8e61
commit 4c06f31f16
3 changed files with 68 additions and 46 deletions

View file

@ -41,52 +41,57 @@
#include <fcntl.h>
#include <ctype.h>
#include "commands.h"
#include "optlist.h"
static void coun_header(void);
static void coun_list(natid cn, struct natstr *natp);
static void coun_list(struct natstr *natp);
int
coun(void)
{
struct nstr_item ni;
struct natstr nat;
int first;
if (!snxtitem(&ni, EF_NATION, player->argp[1]))
return RET_SYN;
first = 1;
prdate();
pr(" # last access %sstatus country name\n",
player->god ? "BTU " : "");
while (nxtitem(&ni, &nat)) {
if ((nat.nat_stat & STAT_INUSE) == 0)
continue;
if (((nat.nat_stat & GOD) != GOD) && !player->god)
continue;
if (first) {
coun_header();
first = 0;
}
coun_list((natid)ni.cur, &nat);
coun_list(&nat);
}
return RET_OK;
}
static void
coun_header(void)
coun_list(struct natstr *natp)
{
prdate();
pr(" # last access time\tstatus\t\t country name\n");
}
static void
coun_list(natid cn, struct natstr *natp)
{
s_char *status;
char *status;
struct sctstr sect;
natid cn = natp->nat_cnum;
if (getplayer(cn))
pr("%3d %-16.16s [%d]", cn, " Now logged on", natp->nat_btu);
else
pr("%3d %-16.16s [%d]", cn, ctime(&natp->nat_last_login),
natp->nat_btu);
pr("%3d ", cn);
if (getplayer(cn)
&& (player->god
|| (natp->nat_stat & STAT_GOD)
|| cn == player->cnum || getrel(natp, player->cnum) == ALLIED))
pr(" Now logged on ");
else if (player->god) {
if (natp->nat_last_login == 0)
pr(" Never logged on ");
else {
pr("%.16s - ", ctime(&natp->nat_last_login));
pr("%-16.16s",
natp->nat_last_login <= natp->nat_last_logout
? ctime(&natp->nat_last_logout) : "?");
}
} else
pr(" Unknown ");
if (player->god)
pr(" %4d", natp->nat_btu);
if (natp->nat_stat & STAT_GOD)
status = "DEITY";
@ -95,16 +100,17 @@ coun_list(natid cn, struct natstr *natp)
else if (natp->nat_stat & STAT_SANCT)
status = "Sanctuary";
else if (natp->nat_stat & STAT_NORM) {
getsect(natp->nat_xcap, natp->nat_ycap, &sect);
if (sect.sct_own != cn ||
(sect.sct_type != SCT_CAPIT && sect.sct_type != SCT_MOUNT))
status = "In flux";
else if (natp->nat_money < 0)
status = "Broke";
else
status = "Active";
status = "Active";
if (!opt_HIDDEN || player->god) {
getsect(natp->nat_xcap, natp->nat_ycap, &sect);
if (sect.sct_own != cn ||
(sect.sct_type != SCT_CAPIT && sect.sct_type != SCT_MOUNT))
status = "In flux";
else if (natp->nat_money < 0)
status = "Broke";
}
} else {
status = "Visitor";
}
pr("\t%-9.9s\t %s\n", status, natp->nat_cnam);
pr(" %-9.9s %s\n", status, natp->nat_cnam);
}