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

collect: Don't permit confiscation of active capital

Browse source 
The whole idea of a sector acquiescing to takeover by lawyers waving
loan documents "proving" it's rightfully theirs is pretty
preposterous.  But a capital giving itself up that way (and then
paying out half the nation's treasury on top) beggars belief.
Disallow it.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-11 16:45:39 +02:00
parent b422a282c5
commit 6ec936a8d6
2 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
info/collect.t
View file

@ -8,8 +8,6 @@ Through the collect command overdue loans can be \*Qcleared up\*U.
If you should find that you have a problem debtor who refuses If you should find that you have a problem debtor who refuses
to pay up on your kind loan you can always seize one or more to pay up on your kind loan you can always seize one or more
of his/her sectors. of his/her sectors.
Perhaps the mere threat of a collection on
someone's capital may do the trick!
.s1 .s1
To settle up accounts on overdue loan #9 you would type: To settle up accounts on overdue loan #9 you would type:
.EX collect 9 .EX collect 9

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

@ -50,6 +50,7 @@ coll(void)
char *p; char *p;
struct lonstr loan; struct lonstr loan;
struct sctstr sect; struct sctstr sect;
struct natstr *lonee_np;
coord x, y; coord x, y;
double owed; double owed;
double pay; double pay;
@ -76,6 +77,7 @@ coll(void)
return RET_FAIL; return RET_FAIL;
} }
lonee_np = getnatp(loan.l_lonee);
pr("You are owed $%.2f on that loan.\n", owed); pr("You are owed $%.2f on that loan.\n", owed);
p = getstarg(player->argp[2], p = getstarg(player->argp[2],
"What sector do you wish to confiscate? ", buf); "What sector do you wish to confiscate? ", buf);
@ -106,6 +108,12 @@ coll(void)
owed); owed);
return RET_FAIL; return RET_FAIL;
} }
if (!influx(lonee_np)
&& sect.sct_x == lonee_np->nat_xcap
&& sect.sct_y == lonee_np->nat_ycap) {
pr("%s's capital cannot be confiscated.\n", cname(loan.l_lonee));
return RET_FAIL;
}
pr("That sector (and its contents) is valued at $%.2f\n", pay); 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? */
@ -115,15 +123,11 @@ coll(void)
* unwanted things, like generate che. * unwanted things, like generate che.
*/ */
sect.sct_own = player->cnum; sect.sct_own = player->cnum;
memset(sect.sct_dist, 0, sizeof(sect.sct_dist)); memset(sect.sct_dist, 0, sizeof(sect.sct_dist));
memset(sect.sct_del, 0, sizeof(sect.sct_del)); memset(sect.sct_del, 0, sizeof(sect.sct_del));
sect.sct_off = 1; sect.sct_off = 1;
sect.sct_dist_x = sect.sct_x; sect.sct_dist_x = sect.sct_x;
sect.sct_dist_y = sect.sct_y; sect.sct_dist_y = sect.sct_y;
if (sect.sct_type == SCT_CAPIT || sect.sct_type == SCT_MOUNT)
caploss(&sect, loan.l_lonee, "that was %s's capital!\n");
putsect(&sect); putsect(&sect);
nreport(player->cnum, N_SEIZE_SECT, loan.l_lonee, 1); nreport(player->cnum, N_SEIZE_SECT, loan.l_lonee, 1);
owed = loan_owed(&loan, time(&now)); owed = loan_owed(&loan, time(&now));