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

power: Include sector materials and cost in power factor

Browse source 
Building sectors can make you rate *lower* on the power chart, because
the power factor treats all sectors the same, regardless of build
materials and cost.

To avoid that, replace the term

   efficiency / 10.0

by

   (power value of materials + power value of cost + 9)
   * efficiency/100.0

The value of ordinary sectors, which take no materials and cost $100,
doesn't change.  The stock game's fortress is now worth 80% more due
to its materials and higher cost.  The stock game's wilderness is
worth 10% less, because it costs nothing.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2016-06-06 06:58:07 +02:00
parent 2ffd7b948d
commit e8451c7343
Notes: Markus Armbruster 2017-08-14 20:31:27 +02:00 
Fixes bug#133.
4 changed files with 28 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/lib/commands/powe.c
View file

@ -52,6 +52,7 @@ static void out5(double, int, int);
static void gen_power(struct powstr *, int);
static int powcmp(const void *, const void *);
static void addtopow(short *, struct powstr *);
static float empobj_power(int, short[], int);
static float empunit_power(int, int, short[], int);
static float money_power(int);
static float power_tech_factor(float);
@ -225,6 +226,7 @@ gen_power(struct powstr *powbuf, int save)
struct powstr *pow;
int i;
struct sctstr sect;
struct dchrstr *dcp;
struct plnstr plane;
struct plchrstr *pcp;
struct shpstr ship;
@ -244,10 +246,14 @@ gen_power(struct powstr *powbuf, int save)
while (nxtsct(&ns, &sect)) {
if (sect.sct_own == 0)
continue;
dcp = &dchr[sect.sct_type];
pow = &powbuf[sect.sct_own];
pow->p_sects += 1.0;
pow->p_effic += sect.sct_effic;
addtopow(sect.sct_item, pow);
pow->p_power += empobj_power(sect.sct_effic,
dcp->d_mat, dcp->d_cost);
pow->p_power += sect.sct_effic / 100.0 * 9.0;
}
snxtitem_all(&ni, EF_LAND);
while (nxtitem(&ni, &land)) {
@ -304,11 +310,6 @@ gen_power(struct powstr *powbuf, int save)
}
pow->p_money = natp->nat_money;
pow->p_power += money_power(natp->nat_money);
if (pow->p_sects > 0)
pow->p_power += pow->p_sects
* (pow->p_effic / pow->p_sects / 100.0)
* 10.0;
pow->p_power *= power_tech_factor(natp->nat_level[NAT_TLEV]);
pow->p_power += upower[i];
/* ack. add this vec to the "world power" element */
@ -364,11 +365,16 @@ addtopow(short *vec, struct powstr *pow)
pow->p_power += item_power(vec);
}
static float
empobj_power(int effic, short mat[], int cost)
{
return (item_power(mat) + money_power(cost)) * (effic / 100.0);
}
static float
empunit_power(int effic, int tech, short mat[], int cost)
{
return (item_power(mat) + money_power(cost)) * (effic / 100.0)
* power_tech_factor(tech);
return empobj_power(effic, mat, cost) * power_tech_factor(tech);
}
static float