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

(prod_eff): New, factored out of produce() and prod().

Browse source 
(upd_ship): Oil and food production used special rules that didn't
match ordinary production and didn't make much sense.  Made them
follow ordinary production rules.  This puts uw and mil to work, and
makes ship tech and efficiency relevant to production.  Closes #917461
and #955072.
This commit is contained in:
Ron Koenderink 2004-08-17 02:31:10 +00:00
parent 9f226fe05f
commit 3ca767fc88
3 changed files with 62 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

27
src/lib/update/ship.c
View file

@ -168,13 +168,18 @@ upd_ship(register struct shpstr *sp, register int etus,
/*
* take care of oil production
*/
oil_gained = roundavg((sp->shp_item[I_CIVIL] * etus / 10000.0)
* sectp->sct_oil);
max_oil = vl_find(V_OIL, mp->m_vtype, mp->m_vamt, mp->m_nv);
if (sp->shp_item[I_OIL] > max_oil)
oil_gained = max_oil - sp->shp_item[I_OIL];
sp->shp_item[I_OIL] += oil_gained;
product = &pchr[P_OIL];
oil_gained = roundavg(total_work(100, etus,
sp->shp_item[I_CIVIL],
sp->shp_item[I_MILIT],
sp->shp_item[I_UW])
* (double)sp->shp_effic / 100.0
* (double)sectp->sct_oil / 100.0
* prod_eff(product, sp->shp_tech));
max_oil = vl_find(V_OIL, mp->m_vtype, mp->m_vamt, mp->m_nv);
if (sp->shp_item[I_OIL] + oil_gained > max_oil)
oil_gained = max_oil - sp->shp_item[I_OIL];
sp->shp_item[I_OIL] += oil_gained;
if (product->p_nrdep != 0 && oil_gained > 0) {
resource = ((s_char *)sectp) + product->p_nrndx;
*resource -= roundavg(oil_gained *
@ -182,8 +187,14 @@ upd_ship(register struct shpstr *sp, register int etus,
}
}
if ((mp->m_flags & M_FOOD) && sectp->sct_type == SCT_WATER) {
sp->shp_item[I_FOOD] += ((sp->shp_item[I_CIVIL] * etus) / 1000.0)
* sectp->sct_fertil;
product = &pchr[P_FOOD];
sp->shp_item[I_FOOD] += roundavg(total_work(100, etus,
sp->shp_item[I_CIVIL],
sp->shp_item[I_MILIT],
sp->shp_item[I_UW])
* (double)sp->shp_effic / 100.0
* (double)sectp->sct_fertil / 100.0
* prod_eff(product, sp->shp_tech));
}
if ((n = feed_ship(sp, etus, &needed, 1)) > 0) {
wu(0, sp->shp_own, "%d starved on %s\n", n, prship(sp));