Update copyright notice

[empserver] / src / lib / common / move.c

diff --git a/src/lib/common/move.c b/src/lib/common/move.c
index 093b5cb48e1a0f915fc6ba89dd6b45ea7466200f..e90b1b3696c8245e67c132d20d434ddcaaa0f248 100644 (file)
--- a/src/lib/common/move.c
+++ b/src/lib/common/move.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, 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,52 +25,63 @@
  *  ---
  *
  *  move.c: Misc. move routines
- * 
+ *
  *  Known contributors to this file:
- *     
+ *     Markus Armbruster, 2006-2008
  */
 
 #include <config.h>
 
 #include "misc.h"
-#include "xy.h"
-#include "sect.h"
-#include "path.h"
 #include "nat.h"
-#include "common.h"
+#include "optlist.h"
+#include "path.h"
+#include "sect.h"
+#include "xy.h"
 
 double
-sector_mcost(struct sctstr *sp, int do_bonus)
+sector_mcost(struct sctstr *sp, int mobtype)
 {
-    double d;
+    double base, cost;
 
-    d = dchr[sp->sct_type].d_mcst;
-    if (d <= 0)
+    base = dchr[sp->sct_type].d_mob0;
+    if (base < 0)
        return -1.0;
 
-    if (do_bonus == MOB_MOVE || do_bonus == MOB_MARCH) {
-       d = d / (1.0 + sp->sct_road / 122.0);
-    } else if (do_bonus == MOB_RAIL) {
-       if (sp->sct_rail <= 0)
+    if (mobtype == MOB_RAIL && opt_RAILWAYS) {
+       if (!SCT_HAS_RAIL(sp))
+           return -1;
+       mobtype = MOB_MARCH;
+    }
+
+    /* linear function in eff, d_mob0 at 0%, d_mob1 at 100% */
+    base += (dchr[sp->sct_type].d_mob1 - base) * sp->sct_effic / 100;
+    if (CANT_HAPPEN(base < 0))
+       base = 0;
+
+    if (mobtype == MOB_MOVE || mobtype == MOB_MARCH) {
+       /* linear function in road, base at 0%, base/10 at 100% */
+       cost = base;
+       if (intrchr[INT_ROAD].in_enable)
+           cost -= base * 0.009 * sp->sct_road;
+    } else if (mobtype == MOB_RAIL) {
+       if (!intrchr[INT_RAIL].in_enable || sp->sct_rail <= 0)
            return -1.0;
-       d = d / (1.0 + sp->sct_rail / 100.0);
+       /* linear function in rail, base at 0%, base/100 at 100% */
+       cost = base - base * 0.0099 * sp->sct_rail;
     } else {
-       if (d < 2.0)
-           d = 2.0;
+       CANT_REACH();
+       cost = base;
     }
-    if (d < 1.0)
-       d = 1.0;
-    if (dchr[sp->sct_type].d_mcst < 25)
-       d = (d * 100.0 - sp->sct_effic) / 500.0;
-    else
-       d = (d * 10.0 - sp->sct_effic) / 115;
+    if (CANT_HAPPEN(cost < 0))
+       cost = 0;
 
-    if (do_bonus == MOB_MOVE)
-       return MAX(d, MIN_MOBCOST);
-    if (sp->sct_own != sp->sct_oldown && sp->sct_mobil <= 0
-       && do_bonus != MOB_RAIL)
-       return MAX(d, LND_MINMOBCOST);
-    return MAX(d, 0.01);
+    if (mobtype == MOB_MOVE)
+       return MAX(cost, 0.001);
+    if (sp->sct_own != sp->sct_oldown && sp->sct_mobil <= 0)
+       /* slow down land units in newly taken sectors */
+       return cost + 0.2;
+    return MAX(cost, 0.02);
 }
 
 double
@@ -79,3 +89,33 @@ speed_factor(double effspd, int tech)
 {
     return 480.0 / (effspd + techfact(tech, effspd));
 }
+
+/* Minimal efficiency for railway and railway extension (opt_RAILWAYS) */
+#define SCT_RAIL_EFF 5
+#define SCT_RAIL_EXT_EFF 60
+
+/* Is sector SP a railway? */
+#define SCT_IS_RAILWAY(sp) \
+    (dchr[(sp)->sct_type].d_mob1 == 0 && (sp)->sct_effic >= SCT_RAIL_EFF)
+/* May sector SP have a railway extension? */
+#define SCT_MAY_HAVE_RAIL_EXT(sp) \
+    ((sp)->sct_effic >= SCT_RAIL_EXT_EFF)
+/* Does railway sector SP extend railway track into sector TOSP? */
+#define SCT_EXTENDS_RAIL(sp, tosp) \
+    ((sp)->sct_own == (tosp)->sct_own && SCT_MAY_HAVE_RAIL_EXT(tosp))
+
+int
+sct_rail_track(struct sctstr *sp)
+{
+    int i, res;
+    struct sctstr *nsp;
+
+    res = !!SCT_IS_RAILWAY(sp);
+    for (i = DIR_FIRST; i <= DIR_LAST; i++) {
+       nsp = getsectp(sp->sct_x + diroff[i][0],
+                      sp->sct_y + diroff[i][1]);
+       if (SCT_IS_RAILWAY(nsp) && SCT_EXTENDS_RAIL(nsp, sp))
+           res++;
+    }
+    return res;
+}