From: Markus Armbruster Date: Sat, 11 Jun 2016 14:04:54 +0000 (+0200) Subject: collect: Don't disclose sector value when it exceeds loan X-Git-Tag: v4.4.0~220 X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=b422a282c56356837182696e2e708de38b79394f collect: Don't disclose sector value when it exceeds loan When collect refuses to confiscate a sector because it's value exceeds the amount owed, it still tells the player the exact value. Don't. Don't give the player something for nothing. Signed-off-by: Markus Armbruster --- diff --git a/info/collect.t b/info/collect.t index 665307b99..b5889bbfa 100644 --- a/info/collect.t +++ b/info/collect.t @@ -23,10 +23,7 @@ debtor to which you are adjacent. Any adjacent sector includes any sector you have that borders the sector you wish to confiscate. .s1 -The program then paws over the sector and assesses its value: -.NF -That sector (and its contents) is valued at $2345.00 -.FI +The program then paws over the sector and assesses its value. If the amount you are owed exceeds this amount the sector becomes yours! If the value of the sector is close enough to the diff --git a/src/lib/commands/coll.c b/src/lib/commands/coll.c index 0e4fc1d3d..4b6a0b28b 100644 --- a/src/lib/commands/coll.c +++ b/src/lib/commands/coll.c @@ -24,11 +24,12 @@ * * --- * - * coll.c: Collet on a loan + * coll.c: Collect on a loan * * Known contributors to this file: * Pat Loney, 1992 * Steve McClure, 1996-2000 + * Markus Armbruster, 2004-2016 */ #include @@ -100,11 +101,13 @@ coll(void) val = sect.sct_item[ichr[i].i_uid]; pay += val * ichr[i].i_value; } - pr("That sector (and its contents) is valued at $%.2f\n", pay); if (pay > owed * 1.2) { - pr("That is more than is owed!\n"); + pr("That sector (and its contents) is valued at more than %.2f.\n", + owed); return RET_FAIL; } + pr("That sector (and its contents) is valued at $%.2f\n", pay); + sect.sct_item[I_MILIT] = 1; /* FIXME now where did this guy come from? */ /*