/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * See files README, COPYING and CREDITS in the root of the source
+ * tree for related information and legal notices. It is expected
+ * that future projects/authors will amend these files as needed.
*
* ---
*
* nsc.c: Empire selection global structures
*
* Known contributors to this file:
- * Markus Armbruster, 2004
- *
+ * Markus Armbruster, 2004-2006
*/
+/*
+ * Convention: uid selector comes first. Table TYPE has an uid
+ * selector if empfile[TYPE].cadef[0].ca_table == TYPE.
+ */
+
+#include <config.h>
+
#include <stddef.h>
-#include "misc.h"
-#include "xy.h"
-#include "loan.h"
+#include "empobj.h"
+#include "file.h"
#include "nsc.h"
-#include "news.h"
-#include "nuke.h"
-#include "plane.h"
-#include "ship.h"
-#include "land.h"
-#include "sect.h"
-#include "trade.h"
-#include "treaty.h"
-#include "genitem.h"
-#include "nat.h"
-#include "map.h"
-#include "commodity.h"
-#include "lost.h"
#include "product.h"
-#include "file.h"
#define fldoff(str, fld) offsetof(struct str, fld)
-#define NSC_IELT(name, pfx, sfx, base, itype) \
-{NSC_SHORT, 0, 0, ((base) + (itype)*sizeof(u_short)), \
+#define NSC_IELT(name, pfx, sfx, base, itype) \
+{NSC_SHORT, 0, 0, ((base) + (itype)*sizeof(unsigned short)), \
sizeof(sfx) == 1 ? name : pfx sfx, EF_BAD}
#define NSC_IVEC(base, sfx) \
NSC_IELT("rad", "r", sfx, base, I_RAD)
struct castr ichr_ca[] = {
+ {NSC_SITYPE(i_type), 0, 0, offsetof(struct ichrstr, i_uid), "uid",
+ EF_ITEM},
{NSC_STRING, 0, 0, offsetof(struct ichrstr, i_name), "name", EF_BAD},
- {NSC_INT, NSC_CONST, 0, offsetof(struct ichrstr, i_mnem), "mnem", EF_BAD},
- {NSC_SITYPE(i_type), 0, 0, offsetof(struct ichrstr, i_vtype), "vtype", EF_BAD},
+ {NSC_STRINGY, NSC_CONST, 1, offsetof(struct ichrstr, i_mnem), "mnem",
+ EF_BAD},
{NSC_INT, 0, 0, offsetof(struct ichrstr, i_value), "value", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct ichrstr, i_sell), "sell", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct ichrstr, i_lbs), "lbs", EF_BAD},
{NSC_INT, 0, NUMPKG, offsetof(struct ichrstr, i_pkg), "pkg", EF_BAD},
+ {NSC_INT, 0, 0, offsetof(struct ichrstr, i_melt_denom), "melt_denom",
+ EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
struct castr pchr_ca[] = {
+ {NSC_INT, 0, 0, offsetof(struct pchrstr, p_uid), "uid", EF_PRODUCT},
{NSC_STRING, 0, 0, offsetof(struct pchrstr, p_name), "name", EF_BAD},
- {NSC_STRING, NSC_CONST, 0, offsetof(struct pchrstr, p_sname), "sname", EF_BAD},
- {NSC_SITYPE(i_type), 0, MAXPRCON, offsetof(struct pchrstr, p_ctype), "ctype", EF_BAD},
- {NSC_USHORT, 0, MAXPRCON, offsetof(struct pchrstr, p_camt), "camt", EF_BAD},
- {NSC_SITYPE(i_type), 0, 0, offsetof(struct pchrstr, p_type), "type", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct pchrstr, p_level), "level", EF_BAD},
+ {NSC_STRING, NSC_CONST, 0, offsetof(struct pchrstr, p_sname), "sname",
+ EF_BAD},
+ {NSC_SITYPE(i_type), 0, MAXPRCON, offsetof(struct pchrstr, p_ctype),
+ "ctype", EF_ITEM},
+ {NSC_USHORT, 0, MAXPRCON, offsetof(struct pchrstr, p_camt), "camt",
+ EF_BAD},
+ {NSC_SITYPE(i_type), 0, 0, offsetof(struct pchrstr, p_type), "type",
+ EF_ITEM},
+ {NSC_INT, 0, 0, offsetof(struct pchrstr, p_level), "level", EF_LEVEL},
{NSC_INT, 0, 0, offsetof(struct pchrstr, p_cost), "cost", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct pchrstr, p_nrndx), "nrndx", EF_BAD},
+ {NSC_INT, 0, 0, offsetof(struct pchrstr, p_nrndx), "nrndx", EF_RESOURCES},
{NSC_INT, 0, 0, offsetof(struct pchrstr, p_nrdep), "nrdep", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct pchrstr, p_nlndx), "nlndx", EF_BAD},
+ {NSC_INT, 0, 0, offsetof(struct pchrstr, p_nlndx), "nlndx", EF_LEVEL},
{NSC_INT, 0, 0, offsetof(struct pchrstr, p_nlmin), "nlmin", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct pchrstr, p_nllag), "nllag", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct pchrstr, p_effic), "effic", EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
struct castr sect_ca[] = {
- {NSC_NATID, 0, 0, fldoff(sctstr, sct_own), "owner", EF_BAD},
- {NSC_XCOORD, 0, 0, fldoff(sctstr, sct_x), "xloc", EF_BAD},
- {NSC_YCOORD, 0, 0, fldoff(sctstr, sct_y), "yloc", EF_BAD},
- {NSC_TYPEID, 0, 0, fldoff(sctstr, sct_type), "des", EF_BAD},
+ /* uid is encoded in x, y */
+ {NSC_NATID, 0, 0, fldoff(sctstr, sct_own), "owner", EF_NATION},
+ {NSC_XCOORD, NSC_CONST, 0, fldoff(sctstr, sct_x), "xloc", EF_BAD},
+ {NSC_YCOORD, NSC_CONST, 0, fldoff(sctstr, sct_y), "yloc", EF_BAD},
+ {NSC_UCHAR, 0, 0, fldoff(sctstr, sct_type), "des", EF_SECTOR_CHR},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_effic), "effic", EF_BAD},
{NSC_SHORT, 0, 0, fldoff(sctstr, sct_mobil), "mobil", EF_BAD},
{NSC_UCHAR, NSC_DEITY, 0, fldoff(sctstr, sct_loyal), "loyal", EF_BAD},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_terr1), "terr1", EF_BAD},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_terr2), "terr2", EF_BAD},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_terr3), "terr3", EF_BAD},
+ {NSC_UCHAR, NSC_DEITY, 0, fldoff(sctstr, sct_dterr), "dterr", EF_BAD},
{NSC_XCOORD, 0, 0, fldoff(sctstr, sct_dist_x), "xdist", EF_BAD},
{NSC_YCOORD, 0, 0, fldoff(sctstr, sct_dist_y), "ydist", EF_BAD},
{NSC_SHORT, 0, 0, fldoff(sctstr, sct_avail), "avail", EF_BAD},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_work), "work", EF_BAD},
- {NSC_UCHAR, NSC_EXTRA, 0, fldoff(sctstr, sct_coastal), "coastal", EF_BAD},
- {NSC_TYPEID, 0, 0, fldoff(sctstr, sct_newtype), "newdes", EF_BAD},
+ {NSC_UCHAR, 0, 0, fldoff(sctstr, sct_coastal), "coastal", EF_BAD},
+ {NSC_UCHAR, 0, 0, fldoff(sctstr, sct_newtype), "newdes", EF_SECTOR_CHR},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_min), "min", EF_BAD},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_gmin), "gold", EF_BAD},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_fertil), "fert", EF_BAD},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_oil), "ocontent", EF_BAD},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_uran), "uran", EF_BAD},
- {NSC_NATID, 0, 0, fldoff(sctstr, sct_oldown), "oldown", EF_BAD},
+ {NSC_NATID, 0, 0, fldoff(sctstr, sct_oldown), "oldown", EF_NATION},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_off), "off", EF_BAD},
NSC_IVEC(fldoff(sctstr, sct_item), ""),
NSC_IVEC(fldoff(sctstr, sct_dist), "_dist"),
NSC_IVEC(fldoff(sctstr, sct_del), "_del"),
+ /* should let old owner access mines, but can't express that: */
{NSC_SHORT, NSC_DEITY, 0, fldoff(sctstr, sct_mines), "mines", EF_BAD},
- {NSC_SHORT, NSC_DEITY, 0, fldoff(sctstr, sct_pstage), "pstage", EF_BAD},
+ {NSC_SHORT, NSC_DEITY, 0, fldoff(sctstr, sct_pstage), "pstage",
+ EF_PLAGUE_STAGES},
{NSC_SHORT, NSC_DEITY, 0, fldoff(sctstr, sct_ptime), "ptime", EF_BAD},
{NSC_UCHAR, NSC_DEITY, 0, fldoff(sctstr, sct_che), "che", EF_BAD},
- {NSC_NATID, NSC_DEITY, 0, fldoff(sctstr, sct_che_target), "che_target", EF_BAD},
+ {NSC_NATID, NSC_DEITY, 0, fldoff(sctstr, sct_che_target), "che_target",
+ EF_NATION},
{NSC_USHORT, 0, 0, fldoff(sctstr, sct_fallout), "fallout", EF_BAD},
{NSC_TIME, 0, 0, fldoff(sctstr, sct_access), "access", EF_BAD},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_road), "road", EF_BAD},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_rail), "rail", EF_BAD},
{NSC_UCHAR, 0, 0, fldoff(sctstr, sct_defense), "dfense", EF_BAD},
- {NSC_TIME, NSC_EXTRA, 0, fldoff(sctstr, sct_timestamp), "timestamp", EF_BAD},
+ {NSC_TIME, NSC_EXTRA, 0, fldoff(sctstr, sct_timestamp), "timestamp",
+ EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
struct castr dchr_ca[] = {
+ {NSC_UCHAR, 0, 0, offsetof(struct dchrstr, d_uid), "uid", EF_SECTOR_CHR},
{NSC_STRING, 0, 0, offsetof(struct dchrstr, d_name), "name", EF_BAD},
- {NSC_INT, NSC_CONST, 0, offsetof(struct dchrstr, d_mnem), "mnem", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct dchrstr, d_prd), "prd", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct dchrstr, d_mcst), "mcst", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct dchrstr, d_flg), "flg", EF_BAD},
- {NSC_SITYPE(i_packing), 0, 0, offsetof(struct dchrstr, d_pkg), "pkg", EF_BAD},
+ {NSC_STRINGY, NSC_CONST, 1, offsetof(struct dchrstr, d_mnem), "mnem",
+ EF_BAD},
+ {NSC_INT, 0, 0, offsetof(struct dchrstr, d_prd), "prd", EF_PRODUCT},
+ {NSC_INT, 0, 0, offsetof(struct dchrstr, d_peffic), "peffic", EF_BAD},
+ {NSC_FLOAT, 0, 0, offsetof(struct dchrstr, d_mob0), "mob0", EF_BAD},
+ {NSC_FLOAT, 0, 0, offsetof(struct dchrstr, d_mob1), "mob1", EF_BAD},
+ {NSC_SITYPE(d_navigation), 0, 0, offsetof(struct dchrstr, d_nav), "nav",
+ EF_SECTOR_NAVIGATION},
+ {NSC_SITYPE(i_packing), 0, 0, offsetof(struct dchrstr, d_pkg), "pkg",
+ EF_PACKING},
{NSC_FLOAT, 0, 0, offsetof(struct dchrstr, d_ostr), "ostr", EF_BAD},
{NSC_FLOAT, 0, 0, offsetof(struct dchrstr, d_dstr), "dstr", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct dchrstr, d_value), "value", EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
-#define NSC_GENITEM \
-{ NSC_NATID, 0, 0, fldoff(genitem, own), "owner", EF_BAD}, \
-{ NSC_SHORT, 0, 0, fldoff(genitem, uid), "uid", EF_BAD}, \
-{ NSC_XCOORD, 0, 0, fldoff(genitem, x), "xloc", EF_BAD}, \
-{ NSC_YCOORD, 0, 0, fldoff(genitem, y), "yloc", EF_BAD}, \
-{ NSC_TYPEID, 0, 0, fldoff(genitem, type), "type", EF_BAD}, \
-{ NSC_CHAR, 0, 0, fldoff(genitem, effic), "effic", EF_BAD}, \
-{ NSC_CHAR , 0, 0, fldoff(genitem, mobil), "mobil", EF_BAD}, \
-{ NSC_SHORT, 0, 0, fldoff(genitem, tech), "tech", EF_BAD}, \
-{ NSC_CHAR, NSC_EXTRA, 0, fldoff(genitem, group), "group", EF_BAD}, \
-{ NSC_XCOORD, 0, 0, fldoff(genitem, opx), "opx", EF_BAD}, \
-{ NSC_YCOORD, 0, 0, fldoff(genitem, opy), "opy", EF_BAD}, \
-{ NSC_SHORT, 0, 0, fldoff(genitem, mission), "mission", EF_BAD}, \
-{ NSC_SHORT, 0, 0, fldoff(genitem, radius), "radius", EF_BAD}
+#define NSC_GENITEM(ef_type, ef_chr) \
+{ NSC_SHORT, 0, 0, fldoff(empobj, uid), "uid", ef_type}, \
+{ NSC_NATID, 0, 0, fldoff(empobj, own), "owner", EF_NATION}, \
+{ NSC_XCOORD, 0, 0, fldoff(empobj, x), "xloc", EF_BAD}, \
+{ NSC_YCOORD, 0, 0, fldoff(empobj, y), "yloc", EF_BAD}, \
+{ NSC_CHAR, 0, 0, fldoff(empobj, type), "type", ef_chr}, \
+{ NSC_CHAR, 0, 0, fldoff(empobj, effic), "effic", EF_BAD}, \
+{ NSC_CHAR , 0, 0, fldoff(empobj, mobil), "mobil", EF_BAD}, \
+{ NSC_UCHAR , 0, 0, fldoff(empobj, off), "off", EF_BAD}, \
+{ NSC_SHORT, 0, 0, fldoff(empobj, tech), "tech", EF_BAD}, \
+{ NSC_STRINGY, NSC_EXTRA, 1, fldoff(empobj, group), "group", EF_BAD}, \
+{ NSC_XCOORD, 0, 0, fldoff(empobj, opx), "opx", EF_BAD}, \
+{ NSC_YCOORD, 0, 0, fldoff(empobj, opy), "opy", EF_BAD}, \
+{ NSC_SHORT, 0, 0, fldoff(empobj, mission), "mission", EF_MISSIONS}, \
+{ NSC_SHORT, 0, 0, fldoff(empobj, radius), "radius", EF_BAD}
struct castr ship_ca[] = {
- NSC_GENITEM,
- {NSC_CHAR, 0, 0, fldoff(shpstr, shp_fleet), "fleet", EF_BAD},
+ NSC_GENITEM(EF_SHIP, EF_SHIP_CHR),
+ {NSC_STRINGY, 0, 1, fldoff(shpstr, shp_fleet), "fleet", EF_BAD},
{NSC_UCHAR, NSC_EXTRA, 0, fldoff(shpstr, shp_nplane), "nplane", EF_BAD},
{NSC_UCHAR, NSC_EXTRA, 0, fldoff(shpstr, shp_nland), "nland", EF_BAD},
{NSC_XCOORD, 0, 0, fldoff(shpstr, shp_destx[0]), "xstart", EF_BAD},
{NSC_XCOORD, 0, 0, fldoff(shpstr, shp_destx[1]), "xend", EF_BAD},
{NSC_YCOORD, 0, 0, fldoff(shpstr, shp_desty[0]), "ystart", EF_BAD},
{NSC_YCOORD, 0, 0, fldoff(shpstr, shp_desty[1]), "yend", EF_BAD},
- {NSC_SITYPE(i_type), 0, TMAX, fldoff(shpstr, shp_tstart), "cargostart", EF_BAD},
- {NSC_SITYPE(i_type), 0, TMAX, fldoff(shpstr, shp_tend), "cargoend", EF_BAD},
+ {NSC_SITYPE(i_type), 0, TMAX, fldoff(shpstr, shp_tstart), "cargostart",
+ EF_ITEM},
+ {NSC_SITYPE(i_type), 0, TMAX, fldoff(shpstr, shp_tend), "cargoend",
+ EF_ITEM},
{NSC_SHORT, 0, TMAX, fldoff(shpstr, shp_lstart), "amtstart", EF_BAD},
{NSC_SHORT, 0, TMAX, fldoff(shpstr, shp_lend), "amtend", EF_BAD},
{NSC_UCHAR, 0, 0, fldoff(shpstr, shp_autonav), "autonav", EF_BAD},
NSC_IVEC(fldoff(shpstr, shp_item), ""),
- {NSC_SHORT, NSC_DEITY, 0, fldoff(shpstr, shp_pstage), "pstage", EF_BAD},
+ {NSC_SHORT, NSC_DEITY, 0, fldoff(shpstr, shp_pstage), "pstage",
+ EF_PLAGUE_STAGES},
{NSC_SHORT, NSC_DEITY, 0, fldoff(shpstr, shp_ptime), "ptime", EF_BAD},
{NSC_TIME, 0, 0, fldoff(shpstr, shp_access), "access", EF_BAD},
- {NSC_TIME, NSC_EXTRA, 0, fldoff(shpstr, shp_timestamp), "timestamp", EF_BAD},
+ {NSC_TIME, NSC_EXTRA, 0, fldoff(shpstr, shp_timestamp), "timestamp",
+ EF_BAD},
{NSC_UCHAR, 0, 0, fldoff(shpstr, shp_mobquota), "mquota", EF_BAD},
{NSC_STRINGY, 0, MAXSHPPATH, fldoff(shpstr, shp_path), "path", EF_BAD},
{NSC_SHORT, 0, 0, fldoff(shpstr, shp_follow), "follow", EF_BAD},
{NSC_STRINGY, 0, MAXSHPNAMLEN, fldoff(shpstr, shp_name), "name", EF_BAD},
{NSC_UCHAR, 0, 0, fldoff(shpstr, shp_fuel), "fuel", EF_BAD},
- {NSC_UCHAR, NSC_EXTRA, 0, fldoff(shpstr, shp_nchoppers), "nchoppers", EF_BAD},
+ {NSC_UCHAR, NSC_EXTRA, 0, fldoff(shpstr, shp_nchoppers), "nchoppers",
+ EF_BAD},
{NSC_UCHAR, NSC_EXTRA, 0, fldoff(shpstr, shp_nxlight), "nxlight", EF_BAD},
- /* could let builder access these, but we can't express that yet: */
+ /* should let builder access xbuilt, ybuilt, but can't express that: */
{NSC_XCOORD, NSC_DEITY, 0, fldoff(shpstr, shp_orig_x), "xbuilt", EF_BAD},
{NSC_YCOORD, NSC_DEITY, 0, fldoff(shpstr, shp_orig_y), "ybuilt", EF_BAD},
- {NSC_NATID, NSC_DEITY, 0, fldoff(shpstr, shp_orig_own), "builder", EF_BAD},
- {NSC_INT, 0, 0, fldoff(shpstr, shp_rflags), "rflags", EF_BAD},
+ {NSC_NATID, NSC_DEITY, 0, fldoff(shpstr, shp_orig_own), "builder",
+ EF_NATION},
+ {NSC_INT, NSC_BITS, 0, fldoff(shpstr, shp_rflags), "rflags",
+ EF_RETREAT_FLAGS},
{NSC_STRINGY, 0, RET_LEN, fldoff(shpstr, shp_rpath), "rpath", EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
struct castr mchr_ca[] = {
+ {NSC_CHAR, 0, 0, offsetof(struct mchrstr, m_type), "type", EF_SHIP_CHR},
{NSC_STRING, 0, 0, offsetof(struct mchrstr, m_name), "name", EF_BAD},
- {NSC_USHORT, 0, I_MAX+1, offsetof(struct mchrstr, m_item), "item", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct mchrstr, m_lcm), "lcm", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct mchrstr, m_hcm), "hcm", EF_BAD},
+ NSC_IVEC(offsetof(struct mchrstr, m_item), ""),
+ {NSC_INT, 0, 0, offsetof(struct mchrstr, m_lcm), "l_build", EF_BAD},
+ {NSC_INT, 0, 0, offsetof(struct mchrstr, m_hcm), "h_build", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct mchrstr, m_armor), "armor", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct mchrstr, m_speed), "speed", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct mchrstr, m_visib), "visib", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct mchrstr, m_frnge), "frnge", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct mchrstr, m_glim), "glim", EF_BAD},
{NSC_UCHAR, 0, 0, offsetof(struct mchrstr, m_nxlight), "nxlight", EF_BAD},
- {NSC_UCHAR, 0, 0, offsetof(struct mchrstr, m_nchoppers), "nchoppers", EF_BAD},
+ {NSC_UCHAR, 0, 0, offsetof(struct mchrstr, m_nchoppers), "nchoppers",
+ EF_BAD},
{NSC_UCHAR, 0, 0, offsetof(struct mchrstr, m_fuelc), "fuelc", EF_BAD},
{NSC_UCHAR, 0, 0, offsetof(struct mchrstr, m_fuelu), "fuelu", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct mchrstr, m_tech), "tech", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct mchrstr, m_cost), "cost", EF_BAD},
- {NSC_LONG, 0, 0, offsetof(struct mchrstr, m_flags), "flags", EF_SHIP_CHR_FLAGS},
+ {NSC_LONG, NSC_BITS, 0, offsetof(struct mchrstr, m_flags), "flags",
+ EF_SHIP_CHR_FLAGS},
{NSC_UCHAR, 0, 0, offsetof(struct mchrstr, m_nplanes), "nplanes", EF_BAD},
{NSC_UCHAR, 0, 0, offsetof(struct mchrstr, m_nland), "nland", EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
struct castr plane_ca[] = {
- NSC_GENITEM,
- {NSC_CHAR, 0, 0, fldoff(plnstr, pln_wing), "wing", EF_BAD},
+ NSC_GENITEM(EF_PLANE, EF_PLANE_CHR),
+ {NSC_STRINGY, 0, 1, fldoff(plnstr, pln_wing), "wing", EF_BAD},
{NSC_UCHAR, 0, 0, fldoff(plnstr, pln_range), "range", EF_BAD},
{NSC_SHORT, 0, 0, fldoff(plnstr, pln_ship), "ship", EF_BAD},
{NSC_SHORT, 0, 0, fldoff(plnstr, pln_land), "land", EF_BAD},
{NSC_INT, NSC_EXTRA, 0, fldoff(plnstr, pln_def), "def", EF_BAD},
{NSC_CHAR, 0, 0, fldoff(plnstr, pln_harden), "harden", EF_BAD},
{NSC_CHAR, 0, 0, fldoff(plnstr, pln_nuketype), "nuketype", EF_BAD},
- {NSC_CHAR, 0, 0, fldoff(plnstr, pln_flags), "flags", EF_BAD},
+ {NSC_CHAR, NSC_BITS, 0, fldoff(plnstr, pln_flags), "flags",
+ EF_PLANE_FLAGS},
{NSC_TIME, 0, 0, fldoff(plnstr, pln_access), "access", EF_BAD},
- {NSC_TIME, NSC_EXTRA, 0, fldoff(plnstr, pln_timestamp), "timestamp", EF_BAD},
+ {NSC_TIME, NSC_EXTRA, 0, fldoff(plnstr, pln_timestamp), "timestamp",
+ EF_BAD},
{NSC_FLOAT, 0, 0, fldoff(plnstr, pln_theta), "theta", EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
struct castr plchr_ca[] = {
+ {NSC_CHAR, 0, 0, offsetof(struct plchrstr, pl_type), "type", EF_PLANE_CHR},
{NSC_STRING, 0, 0, offsetof(struct plchrstr, pl_name), "name", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct plchrstr, pl_lcm), "lcm", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct plchrstr, pl_hcm), "hcm", EF_BAD},
+ {NSC_INT, 0, 0, offsetof(struct plchrstr, pl_lcm), "l_build", EF_BAD},
+ {NSC_INT, 0, 0, offsetof(struct plchrstr, pl_hcm), "h_build", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct plchrstr, pl_cost), "cost", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct plchrstr, pl_tech), "tech", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct plchrstr, pl_acc), "acc", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct plchrstr, pl_crew), "crew", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct plchrstr, pl_fuel), "fuel", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct plchrstr, pl_stealth), "stealth", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct plchrstr, pl_flags), "flags", EF_PLANE_CHR_FLAGS},
+ {NSC_INT, NSC_BITS, 0, offsetof(struct plchrstr, pl_flags), "flags",
+ EF_PLANE_CHR_FLAGS},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
struct castr land_ca[] = {
- NSC_GENITEM,
- {NSC_CHAR, 0, 0, fldoff(lndstr, lnd_army), "army", EF_BAD},
+ NSC_GENITEM(EF_LAND, EF_LAND_CHR),
+ {NSC_STRINGY, 0, 1, fldoff(lndstr, lnd_army), "army", EF_BAD},
{NSC_SHORT, 0, 0, fldoff(lndstr, lnd_ship), "ship", EF_BAD},
{NSC_CHAR, 0, 0, fldoff(lndstr, lnd_harden), "harden", EF_BAD},
{NSC_SHORT, 0, 0, fldoff(lndstr, lnd_retreat), "retreat", EF_BAD},
{NSC_UCHAR, 0, 0, fldoff(lndstr, lnd_fuel), "fuel", EF_BAD},
{NSC_UCHAR, NSC_EXTRA, 0, fldoff(lndstr, lnd_nxlight), "nxlight", EF_BAD},
- {NSC_INT, 0, 0, fldoff(lndstr, lnd_rflags), "rflags", EF_BAD},
+ {NSC_INT, NSC_BITS, 0, fldoff(lndstr, lnd_rflags), "rflags",
+ EF_RETREAT_FLAGS},
{NSC_STRINGY, 0, RET_LEN, fldoff(lndstr, lnd_rpath), "rpath", EF_BAD},
{NSC_UCHAR, 0, 0, fldoff(lndstr, lnd_rad_max), "react", EF_BAD},
NSC_IVEC(fldoff(lndstr, lnd_item), ""),
- {NSC_SHORT, NSC_DEITY, 0, fldoff(lndstr, lnd_pstage), "pstage", EF_BAD},
+ {NSC_SHORT, NSC_DEITY, 0, fldoff(lndstr, lnd_pstage), "pstage",
+ EF_PLAGUE_STAGES},
{NSC_SHORT, NSC_DEITY, 0, fldoff(lndstr, lnd_ptime), "ptime", EF_BAD},
{NSC_SHORT, 0, 0, fldoff(lndstr, lnd_land), "land", EF_BAD},
{NSC_UCHAR, NSC_EXTRA, 0, fldoff(lndstr, lnd_nland), "nland", EF_BAD},
{NSC_INT, NSC_EXTRA, 0, fldoff(lndstr, lnd_aaf), "aaf", EF_BAD},
{NSC_UCHAR, NSC_EXTRA, 0, fldoff(lndstr, lnd_fuelc), "fuelc", EF_BAD},
{NSC_UCHAR, NSC_EXTRA, 0, fldoff(lndstr, lnd_fuelu), "fuelu", EF_BAD},
- {NSC_UCHAR, NSC_EXTRA, 0, fldoff(lndstr, lnd_maxlight), "maxlight", EF_BAD},
- {NSC_TIME, NSC_EXTRA, 0, fldoff(lndstr, lnd_timestamp), "timestamp", EF_BAD},
+ {NSC_UCHAR, NSC_EXTRA, 0, fldoff(lndstr, lnd_maxlight), "maxlight",
+ EF_BAD},
+ {NSC_TIME, NSC_EXTRA, 0, fldoff(lndstr, lnd_timestamp), "timestamp",
+ EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
struct castr lchr_ca[] = {
+ {NSC_CHAR, 0, 0, offsetof(struct lchrstr, l_type), "type", EF_LAND_CHR},
{NSC_STRING, 0, 0, offsetof(struct lchrstr, l_name), "name", EF_BAD},
- {NSC_USHORT, 0, I_MAX+1, offsetof(struct mchrstr, m_item), "item", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct lchrstr, l_lcm), "lcm", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct lchrstr, l_hcm), "hcm", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct lchrstr, l_gun), "gun", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct lchrstr, l_shell), "shell", EF_BAD},
+ NSC_IVEC(offsetof(struct lchrstr, l_item), ""),
+ {NSC_INT, 0, 0, offsetof(struct lchrstr, l_lcm), "l_build", EF_BAD},
+ {NSC_INT, 0, 0, offsetof(struct lchrstr, l_hcm), "h_build", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct lchrstr, l_tech), "tech", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct lchrstr, l_cost), "cost", EF_BAD},
{NSC_FLOAT, 0, 0, offsetof(struct lchrstr, l_att), "att", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct lchrstr, l_spd), "spd", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct lchrstr, l_vis), "vis", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct lchrstr, l_spy), "spy", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct lchrstr, l_rad), "rad", EF_BAD},
+ {NSC_INT, 0, 0, offsetof(struct lchrstr, l_rad), "rmax", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct lchrstr, l_frg), "frg", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct lchrstr, l_acc), "acc", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct lchrstr, l_dam), "dam", EF_BAD},
{NSC_UCHAR, 0, 0, offsetof(struct lchrstr, l_fuelc), "fuelc", EF_BAD},
{NSC_UCHAR, 0, 0, offsetof(struct lchrstr, l_fuelu), "fuelu", EF_BAD},
{NSC_UCHAR, 0, 0, offsetof(struct lchrstr, l_nxlight), "nxlight", EF_BAD},
- {NSC_UCHAR, 0, 0, offsetof(struct lchrstr, l_mxland), "mxland", EF_BAD},
- {NSC_LONG, 0, 0, offsetof(struct lchrstr, l_flags), "flags", EF_LAND_CHR_FLAGS},
+ {NSC_UCHAR, 0, 0, offsetof(struct lchrstr, l_nland), "nland", EF_BAD},
+ {NSC_LONG, NSC_BITS, 0, offsetof(struct lchrstr, l_flags), "flags",
+ EF_LAND_CHR_FLAGS},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
struct castr nuke_ca[] = {
- {NSC_NATID, 0, 0, fldoff(nukstr, nuk_own), "owner", EF_BAD},
- {NSC_SHORT, 0, 0, fldoff(nukstr, nuk_uid), "uid", EF_BAD},
- {NSC_XCOORD, 0, 0, fldoff(nukstr, nuk_x), "xloc", EF_BAD},
- {NSC_YCOORD, 0, 0, fldoff(nukstr, nuk_y), "yloc", EF_BAD},
- {NSC_CHAR, 0, 0, fldoff(nukstr, nuk_n), "number", EF_BAD},
- {NSC_SHORT, 0, N_MAXNUKE, fldoff(nukstr, nuk_types), "types", EF_BAD},
- {NSC_TIME, NSC_EXTRA, 0, fldoff(nukstr, nuk_timestamp), "timestamp", EF_BAD},
+ NSC_GENITEM(EF_NUKE, EF_NUKE_CHR),
+ {NSC_SHORT, 0, 0, fldoff(nukstr, nuk_plane), "plane", EF_BAD},
+ {NSC_TIME, NSC_EXTRA, 0, fldoff(nukstr, nuk_timestamp), "timestamp",
+ EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
struct castr nchr_ca[] = {
+ {NSC_CHAR, 0, 0, offsetof(struct nchrstr, n_type), "type", EF_NUKE_CHR},
{NSC_STRING, 0, 0, offsetof(struct nchrstr, n_name), "name", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct nchrstr, n_lcm), "lcm", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct nchrstr, n_hcm), "hcm", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct nchrstr, n_oil), "oil", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct nchrstr, n_rad), "rad", EF_BAD},
+ {NSC_INT, 0, 0, offsetof(struct nchrstr, n_lcm), "l_build", EF_BAD},
+ {NSC_INT, 0, 0, offsetof(struct nchrstr, n_hcm), "h_build", EF_BAD},
+ {NSC_INT, 0, 0, offsetof(struct nchrstr, n_oil), "o_build", EF_BAD},
+ {NSC_INT, 0, 0, offsetof(struct nchrstr, n_rad), "r_build", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct nchrstr, n_blast), "blast", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct nchrstr, n_dam), "dam", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct nchrstr, n_cost), "cost", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct nchrstr, n_tech), "tech", EF_BAD},
{NSC_INT, 0, 0, offsetof(struct nchrstr, n_weight), "weight", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct nchrstr, n_flags), "flags", EF_NUKE_CHR_FLAGS},
+ {NSC_INT, NSC_BITS, 0, offsetof(struct nchrstr, n_flags), "flags",
+ EF_NUKE_CHR_FLAGS},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
struct castr treaty_ca[] = {
- {NSC_NATID, 0, 0, fldoff(trtstr, trt_cna), "cna", EF_BAD},
- {NSC_NATID, 0, 0, fldoff(trtstr, trt_cnb), "cnb", EF_BAD},
- {NSC_CHAR, 0, 0, fldoff(trtstr, trt_status), "status", EF_BAD},
- {NSC_SHORT, 0, 0, fldoff(trtstr, trt_acond), "acond", EF_BAD},
- {NSC_SHORT, 0, 0, fldoff(trtstr, trt_bcond), "bcond", EF_BAD},
+ {NSC_SHORT, 0, 0, fldoff(trtstr, trt_uid), "uid", EF_TREATY},
+ {NSC_NATID, 0, 0, fldoff(trtstr, trt_cna), "cna", EF_NATION},
+ {NSC_NATID, 0, 0, fldoff(trtstr, trt_cnb), "cnb", EF_NATION},
+ {NSC_CHAR, 0, 0, fldoff(trtstr, trt_status), "status",
+ EF_AGREEMENT_STATUS},
+ {NSC_SHORT, NSC_BITS, 0, fldoff(trtstr, trt_acond), "acond",
+ EF_TREATY_FLAGS},
+ {NSC_SHORT, NSC_BITS, 0, fldoff(trtstr, trt_bcond), "bcond",
+ EF_TREATY_FLAGS},
{NSC_TIME, 0, 0, fldoff(trtstr, trt_exp), "exp", EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
-struct castr tchr_ca[] = {
- {NSC_STRING, 0, 0, offsetof(struct tchrstr, t_name), "name", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct tchrstr, t_cond), "cond", EF_BAD},
- {NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
-};
-
struct castr loan_ca[] = {
- {NSC_NATID, 0, 0, fldoff(lonstr, l_loner), "loaner", EF_BAD},
- {NSC_SHORT, 0, 0, fldoff(lonstr, l_uid), "uid", EF_BAD},
- {NSC_NATID, 0, 0, fldoff(lonstr, l_lonee), "loanee", EF_BAD},
- {NSC_CHAR, 0, 0, fldoff(lonstr, l_status), "status", EF_BAD},
+ {NSC_SHORT, 0, 0, fldoff(lonstr, l_uid), "uid", EF_LOAN},
+ {NSC_NATID, 0, 0, fldoff(lonstr, l_loner), "loaner", EF_NATION},
+ {NSC_NATID, 0, 0, fldoff(lonstr, l_lonee), "loanee", EF_NATION},
+ {NSC_CHAR, 0, 0, fldoff(lonstr, l_status), "status",
+ EF_AGREEMENT_STATUS},
{NSC_INT, 0, 0, fldoff(lonstr, l_irate), "irate", EF_BAD},
{NSC_INT, 0, 0, fldoff(lonstr, l_ldur), "ldur", EF_BAD},
{NSC_LONG, 0, 0, fldoff(lonstr, l_amtpaid), "amtpaid", EF_BAD},
};
struct castr news_ca[] = {
- {NSC_NATID, 0, 0, fldoff(nwsstr, nws_ano), "actor", EF_BAD},
- {NSC_SHORT, 0, 0, fldoff(nwsstr, nws_uid), "uid", EF_BAD},
- {NSC_CHAR, 0, 0, fldoff(nwsstr, nws_vrb), "action", EF_BAD},
- {NSC_NATID, 0, 0, fldoff(nwsstr, nws_vno), "victim", EF_BAD},
+ /* no need for uid as long as it's not referenced from other tables */
+ {NSC_NATID, 0, 0, fldoff(nwsstr, nws_ano), "actor", EF_NATION},
+ {NSC_CHAR, 0, 0, fldoff(nwsstr, nws_vrb), "action", EF_NEWS_CHR},
+ {NSC_NATID, 0, 0, fldoff(nwsstr, nws_vno), "victim", EF_NATION},
{NSC_CHAR, 0, 0, fldoff(nwsstr, nws_ntm), "times", EF_BAD},
{NSC_TIME, 0, 0, fldoff(nwsstr, nws_when), "time", EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
struct castr lost_ca[] = {
- {NSC_NATID, 0, 0, fldoff(loststr, lost_owner), "owner", EF_BAD},
- {NSC_INT, 0, 0, fldoff(loststr, lost_uid), "uid", EF_BAD},
- {NSC_CHAR, 0, 0, fldoff(loststr, lost_type), "type", EF_BAD},
+ /* no need for uid as long as it's not referenced from other tables */
+ {NSC_NATID, 0, 0, fldoff(loststr, lost_owner), "owner", EF_NATION},
+ {NSC_CHAR, 0, 0, fldoff(loststr, lost_type), "type", EF_TABLE},
{NSC_SHORT, 0, 0, fldoff(loststr, lost_id), "id", EF_BAD},
{NSC_XCOORD, 0, 0, fldoff(loststr, lost_x), "x", EF_BAD},
{NSC_YCOORD, 0, 0, fldoff(loststr, lost_y), "y", EF_BAD},
};
struct castr commodity_ca[] = {
- {NSC_NATID, 0, 0, fldoff(comstr, com_owner), "owner", EF_BAD},
- {NSC_SHORT, 0, 0, fldoff(comstr, com_uid), "uid", EF_BAD},
- {NSC_SITYPE(i_type), 0, 0, fldoff(comstr, com_type), "type", EF_BAD},
+ {NSC_SHORT, 0, 0, fldoff(comstr, com_uid), "uid", EF_COMM},
+ {NSC_NATID, 0, 0, fldoff(comstr, com_owner), "owner", EF_NATION},
+ {NSC_SITYPE(i_type), 0, 0, fldoff(comstr, com_type), "type", EF_ITEM},
{NSC_INT, 0, 0, fldoff(comstr, com_amount), "amount", EF_BAD},
- {NSC_INT, 0, 0, fldoff(comstr, com_maxbidder), "maxbidder", EF_BAD},
+ {NSC_FLOAT, 0, 0, fldoff(comstr, com_price), "price", EF_BAD},
+ {NSC_INT, 0, 0, fldoff(comstr, com_maxbidder), "maxbidder", EF_NATION},
{NSC_TIME, 0, 0, fldoff(comstr, com_markettime), "markettime", EF_BAD},
- /* could let maxbidder access these, but we can't express that yet: */
+ /* should let maxbidder access xbuy, ybuy, but can't express that: */
{NSC_XCOORD, NSC_DEITY, 0, fldoff(comstr, com_x), "xbuy", EF_BAD},
{NSC_XCOORD, NSC_DEITY, 0, fldoff(comstr, com_y), "ybuy", EF_BAD},
- /* could let the owner access these, but we can't express that yet: */
+ /* should let owner access xsell, ysell, but can't express that: */
{NSC_XCOORD, NSC_DEITY, 0, fldoff(comstr, sell_x), "xsell", EF_BAD},
{NSC_YCOORD, NSC_DEITY, 0, fldoff(comstr, sell_y), "ysell", EF_BAD},
- {NSC_FLOAT, 0, 0, fldoff(comstr, com_price), "price", EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
struct castr trade_ca[] = {
- {NSC_NATID, 0, 0, fldoff(trdstr, trd_owner), "owner", EF_BAD},
- {NSC_SHORT, 0, 0, fldoff(trdstr, trd_uid), "uid", EF_BAD},
- {NSC_CHAR, 0, 0, fldoff(trdstr, trd_type), "type", EF_BAD},
+ {NSC_SHORT, 0, 0, fldoff(trdstr, trd_uid), "uid", EF_TRADE},
+ {NSC_NATID, 0, 0, fldoff(trdstr, trd_owner), "owner", EF_NATION},
+ {NSC_CHAR, 0, 0, fldoff(trdstr, trd_type), "type", EF_TABLE},
{NSC_SHORT, 0, 0, fldoff(trdstr, trd_unitid), "unitid", EF_BAD},
{NSC_LONG, 0, 0, fldoff(trdstr, trd_price), "price", EF_BAD},
- {NSC_INT, 0, 0, fldoff(trdstr, trd_maxbidder), "maxbidder", EF_BAD},
+ {NSC_INT, 0, 0, fldoff(trdstr, trd_maxbidder), "maxbidder", EF_NATION},
{NSC_TIME, 0, 0, fldoff(trdstr, trd_markettime), "markettime", EF_BAD},
- /* could let the owner access these, but we can't express that yet: */
+ /* should let maxbidder access xloc, yloc, but can't express that: */
{NSC_XCOORD, NSC_DEITY, 0, fldoff(trdstr, trd_x), "xloc", EF_BAD},
{NSC_YCOORD, NSC_DEITY, 0, fldoff(trdstr, trd_y), "yloc", EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
-struct castr nat_ca[] = {
- {NSC_NATID, 0, 0, fldoff(natstr, nat_cnum), "cnum", EF_BAD},
- {NSC_CHAR, 0, 0, fldoff(natstr, nat_stat), "stat", EF_BAD},
- {NSC_STRINGY, 0, 20, fldoff(natstr, nat_cnam), "cname", EF_BAD},
- {NSC_STRINGY, NSC_DEITY, 20, fldoff(natstr, nat_pnam), "passwd", EF_BAD},
+struct castr cou_ca[] = {
+ /*
+ * This is the owner's view, i.e. it applies only to the own
+ * nation. The public view nat_ca[], which applies to all
+ * nations, has the same selectors with different flags: NSC_DEITY
+ * is set except for cnum (which must come first) and all
+ * NSC_EXTRA selectors, NSC_EXTRA is cleared.
+ * nat_ca[] should also make tech, research, education and
+ * happiness available, but we can't express the obfuscation
+ * necessary for foreign levels.
+ */
+ {NSC_NATID, 0, 0, fldoff(natstr, nat_cnum), "cnum", EF_NATION},
+ {NSC_SITYPE(nat_status), NSC_EXTRA, 0, fldoff(natstr, nat_stat),
+ "stat", EF_NATION_STATUS},
+ {NSC_STRINGY, NSC_EXTRA, 20, fldoff(natstr, nat_cnam), "cname", EF_BAD},
+ {NSC_STRINGY, NSC_DEITY | NSC_EXTRA, 20, fldoff(natstr, nat_pnam),
+ "passwd", EF_BAD},
{NSC_STRINGY, 0, 32, fldoff(natstr, nat_hostaddr), "ip", EF_BAD},
{NSC_STRINGY, 0, 512, fldoff(natstr, nat_hostname), "hostname", EF_BAD},
{NSC_STRINGY, 0, 32, fldoff(natstr, nat_userid), "userid", EF_BAD},
- {NSC_XCOORD, 0, 0, fldoff(natstr, nat_xstart), "xstart", EF_BAD},
- {NSC_YCOORD, 0, 0, fldoff(natstr, nat_ystart), "ystart", EF_BAD},
{NSC_XCOORD, 0, 0, fldoff(natstr, nat_xcap), "xcap", EF_BAD},
{NSC_YCOORD, 0, 0, fldoff(natstr, nat_ycap), "ycap", EF_BAD},
- {NSC_XCOORD, NSC_DEITY, 0, fldoff(natstr, nat_xorg), "xorg", EF_BAD},
- {NSC_YCOORD, NSC_DEITY, 0, fldoff(natstr, nat_yorg), "yorg", EF_BAD},
+ {NSC_XCOORD, NSC_DEITY | NSC_EXTRA, 0, fldoff(natstr, nat_xorg),
+ "xorg", EF_BAD},
+ {NSC_YCOORD, NSC_DEITY | NSC_EXTRA, 0, fldoff(natstr, nat_yorg),
+ "yorg", EF_BAD},
+ {NSC_CHAR, 0, 0, fldoff(natstr, nat_dayno), "dayno", EF_BAD},
{NSC_CHAR, 0, 0, fldoff(natstr, nat_update), "update", EF_BAD},
{NSC_UCHAR, 0, 0, fldoff(natstr, nat_missed), "missed", EF_BAD},
{NSC_USHORT, 0, 0, fldoff(natstr, nat_tgms), "tgms", EF_BAD},
{NSC_TIME, 0, 0, fldoff(natstr, nat_annotim), "annotim", EF_BAD},
{NSC_FLOAT, 0, 0, fldoff(natstr, nat_level[NAT_TLEV]), "tech", EF_BAD},
{NSC_FLOAT, 0, 0, fldoff(natstr, nat_level[NAT_RLEV]), "research", EF_BAD},
- {NSC_FLOAT, 0, 0, fldoff(natstr, nat_level[NAT_ELEV]), "education", EF_BAD},
- {NSC_FLOAT, 0, 0, fldoff(natstr, nat_level[NAT_HLEV]), "happiness", EF_BAD},
- /* FIXME nat_b[], nat_relate[], nat_contact[], nat_rejects[], nat_priorities[] */
- {NSC_LONG, 0, 0, fldoff(natstr, nat_flags),"flags", EF_BAD},
+ {NSC_FLOAT, 0, 0, fldoff(natstr, nat_level[NAT_ELEV]), "education",
+ EF_BAD},
+ {NSC_FLOAT, 0, 0, fldoff(natstr, nat_level[NAT_HLEV]), "happiness",
+ EF_BAD},
+ {NSC_HIDDEN, NSC_EXTRA, MAXNOC, fldoff(natstr, nat_relate), "relations",
+ EF_NATION_RELATIONS},
+ /* mortals know there's contact (relations show), but not how strong */
+ {NSC_UCHAR, NSC_DEITY | NSC_EXTRA, MAXNOC, fldoff(natstr, nat_contact),
+ "contacts", EF_BAD},
+ {NSC_UCHAR, NSC_EXTRA | NSC_BITS, MAXNOC, fldoff(natstr, nat_rejects),
+ "rejects", EF_NATION_REJECTS},
+ /* FIXME nat_priorities[] */
+ {NSC_LONG, NSC_BITS, 0, fldoff(natstr, nat_flags), "flags",
+ EF_NATION_FLAGS},
+ {NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
+};
+
+struct castr nat_ca[sizeof(cou_ca) / sizeof(*cou_ca)];
+/* initialized in ef_init_srv() */
+
+struct castr realm_ca[] = {
+ /* uid is encoded in cnum, realm */
+ {NSC_NATID, NSC_CONST, 0, fldoff(realmstr, r_cnum), "cnum", EF_NATION},
+ {NSC_USHORT, NSC_CONST, 0, fldoff(realmstr, r_realm), "realm", EF_BAD},
+ {NSC_SHORT, 0, 0, fldoff(realmstr, r_xl), "xl", EF_BAD},
+ {NSC_SHORT, 0, 0, fldoff(realmstr, r_xh), "xh", EF_BAD},
+ {NSC_SHORT, 0, 0, fldoff(realmstr, r_yl), "yl", EF_BAD},
+ {NSC_SHORT, 0, 0, fldoff(realmstr, r_yh), "yh", EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
struct castr intrchr_ca[] = {
- {NSC_STRING, NSC_CONST, 0, offsetof(struct sctintrins, in_name), "name", EF_BAD},
+ /* no need for uid as long as it's not referenced from other tables */
+ {NSC_STRING, NSC_CONST, 0, offsetof(struct sctintrins, in_name), "name",
+ EF_BAD},
{NSC_UCHAR, 0, 0, offsetof(struct sctintrins, in_lcms), "lcms", EF_BAD},
{NSC_UCHAR, 0, 0, offsetof(struct sctintrins, in_hcms), "hcms", EF_BAD},
{NSC_UCHAR, 0, 0, offsetof(struct sctintrins, in_dcost), "dcost", EF_BAD},
{NSC_UCHAR, 0, 0, offsetof(struct sctintrins, in_mcost), "mcost", EF_BAD},
+ {NSC_UCHAR, 0, 0, offsetof(struct sctintrins, in_enable), "enable",
+ EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
struct castr rpt_ca[] = {
- {NSC_STRING, 0, NUM_RPTS, offsetof(struct rptstr, r_newstory), "newstory", EF_BAD},
+ {NSC_CHAR, 0, 0, offsetof(struct rptstr, r_uid), "uid", EF_NEWS_CHR},
+ {NSC_STRING, 0, NUM_RPTS, offsetof(struct rptstr, r_newstory), "newstory",
+ EF_BAD},
{NSC_INT, 0, 0, offsetof(struct rptstr, r_good_will), "good_will", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct rptstr, r_newspage), "newspage", EF_BAD},
+ {NSC_INT, 0, 0, offsetof(struct rptstr, r_newspage), "newspage",
+ EF_PAGE_HEADINGS},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
struct castr empfile_ca[] = {
- {NSC_STRING, 0, 0, offsetof(struct empfile, name), "name", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct empfile, ef_uid), "uid", EF_BAD},
- {NSC_STRING, 0, 0, offsetof(struct empfile, file), "file_name", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct empfile, flags), "flags", EF_BAD},
+ {NSC_INT, 0, 0, offsetof(struct empfile, uid), "uid", EF_TABLE},
+ {NSC_STRING, NSC_CONST, 0, offsetof(struct empfile, name), "name", EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
struct castr symbol_ca[] = {
- {NSC_STRING, 0, 0, offsetof(struct symbol, name), "name", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct symbol, value), "value", EF_BAD},
+ /*
+ * value is is const because it has to match what is compiled into
+ * the server. name is const because clients key on it.
+ */
+ {NSC_INT, NSC_CONST, 0, offsetof(struct symbol, value), "value", EF_BAD},
+ {NSC_STRING, NSC_CONST, 0, offsetof(struct symbol, name), "name", EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
-
-struct symbol ship_chr_flags[] = {
- {M_FOOD, "fish"},
- {M_TORP, "torp"},
- {M_DCH, "dchrg"},
- {M_FLY, "plane"},
- {M_MSL, "miss"},
- {M_OIL, "oil"},
- {M_SONAR, "sonar"},
- {M_MINE, "mine"},
- {M_SWEEP, "sweep"},
- {M_SUB, "sub"},
- {M_SPY, "spy"},
- {M_LAND, "land"},
- {M_SUBT, "sub-torp"},
- {M_TRADE, "trade"},
- {M_SEMILAND, "semi-land"},
- {M_OILER, "oiler"},
- {M_SUPPLY, "supply"},
- {M_ANTIMISSILE, "anti-missile"},
- {0, 0}
-};
-
-struct symbol land_chr_flags[] = {
- {L_XLIGHT, "xlight"},
- {L_ENGINEER, "engineer"},
- {L_SUPPLY, "supply"},
- {L_SECURITY, "security"},
- {L_LIGHT, "light"},
- {L_MARINE, "marine"},
- {L_RECON, "recon"},
- {L_RADAR, "radar"},
- {L_ASSAULT, "assault"},
- {L_FLAK, "flak"},
- {L_SPY, "spy"},
- {L_TRAIN, "train"},
- {L_HEAVY, "heavy"},
- {0, 0}
-};
-
-struct symbol plane_chr_flags[] = {
- {P_T, "tactical"},
- {P_B, "bomber"},
- {P_F, "intercept"},
- {P_C, "cargo"},
- {P_V, "VTOL"},
- {P_M, "missile"},
- {P_L, "light"},
- {P_S, "spy"},
- {P_I, "image"},
- {P_O, "satellite"},
- {P_X, "stealth"},
- {P_N, "SDI"},
- {P_H, "half-stealth"},
- {P_E, "x-light"},
- {P_K, "helo"},
- {P_A, "ASW"},
- {P_P, "para"},
- {P_ESC, "escort"},
- {P_MINE, "mine"},
- {P_SWEEP, "sweep"},
- {P_MAR, "marine"},
- {0, 0}
-};
-
-struct symbol nuke_chr_flags[] = {
- {N_NEUT, "neutron"},
- {0, 0}
-};
-
struct castr mdchr_ca[] = {
- {NSC_STRING, 0, 0, offsetof(struct castr, ca_name), "name", EF_BAD},
- {NSC_CHAR, 0, 0, offsetof(struct castr, ca_type), "type", EF_META_TYPE},
- {NSC_UCHAR, 0, 0, offsetof(struct castr, ca_flags), "flags", EF_META_FLAGS},
- {NSC_USHORT, 0, 0, offsetof(struct castr, ca_len), "len", EF_BAD},
- {NSC_INT, 0, 0, offsetof(struct castr, ca_table), "table", EF_BAD},
+ /* no need for uid */
+ /* name must come first, clients may rely on it */
+ {NSC_STRING, NSC_CONST, 0, offsetof(struct castr, ca_name), "name",
+ EF_BAD},
+ {NSC_CHAR, NSC_CONST, 0, offsetof(struct castr, ca_type), "type",
+ EF_META_TYPE},
+ {NSC_UCHAR, NSC_CONST | NSC_BITS, 0, offsetof(struct castr, ca_flags),
+ "flags", EF_META_FLAGS},
+ {NSC_USHORT, NSC_CONST, 0, offsetof(struct castr, ca_len), "len",
+ EF_BAD},
+ {NSC_INT, NSC_CONST, 0, offsetof(struct castr, ca_table), "table",
+ EF_BAD},
{NSC_NOTYPE, 0, 0, 0, NULL, EF_BAD}
};
-
-struct symbol meta_flags[] = {
- {NSC_DEITY, "DEITY"},
- {NSC_EXTRA, "EXTRA"},
- {NSC_CONST, "CONST"},
- {0, ""}
-};
-
-struct symbol meta_type[] = {
- {NSC_LONG, "d"},
- {NSC_DOUBLE, "g"},
- {NSC_STRING, "s"},
- {NSC_TYPEID, "d"},
- {NSC_CHAR, "d"},
- {NSC_UCHAR, "d"},
- {NSC_SHORT, "d"},
- {NSC_USHORT, "d"},
- {NSC_INT, "d"},
- {NSC_XCOORD, "d"},
- {NSC_YCOORD, "d"},
- {NSC_TIME, "t"},
- {NSC_FLOAT, "g"},
- {NSC_STRINGY,"c"},
- {0 ,""}
-};
projects / empserver / blobdiff