From 1307a3be6b36b9f2f20b372b568fab84de3ff20c Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Fri, 27 May 2016 21:40:11 +0200 Subject: [PATCH] show: Extend show item to show the power value Also update "info power" to point to "show item" instead of the formerly hardcoded values. Signed-off-by: Markus Armbruster --- info/Item-types.t | 35 +++++++++++++++++++---------------- info/power.t | 5 ++--- src/lib/subs/show.c | 10 ++++++---- tests/version/journal.log | 32 ++++++++++++++++---------------- 4 files changed, 43 insertions(+), 39 deletions(-) diff --git a/info/Item-types.t b/info/Item-types.t index 35176c1f3..bf4246ad2 100644 --- a/info/Item-types.t +++ b/info/Item-types.t @@ -9,22 +9,22 @@ The show command displays the detailed characteristics of items. .s1 .EX show item .NF -item value sell lbs packing melt item -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 - g 60 yes 10 1 1 10 1 1 100 guns - p 4 yes 1 1 1 10 1 1 50 petrol - i 2 yes 1 1 1 10 1 1 100 iron ore - d 20 yes 5 1 1 10 1 1 100 dust (gold) - b 280 yes 50 1 1 5 1 4 200 bars of gold - f 0 yes 1 1 1 10 1 1 2 food - o 8 yes 1 1 1 10 1 1 50 oil - l 2 yes 1 1 1 10 1 1 100 light products - h 4 yes 1 1 1 10 1 1 100 heavy products - u 1 yes 2 1 1 2 1 1 2 uncompensated workers - r 150 yes 8 1 1 10 1 1 1000 radioactive materials +item power value sell lbs packing melt item +mnem in no wh ur bk deno name + c 100 1 no 1 1 10 10 10 10 4 civilians + m 100 0 yes 1 1 1 1 1 1 20 military + s 80 5 yes 1 1 1 10 1 1 80 shells + g 400 60 yes 10 1 1 10 1 1 100 guns + p 2 4 yes 1 1 1 10 1 1 50 petrol + i 10 2 yes 1 1 1 10 1 1 100 iron ore + d 200 20 yes 5 1 1 10 1 1 100 dust (gold) + b 1000 280 yes 50 1 1 5 1 4 200 bars of gold + f 0 0 yes 1 1 1 10 1 1 2 food + o 100 8 yes 1 1 1 10 1 1 50 oil + l 100 2 yes 1 1 1 10 1 1 100 light products + h 200 4 yes 1 1 1 10 1 1 100 heavy products + u 0 1 yes 2 1 1 2 1 1 2 uncompensated workers + r 0 150 yes 8 1 1 10 1 1 1000 radioactive materials .FI .s1 The meaning of the headings are: @@ -32,6 +32,9 @@ The meaning of the headings are: .L "item mnem" A one-letter mnemonic abbreviation of the item name. Commands let you use this to select the item. +.L power +How much 1000 units of this item contribute to power (see \*Qinfo +power\*U). .L value The value if the item is mortgaged. .L sell diff --git a/info/power.t b/info/power.t index b3e8748c3..bb5d08201 100644 --- a/info/power.t +++ b/info/power.t @@ -86,9 +86,8 @@ The power value of a ship or land unit is (lcm cost / 10 + hcm cost + The power value of a plane is 20 * efficiency / 100 * (20 + nation tech level) / 500. .s1 -The power value of commodities is civilians / 10 + military / 10 + -shells / 12.5 + guns / 2.5 + petrol / 500 + iron / 100 + dust / 5 + -bars + oil / 10 lcms / 10 + hcms / 5. +The power value of commodities is amount * type factor. \*Qshow +item\*U shows the type factor in column \*Qpower\*U. .s1 Efficiency is in percent. .s1 diff --git a/src/lib/subs/show.c b/src/lib/subs/show.c index 52409e6d0..bab48c074 100644 --- a/src/lib/subs/show.c +++ b/src/lib/subs/show.c @@ -486,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); diff --git a/tests/version/journal.log b/tests/version/journal.log index 7daffb452..aabc96af7 100644 --- a/tests/version/journal.log +++ b/tests/version/journal.log @@ -575,22 +575,22 @@ Play#0 output Play#0 6 0 640 Play#0 input show item Play#0 command show - Play#0 output Play#0 1 item value sell lbs packing melt item - Play#0 output Play#0 1 mnem in no wh ur bk deno name - Play#0 output Play#0 1 c 1 no 1 1 10 10 10 10 4 civilians - Play#0 output Play#0 1 m 0 yes 1 1 1 1 1 1 20 military - Play#0 output Play#0 1 s 5 yes 1 1 1 10 1 1 80 shells - Play#0 output Play#0 1 g 60 yes 10 1 1 10 1 1 100 guns - Play#0 output Play#0 1 p 4 yes 1 1 1 10 1 1 50 petrol - Play#0 output Play#0 1 i 2 yes 1 1 1 10 1 1 100 iron ore - Play#0 output Play#0 1 d 20 yes 5 1 1 10 1 1 100 dust (gold) - Play#0 output Play#0 1 b 280 yes 50 1 1 5 1 4 200 bars of gold - Play#0 output Play#0 1 f 0 yes 1 1 1 10 1 1 2 food - Play#0 output Play#0 1 o 8 yes 1 1 1 10 1 1 50 oil - Play#0 output Play#0 1 l 2 yes 1 1 1 10 1 1 100 light products - Play#0 output Play#0 1 h 4 yes 1 1 1 10 1 1 100 heavy products - Play#0 output Play#0 1 u 1 yes 2 1 1 2 1 1 2 uncompensated workers - Play#0 output Play#0 1 r 150 yes 8 1 1 10 1 1 1000 radioactive materials + Play#0 output Play#0 1 item power value sell lbs packing melt item + Play#0 output Play#0 1 mnem in no wh ur bk deno name + Play#0 output Play#0 1 c 100 1 no 1 1 10 10 10 10 4 civilians + Play#0 output Play#0 1 m 100 0 yes 1 1 1 1 1 1 20 military + Play#0 output Play#0 1 s 80 5 yes 1 1 1 10 1 1 80 shells + Play#0 output Play#0 1 g 400 60 yes 10 1 1 10 1 1 100 guns + Play#0 output Play#0 1 p 2 4 yes 1 1 1 10 1 1 50 petrol + Play#0 output Play#0 1 i 10 2 yes 1 1 1 10 1 1 100 iron ore + Play#0 output Play#0 1 d 200 20 yes 5 1 1 10 1 1 100 dust (gold) + Play#0 output Play#0 1 b 1000 280 yes 50 1 1 5 1 4 200 bars of gold + Play#0 output Play#0 1 f 0 0 yes 1 1 1 10 1 1 2 food + Play#0 output Play#0 1 o 100 8 yes 1 1 1 10 1 1 50 oil + Play#0 output Play#0 1 l 100 2 yes 1 1 1 10 1 1 100 light products + Play#0 output Play#0 1 h 200 4 yes 1 1 1 10 1 1 100 heavy products + Play#0 output Play#0 1 u 0 1 yes 2 1 1 2 1 1 2 uncompensated workers + Play#0 output Play#0 1 r 0 150 yes 8 1 1 10 1 1 1000 radioactive materials Play#0 output Play#0 6 0 640 Play#0 input show updates Play#0 command show -- 2.43.0