/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
* Chad Zabel, 1994
* Steve McClure, 1998-2000
* Ron Koenderink, 2003-2009
- * Markus Armbruster, 2003-2013
+ * Markus Armbruster, 2003-2016
*/
#include <config.h>
#include <ctype.h>
#include <limits.h>
+#include "actofgod.h"
#include "commands.h"
#include "item.h"
#include "land.h"
#include "plague.h"
#include "plane.h"
#include "ship.h"
+#include "unit.h"
static void print_sect(struct sctstr *);
static void print_nat(struct natstr *);
static void print_plane(struct plnstr *);
static void print_land(struct lndstr *);
static void print_ship(struct shpstr *);
-static int getin(char *, char **);
-static int edit_sect(struct sctstr *, char, int, char *);
-static int edit_nat(struct natstr *, char, int, char *);
-static int edit_ship(struct shpstr *, char, int, char *);
-static int edit_land(struct lndstr *, char, int, char *);
-static int edit_plane(struct plnstr *, char, int, char *);
+static void print_nuke(struct nukstr *);
+static char *getin(char *, char **);
+static int edit_nat(struct natstr *, char *, char *);
+static int edit_ship(struct shpstr *, char *, char *);
+static int edit_land(struct lndstr *, char *, char *);
+static int edit_plane(struct plnstr *, char *, char *);
+static int edit_nuke(struct nukstr *, char *, char *);
int
edit(void)
{
- struct sctstr sect;
- struct plnstr plane;
- struct shpstr ship;
- struct lndstr land;
+ union empobj_storage item;
char *what;
- char *ptr;
- char thing;
- int num;
- int arg;
- int err;
- int arg_index = 3;
- coord x, y;
+ struct nstr_item ni;
+ char *key, *ptr;
struct natstr *np;
+ int type, arg_index, ret;
char buf[1024];
- char ewhat;
what = getstarg(player->argp[1],
"Edit what (country, land, ship, plane, nuke, unit)? ",
buf);
if (!what)
return RET_SYN;
- ewhat = what[0];
- switch (ewhat) {
+ switch (what[0]) {
case 'l':
- if (!(ptr = getstarg(player->argp[2], "Sector : ", buf)))
- return RET_FAIL;
- if (!sarg_xy(ptr, &x, &y))
- return RET_FAIL;
- if (!getsect(x, y, §))
- return RET_FAIL;
- break;
- case 'c':
- np = natargp(player->argp[2], "Country? ");
- if (!np)
- return RET_SYN;
+ type = EF_SECTOR;
break;
case 'p':
- if ((num = onearg(player->argp[2], "Plane number? ")) < 0)
- return RET_SYN;
- if (!getplane(num, &plane))
- return RET_SYN;
+ type = EF_PLANE;
break;
case 's':
- if ((num = onearg(player->argp[2], "Ship number? ")) < 0)
- return RET_SYN;
- if (!getship(num, &ship))
- return RET_SYN;
+ type = EF_SHIP;
break;
case 'u':
- if ((num = onearg(player->argp[2], "Unit number? ")) < 0)
- return RET_SYN;
- if (!getland(num, &land))
- return RET_SYN;
+ type = EF_LAND;
break;
case 'n':
- pr("Not implemented yet.\n");
+ type = EF_NUKE;
+ break;
+ case 'c':
+ type = EF_NATION;
break;
default:
pr("huh?\n");
return RET_SYN;
}
- if (!player->argp[3]) {
- switch (ewhat) {
- case 'l':
- print_sect(§);
- break;
- case 'c':
- print_nat(np);
- break;
- case 'p':
- print_plane(&plane);
- break;
- case 's':
- print_ship(&ship);
- break;
- case 'u':
- print_land(&land);
- break;
+
+ if (!snxtitem(&ni, type, player->argp[2], NULL))
+ return RET_SYN;
+ while (nxtitem(&ni, &item)) {
+ if (!player->argp[3]) {
+ switch (type) {
+ case EF_SECTOR:
+ print_sect(&item.sect);
+ break;
+ case EF_SHIP:
+ print_ship(&item.ship);
+ break;
+ case EF_PLANE:
+ print_plane(&item.plane);
+ break;
+ case EF_LAND:
+ print_land(&item.land);
+ break;
+ case EF_NUKE:
+ print_nuke(&item.nuke);
+ break;
+ case EF_NATION:
+ print_nat(&item.nat);
+ break;
+ default:
+ CANT_REACH();
+ }
}
- }
- for (;;) {
- if (player->argp[arg_index]) {
- if (player->argp[arg_index+1]) {
- thing = player->argp[arg_index++][0];
- ptr = player->argp[arg_index++];
- arg = atoi(ptr);
- } else
- return RET_SYN;
- } else if (arg_index == 3) {
- err = getin(buf, &ptr);
- if (err < 0)
- return RET_SYN;
- if (err == 0) {
- switch (ewhat) {
- case 'c':
- print_nat(np);
- break;
- case 'l':
- print_sect(§);
- break;
- case 's':
- print_ship(&ship);
- break;
- case 'u':
- print_land(&land);
- break;
- case 'p':
- print_plane(&plane);
+
+ arg_index = 3;
+ for (;;) {
+ if (player->argp[arg_index]) {
+ if (player->argp[arg_index+1]) {
+ key = player->argp[arg_index++];
+ ptr = player->argp[arg_index++];
+ } else
+ return RET_SYN;
+ } else if (arg_index == 3) {
+ key = getin(buf, &ptr);
+ if (!key)
+ return RET_SYN;
+ if (!*key)
break;
- }
- return RET_OK;
- }
- thing = err;
- arg = atoi(ptr);
- } else
- return RET_OK;
+ } else
+ break;
- switch (ewhat) {
- case 'c':
- if ((err = edit_nat(np, thing, arg, ptr)) != RET_OK)
- return err;
- break;
- case 'l':
- if (!check_sect_ok(§))
- return RET_FAIL;
- if ((err = edit_sect(§, thing, arg, ptr)) != RET_OK)
- return err;
- if (!putsect(§))
- return RET_FAIL;
- break;
- case 's':
- if (!check_ship_ok(&ship))
- return RET_FAIL;
- if ((err = edit_ship(&ship, thing, arg, ptr)) != RET_OK)
- return err;
- if (!ef_ensure_space(EF_SHIP, ship.shp_uid, 50))
- return RET_FAIL;
- if (!putship(ship.shp_uid, &ship))
- return RET_FAIL;
- break;
- case 'u':
- if (!check_land_ok(&land))
- return RET_FAIL;
- if ((err = edit_land(&land, thing, arg, ptr)) != RET_OK)
- return err;
- if (!ef_ensure_space(EF_LAND, land.lnd_uid, 50))
- return RET_FAIL;
- if (!putland(land.lnd_uid, &land))
- return RET_FAIL;
- break;
- case 'p':
- if (!check_plane_ok(&plane))
- return RET_FAIL;
- if ((err = edit_plane(&plane, thing, arg, ptr)) != RET_OK)
- return err;
- if (!ef_ensure_space(EF_PLANE, plane.pln_uid, 50))
+ if (!check_obj_ok(&item.gen))
return RET_FAIL;
- if (!putplane(plane.pln_uid, &plane))
+ switch (type) {
+ case EF_NATION:
+ /*
+ * edit_nat() may update the edited country by sending
+ * it bulletins. Writing back item.nat would trigger
+ * a seqno mismatch oops. Workaround: edit in-place.
+ */
+ np = getnatp(item.nat.nat_cnum);
+ ret = edit_nat(np, key, ptr);
+ if (ret != RET_OK)
+ return ret;
+ if (!putnat(np))
+ return RET_FAIL;
+ item.nat = *np;
+ continue;
+ case EF_SECTOR:
+ ret = edit_sect(&item.sect, key, ptr);
+ break;
+ case EF_SHIP:
+ ret = edit_ship(&item.ship, key, ptr);
+ break;
+ case EF_LAND:
+ ret = edit_land(&item.land, key, ptr);
+ break;
+ case EF_PLANE:
+ ret = edit_plane(&item.plane, key, ptr);
+ break;
+ case EF_NUKE:
+ ret = edit_nuke(&item.nuke, key, ptr);
+ break;
+ default:
+ CANT_REACH();
+ }
+ if (ret != RET_OK)
+ return ret;
+ if (!put_empobj(type, item.gen.uid, &item.gen))
return RET_FAIL;
- break;
}
}
-}
-
-static void
-benefit(natid who, int good)
-{
- if (!opt_GODNEWS)
- return;
- if (good) {
- if (who)
- nreport(player->cnum, N_AIDS, who, 1);
- } else {
- if (who)
- nreport(player->cnum, N_HURTS, who, 1);
- }
+ return RET_OK;
}
static void
noise(struct sctstr *sptr, char *name, int old, int new)
{
- pr("%s of %s changed from %d to %d\n",
- name, xyas(sptr->sct_x, sptr->sct_y, player->cnum), old, new);
- if (sptr->sct_own)
- wu(player->cnum, sptr->sct_own,
- "%s in %s was changed from %d to %d by an act of %s\n",
- name, xyas(sptr->sct_x, sptr->sct_y, sptr->sct_own),
- old, new, cname(player->cnum));
- benefit(sptr->sct_own, old < new);
+ divine_sct_change(sptr, name, new != old, new - old,
+ "from %d to %d", old, new);
}
static void
static void
print_nat(struct natstr *np)
{
- int i;
-
pr("Country #: %2d\n", np->nat_cnum);
pr("Name <n>: %-20s\t", np->nat_cnam);
- pr("Representative <r>: %-20s\n", np->nat_pnam);
+ pr("Representative <r>: %s\n", np->nat_pnam);
pr("BTUs <b>: %3d\t\t\t", np->nat_btu);
pr("Reserves <m>: %5d\n", np->nat_reserve);
pr("Capital <c>: %s\t\t",
pr("Happiness <H>: %.2f\n", np->nat_level[NAT_HLEV]);
pr("Money <M>: $%6d\n", np->nat_money);
pr("Telegrams <t>: %6d\n", np->nat_tgms);
- if (opt_HIDDEN) {
- pr("Countries contacted: ");
- for (i = 0; i < MAXNOC; i++) {
- if (getcontact(np, i))
- pr("%d(%d) ", i, getcontact(np, i));
- }
- pr("\n");
- }
}
static void
{
pr("%s %s\n", prnatid(plane->pln_own), prplane(plane));
pr("UID <U>: %d\t\t", plane->pln_uid);
+ pr("Type <T>: %s\n", plchr[plane->pln_type].pl_name);
pr("Owner <O>: %d\t\t", plane->pln_own);
pr("Location <l>: %s\n",
xyas(plane->pln_x, plane->pln_y, player->cnum));
pr("Range <r>: %d\t\t", plane->pln_range);
pr("Flags <f>: %d\n", plane->pln_flags);
pr("Ship <s>: %d\t\t", plane->pln_ship);
- pr("Land Unit <y>: %d\t", plane->pln_land);
+ pr("Land Unit <y>: %d\n", plane->pln_land);
}
static void
print_land(struct lndstr *land)
{
pr("%s %s\n", prnatid(land->lnd_own), prland(land));
- pr("UID <U>: %d\n", land->lnd_uid);
+ pr("UID <U>: %d\t\t", land->lnd_uid);
+ pr("Type <T>: %s\n", lchr[land->lnd_type].l_name);
pr("Owner <O>: %d\n", land->lnd_own);
pr("Location <L>: %s\n", xyas(land->lnd_x, land->lnd_y, player->cnum));
pr("Efficiency <e>: %d\t", land->lnd_effic);
print_ship(struct shpstr *ship)
{
pr("%s %s\n", prnatid(ship->shp_own), prship(ship));
- pr("UID <U>: %d\n", ship->shp_uid);
+ pr("UID <U>: %d\t\t\t", ship->shp_uid);
+ pr("Type <t>: %s\n", mchr[ship->shp_type].m_name);
pr("Owner <O>: %d\t\t\t", ship->shp_own);
pr("Location <L>: %s\n", xyas(ship->shp_x, ship->shp_y, player->cnum));
pr("Tech <T>: %d\t\t\t", ship->shp_tech);
pr("\n");
}
-static int
+static void
+print_nuke(struct nukstr *nuke)
+{
+ pr("%s %s\n", prnatid(nuke->nuk_own), prnuke(nuke));
+ pr("UID <U>: %d\t\t\t", nuke->nuk_uid);
+ pr("Type <t>: %d\n", nuke->nuk_type);
+ pr("Owner <O>: %d\t\t\t", nuke->nuk_own);
+ pr("Location <L>: %s\n", xyas(nuke->nuk_x, nuke->nuk_y, player->cnum));
+ pr("Tech <T>: %d\t\t\t", nuke->nuk_tech);
+ pr("Stockpile <S>: %.1s\n", &nuke->nuk_stockpile);
+ pr("Plane <p>: %d\n", nuke->nuk_plane);
+}
+
+static char *
getin(char *buf, char **valp)
{
char line[1024];
char *argp[128];
char *p;
+ *valp = NULL;
p = getstarg(NULL, "%c xxxxx -- thing value : ", line);
if (!p)
- return -1;
+ return NULL;
switch (parse(p, buf, argp, NULL, NULL, NULL)) {
case 0:
- return 0;
+ return "";
case 1:
- return -1;
+ return NULL;
default:
*valp = argp[1];
- return argp[0][0];
+ return argp[0];
}
}
}
#endif
-static int
-edit_sect(struct sctstr *sect, char op, int arg, char *p)
+int
+edit_sect_i(struct sctstr *sect, char *key, int arg)
{
- coord newx, newy;
int new;
- switch (op) {
+ switch (*key) {
case 'o':
if (arg < 0 || arg >= MAXNOC)
return RET_SYN;
- pr("Owner of %s changed from %s to %s.\n",
- xyas(sect->sct_x, sect->sct_y, player->cnum),
- prnatid(sect->sct_own), prnatid(arg));
- if (sect->sct_own) {
- wu(player->cnum, sect->sct_own,
- "Sector %s lost to deity intervention\n",
- xyas(sect->sct_x, sect->sct_y, sect->sct_own));
- }
- benefit(sect->sct_own, 0);
+ divine_sct_change_quiet(sect, "Owner", arg != sect->sct_own,
+ "from %s to %s",
+ prnatid(sect->sct_own), prnatid(arg));
+ if (arg == sect->sct_own)
+ break;
+ report_god_takes("Sector ",
+ xyas(sect->sct_x, sect->sct_y, sect->sct_own),
+ sect->sct_own);
+ report_god_gives("Sector ",
+ xyas(sect->sct_x, sect->sct_y, arg),
+ arg);
sect->sct_own = arg;
- if (arg) {
- wu(player->cnum, arg,
- "Sector %s gained from deity intervention\n",
- xyas(sect->sct_x, sect->sct_y, arg));
- }
- benefit(arg, 1);
break;
case 'O':
if (arg < 0 || arg >= MAXNOC)
return RET_SYN;
- pr("Old owner of %s changed from %s to %s.\n",
- xyas(sect->sct_x, sect->sct_y, player->cnum),
- prnatid(sect->sct_oldown), prnatid(arg));
+ divine_sct_change(sect, "Old owner", arg != sect->sct_oldown, 0,
+ "from %s to %s",
+ prnatid(sect->sct_oldown), prnatid(arg));
sect->sct_oldown = arg;
break;
case 'e':
sect->sct_mobil = new;
break;
case 'i':
- new = LIMIT_TO(arg, 0, 127);
+ new = LIMIT_TO(arg, 0, 100);
noise(sect, "Iron ore content", sect->sct_min, new);
sect->sct_min = (unsigned char)new;
break;
case 'g':
- new = LIMIT_TO(arg, 0, 127);
+ new = LIMIT_TO(arg, 0, 100);
noise(sect, "Gold content", sect->sct_gmin, new);
sect->sct_gmin = (unsigned char)new;
break;
case 'f':
- new = LIMIT_TO(arg, 0, 127);
+ new = LIMIT_TO(arg, 0, 100);
noise(sect, "Fertility", sect->sct_fertil, new);
sect->sct_fertil = (unsigned char)new;
break;
case 'c':
- new = LIMIT_TO(arg, 0, 127);
+ new = LIMIT_TO(arg, 0, 100);
noise(sect, "Oil content", sect->sct_oil, new);
sect->sct_oil = (unsigned char)new;
break;
case 'u':
- new = LIMIT_TO(arg, 0, 127);
+ new = LIMIT_TO(arg, 0, 100);
noise(sect, "Uranium content", sect->sct_uran, new);
sect->sct_uran = (unsigned char)new;
break;
break;
case 'l':
new = LIMIT_TO(arg, 0, 127);
- pr("Loyalty of %s changed from %d to %d\n",
- xyas(sect->sct_x, sect->sct_y, player->cnum),
- sect->sct_loyal, new);
+ divine_sct_change_quiet(sect, "Loyalty", new != sect->sct_loyal,
+ "from %d to %d", sect->sct_loyal, new);
sect->sct_loyal = (unsigned char)new;
break;
case 'x':
new = LIMIT_TO(arg, 0, CHE_MAX);
- pr("Guerillas in %s changed from %d to %d\n",
- xyas(sect->sct_x, sect->sct_y, player->cnum),
- sect->sct_che, new);
+ divine_sct_change_quiet(sect, "Guerillas", new != sect->sct_che,
+ "from %d to %d", sect->sct_che, new);
sect->sct_che = new;
break;
case 'X':
if (arg < 0 || arg >= MAXNOC)
return RET_SYN;
- pr("Che target of %s changed from %s to %s.\n",
- xyas(sect->sct_x, sect->sct_y, player->cnum),
- prnatid(sect->sct_che_target), prnatid(arg));
+ divine_sct_change_quiet(sect, "Che target",
+ arg != sect->sct_che_target,
+ "from %s to %s",
+ prnatid(sect->sct_che_target),
+ prnatid(arg));
sect->sct_che_target = arg;
if (arg == 0)
sect->sct_che = 0;
break;
case 'p':
new = LIMIT_TO(arg, 0, PLG_EXPOSED);
- pr("Plague stage of %s changed from %d to %d\n",
- xyas(sect->sct_x, sect->sct_y, player->cnum),
- sect->sct_pstage, new);
+ divine_sct_change_quiet(sect, "Plague stage",
+ new != sect->sct_pstage,
+ "from %d to %d", sect->sct_pstage, new);
sect->sct_pstage = new;
break;
case 't':
new = LIMIT_TO(arg, 0, 32767);
- pr("Plague time of %s changed from %d to %d\n",
- xyas(sect->sct_x, sect->sct_y, player->cnum),
- sect->sct_ptime, new);
+ divine_sct_change_quiet(sect, "Plague time",
+ new != sect->sct_ptime,
+ "from %d to %d", sect->sct_ptime, new);
sect->sct_ptime = new;
break;
case 'F':
new = LIMIT_TO(arg, 0, FALLOUT_MAX);
- pr("Fallout for sector %s changed from %d to %d\n",
- xyas(sect->sct_x, sect->sct_y, player->cnum),
- sect->sct_fallout, new);
+ noise(sect, "Fallout", sect->sct_fallout, new);
sect->sct_fallout = new;
break;
case 'a':
break;
case 'M':
new = LIMIT_TO(arg, 0, MINES_MAX);
+ if (sect->sct_own == sect->sct_oldown)
+ noise(sect, "Mines", sect->sct_mines, new);
+ else
+ divine_sct_change_quiet(sect, "Mines", new != sect->sct_mines,
+ "from %d to %d", sect->sct_mines, new);
sect->sct_mines = new;
- pr("Mines changed to %d\n", new);
break;
+ case 'R':
+ new = LIMIT_TO(arg, 0, 100);
+ noise(sect, "Road percentage", sect->sct_road, new);
+ sect->sct_road = new;
+ break;
+ case 'r':
+ new = LIMIT_TO(arg, 0, 100);
+ noise(sect, "Rail percentage", sect->sct_rail, new);
+ sect->sct_rail = new;
+ break;
+ case 'd':
+ new = LIMIT_TO(arg, 0, 100);
+ noise(sect, "Defense percentage", sect->sct_defense, new);
+ sect->sct_defense = new;
+ break;
+ default:
+ pr("huh? (%s)\n", key);
+ return RET_SYN;
+ }
+ return RET_OK;
+}
+
+int
+edit_sect(struct sctstr *sect, char *key, char *p)
+{
+ coord newx, newy;
+ int new;
+ struct sctstr newsect;
+
+ switch (*key) {
case 'L':
if (!sarg_xy(p, &newx, &newy))
return RET_SYN;
+ if (newx == sect->sct_x && newy == sect->sct_y) {
+ pr("Sector %s unchanged\n", xyas(newx, newy, player->cnum));
+ break;
+ }
+ getsect(newx, newy, &newsect);
+ pr("Sector %s duplicated to %s\n",
+ xyas(sect->sct_x, sect->sct_y, player->cnum),
+ xyas(newx, newy, player->cnum));
+ report_god_takes("Sector ", xyas(newx, newy, newsect.sct_own),
+ newsect.sct_own);
+ report_god_gives("Sector ", xyas(newx, newy, sect->sct_own),
+ sect->sct_own);
+ if (sect->sct_x == sect->sct_dist_x
+ && sect->sct_y == sect->sct_dist_y) {
+ sect->sct_dist_x = newx;
+ sect->sct_dist_y = newy;
+ }
sect->sct_x = newx;
sect->sct_y = newy;
- ef_set_uid(EF_SECTOR, §, XYOFFSET(newx, newy));
+ sect->sct_coastal = newsect.sct_coastal;
+ ef_set_uid(EF_SECTOR, sect, XYOFFSET(newx, newy));
break;
case 'D':
if (!sarg_xy(p, &newx, &newy))
return RET_SYN;
- pr("Distribution location for sector %s changed from %s to %s\n",
- xyas(sect->sct_x, sect->sct_y, player->cnum),
- xyas(sect->sct_dist_x, sect->sct_dist_y, player->cnum),
- xyas(newx, newy, player->cnum));
+ divine_sct_change_quiet(sect, "Distribution sector",
+ newx != sect->sct_dist_x || newy != sect->sct_dist_y,
+ "from %s to %s",
+ xyas(sect->sct_dist_x, sect->sct_dist_y, player->cnum),
+ xyas(newx, newy, player->cnum));
+ if (newx == sect->sct_dist_x && newy == sect->sct_dist_y)
+ break;
+ if (sect->sct_own && sect->sct_own != player->cnum)
+ wu(0, sect->sct_own,
+ "Distribution sector of %s changed from %s to %s"
+ " by an act of %s\n",
+ xyas(sect->sct_x, sect->sct_y, player->cnum),
+ xyas(sect->sct_dist_x, sect->sct_dist_y, player->cnum),
+ xyas(newx, newy, player->cnum),
+ cname(player->cnum));
sect->sct_dist_x = newx;
sect->sct_dist_y = newy;
break;
new = sct_typematch(p);
if (new < 0)
return RET_SYN;
- pr("Designation for sector %s changed from %c to %c\n",
- xyas(sect->sct_x, sect->sct_y, player->cnum),
- dchr[sect->sct_type].d_mnem, dchr[new].d_mnem);
+ divine_sct_change(sect, "Designation",
+ new != sect->sct_type, 0, "from %c to %c",
+ dchr[sect->sct_type].d_mnem, dchr[new].d_mnem);
set_coastal(sect, sect->sct_type, new);
sect->sct_type = new;
break;
new = sct_typematch(p);
if (new < 0)
return RET_SYN;
- pr("New designation for sector %s changed from %c to %c\n",
- xyas(sect->sct_x, sect->sct_y, player->cnum),
- dchr[sect->sct_newtype].d_mnem, dchr[new].d_mnem);
+ divine_sct_change(sect, "New designation",
+ new != sect->sct_newtype, 0, "from %c to %c",
+ dchr[sect->sct_newtype].d_mnem, dchr[new].d_mnem);
sect->sct_newtype = new;
break;
- case 'R':
- new = LIMIT_TO(arg, 0, 100);
- noise(sect, "Road percentage", sect->sct_road, new);
- sect->sct_road = new;
- break;
- case 'r':
- new = LIMIT_TO(arg, 0, 100);
- noise(sect, "Rail percentage", sect->sct_rail, new);
- sect->sct_rail = new;
- break;
- case 'd':
- new = LIMIT_TO(arg, 0, 100);
- noise(sect, "Defense percentage", sect->sct_defense, new);
- sect->sct_defense = new;
- break;
default:
- pr("huh? (%c)\n", op);
- return RET_SYN;
+ return edit_sect_i(sect, key, atoi(p));
}
return RET_OK;
}
+static void
+edit_level(struct natstr *np, int lvl, char *name, char *p)
+{
+ float new = (float)atof(p);
+
+ new = MAX(0.0, new);
+ divine_nat_change(np, name,
+ new != np->nat_level[lvl],
+ (new > np->nat_level[lvl]) - (new < np->nat_level[lvl]),
+ "from %.2f to %.2f", np->nat_level[lvl], new);
+ np->nat_level[lvl] = new;
+}
+
static int
-edit_nat(struct natstr *np, char op, int arg, char *p)
+edit_nat(struct natstr *np, char *key, char *p)
{
coord newx, newy;
natid nat = np->nat_cnum;
- float farg = (float)atof(p);
+ int arg = atoi(p);
- switch (op) {
+ switch (*key) {
case 'n':
if (!check_nat_name(p, nat))
return RET_SYN;
- pr("Country name changed from %s to %s\n", np->nat_cnam, p);
+ divine_nat_change(np, "Country name", strcmp(np->nat_cnam, p), 0,
+ "from %s to %s", np->nat_cnam, p);
+ if (opt_GODNEWS)
+ nreport(player->cnum, N_NAME_CHNG, 0, 1);
strcpy(np->nat_cnam, p);
break;
case 'r':
- pr("Country representative changed from %s to %s\n",
- np->nat_pnam, p);
+ divine_nat_change(np, "Country representative",
+ strncmp(p, np->nat_pnam, sizeof(np->nat_pnam) - 1), 0,
+ "from %s to %.*s",
+ np->nat_pnam, (int)sizeof(np->nat_pnam) - 1, p);
strncpy(np->nat_pnam, p, sizeof(np->nat_pnam) - 1);
break;
case 't':
arg = LIMIT_TO(arg, 0, USHRT_MAX);
+ divine_nat_change_quiet(np, "Number of unread telegrams",
+ arg != np->nat_tgms,
+ "from %d to %d", np->nat_tgms, arg);
np->nat_tgms = arg;
break;
case 'b':
arg = LIMIT_TO(arg, 0, max_btus);
- pr("BTU's changed from %d to %d\n", np->nat_btu, arg);
+ divine_nat_change(np, "BTUs",
+ arg != np->nat_btu, arg - np->nat_btu,
+ "from %d to %d", np->nat_btu, arg);
np->nat_btu = arg;
break;
case 'm':
arg = LIMIT_TO(arg, 0, INT_MAX);
- benefit(nat, np->nat_reserve < arg);
- pr("Military reserves changed from %d to %d\n",
- np->nat_reserve, arg);
- wu(player->cnum, nat,
- "Military reserves changed from %d to %d by divine intervention.\n",
- np->nat_reserve, arg);
+ divine_nat_change(np, "Military reserves",
+ arg != np->nat_reserve, arg - np->nat_reserve,
+ "from %d to %d", np->nat_reserve, arg);
np->nat_reserve = arg;
break;
case 'c':
if (!sarg_xy(p, &newx, &newy))
return RET_SYN;
- pr("Capital coordinates changed from %s to %s\n",
- xyas(np->nat_xcap, np->nat_ycap, player->cnum),
- xyas(newx, newy, player->cnum));
+ if (newx == np->nat_xcap && newy == np->nat_ycap)
+ pr("Capital unchanged\n");
+ else {
+ pr("Capital moved from %s to %s\n",
+ xyas(np->nat_xcap, np->nat_ycap, player->cnum),
+ xyas(newx, newy, player->cnum));
+ if (nat != player->cnum)
+ wu(0, nat,
+ "Capital moved from %s to %s by an act of %s!\n",
+ xyas(np->nat_xcap, np->nat_ycap, nat),
+ xyas(newx, newy, nat), cname(player->cnum));
+ }
np->nat_xcap = newx;
np->nat_ycap = newy;
break;
case 'o':
if (!sarg_xy(p, &newx, &newy))
return RET_SYN;
- pr("Origin coordinates changed from %s to %s\n",
- xyas(np->nat_xorg, np->nat_yorg, player->cnum),
- xyas(newx, newy, player->cnum));
+ if (newx == np->nat_xorg && newy == np->nat_yorg)
+ pr("Origin unchanged\n");
+ else {
+ pr("Origin moved from %s to %s\n",
+ xyas(np->nat_xorg, np->nat_yorg, player->cnum),
+ xyas(newx, newy, player->cnum));
+ if (nat != player->cnum)
+ wu(0, nat,
+ "Origin moved from %s to %s by an act of %s!\n",
+ xyas(np->nat_xorg, np->nat_yorg, nat),
+ xyas(newx, newy, nat), cname(player->cnum));
+ }
np->nat_xorg = newx;
np->nat_yorg = newy;
break;
case 's':
- np->nat_stat = LIMIT_TO(arg, STAT_UNUSED, STAT_GOD);
+ arg = LIMIT_TO(arg, STAT_UNUSED, STAT_GOD);
+ divine_nat_change(np, "Status",
+ (enum nat_status)arg != np->nat_stat,
+ 0, "to %s", nation_status[arg].name);
+ np->nat_stat = arg;
break;
case 'u':
arg = LIMIT_TO(arg, 0, m_m_p_d * 60);
- pr("Number of seconds used changed from %d to %d.\n",
- np->nat_timeused, arg);
+ divine_nat_change(np, "Number of seconds used",
+ arg != np->nat_timeused, arg - np->nat_timeused,
+ "from %d to %d", np->nat_timeused, arg);
np->nat_timeused = arg;
break;
case 'M':
- pr("Money changed from %d to %d\n", np->nat_money, arg);
- wu(player->cnum, nat,
- "Money changed from %d to %d by divine intervention.\n",
- np->nat_money, arg);
+ divine_nat_change(np, "Money",
+ arg != np->nat_money, arg - np->nat_money,
+ "from %d to %d", np->nat_money, arg);
np->nat_money = arg;
break;
case 'T':
- farg = MAX(0.0, farg);
- pr("Tech changed from %.2f to %.2f.\n",
- np->nat_level[NAT_TLEV], farg);
- np->nat_level[NAT_TLEV] = farg;
+ edit_level(np, NAT_TLEV, "Technology", p);
break;
case 'R':
- farg = MAX(0.0, farg);
- pr("Research changed from %.2f to %.2f.\n",
- np->nat_level[NAT_RLEV], farg);
- np->nat_level[NAT_RLEV] = farg;
+ edit_level(np, NAT_RLEV, "Research", p);
break;
case 'E':
- farg = MAX(0.0, farg);
- pr("Education changed from %.2f to %.2f.\n",
- np->nat_level[NAT_ELEV], farg);
- np->nat_level[NAT_ELEV] = farg;
+ edit_level(np, NAT_ELEV, "Education", p);
break;
case 'H':
- farg = MAX(0.0, farg);
- pr("Happiness changed from %.2f to %.2f.\n",
- np->nat_level[NAT_HLEV], farg);
- np->nat_level[NAT_HLEV] = farg;
+ edit_level(np, NAT_HLEV, "Happiness", p);
break;
default:
- pr("huh? (%c)\n", op);
+ pr("huh? (%s)\n", key);
break;
}
- putnat(np);
return RET_OK;
}
static int
-edit_ship(struct shpstr *ship, char op, int arg, char *p)
+edit_unit(struct empobj *unit, char *key, char *p,
+ int mineff, char *group_name, int on_carrier)
{
- struct mchrstr *mcp = &mchr[ship->shp_type];
+ int arg = atoi(p);
coord newx, newy;
+ union empobj_storage newunit;
+ char newgroup;
- newx = newy = 0;
- switch (op) {
- case 'a':
- arg = LIMIT_TO(arg, 0, PLG_EXPOSED);
- ship->shp_pstage = arg;
- break;
- case 'b':
- arg = LIMIT_TO(arg, 0, 32767);
- ship->shp_ptime = arg;
- break;
- case 'R':
- strncpy(ship->shp_rpath, p, sizeof(ship->shp_rpath) - 1);
- break;
- case 'W':
- ship->shp_rflags = arg;
- break;
+ switch (toupper(*key)) {
case 'U':
- ef_set_uid(EF_SHIP, ship, arg);
+ if (arg < 0)
+ return RET_SYN;
+ if (arg == unit->uid) {
+ pr("%s unchanged\n", unit_nameof(unit));
+ break;
+ }
+ if (!ef_ensure_space(unit->ef_type, arg, 50)) {
+ pr("Can't copy to %s #%d\n", ef_nameof(unit->ef_type), arg);
+ return RET_FAIL;
+ }
+ pr("%s duplicated to (#%d)\n", unit_nameof(unit), arg);
+ ef_set_uid(unit->ef_type, unit, arg);
+ if (get_empobj(unit->ef_type, arg, &newunit) && newunit.gen.own) {
+ pr("Replacing %s of %s\n",
+ unit_nameof(&newunit.gen), prnatid(newunit.gen.own));
+ report_god_takes("", unit_nameof(&newunit.gen),
+ newunit.gen.own);
+ }
+ report_god_gives("", unit_nameof(unit), unit->own);
break;
case 'O':
if (arg < 0 || arg >= MAXNOC)
return RET_SYN;
- if (ship->shp_own)
- wu(player->cnum, ship->shp_own,
- "%s taken from you by deity intervention!\n", prship(ship));
- if (arg)
- wu(player->cnum, (natid)arg,
- "%s given to you by deity intervention!\n", prship(ship));
- ship->shp_own = arg;
+ divine_unit_change_quiet(unit, "Owner", arg != unit->own,
+ "from %s to %s",
+ prnatid(unit->own), prnatid(arg));
+ if (arg != unit->own) {
+ report_god_takes("", unit_nameof(unit), unit->own);
+ report_god_gives("", unit_nameof(unit), arg);
+ }
+ if (arg && unit->effic < mineff) {
+ divine_unit_change_quiet(unit, "Efficiency", 1,
+ "from %d to %d", unit->effic, mineff);
+ unit->effic = mineff;
+ }
+ unit->own = arg;
break;
case 'L':
if (!sarg_xy(p, &newx, &newy))
return RET_SYN;
- ship->shp_x = newx;
- ship->shp_y = newy;
- break;
- case 'T':
- arg = LIMIT_TO(arg, mcp->m_tech, SHRT_MAX);
- shp_set_tech(ship, arg);
+ if (on_carrier && (newx != unit->x || newy != unit->y)) {
+ pr("Can't move %s while it's loaded\n", unit_nameof(unit));
+ return RET_FAIL;
+ }
+ divine_unit_change_quiet(unit, "Location",
+ newx != unit->x || newy != unit->y,
+ "from %s to %s",
+ xyas(unit->x, unit->y, player->cnum),
+ xyas(newx, newy, player->cnum));
+ if (newx == unit->x && newy == unit->y)
+ break;
+ if (unit->own && unit->own != player->cnum)
+ wu(0, unit->own,
+ "Location of %s changed from %s to %s by an act of %s!\n",
+ unit_nameof(unit),
+ xyas(unit->x, unit->y, unit->own),
+ xyas(newx, newy, unit->own),
+ cname(player->cnum));
+ unit_teleport(unit, newx, newy);
break;
case 'E':
- ship->shp_effic = LIMIT_TO(arg, SHIP_MINEFF, 100);
+ arg = LIMIT_TO(arg, mineff, 100);
+ divine_unit_change(unit, "Efficiency",
+ arg != unit->effic, arg - unit->effic,
+ "from %d to %d", unit->effic, arg);
+ unit->effic = arg;
break;
case 'M':
arg = LIMIT_TO(arg, -127, 127);
- ship->shp_mobil = arg;
+ divine_unit_change(unit, "Mobility",
+ arg != unit->mobil, arg - unit->mobil,
+ "from %d to %d", unit->mobil, arg);
+ unit->mobil = arg;
break;
case 'F':
+ case 'W':
+ case 'A':
+ case 'S':
if (p[0] == '~')
- ship->shp_fleet = 0;
+ newgroup = 0;
else if (isalpha(p[0]))
- ship->shp_fleet = p[0];
+ newgroup = p[0];
else {
- pr("%c: invalid fleet\n", p[0]);
+ pr("%c: invalid %s\n", p[0], group_name);
return RET_FAIL;
}
+ divine_unit_change(unit, "Assignment", newgroup != unit->group, 0,
+ "from %s %c to %c", group_name,
+ unit->group ? unit->group : '~', p[0]);
+ unit->group = newgroup;
break;
- case 'c':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_CIVIL]);
- ship->shp_item[I_CIVIL] = arg;
+ default:
+ CANT_REACH();
+ }
+ return RET_OK;
+}
+
+static void
+edit_item(struct empobj *unit, short item[], struct ichrstr *ip, int arg,
+ short lim[])
+{
+ arg = LIMIT_TO(arg, 0, lim[ip->i_uid]);
+ divine_unit_change_quiet(unit, ip->i_name, arg != item[ip->i_uid],
+ "from %d to %d", item[ip->i_uid], arg);
+ report_divine_gift(unit->own, ip, arg - item[ip->i_uid],
+ unit_nameof(unit));
+ item[ip->i_uid] = arg;
+}
+
+static void
+limit_item(struct empobj *unit, short item[], short lim[])
+{
+ i_type it;
+
+ for (it = I_NONE + 1; it <= I_MAX; it++) {
+ if (item[it] > lim[it])
+ edit_item(unit, item, &ichr[it], item[it], lim);
+ }
+}
+
+static int
+edit_ship(struct shpstr *ship, char *key, char *p)
+{
+ struct mchrstr *mcp = &mchr[ship->shp_type];
+ int arg = atoi(p);
+ int ret;
+
+ switch (*key) {
+ case 'U':
+ case 'O':
+ case 'L':
+ case 'E':
+ case 'M':
+ case 'F':
+ ret = edit_unit((struct empobj *)ship, key, p,
+ SHIP_MINEFF, "fleet", 0);
+ return ret;
+ case 't':
+ arg = ef_elt_byname(EF_SHIP_CHR, p);
+ if (arg < 0) {
+ pr("%s: invalid ship type\n", p);
+ return RET_FAIL;
+ }
+ divine_unit_change((struct empobj *)ship, "Type",
+ arg != ship->shp_type, 0,
+ "to %s", mchr[arg].m_name);
+ if (ship->shp_tech < mchr[arg].m_tech)
+ shp_set_tech(ship, mchr[arg].m_tech);
+ ship->shp_type = arg;
+ shp_set_tech(ship, ship->shp_tech);
+ limit_item((struct empobj *)ship, ship->shp_item, mchr[arg].m_item);
break;
- case 'm':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_MILIT]);
- ship->shp_item[I_MILIT] = arg;
+ case 'T':
+ arg = LIMIT_TO(arg, mcp->m_tech, SHRT_MAX);
+ divine_unit_change((struct empobj *)ship, "Tech level",
+ arg != ship->shp_tech, arg - ship->shp_tech,
+ "from %d to %d", ship->shp_tech, arg);
+ shp_set_tech(ship, arg);
break;
- case 'u':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_UW]);
- ship->shp_item[I_UW] = arg;
+ case 'a':
+ arg = LIMIT_TO(arg, 0, PLG_EXPOSED);
+ divine_unit_change_quiet((struct empobj *)ship, "Plague stage",
+ arg != ship->shp_pstage,
+ "from %d to %d", ship->shp_pstage, arg);
+ ship->shp_pstage = arg;
break;
- case 'f':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_FOOD]);
- ship->shp_item[I_FOOD] = arg;
+ case 'b':
+ arg = LIMIT_TO(arg, 0, 32767);
+ divine_unit_change_quiet((struct empobj *)ship, "Plague time",
+ arg != ship->shp_ptime,
+ "from %d to %d", ship->shp_ptime, arg);
+ ship->shp_ptime = arg;
break;
- case 's':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_SHELL]);
- ship->shp_item[I_SHELL] = arg;
+ case 'R':
+ divine_unit_change((struct empobj *)ship, "Retreat path",
+ strncmp(p, ship->shp_rpath, sizeof(ship->shp_rpath) - 1),
+ 0, "from %s to %.*s",
+ ship->shp_rpath, (int)sizeof(ship->shp_rpath) - 1, p);
+ strncpy(ship->shp_rpath, p, sizeof(ship->shp_rpath) - 1);
break;
- case 'g':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_GUN]);
- ship->shp_item[I_GUN] = arg;
+ case 'W':
+ divine_flag_change((struct empobj *)ship, "Retreat conditions",
+ ship->shp_rflags, arg, retreat_flags);
+ ship->shp_rflags = arg;
break;
+ case 'c':
+ case 'm':
+ case 'u':
+ case 'f':
+ case 's':
+ case 'g':
case 'p':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_PETROL]);
- ship->shp_item[I_PETROL] = arg;
- break;
case 'i':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_IRON]);
- ship->shp_item[I_IRON] = arg;
- break;
case 'd':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_DUST]);
- ship->shp_item[I_DUST] = arg;
- break;
case 'o':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_OIL]);
- ship->shp_item[I_OIL] = arg;
- break;
case 'l':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_LCM]);
- ship->shp_item[I_LCM] = arg;
- break;
case 'h':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_HCM]);
- ship->shp_item[I_HCM] = arg;
- break;
case 'r':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_RAD]);
- ship->shp_item[I_RAD] = arg;
+ edit_item((struct empobj *)ship, ship->shp_item, item_by_name(key),
+ arg, mcp->m_item);
break;
default:
- pr("huh? (%c)\n", op);
+ pr("huh? (%s)\n", key);
return RET_FAIL;
}
return RET_OK;
}
static int
-edit_land(struct lndstr *land, char op, int arg, char *p)
+edit_land(struct lndstr *land, char *key, char *p)
{
struct lchrstr *lcp = &lchr[land->lnd_type];
- coord newx, newy;
+ int arg = atoi(p);
- newx = newy = 0;
- switch (op) {
- case 'Y':
- if (arg < -1 || arg >= ef_nelem(EF_LAND))
- return RET_SYN;
- if (arg >= 0 && arg != land->lnd_land)
- land->lnd_ship = -1;
- land->lnd_land = arg;
- break;
+ switch (*key) {
case 'U':
- ef_set_uid(EF_LAND, land, arg);
- break;
case 'O':
- if (arg < 0 || arg >= MAXNOC)
- return RET_SYN;
- if (land->lnd_own)
- wu(player->cnum, land->lnd_own,
- "%s taken from you by deity intervention!\n", prland(land));
- if (arg)
- wu(player->cnum, (natid)arg,
- "%s given to you by deity intervention!\n", prland(land));
- land->lnd_own = arg;
- break;
case 'L':
- if (!sarg_xy(p, &newx, &newy))
- return RET_SYN;
- land->lnd_x = newx;
- land->lnd_y = newy;
- break;
case 'e':
- land->lnd_effic = LIMIT_TO(arg, LAND_MINEFF, 100);
- break;
case 'M':
- arg = LIMIT_TO(arg, -127, 127);
- land->lnd_mobil = arg;
+ case 'a':
+ return edit_unit((struct empobj *)land, key, p,
+ LAND_MINEFF, "army",
+ land->lnd_ship >= 0 || land->lnd_land >= 0);
+ case 'T':
+ arg = ef_elt_byname(EF_LAND_CHR, p);
+ if (arg < 0) {
+ pr("%s: invalid land unit type\n", p);
+ return RET_FAIL;
+ }
+ divine_unit_change((struct empobj *)land, "Type",
+ arg != land->lnd_type, 0,
+ "to %s", lchr[arg].l_name);
+ if (land->lnd_tech < lchr[arg].l_tech)
+ lnd_set_tech(land, lchr[arg].l_tech);
+ land->lnd_type = arg;
+ lnd_set_tech(land, land->lnd_tech);
+ limit_item((struct empobj *)land, land->lnd_item, lchr[arg].l_item);
break;
case 't':
arg = LIMIT_TO(arg, lcp->l_tech, SHRT_MAX);
+ divine_unit_change((struct empobj *)land, "Tech level",
+ arg != land->lnd_tech, arg - land->lnd_tech,
+ "from %d to %d", land->lnd_tech, arg);
lnd_set_tech(land, arg);
break;
- case 'a':
- if (p[0] == '~')
- land->lnd_army = 0;
- else if (isalpha(p[0]))
- land->lnd_army = p[0];
- else {
- pr("%c: invalid army\n", p[0]);
- return RET_FAIL;
- }
- break;
case 'F':
- land->lnd_harden = LIMIT_TO(arg, 0, 127);
+ arg = LIMIT_TO(arg, 0, 127);
+ divine_unit_change((struct empobj *)land, "Fortification",
+ arg != land->lnd_harden, arg - land->lnd_harden,
+ "from %d to %d", land->lnd_harden, arg);
+ land->lnd_harden = arg;
break;
case 'S':
if (arg < -1 || arg >= ef_nelem(EF_SHIP))
return RET_SYN;
- if (arg >= 0 && arg != land->lnd_ship)
+ if (arg == land->lnd_ship) {
+ pr("Ship of %s unchanged\n", prland(land));
+ break;
+ }
+ divine_unload((struct empobj *)land, EF_SHIP, land->lnd_ship);
+ if (arg >= 0) {
+ divine_unload((struct empobj *)land, EF_LAND, land->lnd_land);
land->lnd_land = -1;
+ }
+ divine_load((struct empobj *)land, EF_SHIP, arg);
land->lnd_ship = arg;
break;
+ case 'Y':
+ if (arg < -1 || arg >= ef_nelem(EF_LAND))
+ return RET_SYN;
+ if (arg == land->lnd_land) {
+ pr("Land unit of %s unchanged\n", prland(land));
+ break;
+ }
+ divine_unload((struct empobj *)land, EF_LAND, land->lnd_land);
+ if (arg >= 0) {
+ divine_unload((struct empobj *)land, EF_SHIP, land->lnd_ship);
+ land->lnd_ship = -1;
+ }
+ divine_load((struct empobj *)land, EF_LAND, arg);
+ land->lnd_land = arg;
+ break;
+ case 'A':
+ arg = LIMIT_TO(arg, 0, PLG_EXPOSED);
+ divine_unit_change_quiet((struct empobj *)land, "Plague stage",
+ arg != land->lnd_pstage,
+ "from %d to %d", land->lnd_pstage, arg);
+ land->lnd_pstage = arg;
+ break;
+ case 'b':
+ arg = LIMIT_TO(arg, 0, 32767);
+ divine_unit_change_quiet((struct empobj *)land, "Plague time",
+ arg != land->lnd_ptime,
+ "from %d to %d", land->lnd_ptime, arg);
+ land->lnd_ptime = arg;
+ break;
case 'Z':
arg = LIMIT_TO(arg, 0, 100);
+ divine_unit_change((struct empobj *)land, "Retreat percentage",
+ arg != land->lnd_retreat, 0,
+ "from %d to %d", land->lnd_retreat, arg);
land->lnd_retreat = arg;
break;
case 'R':
+ divine_unit_change((struct empobj *)land, "Retreat path",
+ strncmp(p, land->lnd_rpath, sizeof(land->lnd_rpath) - 1),
+ 0, "from %s to %.*s",
+ land->lnd_rpath, (int)sizeof(land->lnd_rpath) - 1, p);
strncpy(land->lnd_rpath, p, sizeof(land->lnd_rpath) - 1);
break;
case 'W':
+ divine_flag_change((struct empobj *)land, "Retreat condition",
+ land->lnd_rflags, arg, retreat_flags);
land->lnd_rflags = arg;
break;
case 'c':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_CIVIL]);
- land->lnd_item[I_CIVIL] = arg;
- break;
case 'm':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_MILIT]);
- land->lnd_item[I_MILIT] = arg;
- break;
case 'u':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_UW]);
- land->lnd_item[I_UW] = arg;
- break;
case 'f':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_FOOD]);
- land->lnd_item[I_FOOD] = arg;
- break;
case 's':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_SHELL]);
- land->lnd_item[I_SHELL] = arg;
- break;
case 'g':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_GUN]);
- land->lnd_item[I_GUN] = arg;
- break;
case 'p':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_PETROL]);
- land->lnd_item[I_PETROL] = arg;
- break;
case 'i':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_IRON]);
- land->lnd_item[I_IRON] = arg;
- break;
case 'd':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_DUST]);
- land->lnd_item[I_DUST] = arg;
- break;
case 'o':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_OIL]);
- land->lnd_item[I_OIL] = arg;
- break;
case 'l':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_LCM]);
- land->lnd_item[I_LCM] = arg;
- break;
case 'h':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_HCM]);
- land->lnd_item[I_HCM] = arg;
- break;
case 'r':
- arg = LIMIT_TO(arg, 0, lcp->l_item[I_RAD]);
- land->lnd_item[I_RAD] = arg;
+ edit_item((struct empobj *)land, land->lnd_item, item_by_name(key),
+ arg, lcp->l_item);
break;
default:
- pr("huh? (%c)\n", op);
+ pr("huh? (%s)\n", key);
return RET_FAIL;
}
return RET_OK;
}
static int
-edit_plane(struct plnstr *plane, char op, int arg, char *p)
+edit_plane(struct plnstr *plane, char *key, char *p)
{
struct plchrstr *pcp = &plchr[plane->pln_type];
- coord newx, newy;
+ int arg = atoi(p);
- switch (op) {
+ switch (*key) {
case 'U':
- ef_set_uid(EF_PLANE, plane, arg);
- break;
- case 'l':
- if (!sarg_xy(p, &newx, &newy))
- return RET_SYN;
- plane->pln_x = newx;
- plane->pln_y = newy;
- break;
case 'O':
- if (arg < 0 || arg >= MAXNOC)
- return RET_SYN;
- if (plane->pln_own)
- wu(player->cnum, plane->pln_own,
- "%s taken from you by deity intervention!\n",
- prplane(plane));
- if (arg)
- wu(player->cnum, arg,
- "%s given to you by deity intervention!\n", prplane(plane));
- plane->pln_own = arg;
- break;
+ case 'l':
case 'e':
- plane->pln_effic = LIMIT_TO(arg, PLANE_MINEFF, 100);
- break;
case 'm':
- plane->pln_mobil = LIMIT_TO(arg, -127, 127);
+ case 'w':
+ return edit_unit((struct empobj *)plane, key, p,
+ PLANE_MINEFF, "wing",
+ plane->pln_ship >= 0 || plane->pln_land >= 0);
+ case 'T':
+ arg = ef_elt_byname(EF_PLANE_CHR, p);
+ if (arg < 0) {
+ pr("%s: invalid plane type\n", p);
+ return RET_FAIL;
+ }
+ divine_unit_change((struct empobj *)plane, "Type",
+ arg != plane->pln_type, 0,
+ "to %s", plchr[arg].pl_name);
+ if (plane->pln_tech < plchr[arg].pl_tech)
+ pln_set_tech(plane, plchr[arg].pl_tech);
+ if (plane->pln_range >= pln_range_max(plane))
+ /* preserve unlimited range, pln_set_tech() will adjust */
+ plane->pln_range = UCHAR_MAX;
+ plane->pln_type = arg;
+ pln_set_tech(plane, plane->pln_tech);
break;
case 't':
arg = LIMIT_TO(arg, pcp->pl_tech, SHRT_MAX);
+ divine_unit_change((struct empobj *)plane, "Tech level",
+ arg != plane->pln_tech, arg - plane->pln_tech,
+ "from %d to %d", plane->pln_tech, arg);
pln_set_tech(plane, arg);
break;
- case 'w':
- if (p[0] == '~')
- plane->pln_wing = 0;
- else if (isalpha(p[0]))
- plane->pln_wing = p[0];
- else {
- pr("%c: invalid wing\n", p[0]);
- return RET_FAIL;
- }
- break;
case 'r':
arg = LIMIT_TO(arg, 0, pl_range(pcp, plane->pln_tech));
+ divine_unit_change((struct empobj *)plane, "Range",
+ arg != plane->pln_range, 0,
+ "from %d to %d", plane->pln_range, arg);
plane->pln_range = (unsigned char)arg;
break;
case 's':
if (arg < -1 || arg >= ef_nelem(EF_SHIP))
return RET_SYN;
- if (arg >= 0 && arg != plane->pln_ship)
+ if (arg == plane->pln_ship) {
+ pr("Ship of %s unchanged\n", prplane(plane));
+ break;
+ }
+ divine_unload((struct empobj *)plane, EF_SHIP, plane->pln_ship);
+ if (arg >= 0) {
+ divine_unload((struct empobj *)plane, EF_LAND, plane->pln_land);
plane->pln_land = -1;
+ }
+ divine_load((struct empobj *)plane, EF_SHIP, arg);
plane->pln_ship = arg;
break;
case 'y':
if (arg < -1 || arg >= ef_nelem(EF_LAND))
return RET_SYN;
- if (arg >= 0 && arg != plane->pln_land)
+ if (arg == plane->pln_land) {
+ pr("Land unit of %s unchanged\n", prplane(plane));
+ break;
+ }
+ divine_unload((struct empobj *)plane, EF_LAND, plane->pln_land);
+ if (arg >= 0) {
+ divine_unload((struct empobj *)plane, EF_SHIP, plane->pln_ship);
plane->pln_ship = -1;
+ }
+ divine_load((struct empobj *)plane, EF_LAND, arg);
plane->pln_land = arg;
break;
case 'f':
+ divine_flag_change((struct empobj *)plane, "Flags",
+ plane->pln_flags, arg, plane_flags);
plane->pln_flags = arg;
break;
default:
- pr("huh? (%c)\n", op);
+ pr("huh? (%s)\n", key);
+ return RET_FAIL;
+ }
+ return RET_OK;
+}
+
+static int
+edit_nuke(struct nukstr *nuke, char *key, char *p)
+{
+ struct nchrstr *ncp = &nchr[nuke->nuk_type];
+ int arg = atoi(p);
+
+ switch (*key) {
+ case 'U':
+ case 'O':
+ case 'L':
+ case 'S':
+ return edit_unit((struct empobj *)nuke, key, p,
+ 100, "stockpile", nuke->nuk_plane >= 0);
+ case 't':
+ arg = ef_elt_byname(EF_NUKE_CHR, p);
+ if (arg < 0) {
+ pr("%s: invalid nuke type\n", p);
+ return RET_FAIL;
+ }
+ divine_unit_change((struct empobj *)nuke, "Type",
+ arg != nuke->nuk_type, 0,
+ "to %s", nchr[arg].n_name);
+ if (nuke->nuk_tech < nchr[arg].n_tech)
+ nuke->nuk_tech = nchr[arg].n_tech;
+ nuke->nuk_type = arg;
+ break;
+ case 'T':
+ arg = LIMIT_TO(arg, ncp->n_tech, SHRT_MAX);
+ divine_unit_change((struct empobj *)nuke, "Tech level",
+ arg != nuke->nuk_tech, arg - nuke->nuk_tech,
+ "from %d to %d", nuke->nuk_tech, arg);
+ nuke->nuk_tech = arg;
+ break;
+ case 'p':
+ if (arg < -1 || arg >= ef_nelem(EF_PLANE))
+ return RET_SYN;
+ if (arg == nuke->nuk_plane) {
+ pr("Plane of %s unchanged\n", prnuke(nuke));
+ break;
+ }
+ divine_unload((struct empobj *)nuke, EF_PLANE, nuke->nuk_plane);
+ divine_load((struct empobj *)nuke, EF_PLANE, arg);
+ nuke->nuk_plane = arg;
+ break;
+ default:
+ pr("huh? (%s)\n", key);
return RET_FAIL;
}
return RET_OK;