(plan): Condense columns LSB and nuke into column special. Rename

column s/l to carry.

diff --git a/info/plane.t b/info/plane.t
index 7f6e7deb548aa7a5cacf9fe8987f1447d11377d6..f37acb1f1cdb1a07266ff96b12f8f727dfa8b401 100644 (file)
--- a/info/plane.t
+++ b/info/plane.t
@@ -1,19 +1,12 @@
 .TH Command PLANE
-.NA plane "Report status of plane, wing or planes in a give area"
+.NA plane "Report status of planes"
 .LV Basic
-.SY "plane [<PLANE> | <SECTS>]"
-The plane report command is a census of your planes
-and lists all the information available in readable format.
-.s1
-The <PLANE> and <SECTS> arguments are provided in case you only
-wish to look at one plane
-or all planes within a given area.
-.s1
-Plane expects some argument.  To see all planes, use the
-argument '*', or enter "plane *".
+.SY "plane <PLANES>"
+The plane report command is a census of your planes and lists all the
+information available in readable format.  For example:
 .EX plane *
 .NF
-   #    type                x,y    w  eff  mu def tech ran hard   s/l LSB nuke
+   #    type                x,y    w  eff  mu def tech ran hard carry special
    0 f2  P-51 Mustang       1,-1     100%  90   5  110  11    0
    1 f2  P-51 Mustang       1,-1     100%  90   5  110  11    0
    3 lb  TBD-1 Devastato    1,-1     100%  90   4  120  11    0
@@ -26,29 +19,27 @@ The report format contains the following fields:
 .L #
 the plane number
 .L type
-the type of plane; \*Qfighter 1\*U, \*Qjet hvy bomber\*U, etc,
+the type of plane; \*Qfighter 1\*U, \*Qjet hvy bomber\*U, etc.,
 .L x,y
-the plane's current location (relative to your capital),
+the plane's current location
 .L w
-the \*Qair wing\*U designation letter,
+the \*Qair wing\*U designation letter (set by \*Qwingadd\*U command),
 .L eff
 the plane's efficiency,
 .L mu
 the number of mobility points the plane has,
-.L att
-the attack value of the plane (for air-to-air combat)
+.L def
+the defense value of the plane (for air-to-air combat)
 .L tech
 the tech level at which it was created,
 .L range
-and the range (in sectors) it can fly on a given mission.
-.L s/l
+and the range (in sectors) it can fly in one sortie,
+.L carry
 the ship or land unit the plane is on
-.L LSB
-For satellites, LS stands for "launched?" and "Geo-synchroneous orbit?".
-For planes or missiles armed with nukes, B will either have the value 
-"A" for airburst, or "G" for groundburst (see info arm).
-.L nuke
-the type of nuke carried
+.L special
+shows \*Qorbit\*U or \*Qgeosync\*U for satellites in (geo-synchronous)
+orbit, else nuclear armament type and programming (\*QA\*U for
+air burst, \*QG\*U for ground burst; see info \*Qarm\*U).
 .in
 .s1
 .SA "pstat, upgrade, arm, bomb, build, drop, fly, launch, paradrop, recon, satellite, scrap, wingadd, Planes"

diff --git a/src/lib/commands/plan.c b/src/lib/commands/plan.c
index d1bfd05e1c1c65d77d4f3de5f9074ce0f9b708f3..b501bf8d3f5eb156d69e76c50da93fcdce4545e9 100644 (file)
--- a/src/lib/commands/plan.c
+++ b/src/lib/commands/plan.c
@@ -30,6 +30,7 @@
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Steve McClure, 2000
+ *     Markus Armbruster, 2006
  */
 
 #include <config.h>
@@ -59,7 +60,7 @@ plan(void)
        if (nplanes++ == 0) {
            if (player->god)
                pr("own ");
-           pr("   #    type                x,y    w  eff  mu def tech ran hard   s/l LSB nuke\n");
+           pr("   #    type                x,y    w  eff  mu def tech ran hard carry special\n");
        }
        if (player->god)
            pr("%3d ", plane.pln_own);
@@ -75,15 +76,14 @@ plan(void)
            pr("%5dL", plane.pln_land);
        else
            pr("      ");
-       if ((plchr[(int)plane.pln_type].pl_flags & (P_O | P_M)) == P_O) {
-           pr(" %c", (plane.pln_flags & PLN_LAUNCHED) ? 'Y' : 'N');
-           pr("%c", (plane.pln_flags & PLN_SYNCHRONOUS) ? 'Y' : 'N');
-       } else
-           pr("  ");
-       if (plane.pln_nuketype != -1)
-           pr(" %c %-5.5s",
-              plane.pln_flags & PLN_AIRBURST ? 'A' : 'G',
-              nchr[(int)plane.pln_nuketype].n_name);
+       if (plane.pln_flags & PLN_SYNCHRONOUS)
+           pr(" geosync");
+       else if (plane.pln_flags & PLN_LAUNCHED)
+           pr(" orbit");
+       else if (plane.pln_nuketype >= 0)
+           pr(" %-5.5s %c",
+              nchr[(int)plane.pln_nuketype].n_name,
+              plane.pln_flags & PLN_AIRBURST ? 'A' : 'G');
        pr("\n");
     }