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

(lcarg, lcargo.t): Fix the header to match the info page.

Browse source 
Update the info page for the change to add civ, mil and uw.

(carg, cargo.t): Add the civ, mil and uw to cargo display.
Make the same as lcargo.  Update the info page.
This commit is contained in:
Ron Koenderink 2006-02-01 23:52:42 +00:00
parent c500f4adc3
commit 1283f79db5
3 changed files with 42 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

28
info/cargo.t
View file

@ -18,15 +18,21 @@ the ship number, or
.L lnd# .L lnd#
the unit number, the unit number,
.L "ship type" .L "ship type"
the type of ship; \*Qpatrol boat\*U, \*Qsubmarine\*U, etc, or the type of ship; \*Qpt\*U, \*Qfb\*U, etc, or
.L "unit type" .L "unit type"
the type of unit; \*Qwar band\*U, \*Qengineer\*U, etc, the type of unit; \*Qart\*U, \*Qeng\*U, etc,
.L x,y .L x,y
the ship/unit's current location (relative to your capital), the ship/unit's current location,
.L flt .L flt
the fleet/army designation letter (set by \*Qfleetadd/army\*U command), the fleet/army designation letter (set by \*Qfleetadd/army\*U command),
.L eff .L eff
the ship/unit's efficiency, the ship/unit's efficiency,
.L civ
the number of civilians on board,
.L mil
the number of military on board,
.L uw
the number of uncompensated workers on board,
.L sh .L sh
the number of shells on board, the number of shells on board,
.L gun .L gun
@ -50,15 +56,15 @@ the amount of radioactive material on board
.in .in
.s1 .s1
For example: For example:
.EX cargo K .EX cargo F
.NF .NF
shp# ship type x,y flt eff sh gun pet irn dst bar oil lcm hcm rad shp# x,y flt eff civ mil uw sh gun pet irn dst bar oil lcm hcm rad
86 aircraft carrier -29,-51 K 100% 298 4 0 0 0 0 0 0 0 0 3 dd 8,-14 F 86% 0 2 0 34 4 0 0 0 0 0 0 0 0
110 battleship -29,-51 K 100% 100 8 0 0 0 0 0 0 0 0 4 fb -2,14 F 100% 10 10 0 0 0 10 0 0 0 10 0 0 0
115 battleship -29,-51 K 100% 60 8 0 0 0 0 0 0 0 0 7 dd 8,-14 F 100% 0 60 0 40 4 0 0 0 0 0 0 0 0
181 destroyer -27,-35 K 100% 40 4 0 0 0 0 0 0 0 0 10 fb 5,-15 F 100% 1 0 0 0 0 0 0 0 0 0 0 0 0
182 destroyer -27,-35 K 100% 40 4 0 0 0 0 0 0 0 0 11 fb 3,-15 F 20% 0 0 0 0 0 0 0 0 0 0 0 0 0
183 destroyer -27,-35 K 100% 40 4 0 0 0 0 0 0 0 0 13 bb 4,-16 F 80% 0 10 0 100 4 0 0 0 0 0 0 0 0
6 ships 6 ships
.FI .FI
.s1 .s1

28
info/lcargo.t
View file

