/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, 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,
* 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/>.
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * See files README, COPYING and CREDITS in the root of the source
+ * tree for related information and legal notices. It is expected
+ * that future projects/authors will amend these files as needed.
*
* ---
*
* deliver.c: Deliver commodities to neighboring sector
- *
+ *
* Known contributors to this file:
- *
+ * Markus Armbruster, 2004-2016
*/
-#include "misc.h"
-#include "var.h"
-#include "sect.h"
+#include <config.h>
+
#include "item.h"
+#include "optlist.h"
#include "path.h"
-#include "file.h"
-#include "xy.h"
+#include "plague.h"
+#include "sect.h"
+#include "prototypes.h"
#include "update.h"
-#include "subs.h"
-#include "common.h"
-int
-deliver(register struct sctstr *from, struct ichrstr *ip, int dir,
- int thresh, int amt_src, int plague)
+#define DELIVER_BONUS 4.0
+
+static int
+deliver(struct sctstr *from, struct ichrstr *ip, int dir,
+ int thresh, int amt_src, int plague, enum i_packing packing)
{
- register struct sctstr *to;
- int vtype; /* item vartype */
- int pack_src;
+ struct sctstr *to;
+ i_type vtype; /* item vartype */
int amt_moved;
int amt_dst;
int mobility;
- float mcost;
- struct dchrstr *dp;
+ double mcost;
int n;
if (dir <= 0 || dir > DIR_UL)
if ((amt_moved = amt_src - thresh) <= 0)
return 0;
/*
- * make sure delivery looks ok. Check where its going,
+ * make sure delivery looks OK. Check where its going,
* where its coming from, and see if there is more than
* the threshold amount
*/
ip->i_name, ownxy(from));
return 0;
}
- dp = &dchr[from->sct_type];
- vtype = ip->i_vtype;
- pack_src = ip->i_pkg[dp->d_pkg];
+ vtype = ip->i_uid;
mobility = from->sct_mobil / 2;
- if (vtype == V_CIVIL && from->sct_own != from->sct_oldown) {
- wu(0, from->sct_own,
- "The conquered populace in %s refuses to relocate!\n",
- ownxy(from));
- return 0;
+ if (vtype == I_CIVIL) {
+ if (from->sct_own != from->sct_oldown) {
+ wu(0, from->sct_own,
+ "The conquered populace in %s refuses to relocate!\n",
+ ownxy(from));
+ return 0;
+ }
+ if (to->sct_own != to->sct_oldown) {
+ wu(0, from->sct_own,
+ "Citizens in %s refuse to relocate!\n", ownxy(from));
+ return 0;
+ }
}
+ /* make sure not to abandon the sector */
+ if (vtype == I_CIVIL || (vtype == I_MILIT && !to->sct_item[I_CIVIL]))
+ amt_moved--;
/*
* disallow delivery into prohibited sectors.
* calculate unit movement cost; decrease amount if
* there isn't enough mobility.
*/
- mcost = sector_mcost(to, MOB_ROAD) * ip->i_lbs / pack_src;
- mcost /= 4.0;
+ mcost = sector_mcost(to, MOB_MOVE) * ip->i_lbs / ip->i_pkg[packing];
+ mcost /= DELIVER_BONUS;
if (mobility < mcost * amt_moved) {
/* XXX can mcost be == 0? */
from->sct_mobil = n;
return amt_moved;
}
+
+void
+dodeliver(struct sctstr *sp)
+{
+ i_type i;
+ int thresh;
+ int dir;
+ int plague;
+ enum i_packing packing;
+ int n;
+
+ if (sp->sct_mobil <= 0)
+ return;
+ plague = sp->sct_pstage;
+ packing = sp->sct_effic >= 60 ? dchr[sp->sct_type].d_pkg : IPKG;
+ for (i = I_NONE + 1; i <= I_MAX; i++) {
+ if (sp->sct_del[i] == 0)
+ continue;
+ thresh = sp->sct_del[i] & ~0x7;
+ dir = sp->sct_del[i] & 0x7;
+ n = deliver(sp, &ichr[i], dir, thresh, sp->sct_item[i],
+ plague, packing);
+ if (n > 0) {
+ sp->sct_item[i] -= n;
+ if (sp->sct_mobil <= 0)
+ break;
+ }
+ }
+}