/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, 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
* ---
*
* ship.c: Do production for ships
- *
+ *
* Known contributors to this file:
* Dave Pare, 1986
* Steve McClure, 1996
* Ron Koenderink, 2004
- * Markus Armbruster, 2006
+ * Markus Armbruster, 2006-2009
*/
#include <config.h>
#include <math.h>
-#include "misc.h"
-#include "plague.h"
-#include "sect.h"
-#include "nat.h"
-#include "ship.h"
-#include "news.h"
-#include "file.h"
-#include "product.h"
+#include "budg.h"
#include "land.h"
-#include "xy.h"
-#include "nsc.h"
-#include "optlist.h"
+#include "lost.h"
+#include "news.h"
+#include "plague.h"
#include "player.h"
+#include "product.h"
+#include "ship.h"
#include "update.h"
-#include "common.h"
-#include "subs.h"
-#include "gen.h"
-#include "lost.h"
-#include "budg.h"
-static void 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 *, struct bp *, int);
+static void upd_ship(struct shpstr *, int, struct natstr *, struct bp *, int);
static int feed_ship(struct shpstr *, int);
int
-prod_ship(int etus, int natnum, int *bp, int build)
+prod_ship(int etus, int natnum, struct bp *bp, int build)
/* build = 1, maintain = 0 */
{
struct shpstr *sp;
struct natstr *np;
int n, k = 0;
int start_money;
- int lastx = 9999, lasty = 9999;
- bp_enable_cachepath();
for (n = 0; NULL != (sp = getshipp(n)); n++) {
if (sp->shp_own == 0)
continue;
}
np = getnatp(sp->shp_own);
- if (lastx == 9999 || lasty == 9999) {
- lastx = sp->shp_x;
- lasty = sp->shp_y;
- }
- if (lastx != sp->shp_x || lasty != sp->shp_y) {
- /* Reset the cache */
- bp_disable_cachepath();
- 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 */
if (player->simulation)
np->nat_money = start_money;
}
- bp_disable_cachepath();
- bp_clear_cachepath();
if (opt_SAIL) {
if (build && !player->simulation) /* make sure to only sail once */
static void
upd_ship(struct shpstr *sp, int etus,
- struct natstr *np, int *bp, int build)
+ struct natstr *np, struct bp *bp, int build)
/* build = 1, maintain = 0 */
{
struct sctstr *sectp;
sectp = getsectp(sp->shp_x, sp->shp_y);
/* produce oil */
- if ((mp->m_flags & M_OIL) && sectp->sct_type == SCT_WATER) {
- product = &pchr[P_OIL];
+ if (np->nat_money >= 0
+ && (mp->m_flags & M_OIL) && sectp->sct_type == SCT_WATER) {
+ product = &pchr[dchr[SCT_OIL].d_prd];
oil_gained = roundavg(total_work(100, etus,
sp->shp_item[I_CIVIL],
- sp->shp_item[I_MILIT],
+ sp->shp_item[I_MILIT],
sp->shp_item[I_UW],
ITEM_MAX)
* sp->shp_effic / 100.0
* sectp->sct_oil / 100.0
- * prod_eff(product, sp->shp_tech));
+ * prod_eff(SCT_OIL, 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;
}
/* produce fish */
- if ((mp->m_flags & M_FOOD) && sectp->sct_type == SCT_WATER) {
- product = &pchr[P_FOOD];
+ if (np->nat_money >= 0
+ && (mp->m_flags & M_FOOD) && sectp->sct_type == SCT_WATER) {
sp->shp_item[I_FOOD]
+= roundavg(total_work(100, etus,
sp->shp_item[I_CIVIL],
ITEM_MAX)
* sp->shp_effic / 100.0
* sectp->sct_fertil / 100.0
- * prod_eff(product, sp->shp_tech));
+ * prod_eff(SCT_AGRI, sp->shp_tech));
}
/* feed */
if ((n = feed_ship(sp, etus)) > 0) {
* 8 * 8 * $40 = $2560!
*/
static void
-shiprepair(struct shpstr *ship, struct natstr *np, int *bp, int etus)
+shiprepair(struct shpstr *ship, struct natstr *np, struct bp *bp, int etus)
{
int delta;
struct sctstr *sp;
struct mchrstr *mp;
- float leftp, buildp;
- int left, build;
- int lcm_needed, hcm_needed;
+ int build;
int wf;
int avail;
int w_p_eff;
int mult;
int mvec[I_MAX + 1];
- int rel;
mp = &mchr[(int)ship->shp_type];
sp = getsectp(ship->shp_x, ship->shp_y);
if ((sp->sct_own != ship->shp_own) && (sp->sct_own != 0)) {
- rel = getrel(getnatp(sp->sct_own), ship->shp_own);
-
- if (rel < FRIENDLY)
+ if (getrel(getnatp(sp->sct_own), ship->shp_own) < FRIENDLY)
return;
}
- wf = 0;
/* only military can work on a military boat */
- if (ship->shp_glim > 0)
+ if (mp->m_glim != 0)
wf = etus * ship->shp_item[I_MILIT] / 2;
else
wf = etus * (ship->shp_item[I_CIVIL] / 2 + ship->shp_item[I_MILIT] / 5);
if (!player->simulation)
avail = wf + sp->sct_avail * 100;
else
- avail = wf + gt_bg_nmbr(bp, sp, I_MAX + 1) * 100;
+ avail = wf + bp_get_avail(bp, sp) * 100;
}
w_p_eff = SHP_BLD_WORK(mp->m_lcm, mp->m_hcm);
return;
}
- left = 100 - ship->shp_effic;
delta = roundavg((double)avail / w_p_eff);
if (delta <= 0)
return;
if (delta > (int)((float)etus * ship_grow_scale))
delta = (int)((float)etus * ship_grow_scale);
- if (delta > left)
- delta = left;
-
- /* delta is the max amount we can grow */
-
- left = 100 - ship->shp_effic;
- if (left > delta)
- left = delta;
+ if (delta > 100 - ship->shp_effic)
+ delta = 100 - ship->shp_effic;
- leftp = left / 100.0;
memset(mvec, 0, sizeof(mvec));
- 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);
-
- 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);
-
- build = ldround(buildp * 100.0, 1);
- memset(mvec, 0, sizeof(mvec));
- mvec[I_LCM] = roundavg(mp->m_lcm * buildp);
- mvec[I_HCM] = roundavg(mp->m_hcm * buildp);
- get_materials(sp, bp, mvec, 1);
+ mvec[I_LCM] = mp->m_lcm;
+ mvec[I_HCM] = mp->m_hcm;
+ build = get_materials(sp, bp, mvec, delta);
if (sp->sct_type != SCT_HARBR)
build = delta;
+
wf -= build * w_p_eff;
if (wf < 0) {
/*
if (!player->simulation)
avail = (sp->sct_avail * 100 + wf) / 100;
else
- avail = (gt_bg_nmbr(bp, sp, I_MAX + 1) * 100 + wf) / 100;
+ avail = (bp_get_avail(bp, sp) * 100 + wf) / 100;
if (avail < 0)
avail = 0;
if (!player->simulation)
sp->sct_avail = avail;
else
- pt_bg_nmbr(bp, sp, I_MAX + 1, avail);
+ bp_put_avail(bp, sp, avail);
}
if (sp->sct_type != SCT_HARBR)
if ((build + ship->shp_effic) > 80) {
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);
+ snxtitem_cargo(&ni, EF_LAND, EF_SHIP, sp->shp_uid);
while ((lp = nxtitemp(&ni)) && needed > sp->shp_item[I_FOOD]) {
- if (lp->lnd_ship != sp->shp_uid)
- continue;
give = lp->lnd_item[I_FOOD] - food_needed(lp->lnd_item, etus);
if (give < 1.0)
continue;
projects / empserver / blobdiff