(show_nuke_build, show_nuke_capab): Column res used to be shown only

with DRNUKE.  Show it always.

diff --git a/info/Nuke-types.t b/info/Nuke-types.t
index 20d970d3746f7a00d506b35d125164a64061e1bb..9eec5672575ef35cacbdb4b8f61806fef38b9510 100644 (file)
--- a/info/Nuke-types.t
+++ b/info/Nuke-types.t
@@ -48,26 +48,20 @@ device carrying capacity.
 As a guide (these numbers are subject to change):
 .EX show nuke build
 .NF
-        lcm hcm  oil  rad tech $
-10kt fission   50  50   25   50  200 $7500
-50kt fission   60  60   30   75  225 $9000
-100kt fission  75  75   40  100  250 $12000
-250kt fusion   50  50   25   50  280 $7500
-500kt fusion   60  60   30   75  295 $9000
-1mt fusion     75  75   50  100  310 $12000
-3mt fusion    100 100   75  127  325 $19000
+Printing for tech level '300'
+              lcm hcm  oil  rad avail tech res $
+10kt  fission  50  50   25   70    49  280   0 $ 10000
+15kt  fission  50  50   25   80    51  290   0 $ 15000
+50kt  fission  60  60   30   90    60  300   0 $ 25000
 .FI
 .s1
 .EX show nuke capab
 .NF
-        blst dam lbs tech $
-10kt fission     3  80   4  200 $7500
-50kt fission     3 100   6  225 $9000
-100kt fission    4 120   8  250 $12000
-250kt fusion     4 150   4  280 $7500
-500kt fusion     5 170   6  295 $9000
-1mt fusion       6 190   8  310 $12000
-3mt fusion       7 210  10  325 $19000
+Printing for tech level '300'
+              blst dam lbs tech res $        abilities
+10kt  fission    3  70   4  280   0 $  10000
+15kt  fission    3  90   5  290   0 $  15000
+50kt  fission    3 100   6  300   0 $  25000
 .FI
 .s1
 The larger the megatonnage, the more damage done by the weapon.

diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c
index 77d9472c5427f871ad72e822ee66383195571fa6..4dbd01a31bce658d9d9a2bcc28f1d3050873ee2c 100644 (file)
--- a/src/lib/subs/show.c
+++ b/src/lib/subs/show.c
@@ -166,24 +166,17 @@ show_nuke_build(int tlev)
     struct nchrstr *np;
     int avail;
 
-    if (opt_DRNUKE)
-       pr("%13s lcm hcm  oil  rad avail tech res $\n", "");
-    else
-       pr("%13s lcm hcm  oil  rad avail tech $\n", "");
+    pr("%13s lcm hcm  oil  rad avail tech res $\n", "");
 
     for (np = nchr; np->n_name; np++) {
        avail = NUK_BLD_WORK(np->n_lcm, np->n_hcm, np->n_oil, np->n_rad);
        if (np->n_tech > tlev)
            continue;
-       if (opt_DRNUKE)
-           pr("%-13.13s %3d %3d %4d %4d %5d %4d %3d $%6d\n",
-              np->n_name, np->n_lcm, np->n_hcm, np->n_oil,
-              np->n_rad, avail, np->n_tech,
-              (int)(np->n_tech * drnuke_const) + 1, np->n_cost);
-       else
-           pr("%-13.13s %3d %3d %4d %4d %5d %4d $%6d\n",
-              np->n_name, np->n_lcm, np->n_hcm, np->n_oil,
-              np->n_rad, avail, np->n_tech, np->n_cost);
+       pr("%-13.13s %3d %3d %4d %4d %5d %4d %3d $%6d\n",
+          np->n_name, np->n_lcm, np->n_hcm, np->n_oil,
+          np->n_rad, avail, np->n_tech,
+          opt_DRNUKE ? (int)(np->n_tech * drnuke_const) + 1 : 0,
+          np->n_cost);
     }
 }
 
@@ -194,24 +187,16 @@ show_nuke_capab(int tlev)
     int i, j;
     char *p;
 
-    if (opt_DRNUKE)
-       pr("%13s blst dam lbs tech res $%7s abilities\n", "", "");
-    else
-       pr("%13s blst dam lbs tech $%7s abilities\n", "", "");
+    pr("%13s blst dam lbs tech res $%7s abilities\n", "", "");
 
     for (np = nchr; np->n_name; np++) {
        if (np->n_tech > tlev)
            continue;
-       if (opt_DRNUKE)
-           pr("%-13.13s %4d %3d %3d %4d %3d $%7d ",
-              np->n_name, np->n_blast, np->n_dam,
-              np->n_weight, np->n_tech,
-              (int)(np->n_tech * drnuke_const) + 1, np->n_cost);
-       else                    /* not DRNUKE */
-           pr("%-13.13s %4d %3d %3d %4d $%7d ",
-              np->n_name, np->n_blast, np->n_dam,
-              np->n_weight, np->n_tech, np->n_cost);
-
+       pr("%-13.13s %4d %3d %3d %4d %3d $%7d ",
+          np->n_name, np->n_blast, np->n_dam,
+          np->n_weight, np->n_tech,
+          opt_DRNUKE ? (int)(np->n_tech * drnuke_const) + 1 : 0,
+          np->n_cost);
        for (i = j = 0; i < 32; i++) {
            if (!(np->n_flags & bit(i)))
                continue;