/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
* ---
*
* distribute.c: Do distribution to sectors
- *
+ *
* Known contributors to this file:
* Dave Pare, 1986
* Steve McClure, 1998
+ * Markus Armbruster, 2004-2011
*/
#include <config.h>
#include "prototypes.h"
#include "update.h"
+#ifdef DISTRIBUTE_DEBUG
+#define DPRINTF(fmt, ...) ((void)printf(fmt , ## __VA_ARGS__))
+#else
+#define DPRINTF(fmt, ...) ((void)0)
+#endif
+
#define EXPORT_BONUS 10.0
#define IMPORT_BONUS 10.0
int
-dodistribute(struct sctstr *sp, int imex, char *path, double dist_i_cost,
- double dist_e_cost)
- /* import or export? */
+dodistribute(struct sctstr *sp, int imex, double import_cost)
{
+ double path_cost, dcc;
struct ichrstr *ip;
struct sctstr *dist;
int amt;
int thresh;
int amt_dist;
int amt_sect;
- i_packing sect_packing, dist_packing;
+ enum i_packing sect_packing, dist_packing;
int pack;
double mcost;
int diff;
if ((sp->sct_dist_x == sp->sct_x) && (sp->sct_dist_y == sp->sct_y))
return 0;
- if (!path) {
- if (sp->sct_own != 0) {
- if (imex == EXPORT) /* only want this once */
+ if (imex == IMPORT && import_cost < 0.0)
+ return 0;
+
+ dist = getsectp(sp->sct_dist_x, sp->sct_dist_y);
+ if (imex == IMPORT)
+ path_cost = import_cost;
+ else {
+ dcc = sector_mcost(dist, MOB_MOVE);
+ if (import_cost < 0.0 || dcc < 0.0) {
+ if (sp->sct_own != 0)
wu(0, sp->sct_own, "No path to dist sector for %s\n",
ownxy(sp));
+ return 0;
}
- return 0;
+ path_cost = import_cost - sector_mcost(sp, MOB_MOVE) + dcc;
}
- dist = getsectp(sp->sct_dist_x, sp->sct_dist_y);
dist_packing = dist->sct_effic >= 60 ? dchr[dist->sct_type].d_pkg : IPKG;
sect_packing = sp->sct_effic >= 60 ? dchr[sp->sct_type].d_pkg : IPKG;
+ DPRINTF("distribute: %d,%d to %d,%d pathcost %g\n",
+ sp->sct_x, sp->sct_y, sp->sct_dist_x, sp->sct_dist_y,
+ path_cost);
+
lplague = rplague = changed = 0;
for (item = I_NONE + 1; item <= I_MAX; item++) {
if (sp->sct_dist[item] == 0)
* check to make sure have enough mobility in the
* dist sector to import what we need.
*/
- if (dist->sct_mobil <= 0) {
- /*logerror(" dist mobil < 0"); */
+ if (dist->sct_mobil <= 0)
continue;
- }
amt = diff;
- if (item == I_CIVIL)
- amt_dist--; /* Don't send your last civ */
+ /* make sure not to abandon the sector */
+ if (item == I_CIVIL ||
+ (item == I_MILIT && dist->sct_item[I_CIVIL] == 0))
+ amt_dist--;
if (amt_dist < amt) {
amt = amt_dist;
continue;
}
pack = ip->i_pkg[dist_packing];
- mcost = dist_i_cost / pack * ip->i_lbs / IMPORT_BONUS;
+ mcost = path_cost / pack * ip->i_lbs / IMPORT_BONUS;
if (dist->sct_mobil < mcost * amt)
amt = dist->sct_mobil / mcost;
* also make sure that there's enough space in the
* target sector to hold the required amt.
*/
- if (sp->sct_mobil <= 0) {
- /*logerror(" sp mob is zero"); */
+ if (sp->sct_mobil <= 0)
continue;
- }
amt = diff;
if (amt > amt_sect)
amt = amt_sect;
pack = MAX(ip->i_pkg[sect_packing], ip->i_pkg[dist_packing]);
- mcost = dist_e_cost / pack * ip->i_lbs / EXPORT_BONUS;
+ mcost = path_cost / pack * ip->i_lbs / EXPORT_BONUS;
if (sp->sct_mobil < mcost * amt)
amt = sp->sct_mobil / mcost;
if (amt > ITEM_MAX - amt_dist)