/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * 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.
*
* ---
*
* Known contributors to this file:
* Dave Pare, 1986
* Steve McClure, 1996
+ * Ron Koenderink, 2004
+ * Markus Armbruster, 2006
*/
+#include <config.h>
+
+#include <math.h>
#include "misc.h"
#include "plague.h"
#include "sect.h"
#include "lost.h"
#include "budg.h"
-#ifndef MIN
-#define MIN(x,y) ((x) > (y) ? (y) : (x))
-#endif
-
-static int shiprepair(struct shpstr *, struct natstr *,
- int *, int);
-static void upd_ship(struct shpstr *, int,
- struct natstr *, int *, int);
+static void shiprepair(struct shpstr *, struct natstr *, int *, int);
+static void upd_ship(struct shpstr *, int, struct natstr *, int *, int);
+static int feed_ship(struct shpstr *, int);
int
prod_ship(int etus, int natnum, int *bp, int build)
continue;
if (sp->shp_own != natnum)
continue;
+ if (sp->shp_effic < SHIP_MINEFF) {
+ makelost(EF_SHIP, sp->shp_own, sp->shp_uid,
+ sp->shp_x, sp->shp_y);
+ sp->shp_own = 0;
+ continue;
+ }
+
np = getnatp(sp->shp_own);
- start_money = np->nat_money;
if (lastx == 9999 || lasty == 9999) {
lastx = sp->shp_x;
lasty = sp->shp_y;
bp_clear_cachepath();
bp_enable_cachepath();
}
+ start_money = np->nat_money;
upd_ship(sp, etus, np, bp, build);
if (build && !player->simulation) /* make sure to only autonav once */
nav_ship(sp); /* autonav the ship */
sea_money[sp->shp_own] += np->nat_money - start_money;
- if ((build && (np->nat_money != start_money)) || (!build))
+ if (!build || np->nat_money != start_money)
k++;
if (player->simulation)
np->nat_money = start_money;
int max_oil;
int max_food;
struct pchrstr *product;
- u_char *resource;
+ unsigned char *resource;
int dep;
int n;
int mult;
- int needed;
int cost;
int eff;
mp = &mchr[(int)sp->shp_type];
if (build == 1) {
- if (np->nat_priorities[PRI_SBUILD] == 0 || np->nat_money < 0)
- return;
- if (sp->shp_effic < SHIP_MINEFF || !shiprepair(sp, np, bp, etus)) {
- makelost(EF_SHIP, sp->shp_own, sp->shp_uid, sp->shp_x,
- sp->shp_y);
- sp->shp_own = 0;
- return;
- }
+ if (np->nat_money >= 0)
+ shiprepair(sp, np, bp, etus);
} else {
mult = 1;
if (np->nat_level[NAT_TLEV] < sp->shp_tech * 0.85)
mult = 2;
- cost = -(mult * etus * dmin(0.0, money_ship * mp->m_cost));
- if ((np->nat_priorities[PRI_SMAINT] == 0 || np->nat_money < cost)
- && !player->simulation) {
+ cost = -(mult * etus * MIN(0.0, money_ship * mp->m_cost));
+ if (np->nat_money < cost && !player->simulation) {
if ((eff = sp->shp_effic - etus / 5) < SHIP_MINEFF) {
wu(0, sp->shp_own,
"%s lost to lack of maintenance\n", prship(sp));
- makelost(EF_SHIP, sp->shp_own, sp->shp_uid, sp->shp_x,
- sp->shp_y);
+ makelost(EF_SHIP, sp->shp_own, sp->shp_uid,
+ sp->shp_x, sp->shp_y);
sp->shp_own = 0;
return;
}
if (!player->simulation) {
sectp = getsectp(sp->shp_x, sp->shp_y);
+ /* produce oil */
if ((mp->m_flags & M_OIL) && sectp->sct_type == SCT_WATER) {
- /*
- * take care of oil production
- */
product = &pchr[P_OIL];
oil_gained = roundavg(total_work(100, etus,
sp->shp_item[I_CIVIL],
sp->shp_item[I_MILIT],
- sp->shp_item[I_UW])
- * (double)sp->shp_effic / 100.0
- * (double)sectp->sct_oil / 100.0
+ sp->shp_item[I_UW],
+ ITEM_MAX)
+ * sp->shp_effic / 100.0
+ * sectp->sct_oil / 100.0
* prod_eff(product, sp->shp_tech));
max_oil = mp->m_item[I_OIL];
if (sp->shp_item[I_OIL] + oil_gained > max_oil)
oil_gained = max_oil - sp->shp_item[I_OIL];
- sp->shp_item[I_OIL] += oil_gained;
if (product->p_nrdep != 0 && oil_gained > 0) {
- resource = (u_char *)sectp + product->p_nrndx;
+ resource = (unsigned char *)sectp + product->p_nrndx;
+ if (*resource * 100 < product->p_nrdep * oil_gained)
+ oil_gained = *resource * 100 / product->p_nrdep;
dep = roundavg(oil_gained * product->p_nrdep / 100.0);
if (CANT_HAPPEN(dep > *resource))
dep = *resource;
*resource -= dep;
}
+ sp->shp_item[I_OIL] += oil_gained;
}
+ /* produce fish */
if ((mp->m_flags & M_FOOD) && sectp->sct_type == SCT_WATER) {
product = &pchr[P_FOOD];
- sp->shp_item[I_FOOD] += roundavg(total_work(100, etus,
- sp->shp_item[I_CIVIL],
- sp->shp_item[I_MILIT],
- sp->shp_item[I_UW])
- * (double)sp->shp_effic / 100.0
- * (double)sectp->sct_fertil / 100.0
- * prod_eff(product, sp->shp_tech));
+ sp->shp_item[I_FOOD]
+ += roundavg(total_work(100, etus,
+ sp->shp_item[I_CIVIL],
+ sp->shp_item[I_MILIT],
+ sp->shp_item[I_UW],
+ ITEM_MAX)
+ * sp->shp_effic / 100.0
+ * sectp->sct_fertil / 100.0
+ * prod_eff(product, sp->shp_tech));
}
- if ((n = feed_ship(sp, etus, &needed, 1)) > 0) {
+ /* feed */
+ if ((n = feed_ship(sp, etus)) > 0) {
wu(0, sp->shp_own, "%d starved on %s\n", n, prship(sp));
if (n > 10)
nreport(sp->shp_own, N_DIE_FAMINE, 0, 1);
* battleships +8 % eff each etu. This will cost around
* 8 * 8 * $40 = $2560!
*/
-static int
-shiprepair(struct shpstr *ship, struct natstr *np,
- int *bp, int etus)
+static void
+shiprepair(struct shpstr *ship, struct natstr *np, int *bp, int etus)
{
int delta;
struct sctstr *sp;
rel = getrel(getnatp(sp->sct_own), ship->shp_own);
if (rel < FRIENDLY)
- return 1;
+ return;
}
wf = 0;
w_p_eff = SHP_BLD_WORK(mp->m_lcm, mp->m_hcm);
if ((sp->sct_off) && (sp->sct_own == ship->shp_own))
- return 1;
+ return;
mult = 1;
if (np->nat_level[NAT_TLEV] < ship->shp_tech * 0.85)
if (ship->shp_effic == 100) {
/* ship is ok; no repairs needed */
- return 1;
+ return;
}
left = 100 - ship->shp_effic;
delta = roundavg((double)avail / w_p_eff);
if (delta <= 0)
- return 1;
- if (delta > etus * ship_grow_scale)
- delta = etus * ship_grow_scale;
+ return;
+ if (delta > (int)((float)etus * ship_grow_scale))
+ delta = (int)((float)etus * ship_grow_scale);
if (delta > left)
delta = left;
if (left > delta)
left = delta;
- leftp = ((float)left / 100.0);
+ leftp = left / 100.0;
memset(mvec, 0, sizeof(mvec));
- mvec[I_LCM] = lcm_needed = ldround((double)(mp->m_lcm * leftp), 1);
- mvec[I_HCM] = hcm_needed = ldround((double)(mp->m_hcm * leftp), 1);
-
+ mvec[I_LCM] = lcm_needed = ldround(mp->m_lcm * leftp, 1);
+ mvec[I_HCM] = hcm_needed = ldround(mp->m_hcm * leftp, 1);
get_materials(sp, bp, mvec, 0);
- if (mvec[I_LCM] >= lcm_needed)
- buildp = leftp;
- else
- buildp = ((float)mvec[I_LCM] / (float)mp->m_lcm);
+ buildp = leftp;
+ if (mvec[I_LCM] < lcm_needed)
+ buildp = MIN(buildp, (float)mvec[I_LCM] / (float)mp->m_lcm);
if (mvec[I_HCM] < hcm_needed)
- buildp = MIN(buildp, ((float)mvec[I_HCM] / (float)mp->m_hcm));
+ buildp = MIN(buildp, (float)mvec[I_HCM] / (float)mp->m_hcm);
- build = ldround((double)(buildp * 100.0), 1);
+ build = ldround(buildp * 100.0, 1);
memset(mvec, 0, sizeof(mvec));
- mvec[I_LCM] = lcm_needed = roundavg((double)(mp->m_lcm * buildp));
- mvec[I_HCM] = hcm_needed = roundavg((double)(mp->m_hcm * buildp));
-
+ mvec[I_LCM] = roundavg(mp->m_lcm * buildp);
+ mvec[I_HCM] = roundavg(mp->m_hcm * buildp);
get_materials(sp, bp, mvec, 1);
if (sp->sct_type != SCT_HARBR)
np->nat_money -= mult * mp->m_cost * build / 100.0;
if (!player->simulation)
- ship->shp_effic += (s_char)build;
- return 1;
+ ship->shp_effic += (signed char)build;
}
/*
* returns the number who starved, if any.
*/
-int
-feed_ship(struct shpstr *sp, int etus, int *needed, int doit)
+static int
+feed_ship(struct shpstr *sp, int etus)
{
- double food_eaten, land_eaten;
- int ifood_eaten;
- int can_eat, need;
- int total_people;
- int to_starve;
- int starved;
+ int needed, take;
+ double give;
struct nstr_item ni;
struct lndstr *lp;
if (opt_NOFOOD)
- return 0; /* no food no work to do */
-
- total_people
- = sp->shp_item[I_CIVIL] + sp->shp_item[I_MILIT] + sp->shp_item[I_UW];
- food_eaten = etus * eatrate * total_people;
- ifood_eaten = (int)food_eaten;
- if (food_eaten - ifood_eaten > 0)
- ifood_eaten++;
- starved = 0;
- *needed = 0;
- if (!player->simulation && ifood_eaten > sp->shp_item[I_FOOD])
- sp->shp_item[I_FOOD]
- += supply_commod(sp->shp_own, sp->shp_x, sp->shp_y,
- I_FOOD, ifood_eaten - sp->shp_item[I_FOOD]);
-
-/* doit - only steal food from land units during the update */
- if (ifood_eaten > sp->shp_item[I_FOOD] && sp->shp_nland > 0 && doit) {
+ return 0;
+
+ needed = (int)ceil(food_needed(sp->shp_item, etus));
+
+ /* scrounge */
+ if (needed > sp->shp_item[I_FOOD])
+ sp->shp_item[I_FOOD] += supply_commod(sp->shp_own,
+ sp->shp_x, sp->shp_y, I_FOOD,
+ needed - sp->shp_item[I_FOOD]);
+ if (needed > sp->shp_item[I_FOOD]) {
+ /* take from embarked land units, but don't starve them */
snxtitem_all(&ni, EF_LAND);
- while ((lp = (struct lndstr *)nxtitemp(&ni, 0)) &&
- ifood_eaten > sp->shp_item[I_FOOD]) {
+ while ((lp = nxtitemp(&ni)) && needed > sp->shp_item[I_FOOD]) {
if (lp->lnd_ship != sp->shp_uid)
continue;
- need = ifood_eaten - sp->shp_item[I_FOOD];
- land_eaten = etus * eatrate * lnd_getmil(lp);
- if (lp->lnd_item[I_FOOD] - need > land_eaten) {
- sp->shp_item[I_FOOD] += need;
- lp->lnd_item[I_FOOD] -= need;
- } else if (lp->lnd_item[I_FOOD] - land_eaten > 0) {
- sp->shp_item[I_FOOD] += lp->lnd_item[I_FOOD] - land_eaten;
- lp->lnd_item[I_FOOD] -= lp->lnd_item[I_FOOD] - land_eaten;
- }
+ give = lp->lnd_item[I_FOOD] - food_needed(lp->lnd_item, etus);
+ if (give < 1.0)
+ continue;
+ take = MIN((int)give, needed - sp->shp_item[I_FOOD]);
+ sp->shp_item[I_FOOD] += take;
+ lp->lnd_item[I_FOOD] -= take;
}
}
- if (ifood_eaten > sp->shp_item[I_FOOD]) {
- *needed = ifood_eaten - sp->shp_item[I_FOOD];
- can_eat = sp->shp_item[I_FOOD] / (etus * eatrate);
- /* only want to starve off at most 1/2 the populace. */
- if (can_eat < total_people / 2)
- can_eat = total_people / 2;
-
- to_starve = total_people - can_eat;
- while (to_starve && sp->shp_item[I_UW]) {
- to_starve--;
- starved++;
- sp->shp_item[I_UW]--;
- }
- while (to_starve && sp->shp_item[I_CIVIL]) {
- to_starve--;
- starved++;
- sp->shp_item[I_CIVIL]--;
- }
- while (to_starve && sp->shp_item[I_MILIT]) {
- to_starve--;
- starved++;
- sp->shp_item[I_MILIT]--;
- }
-
- sp->shp_item[I_FOOD] = 0;
- } else {
- sp->shp_item[I_FOOD] -= (int)food_eaten;
- }
- return starved;
+ return feed_people(sp->shp_item, etus);
}
projects / empserver / blobdiff