#include <ctype.h>
#include <limits.h>
+#include "actofgod.h"
#include "commands.h"
#include "item.h"
#include "land.h"
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 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 *);
int
edit(void)
struct shpstr ship;
struct lndstr land;
char *what;
- char *ptr;
- char thing;
+ char *key, *ptr;
int num;
- int arg;
int err;
int arg_index = 3;
coord x, y;
for (;;) {
if (player->argp[arg_index]) {
if (player->argp[arg_index+1]) {
- thing = player->argp[arg_index++][0];
+ key = player->argp[arg_index++];
ptr = player->argp[arg_index++];
- arg = atoi(ptr);
} else
return RET_SYN;
} else if (arg_index == 3) {
- err = getin(buf, &ptr);
- if (err < 0)
+ key = getin(buf, &ptr);
+ if (!key)
return RET_SYN;
- if (err == 0) {
+ if (!*key) {
switch (ewhat) {
case 'c':
print_nat(np);
}
return RET_OK;
}
- thing = err;
- arg = atoi(ptr);
} else
return RET_OK;
switch (ewhat) {
case 'c':
- if ((err = edit_nat(np, thing, arg, ptr)) != RET_OK)
+ if ((err = edit_nat(np, key, ptr)) != RET_OK)
return err;
break;
case 'l':
if (!check_sect_ok(§))
return RET_FAIL;
- if ((err = edit_sect(§, thing, arg, ptr)) != RET_OK)
+ if ((err = edit_sect(§, key, ptr)) != RET_OK)
return err;
if (!putsect(§))
return RET_FAIL;
case 's':
if (!check_ship_ok(&ship))
return RET_FAIL;
- if ((err = edit_ship(&ship, thing, arg, ptr)) != RET_OK)
+ if ((err = edit_ship(&ship, key, ptr)) != RET_OK)
return err;
if (!ef_ensure_space(EF_SHIP, ship.shp_uid, 50))
return RET_FAIL;
case 'u':
if (!check_land_ok(&land))
return RET_FAIL;
- if ((err = edit_land(&land, thing, arg, ptr)) != RET_OK)
+ if ((err = edit_land(&land, key, ptr)) != RET_OK)
return err;
if (!ef_ensure_space(EF_LAND, land.lnd_uid, 50))
return RET_FAIL;
case 'p':
if (!check_plane_ok(&plane))
return RET_FAIL;
- if ((err = edit_plane(&plane, thing, arg, ptr)) != RET_OK)
+ if ((err = edit_plane(&plane, key, ptr)) != RET_OK)
return err;
if (!ef_ensure_space(EF_PLANE, plane.pln_uid, 50))
return RET_FAIL;
}
static void
-benefit(natid who, int good)
+benefit(natid who, int goodness)
{
- 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);
- }
+ if (opt_GODNEWS && getnatp(who)->nat_stat != STAT_GOD && goodness)
+ nreport(player->cnum, goodness > 0 ? N_AIDS : N_HURTS, who, 1);
}
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
pr("\n");
}
-static int
+static char *
getin(char *buf, char **valp)
{
+ char line[1024];
+ char *argp[128];
char *p;
- unsigned char thing;
- p = getstarg(NULL, "%c xxxxx -- thing value : ", buf);
+ *valp = NULL;
+ p = getstarg(NULL, "%c xxxxx -- thing value : ", line);
if (!p)
- return -1;
- if (!*p)
- return 0;
- for (; isspace(*p); p++) ;
- if (!*p)
- return -1;
- thing = *p;
- for (; *p && !isspace(*p); p++) ;
- for (; isspace(*p); p++) ;
- if (!*p)
- return -1;
- *valp = p;
- return thing;
+ return NULL;
+ switch (parse(p, buf, argp, NULL, NULL, NULL)) {
+ case 0:
+ return "";
+ case 1:
+ return NULL;
+ default:
+ *valp = argp[1];
+ return argp[0];
+ }
}
#if 0 /* not needed right now */
}
#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);
sect->sct_x = newx;
sect->sct_y = newy;
- ef_set_uid(EF_SECTOR, §, XYOFFSET(newx, newy));
+ 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 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;
+ int arg = atoi(p);
float farg = (float)atof(p);
- switch (op) {
+ switch (*key) {
case 'n':
if (!check_nat_name(p, nat))
return RET_SYN;
break;
case 'm':
arg = LIMIT_TO(arg, 0, INT_MAX);
- benefit(nat, np->nat_reserve < arg);
+ benefit(nat, arg - np->nat_reserve);
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);
+ if (arg == np->nat_reserve)
+ break;
+ if (nat != player->cnum)
+ wu(0, nat,
+ "Military reserves changed from %d to %d by an act of %s\n",
+ np->nat_reserve, arg, cname(player->cnum));
np->nat_reserve = arg;
break;
case 'c':
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);
+ if (arg == np->nat_money)
+ break;
+ if (nat != player->cnum)
+ wu(0, nat, "Money changed from %d to %d by an act of %s\n",
+ np->nat_money, arg, cname(player->cnum));
np->nat_money = arg;
break;
case 'T':
np->nat_level[NAT_HLEV] = farg;
break;
default:
- pr("huh? (%c)\n", op);
+ pr("huh? (%s)\n", key);
break;
}
putnat(np);
}
static int
-edit_ship(struct shpstr *ship, char op, int arg, char *p)
+edit_ship(struct shpstr *ship, char *key, char *p)
{
struct mchrstr *mcp = &mchr[ship->shp_type];
+ int arg = atoi(p);
coord newx, newy;
+ struct ichrstr *ip;
newx = newy = 0;
- switch (op) {
+ switch (*key) {
case 'a':
arg = LIMIT_TO(arg, 0, PLG_EXPOSED);
ship->shp_pstage = arg;
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));
+ if (arg == ship->shp_own)
+ break;
+ if (ship->shp_own && ship->shp_own != player->cnum)
+ wu(0, ship->shp_own, "%s taken from you by an act of %s!\n",
+ prship(ship), cname(player->cnum));
+ if (arg && arg != player->cnum)
+ wu(0, arg, "%s given to you by an act of %s!\n",
+ prship(ship), cname(player->cnum));
ship->shp_own = arg;
break;
case 'L':
}
break;
case 'c':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_CIVIL]);
- ship->shp_item[I_CIVIL] = arg;
- break;
case 'm':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_MILIT]);
- ship->shp_item[I_MILIT] = arg;
- break;
case 'u':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_UW]);
- ship->shp_item[I_UW] = arg;
- break;
case 'f':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_FOOD]);
- ship->shp_item[I_FOOD] = arg;
- break;
case 's':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_SHELL]);
- ship->shp_item[I_SHELL] = arg;
- break;
case 'g':
- arg = LIMIT_TO(arg, 0, mcp->m_item[I_GUN]);
- ship->shp_item[I_GUN] = arg;
- break;
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;
+ ip = item_by_name(key);
+ arg = LIMIT_TO(arg, 0, mchr[ship->shp_type].m_item[ip->i_uid]);
+ divine_unit_change_quiet((struct empobj *)ship, ip->i_name,
+ arg != ship->shp_item[ip->i_uid],
+ "from %d to %d",
+ ship->shp_item[ip->i_uid], arg);
+ report_divine_gift(ship->shp_own, ip,
+ arg - ship->shp_item[ip->i_uid], prship(ship));
+ ship->shp_item[ip->i_uid] = arg;
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];
+ int arg = atoi(p);
coord newx, newy;
+ struct ichrstr *ip;
newx = newy = 0;
- switch (op) {
+ switch (*key) {
case 'Y':
if (arg < -1 || arg >= ef_nelem(EF_LAND))
return RET_SYN;
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));
+ if (arg == land->lnd_own)
+ break;
+ if (land->lnd_own && land->lnd_own != player->cnum)
+ wu(0, land->lnd_own, "%s taken from you by an act of %s!\n",
+ prland(land), cname(player->cnum));
+ if (arg && arg != player->cnum)
+ wu(0, arg, "%s given to you by an act of %s!\n",
+ prland(land), cname(player->cnum));
land->lnd_own = arg;
break;
case 'L':
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;
+ ip = item_by_name(key);
+ arg = LIMIT_TO(arg, 0, lchr[land->lnd_type].l_item[ip->i_uid]);
+ divine_unit_change_quiet((struct empobj *)land, ip->i_name,
+ arg != land->lnd_item[ip->i_uid],
+ "from %d to %d",
+ land->lnd_item[ip->i_uid], arg);
+ report_divine_gift(land->lnd_own, ip,
+ arg - land->lnd_item[ip->i_uid], prland(land));
+ land->lnd_item[ip->i_uid] = arg;
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];
+ int arg = atoi(p);
coord newx, newy;
- switch (op) {
+ switch (*key) {
case 'U':
ef_set_uid(EF_PLANE, plane, arg);
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));
+ if (arg == plane->pln_own)
+ break;
+ if (plane->pln_own && plane->pln_own != player->cnum)
+ wu(0, plane->pln_own, "%s taken from you by an act of %s!\n",
+ prplane(plane), cname(player->cnum));
+ if (arg && arg != player->cnum)
+ wu(0, arg, "%s given to you by an act of %s!\n",
+ prplane(plane), cname(player->cnum));
plane->pln_own = arg;
break;
case 'e':
plane->pln_flags = arg;
break;
default:
- pr("huh? (%c)\n", op);
+ pr("huh? (%s)\n", key);
return RET_FAIL;
}
return RET_OK;
projects / empserver / blobdiff