diff --git a/info/Commands/country.t b/info/Commands/country.t index ea30fd38..94c68ab7 100644 --- a/info/Commands/country.t +++ b/info/Commands/country.t @@ -4,15 +4,30 @@ .SY "country " The country command displays status of the countries you specify. .s1 -Unless you are a deity, the country command will report only on -deity countries. +.EX country * +.NF +Sat Oct 15 20:54:30 2005 + # last access status name + 0 Now logged on DEITY POGO + 1 Now logged on Active Khazad'ur + 2 Unknown Active Spectre + 3 Unknown Sanctuary 3 + 4 Unknown Sanctuary 4 + 5 Unknown Visitor visitor +.FI +.s1 +Deities get more information: .s1 .EX country * .NF -Thu Jan 21 07:14:12 1993 - # last access time status country name - 0 Now logged on [512] DEITY The_Scum - 1 Wed Jan 20 23:07 [512] Active Khazad'ur - 2 Thu Jan 21 07:00 [511] Active Spectre +Sat Oct 15 20:54:30 2005 + # last access BTU status name + 0 Now logged on 640 DEITY POGO + 1 Now logged on 480 Active Khazad'ur + 2 Sat Oct 15 17:56 - Sat Oct 15 18:11 638 Active Spectre + 3 Never logged on 640 Sanctuary 3 + 4 Never logged on 640 Sanctuary 4 + 5 Sat Oct 15 20:08 - ? 640 Visitor visitor .FI +.s1 .SA "players, Communication, Playing" diff --git a/info/Server/Hidden.t b/info/Server/Hidden.t index 7d99dadb..5b923dc4 100644 --- a/info/Server/Hidden.t +++ b/info/Server/Hidden.t @@ -5,11 +5,12 @@ The following commands are restricted when the HIDDEN option is in play: .NF -power: Displays your own power only; other nations never show up. -report: Reports on contacted countries only, and no status. -relations: Reports on contacted countries only. -newspaper: Reports on contacted countries only, except for headlines. accept: Will only display contacted countries. +country: Discloses less detailed status of active countries. +newspaper: Reports on contacted countries only, except for headlines. +power: Displays your own power only; other nations never show up. +relations: Reports on contacted countries only. +report: Reports on contacted countries only, and no status. .FI .s1 Commands to interact with other countries, like telegram, work only @@ -35,5 +36,5 @@ If the LOSE_CONTACT option is in play, contact is lost after three update of no contact. Contact can be maintained by the same methods described above. It's important to note, however, that contact is retained by RECEIVING a telegram, not sending one. - +.s1 .SA "Options, Server" diff --git a/src/lib/commands/coun.c b/src/lib/commands/coun.c index c83e4367..9e0e57db 100644 --- a/src/lib/commands/coun.c +++ b/src/lib/commands/coun.c @@ -41,52 +41,57 @@ #include #include #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, §); - 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, §); + 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); }