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

collect: Don't disclose sector value when it exceeds loan

Browse source 
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 <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-11 16:04:54 +02:00
parent 8b1cc6cb47
commit b422a282c5
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
info/collect.t
View file

@ -23,10 +23,7 @@ debtor to which you are adjacent.
Any adjacent sector includes any sector you have that borders the Any adjacent sector includes any sector you have that borders the
sector you wish to confiscate. sector you wish to confiscate.
.s1 .s1
The program then paws over the sector and assesses its value: The program then paws over the sector and assesses its value.
.NF
That sector (and its contents) is valued at $2345.00
.FI
If the amount you are owed exceeds this amount the sector If the amount you are owed exceeds this amount the sector
becomes yours! becomes yours!
If the value of the sector is close enough to the If the value of the sector is close enough to the

9
src/lib/commands/coll.c
View file

@ -24,11 +24,12 @@
* *
* --- * ---
* *
* coll.c: Collet on a loan * coll.c: Collect on a loan
* *
* Known contributors to this file: * Known contributors to this file:
* Pat Loney, 1992 * Pat Loney, 1992
* Steve McClure, 1996-2000 * Steve McClure, 1996-2000
* Markus Armbruster, 2004-2016
*/ */
#include <config.h> #include <config.h>
@ -100,11 +101,13 @@ coll(void)
val = sect.sct_item[ichr[i].i_uid]; val = sect.sct_item[ichr[i].i_uid];
pay += val * ichr[i].i_value; pay += val * ichr[i].i_value;
} }
pr("That sector (and its contents) is valued at $%.2f\n", pay);
if (pay > owed * 1.2) { 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; 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? */ sect.sct_item[I_MILIT] = 1; /* FIXME now where did this guy come from? */
/* /*