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

(fina, repa, shark): Bankers never round down debts!

Browse source 
(repa, coll): Collect interest for the time the debtor is idling at
sub-prompts.
This commit is contained in:
Markus Armbruster 2004-08-20 08:47:00 +00:00
parent e7c9da21e5
commit bcc4a86944
4 changed files with 16 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -130,6 +130,7 @@ coll(void)
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));
if (pay >= owed) { if (pay >= owed) {
loan.l_ldur = 0; loan.l_ldur = 0;
nreport(loan.l_lonee, N_REPAY_LOAN, player->cnum, 1); nreport(loan.l_lonee, N_REPAY_LOAN, player->cnum, 1);

4
src/lib/commands/fina.c
View file

@ -70,9 +70,9 @@ fina(void)
pr(" %-2d (%3d) %-8.8s (%3d) %-8.8s ", ni.cur, pr(" %-2d (%3d) %-8.8s (%3d) %-8.8s ", ni.cur,
loan.l_loner, cname(loan.l_loner), loan.l_loner, cname(loan.l_loner),
loan.l_lonee, cname(loan.l_lonee)); loan.l_lonee, cname(loan.l_lonee));
pr("%3d%% %3d %5ld %7ld", pr("%3d%% %3d %5ld %7.0f",
loan.l_irate, loan.l_ldur, loan.l_amtpaid, loan.l_irate, loan.l_ldur, loan.l_amtpaid,
(long)loan_owed(&loan, now)); ceil(loan_owed(&loan, now)));
if (now > loan.l_duedate) if (now > loan.l_duedate)
pr(" (in arrears)\n"); pr(" (in arrears)\n");
else else

22
src/lib/commands/repa.c
View file

@ -48,9 +48,10 @@ repa(void)
struct natstr *natp; struct natstr *natp;
struct natstr *loaner; struct natstr *loaner;
int loan_num; int loan_num;
long payment; int payment;
long owe; long newdue;
s_char *cp; s_char *cp;
time_t now;
s_char buf[1024]; s_char buf[1024];
if (!opt_LOANS) { if (!opt_LOANS) {
@ -69,7 +70,6 @@ repa(void)
pr("You don't owe anything on that loan.\n"); pr("You don't owe anything on that loan.\n");
return RET_FAIL; return RET_FAIL;
} }
owe = (long)loan_owed(&loan, time(NULL));
if ((cp = getstarg(player->argp[2], "amount? ", buf)) == 0) if ((cp = getstarg(player->argp[2], "amount? ", buf)) == 0)
return RET_SYN; return RET_SYN;
if (!check_loan_ok(&loan)) if (!check_loan_ok(&loan))
@ -77,7 +77,9 @@ repa(void)
payment = atoi(cp); payment = atoi(cp);
if (payment <= 0) if (payment <= 0)
return RET_SYN; return RET_SYN;
if (payment > owe) {
newdue = (long)ceil(loan_owed(&loan, time(&now)) - payment);
if (newdue < 0) {
pr("You don't owe that much.\n"); pr("You don't owe that much.\n");
return RET_FAIL; return RET_FAIL;
} }
@ -89,9 +91,9 @@ repa(void)
loaner = getnatp(loan.l_loner); loaner = getnatp(loan.l_loner);
loaner->nat_money += payment; loaner->nat_money += payment;
putnat(loaner); putnat(loaner);
(void)time(&loan.l_lastpay); loan.l_lastpay = now;
if (owe <= payment) { if (newdue == 0) {
wu(0, loan.l_loner, "Country #%d paid off loan #%d with $%ld\n", wu(0, loan.l_loner, "Country #%d paid off loan #%d with $%d\n",
player->cnum, loan_num, payment); player->cnum, loan_num, payment);
nreport(player->cnum, N_REPAY_LOAN, loan.l_loner, 1); nreport(player->cnum, N_REPAY_LOAN, loan.l_loner, 1);
loan.l_status = LS_FREE; loan.l_status = LS_FREE;
@ -99,9 +101,9 @@ repa(void)
pr("Congratulations, you've paid off the loan!\n"); pr("Congratulations, you've paid off the loan!\n");
} else { } else {
wu(0, loan.l_loner, wu(0, loan.l_loner,
"Country #%d paid $%.2f on loan %d\n", player->cnum, "Country #%d paid $%d on loan %d\n",
(double)payment, loan_num); player->cnum, payment, loan_num);
loan.l_amtdue = owe - payment; loan.l_amtdue = newdue;
loan.l_amtpaid += payment; loan.l_amtpaid += payment;
} }
if (!putloan(loan_num, &loan)) { if (!putloan(loan_num, &loan)) {

2
src/lib/commands/shark.c
View file

@ -86,7 +86,7 @@ shark(void)
} }
pr("That loan is worth $%.2f.\n", owed); pr("That loan is worth $%.2f.\n", owed);
natp = getnatp(player->cnum); natp = getnatp(player->cnum);
payment = owed * (1.0 + loan.l_irate / 100.0); payment = (long)ceil(owed * (1.0 + loan.l_irate / 100.0));
if (payment > natp->nat_money - 100.0) { if (payment > natp->nat_money - 100.0) {
pr("You do not have enough to cover that loan\n"); pr("You do not have enough to cover that loan\n");
return RET_FAIL; return RET_FAIL;