@ -18,15 +18,21 @@ the ship number, or
.L lnd# .L lnd#
the unit number, the unit number,
.L "ship type" .L "ship type"
the type of ship; \*Qpatrol boat\*U, \*Qsubmarine\*U, etc, or the type of ship; \*Qpt\*U, \*Qfb\*U, etc, or
.L "unit type" .L "unit type"
the type of unit; \*Qwar band\*U, \*Qengineer\*U, etc, the type of unit; \*Qart\*U, \*Qeng\*U, etc,
.L x,y .L x,y
the ship/unit's current location (relative to your capital), the ship/unit's current location,
.L flt .L flt
the fleet/army designation letter (set by \*Qfleetadd/army\*U command), the fleet/army designation letter (set by \*Qfleetadd/army\*U command),
.L eff .L eff
the ship/unit's efficiency, the ship/unit's efficiency,
.L civ
the number of civilians on board,
.L mil
the number of military on board,
.L uw
the number of uncompensated workers on board,
.L sh .L sh
the number of shells on board, the number of shells on board,
.L gun .L gun
@ -50,15 +56,15 @@ the amount of radioactive material on board
.in .in
.s1 .s1
For example: For example:
.EX cargo K .EX cargo F
.NF .NF
shp# ship type x,y flt eff sh gun pet irn dst bar oil lcm hcm rad shp# x,y flt eff civ mil uw sh gun pet irn dst bar oil lcm hcm rad
86 aircraft carrier -29,-51 K 100% 298 4 0 0 0 0 0 0 0 0 3 dd 8,-14 F 86% 0 2 0 34 4 0 0 0 0 0 0 0 0
110 battleship -29,-51 K 100% 100 8 0 0 0 0 0 0 0 0 4 fb -2,14 F 100% 10 10 0 0 0 10 0 0 0 10 0 0 0
115 battleship -29,-51 K 100% 60 8 0 0 0 0 0 0 0 0 7 dd 8,-14 F 100% 0 60 0 40 4 0 0 0 0 0 0 0 0
181 destroyer -27,-35 K 100% 40 4 0 0 0 0 0 0 0 0 10 fb 5,-15 F 100% 1 0 0 0 0 0 0 0 0 0 0 0 0
182 destroyer -27,-35 K 100% 40 4 0 0 0 0 0 0 0 0 11 fb 3,-15 F 20% 0 0 0 0 0 0 0 0 0 0 0 0 0
183 destroyer -27,-35 K 100% 40 4 0 0 0 0 0 0 0 0 13 bb 4,-16 F 80% 0 10 0 100 4 0 0 0 0 0 0 0 0
6 ships 6 ships
.FI .FI
.s1 .s1

11
src/lib/commands/carg.c
View file

@ -59,12 +59,15 @@ carg(void)
if ((player->cnum != ship.shp_own) && !player->god) if ((player->cnum != ship.shp_own) && !player->god)
continue; continue;
if (nships++ == 0) if (nships++ == 0)
pr("shp# ship type x,y flt eff sh gun pet irn dst bar oil lcm hcm rad\n"); pr("shp# x,y flt eff civ mil uw sh gun pet irn dst bar oil lcm hcm rad\n");
pr("%4d ", ni.cur); pr("%4d ", ni.cur);
pr("%-16.16s ", mchr[(int)ship.shp_type].m_name); pr("%-4.4s ", mchr[(int)ship.shp_type].m_name);
prxy("%4d,%-4d ", ship.shp_x, ship.shp_y, player->cnum); prxy("%4d,%-4d ", ship.shp_x, ship.shp_y, player->cnum);
pr(" %c", ship.shp_fleet); pr("%c ", ship.shp_fleet);
pr("%4d%%", ship.shp_effic); pr("%4d%%", ship.shp_effic);
pr("%4d", ship.shp_item[I_CIVIL]);
pr("%4d", ship.shp_item[I_MILIT]);
pr("%4d", ship.shp_item[I_UW]);
pr("%4d", ship.shp_item[I_SHELL]); pr("%4d", ship.shp_item[I_SHELL]);
pr("%4d", ship.shp_item[I_GUN]); pr("%4d", ship.shp_item[I_GUN]);
pr("%4d", ship.shp_item[I_PETROL]); pr("%4d", ship.shp_item[I_PETROL]);
@ -109,7 +112,7 @@ lcarg(void)
pr("%4d ", ni.cur); pr("%4d ", ni.cur);
pr("%-4.4s ", lchr[(int)land.lnd_type].l_name); pr("%-4.4s ", lchr[(int)land.lnd_type].l_name);
prxy("%4d,%-4d ", land.lnd_x, land.lnd_y, player->cnum); prxy("%4d,%-4d ", land.lnd_x, land.lnd_y, player->cnum);
pr(" %c", land.lnd_army); pr("%c ", land.lnd_army);
pr("%4d%%", land.lnd_effic); pr("%4d%%", land.lnd_effic);
pr("%4d", land.lnd_item[I_CIVIL]); pr("%4d", land.lnd_item[I_CIVIL]);
pr("%4d", land.lnd_item[I_MILIT]); pr("%4d", land.lnd_item[I_MILIT]);