X-Git-Url: http://git.pond.sub.org/?p=empserver;a=blobdiff_plain;f=src%2Flib%2Fsubs%2Fshow.c;h=bab48c074763f9677fb935a635d59d28819564b6;hp=3c136f77b5e29e8607d71a876be7ee57b381d955;hb=1307a3be6;hpb=08b94556826ec883ab68c736ad8494118511446c

diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c
index 3c136f77b..bab48c074 100644
--- a/src/lib/subs/show.c
+++ b/src/lib/subs/show.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -31,8 +30,8 @@
  *     Julian Onions, 1988
  *     Jeff Bailey, 1990
  *     Steve McClure, 1996
- *     Ron Koenderink, 2005
- *     Markus Armbruster, 2006-2008
+ *     Ron Koenderink, 2005-2009
+ *     Markus Armbruster, 2006-2016
  */
 
 #include <config.h>
@@ -55,80 +54,105 @@
 #include "ship.h"
 
 static char *fmttime2822(time_t);
+static void show_load(short[]);
+static void show_capab(int, struct symbol *);
 
-struct look_list {
-    union {
-	struct lchrstr *lp;
-	struct plchrstr *pp;
-	struct mchrstr *mp;
-    } l_u;
+struct chr_index {
+    int type;
     int tech;
 };
 
-/*
- * Change this if there are ever more than 200 ships, plane or land
- * unit types.
- */
-static struct look_list lookup_list[200];
-static int lookup_list_cnt = 0;
+static int
+chr_index_cmp(const void *a, const void *b)
+{
+    const struct chr_index *ca = a, *cb = b;
+    if (ca->tech == cb->tech)
+	return ca->type - cb->type;
+    return ca->tech - cb->tech;
+}
 
-static void
-sort_lookup_list(void)
+static int
+make_mchr_index(struct chr_index chridx[], int tlev)
 {
-    struct natstr *np = getnatp(player->cnum);
-    struct look_list tmp;
-    int i;
-    int j;
+    struct natstr *natp = getnatp(player->cnum);
+    int i, n;
 
-    if (!(np->nat_flags & NF_TECHLISTS))
-	return;
-    for (i = 0; i < lookup_list_cnt; i++) {
-	for (j = i; j < lookup_list_cnt; j++) {
-	    if (lookup_list[j].tech < lookup_list[i].tech) {
-		tmp = lookup_list[j];
-		lookup_list[j] = lookup_list[i];
-		lookup_list[i] = tmp;
-	    }
-	}
+    n = 0;
+    for (i = 0; mchr[i].m_name; i++) {
+	if (!mchr[i].m_name[0])
+	    continue;
+	if (mchr[i].m_tech > tlev)
+	    continue;
+	chridx[n].type = i;
+	chridx[n].tech = mchr[i].m_tech;
+	n++;
     }
+    if (natp->nat_flags & NF_TECHLISTS)
+	qsort(chridx, n, sizeof(*chridx), chr_index_cmp);
+    return n;
 }
 
-static void
-make_new_list(int tlev, int type)
+static int
+make_plchr_index(struct chr_index chridx[], int tlev)
 {
-    struct plchrstr *pp;
-    struct lchrstr *lp;
-    struct mchrstr *mp;
+    struct natstr *natp = getnatp(player->cnum);
+    int i, n;
 
-    lookup_list_cnt = 0;
-    if (type == EF_PLANE) {
-	for (pp = plchr; pp->pl_name; pp++) {
-	    if (pp->pl_tech > tlev)
-		continue;
-	    lookup_list[lookup_list_cnt].l_u.pp = pp;
-	    lookup_list[lookup_list_cnt].tech = pp->pl_tech;
-	    lookup_list_cnt++;
-	}
-    } else if (type == EF_SHIP) {
-	for (mp = mchr; mp->m_name; mp++) {
-	    if (mp->m_tech > tlev)
-		continue;
-	    lookup_list[lookup_list_cnt].l_u.mp = mp;
-	    lookup_list[lookup_list_cnt].tech = mp->m_tech;
-	    lookup_list_cnt++;
-	}
-    } else if (type == EF_LAND) {
-	for (lp = lchr; lp->l_name; lp++) {
-	    if (lp->l_tech > tlev)
-		continue;
-	    lookup_list[lookup_list_cnt].l_u.lp = lp;
-	    lookup_list[lookup_list_cnt].tech = lp->l_tech;
-	    lookup_list_cnt++;
-	}
-    } else
-	return;
+    n = 0;
+    for (i = 0; plchr[i].pl_name; i++) {
+	if (!plchr[i].pl_name[0])
+	    continue;
+	if (plchr[i].pl_tech > tlev)
+	    continue;
+	chridx[n].type = i;
+	chridx[n].tech = plchr[i].pl_tech;
+	n++;
+    }
+    if (natp->nat_flags & NF_TECHLISTS)
+	qsort(chridx, n, sizeof(*chridx), chr_index_cmp);
+    return n;
+}
 
-    sort_lookup_list();
+static int
+make_lchr_index(struct chr_index chridx[], int tlev)
+{
+    struct natstr *natp = getnatp(player->cnum);
+    int i, n;
+
+    n = 0;
+    for (i = 0; lchr[i].l_name; i++) {
+	if (!lchr[i].l_name[0])
+	    continue;
+	if (lchr[i].l_tech > tlev)
+	    continue;
+	chridx[n].type = i;
+	chridx[n].tech = lchr[i].l_tech;
+	n++;
+    }
+    if (natp->nat_flags & NF_TECHLISTS)
+	qsort(chridx, n, sizeof(*chridx), chr_index_cmp);
+    return n;
+}
+
+static int
+make_nchr_index(struct chr_index chridx[], int tlev)
+{
+    struct natstr *natp = getnatp(player->cnum);
+    int i, n;
+
+    n = 0;
+    for (i = 0; nchr[i].n_name; i++) {
+	if (!nchr[i].n_name[0])
+	    continue;
+	if (nchr[i].n_tech > tlev)
+	    continue;
+	chridx[n].type = i;
+	chridx[n].tech = nchr[i].n_tech;
+	n++;
+    }
+    if (natp->nat_flags & NF_TECHLISTS)
+	qsort(chridx, n, sizeof(*chridx), chr_index_cmp);
+    return n;
 }
 
 void
@@ -148,7 +172,7 @@ show_tower(int tlev)
 {
     if (tlev < buil_tower_bt)
 	return;
-    pr("Bridge Towers require %g tech, %d hcm, 0 workers,\n",
+    pr("Bridge towers require %g tech, %d hcm, 0 workers,\n",
        buil_tower_bt, buil_tower_bh);
     pr("%d available workforce, and cost $%g\n",
        (SCT_BLD_WORK(0, buil_tower_bh) * SCT_MINEFF + 99) / 100,
@@ -164,18 +188,18 @@ show_nuke_stats(int tlev)
 void
 show_nuke_build(int tlev)
 {
+    struct chr_index chridx[sizeof(nchr) / sizeof(*nchr)];
+    int n = make_nchr_index(chridx, tlev);
+    int i;
     struct nchrstr *np;
-    int avail;
 
     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;
+    for (i = 0; i < n; i++) {
+	np = &nchr[chridx[i].type];
 	pr("%-13.13s %3d %3d %4d %4d %5d %4d %3.0f $%6d\n",
-	   np->n_name, np->n_lcm, np->n_hcm, np->n_oil,
-	   np->n_rad, avail, np->n_tech,
+	   np->n_name, np->n_mat[I_LCM], np->n_mat[I_HCM],
+	   np->n_mat[I_OIL], np->n_mat[I_RAD], np->n_bwork, np->n_tech,
 	   drnuke_const > MIN_DRNUKE_CONST ?
 		ceil(np->n_tech * drnuke_const) : 0.0,
 	   np->n_cost);
@@ -185,30 +209,21 @@ show_nuke_build(int tlev)
 void
 show_nuke_capab(int tlev)
 {
+    struct chr_index chridx[sizeof(nchr) / sizeof(*nchr)];
+    int n = make_nchr_index(chridx, tlev);
+    int i;
     struct nchrstr *np;
-    int i, j;
-    char *p;
 
     pr("%13s blst dam lbs tech res $%7s abilities\n", "", "");
-
-    for (np = nchr; np->n_name; np++) {
-	if (np->n_tech > tlev)
-	    continue;
-	pr("%-13.13s %4d %3d %3d %4d %3.0f $%7d ",
+    for (i = 0; i < n; i++) {
+	np = &nchr[chridx[i].type];
+	pr("%-13.13s %4d %3d %3d %4d %3.0f $%7d",
 	   np->n_name, np->n_blast, np->n_dam,
 	   np->n_weight, np->n_tech,
 	   drnuke_const > MIN_DRNUKE_CONST ?
 		ceil(np->n_tech * drnuke_const) : 0.0,
 	   np->n_cost);
-	for (i = j = 0; i < 32; i++) {
-	    if (!(np->n_flags & bit(i)))
-		continue;
-	    if (NULL != (p = symbol_by_value(bit(i), nuke_chr_flags))) {
-		if (j++ > 0)
-		    pr(" ");
-		pr("%s", p);
-	    }
-	}
+	show_capab(np->n_flags, nuke_chr_flags);
 	pr("\n");
     }
 }
@@ -216,93 +231,55 @@ show_nuke_capab(int tlev)
 void
 show_ship_build(int tlev)
 {
+    struct chr_index chridx[sizeof(mchr) / sizeof(*mchr)];
+    int n = make_mchr_index(chridx, tlev);
+    int i;
     struct mchrstr *mp;
-    int n;
 
     pr("%25s lcm hcm avail tech $\n", "");
-    make_new_list(tlev, EF_SHIP);
-    for (n = 0; n < lookup_list_cnt; n++) {
-	mp = (struct mchrstr *)lookup_list[n].l_u.mp;
-	/* Can't show trade ships unless it's turned on */
-	if ((mp->m_flags & M_TRADE) && !opt_TRADESHIPS)
-	    continue;
-
+    for (i = 0; i < n; i++) {
+	mp = &mchr[chridx[i].type];
 	pr("%-25.25s %3d %3d %5d %4d $%d\n",
-	   mp->m_name, mp->m_lcm, mp->m_hcm,
-	   SHP_BLD_WORK(mp->m_lcm, mp->m_hcm), mp->m_tech, mp->m_cost);
+	   mp->m_name, mp->m_mat[I_LCM], mp->m_mat[I_HCM],
+	   mp->m_bwork, mp->m_tech, mp->m_cost);
     }
 }
 
 void
 show_ship_stats(int tlev)
 {
+    struct chr_index chridx[sizeof(mchr) / sizeof(*mchr)];
+    int n = make_mchr_index(chridx, tlev);
+    int i;
     struct mchrstr *mp;
-    int scount;
-
-    pr("%25s      s  v  s  r  f  l  p  h  x", "");
-    pr("\n");
 
-    pr("%25s      p  i  p  n  i  n  l  e  p", "");
-    pr("\n");
-
-    pr("%25s def  d  s  y  g  r  d  n  l  l", "");
-    pr("\n");
-
-
-    make_new_list(tlev, EF_SHIP);
-    for (scount = 0; scount < lookup_list_cnt; scount++) {
-	mp = (struct mchrstr *)lookup_list[scount].l_u.mp;
-	/* Can't show trade ships unless it's turned on */
-	if ((mp->m_flags & M_TRADE) && !opt_TRADESHIPS)
-	    continue;
-
-	pr("%-25.25s %3d %2d %2d %2d %2d %2d ",
+    pr("%25s      s  v  s  r  f  l  p  h  x\n", "");
+    pr("%25s      p  i  p  n  i  n  l  e  p\n", "");
+    pr("%25s def  d  s  y  g  r  d  n  l  l\n", "");
+    for (i = 0; i < n; i++) {
+	mp = &mchr[chridx[i].type];
+	pr("%-25.25s %3d %2d %2d %2d %2d %2d %2d %2d %2d %2d\n",
 	   mp->m_name, m_armor(mp, tlev), m_speed(mp, tlev),
 	   m_visib(mp, tlev), mp->m_vrnge,
-	   m_frnge(mp, tlev), m_glim(mp, tlev));
-
-	pr("%2d ", mp->m_nland);
-	pr("%2d ", mp->m_nplanes);
-	pr("%2d ", mp->m_nchoppers);
-	pr("%2d ", mp->m_nxlight);
-	pr("\n");
+	   m_frnge(mp, tlev), m_glim(mp, tlev),
+	   mp->m_nland, mp->m_nplanes, mp->m_nchoppers, mp->m_nxlight);
     }
 }
 
 void
 show_ship_capab(int tlev)
 {
+    struct chr_index chridx[sizeof(mchr) / sizeof(*mchr)];
+    int n = make_mchr_index(chridx, tlev);
+    int i;
     struct mchrstr *mp;
-    i_type i;
-    int j;
-    int scount;
-    int n;
-    char *p;
 
     pr("%25s cargos & capabilities\n", "");
-
-    make_new_list(tlev, EF_SHIP);
-    for (scount = 0; scount < lookup_list_cnt; scount++) {
-	mp = (struct mchrstr *)lookup_list[scount].l_u.mp;
-	/* Can't show trade ships unless it's turned on */
-	if ((mp->m_flags & M_TRADE) && !opt_TRADESHIPS)
-	    continue;
-
+    for (i = 0; i < n; i++) {
+	mp = &mchr[chridx[i].type];
 	pr("%-25.25s ", mp->m_name);
-
-	for (i = I_NONE + 1; i <= I_MAX; ++i)
-	    if (mp->m_item[i])
-		pr(" %d%c", mp->m_item[i], ichr[i].i_mnem);
-	pr(" ");
-	for (j = n = 0; j < 32; j++) {
-	    if (!(mp->m_flags & bit(j)))
-		continue;
-	    if (NULL != (p = symbol_by_value(bit(j), ship_chr_flags))) {
-		if (n++ > 0)
-		    pr(" ");
-		pr("%s", p);
-	    }
-	}
+	show_load(mp->m_item);
+	show_capab(mp->m_flags, ship_chr_flags);
 	pr("\n");
     }
 }
@@ -310,46 +287,34 @@ show_ship_capab(int tlev)
 void
 show_plane_stats(int tlev)
 {
+    struct chr_index chridx[sizeof(plchr) / sizeof(*plchr)];
+    int n = make_plchr_index(chridx, tlev);
+    int i;
     struct plchrstr *pp;
-    int pcount;
 
     pr("%25s acc load att def ran fuel stlth\n", "");
-    make_new_list(tlev, EF_PLANE);
-    for (pcount = 0; pcount < lookup_list_cnt; pcount++) {
-	pp = (struct plchrstr *)lookup_list[pcount].l_u.pp;
-	pr("%-25.25s %3d %4d %3d %3d %3d %4d ",
+    for (i = 0; i < n; i++) {
+	pp = &plchr[chridx[i].type];
+	pr("%-25.25s %3d %4d %3d %3d %3d %4d %4d%%\n",
 	   pp->pl_name, pl_acc(pp, tlev), pl_load(pp, tlev),
 	   pl_att(pp, tlev), pl_def(pp, tlev), pl_range(pp, tlev),
-	   pp->pl_fuel);
-	pr("%4d%% ", pp->pl_stealth);
-	pr("\n");
+	   pp->pl_fuel, pp->pl_stealth);
     }
 }
 
 void
 show_plane_capab(int tlev)
 {
-    struct plchrstr *pp;
+    struct chr_index chridx[sizeof(plchr) / sizeof(*plchr)];
+    int n = make_plchr_index(chridx, tlev);
     int i;
-    int pcount;
-    int n;
-    char *p;
+    struct plchrstr *pp;
 
     pr("%25s capabilities\n", "");
-    make_new_list(tlev, EF_PLANE);
-    for (pcount = 0; pcount < lookup_list_cnt; pcount++) {
-	pp = (struct plchrstr *)lookup_list[pcount].l_u.pp;
-	pr("%-25.25s  ", pp->pl_name);
-
-	for (i = n = 0; i < 32; i++) {
-	    if (!(pp->pl_flags & bit(i)))
-		continue;
-	    if (NULL != (p = symbol_by_value(bit(i), plane_chr_flags))) {
-		if (n++ > 0)
-		    pr(" ");
-		pr("%s", p);
-	    }
-	}
+    for (i = 0; i < n; i++) {
+	pp = &plchr[chridx[i].type];
+	pr("%-25.25s ", pp->pl_name);
+	show_capab(pp->pl_flags, plane_chr_flags);
 	pr("\n");
     }
 }
@@ -357,72 +322,54 @@ show_plane_capab(int tlev)
 void
 show_plane_build(int tlev)
 {
+    struct chr_index chridx[sizeof(plchr) / sizeof(*plchr)];
+    int n = make_plchr_index(chridx, tlev);
+    int i;
     struct plchrstr *pp;
-    int pcount;
 
     pr("%25s lcm hcm crew avail tech $\n", "");
-    make_new_list(tlev, EF_PLANE);
-    for (pcount = 0; pcount < lookup_list_cnt; pcount++) {
-	pp = (struct plchrstr *)lookup_list[pcount].l_u.pp;
+    for (i = 0; i < n; i++) {
+	pp = &plchr[chridx[i].type];
 	pr("%-25.25s %3d %3d %4d %5d %4d $%d\n",
-	   pp->pl_name, pp->pl_lcm,
-	   pp->pl_hcm, pp->pl_crew,
-	   PLN_BLD_WORK(pp->pl_lcm, pp->pl_hcm), pp->pl_tech, pp->pl_cost);
+	   pp->pl_name, pp->pl_mat[I_LCM],
+	   pp->pl_mat[I_HCM], pp->pl_mat[I_MILIT],
+	   pp->pl_bwork, pp->pl_tech, pp->pl_cost);
     }
 }
 
 void
 show_land_build(int tlev)
 {
+    struct chr_index chridx[sizeof(lchr) / sizeof(*lchr)];
+    int n = make_lchr_index(chridx, tlev);
+    int i;
     struct lchrstr *lp;
-    int n;
 
     pr("%25s lcm hcm guns avail tech $\n", "");
-    make_new_list(tlev, EF_LAND);
-    for (n = 0; n < lookup_list_cnt; n++) {
-	lp = (struct lchrstr *)lookup_list[n].l_u.lp;
-	if ((lp->l_flags & L_SPY) && !opt_LANDSPIES)
-	    continue;
+    for (i = 0; i < n; i++) {
+	lp = &lchr[chridx[i].type];
 	pr("%-25.25s %3d %3d %4d %5d %4d $%d\n",
-	   lp->l_name, lp->l_lcm,
-	   lp->l_hcm,
-	   lp->l_gun,
-	   LND_BLD_WORK(lp->l_lcm, lp->l_hcm), lp->l_tech, lp->l_cost);
+	   lp->l_name, lp->l_mat[I_LCM],
+	   lp->l_mat[I_HCM],
+	   lp->l_mat[I_GUN],
+	   lp->l_bwork, lp->l_tech, lp->l_cost);
     }
 }
 
 void
 show_land_capab(int tlev)
 {
+    struct chr_index chridx[sizeof(lchr) / sizeof(*lchr)];
+    int n = make_lchr_index(chridx, tlev);
+    int i;
     struct lchrstr *lcp;
-    int lcount;
-    i_type i;
-    int j, n;
-    char *p;
 
     pr("%25s capabilities\n", "");
-
-    make_new_list(tlev, EF_LAND);
-    for (lcount = 0; lcount < lookup_list_cnt; lcount++) {
-	lcp = (struct lchrstr *)lookup_list[lcount].l_u.lp;
-	if ((lcp->l_flags & L_SPY) && !opt_LANDSPIES)
-	    continue;
-
+    for (i = 0; i < n; i++) {
+	lcp = &lchr[chridx[i].type];
 	pr("%-25s ", lcp->l_name);
-
-	for (i = I_NONE + 1; i <= I_MAX; ++i)
-	    if (lcp->l_item[i])
-		pr(" %d%c", lcp->l_item[i], ichr[i].i_mnem);
-	pr(" ");
-	for (j = n = 0; j < 32; j++) {
-	    if (!(lcp->l_flags & bit(j)))
-		continue;
-	    if (NULL != (p = symbol_by_value(bit(j), land_chr_flags))) {
-		if (n++ > 0)
-		    pr(" ");
-		pr("%s", p);
-	    }
-	}
+	show_load(lcp->l_item);
+	show_capab(lcp->l_flags, land_chr_flags);
 	pr("\n");
     }
 }
@@ -430,61 +377,65 @@ show_land_capab(int tlev)
 void
 show_land_stats(int tlev)
 {
+    struct chr_index chridx[sizeof(lchr) / sizeof(*lchr)];
+    int n = make_lchr_index(chridx, tlev);
+    int i;
     struct lchrstr *lcp;
-    int lcount;
 
     pr("%25s              s  v  s  r  r  a  f  a  a  x  l\n", "");
     pr("%25s              p  i  p  a  n  c  i  m  a  p  n\n", "");
     pr("%25s att def vul  d  s  y  d  g  c  r  m  f  l  d\n", "");
-
-    make_new_list(tlev, EF_LAND);
-    for (lcount = 0; lcount < lookup_list_cnt; lcount++) {
-	lcp = (struct lchrstr *)lookup_list[lcount].l_u.lp;
-	if ((lcp->l_flags & L_SPY) && !opt_LANDSPIES)
-	    continue;
-
-	pr("%-25s %1.1f %1.1f %3d ",
+    for (i = 0; i < n; i++) {
+	lcp = &lchr[chridx[i].type];
+	pr("%-25s %1.1f %1.1f %3d %2d %2d %2d %2d %2d %2d %2d %2d %2d"
+	   " %2d %2d\n",
 	   lcp->l_name,
-	   l_att(lcp, tlev), l_def(lcp, tlev), l_vul(lcp, tlev));
-	pr("%2d %2d %2d %2d ",
-	   l_spd(lcp, tlev), lcp->l_vis, lcp->l_spy, lcp->l_rad);
-	pr("%2d %2d %2d %2d %2d ",
+	   l_att(lcp, tlev), l_def(lcp, tlev), l_vul(lcp, tlev),
+	   l_spd(lcp, tlev), lcp->l_vis, lcp->l_spy, lcp->l_rad,
 	   l_frg(lcp, tlev), l_acc(lcp, tlev), l_dam(lcp, tlev),
-	   lcp->l_ammo, lcp->l_aaf);
-	pr("\n");
+	   lcp->l_ammo, lcp->l_aaf, lcp->l_nxlight, lcp->l_nland);
     }
 }
 
 void
 show_sect_build(int foo)
 {
-    int x, first;
+    int i, first;
 
-    pr("sector type    cost to des    cost for 1%% eff   lcms for 1%%    hcms for 1%%\n");
-    for (x = 0; dchr[x].d_name; x++) {
-	if (dchr[x].d_mnem == 0)
+    pr("                        desig   build 100%% eff  maint\n"
+       "sector type                 $   lcm  hcm     $      $\n");
+    for (i = 0; dchr[i].d_name; i++) {
+	if (dchr[i].d_mnem == 0)
 	    continue;
-	if (dchr[x].d_cost < 0)
+	if (dchr[i].d_mob0 < 0)
 	    continue;
-	if ((dchr[x].d_cost > 0) || (dchr[x].d_build != 1) ||
-	    (dchr[x].d_lcms > 0) || (dchr[x].d_hcms > 0)) {
-	    pr("%-14c %-14d %-17d %-14d %d\n",
-	       dchr[x].d_mnem, dchr[x].d_cost, dchr[x].d_build,
-	       dchr[x].d_lcms, dchr[x].d_hcms);
-	}
+	if (dchr[i].d_cost <= 0 && dchr[i].d_build == 1
+	    && dchr[i].d_lcms == 0 && dchr[i].d_hcms == 0
+	    && dchr[i].d_maint == 0)
+	    continue;		/* the usual, skip */
+	pr("%c %-21.21s", dchr[i].d_mnem, dchr[i].d_name);
+	if (dchr[i].d_cost < 0)
+	    pr(" can't");
+	else
+	    pr(" %5d", dchr[i].d_cost);
+	pr(" %5d%5d %5d  %5d\n",
+	   100 * dchr[i].d_lcms,
+	   100 * dchr[i].d_hcms,
+	   100 * dchr[i].d_build,
+	   dchr[i].d_maint * etu_per_update);
     }
-    pr("other          0              1                 0              0\n");
+    pr("any other                   0     0    0   100      0\n");
 
     first = 1;
-    for (x = 0; intrchr[x].in_name; x++) {
-	if (!intrchr[x].in_enable)
+    for (i = 0; intrchr[i].in_name; i++) {
+	if (!intrchr[i].in_enable)
 	    continue;
 	if (first)
 	    pr("\nInfrastructure building - adding 1 point of efficiency costs:\n"
 	       "       type          lcms    hcms    mobility    $$$$\n");
 	pr("%-20s %4d    %4d    %8d    %4d\n",
-	   intrchr[x].in_name, intrchr[x].in_lcms, intrchr[x].in_hcms,
-	   intrchr[x].in_mcost, intrchr[x].in_dcost);
+	   intrchr[i].in_name, intrchr[i].in_lcms, intrchr[i].in_hcms,
+	   intrchr[i].in_mcost, intrchr[i].in_dcost);
 	first = 0;
     }
 }
@@ -492,41 +443,41 @@ show_sect_build(int foo)
 void
 show_sect_stats(int foo)
 {
-    int x;
+    int i;
     struct natstr *natp = getnatp(player->cnum);
 
     pr("                        mob cost   max   max   naviga    packing   max\n");
     pr("  sector type            0%% 100%%   off   def   bility      bonus   pop\n");
 
-    for (x = 0; dchr[x].d_name; x++) {
-	if (dchr[x].d_mnem == 0)
+    for (i = 0; dchr[i].d_name; i++) {
+	if (dchr[i].d_mnem == 0)
 	    continue;
-	pr("%c %-21.21s", dchr[x].d_mnem, dchr[x].d_name);
-	if (dchr[x].d_mob0 < 0)
+	pr("%c %-21.21s", dchr[i].d_mnem, dchr[i].d_name);
+	if (dchr[i].d_mob0 < 0)
 	    pr("  no way ");
 	else
-	    pr(" %3.1f  %3.1f", dchr[x].d_mob0, dchr[x].d_mob1);
+	    pr(" %3.1f  %3.1f", dchr[i].d_mob0, dchr[i].d_mob1);
 	pr("  %5.2f %5.2f %7.7s %10.10s %5d\n",
-	   dchr[x].d_ostr, dchr[x].d_dstr,
-	   symbol_by_value(dchr[x].d_nav, sector_navigation),
-	   symbol_by_value(dchr[x].d_pkg, packing),
-	   max_population(natp->nat_level[NAT_RLEV], x, 100));
+	   dchr[i].d_ostr, dchr[i].d_dstr,
+	   symbol_by_value(dchr[i].d_nav, sector_navigation),
+	   symbol_by_value(dchr[i].d_pkg, packing),
+	   max_population(natp->nat_level[NAT_RLEV], i, 100));
     }
 }
 
 void
 show_sect_capab(int foo)
 {
-    int x;
+    int i;
 
     pr("  sector type             product  p.e.\n");
 
-    for (x = 0; dchr[x].d_name; x++) {
-	if (dchr[x].d_mnem == 0 || dchr[x].d_prd < 0)
+    for (i = 0; dchr[i].d_name; i++) {
+	if (dchr[i].d_mnem == 0 || dchr[i].d_prd < 0)
 	    continue;
 	pr("%c %-23s %-7s %4d%%\n",
-	   dchr[x].d_mnem, dchr[x].d_name, pchr[dchr[x].d_prd].p_sname,
-	   dchr[x].d_peffic);
+	   dchr[i].d_mnem, dchr[i].d_name, pchr[dchr[i].d_prd].p_sname,
+	   dchr[i].d_peffic);
     }
 }
 
@@ -535,12 +486,14 @@ show_item(int tlev)
 {
     struct ichrstr *ip;
 
-    pr("item value sell lbs    packing     melt  item\n");
-    pr("mnem                in no wh ur bk deno  name\n");
+    pr("item power value sell lbs    packing     melt  item\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",
-	   ip->i_mnem, ip->i_value, ip->i_sell ? "yes" : "no", ip->i_lbs,
+	pr("  %c  %5d %5d %4s %3d %2d %2d %2d %2d %2d %4d  %s\n",
+	   ip->i_mnem, ip->i_power,
+	   ip->i_value, ip->i_sell ? "yes" : "no",
+	   ip->i_lbs,
 	   ip->i_pkg[IPKG], ip->i_pkg[NPKG], ip->i_pkg[WPKG],
 	   ip->i_pkg[UPKG], ip->i_pkg[BPKG],
 	   ip->i_melt_denom, ip->i_name);
@@ -557,11 +510,13 @@ show_product(int tlev)
     pr("product    cost  raw materials  reso dep  level p.e.\n");
 
     for (pp = pchr; pp->p_sname; pp++) {
+	if (!pp->p_sname[0])
+	    continue;
 	pr("%7.7s %c  $%-3d ",
 	   pp->p_sname,
 	   pp->p_type < 0 ? ' ' : ichr[pp->p_type].i_mnem,
 	   pp->p_cost);
-	(void)CANT_HAPPEN(MAXPRCON > 3); /* output has only three columns */
+	BUILD_ASSERT(MAXPRCON <= 3); /* output has only three columns */
 	for (i = 0; i < 3; i++) {
 	    if (i < MAXPRCON && pp->p_camt[i]
 		&& pp->p_ctype[i] > I_NONE && pp->p_ctype[i] <= I_MAX)
@@ -596,7 +551,7 @@ show_news(int tlev)
 	if (rpt[i].r_newspage == N_NOTUSED)
 	    continue;
 	pr("%-2d %-20.20s %4d\n", rpt[i].r_uid,
-	    page_headings[rpt[i].r_newspage].name, rpt[i].r_good_will);
+	   page_headings[rpt[i].r_newspage].name, rpt[i].r_good_will);
 	for (j = 0; j < NUM_RPTS; j++)
 	    pr("    %s\n", rpt[i].r_newstory[j]);
     }
@@ -650,7 +605,7 @@ show_updates(int n)
 }
 
 /*
- * Return T formatted according to RFC 2822.
+ * Return @t formatted according to RFC 2822.
  * The return value is statically allocated and overwritten on
  * subsequent calls.
  */
@@ -677,14 +632,35 @@ fmttime2822(time_t t)
 	(time->tm_isdst ? tzi.DaylightBias : tzi.StandardBias));
 
     nn = _snprintf(buf + n, sizeof(buf) - n, " %+03d%02d",
-	time_offset/60, abs(time_offset) % 60);
+		   time_offset / 60, abs(time_offset) % 60);
     if (CANT_HAPPEN(nn <= 0 || nn + n >= sizeof(buf)))
 	buf[0] = 0;
 #else
     size_t n = strftime(buf, sizeof(buf), "%a, %d %b %Y %T %z",
-		     localtime(&t));
+			localtime(&t));
     if (CANT_HAPPEN(n == 0))
 	buf[0] = 0;
 #endif
     return buf;
 }
+
+static void
+show_load(short item[])
+{
+    i_type i;
+
+    for (i = I_NONE + 1; i <= I_MAX; ++i) {
+	if (item[i])
+	    pr(" %d%c", item[i], ichr[i].i_mnem);
+    }
+}
+
+static void
+show_capab(int flags, struct symbol *table)
+{
+    char buf[1024];
+
+    symbol_set_fmt(buf, sizeof(buf), flags, table, " ", 0);
+    if (*buf)
+	pr(" %s", buf);
+}