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

production: Use update code instead of duplicating it

Browse source 
prod() duplicates the update's sector production code, except it
computes both output with present materials ("make" output) and output
not limited by lack of materials or production backlog ("max" output).
It also rounds materials consumed up instead of randomly.

Factor prod_output() out of produce() for reuse by prod().  prod()
runs it twice: once for "make" output and once for "max" output.

Test output changes are due to random rounding.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-07-07 08:03:58 +02:00
parent 6013758272
commit 4a714a37da
6 changed files with 215 additions and 229 deletions
Download patch file Download diff file Expand all files Collapse all files

61
src/lib/update/produce.c
View file

@ -52,21 +52,44 @@ produce(struct natstr *np, struct sctstr *sp)
{
struct budget *budget = &nat_budget[sp->sct_own];
struct pchrstr *product;
double p_e;
double prodeff;
unsigned char *resource;
double output;
int unit_work, work_used;
i_type item;
double material_limit, worker_limit, res_limit;
double material_consume;
int val;
double cost;
if (dchr[sp->sct_type].d_prd < 0)
return;
product = &pchr[dchr[sp->sct_type].d_prd];
item = product->p_type;
prodeff = prod_eff(sp->sct_type, np->nat_level[product->p_nlndx]);
output = prod_output(sp, prodeff);
if (!output)
return;
cost = product->p_cost * output / prodeff;
if (opt_TECH_POP) {
if (product->p_level == NAT_TLEV) {
if (tpops[sp->sct_own] > 50000)
cost *= tpops[sp->sct_own] / 50000.0;
}
}
budget->prod[sp->sct_type].count += ldround(output, 1);
budget->prod[sp->sct_type].money -= cost;
budget->money -= cost;
}
double
prod_output(struct sctstr *sp, double prodeff)
{
struct pchrstr *product = &pchr[dchr[sp->sct_type].d_prd];
i_type item = product->p_type;
unsigned char *resource;
double p_e;
double material_limit, worker_limit, res_limit;
double material_consume, output;
int unit_work, work_used;
int val;
if (product->p_nrndx)
resource = (unsigned char *)sp + product->p_nrndx;
else
@ -95,16 +118,16 @@ produce(struct natstr *np, struct sctstr *sp)
if (CANT_HAPPEN(material_consume < 0.0))
material_consume = 0.0;
if (material_consume == 0.0)
return;
return 0.0;
prodeff = prod_eff(sp->sct_type, np->nat_level[product->p_nlndx]);
if (prodeff <= 0.0) {
if (!player->simulation)
wu(0, sp->sct_own,
"%s level too low to produce in %s (need %d)\n",
levelnames[product->p_nlndx], ownxy(sp), product->p_nlmin);
return;
return 0.0;
}
/*
* Adjust produced amount by commodity production ratio
*/
@ -146,24 +169,14 @@ produce(struct natstr *np, struct sctstr *sp)
*resource = val;
}
cost = product->p_cost * material_consume;
if (opt_TECH_POP) {
if (product->p_level == NAT_TLEV) {
if (tpops[sp->sct_own] > 50000)
cost *= tpops[sp->sct_own] / 50000.0;
}
}
budget->prod[sp->sct_type].count += ldround(output, 1);
budget->prod[sp->sct_type].money -= cost;
budget->money -= cost;
if (CANT_HAPPEN(p_e <= 0.0))
return;
return 0.0;
work_used = roundavg(unit_work * material_consume / p_e);
if (CANT_HAPPEN(work_used > sp->sct_avail))
work_used = sp->sct_avail;
sp->sct_avail -= work_used;
return output;
}
/*