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

budget: Fix treasury tracking

Browse source 
The update simply updates each nation's nat_money as it goes.  Works.
Except it doesn't update when it runs on behalf of budget.  But it
still checks nat_money to determine whether the nation is solvent.
These checks are all broken.  Leads to massive mispredictions when
you'd go broke or solvent during a real update.

Track money unconditionally in nat_budget[].money.  Delay update of
nat_money until prod_nat().  Replace separate money[] by new
nat_budget[].start_money.  Closes bug#235.

Remaining difference between budget and update in the update test:

* #1: budget mispredicts plane #100 gets built (to be fixed)

* #2: budget shows ship, plane and land unit maintenance when broke,
      but update damages them instead (correct)

* #2: sector -14,0 converts, quadrupling its taxes (correct)

* #4 & #5: bank with dust and bars taken over by che (correct)

* #4: plague deaths (correct)

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-19 11:32:36 +02:00
parent 058268595f
commit 10789a0365
14 changed files with 78 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/lib/update/land.c
View file

@ -48,7 +48,7 @@
#include "prototypes.h"
#include "update.h"
static void upd_land(struct lndstr *, int, struct natstr *, struct bp *, int);
static void upd_land(struct lndstr *, int, struct bp *, int);
static void landrepair(struct lndstr *, struct natstr *, struct bp *,
int, struct budget *);
static int feed_land(struct lndstr *, int);
@ -59,9 +59,7 @@ prod_land(int etus, int natnum, struct bp *bp, int build)
{
struct lndstr *lp;
struct sctstr *sp;
struct natstr *np;
int i;
int start_money;
for (i = 0; (lp = getlandp(i)); i++) {
if (lp->lnd_own == 0)
@ -78,21 +76,17 @@ prod_land(int etus, int natnum, struct bp *bp, int build)
sp = getsectp(lp->lnd_x, lp->lnd_y);
if (sp->sct_type == SCT_SANCT)
continue;
np = getnatp(lp->lnd_own);
start_money = np->nat_money;
upd_land(lp, etus, np, bp, build);
if (player->simulation)
np->nat_money = start_money;
upd_land(lp, etus, bp, build);
}
}
static void
upd_land(struct lndstr *lp, int etus,
struct natstr *np, struct bp *bp, int build)
upd_land(struct lndstr *lp, int etus, struct bp *bp, int build)
/* build = 1, maintain = 0 */
{
struct budget *budget = &nat_budget[lp->lnd_own];
struct lchrstr *lcp;
struct lchrstr *lcp = &lchr[lp->lnd_type];
struct natstr *np = getnatp(lp->lnd_own);
int pstage, ptime;
int min = morale_base - (int)np->nat_level[NAT_HLEV];
int n, mult, cost, eff_lost;
@ -101,9 +95,8 @@ upd_land(struct lndstr *lp, int etus,
if (lp->lnd_retreat < min)
lp->lnd_retreat = min;
lcp = &lchr[(int)lp->lnd_type];
if (build == 1) {
if (!lp->lnd_off && np->nat_money >= 0)
if (!lp->lnd_off && budget->money >= 0)
landrepair(lp, np, bp, etus, budget);
if (!player->simulation)
lp->lnd_off = 0;
@ -115,7 +108,7 @@ upd_land(struct lndstr *lp, int etus,
mult *= 3;
budget->bm[BUDG_LND_MAINT].count++;
cost = -(mult * etus * MIN(0.0, money_land * lcp->l_cost));
if (np->nat_money < cost && !player->simulation) {
if (budget->money < cost && !player->simulation) {
eff_lost = etus / 5;
if (lp->lnd_effic - eff_lost < LAND_MINEFF)
eff_lost = lp->lnd_effic - LAND_MINEFF;
@ -126,7 +119,7 @@ upd_land(struct lndstr *lp, int etus,
}
} else {
budget->bm[BUDG_LND_MAINT].money -= cost;
np->nat_money -= cost;
budget->money -= cost;
}
if (!player->simulation) {
@ -249,7 +242,7 @@ landrepair(struct lndstr *land, struct natstr *np, struct bp *bp, int etus,
cost = roundavg(mult * lp->l_cost * build / 100.0);
budget->bm[BUDG_LND_BUILD].count += !!build;
budget->bm[BUDG_LND_BUILD].money -= cost;
np->nat_money -= cost;
budget->money -= cost;
if (!player->simulation)
land->lnd_effic += (signed char)build;
}