/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
* nsc.c: Empire selection global structures
*
* Known contributors to this file:
- * Markus Armbruster, 2004-2013
+ * Markus Armbruster, 2004-2016
*/
/*
{"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 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 can point to dead ship; avoid ca_table for now */
- {"follow", fldoff(shp_follow), NSC_INT, 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_INT, 0, NULL,
#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,
{"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},
struct castr nuke_ca[] = {
#define CURSTR struct nukstr
NSC_GENITEM(EF_NUKE, EF_NUKE_CHR),
+ {"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_INT, 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_INT, 0, NULL, EF_LOAN, 0},
{"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},
+ {"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},
{"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},
+ {"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},
{"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},
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},
/* 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_TABLE, NSC_CONST},