Update copyright notice

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

diff --git a/src/lib/commands/powe.c b/src/lib/commands/powe.c
index 3603df0011da8500475e03670d18a68ab02fe001..f72c9951ff091768a7e411ce0f34b35bb04ce6e2 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-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -41,6 +41,7 @@
 #include "commands.h"
 #include "item.h"
 #include "land.h"
+#include "nuke.h"
 #include "optlist.h"
 #include "plane.h"
 #include "power.h"
@@ -51,6 +52,9 @@ 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);
 static float item_power(short[]);
 
@@ -220,15 +224,20 @@ 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;
+    struct mchrstr *mcp;
     struct lndstr land;
+    struct lchrstr *lcp;
+    struct nukstr nuke;
+    struct nchrstr *ncp;
     struct nstr_item ni;
     struct nstr_sect ns;
     struct natstr *natp;
-    float f;
 
     player->btused += 10;
     memset(powbuf, 0, MAXNOC * sizeof(*powbuf));
@@ -237,48 +246,61 @@ 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)) {
        if (land.lnd_own == 0)
            continue;
+       lcp = &lchr[land.lnd_type];
        pow = &powbuf[land.lnd_own];
        addtopow(land.lnd_item, pow);
-       f = (lchr[land.lnd_type].l_mat[I_LCM] / 10.0)
-           * (land.lnd_effic / 100.0);
-       f += (lchr[land.lnd_type].l_mat[I_HCM] / 10.0)
-           * (land.lnd_effic / 100.0);
-       upower[land.lnd_own] += f * 2 * power_tech_factor(land.lnd_tech);
-       if (!(lchr[(int)land.lnd_type].l_flags & L_SPY))
+       upower[land.lnd_own] += empunit_power(land.lnd_effic,
+                                             land.lnd_tech,
+                                             lcp->l_mat, lcp->l_cost);
+       if (!(lcp->l_flags & L_SPY))
            pow->p_units += 1.0;
     }
     snxtitem_all(&ni, EF_SHIP);
     while (nxtitem(&ni, &ship)) {
        if (ship.shp_own == 0)
            continue;
+       mcp = &mchr[ship.shp_type];
        pow = &powbuf[ship.shp_own];
        addtopow(ship.shp_item, pow);
-       f = (mchr[ship.shp_type].m_mat[I_LCM] / 10.0)
-           * (ship.shp_effic / 100.0);
-       f += (mchr[ship.shp_type].m_mat[I_HCM] / 10.0)
-           * (ship.shp_effic / 100.0);
-       upower[ship.shp_own] += f * 2 * power_tech_factor(ship.shp_tech);
+       upower[ship.shp_own] += empunit_power(ship.shp_effic,
+                                             ship.shp_tech,
+                                             mcp->m_mat, mcp->m_cost);
        pow->p_ships += 1.0;
     }
     snxtitem_all(&ni, EF_PLANE);
     while (nxtitem(&ni, &plane)) {
        if (plane.pln_own == 0)
            continue;
+       pcp = &plchr[plane.pln_type];
        pow = &powbuf[plane.pln_own];
+       upower[plane.pln_own] += empunit_power(plane.pln_effic,
+                                              plane.pln_tech,
+                                              pcp->pl_mat, pcp->pl_cost);
        pow->p_planes += 1.0;
-       natp = getnatp(plane.pln_own);
-       f = 20 * (plane.pln_effic / 100.0) *
-           (20 + natp->nat_level[NAT_TLEV]) / 500.0;
-       upower[plane.pln_own] += f * power_tech_factor(plane.pln_tech);
+    }
+    snxtitem_all(&ni, EF_NUKE);
+    while (nxtitem(&ni, &nuke)) {
+       if (nuke.nuk_own == 0)
+           continue;
+       ncp = &nchr[nuke.nuk_type];
+       upower[nuke.nuk_own] += empunit_power(nuke.nuk_effic,
+                                             nuke.nuk_tech,
+                                             ncp->n_mat, ncp->n_cost);
     }
     for (i = 1; NULL != (natp = getnatp(i)); i++) {
        pow = &powbuf[i];
@@ -288,12 +310,7 @@ gen_power(struct powstr *powbuf, int save)
            continue;
        }
        pow->p_money = natp->nat_money;
-       pow->p_power += pow->p_money / 100.;
-
-       if (pow->p_sects > 0)
-           pow->p_power += pow->p_sects
-               * (pow->p_effic / pow->p_sects / 100.0)
-               * 10.0;
+       pow->p_power += money_power(natp->nat_money);
        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 */
@@ -349,6 +366,24 @@ 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 empobj_power(effic, mat, cost) * power_tech_factor(tech);
+}
+
+static float
+money_power(int money)
+{
+    return money / 100.0;
+}
+
 static float
 power_tech_factor(float tech)
 {