Show packing type instead of selected bonuses in show se s

show_sect_stats() used to show packing bonuses for military,
uncompensated workers, civilians, bars and lcms.  The bonus for lcms
was labelled "other", which was okay only as long as all other
commodities receive the same packing bonuses.

Show packing bonus type instead.  The actual bonus for each commodity
and packing type is already shown by show item.  But change its header
for the NPKG column from "rg" to "no", because packing type NPKG is
shown by show se s as "normal".

diff --git a/info/Item-types.t b/info/Item-types.t
index 4b5561a1ecbab77f46fd932d690ac8868503842d..35176c1f3119669d225e5eb64c50fd31e35aca29 100644 (file)
--- a/info/Item-types.t
+++ b/info/Item-types.t
@@ -9,9 +9,8 @@ The show command displays the detailed characteristics of items.
 .s1
 .EX show item
 .NF
-Printing for tech level '344'
 item value sell lbs    packing     melt  item
-mnem                in rg wh ur bk deno  name
+mnem                in no wh ur bk deno  name
    c     1   no   1  1 10 10 10 10    4  civilians
    m     0   no   1  1  1  1  1  1   20  military
    s     5  yes   1  1  1 10  1  1   80  shells
@@ -42,8 +41,8 @@ The weight of the item, which determines how much mobility it takes to
 move it.
 .L "packing in"
 The packing bonus the item receives in inefficient (<60%) sectors.
-.L "packing rg"
-The packing bonus the item receives in regular sectors.
+.L "packing no"
+The packing bonus the item receives in normal sectors.
 .L "packing wh"
 The packing bonus the item receives in warehouse sectors.
 .L "packing ur"

diff --git a/info/Sector-types.t b/info/Sector-types.t
index b410e3c7c8597f07050a5a8d0fe4c8dd15a5cb63..3e8f5d25240c3d425dd3a603c43d14f3122e7991 100644 (file)
--- a/info/Sector-types.t
+++ b/info/Sector-types.t
@@ -265,42 +265,42 @@ sectors.  See \*Qinfo Infrastructure\*U for details.
 To check out various stats, you do:
 .EX show sect stats
 .NF
-                        mob cost   max   max   --  packing bonus  --   max
-  sector type            0% 100%   off   def   mil  uw civ bar other   pop
-\&. sea                    no way    0.00  0.00     1   1  10   1     1     0
-^ mountain              2.4  1.2   1.00  4.00     1   1  10   1     1   100
-s sanctuary              no way    0.00 99.00     1   1  10   1     1  1000
-\e wasteland              no way    0.00 99.00     1   1  10   1     1     0
-- wilderness            0.4  0.4   1.00  2.00     1   1  10   1     1  1000
-c capital               0.4  0.2   1.00  2.00     1   1  10   1     1  1000
-u uranium mine          0.4  0.2   1.00  2.00     1   1  10   1     1  1000
-p park                  0.4  0.2   1.00  1.50     1   1  10   1     1  1000
-d defense plant         0.4  0.2   1.00  1.50     1   1  10   1     1  1000
-i shell industry        0.4  0.2   1.00  1.50     1   1  10   1     1  1000
-m mine                  0.4  0.2   1.00  2.00     1   1  10   1     1  1000
-g gold mine             0.4  0.2   1.00  2.00     1   1  10   1     1  1000
-h harbor                0.4  0.2   1.00  1.50     1   2  10   5    10  1000
-w warehouse             0.4  0.2   1.00  1.50     1   2  10   5    10  1000
-* airfield              0.4  0.2   1.00  1.25     1   1  10   1     1  1000
-a agribusiness          0.4  0.2   1.00  1.50     1   1  10   1     1  1000
-o oil field             0.4  0.2   1.00  1.50     1   1  10   1     1  1000
-j light manufacturing   0.4  0.2   1.00  1.50     1   1  10   1     1  1000
-k heavy manufacturing   0.4  0.2   1.00  1.50     1   1  10   1     1  1000
-f fortress              0.4  0.2   2.00  4.00     1   1  10   1     1  1000
-t technical center      0.4  0.2   1.00  1.50     1   1  10   1     1  1000
-r research lab          0.4  0.2   1.00  1.50     1   1  10   1     1  1000
-n nuclear plant         0.4  0.2   1.00  2.00     1   1  10   1     1  1000
-l library/school        0.4  0.2   1.00  1.50     1   1  10   1     1  1000
-+ highway               0.4  0.0   1.00  1.00     1   1  10   1     1  1000
-) radar installation    0.4  0.2   1.00  1.50     1   1  10   1     1  1000
-! headquarters          0.4  0.2   1.00  1.50     1   1  10   1     1  1000
-# bridge head           0.4  0.0   1.00  1.00     1   1  10   1     1  1000
-= bridge span           0.4  0.0   1.00  1.00     1   1  10   1     1   100
-b bank                  0.4  0.2   1.00  2.25     1   1  10   4     1  1000
-% refinery              0.4  0.2   1.00  1.50     1   1  10   1     1  1000
-e enlistment center     0.4  0.2   1.00  2.00     1   1  10   1     1  1000
-~ plains                0.4  0.2   1.00  1.50     1   1  10   1     1   100
-@ bridge tower          0.4  0.0   1.00  1.50     1   1  10   1     1   100
+                        mob cost   max   max     packing   max
+  sector type            0% 100%   off   def       bonus   pop
+\&. sea                    no way    0.00  0.00     normal     0
+^ mountain              2.4  1.2   1.00  4.00     normal   100
+s sanctuary              no way    0.00 99.00     normal  1000
+\e wasteland              no way    0.00 99.00     normal     0
+- wilderness            0.4  0.4   1.00  2.00     normal  1000
+c capital               0.4  0.2   1.00  2.00     normal  1000
+u uranium mine          0.4  0.2   1.00  2.00     normal  1000
+p park                  0.4  0.2   1.00  1.50     normal  1000
+d defense plant         0.4  0.2   1.00  1.50     normal  1000
+i shell industry        0.4  0.2   1.00  1.50     normal  1000
+m mine                  0.4  0.2   1.00  2.00     normal  1000
+g gold mine             0.4  0.2   1.00  2.00     normal  1000
+h harbor                0.4  0.2   1.00  1.50  warehouse  1000
+w warehouse             0.4  0.2   1.00  1.50  warehouse  1000
+* airfield              0.4  0.2   1.00  1.25     normal  1000
+a agribusiness          0.4  0.2   1.00  1.50     normal  1000
+o oil field             0.4  0.2   1.00  1.50     normal  1000
+j light manufacturing   0.4  0.2   1.00  1.50     normal  1000
+k heavy manufacturing   0.4  0.2   1.00  1.50     normal  1000
+f fortress              0.4  0.2   2.00  4.00     normal  1000
+t technical center      0.4  0.2   1.00  1.50     normal  1000
+r research lab          0.4  0.2   1.00  1.50     normal  1000
+n nuclear plant         0.4  0.2   1.00  2.00     normal  1000
+l library/school        0.4  0.2   1.00  1.50     normal  1000
++ highway               0.4  0.0   1.00  1.00     normal  1000
+) radar installation    0.4  0.2   1.00  1.50     normal  1000
+! headquarters          0.4  0.2   1.00  1.50     normal  1000
+# bridge head           0.4  0.0   1.00  1.00     normal  1000
+= bridge span           0.4  0.0   1.00  1.00     normal   100
+b bank                  0.4  0.2   1.00  2.25       bank  1000
+% refinery              0.4  0.2   1.00  1.50     normal  1000
+e enlistment center     0.4  0.2   1.00  2.00     normal  1000
+~ plains                0.4  0.2   1.00  1.50     normal   100
+@ bridge tower          0.4  0.0   1.00  1.50     normal   100
 .FI
 The two mob cost columns show the relative cost to move through such
 sectors at 0% and 100% efficiency.  It changes linearly between 0% and

diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c
index 01a2d4366b0dd48365c2c7765011b517e8aca2e9..e4f1b1ec35d58a8ce0f911b4d9c1bddecd5c9803 100644 (file)
--- a/src/lib/subs/show.c
+++ b/src/lib/subs/show.c
@@ -504,8 +504,8 @@ show_sect_stats(int foo)
        if (dchr[x].d_mnem == 0)
            continue;
        if (first) {
-           pr("                        mob cost   max   max   --  packing bonus  --   max\n");
-           pr("  sector type            0%% 100%%   off   def   mil  uw civ bar other   pop\n");
+           pr("                        mob cost   max   max     packing   max\n");
+           pr("  sector type            0%% 100%%   off   def       bonus   pop\n");
            first = 0;
        }
        pr("%c %-21.21s", dchr[x].d_mnem, dchr[x].d_name);
@@ -513,13 +513,9 @@ show_sect_stats(int foo)
            pr("  no way ");
        else
            pr(" %3.1f  %3.1f", dchr[x].d_mob0, dchr[x].d_mob1);
-       pr("  %5.2f %5.2f   %3d %3d %3d %3d %5d %5d\n",
+       pr("  %5.2f %5.2f %10.10s %5d\n",
           dchr[x].d_ostr, dchr[x].d_dstr,
-          ichr[I_MILIT].i_pkg[dchr[x].d_pkg],
-          ichr[I_UW].i_pkg[dchr[x].d_pkg],
-          ichr[I_CIVIL].i_pkg[dchr[x].d_pkg],
-          ichr[I_BAR].i_pkg[dchr[x].d_pkg],
-          ichr[I_LCM].i_pkg[dchr[x].d_pkg],
+          symbol_by_value(dchr[x].d_pkg, packing),
           max_population(natp->nat_level[NAT_RLEV], x, 100));
     }
 }
@@ -589,7 +585,7 @@ show_item(int tlev)
     struct ichrstr *ip;
 
     pr("item value sell lbs    packing     melt  item\n");
-    pr("mnem                in rg wh ur bk deno  name\n");
+    pr("mnem                in no wh ur bk deno  name\n");
 
     for (ip = ichr; ip->i_name; ip++) {
        pr("   %c %5d %4s %3d %2d %2d %2d %2d %2d %4d  %s\n",