From: Markus Armbruster <armbru@pond.sub.org>
Date: Mon, 28 Jul 2008 01:16:57 +0000 (-0400)
Subject: Remove product information from show sect c
X-Git-Tag: v4.3.16~32
X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=e58be3179a6d221af3e9c212a8eda6e51c766bfb

Remove product information from show sect c

New show product made this redundant.
---

diff --git a/info/Sector-types.t b/info/Sector-types.t
index 0cb3543d8..8ab9d65d6 100644
--- a/info/Sector-types.t
+++ b/info/Sector-types.t
@@ -321,36 +321,27 @@ sector type can hold.
 Finally, to check out what sectors can do, use:
 .EX show sect capabilities
 .NF
-                                                 --- level ---          reso 
-  sector type             product use1 use2 use3 level min lag eff% $$$ dep c
-^ mountain                dust                           0   0   75   0  20 d
-u uranium mine            rad                    tech   40  10  100   2  35 r
-p park                    happy    1 l                   0   0  100   9   0  
-d defense plant           guns     1 o  5 l 10 h tech   20  10  100  30   0 g
-i shell industry          shells   2 l  1 h      tech   20  10  100   3   0 s
-m mine                    iron                           0   0  100   0   0 i
-g gold mine               dust                           0   0  100   0  20 d
-a agribusiness            food                   tech  -10  10  900   0   0 f
-o oil field               oil                    tech  -10  10  100   0  10 o
-j light manufacturing     lcm      1 i           tech  -10  10  100   0   0 l
-k heavy manufacturing     hcm      2 i           tech  -10  10  100   0   0 h
-t technical center        tech     1 d  5 o 10 l edu     5  10  100 300   0  
-r research lab            medical  1 d  5 o 10 l edu     5  10  100  90   0  
-l library/school          edu      1 l                   0   0  100   9   0  
-b bank                    bars     5 d                   0   0  100  10   0 b
-% refinery                petrol   1 o           tech   20  10 1000   1   0 p
+  sector type             product  p.e.
+^ mountain                dust      75%
+u uranium mine            rad      100%
+p park                    happy    100%
+d defense plant           guns     100%
+i shell industry          shells   100%
+m mine                    iron     100%
+g gold mine               dust     100%
+a agribusiness            food     900%
+o oil field               oil      100%
+j light manufacturing     lcm      100%
+k heavy manufacturing     hcm      100%
+t technical center        tech     100%
+r research lab            medical  100%
+l library/school          edu      100%
+b bank                    bars     100%
+% refinery                petrol  1000%
 .FI
-Column product shows what the sector produces, the use columns show
-the raw materials required to make one unit of production, and column
-$$$ shows how much money it costs.
+Column product shows what the sector produces.  Column p.e. shows the
+sector type's production efficiency.  Use command \*Qshow product\*U
+to find out more about products, and see \*Qinfo Products\*U.
 .s1
-Columns level, min and lag show how the production efficiency depends
-on a level (if any): p.e. = (level-min) / (level-min+lag).
 .s1
-Column eff% shows how many products are made per unit of production.
-.s1
-Column dep shows how fast production depletes the natural resource it
-exploits.  It only applies to products iron, dist, food, oil and rad.
-High numbers mean fast depletion.
-.s1
-.SA "designate, show, improve, BTU, Sectors, Producing, Transportation"
+.SA "designate, show, improve, BTU, Sectors, Producing, Products, Transportation"
diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c
index 94379f87a..6c13c6eee 100644
--- a/src/lib/subs/show.c
+++ b/src/lib/subs/show.c
@@ -521,56 +521,16 @@ show_sect_stats(int foo)
 void
 show_sect_capab(int foo)
 {
-    int x, i, j;
-    char *tmpstr;
+    int x;
 
-    pr("                                                 --- level ---          reso \n");
-    pr("  sector type             product use1 use2 use3 level min lag eff%% $$$ dep c\n");
+    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)
 	    continue;
-	j = dchr[x].d_prd;
-
-	pr("%c %-23s %-7s ",
-	   dchr[x].d_mnem, dchr[x].d_name, pchr[j].p_sname);
-	(void)CANT_HAPPEN(MAXPRCON > 3); /* output has only three columns */
-	for (i = 0; i < 3; i++) {
-	    if (i < MAXPRCON
-		&& pchr[j].p_camt[i]
-		&& pchr[j].p_ctype[i] > I_NONE
-		&& pchr[j].p_ctype[i] <= I_MAX) {
-		pr("%2d %c ", pchr[j].p_camt[i],
-		   ichr[pchr[j].p_ctype[i]].i_name[0]);
-	    } else {
-		pr("     ");
-	    }
-	}
-	switch (pchr[j].p_nlndx) {
-	case NAT_TLEV:
-	    tmpstr = "tech";
-	    break;
-	case NAT_ELEV:
-	    tmpstr = "edu";
-	    break;
-	case NAT_RLEV:
-	    tmpstr = "res";
-	    break;
-	case NAT_HLEV:
-	    tmpstr = "hap";
-	    break;
-	default:
-	    tmpstr = " ";
-	    break;
-	}
-	pr("%-5s %3d %3d %4d %3d %3d %c",
-	   tmpstr,
-	   pchr[j].p_nlmin,
-	   pchr[j].p_nllag,
-	   dchr[x].d_peffic, pchr[j].p_cost, pchr[j].p_nrdep,
-	   pchr[j].p_type != I_NONE ? ichr[pchr[j].p_type].i_mnem : ' ');
-
-	pr("\n");
+	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);
     }
 }