/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2021, 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-2018
*/
#include <config.h>
static int edit_nuke(struct nukstr *, char *, char *);
int
-edit(void)
+c_edit(void)
{
union empobj_storage item;
char *what;
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("Land Unit <y>: %d\n", plane->pln_land);
}
+static void
+print_items(short item[])
+{
+ pr(" civ mil uw food sh gun pet iron dust bar oil lcm hcm rad\n"
+ " c m u f s g p i d B o l h r\n"
+ "%5d%5d%5d%5d%5d%5d%5d%5d%5d%5d%5d%5d%5d%5d\n",
+ item[I_CIVIL],
+ item[I_MILIT],
+ item[I_UW],
+ item[I_FOOD],
+ item[I_SHELL],
+ item[I_GUN],
+ item[I_PETROL],
+ item[I_IRON],
+ item[I_DUST],
+ item[I_BAR],
+ item[I_OIL],
+ item[I_LCM],
+ item[I_HCM],
+ item[I_RAD]);
+}
+
static void
print_land(struct lndstr *land)
{
pr("Retreat percentage <Z>: %d\n", land->lnd_retreat);
pr("Retreat path <R>: '%s'\t\tRetreat Flags <W>: %d\n",
land->lnd_rpath, land->lnd_rflags);
- pr("civ mil uw food shl gun pet irn dst oil lcm hcm rad\n");
- pr(" c m u f s g p i d o l h r\n");
- pr("%3d", land->lnd_item[I_CIVIL]);
- pr("%4d", land->lnd_item[I_MILIT]);
- pr("%4d", land->lnd_item[I_UW]);
- pr("%5d", land->lnd_item[I_FOOD]);
- pr("%4d", land->lnd_item[I_SHELL]);
- pr("%4d", land->lnd_item[I_GUN]);
- pr("%5d", land->lnd_item[I_PETROL]);
- pr("%5d", land->lnd_item[I_IRON]);
- pr("%5d", land->lnd_item[I_DUST]);
- pr("%5d", land->lnd_item[I_OIL]);
- pr("%5d", land->lnd_item[I_LCM]);
- pr("%5d", land->lnd_item[I_HCM]);
- pr("%4d", land->lnd_item[I_RAD]);
- pr("\n");
+ print_items(land->lnd_item);
}
static void
ship->shp_rpath, ship->shp_rflags);
pr("Plague Stage <a>: %d\t\t", ship->shp_pstage);
pr("Plague Time <b>: %d\n", ship->shp_ptime);
- pr("civ mil uw food shl gun pet irn dst oil lcm hcm rad\n");
- pr(" c m u f s g p i d o l h r\n");
- pr("%3d", ship->shp_item[I_CIVIL]);
- pr("%4d", ship->shp_item[I_MILIT]);
- pr("%4d", ship->shp_item[I_UW]);
- pr("%5d", ship->shp_item[I_FOOD]);
- pr("%4d", ship->shp_item[I_SHELL]);
- pr("%4d", ship->shp_item[I_GUN]);
- pr("%5d", ship->shp_item[I_PETROL]);
- pr("%5d", ship->shp_item[I_IRON]);
- pr("%5d", ship->shp_item[I_DUST]);
- pr("%5d", ship->shp_item[I_OIL]);
- pr("%5d", ship->shp_item[I_LCM]);
- pr("%5d", ship->shp_item[I_HCM]);
- pr("%4d", ship->shp_item[I_RAD]);
- pr("\n");
+ print_items(ship->shp_item);
}
static void
break;
case 'x':
new = LIMIT_TO(arg, 0, CHE_MAX);
- divine_sct_change_quiet(sect, "Guerillas", new != sect->sct_che,
+ divine_sct_change_quiet(sect, "Guerrillas", new != sect->sct_che,
"from %d to %d", sect->sct_che, new);
sect->sct_che = new;
break;
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;
+ sect->sct_coastal = newsect.sct_coastal;
ef_set_uid(EF_SECTOR, sect, XYOFFSET(newx, newy));
break;
case 'D':
coord newx, newy;
union empobj_storage newunit;
char newgroup;
-
+
switch (toupper(*key)) {
case 'U':
if (arg < 0)
return RET_FAIL;
}
divine_unit_change_quiet(unit, "Location",
- unit->own && unit->own != player->cnum,
+ newx != unit->x || newy != unit->y,
"from %s to %s",
xyas(unit->x, unit->y, player->cnum),
xyas(newx, newy, player->cnum));
xyas(unit->x, unit->y, unit->own),
xyas(newx, newy, unit->own),
cname(player->cnum));
- unit->x = newx;
- unit->y = newy;
+ unit_teleport(unit, newx, newy);
break;
case 'E':
arg = LIMIT_TO(arg, mineff, 100);
item[ip->i_uid] = arg;
}
+static void
+edit_unit_item(struct empobj *unit, short item[], char *key, int arg,
+ short lim[])
+{
+ char lowkey[2];
+
+ lowkey[0] = tolower(*key);
+ lowkey[1] = 0;
+ edit_item(unit, item, item_by_name(lowkey), arg, lim);
+}
+
static void
limit_item(struct empobj *unit, short item[], short lim[])
{
{
struct mchrstr *mcp = &mchr[ship->shp_type];
int arg = atoi(p);
+ int ret;
switch (*key) {
case 'U':
case 'E':
case 'M':
case 'F':
- return edit_unit((struct empobj *)ship, key, p,
- SHIP_MINEFF, "fleet", 0);
+ 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) {
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);
- if (ship->shp_tech >= mchr[arg].m_tech)
- break;
- arg = mchr[arg].m_tech;
- /* fall through */
+ break;
case 'T':
arg = LIMIT_TO(arg, mcp->m_tech, SHRT_MAX);
divine_unit_change((struct empobj *)ship, "Tech level",
case 'p':
case 'i':
case 'd':
+ case 'B':
case 'o':
case 'l':
case 'h':
case 'r':
- edit_item((struct empobj *)ship, ship->shp_item, item_by_name(key),
- arg, mcp->m_item);
+ edit_unit_item((struct empobj *)ship, ship->shp_item, key, arg,
+ mcp->m_item);
break;
default:
pr("huh? (%s)\n", key);
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);
- if (land->lnd_tech >= lchr[arg].l_tech)
- break;
- arg = lchr[arg].l_tech;
- /* fall through */
+ break;
case 't':
arg = LIMIT_TO(arg, lcp->l_tech, SHRT_MAX);
divine_unit_change((struct empobj *)land, "Tech level",
break;
case 'F':
arg = LIMIT_TO(arg, 0, 127);
+ if (land->lnd_ship >= 0 || land->lnd_land >= 0)
+ arg = 0;
divine_unit_change((struct empobj *)land, "Fortification",
arg != land->lnd_harden, arg - land->lnd_harden,
"from %d to %d", land->lnd_harden, arg);
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",
case 'p':
case 'i':
case 'd':
+ case 'B':
case 'o':
case 'l':
case 'h':
case 'r':
- edit_item((struct empobj *)land, land->lnd_item, item_by_name(key),
- arg, lcp->l_item);
+ edit_unit_item((struct empobj *)land, land->lnd_item, key, arg,
+ lcp->l_item);
break;
default:
pr("huh? (%s)\n", key);
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;
- if (plane->pln_tech >= plchr[arg].pl_tech)
- break;
- arg = plchr[arg].pl_tech;
- /* fall through */
+ 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",
"from %d to %d", plane->pln_tech, arg);
pln_set_tech(plane, arg);
break;
+ case 'F':
+ arg = LIMIT_TO(arg, 0, 127);
+ if (!(pcp->pl_flags & P_M)
+ || plane->pln_ship >= 0 || plane->pln_land >= 0)
+ arg = 0;
+ divine_unit_change((struct empobj *)plane, "Fortification",
+ arg != plane->pln_harden, arg - plane->pln_harden,
+ "from %d to %d", plane->pln_harden, arg);
+ plane->pln_harden = arg;
+ break;
case 'r':
arg = LIMIT_TO(arg, 0, pl_range(pcp, plane->pln_tech));
divine_unit_change((struct empobj *)plane, "Range",
divine_flag_change((struct empobj *)plane, "Flags",
plane->pln_flags, arg, plane_flags);
plane->pln_flags = arg;
+ if (pln_is_in_orbit(plane))
+ plane->pln_ship = plane->pln_land = -1;
break;
default:
pr("huh? (%s)\n", key);
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;
- if (nuke->nuk_tech >= nchr[arg].n_tech)
- break;
- arg = nchr[arg].n_tech;
- /* fall through */
+ break;
case 'T':
arg = LIMIT_TO(arg, ncp->n_tech, SHRT_MAX);
divine_unit_change((struct empobj *)nuke, "Tech level",
projects / empserver / blobdiff