/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
#include <config.h>
-#include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
-#include "file.h"
+#include <ctype.h>
#include "commands.h"
-#include "optlist.h"
#include "empobj.h"
+#include "optlist.h"
static void scuttle_land(struct lndstr *);
sprintf(prompt, "%s(s)? ", ef_nameof(type));
if ((p = getstarg(player->argp[2], prompt, buf)) == 0)
return RET_SYN;
- if (!snxtitem(&ni, type, p))
+ if (!snxtitem(&ni, type, p, NULL))
return RET_SYN;
if (p && (isalpha(*p) || (*p == '*') || (*p == '~') || issector(p)
|| islist(p))) {
if (!scuttle_tradeship(&item.ship, 1))
continue;
}
- pr("%s", prship(&item.ship));
scuttle_ship(&item.ship);
} else if (type == EF_LAND) {
if (item.land.lnd_ship >= 0) {
prland(&item.land));
continue;
}
- pr("%s", prland(&item.land));
scuttle_land(&item.land);
} else {
- pr("%s", prplane(&item.plane));
- if (item.plane.pln_ship >= 0) {
- struct shpstr ship;
-
- getship(item.plane.pln_ship, &ship);
- take_plane_off_ship(&item.plane, &ship);
- }
item.plane.pln_effic = 0;
putplane(item.plane.pln_uid, &item.plane);
}
- pr(" scuttled in %s\n",
- xyas(item.ship.shp_x, item.ship.shp_y, player->cnum));
+ pr("%s scuttled in %s\n",
+ obj_nameof(&item.gen),
+ xyas(item.gen.x, item.gen.y, player->cnum));
}
return RET_OK;
{
float cash = 0;
float ally_cash = 0;
- int dist;
+ int dist = -1;
struct sctstr sect;
struct mchrstr *mp;
struct natstr *np;
mp = &mchr[(int)sp->shp_type];
getsect(sp->shp_x, sp->shp_y, §);
- if (sect.sct_own && sect.sct_type == SCT_HARBR) {
+ if (sect.sct_own && sect.sct_type == SCT_HARBR && sect.sct_effic >= 2
+ && getrel(getnatp(sect.sct_own), sp->shp_own) >= FRIENDLY) {
dist = mapdist(sp->shp_x, sp->shp_y,
sp->shp_orig_x, sp->shp_orig_y);
/* Don't disclose distance to to pirates */
- if (sp->shp_own == sp->shp_orig_own) {
- if (interactive)
- pr("%s has gone %d sects\n", prship(sp), dist);
- else
- wu(0, sp->shp_own, "%s has gone %d sects\n",
- prship(sp), dist);
- }
+ if (sp->shp_own == sp->shp_orig_own)
+ mpr(sp->shp_own, "%s has gone %d sects\n", prship(sp), dist);
if (dist < trade_1_dist)
cash = 0;
else if (dist < trade_2_dist)
}
}
- if (!interactive && cash) {
+ if (!cash && (dist < 0 || sp->shp_own == sp->shp_orig_own)) {
+ if (interactive) {
+ pr("You won't get any money if you scuttle in %s!",
+ xyas(sp->shp_x, sp->shp_y, player->cnum));
+ sprintf(buf, "Are you sure you want to scuttle %s? ", prship(sp));
+ return confirm(buf);
+ } else
+ return 0;
+ }
+
+ if (interactive) {
+ player->dolcost -= cash;
+ } else {
natp = getnatp(sp->shp_own);
natp->nat_money += cash;
putnat(natp);
wu(0, sp->shp_own, "You just made $%d.\n", (int)cash);
- } else if (!cash && !interactive) {
- wu(0, sp->shp_own, "Unfortunately, you make $0 on this trade.\n");
- } else if (cash && interactive) {
- player->dolcost -= cash;
- } else if (interactive && sp->shp_own == sp->shp_orig_own) {
- pr("You won't get any money if you scuttle in %s!",
- xyas(sp->shp_x, sp->shp_y, player->cnum));
- sprintf(buf, "Are you sure you want to scuttle %s? ", prship(sp));
- return confirm(buf);
}
if (ally_cash) {
struct lndstr land;
getsect(sp->shp_x, sp->shp_y, §);
- snxtitem_all(&ni, EF_PLANE);
+ snxtitem_cargo(&ni, EF_PLANE, EF_SHIP, sp->shp_uid);
while (nxtitem(&ni, &plane)) {
- if (plane.pln_own == 0)
- continue;
- if (plane.pln_ship == sp->shp_uid) {
- plane.pln_ship = -1;
- if (sect.sct_own != sp->shp_own) {
- wu(0, plane.pln_own, "Plane %d scuttled in %s\n",
- plane.pln_uid,
- xyas(plane.pln_x, plane.pln_y, plane.pln_own));
- plane.pln_effic = 0;
- } else {
- wu(0, plane.pln_own,
- "Plane %d transferred off ship %d to %s\n",
- plane.pln_uid, sp->shp_uid,
- xyas(plane.pln_x, plane.pln_y, plane.pln_own));
- }
- putplane(plane.pln_uid, &plane);
+ plane.pln_ship = -1;
+ if (sect.sct_own != sp->shp_own) {
+ wu(0, plane.pln_own, "Plane %d scuttled in %s\n",
+ plane.pln_uid,
+ xyas(plane.pln_x, plane.pln_y, plane.pln_own));
+ plane.pln_effic = 0;
+ } else {
+ wu(0, plane.pln_own,
+ "Plane %d transferred off ship %d to %s\n",
+ plane.pln_uid, sp->shp_uid,
+ xyas(plane.pln_x, plane.pln_y, plane.pln_own));
}
+ putplane(plane.pln_uid, &plane);
}
- snxtitem_all(&ni, EF_LAND);
+ snxtitem_cargo(&ni, EF_LAND, EF_SHIP, sp->shp_uid);
while (nxtitem(&ni, &land)) {
- if (land.lnd_own == 0)
- continue;
- if (land.lnd_ship == sp->shp_uid) {
- land.lnd_ship = -1;
- if (sect.sct_own == sp->shp_own) {
- wu(0, land.lnd_own,
- "Land unit %d transferred off ship %d to %s\n",
- land.lnd_uid, sp->shp_uid,
- xyas(land.lnd_x, land.lnd_y, land.lnd_own));
- putland(land.lnd_uid, &land);
- } else
- scuttle_land(&land);
- }
+ land.lnd_ship = -1;
+ if (sect.sct_own == sp->shp_own) {
+ wu(0, land.lnd_own,
+ "Land unit %d transferred off ship %d to %s\n",
+ land.lnd_uid, sp->shp_uid,
+ xyas(land.lnd_x, land.lnd_y, land.lnd_own));
+ putland(land.lnd_uid, &land);
+ } else
+ scuttle_land(&land);
}
sp->shp_effic = 0;
putship(sp->shp_uid, sp);
struct lndstr land;
getsect(lp->lnd_x, lp->lnd_y, §);
- snxtitem_all(&ni, EF_PLANE);
+ snxtitem_cargo(&ni, EF_PLANE, EF_LAND, lp->lnd_uid);
while (nxtitem(&ni, &plane)) {
- if (plane.pln_own == 0)
- continue;
- if (plane.pln_land == lp->lnd_uid) {
- plane.pln_land = -1;
- if (sect.sct_own != lp->lnd_own) {
- wu(0, plane.pln_own, "Plane %d scuttled in %s\n",
- plane.pln_uid,
- xyas(plane.pln_x, plane.pln_y, plane.pln_own));
- plane.pln_effic = 0;
- } else {
- wu(0, plane.pln_own,
- "Plane %d transferred off unit %d to %s\n",
- plane.pln_uid, lp->lnd_uid,
- xyas(plane.pln_x, plane.pln_y, plane.pln_own));
- }
- putplane(plane.pln_uid, &plane);
+ plane.pln_land = -1;
+ if (sect.sct_own != lp->lnd_own) {
+ wu(0, plane.pln_own, "Plane %d scuttled in %s\n",
+ plane.pln_uid,
+ xyas(plane.pln_x, plane.pln_y, plane.pln_own));
+ plane.pln_effic = 0;
+ } else {
+ wu(0, plane.pln_own,
+ "Plane %d transferred off unit %d to %s\n",
+ plane.pln_uid, lp->lnd_uid,
+ xyas(plane.pln_x, plane.pln_y, plane.pln_own));
}
+ putplane(plane.pln_uid, &plane);
}
- snxtitem_all(&ni, EF_LAND);
+ snxtitem_cargo(&ni, EF_LAND, EF_LAND, lp->lnd_uid);
while (nxtitem(&ni, &land)) {
- if (land.lnd_own == 0)
- continue;
- if (land.lnd_land == lp->lnd_uid) {
- land.lnd_land = -1;
- if (sect.sct_own == lp->lnd_own) {
- wu(0, land.lnd_own,
- "Land unit %d transferred off unit %d to %s\n",
- land.lnd_uid, lp->lnd_uid,
- xyas(land.lnd_x, land.lnd_y, land.lnd_own));
- putland(land.lnd_uid, &land);
- } else
- scuttle_land(&land);
- }
+ land.lnd_land = -1;
+ if (sect.sct_own == lp->lnd_own) {
+ wu(0, land.lnd_own,
+ "Land unit %d transferred off unit %d to %s\n",
+ land.lnd_uid, lp->lnd_uid,
+ xyas(land.lnd_x, land.lnd_y, land.lnd_own));
+ putland(land.lnd_uid, &land);
+ } else
+ scuttle_land(&land);
}
lp->lnd_effic = 0;
putland(lp->lnd_uid, lp);
projects / empserver / blobdiff