Update copyright notice

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

diff --git a/src/lib/commands/newe.c b/src/lib/commands/newe.c
index 5d7983304e11931c8ec3b9650c899c0f1ce20e21..2f981365effd0b904629970429807eddbd3b9833 100644 (file)
--- a/src/lib/commands/newe.c
+++ b/src/lib/commands/newe.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2018, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,9 +25,10 @@
  *  ---
  *
  *  newe.c: Show new sector efficiency (projected)
- * 
+ *
  *  Known contributors to this file:
  *     Thomas Ruschak, 1993
+ *     Markus Armbruster, 2004-2016
  */
 
 #include <config.h>
@@ -36,6 +36,7 @@
 #include "commands.h"
 #include "item.h"
 #include "optlist.h"
+#include "update.h"
 
 int
 newe(void)
@@ -43,15 +44,7 @@ newe(void)
     struct natstr *natp;
     struct sctstr sect;
     struct nstr_sect nstr;
-    double work, lcms, hcms;
     int nsect;
-    int civs = 0;
-    int uws = 0;
-    int bwork;
-    int twork;
-    int type;
-    int eff;
-    int maxpop;
 
     if (!snxtsct(&nstr, player->argp[1]))
        return RET_SYN;
@@ -62,80 +55,17 @@ newe(void)
        if (!player->owner)
            continue;
        if (!sect.sct_off) {
-           civs = (1.0 + obrate * etu_per_update) * sect.sct_item[I_CIVIL];
-           uws = (1.0 + uwbrate * etu_per_update) * sect.sct_item[I_UW];
            natp = getnatp(sect.sct_own);
-           maxpop = max_pop(natp->nat_level[NAT_RLEV], &sect);
-           work = new_work(&sect,
-                           total_work(sect.sct_work, etu_per_update,
-                                      civs, sect.sct_item[I_MILIT], uws,
-                                      maxpop));
-           bwork = work / 2;
-
-           type = sect.sct_type;
-           eff = sect.sct_effic;
-           if (sect.sct_newtype != type) {
-               twork = (eff + 3) / 4;
-               if (twork > bwork) {
-                   twork = bwork;
-               }
-               work -= twork;
-               bwork -= twork;
-               eff -= twork * 4;
-               if (eff <= 0) {
-                   type = sect.sct_newtype;
-                   eff = 0;
-               }
-
-               twork = 100 - eff;
-               if (twork > bwork) {
-                   twork = bwork;
-               }
-               if (dchr[type].d_lcms > 0) {
-                   lcms = sect.sct_item[I_LCM];
-                   lcms = (int)(lcms / dchr[type].d_lcms);
-                   if (twork > lcms)
-                       twork = lcms;
-               }
-               if (dchr[type].d_hcms > 0) {
-                   hcms = sect.sct_item[I_HCM];
-                   hcms = (int)(hcms / dchr[type].d_hcms);
-                   if (twork > hcms)
-                       twork = hcms;
-               }
-               work -= twork;
-               eff += twork;
-           } else if (eff < 100) {
-               twork = 100 - eff;
-               if (twork > bwork) {
-                   twork = bwork;
-               }
-               if (dchr[type].d_lcms > 0) {
-                   lcms = sect.sct_item[I_LCM];
-                   lcms = (int)(lcms / dchr[type].d_lcms);
-                   if (twork > lcms)
-                       twork = lcms;
-               }
-               if (dchr[type].d_hcms > 0) {
-                   hcms = sect.sct_item[I_HCM];
-                   hcms = (int)(hcms / dchr[type].d_hcms);
-                   if (twork > hcms)
-                       twork = hcms;
-               }
-               work -= twork;
-               eff += twork;
-           }
-       } else {
-           eff = sect.sct_effic;
-           type = sect.sct_type;
+           do_feed(&sect, natp, etu_per_update, 1);
+           buildeff(&sect);
        }
        if (nsect++ == 0) {
            pr("EFFICIENCY SIMULATION\n");
            pr("   sect  des    projected eff\n");
        }
-       prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
-       pr(" %c", dchr[type].d_mnem);
-       pr("    %3d%%\n", eff);
+       prxy("%4d,%-4d", nstr.x, nstr.y);
+       pr(" %c", dchr[sect.sct_type].d_mnem);
+       pr("    %3d%%\n", sect.sct_effic);
     }
     player->simulation = 0;
     if (nsect == 0) {