empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(prod): New column avail'. Narrow column will make' (amount and

Browse source 
short product name) to `make' (amount and, if product is an item,
product mnemonic).
This commit is contained in:
Markus Armbruster 2005-03-16 22:12:31 +00:00
parent 345ad3dfe0
commit b0e0c1b321
1 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

19
src/lib/commands/prod.c
View file

@ -256,15 +256,15 @@ prod(void)
i = 0; i = 0;
for (j = 0; j < MAXPRCON; ++j) { for (j = 0; j < MAXPRCON; ++j) {
it = pp->p_ctype[j]; it = pp->p_ctype[j];
if (it > I_NONE && it <= I_MAX && ichr[it].i_name != 0) { if (it > I_NONE && it <= I_MAX && ichr[it].i_mnem != 0) {
if (CANT_HAPPEN(i >= 3)) if (CANT_HAPPEN(i >= 3))
break; break;
sprintf(use[i], "%4d%c", sprintf(use[i], "%4d%c",
(int)((take * (double)pp->p_camt[j]) + 0.5), (int)((take * (double)pp->p_camt[j]) + 0.5),
ichr[it].i_name[0]); ichr[it].i_mnem);
sprintf(maxc[i], "%4d%c", sprintf(maxc[i], "%4d%c",
(int)((mtake * (double)pp->p_camt[j]) + 0.5), (int)((mtake * (double)pp->p_camt[j]) + 0.5),
ichr[it].i_name[0]); ichr[it].i_mnem);
++i; ++i;
} }
} }
@ -278,15 +278,16 @@ prod(void)
if (nsect++ == 0) { if (nsect++ == 0) {
pr("PRODUCTION SIMULATION\n"); pr("PRODUCTION SIMULATION\n");
pr(" sect des eff will make p.e. cost use1 use2 use3 max1 max2 max3 max\n"); pr(" sect eff des avail make p.e. cost use1 use2 use3 max1 max2 max3 max\n");
} }
prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum); prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
pr(" %c", dchr[type].d_mnem); pr(" %c", dchr[type].d_mnem);
pr(" %3.0f%%", p_e * 100.0); pr(" %3.0f%%", p_e * 100.0);
pr(" %5d", work);
if (vtype != I_NONE) { if (vtype != I_NONE) {
pr(" %5d", (int)(real + 0.5)); pr(" %4d%c", (int)(real + 0.5), ichr[vtype].i_mnem);
} else if (type != SCT_ENLIST) { } else if (type != SCT_ENLIST) {
switch (pp->p_level) { switch (pp->p_level) {
case NAT_TLEV: case NAT_TLEV:
@ -295,7 +296,7 @@ prod(void)
break; break;
case NAT_ELEV: case NAT_ELEV:
case NAT_HLEV: case NAT_HLEV:
pr(" %5.0f", real); pr(" %4.0f ", real);
break; break;
default: default:
CANT_HAPPEN("bad TYPE"); CANT_HAPPEN("bad TYPE");
@ -328,12 +329,12 @@ prod(void)
if (natp->nat_priorities[type] == 0) { if (natp->nat_priorities[type] == 0) {
maxmil = 0; maxmil = 0;
} }
pr(" %5d mil 1.00 $%-5d%4dc %4dc %5d\n", pr(" %4d%c 1.00 $%-5d%4dc %4dc %5d\n",
enlisted, enlisted * 3, enlisted, enlisted, maxmil); enlisted, ichr[I_MILIT].i_mnem, enlisted * 3,
enlisted, enlisted, maxmil);
continue; continue;
} }
pr(" %-7.7s", pp->p_sname);
pr(" %.2f", prodeff); pr(" %.2f", prodeff);
pr(" $%-5d", cost); pr(" $%-5d", cost);
for (i = 0; i < 3; i++) { for (i = 0; i < 3; i++) {