Update copyright notice

[empserver] / src / lib / commands / powe.c

diff --git a/src/lib/commands/powe.c b/src/lib/commands/powe.c
index f5585552023b637615fe1c3d27ce4be9bcd8656b..0d4b11eccbaf0501e2ed3f0e04d05d013281bca2 100644 (file)
--- a/src/lib/commands/powe.c
+++ b/src/lib/commands/powe.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -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);
@@ -223,8 +224,9 @@ gen_power(struct powstr *powbuf, int save)
     float *f_ptr;
     float *f_pt2;
     struct powstr *pow;
-    int i;
+    int i, maxpop;
     struct sctstr sect;
+    struct dchrstr *dcp;
     struct plnstr plane;
     struct plchrstr *pcp;
     struct shpstr ship;
@@ -244,10 +246,16 @@ gen_power(struct powstr *powbuf, int save)
     while (nxtsct(&ns, &sect)) {
        if (sect.sct_own == 0)
            continue;
+       dcp = &dchr[sect.sct_type];
+       natp = getnatp(sect.sct_own);
        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);
+       maxpop = max_pop(natp->nat_level[NAT_RLEV], &sect);
+       pow->p_power += (1.0 + maxpop / 1000.0 * 8) * sect.sct_effic / 100.0;
     }
     snxtitem_all(&ni, EF_LAND);
     while (nxtitem(&ni, &land)) {
@@ -304,11 +312,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 +367,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