diff --git a/include/map.h b/include/map.h index 9bdbf01c..c5a0a223 100644 --- a/include/map.h +++ b/include/map.h @@ -50,7 +50,8 @@ extern void border(struct range *, char *, char *); #define MAP_SHIP bit(0) #define MAP_LAND bit(1) #define MAP_PLANE bit(2) -#define MAP_HIGH bit(3) -#define MAP_ALL MAP_SHIP | MAP_LAND | MAP_PLANE +#define MAP_NUKE bit(3) +#define MAP_HIGH bit(4) +#define MAP_ALL MAP_SHIP | MAP_LAND | MAP_PLANE | MAP_NUKE #endif diff --git a/info/bmap.t b/info/bmap.t index d1093a26..08a8a559 100644 --- a/info/bmap.t +++ b/info/bmap.t @@ -1,10 +1,11 @@ .TH Command BMAP .NA bmap "Big map of all your worldly knowledge" .LV Basic -.SY "bmap [ | ] " -.SY "lbmap [ | ] " -.SY "pbmap [ | ] " -.SY "sbmap [ | ] " +.SY "bmap [ | ] " +.SY "lbmap [ | ] " +.SY "nbmap [ | ] " +.SY "pbmap [ | ] " +.SY "sbmap [ | ] " A bmap gives you a graphic representation of all or part of your country. .s1 Bmap differs from map in that it reflects everything you've learned @@ -67,15 +68,17 @@ bmap centered on the location of that ship, provided you own it. If you use lbmap, you can get a bmap around a land unit. If you use pbmap, you can get a bmap around a plane. If you use sbmap, you can get a bmap around a ship. +If you use nbmap, you can get a bmap around a nuke. .s1 .L "BMAP FLAGS" .s1 If you specify an 's' flag, bmap will put your ships on the map. If you specify an 'l' flag, bmap will put your land units on the map. If you specify an 'p' flag, bmap will put your planes on the map. +If you specify an 'n' flag, bmap will put your nukes on the map. A '*' will put all on the map. When multiple unit types are selected they are displayed -in the following priority order: land units, ships, planes. +in the following priority order: nukes, land units, ships, planes. To highlight sectors you own, specify the 'h' flag. .s1 You actually have two bmaps. One which is created by the server; this diff --git a/info/lbmap.t b/info/lbmap.t index ac728b7e..cc75520a 100644 --- a/info/lbmap.t +++ b/info/lbmap.t @@ -1,10 +1,11 @@ .TH Command LBMAP .NA lbmap "Big map of all your worldly knowledge around a land unit" .LV Expert -.SY "bmap [ | ] " -.SY "lbmap [ | ] " -.SY "pbmap [ | ] " -.SY "sbmap [ | ] " +.SY "bmap [ | ] " +.SY "lbmap [ | ] " +.SY "nbmap [ | ] " +.SY "pbmap [ | ] " +.SY "sbmap [ | ] " A bmap gives you a graphic representation of all or part of your country. .s1 Bmap differs from map in that it reflects everything you've learned @@ -69,15 +70,17 @@ bmap centered on the location of that ship, provided you own it. If you use lbmap, you can get a bmap around a land unit. If you use pbmap, you can get a bmap around a plane. If you use sbmap, you can get a bmap around a ship. +If you use nbmap, you can get a bmap around a nuke. .s1 .L "BMAP FLAGS" .s1 If you specify an 's' flag, bmap will put your ships on the map. If you specify an 'l' flag, bmap will put your land units on the map. If you specify an 'p' flag, bmap will put your planes on the map. +If you specify an 'n' flag, bmap will put your nukes on the map. A '*' will put all on the map. When multiple unit types are selected they are displayed -in the following priority order: land units, ships, planes. +in the following priority order: nukes, land units, ships, planes. To highlight sectors you own, specify the 'h' flag. .s1 You actually have two bmaps. One which is created by the server; this diff --git a/info/lmap.t b/info/lmap.t index 15d50da0..d01e2827 100644 --- a/info/lmap.t +++ b/info/lmap.t @@ -1,11 +1,11 @@ .TH Command LMAP .NA lmap "Map around a land unit" .LV Expert -.SY "map " -.SY "nmap " -.SY "smap " -.SY "lmap " -.SY "pmap " +.SY "map " +.SY "nmap " +.SY "smap " +.SY "lmap " +.SY "pmap " A map gives you a graphic representation of all or part of your country. .s1 Your own sectors as well as sea, mountains, wasteland and unowned @@ -56,15 +56,17 @@ instead of old sector designations of your own country. If you use lmap, you can get a map around a land unit. If you use pmap, you can get a map around a plane. If you use smap, you can get a map around a ship. +If you use nmap, you can get a map around a nuke. .s1 .L "MAP FLAGS" .s1 If you specify an 's' flag, map will put your ships on the map. If you specify an 'l' flag, map will put your land units on the map. If you specify an 'p' flag, map will put your planes on the map. +If you specify an 'n' flag, map will put your nukes on the map. A '*' will put all on the map. When multiple unit types are selected they are displayed -in the following priority order: land units, ships, planes. +in the following priority order: nukes, land units, ships, planes. To highlight sectors you own, specifiy the 'h' flag. .s1 .SA "census, commodity, radar, realm, route, update, LandUnits, Maps" diff --git a/info/map.t b/info/map.t index 40ef1d9b..1bdcd433 100644 --- a/info/map.t +++ b/info/map.t @@ -1,11 +1,11 @@ .TH Command MAP .NA map "Generate a map showing sector types, seas, etc" .LV Basic -.SY "map " -.SY "nmap " -.SY "smap " -.SY "lmap " -.SY "pmap " +.SY "map " +.SY "nmap " +.SY "smap " +.SY "lmap " +.SY "pmap " A map gives you a graphic representation of all or part of your country. .s1 Your own sectors as well as sea, mountains, wasteland and unowned @@ -54,15 +54,17 @@ instead of old sector designations of your own country. If you use lmap, you can get a map around a land unit. If you use pmap, you can get a map around a plane. If you use smap, you can get a map around a ship. +If you use nmap, you can get a map around a nuke. .s1 .L "MAP FLAGS" .s1 If you specify an 's' flag, map will put your ships on the map. If you specify an 'l' flag, map will put your land units on the map. If you specify an 'p' flag, map will put your planes on the map. +If you specify an 'n' flag, map will put your nukes on the map. A '*' will put all on the map. When multiple unit types are selected they are displayed -in the following priority order: land units, ships, planes. +in the following priority order: nukes, land units, ships, planes. To highlight sectors you own, specifiy the 'h' flag. .s1 .SA "census, commodity, radar, realm, route, update, Maps" diff --git a/info/nbmap.t b/info/nbmap.t new file mode 100644 index 00000000..895730a8 --- /dev/null +++ b/info/nbmap.t @@ -0,0 +1,97 @@ +.TH Command NBMAP +.NA sbmap "Big map of all your worldly knowledge around a nuke" +.LV Basic +.SY "bmap [ | ] " +.SY "lbmap [ | ] " +.SY "nbmap [ | ] " +.SY "pbmap [ | ] " +.SY "sbmap [ | ] " +A bmap gives you a graphic representation of all or part of your country. +.s1 +Bmap differs from map in that it reflects everything you've learned +about the world. If, for example, you navigate near a sector and find +out that it is sea, it will show up on your bmap as sea, even if it +doesn't show up on your map. +.s1 +Note that bmap shows the \*QLAST KNOWN INFORMATION\*U you have about +a sector. It may change, and your bmap will not reflect it. For example, +if you re-designate a sector, it won't show up on your bmap as the +new sector type until you do a map. +.s1 +Commands contributing to bmap include (but are not limited to): +map, nav, fly, bomb, recon, para, drop, lookout, coastwatch, radar. +(probably others) +.s1 +Note that any sector +marked as 'X' on your bmap will automatically be avoided by +ships when they are trying to calculate the best path between two +points. Whenever you detect a sea mine in a sector, the server will +automatically put an 'X' on your bmap. +.s1 +You can call up a local bmap while navigating or marching by typing 'B' +at the prompt. +.s1 +Examples: +.EX bmap -9:18,-8:5 +generates a 28 x 14 bmap based on data supplied by the sectors +in the area specified. +.NF + ---------0000000000111111111 + 9876543210123456789012345678 + -8 . . . - - -8 + -7 . . . . - ^ -7 + -6 . . . . - - - - -6 + -5 . . - . a a - ^ ? ? - -5 + -4 . . . . k o ! - ^ ? ? ? -4 + -3 . - . a h j a ^ ^ ^ ^ ^ - -3 + -2 . . - . a a a ^ a a - - - -2 + -1 . . . a a a b + + ^ ^ - -1 + 0 . . . m c u a a - ^ - ^ 0 + 1 . - . a a . a a - - ^ 1 + 2 - ^ ^ a a a ^ a - - ^ 2 + 3 - - - - - - - . . - 3 + 4 ^ - - - - - ^ - - 4 + 5 - ^ - - ^ - - - 5 + ---------0000000000111111111 + 9876543210123456789012345678 +.FI +.s1 +.EX bmap # >mapfil +where your \*Qrealm\*U (or '#', +see \*Qinfo realm\*U or \*Qinfo update\*U) +is -5:5,-6:6 will type out a 11 by 13 sector bmap +and also put the bmap in the file called \*Qmapfil\*U. +.s1 +You can also give the number of a ship, and bmap will give you a small +bmap centered on the location of that ship, provided you own it. +.s1 +If you use lbmap, you can get a bmap around a land unit. +If you use pbmap, you can get a bmap around a plane. +If you use sbmap, you can get a bmap around a ship. +If you use nbmap, you can get a bmap around a nuke. +.s1 +.L "BMAP FLAGS" +.s1 +If you specify an 's' flag, bmap will put your ships on the map. +If you specify an 'l' flag, bmap will put your land units on the map. +If you specify an 'p' flag, bmap will put your planes on the map. +If you specify an 'n' flag, bmap will put your nukes on the map. +A '*' will put all on the map. +When multiple unit types are selected they are displayed +in the following priority order: nukes, land units, ships, planes. +To highlight sectors you own, specify the 'h' flag. +.s1 +You actually have two bmaps. One which is created by the server; this +one is called your 'true' bmap. You can view your true bmap at any +time using the +.SY "bmap true" +command. However, usually when you view your bmap, you are looking at +your 'working' bmap. The only difference between your working bmap +and your true bmap is that your working bmap also contains +designations put on there by you using the 'bdes' command, and by your +friends using the "sharebmap" command. If somehow your bmap gets +corrupted, you can revert your working bmap back to your true bmap +using the command: +.SY "bmap revert" +.s1 +.SA "bdes, map, navigate, fly, bomb, recon, paradrop, drop, lookout, coastwatch, radar, sharebmap, Nukes, Maps" diff --git a/info/nmap.t b/info/nmap.t index 3a517c0a..a1b4dc43 100644 --- a/info/nmap.t +++ b/info/nmap.t @@ -1,11 +1,11 @@ .TH Command NMAP -.NA nmap "Generate a map showing new sector types, seas, etc" +.NA nmap "Generate a map showing new sector types or around a nuke" .LV Basic -.SY "map " -.SY "nmap " -.SY "smap " -.SY "lmap " -.SY "pmap " +.SY "map " +.SY "nmap " +.SY "smap " +.SY "lmap " +.SY "pmap " A map gives you a graphic representation of all or part of your country. .s1 Your own sectors as well as sea, mountains, wasteland and unowned @@ -54,15 +54,17 @@ instead of old sector designations of your own country. If you use lmap, you can get a map around a land unit. If you use pmap, you can get a map around a plane. If you use smap, you can get a map around a ship. +If you use nmap, you can get a map around a nuke. .s1 .L "MAP FLAGS" .s1 If you specify an 's' flag, map will put your ships on the map. If you specify an 'l' flag, map will put your land units on the map. If you specify an 'p' flag, map will put your planes on the map. +If you specify an 'n' flag, map will put your nukes on the map. A '*' will put all on the map. When multiple unit types are selected they are displayed -in the following priority order: land units, ships, planes. +in the following priority order: nukes, land units, ships, planes. To highlight sectors you own, specifiy the 'h' flag. .s1 -.SA "census, commodity, radar, realm, route, update, Maps" +.SA "census, commodity, radar, realm, route, update, Nukes, Maps" diff --git a/info/pbmap.t b/info/pbmap.t index 5ce3f631..8757089d 100644 --- a/info/pbmap.t +++ b/info/pbmap.t @@ -1,10 +1,11 @@ .TH Command PBMAP .NA pbmap "Big map of all your worldly knowledge around a plane" .LV Expert -.SY "bmap [ | ] " -.SY "lbmap [ | ] " -.SY "pbmap [ | ] " -.SY "sbmap [ | ] " +.SY "bmap [ | ] " +.SY "lbmap [ | ] " +.SY "nbmap [ | ] " +.SY "pbmap [ | ] " +.SY "sbmap [ | ] " A bmap gives you a graphic representation of all or part of your country. .s1 Bmap differs from map in that it reflects everything you've learned @@ -67,15 +68,17 @@ bmap centered on the location of that ship, provided you own it. If you use lbmap, you can get a bmap around a land unit. If you use pbmap, you can get a bmap around a plane. If you use sbmap, you can get a bmap around a ship. +If you use nbmap, you can get a bmap around a nuke. .s1 .L "BMAP FLAGS" .s1 If you specify an 's' flag, bmap will put your ships on the map. If you specify an 'l' flag, bmap will put your land units on the map. If you specify an 'p' flag, bmap will put your planes on the map. +If you specify an 'n' flag, bmap will put your nukes on the map. A '*' will put all on the map. When multiple unit types are selected they are displayed -in the following priority order: land units, ships, planes. +in the following priority order: nukes, land units, ships, planes. To highlight sectors you own, specify the 'h' flag. .s1 You actually have two bmaps. One which is created by the server; this diff --git a/info/pmap.t b/info/pmap.t index 188ac30e..b322b6aa 100644 --- a/info/pmap.t +++ b/info/pmap.t @@ -1,11 +1,11 @@ .TH Command PMAP .NA pmap "Get a map around a plane" .LV Expert -.SY "map " -.SY "nmap " -.SY "smap " -.SY "lmap " -.SY "pmap " +.SY "map " +.SY "nmap " +.SY "smap " +.SY "lmap " +.SY "pmap " A map gives you a graphic representation of all or part of your country. .s1 Your own sectors as well as sea, mountains, wasteland and unowned @@ -54,15 +54,17 @@ instead of old sector designations of your own country. If you use lmap, you can get a map around a land unit. If you use pmap, you can get a map around a plane. If you use smap, you can get a map around a ship. +If you use nmap, you can get a map around a nuke. .s1 .L "MAP FLAGS" .s1 If you specify an 's' flag, map will put your ships on the map. If you specify an 'l' flag, map will put your land units on the map. If you specify an 'p' flag, map will put your planes on the map. +If you specify an 'n' flag, map will put your nukes on the map. A '*' will put all on the map. When multiple unit types are selected they are displayed -in the following priority order: land units, ships, planes. +in the following priority order: nukes, land units, ships, planes. To highlight sectors you own, specifiy the 'h' flag. .s1 .SA "census, commodity, radar, realm, route, update, Planes, Maps" diff --git a/info/sbmap.t b/info/sbmap.t index d88d1e23..56f4919c 100644 --- a/info/sbmap.t +++ b/info/sbmap.t @@ -1,10 +1,11 @@ .TH Command SBMAP .NA sbmap "Big map of all your worldly knowledge around a ship" .LV Basic -.SY "bmap [ | ] " -.SY "lbmap [ | ] " -.SY "pbmap [ | ] " -.SY "sbmap [ | ] " +.SY "bmap [ | ] " +.SY "lbmap [ | ] " +.SY "nbmap [ | ] " +.SY "pbmap [ | ] " +.SY "sbmap [ | ] " A bmap gives you a graphic representation of all or part of your country. .s1 Bmap differs from map in that it reflects everything you've learned @@ -69,15 +70,17 @@ bmap centered on the location of that ship, provided you own it. If you use lbmap, you can get a bmap around a land unit. If you use pbmap, you can get a bmap around a plane. If you use sbmap, you can get a bmap around a ship. +If you use nbmap, you can get a bmap around a nuke. .s1 .L "BMAP FLAGS" .s1 If you specify an 's' flag, bmap will put your ships on the map. If you specify an 'l' flag, bmap will put your land units on the map. If you specify an 'p' flag, bmap will put your planes on the map. +If you specify an 'n' flag, bmap will put your nukes on the map. A '*' will put all on the map. When multiple unit types are selected they are displayed -in the following priority order: land units, ships, planes. +in the following priority order: nukes, land units, ships, planes. To highlight sectors you own, specify the 'h' flag. .s1 You actually have two bmaps. One which is created by the server; this diff --git a/info/smap.t b/info/smap.t index 1e27f602..adae248c 100644 --- a/info/smap.t +++ b/info/smap.t @@ -1,11 +1,11 @@ .TH Command SMAP .NA smap "Get a map around a ship" .LV Basic -.SY "map " -.SY "nmap " -.SY "smap " -.SY "lmap " -.SY "pmap " +.SY "map " +.SY "nmap " +.SY "smap " +.SY "lmap " +.SY "pmap " A map gives you a graphic representation of all or part of your country. .s1 Your own sectors as well as sea, mountains, wasteland and unowned @@ -56,15 +56,17 @@ instead of old sector designations of your own country. If you use lmap, you can get a map around a land unit. If you use pmap, you can get a map around a plane. If you use smap, you can get a map around a ship. +If you use nmap, you can get a map around a nuke. .s1 .L "MAP FLAGS" .s1 If you specify an 's' flag, map will put your ships on the map. If you specify an 'l' flag, map will put your land units on the map. If you specify an 'p' flag, map will put your planes on the map. +If you specify an 'n' flag, map will put your nukes on the map. A '*' will put all on the map. When multiple unit types are selected they are displayed -in the following priority order: land units, ships, planes. +in the following priority order: nukes, land units, ships, planes. To highlight sectors you own, specifiy the 'h' flag. .s1 .SA "census, commodity, radar, realm, route, update, Ships, Maps" diff --git a/src/lib/commands/map.c b/src/lib/commands/map.c index 5227aa93..5cae613b 100644 --- a/src/lib/commands/map.c +++ b/src/lib/commands/map.c @@ -62,9 +62,13 @@ map(void) if (**player->argp != 'm') { if (**player->argp == 'b') bmap = 'b'; - else if (**player->argp == 'n') - bmap = 'n'; - else { + else if (**player->argp == 'n') { + unit_type = EF_NUKE; + if (player->argp[0][1] == 'b') + bmap = 'b'; + else + bmap = 'n'; + } else { if (**player->argp == 'l') unit_type = EF_LAND; else if (**player->argp == 'p') @@ -111,6 +115,10 @@ map(void) case 'P': map_flags |= MAP_PLANE; break; + case 'n': + case 'N': + map_flags |= MAP_NUKE; + break; case 'h': case 'H': map_flags |= MAP_HIGH; diff --git a/src/lib/common/maps.c b/src/lib/common/maps.c index 23a23ac7..458f0e7a 100644 --- a/src/lib/common/maps.c +++ b/src/lib/common/maps.c @@ -62,6 +62,7 @@ draw_map(int bmap, char origin, int map_flags, struct nstr_sect *nsp) struct shpstr ship; struct lndstr land; struct plnstr plane; + struct nukstr nuke; coord x, y; int i; /* Note this is not re-entrant anyway, so we keep the buffers @@ -217,6 +218,21 @@ draw_map(int bmap, char origin, int map_flags, struct nstr_sect *nsp) wmap[y][x] = (*lchr[(int)land.lnd_type].l_name) & ~0x20; } } + if (map_flags & MAP_NUKE) { + snxtitem_all(&ni, EF_NUKE); + while (nxtitem(&ni, &nuke)) { + if (nuke.nuk_own == 0) + continue; + if (nuke.nuk_own != player->cnum && !player->god) + continue; + if (!xyinrange(nuke.nuk_x, nuke.nuk_y, &nsp->range)) + continue; + + x = xnorm(nuke.nuk_x - nsp->range.lx); + y = ynorm(nuke.nuk_y - nsp->range.ly); + wmap[y][x] = 'N'; + } + } if (map_flags & MAP_HIGH) { char *ptr; struct sctstr sect; @@ -305,6 +321,7 @@ unit_map(int unit_type, int uid, struct nstr_sect *nsp, char *originp) struct shpstr origs; struct lndstr origl; struct plnstr origp; + struct nukstr orign; struct genitem *gp; struct range range; @@ -318,6 +335,11 @@ unit_map(int unit_type, int uid, struct nstr_sect *nsp, char *originp) return RET_FAIL; gp = (struct genitem *)&origp; *originp = *plchr[(int)origp.pln_type].pl_name; + } else if (unit_type == EF_NUKE) { + if (!getnuke(uid, &orign) || !player->owner || orign.nuk_own == 0) + return RET_FAIL; + gp = (struct genitem *)&orign; + *originp = 'n'; } else { if (!getship(uid, &origs) || !player->owner || origs.shp_own == 0) return RET_FAIL; diff --git a/src/lib/player/empmod.c b/src/lib/player/empmod.c index 3ad9da80..d9ff0e12 100644 --- a/src/lib/player/empmod.c +++ b/src/lib/player/empmod.c @@ -55,7 +55,7 @@ struct cmndstr player_coms[] = { 3, atta, C_MOD, NORM + MONEY + CAP}, {"bdes ", 0, bdes, C_MOD, NORM}, {"bestpath ", 0, best, 0, NORM}, - {"bmap [s|l|p|r|t|*|h]", 0, map, C_MOD, NORM}, + {"bmap [s|l|n|p|r|t|*|h]", 0, map, C_MOD, NORM}, {"board [|]", 3, boar, C_MOD, NORM + MONEY + CAP}, {"bomb ", @@ -124,7 +124,7 @@ struct cmndstr player_coms[] = { {"info ", 0, info, 0, VIS}, {"land ", 0, land, C_MOD, NORM}, {"launch ", 3, laun, C_MOD, NORM + MONEY + CAP}, - {"lbmap [s|l|p|r|t|*|h]", 0, map, C_MOD, NORM}, + {"lbmap [s|l|n|p|r|t|*|h]", 0, map, C_MOD, NORM}, {"lboard []", 3, lboa, C_MOD, NORM + MONEY + CAP}, {"lcargo ", 0, lcarg, 0, NORM}, @@ -135,7 +135,7 @@ struct cmndstr player_coms[] = { {"lload ", 1, lload, C_MOD, NORM + CAP}, {"llookout ", 1, llook, 0, NORM + CAP}, - {"lmap [s|l|p|*|h]", 0, map, C_MOD, NORM}, + {"lmap [s|l|n|p|*|h]", 0, map, C_MOD, NORM}, {"lmine ", 2, landmine, C_MOD, NORM + MONEY + CAP}, {"load ", 1, load, C_MOD, NORM + CAP}, @@ -150,7 +150,7 @@ struct cmndstr player_coms[] = { 1, ltend, C_MOD, NORM + CAP}, {"lunload ", 1, lload, C_MOD, NORM + CAP}, - {"map [s|l|p|*|h]", 0, map, C_MOD, VIS}, + {"map [s|l|n|p|*|h]", 0, map, C_MOD, VIS}, {"march ", 1, march, C_MOD, NORM + CAP}, {"market ", 0, mark, 0, VIS}, {"mine ", 2, mine, C_MOD, NORM + MONEY + CAP}, @@ -165,11 +165,12 @@ struct cmndstr player_coms[] = { {"name ", 0, name, C_MOD, NORM}, {"nation [as-COUNTRY]", 0, nati, 0, VIS}, {"navigate ", 1, navi, C_MOD, NORM + CAP}, + {"nbmap [s|l|n|p|r|t|*|h]", 0, map, C_MOD, NORM}, {"ndump ", 0, ndump, 0, NORM}, {"newcap []", 0, new, C_MOD, GOD}, {"neweff ", 0, newe, C_MOD, NORM}, {"newspaper [days]", 0, news, 0, VIS}, - {"nmap [s|l|p|*|h]", 0, map, C_MOD, VIS}, + {"nmap [s|l|n|p|*|h]", 0, map, C_MOD, VIS}, {"nuke ", 0, nuke, 0, NORM}, {"offer [ ]", 1, offe, C_MOD, NORM + MONEY + CAP}, @@ -179,13 +180,13 @@ struct cmndstr player_coms[] = { 3, para, C_MOD, NORM + MONEY + CAP}, {"path ", 0, path, 0, NORM}, {"payoff ", 0, payo, C_MOD, NORM}, - {"pbmap [s|l|p|r|t|*|h]", 0, map, C_MOD, NORM}, + {"pbmap [s|l|n|p|r|t|*|h]", 0, map, C_MOD, NORM}, {"pboard ", 3, pboa, C_MOD, NORM + MONEY + CAP}, {"pdump []", 0, pdump, 0, NORM}, {"peek ", 0, peek, 0, GOD}, {"plane ", 0, plan, 0, NORM}, {"players", 0, play, 0, VIS}, - {"pmap [s|l|p|*|h]", 0, map, C_MOD, NORM}, + {"pmap [s|l|n|p|*|h]", 0, map, C_MOD, NORM}, {"power [[\"new\" []] | [\"country\" ]]", 0, powe, C_MOD, VIS}, {"pray", 0, tele, C_MOD, NORM}, @@ -213,7 +214,7 @@ struct cmndstr player_coms[] = { {"sail ", 1, sail, C_MOD, NORM + CAP}, {"satellite [ [?cond&cond&...]]", 1, sate, 0, NORM + MONEY + CAP}, - {"sbmap [s|l|p|r|t|*|h]", 0, map, C_MOD, NORM}, + {"sbmap [s|l|n|p|r|t|*|h]", 0, map, C_MOD, NORM}, {"scrap ", 2, scra, C_MOD, NORM + MONEY + CAP}, {"scuttle ", 5, scut, C_MOD, NORM + CAP}, @@ -232,7 +233,7 @@ struct cmndstr player_coms[] = { {"shutdown [] ", 0, shut, 0, GOD}, {"sinfrastructure ", 0, sinfra, 0, VIS}, {"skywatch ", 1, skyw, C_MOD, NORM + CAP}, - {"smap [s|l|p|*|h]", 0, map, C_MOD, NORM}, + {"smap [s|l|n|p|*|h]", 0, map, C_MOD, NORM}, {"sonar ", 1, sona, C_MOD, NORM + CAP}, {"sorder ", 0, sorde, C_MOD, NORM + CAP}, {"spy ", 1, spy, C_MOD, NORM + CAP},