/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Ken Stevens, Steve McClure, Markus Armbruster
*
- * This program is free software; you can redistribute it and/or modify
+ * Empire is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* ---
*
* nsc.c: Empire selection global structures
*
* Known contributors to this file:
- * Markus Armbruster, 2004-2009
+ * Markus Armbruster, 2004-2016
*/
/*
#include "empobj.h"
#include "file.h"
#include "optlist.h"
+#include "news.h"
#include "nsc.h"
#include "product.h"
#include "unit.h"
static void *nsc_lnd_dam(struct valstr *, struct natstr *, void *);
static void *nsc_lnd_aaf(struct valstr *, struct natstr *, void *);
static void *nsc_lchr(struct valstr *, struct natstr *, void *);
+static void *nsc_nws_timestamp(struct valstr *, struct natstr *, void *);
-/* Ugly hack to improve legibility by avoid long lines */
+/* Ugly hacks to avoid illegibly long lines */
#define fldoff(fld) offsetof(CURSTR, fld)
#define empobjoff(fld) offsetof(struct empobj, fld)
{"uid", fldoff(i_uid), NSC_SITYPE(i_type), 0, NULL, EF_ITEM, 0},
{"name", fldoff(i_name), NSC_STRING, 0, NULL, EF_BAD, 0},
{"mnem", fldoff(i_mnem), NSC_STRINGY, 1, NULL, EF_BAD, NSC_CONST},
+ {"power", fldoff(i_power), NSC_INT, 0, NULL, EF_BAD, 0},
{"value", fldoff(i_value), NSC_INT, 0, NULL, EF_BAD, 0},
{"sell", fldoff(i_sell), NSC_INT, 0, NULL, EF_BAD, 0},
{"lbs", fldoff(i_lbs), NSC_INT, 0, NULL, EF_BAD, 0},
#define CURSTR struct pchrstr
{"uid", fldoff(p_uid), NSC_INT, 0, NULL, EF_PRODUCT, 0},
{"name", fldoff(p_name), NSC_STRING, 0, NULL, EF_BAD, 0},
- {"sname", fldoff(p_sname), NSC_STRING, 0, NULL, EF_BAD, NSC_CONST},
+ {"sname", fldoff(p_sname), NSC_STRING, 0, NULL, EF_BAD, 0},
{"ctype", fldoff(p_ctype), NSC_SITYPE(i_type), MAXPRCON, NULL,
EF_ITEM, 0},
{"camt", fldoff(p_camt), NSC_USHORT, MAXPRCON, NULL, EF_BAD, 0},
struct castr sect_ca[] = {
#define CURSTR struct sctstr
/* uid needs to be NSC_DEITY because it discloses true origin */
- {"uid", fldoff(sct_uid), NSC_SHORT, 0, NULL,
+ {"uid", fldoff(sct_uid), NSC_INT, 0, NULL,
EF_SECTOR, NSC_DEITY | NSC_EXTRA},
{"timestamp", fldoff(sct_timestamp), NSC_TIME, 0, NULL,
EF_BAD, NSC_EXTRA},
{"xloc", fldoff(sct_x), NSC_XCOORD, 0, NULL, EF_BAD, NSC_CONST},
{"yloc", fldoff(sct_y), NSC_YCOORD, 0, NULL, EF_BAD, NSC_CONST},
{"des", fldoff(sct_type), NSC_CHAR, 0, NULL, EF_SECTOR_CHR, 0},
- {"effic", fldoff(sct_effic), NSC_UCHAR, 0, NULL, EF_BAD, 0},
- {"mobil", fldoff(sct_mobil), NSC_SHORT, 0, NULL, EF_BAD, 0},
+ {"effic", fldoff(sct_effic), NSC_CHAR, 0, NULL, EF_BAD, 0},
+ {"mobil", fldoff(sct_mobil), NSC_CHAR, 0, NULL, EF_BAD, 0},
+ {"off", fldoff(sct_off), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"loyal", fldoff(sct_loyal), NSC_UCHAR, 0, NULL, EF_BAD, NSC_DEITY},
{"terr", 0, NSC_UCHAR, 0, nsc_sct_terr, EF_BAD, NSC_EXTRA},
{"terr0", fldoff(sct_terr), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"ocontent", fldoff(sct_oil), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"uran", fldoff(sct_uran), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"oldown", fldoff(sct_oldown), NSC_NATID, 0, NULL, EF_NATION, 0},
- {"off", fldoff(sct_off), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"track", 0, NSC_LONG, 0, nsc_sct_track, EF_BAD, NSC_EXTRA},
NSC_IVEC(fldoff(sct_item), ""),
NSC_IVEC(fldoff(sct_dist), "_dist"),
};
#define NSC_GENITEM(ef_type, ef_chr) \
- {"uid", empobjoff(uid), NSC_SHORT, 0, NULL, ef_type, 0}, \
+ {"uid", empobjoff(uid), NSC_INT, 0, NULL, ef_type, 0}, \
{"timestamp", empobjoff(timestamp), NSC_TIME, 0, NULL, EF_BAD, NSC_EXTRA}, \
- {"owner", empobjoff(own), NSC_NATID, 0, NULL, EF_NATION, 0}, \
- {"xloc", empobjoff(x), NSC_XCOORD, 0, NULL, EF_BAD, 0}, \
- {"yloc", empobjoff(y), NSC_YCOORD, 0, NULL, EF_BAD, 0}, \
- {"type", empobjoff(type), NSC_CHAR, 0, NULL, ef_chr, 0}, \
- {"effic", empobjoff(effic), NSC_CHAR, 0, NULL, EF_BAD, 0}, \
- {"mobil", empobjoff(mobil), NSC_CHAR , 0, NULL, EF_BAD, 0}, \
- {"off", empobjoff(off), NSC_UCHAR , 0, NULL, EF_BAD, 0}, \
- {"tech", empobjoff(tech), NSC_SHORT, 0, NULL, EF_BAD, 0}, \
- {"group", empobjoff(group), NSC_STRINGY, 1, NULL, EF_BAD, NSC_EXTRA}, \
- {"opx", empobjoff(opx), NSC_XCOORD, 0, NULL, EF_BAD, 0}, \
- {"opy", empobjoff(opy), NSC_YCOORD, 0, NULL, EF_BAD, 0}, \
- {"mission", empobjoff(mission), NSC_SHORT, 0, NULL, EF_MISSIONS, 0}, \
- {"radius", empobjoff(radius), NSC_SHORT, 0, NULL, EF_BAD, 0}
+ {"owner", empobjoff(own), NSC_NATID, 0, NULL, EF_NATION, 0}, \
+ {"xloc", empobjoff(x), NSC_XCOORD, 0, NULL, EF_BAD, 0}, \
+ {"yloc", empobjoff(y), NSC_YCOORD, 0, NULL, EF_BAD, 0}, \
+ {"type", empobjoff(type), NSC_CHAR, 0, NULL, ef_chr, 0}, \
+ {"effic", empobjoff(effic), NSC_CHAR, 0, NULL, EF_BAD, 0}, \
+ {"mobil", empobjoff(mobil), NSC_CHAR , 0, NULL, EF_BAD, 0}, \
+ {"off", empobjoff(off), NSC_UCHAR , 0, NULL, EF_BAD, 0}, \
+ {"tech", empobjoff(tech), NSC_SHORT, 0, NULL, EF_BAD, 0}, \
+ {"group", empobjoff(group), NSC_STRINGY, 1, NULL, EF_BAD, NSC_EXTRA}, \
+ {"opx", empobjoff(opx), NSC_XCOORD, 0, NULL, EF_BAD, 0}, \
+ {"opy", empobjoff(opy), NSC_YCOORD, 0, NULL, EF_BAD, 0}, \
+ {"mission", empobjoff(mission), NSC_SHORT, 0, NULL, EF_MISSIONS, 0}, \
+ {"radius", empobjoff(radius), NSC_SHORT, 0, NULL, EF_BAD, 0}
struct castr ship_ca[] = {
#define CURSTR struct shpstr
NSC_GENITEM(EF_SHIP, EF_SHIP_CHR),
{"fleet", fldoff(shp_fleet), NSC_STRINGY, 1, NULL, EF_BAD, 0},
- {"xstart", fldoff(shp_destx[0]), NSC_XCOORD, 0, NULL, EF_BAD, 0},
- {"xend", fldoff(shp_destx[1]), NSC_XCOORD, 0, NULL, EF_BAD, 0},
- {"ystart", fldoff(shp_desty[0]), NSC_YCOORD, 0, NULL, EF_BAD, 0},
- {"yend", fldoff(shp_desty[1]), NSC_YCOORD, 0, NULL, EF_BAD, 0},
- {"cargostart", fldoff(shp_tstart), NSC_SITYPE(i_type), TMAX, NULL,
- EF_ITEM, 0},
- {"cargoend", fldoff(shp_tend), NSC_SITYPE(i_type), TMAX, NULL,
- EF_ITEM, 0},
- {"amtstart", fldoff(shp_lstart), NSC_SHORT, TMAX, NULL, EF_BAD, 0},
- {"amtend", fldoff(shp_lend), NSC_SHORT, TMAX, NULL, EF_BAD, 0},
- {"autonav", fldoff(shp_autonav), NSC_UCHAR, 0, NULL, EF_BAD, 0},
NSC_IVEC(fldoff(shp_item), ""),
{"pstage", fldoff(shp_pstage), NSC_SHORT, 0, NULL,
EF_PLAGUE_STAGES, NSC_DEITY},
{"ptime", fldoff(shp_ptime), NSC_SHORT, 0, NULL, EF_BAD, NSC_DEITY},
{"access", fldoff(shp_access), NSC_SHORT, 0, NULL, EF_BAD, 0},
- {"mquota", fldoff(shp_mobquota), NSC_UCHAR, 0, NULL, EF_BAD, 0},
- {"path", fldoff(shp_path), NSC_STRINGY, MAXSHPPATH, NULL, EF_BAD, 0},
- {"follow", fldoff(shp_follow), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"name", fldoff(shp_name), NSC_STRINGY, MAXSHPNAMLEN, NULL,
EF_BAD, 0},
/* should let builder access xbuilt, ybuilt, but can't express that: */
{"type", fldoff(m_type), NSC_CHAR, 0, NULL, EF_SHIP_CHR, 0},
{"name", fldoff(m_name), NSC_STRING, 0, NULL, EF_BAD, 0},
NSC_IVEC(fldoff(m_item), ""),
- {"l_build", fldoff(m_lcm), NSC_INT, 0, NULL, EF_BAD, 0},
- {"h_build", fldoff(m_hcm), NSC_INT, 0, NULL, EF_BAD, 0},
+ {"l_build", fldoff(m_mat[I_LCM]), NSC_SHORT, 0, NULL, EF_BAD, 0},
+ {"h_build", fldoff(m_mat[I_HCM]), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"armor", fldoff(m_armor), NSC_INT, 0, NULL, EF_BAD, 0},
{"speed", fldoff(m_speed), NSC_INT, 0, NULL, EF_BAD, 0},
{"visib", fldoff(m_visib), NSC_INT, 0, NULL, EF_BAD, 0},
{"glim", fldoff(m_glim), NSC_INT, 0, NULL, EF_BAD, 0},
{"nxlight", fldoff(m_nxlight), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"nchoppers", fldoff(m_nchoppers), NSC_UCHAR, 0, NULL, EF_BAD, 0},
+ {"bwork", fldoff(m_bwork), NSC_INT, 0, NULL, EF_BAD, 0},
{"tech", fldoff(m_tech), NSC_INT, 0, NULL, EF_BAD, 0},
{"cost", fldoff(m_cost), NSC_INT, 0, NULL, EF_BAD, 0},
- {"flags", fldoff(m_flags), NSC_LONG, 0, NULL,
+ {"flags", fldoff(m_flags), NSC_INT, 0, NULL,
EF_SHIP_CHR_FLAGS, NSC_BITS},
{"nplanes", fldoff(m_nplanes), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"nland", fldoff(m_nland), NSC_UCHAR, 0, NULL, EF_BAD, 0},
NSC_GENITEM(EF_PLANE, EF_PLANE_CHR),
{"wing", fldoff(pln_wing), NSC_STRINGY, 1, NULL, EF_BAD, 0},
{"range", fldoff(pln_range), NSC_UCHAR, 0, NULL, EF_BAD, 0},
- {"ship", fldoff(pln_ship), NSC_SHORT, 0, NULL, EF_BAD, 0},
- {"land", fldoff(pln_land), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"harden", fldoff(pln_harden), NSC_CHAR, 0, NULL, EF_BAD, 0},
- {"flags", fldoff(pln_flags), NSC_CHAR, 0, NULL,
+ {"ship", fldoff(pln_ship), NSC_INT, 0, NULL, EF_SHIP, 0},
+ {"land", fldoff(pln_land), NSC_INT, 0, NULL, EF_LAND, 0},
+ {"flags", fldoff(pln_flags), NSC_INT, 0, NULL,
EF_PLANE_FLAGS, NSC_BITS},
{"access", fldoff(pln_access), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"theta", fldoff(pln_theta), NSC_FLOAT, 0, NULL, EF_BAD, 0},
#define CURSTR struct plchrstr
{"type", fldoff(pl_type), NSC_CHAR, 0, NULL, EF_PLANE_CHR, 0},
{"name", fldoff(pl_name), NSC_STRING, 0, NULL, EF_BAD, 0},
- {"l_build", fldoff(pl_lcm), NSC_INT, 0, NULL, EF_BAD, 0},
- {"h_build", fldoff(pl_hcm), NSC_INT, 0, NULL, EF_BAD, 0},
- {"cost", fldoff(pl_cost), NSC_INT, 0, NULL, EF_BAD, 0},
+ {"l_build", fldoff(pl_mat[I_LCM]), NSC_SHORT, 0, NULL, EF_BAD, 0},
+ {"h_build", fldoff(pl_mat[I_HCM]), NSC_SHORT, 0, NULL, EF_BAD, 0},
+ {"bwork", fldoff(pl_bwork), NSC_INT, 0, NULL, EF_BAD, 0},
{"tech", fldoff(pl_tech), NSC_INT, 0, NULL, EF_BAD, 0},
+ {"cost", fldoff(pl_cost), NSC_INT, 0, NULL, EF_BAD, 0},
{"acc", fldoff(pl_acc), NSC_INT, 0, NULL, EF_BAD, 0},
{"load", fldoff(pl_load), NSC_INT, 0, NULL, EF_BAD, 0},
{"att", fldoff(pl_att), NSC_INT, 0, NULL, EF_BAD, 0},
{"def", fldoff(pl_def), NSC_INT, 0, NULL, EF_BAD, 0},
{"range", fldoff(pl_range), NSC_INT, 0, NULL, EF_BAD, 0},
- {"crew", fldoff(pl_crew), NSC_INT, 0, NULL, EF_BAD, 0},
+ {"crew", fldoff(pl_mat[I_MILIT]), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"fuel", fldoff(pl_fuel), NSC_INT, 0, NULL, EF_BAD, 0},
{"stealth", fldoff(pl_stealth), NSC_INT, 0, NULL, EF_BAD, 0},
{"flags", fldoff(pl_flags), NSC_INT, 0, NULL,
#define CURSTR struct lndstr
NSC_GENITEM(EF_LAND, EF_LAND_CHR),
{"army", fldoff(lnd_army), NSC_STRINGY, 1, NULL, EF_BAD, 0},
- {"ship", fldoff(lnd_ship), NSC_SHORT, 0, NULL, EF_BAD, 0},
+ {"ship", fldoff(lnd_ship), NSC_INT, 0, NULL, EF_SHIP, 0},
{"harden", fldoff(lnd_harden), NSC_CHAR, 0, NULL, EF_BAD, 0},
{"retreat", fldoff(lnd_retreat), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"rflags", fldoff(lnd_rflags), NSC_INT, 0, NULL,
{"pstage", fldoff(lnd_pstage), NSC_SHORT, 0, NULL,
EF_PLAGUE_STAGES, NSC_DEITY},
{"ptime", fldoff(lnd_ptime), NSC_SHORT, 0, NULL, EF_BAD, NSC_DEITY},
- {"land", fldoff(lnd_land), NSC_SHORT, 0, NULL, EF_BAD, 0},
+ {"land", fldoff(lnd_land), NSC_INT, 0, NULL, EF_LAND, 0},
{"access", fldoff(lnd_access), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"att", 0, NSC_DOUBLE, 0, nsc_lnd_att, EF_BAD, NSC_EXTRA},
{"def", 0, NSC_DOUBLE, 0, nsc_lnd_def, EF_BAD, NSC_EXTRA},
{"type", fldoff(l_type), NSC_CHAR, 0, NULL, EF_LAND_CHR, 0},
{"name", fldoff(l_name), NSC_STRING, 0, NULL, EF_BAD, 0},
NSC_IVEC(fldoff(l_item), ""),
- {"l_build", fldoff(l_lcm), NSC_INT, 0, NULL, EF_BAD, 0},
- {"h_build", fldoff(l_hcm), NSC_INT, 0, NULL, EF_BAD, 0},
+ {"l_build", fldoff(l_mat[I_LCM]), NSC_SHORT, 0, NULL, EF_BAD, 0},
+ {"h_build", fldoff(l_mat[I_HCM]), NSC_SHORT, 0, NULL, EF_BAD, 0},
+ {"bwork", fldoff(l_bwork), NSC_INT, 0, NULL, EF_BAD, 0},
{"tech", fldoff(l_tech), NSC_INT, 0, NULL, EF_BAD, 0},
{"cost", fldoff(l_cost), NSC_INT, 0, NULL, EF_BAD, 0},
{"att", fldoff(l_att), NSC_FLOAT, 0, NULL, EF_BAD, 0},
{"dam", fldoff(l_dam), NSC_INT, 0, NULL, EF_BAD, 0},
{"ammo", fldoff(l_ammo), NSC_INT, 0, NULL, EF_BAD, 0},
{"aaf", fldoff(l_aaf), NSC_INT, 0, NULL, EF_BAD, 0},
+ {"flags", fldoff(l_flags), NSC_INT, 0, NULL,
+ EF_LAND_CHR_FLAGS, NSC_BITS},
{"nxlight", fldoff(l_nxlight), NSC_UCHAR, 0, NULL, EF_BAD, 0},
{"nland", fldoff(l_nland), NSC_UCHAR, 0, NULL, EF_BAD, 0},
- {"flags", fldoff(l_flags), NSC_LONG, 0, NULL,
- EF_LAND_CHR_FLAGS, NSC_BITS},
{NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0}
#undef CURSTR
};
struct castr nuke_ca[] = {
#define CURSTR struct nukstr
NSC_GENITEM(EF_NUKE, EF_NUKE_CHR),
- {"plane", fldoff(nuk_plane), NSC_SHORT, 0, NULL, EF_BAD, 0},
+ {"stockpile", fldoff(nuk_stockpile), NSC_STRINGY, 1, NULL, EF_BAD, 0},
+ {"plane", fldoff(nuk_plane), NSC_INT, 0, NULL, EF_PLANE, 0},
{NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0}
#undef CURSTR
};
#define CURSTR struct nchrstr
{"type", fldoff(n_type), NSC_CHAR, 0, NULL, EF_NUKE_CHR, 0},
{"name", fldoff(n_name), NSC_STRING, 0, NULL, EF_BAD, 0},
- {"l_build", fldoff(n_lcm), NSC_INT, 0, NULL, EF_BAD, 0},
- {"h_build", fldoff(n_hcm), NSC_INT, 0, NULL, EF_BAD, 0},
- {"o_build", fldoff(n_oil), NSC_INT, 0, NULL, EF_BAD, 0},
- {"r_build", fldoff(n_rad), NSC_INT, 0, NULL, EF_BAD, 0},
+ {"l_build", fldoff(n_mat[I_LCM]), NSC_SHORT, 0, NULL, EF_BAD, 0},
+ {"h_build", fldoff(n_mat[I_HCM]), NSC_SHORT, 0, NULL, EF_BAD, 0},
+ {"o_build", fldoff(n_mat[I_OIL]), NSC_SHORT, 0, NULL, EF_BAD, 0},
+ {"r_build", fldoff(n_mat[I_RAD]), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"blast", fldoff(n_blast), NSC_INT, 0, NULL, EF_BAD, 0},
{"dam", fldoff(n_dam), NSC_INT, 0, NULL, EF_BAD, 0},
- {"cost", fldoff(n_cost), NSC_INT, 0, NULL, EF_BAD, 0},
+ {"bwork", fldoff(n_bwork), NSC_INT, 0, NULL, EF_BAD, 0},
{"tech", fldoff(n_tech), NSC_INT, 0, NULL, EF_BAD, 0},
+ {"cost", fldoff(n_cost), NSC_INT, 0, NULL, EF_BAD, 0},
{"weight", fldoff(n_weight), NSC_INT, 0, NULL, EF_BAD, 0},
{"flags", fldoff(n_flags), NSC_INT, 0, NULL,
EF_NUKE_CHR_FLAGS, NSC_BITS},
#undef CURSTR
};
-struct castr treaty_ca[] = {
-#define CURSTR struct trtstr
- {"uid", fldoff(trt_uid), NSC_SHORT, 0, NULL, EF_TREATY, 0},
- {"timestamp", fldoff(trt_timestamp), NSC_TIME, 0, NULL,
- EF_BAD, NSC_EXTRA},
- {"cna", fldoff(trt_cna), NSC_NATID, 0, NULL, EF_NATION, 0},
- {"cnb", fldoff(trt_cnb), NSC_NATID, 0, NULL, EF_NATION, 0},
- {"status", fldoff(trt_status), NSC_CHAR, 0, NULL,
- EF_AGREEMENT_STATUS, 0},
- {"acond", fldoff(trt_acond), NSC_SHORT, 0, NULL,
- EF_TREATY_FLAGS, NSC_BITS},
- {"bcond", fldoff(trt_bcond), NSC_SHORT, 0, NULL,
- EF_TREATY_FLAGS, NSC_BITS},
- {"exp", fldoff(trt_exp), NSC_TIME, 0, NULL, EF_BAD, 0},
- {NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0}
-#undef CURSTR
-};
-
struct castr loan_ca[] = {
#define CURSTR struct lonstr
- {"uid", fldoff(l_uid), NSC_SHORT, 0, NULL, EF_LOAN, 0},
+ {"uid", fldoff(l_uid), NSC_INT, 0, NULL, EF_LOAN, 0},
{"timestamp", fldoff(l_timestamp), NSC_TIME, 0, NULL,
EF_BAD, NSC_EXTRA},
{"loaner", fldoff(l_loner), NSC_NATID, 0, NULL, EF_NATION, 0},
EF_AGREEMENT_STATUS, 0},
{"irate", fldoff(l_irate), NSC_INT, 0, NULL, EF_BAD, 0},
{"ldur", fldoff(l_ldur), NSC_INT, 0, NULL, EF_BAD, 0},
- {"amtpaid", fldoff(l_amtpaid), NSC_LONG, 0, NULL, EF_BAD, 0},
- {"amtdue", fldoff(l_amtdue), NSC_LONG, 0, NULL, EF_BAD, 0},
+ {"amtpaid", fldoff(l_amtpaid), NSC_INT, 0, NULL, EF_BAD, 0},
+ {"amtdue", fldoff(l_amtdue), NSC_INT, 0, NULL, EF_BAD, 0},
{"lastpay", fldoff(l_lastpay), NSC_TIME, 0, NULL, EF_BAD, 0},
{"duedate", fldoff(l_duedate), NSC_TIME, 0, NULL, EF_BAD, 0},
{NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0}
struct castr news_ca[] = {
#define CURSTR struct nwsstr
- /* no need for uid as long as it's not referenced from other tables */
- {"timestamp", fldoff(nws_timestamp), NSC_TIME, 0, NULL,
- EF_BAD, NSC_EXTRA},
+ {"timestamp", 0, NSC_LONG, 0, nsc_nws_timestamp, EF_BAD, NSC_EXTRA},
{"actor", fldoff(nws_ano), NSC_NATID, 0, NULL, EF_NATION, 0},
{"action", fldoff(nws_vrb), NSC_UCHAR, 0, NULL, EF_NEWS_CHR, 0},
{"victim", fldoff(nws_vno), NSC_NATID, 0, NULL, EF_NATION, 0},
{"times", fldoff(nws_ntm), NSC_CHAR, 0, NULL, EF_BAD, 0},
+ {"duration", fldoff(nws_duration), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"time", fldoff(nws_when), NSC_TIME, 0, NULL, EF_BAD, 0},
{NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0}
#undef CURSTR
struct castr lost_ca[] = {
#define CURSTR struct loststr
- /* no need for uid as long as it's not referenced from other tables */
+ /* no need for uid as long as it's not referenced from other tables */
{"timestamp", fldoff(lost_timestamp), NSC_TIME, 0, NULL,
EF_BAD, 0},
{"owner", fldoff(lost_owner), NSC_NATID, 0, NULL, EF_NATION, 0},
- {"type", fldoff(lost_type), NSC_CHAR, 0, NULL, EF_TABLE, 0},
- {"id", fldoff(lost_id), NSC_SHORT, 0, NULL, EF_BAD, 0},
+ {"type", fldoff(lost_type), NSC_SHORT, 0, NULL, EF_TABLE, 0},
+ /* id's ca_table given by type, but can't express that: */
+ {"id", fldoff(lost_id), NSC_INT, 0, NULL, EF_BAD, 0},
{"x", fldoff(lost_x), NSC_XCOORD, 0, NULL, EF_BAD, 0},
{"y", fldoff(lost_y), NSC_YCOORD, 0, NULL, EF_BAD, 0},
{NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0}
struct castr commodity_ca[] = {
#define CURSTR struct comstr
- {"uid", fldoff(com_uid), NSC_SHORT, 0, NULL, EF_COMM, 0},
+ {"uid", fldoff(com_uid), NSC_INT, 0, NULL, EF_COMM, 0},
{"timestamp", fldoff(com_timestamp), NSC_TIME, 0, NULL,
EF_BAD, NSC_EXTRA},
{"owner", fldoff(com_owner), NSC_NATID, 0, NULL, EF_NATION, 0},
struct castr trade_ca[] = {
#define CURSTR struct trdstr
- {"uid", fldoff(trd_uid), NSC_SHORT, 0, NULL, EF_TRADE, 0},
+ {"uid", fldoff(trd_uid), NSC_INT, 0, NULL, EF_TRADE, 0},
{"timestamp", fldoff(trd_timestamp), NSC_TIME, 0, NULL,
EF_BAD, NSC_EXTRA},
{"owner", fldoff(trd_owner), NSC_NATID, 0, NULL, EF_NATION, 0},
- {"type", fldoff(trd_type), NSC_CHAR, 0, NULL, EF_TABLE, 0},
- {"unitid", fldoff(trd_unitid), NSC_SHORT, 0, NULL, EF_BAD, 0},
- {"price", fldoff(trd_price), NSC_LONG, 0, NULL, EF_BAD, 0},
+ {"type", fldoff(trd_type), NSC_SHORT, 0, NULL, EF_TABLE, 0},
+ /* unitid's ca_table given by type, but can't express that: */
+ {"unitid", fldoff(trd_unitid), NSC_INT, 0, NULL, EF_BAD, 0},
+ {"price", fldoff(trd_price), NSC_INT, 0, NULL, EF_BAD, 0},
{"maxbidder", fldoff(trd_maxbidder), NSC_INT, 0, NULL, EF_NATION, 0},
{"markettime", fldoff(trd_markettime), NSC_TIME, 0, NULL, EF_BAD, 0},
/* should let maxbidder access xloc, yloc, but can't express that: */
EF_BAD, NSC_EXTRA},
{"stat", fldoff(nat_stat), NSC_SITYPE(enum nat_status), 0, NULL,
EF_NATION_STATUS, NSC_EXTRA},
+ {"flags", fldoff(nat_flags), NSC_INT, 0, NULL,
+ EF_NATION_FLAGS, NSC_BITS},
{"cname", fldoff(nat_cnam), NSC_STRINGY, 20, NULL, EF_BAD, NSC_EXTRA},
{"passwd", fldoff(nat_pnam), NSC_STRINGY, 20, NULL,
EF_BAD, NSC_DEITY | NSC_EXTRA},
- {"ip", fldoff(nat_hostaddr), NSC_STRINGY, 32, NULL, EF_BAD, 0},
- {"hostname", fldoff(nat_hostname), NSC_STRINGY, 512, NULL, EF_BAD, 0},
+ {"ip", fldoff(nat_hostaddr), NSC_STRINGY, 46, NULL, EF_BAD, 0},
+ {"hostname", 0, NSC_STRINGY, 0, NULL, EF_BAD, 0}, /* deprecated */
{"userid", fldoff(nat_userid), NSC_STRINGY, 32, NULL, EF_BAD, 0},
{"xcap", fldoff(nat_xcap), NSC_XCOORD, 0, NULL, EF_BAD, 0},
{"ycap", fldoff(nat_ycap), NSC_YCOORD, 0, NULL, EF_BAD, 0},
{"timeused", fldoff(nat_timeused), NSC_INT, 0, NULL, EF_BAD, 0},
{"btu", fldoff(nat_btu), NSC_SHORT, 0, NULL, EF_BAD, 0},
{"access", fldoff(nat_access), NSC_SHORT, 0, NULL, EF_BAD, 0},
- {"milreserve", fldoff(nat_reserve), NSC_LONG, 0, NULL, EF_BAD, 0},
- {"money", fldoff(nat_money), NSC_LONG, 0, NULL, EF_BAD, 0},
+ {"milreserve", fldoff(nat_reserve), NSC_INT, 0, NULL, EF_BAD, 0},
+ {"money", fldoff(nat_money), NSC_INT, 0, NULL, EF_BAD, 0},
{"login", fldoff(nat_last_login), NSC_TIME, 0, NULL, EF_BAD, 0},
{"logout", fldoff(nat_last_logout), NSC_TIME, 0, NULL, EF_BAD, 0},
{"newstim", fldoff(nat_newstim), NSC_TIME, 0, NULL, EF_BAD, 0},
EF_BAD, 0},
{"happiness", fldoff(nat_level[NAT_HLEV]), NSC_FLOAT, 0, NULL,
EF_BAD, 0},
- {"relations", fldoff(nat_relate), NSC_HIDDEN, MAXNOC, NULL,
- EF_NATION_RELATIONS, NSC_EXTRA},
+ {"relations", fldoff(nat_relate), NSC_UCHAR, MAXNOC, NULL,
+ EF_NATION_RELATIONS, NSC_EXTRA | NSC_HIDDEN},
/* mortals know there's contact (relations show), but not how strong */
{"contacts", fldoff(nat_contact), NSC_UCHAR, MAXNOC, NULL,
EF_BAD, NSC_DEITY | NSC_EXTRA},
{"rejects", fldoff(nat_rejects), NSC_UCHAR, MAXNOC, NULL,
EF_NATION_REJECTS, NSC_EXTRA | NSC_BITS},
- {"flags", fldoff(nat_flags), NSC_LONG, 0, NULL,
- EF_NATION_FLAGS, NSC_BITS},
{NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0}
#undef CURSTR
};
/* no need for uid */
/* name must come first, clients may rely on it */
{"name", fldoff(ca_name), NSC_STRING, 0, NULL, EF_BAD, NSC_CONST},
- {"type", fldoff(ca_type), NSC_CHAR, 0, NULL, EF_META_TYPE, NSC_CONST},
- {"flags", fldoff(ca_flags), NSC_UCHAR, 0, NULL,
+ {"type", fldoff(ca_type), NSC_SITYPE(enum nsc_type), 0, NULL,
+ EF_META_TYPE, NSC_CONST},
+ {"flags", fldoff(ca_flags), NSC_INT, 0, NULL,
EF_META_FLAGS, NSC_CONST | NSC_BITS},
{"len", fldoff(ca_len), NSC_USHORT, 0, NULL, EF_BAD, NSC_CONST},
- {"table", fldoff(ca_table), NSC_INT, 0, NULL, EF_BAD, NSC_CONST},
+ {"table", fldoff(ca_table), NSC_INT, 0, NULL, EF_TABLE, NSC_CONST},
{NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0}
#undef CURSTR
};
val->val_as.sym.get = NULL;
return lchr + ((struct lndstr *)ptr)->lnd_type;
}
+
+static void *
+nsc_nws_timestamp(struct valstr *val, struct natstr *natp, void *ptr)
+{
+ struct nwsstr *np = ptr;
+
+ val->val_as.lng = np->nws_when + np->nws_duration;
+ return NULL;
+}
projects / empserver / blobdiff