reject: Create EF_REJECT table of struct rejectstr

New struct rejectstr is basically empty so far.  The next commit will
move reject state from struct natstr to struct rejectstr.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/include/file.h b/include/file.h
index ab8cefd1d6fc2ea8dbaa0707104861a4efaef51e..111b5b1d284f6e72de44294720f895dd3d9c5d43 100644 (file)
--- a/include/file.h
+++ b/include/file.h
@@ -156,6 +156,7 @@ enum {
     EF_POWER,
     EF_NATION,
     EF_CONTACT,
+    EF_REJECT,
     EF_LOAN,
     EF_MAP,
     EF_BMAP,

diff --git a/include/nat.h b/include/nat.h
index 2ad7f049cdd529e86b62a0e10f1193748388264f..e42fd68fdf0ee216143eb16380bdbd322a66d165 100644 (file)
--- a/include/nat.h
+++ b/include/nat.h
@@ -161,6 +161,16 @@ enum rej_comm {
     REJ_LOAN                   /* don't allow loans to be offered */
 };
 
+struct rejectstr {
+    /* initial part must match struct empobj */
+    signed ef_type: 8;
+    unsigned rej_seqno: 12;
+    unsigned rej_generation: 12;
+    int rej_uid;
+    time_t rej_timestamp;
+    /* end of part matching struct empobj */
+};
+
 extern char *relates[];
 
 /* procedures relating to nation stuff */
@@ -172,6 +182,10 @@ extern char *relates[];
 #define putcontact(p) ef_write(EF_CONTACT, (p)->con_uid, (p))
 #define getcontactp(n) ((struct contactstr *)ef_ptr(EF_CONTACT, (n)))
 
+#define getreject(n, p) ef_read(EF_REJECT, (n), (p))
+#define putreject(p) ef_write(EF_REJECT, (p)->rej_uid, (p))
+#define getrejectp(n) ((struct rejectstr *)ef_ptr(EF_REJECT, (n)))
+
 #define getrealm(r, n, p) ef_read(EF_REALM, ((r) + ((n) * MAXNOR)), (p))
 #define putrealm(p) ef_write(EF_REALM, (p)->r_uid, (p))
 

diff --git a/include/nsc.h b/include/nsc.h
index beeea10ebb83ce7234840944ede93288d2024c83..ae3a99267d8bb8b32632a46083a25d37aaa8baaa 100644 (file)
--- a/include/nsc.h
+++ b/include/nsc.h
@@ -274,6 +274,7 @@ extern struct castr trade_ca[];
 extern struct castr nat_ca[];
 extern struct castr cou_ca[];
 extern struct castr contact_ca[];
+extern struct castr reject_ca[];
 extern struct castr realm_ca[];
 extern struct castr game_ca[];
 extern struct castr intrchr_ca[];

diff --git a/src/lib/common/empobj.c b/src/lib/common/empobj.c
index b8cceeeaa427271c52c04d3a96c2b1169f83490f..6bdcf687eaf0c3a031f2c941dc01be81f5ed4082 100644 (file)
--- a/src/lib/common/empobj.c
+++ b/src/lib/common/empobj.c
@@ -74,6 +74,7 @@ empobj_in_use(int type, void *p)
     case EF_COUNTRY:
        return ((struct natstr *)p)->nat_stat != STAT_UNUSED;
     case EF_CONTACT:
+    case EF_REJECT:
        return empobj_in_use(EF_NATION,
                             ef_ptr(EF_NATION,
                                    ((struct ef_typedstr *)p)->uid));

diff --git a/src/lib/common/filetable.c b/src/lib/common/filetable.c
index b8a1f568dcd8a1346f1582e31ccefd6d4b85ef5a..c433758b74bd8b11dccdc3724149481a24aa49ec 100644 (file)
--- a/src/lib/common/filetable.c
+++ b/src/lib/common/filetable.c
@@ -168,6 +168,9 @@ struct empfile empfile[] = {
     {EF_CONTACT, "contact", NULL, "contact", contact_ca, EF_BAD,
      UNMAPPED_CACHE(struct contactstr, MAXNOC, EFF_TYPED),
      contact_oninit, NULL, NULL, NULL},
+    {EF_REJECT, "reject", NULL, "reject", reject_ca, EF_BAD,
+     UNMAPPED_CACHE(struct rejectstr, MAXNOC, EFF_TYPED),
+     NULL, NULL, NULL, NULL},
     {EF_LOAN, "loan", NULL, "loan", loan_ca, EF_BAD,
      UNMAPPED_CACHE(struct lonstr, -1, EFF_TYPED),
      NULL, NULL, NULL, NULL},

diff --git a/src/lib/common/nsc.c b/src/lib/common/nsc.c
index 0a37460bb0adda43d36d673bd3f65ef6671f4f19..d5c2b29a80d6e2f47086aa77d47f2a441effffe3 100644 (file)
--- a/src/lib/common/nsc.c
+++ b/src/lib/common/nsc.c
@@ -659,6 +659,15 @@ struct castr contact_ca[] = {
 #undef CURSTR
 };
 
+struct castr reject_ca[] = {
+#define CURSTR struct rejectstr
+    {"uid", fldoff(rej_uid), NSC_INT, 0, NULL, EF_REJECT, 0, CA_DUMP},
+    {"timestamp", fldoff(rej_timestamp), NSC_TIME, 0, NULL,
+     EF_BAD, 0, CA_DUMP_NONE},
+    {NULL, 0, NSC_NOTYPE, 0, NULL, EF_BAD, 0, CA_DUMP}
+#undef CURSTR
+};
+
 struct castr realm_ca[] = {
 #define CURSTR struct realmstr
     /* uid is encoded in cnum, realm */

diff --git a/src/lib/subs/fileinit.c b/src/lib/subs/fileinit.c
index 43ae627ae3e36828d09a6faac0594e1f3bea564b..17214365cd0fdad9cf11a3d09d60bfa57d121fa8 100644 (file)
--- a/src/lib/subs/fileinit.c
+++ b/src/lib/subs/fileinit.c
@@ -110,6 +110,7 @@ ef_open_srv(void)
     failed |= !ef_open(EF_LOST, 0);
     failed |= !ef_open(EF_REALM, EFF_MEM);
     failed |= !ef_open(EF_CONTACT, EFF_MEM);
+    failed |= !ef_open(EF_REJECT, EFF_MEM);
     if (!failed)
        failed |= ef_open_view(EF_COUNTRY);
     if (failed) {
@@ -139,4 +140,5 @@ ef_close_srv(void)
     ef_close(EF_LOST);
     ef_close(EF_REALM);
     ef_close(EF_CONTACT);
+    ef_close(EF_REJECT);
 }

diff --git a/tests/actofgod/final.xdump b/tests/actofgod/final.xdump
index bba482ea1a8f4b6708efe3c78c4722326dbc53ff..ed31c2d87132cfe31856ae81e3b191e060597965 100644 (file)
--- a/tests/actofgod/final.xdump
+++ b/tests/actofgod/final.xdump
@@ -247,6 +247,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 config contact
 uid contacts(0) contacts(1) contacts(2) contacts(3) contacts(4) contacts(5) contacts(6) contacts(7) contacts(8) contacts(9) contacts(10) contacts(11) contacts(12) contacts(13) contacts(14) contacts(15) contacts(16) contacts(17) contacts(18) contacts(19) contacts(20) contacts(21) contacts(22) contacts(23) contacts(24) contacts(25) contacts(26) contacts(27) contacts(28) contacts(29) contacts(30) contacts(31) contacts(32) contacts(33) contacts(34) contacts(35) contacts(36) contacts(37) contacts(38) contacts(39) contacts(40) contacts(41) contacts(42) contacts(43) contacts(44) contacts(45) contacts(46) contacts(47) contacts(48) contacts(49) contacts(50) contacts(51) contacts(52) contacts(53) contacts(54) contacts(55) contacts(56) contacts(57) contacts(58) contacts(59) contacts(60) contacts(61) contacts(62) contacts(63) contacts(64) contacts(65) contacts(66) contacts(67) contacts(68) contacts(69) contacts(70) contacts(71) contacts(72) contacts(73) contacts(74) contacts(75) contacts(76) contacts(77) contacts(78) contacts(79) contacts(80) contacts(81) contacts(82) contacts(83) contacts(84) contacts(85) contacts(86) contacts(87) contacts(88) contacts(89) contacts(90) contacts(91) contacts(92) contacts(93) contacts(94) contacts(95) contacts(96) contacts(97) contacts(98)
 /config
+config reject
+uid
+/config
 config loan
 uid loaner loanee status irate ldur amtpaid amtdue lastpay duedate
 /config

diff --git a/tests/bridgefall/final.xdump b/tests/bridgefall/final.xdump
index 3a0e328079cd2f2efb24fb130cd20608102434cb..64128080db0a5398f7d503285d022cfb5429329d 100644 (file)
--- a/tests/bridgefall/final.xdump
+++ b/tests/bridgefall/final.xdump
@@ -62,6 +62,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 config contact
 uid contacts(0) contacts(1) contacts(2) contacts(3) contacts(4) contacts(5) contacts(6) contacts(7) contacts(8) contacts(9) contacts(10) contacts(11) contacts(12) contacts(13) contacts(14) contacts(15) contacts(16) contacts(17) contacts(18) contacts(19) contacts(20) contacts(21) contacts(22) contacts(23) contacts(24) contacts(25) contacts(26) contacts(27) contacts(28) contacts(29) contacts(30) contacts(31) contacts(32) contacts(33) contacts(34) contacts(35) contacts(36) contacts(37) contacts(38) contacts(39) contacts(40) contacts(41) contacts(42) contacts(43) contacts(44) contacts(45) contacts(46) contacts(47) contacts(48) contacts(49) contacts(50) contacts(51) contacts(52) contacts(53) contacts(54) contacts(55) contacts(56) contacts(57) contacts(58) contacts(59) contacts(60) contacts(61) contacts(62) contacts(63) contacts(64) contacts(65) contacts(66) contacts(67) contacts(68) contacts(69) contacts(70) contacts(71) contacts(72) contacts(73) contacts(74) contacts(75) contacts(76) contacts(77) contacts(78) contacts(79) contacts(80) contacts(81) contacts(82) contacts(83) contacts(84) contacts(85) contacts(86) contacts(87) contacts(88) contacts(89) contacts(90) contacts(91) contacts(92) contacts(93) contacts(94) contacts(95) contacts(96) contacts(97) contacts(98)
 /config
+config reject
+uid
+/config
 config loan
 uid loaner loanee status irate ldur amtpaid amtdue lastpay duedate
 /config

diff --git a/tests/build/final.xdump b/tests/build/final.xdump
index 492fd938ce687d5a149500931e078edf469aaa0a..029771baf91a81ac6d6d6a2f918afe75e906de6a 100644 (file)
--- a/tests/build/final.xdump
+++ b/tests/build/final.xdump
@@ -118,6 +118,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 config contact
 uid contacts(0) contacts(1) contacts(2) contacts(3) contacts(4) contacts(5) contacts(6) contacts(7) contacts(8) contacts(9) contacts(10) contacts(11) contacts(12) contacts(13) contacts(14) contacts(15) contacts(16) contacts(17) contacts(18) contacts(19) contacts(20) contacts(21) contacts(22) contacts(23) contacts(24) contacts(25) contacts(26) contacts(27) contacts(28) contacts(29) contacts(30) contacts(31) contacts(32) contacts(33) contacts(34) contacts(35) contacts(36) contacts(37) contacts(38) contacts(39) contacts(40) contacts(41) contacts(42) contacts(43) contacts(44) contacts(45) contacts(46) contacts(47) contacts(48) contacts(49) contacts(50) contacts(51) contacts(52) contacts(53) contacts(54) contacts(55) contacts(56) contacts(57) contacts(58) contacts(59) contacts(60) contacts(61) contacts(62) contacts(63) contacts(64) contacts(65) contacts(66) contacts(67) contacts(68) contacts(69) contacts(70) contacts(71) contacts(72) contacts(73) contacts(74) contacts(75) contacts(76) contacts(77) contacts(78) contacts(79) contacts(80) contacts(81) contacts(82) contacts(83) contacts(84) contacts(85) contacts(86) contacts(87) contacts(88) contacts(89) contacts(90) contacts(91) contacts(92) contacts(93) contacts(94) contacts(95) contacts(96) contacts(97) contacts(98)
 /config
+config reject
+uid
+/config
 config loan
 uid loaner loanee status irate ldur amtpaid amtdue lastpay duedate
 /config

diff --git a/tests/fairland/final.xdump b/tests/fairland/final.xdump
index bac768b4c9292bc501c898bade66fbe1d255284b..7184341160dc37e4651d9a4922bc3f27b3113010 100644 (file)
--- a/tests/fairland/final.xdump
+++ b/tests/fairland/final.xdump
@@ -1050,6 +1050,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 config contact
 uid contacts(0) contacts(1) contacts(2) contacts(3) contacts(4) contacts(5) contacts(6) contacts(7) contacts(8) contacts(9) contacts(10) contacts(11) contacts(12) contacts(13) contacts(14) contacts(15) contacts(16) contacts(17) contacts(18) contacts(19) contacts(20) contacts(21) contacts(22) contacts(23) contacts(24) contacts(25) contacts(26) contacts(27) contacts(28) contacts(29) contacts(30) contacts(31) contacts(32) contacts(33) contacts(34) contacts(35) contacts(36) contacts(37) contacts(38) contacts(39) contacts(40) contacts(41) contacts(42) contacts(43) contacts(44) contacts(45) contacts(46) contacts(47) contacts(48) contacts(49) contacts(50) contacts(51) contacts(52) contacts(53) contacts(54) contacts(55) contacts(56) contacts(57) contacts(58) contacts(59) contacts(60) contacts(61) contacts(62) contacts(63) contacts(64) contacts(65) contacts(66) contacts(67) contacts(68) contacts(69) contacts(70) contacts(71) contacts(72) contacts(73) contacts(74) contacts(75) contacts(76) contacts(77) contacts(78) contacts(79) contacts(80) contacts(81) contacts(82) contacts(83) contacts(84) contacts(85) contacts(86) contacts(87) contacts(88) contacts(89) contacts(90) contacts(91) contacts(92) contacts(93) contacts(94) contacts(95) contacts(96) contacts(97) contacts(98)
 /config
+config reject
+uid
+/config
 config loan
 uid loaner loanee status irate ldur amtpaid amtdue lastpay duedate
 /config

diff --git a/tests/files/final.xdump b/tests/files/final.xdump
index 0d457e2eb3e2ffd16efd7f59507b8ca9e69ff320..3f78d04df8e40475f9317797867eafc3ea035d0a 100644 (file)
--- a/tests/files/final.xdump
+++ b/tests/files/final.xdump
@@ -26,6 +26,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 config contact
 uid contacts(0) contacts(1) contacts(2) contacts(3) contacts(4) contacts(5) contacts(6) contacts(7) contacts(8) contacts(9) contacts(10) contacts(11) contacts(12) contacts(13) contacts(14) contacts(15) contacts(16) contacts(17) contacts(18) contacts(19) contacts(20) contacts(21) contacts(22) contacts(23) contacts(24) contacts(25) contacts(26) contacts(27) contacts(28) contacts(29) contacts(30) contacts(31) contacts(32) contacts(33) contacts(34) contacts(35) contacts(36) contacts(37) contacts(38) contacts(39) contacts(40) contacts(41) contacts(42) contacts(43) contacts(44) contacts(45) contacts(46) contacts(47) contacts(48) contacts(49) contacts(50) contacts(51) contacts(52) contacts(53) contacts(54) contacts(55) contacts(56) contacts(57) contacts(58) contacts(59) contacts(60) contacts(61) contacts(62) contacts(63) contacts(64) contacts(65) contacts(66) contacts(67) contacts(68) contacts(69) contacts(70) contacts(71) contacts(72) contacts(73) contacts(74) contacts(75) contacts(76) contacts(77) contacts(78) contacts(79) contacts(80) contacts(81) contacts(82) contacts(83) contacts(84) contacts(85) contacts(86) contacts(87) contacts(88) contacts(89) contacts(90) contacts(91) contacts(92) contacts(93) contacts(94) contacts(95) contacts(96) contacts(97) contacts(98)
 /config
+config reject
+uid
+/config
 config loan
 uid loaner loanee status irate ldur amtpaid amtdue lastpay duedate
 /config

diff --git a/tests/fire/final.xdump b/tests/fire/final.xdump
index 977a2ab88178707a19bb2f30851eba4dff963ceb..05765dae46083154482e33873ddc835ca8a4c768 100644 (file)
--- a/tests/fire/final.xdump
+++ b/tests/fire/final.xdump
@@ -107,6 +107,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 config contact
 uid contacts(0) contacts(1) contacts(2) contacts(3) contacts(4) contacts(5) contacts(6) contacts(7) contacts(8) contacts(9) contacts(10) contacts(11) contacts(12) contacts(13) contacts(14) contacts(15) contacts(16) contacts(17) contacts(18) contacts(19) contacts(20) contacts(21) contacts(22) contacts(23) contacts(24) contacts(25) contacts(26) contacts(27) contacts(28) contacts(29) contacts(30) contacts(31) contacts(32) contacts(33) contacts(34) contacts(35) contacts(36) contacts(37) contacts(38) contacts(39) contacts(40) contacts(41) contacts(42) contacts(43) contacts(44) contacts(45) contacts(46) contacts(47) contacts(48) contacts(49) contacts(50) contacts(51) contacts(52) contacts(53) contacts(54) contacts(55) contacts(56) contacts(57) contacts(58) contacts(59) contacts(60) contacts(61) contacts(62) contacts(63) contacts(64) contacts(65) contacts(66) contacts(67) contacts(68) contacts(69) contacts(70) contacts(71) contacts(72) contacts(73) contacts(74) contacts(75) contacts(76) contacts(77) contacts(78) contacts(79) contacts(80) contacts(81) contacts(82) contacts(83) contacts(84) contacts(85) contacts(86) contacts(87) contacts(88) contacts(89) contacts(90) contacts(91) contacts(92) contacts(93) contacts(94) contacts(95) contacts(96) contacts(97) contacts(98)
 /config
+config reject
+uid
+/config
 config loan
 uid loaner loanee status irate ldur amtpaid amtdue lastpay duedate
 /config

diff --git a/tests/navi-march/final.xdump b/tests/navi-march/final.xdump
index ebe4f18f8dd950f46080132d9d4ce580381d92e2..0f3490b8cdddc5e84e3cd8408e6b58c9e7aa0183 100644 (file)
--- a/tests/navi-march/final.xdump
+++ b/tests/navi-march/final.xdump
@@ -302,6 +302,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 config contact
 uid contacts(0) contacts(1) contacts(2) contacts(3) contacts(4) contacts(5) contacts(6) contacts(7) contacts(8) contacts(9) contacts(10) contacts(11) contacts(12) contacts(13) contacts(14) contacts(15) contacts(16) contacts(17) contacts(18) contacts(19) contacts(20) contacts(21) contacts(22) contacts(23) contacts(24) contacts(25) contacts(26) contacts(27) contacts(28) contacts(29) contacts(30) contacts(31) contacts(32) contacts(33) contacts(34) contacts(35) contacts(36) contacts(37) contacts(38) contacts(39) contacts(40) contacts(41) contacts(42) contacts(43) contacts(44) contacts(45) contacts(46) contacts(47) contacts(48) contacts(49) contacts(50) contacts(51) contacts(52) contacts(53) contacts(54) contacts(55) contacts(56) contacts(57) contacts(58) contacts(59) contacts(60) contacts(61) contacts(62) contacts(63) contacts(64) contacts(65) contacts(66) contacts(67) contacts(68) contacts(69) contacts(70) contacts(71) contacts(72) contacts(73) contacts(74) contacts(75) contacts(76) contacts(77) contacts(78) contacts(79) contacts(80) contacts(81) contacts(82) contacts(83) contacts(84) contacts(85) contacts(86) contacts(87) contacts(88) contacts(89) contacts(90) contacts(91) contacts(92) contacts(93) contacts(94) contacts(95) contacts(96) contacts(97) contacts(98)
 /config
+config reject
+uid
+/config
 config loan
 uid loaner loanee status irate ldur amtpaid amtdue lastpay duedate
 /config

diff --git a/tests/retreat/final.xdump b/tests/retreat/final.xdump
index 740fc9081131f2073afb7c1dcd895cc64f8209a5..a1774db452fa343c16d8b5839370ac23fc1b2e11 100644 (file)
--- a/tests/retreat/final.xdump
+++ b/tests/retreat/final.xdump
@@ -181,6 +181,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 config contact
 uid contacts(0) contacts(1) contacts(2) contacts(3) contacts(4) contacts(5) contacts(6) contacts(7) contacts(8) contacts(9) contacts(10) contacts(11) contacts(12) contacts(13) contacts(14) contacts(15) contacts(16) contacts(17) contacts(18) contacts(19) contacts(20) contacts(21) contacts(22) contacts(23) contacts(24) contacts(25) contacts(26) contacts(27) contacts(28) contacts(29) contacts(30) contacts(31) contacts(32) contacts(33) contacts(34) contacts(35) contacts(36) contacts(37) contacts(38) contacts(39) contacts(40) contacts(41) contacts(42) contacts(43) contacts(44) contacts(45) contacts(46) contacts(47) contacts(48) contacts(49) contacts(50) contacts(51) contacts(52) contacts(53) contacts(54) contacts(55) contacts(56) contacts(57) contacts(58) contacts(59) contacts(60) contacts(61) contacts(62) contacts(63) contacts(64) contacts(65) contacts(66) contacts(67) contacts(68) contacts(69) contacts(70) contacts(71) contacts(72) contacts(73) contacts(74) contacts(75) contacts(76) contacts(77) contacts(78) contacts(79) contacts(80) contacts(81) contacts(82) contacts(83) contacts(84) contacts(85) contacts(86) contacts(87) contacts(88) contacts(89) contacts(90) contacts(91) contacts(92) contacts(93) contacts(94) contacts(95) contacts(96) contacts(97) contacts(98)
 /config
+config reject
+uid
+/config
 config loan
 uid loaner loanee status irate ldur amtpaid amtdue lastpay duedate
 /config

diff --git a/tests/smoke/99/00-POGO b/tests/smoke/99/00-POGO
index 188b81cc2c4c020eff559d2f2cb53c799e4ca9be..f8d9d0bbefb8264098481cb568a8b80422800358 100644 (file)
--- a/tests/smoke/99/00-POGO
+++ b/tests/smoke/99/00-POGO
@@ -8,7 +8,8 @@ __cmd added -1 0 0
 xdump trade *
 xdump nat *
 xdump contact *
-__cmd added 1 0 0
+xdump reject *
+__cmd added 2 0 0
 xdump loan *
 xdump commodity *
 xdump lost *

diff --git a/tests/smoke/99/01-1 b/tests/smoke/99/01-1
index a8be579d7c79d7e92a799142c97ecac6314af757..965c434df11a7c98e26ab9995f3f49dd4a46dec7 100644 (file)
--- a/tests/smoke/99/01-1
+++ b/tests/smoke/99/01-1
@@ -8,7 +8,8 @@ __cmd added -1 0 0
 xdump trade *
 xdump nat *
 xdump contact *
-__cmd added 1 0 0
+xdump reject *
+__cmd added 2 0 0
 xdump loan *
 xdump commodity *
 xdump lost *

diff --git a/tests/smoke/fairland.xdump b/tests/smoke/fairland.xdump
index 8c6788cf7b76a681e0301b3a6f7f7ff4c380743a..4d90b57773d07aae21631b4b30a3ab10e9a5c8f8 100644 (file)
--- a/tests/smoke/fairland.xdump
+++ b/tests/smoke/fairland.xdump
@@ -1050,6 +1050,9 @@ cnum stat cname passwd ip userid xcap ycap xorg yorg update tgms ann timeused bt
 config contact
 uid contacts(0) contacts(1) contacts(2) contacts(3) contacts(4) contacts(5) contacts(6) contacts(7) contacts(8) contacts(9) contacts(10) contacts(11) contacts(12) contacts(13) contacts(14) contacts(15) contacts(16) contacts(17) contacts(18) contacts(19) contacts(20) contacts(21) contacts(22) contacts(23) contacts(24) contacts(25) contacts(26) contacts(27) contacts(28) contacts(29) contacts(30) contacts(31) contacts(32) contacts(33) contacts(34) contacts(35) contacts(36) contacts(37) contacts(38) contacts(39) contacts(40) contacts(41) contacts(42) contacts(43) contacts(44) contacts(45) contacts(46) contacts(47) contacts(48) contacts(49) contacts(50) contacts(51) contacts(52) contacts(53) contacts(54) contacts(55) contacts(56) contacts(57) contacts(58) contacts(59) contacts(60) contacts(61) contacts(62) contacts(63) contacts(64) contacts(65) contacts(66) contacts(67) contacts(68) contacts(69) contacts(70) contacts(71) contacts(72) contacts(73) contacts(74) contacts(75) contacts(76) contacts(77) contacts(78) contacts(79) contacts(80) contacts(81) contacts(82) contacts(83) contacts(84) contacts(85) contacts(86) contacts(87) contacts(88) contacts(89) contacts(90) contacts(91) contacts(92) contacts(93) contacts(94) contacts(95) contacts(96) contacts(97) contacts(98)
 /config
+config reject
+uid
+/config
 config loan
 uid loaner loanee status irate ldur amtpaid amtdue lastpay duedate
 /config

diff --git a/tests/smoke/final.xdump b/tests/smoke/final.xdump
index 8ce890633cd9b192bed5613eec9331e2fd2fed17..02405fe2b3057977012234b23e06078c0be7a873 100644 (file)
--- a/tests/smoke/final.xdump
+++ b/tests/smoke/final.xdump
@@ -1103,6 +1103,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 config contact
 uid contacts(0) contacts(1) contacts(2) contacts(3) contacts(4) contacts(5) contacts(6) contacts(7) contacts(8) contacts(9) contacts(10) contacts(11) contacts(12) contacts(13) contacts(14) contacts(15) contacts(16) contacts(17) contacts(18) contacts(19) contacts(20) contacts(21) contacts(22) contacts(23) contacts(24) contacts(25) contacts(26) contacts(27) contacts(28) contacts(29) contacts(30) contacts(31) contacts(32) contacts(33) contacts(34) contacts(35) contacts(36) contacts(37) contacts(38) contacts(39) contacts(40) contacts(41) contacts(42) contacts(43) contacts(44) contacts(45) contacts(46) contacts(47) contacts(48) contacts(49) contacts(50) contacts(51) contacts(52) contacts(53) contacts(54) contacts(55) contacts(56) contacts(57) contacts(58) contacts(59) contacts(60) contacts(61) contacts(62) contacts(63) contacts(64) contacts(65) contacts(66) contacts(67) contacts(68) contacts(69) contacts(70) contacts(71) contacts(72) contacts(73) contacts(74) contacts(75) contacts(76) contacts(77) contacts(78) contacts(79) contacts(80) contacts(81) contacts(82) contacts(83) contacts(84) contacts(85) contacts(86) contacts(87) contacts(88) contacts(89) contacts(90) contacts(91) contacts(92) contacts(93) contacts(94) contacts(95) contacts(96) contacts(97) contacts(98)
 /config
+config reject
+uid
+/config
 config loan
 uid loaner loanee status irate ldur amtpaid amtdue lastpay duedate
 /config

diff --git a/tests/smoke/journal.log b/tests/smoke/journal.log
index b658c8b4c733203e8d1b57e5bdef916bec61fbef..9f203503f05e5b4a84f21116b8e664aea82273ad 100644 (file)
--- a/tests/smoke/journal.log
+++ b/tests/smoke/journal.log
@@ -14092,7 +14092,24 @@
     Play#0 output Play#0 1 11 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1
     Play#0 output Play#0 1 /12
     Play#0 output Play#0 6 0 640
-    Play#0 input __cmd added 1 0 0
+    Play#0 input xdump reject *
+    Play#0 command xdump
+    Play#0 output Play#0 1 XDUMP reject 0
+    Play#0 output Play#0 1 0
+    Play#0 output Play#0 1 1
+    Play#0 output Play#0 1 2
+    Play#0 output Play#0 1 3
+    Play#0 output Play#0 1 4
+    Play#0 output Play#0 1 5
+    Play#0 output Play#0 1 6
+    Play#0 output Play#0 1 7
+    Play#0 output Play#0 1 8
+    Play#0 output Play#0 1 9
+    Play#0 output Play#0 1 10
+    Play#0 output Play#0 1 11
+    Play#0 output Play#0 1 /12
+    Play#0 output Play#0 6 0 640
+    Play#0 input __cmd added 2 0 0
     Play#0 command __cmd
     Play#0 output Play#0 6 0 640
     Play#0 input xdump loan *
@@ -14263,7 +14280,24 @@
     Play#1 output Play#1 1 11
     Play#1 output Play#1 1 /12
     Play#1 output Play#1 6 0 640
-    Play#1 input __cmd added 1 0 0
+    Play#1 input xdump reject *
+    Play#1 command xdump
+    Play#1 output Play#1 1 XDUMP reject 0
+    Play#1 output Play#1 1 0
+    Play#1 output Play#1 1 1
+    Play#1 output Play#1 1 2
+    Play#1 output Play#1 1 3
+    Play#1 output Play#1 1 4
+    Play#1 output Play#1 1 5
+    Play#1 output Play#1 1 6
+    Play#1 output Play#1 1 7
+    Play#1 output Play#1 1 8
+    Play#1 output Play#1 1 9
+    Play#1 output Play#1 1 10
+    Play#1 output Play#1 1 11
+    Play#1 output Play#1 1 /12
+    Play#1 output Play#1 6 0 640
+    Play#1 input __cmd added 2 0 0
     Play#1 command __cmd
     Play#1 output Play#1 6 0 640
     Play#1 input xdump loan *

diff --git a/tests/torpedo/final.xdump b/tests/torpedo/final.xdump
index 4c1987d96565a38bedf2fe7bf6b95b3e80a385ac..06c396f0a72071f92ded07db8854f6c3d8cbda74 100644 (file)
--- a/tests/torpedo/final.xdump
+++ b/tests/torpedo/final.xdump
@@ -98,6 +98,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 config contact
 uid contacts(0) contacts(1) contacts(2) contacts(3) contacts(4) contacts(5) contacts(6) contacts(7) contacts(8) contacts(9) contacts(10) contacts(11) contacts(12) contacts(13) contacts(14) contacts(15) contacts(16) contacts(17) contacts(18) contacts(19) contacts(20) contacts(21) contacts(22) contacts(23) contacts(24) contacts(25) contacts(26) contacts(27) contacts(28) contacts(29) contacts(30) contacts(31) contacts(32) contacts(33) contacts(34) contacts(35) contacts(36) contacts(37) contacts(38) contacts(39) contacts(40) contacts(41) contacts(42) contacts(43) contacts(44) contacts(45) contacts(46) contacts(47) contacts(48) contacts(49) contacts(50) contacts(51) contacts(52) contacts(53) contacts(54) contacts(55) contacts(56) contacts(57) contacts(58) contacts(59) contacts(60) contacts(61) contacts(62) contacts(63) contacts(64) contacts(65) contacts(66) contacts(67) contacts(68) contacts(69) contacts(70) contacts(71) contacts(72) contacts(73) contacts(74) contacts(75) contacts(76) contacts(77) contacts(78) contacts(79) contacts(80) contacts(81) contacts(82) contacts(83) contacts(84) contacts(85) contacts(86) contacts(87) contacts(88) contacts(89) contacts(90) contacts(91) contacts(92) contacts(93) contacts(94) contacts(95) contacts(96) contacts(97) contacts(98)
 /config
+config reject
+uid
+/config
 config loan
 uid loaner loanee status irate ldur amtpaid amtdue lastpay duedate
 /config

diff --git a/tests/update/final.xdump b/tests/update/final.xdump
index eb3d02862b93d0adbe69bd83cb478c9039ff8dc9..6c7bdcaaa6052629168f2325e24e3ccee17c12b9 100644 (file)
--- a/tests/update/final.xdump
+++ b/tests/update/final.xdump
@@ -435,6 +435,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 config contact
 uid contacts(0) contacts(1) contacts(2) contacts(3) contacts(4) contacts(5) contacts(6) contacts(7) contacts(8) contacts(9) contacts(10) contacts(11) contacts(12) contacts(13) contacts(14) contacts(15) contacts(16) contacts(17) contacts(18) contacts(19) contacts(20) contacts(21) contacts(22) contacts(23) contacts(24) contacts(25) contacts(26) contacts(27) contacts(28) contacts(29) contacts(30) contacts(31) contacts(32) contacts(33) contacts(34) contacts(35) contacts(36) contacts(37) contacts(38) contacts(39) contacts(40) contacts(41) contacts(42) contacts(43) contacts(44) contacts(45) contacts(46) contacts(47) contacts(48) contacts(49) contacts(50) contacts(51) contacts(52) contacts(53) contacts(54) contacts(55) contacts(56) contacts(57) contacts(58) contacts(59) contacts(60) contacts(61) contacts(62) contacts(63) contacts(64) contacts(65) contacts(66) contacts(67) contacts(68) contacts(69) contacts(70) contacts(71) contacts(72) contacts(73) contacts(74) contacts(75) contacts(76) contacts(77) contacts(78) contacts(79) contacts(80) contacts(81) contacts(82) contacts(83) contacts(84) contacts(85) contacts(86) contacts(87) contacts(88) contacts(89) contacts(90) contacts(91) contacts(92) contacts(93) contacts(94) contacts(95) contacts(96) contacts(97) contacts(98)
 /config
+config reject
+uid
+/config
 config loan
 uid loaner loanee status irate ldur amtpaid amtdue lastpay duedate
 /config

diff --git a/tests/version/default/00-POGO b/tests/version/default/00-POGO
index 5a4fc7577216f4b030d3b043e16cc605620b40bc..ed5eb0ebcd2e182cca641ba582444e0ed39b8d80 100644 (file)
--- a/tests/version/default/00-POGO
+++ b/tests/version/default/00-POGO
@@ -71,7 +71,8 @@ xdump meta 49
 xdump meta 50
 xdump meta 51
 xdump meta 52
-__cmd added 1 0 0
+xdump meta 53
+__cmd added 2 0 0
 | xdump of game state is in smoke test
 xdump item *
 xdump product *

diff --git a/tests/version/journal.log b/tests/version/journal.log
index 56aa742739cee555498a08b19e5ec689157d0eb2..39de3589587439c834376e0d6049fda81ade7e40 100644 (file)
--- a/tests/version/journal.log
+++ b/tests/version/journal.log
@@ -610,7 +610,7 @@
     Play#0 output Play#0 1 "owner" 1 0 0 8
     Play#0 output Play#0 1 "xloc" 1 0 0 -1
     Play#0 output Play#0 1 "yloc" 1 0 0 -1
-    Play#0 output Play#0 1 "des" 1 0 0 19
+    Play#0 output Play#0 1 "des" 1 0 0 20
     Play#0 output Play#0 1 "effic" 1 0 0 -1
     Play#0 output Play#0 1 "mobil" 1 0 0 -1
     Play#0 output Play#0 1 "off" 1 0 0 -1
@@ -626,7 +626,7 @@
     Play#0 output Play#0 1 "elev" 1 1 0 -1
     Play#0 output Play#0 1 "work" 1 0 0 -1
     Play#0 output Play#0 1 "coastal" 1 0 0 -1
-    Play#0 output Play#0 1 "newdes" 1 0 0 19
+    Play#0 output Play#0 1 "newdes" 1 0 0 20
     Play#0 output Play#0 1 "min" 1 0 0 -1
     Play#0 output Play#0 1 "gold" 1 0 0 -1
     Play#0 output Play#0 1 "fert" 1 0 0 -1
@@ -676,7 +676,7 @@
     Play#0 output Play#0 1 "u_del" 1 0 0 -1
     Play#0 output Play#0 1 "r_del" 1 0 0 -1
     Play#0 output Play#0 1 "mines" 1 1 0 -1
-    Play#0 output Play#0 1 "pstage" 1 1 0 43
+    Play#0 output Play#0 1 "pstage" 1 1 0 44
     Play#0 output Play#0 1 "ptime" 1 1 0 -1
     Play#0 output Play#0 1 "che" 1 1 0 -1
     Play#0 output Play#0 1 "che_target" 1 1 0 8
@@ -694,14 +694,14 @@
     Play#0 output Play#0 1 "owner" 1 0 0 8
     Play#0 output Play#0 1 "xloc" 1 0 0 -1
     Play#0 output Play#0 1 "yloc" 1 0 0 -1
-    Play#0 output Play#0 1 "type" 1 0 0 20
+    Play#0 output Play#0 1 "type" 1 0 0 21
     Play#0 output Play#0 1 "effic" 1 0 0 -1
     Play#0 output Play#0 1 "mobil" 1 0 0 -1
     Play#0 output Play#0 1 "off" 1 0 0 -1
     Play#0 output Play#0 1 "tech" 1 0 0 -1
     Play#0 output Play#0 1 "opx" 1 0 0 -1
     Play#0 output Play#0 1 "opy" 1 0 0 -1
-    Play#0 output Play#0 1 "mission" 1 0 0 35
+    Play#0 output Play#0 1 "mission" 1 0 0 36
     Play#0 output Play#0 1 "radius" 1 0 0 -1
     Play#0 output Play#0 1 "fleet" 3 0 0 -1
     Play#0 output Play#0 1 "civil" 1 0 0 -1
@@ -718,14 +718,14 @@
     Play#0 output Play#0 1 "hcm" 1 0 0 -1
     Play#0 output Play#0 1 "uw" 1 0 0 -1
     Play#0 output Play#0 1 "rad" 1 0 0 -1
-    Play#0 output Play#0 1 "pstage" 1 1 0 43
+    Play#0 output Play#0 1 "pstage" 1 1 0 44
     Play#0 output Play#0 1 "ptime" 1 1 0 -1
     Play#0 output Play#0 1 "access" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 "xbuilt" 1 1 0 -1
     Play#0 output Play#0 1 "ybuilt" 1 1 0 -1
     Play#0 output Play#0 1 "builder" 1 1 0 8
-    Play#0 output Play#0 1 "rflags" 1 8 0 47
+    Play#0 output Play#0 1 "rflags" 1 8 0 48
     Play#0 output Play#0 1 "rpath" 3 0 0 -1
     Play#0 output Play#0 1 /37
     Play#0 output Play#0 6 0 640
@@ -736,21 +736,21 @@
     Play#0 output Play#0 1 "owner" 1 0 0 8
     Play#0 output Play#0 1 "xloc" 1 0 0 -1
     Play#0 output Play#0 1 "yloc" 1 0 0 -1
-    Play#0 output Play#0 1 "type" 1 0 0 21
+    Play#0 output Play#0 1 "type" 1 0 0 22
     Play#0 output Play#0 1 "effic" 1 0 0 -1
     Play#0 output Play#0 1 "mobil" 1 0 0 -1
     Play#0 output Play#0 1 "off" 1 0 0 -1
     Play#0 output Play#0 1 "tech" 1 0 0 -1
     Play#0 output Play#0 1 "opx" 1 0 0 -1
     Play#0 output Play#0 1 "opy" 1 0 0 -1
-    Play#0 output Play#0 1 "mission" 1 0 0 35
+    Play#0 output Play#0 1 "mission" 1 0 0 36
     Play#0 output Play#0 1 "radius" 1 0 0 -1
     Play#0 output Play#0 1 "wing" 3 0 0 -1
     Play#0 output Play#0 1 "range" 1 0 0 -1
     Play#0 output Play#0 1 "harden" 1 0 0 -1
     Play#0 output Play#0 1 "ship" 1 0 0 1
     Play#0 output Play#0 1 "land" 1 0 0 3
-    Play#0 output Play#0 1 "flags" 1 8 0 45
+    Play#0 output Play#0 1 "flags" 1 8 0 46
     Play#0 output Play#0 1 "access" 1 0 0 -1
     Play#0 output Play#0 1 "theta" 2 0 0 -1
     Play#0 output Play#0 1 /21
@@ -762,20 +762,20 @@
     Play#0 output Play#0 1 "owner" 1 0 0 8
     Play#0 output Play#0 1 "xloc" 1 0 0 -1
     Play#0 output Play#0 1 "yloc" 1 0 0 -1
-    Play#0 output Play#0 1 "type" 1 0 0 22
+    Play#0 output Play#0 1 "type" 1 0 0 23
     Play#0 output Play#0 1 "effic" 1 0 0 -1
     Play#0 output Play#0 1 "mobil" 1 0 0 -1
     Play#0 output Play#0 1 "off" 1 0 0 -1
     Play#0 output Play#0 1 "tech" 1 0 0 -1
     Play#0 output Play#0 1 "opx" 1 0 0 -1
     Play#0 output Play#0 1 "opy" 1 0 0 -1
-    Play#0 output Play#0 1 "mission" 1 0 0 35
+    Play#0 output Play#0 1 "mission" 1 0 0 36
     Play#0 output Play#0 1 "radius" 1 0 0 -1
     Play#0 output Play#0 1 "army" 3 0 0 -1
     Play#0 output Play#0 1 "ship" 1 0 0 1
     Play#0 output Play#0 1 "harden" 1 0 0 -1
     Play#0 output Play#0 1 "retreat" 1 0 0 -1
-    Play#0 output Play#0 1 "rflags" 1 8 0 47
+    Play#0 output Play#0 1 "rflags" 1 8 0 48
     Play#0 output Play#0 1 "rpath" 3 0 0 -1
     Play#0 output Play#0 1 "civil" 1 0 0 -1
     Play#0 output Play#0 1 "milit" 1 0 0 -1
@@ -791,7 +791,7 @@
     Play#0 output Play#0 1 "hcm" 1 0 0 -1
     Play#0 output Play#0 1 "uw" 1 0 0 -1
     Play#0 output Play#0 1 "rad" 1 0 0 -1
-    Play#0 output Play#0 1 "pstage" 1 1 0 43
+    Play#0 output Play#0 1 "pstage" 1 1 0 44
     Play#0 output Play#0 1 "ptime" 1 1 0 -1
     Play#0 output Play#0 1 "land" 1 0 0 3
     Play#0 output Play#0 1 "access" 1 0 0 -1
@@ -804,14 +804,14 @@
     Play#0 output Play#0 1 "owner" 1 0 0 8
     Play#0 output Play#0 1 "xloc" 1 0 0 -1
     Play#0 output Play#0 1 "yloc" 1 0 0 -1
-    Play#0 output Play#0 1 "type" 1 0 0 23
+    Play#0 output Play#0 1 "type" 1 0 0 24
     Play#0 output Play#0 1 "effic" 1 0 0 -1
     Play#0 output Play#0 1 "mobil" 1 0 0 -1
     Play#0 output Play#0 1 "off" 1 0 0 -1
     Play#0 output Play#0 1 "tech" 1 0 0 -1
     Play#0 output Play#0 1 "opx" 1 0 0 -1
     Play#0 output Play#0 1 "opy" 1 0 0 -1
-    Play#0 output Play#0 1 "mission" 1 0 0 35
+    Play#0 output Play#0 1 "mission" 1 0 0 36
     Play#0 output Play#0 1 "radius" 1 0 0 -1
     Play#0 output Play#0 1 "stockpile" 3 0 0 -1
     Play#0 output Play#0 1 "plane" 1 0 0 2
@@ -821,7 +821,7 @@
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta news 0
     Play#0 output Play#0 1 "actor" 1 0 0 8
-    Play#0 output Play#0 1 "action" 1 0 0 24
+    Play#0 output Play#0 1 "action" 1 0 0 25
     Play#0 output Play#0 1 "victim" 1 0 0 8
     Play#0 output Play#0 1 "times" 1 0 0 -1
     Play#0 output Play#0 1 "duration" 1 0 0 -1
@@ -833,7 +833,7 @@
     Play#0 output Play#0 1 XDUMP meta trade 0
     Play#0 output Play#0 1 "uid" 1 0 0 6
     Play#0 output Play#0 1 "owner" 1 0 0 8
-    Play#0 output Play#0 1 "type" 1 0 0 27
+    Play#0 output Play#0 1 "type" 1 0 0 28
     Play#0 output Play#0 1 "unitid" 1 0 0 -1
     Play#0 output Play#0 1 "price" 1 0 0 -1
     Play#0 output Play#0 1 "maxbidder" 1 0 0 8
@@ -850,8 +850,8 @@
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta nat 0
     Play#0 output Play#0 1 "cnum" 1 0 0 8
-    Play#0 output Play#0 1 "stat" 1 0 0 39
-    Play#0 output Play#0 1 "flags" 1 9 0 36
+    Play#0 output Play#0 1 "stat" 1 0 0 40
+    Play#0 output Play#0 1 "flags" 1 9 0 37
     Play#0 output Play#0 1 "cname" 3 0 0 -1
     Play#0 output Play#0 1 "passwd" 3 1 0 -1
     Play#0 output Play#0 1 "ip" 3 1 0 -1
@@ -876,8 +876,8 @@
     Play#0 output Play#0 1 "research" 2 1 0 -1
     Play#0 output Play#0 1 "education" 2 1 0 -1
     Play#0 output Play#0 1 "happiness" 2 1 0 -1
-    Play#0 output Play#0 1 "relations" 1 16 99 38
-    Play#0 output Play#0 1 "rejects" 1 8 99 37
+    Play#0 output Play#0 1 "relations" 1 16 99 39
+    Play#0 output Play#0 1 "rejects" 1 8 99 38
     Play#0 output Play#0 1 /29
     Play#0 output Play#0 6 0 640
     Play#0 input xdump meta 9
@@ -889,11 +889,17 @@
     Play#0 output Play#0 6 0 640
     Play#0 input xdump meta 10
     Play#0 command xdump
-    Play#0 output Play#0 1 XDUMP meta loan 0
+    Play#0 output Play#0 1 XDUMP meta reject 0
     Play#0 output Play#0 1 "uid" 1 0 0 10
+    Play#0 output Play#0 1 /1
+    Play#0 output Play#0 6 0 640
+    Play#0 input xdump meta 11
+    Play#0 command xdump
+    Play#0 output Play#0 1 XDUMP meta loan 0
+    Play#0 output Play#0 1 "uid" 1 0 0 11
     Play#0 output Play#0 1 "loaner" 1 0 0 8
     Play#0 output Play#0 1 "loanee" 1 0 0 8
-    Play#0 output Play#0 1 "status" 1 0 0 30
+    Play#0 output Play#0 1 "status" 1 0 0 31
     Play#0 output Play#0 1 "irate" 1 0 0 -1
     Play#0 output Play#0 1 "ldur" 1 0 0 -1
     Play#0 output Play#0 1 "amtpaid" 1 0 0 -1
@@ -902,20 +908,20 @@
     Play#0 output Play#0 1 "duedate" 1 0 0 -1
     Play#0 output Play#0 1 /10
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 11
+    Play#0 input xdump meta 12
     Play#0 command xdump
     Play#0 output Play#0 1 Usage: xdump ["meta"] <TYPE> [<RECORDS>]
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 12
+    Play#0 input xdump meta 13
     Play#0 command xdump
     Play#0 output Play#0 1 Usage: xdump ["meta"] <TYPE> [<RECORDS>]
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 13
+    Play#0 input xdump meta 14
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta commodity 0
-    Play#0 output Play#0 1 "uid" 1 0 0 13
+    Play#0 output Play#0 1 "uid" 1 0 0 14
     Play#0 output Play#0 1 "owner" 1 0 0 8
-    Play#0 output Play#0 1 "type" 1 0 0 17
+    Play#0 output Play#0 1 "type" 1 0 0 18
     Play#0 output Play#0 1 "amount" 1 0 0 -1
     Play#0 output Play#0 1 "price" 2 0 0 -1
     Play#0 output Play#0 1 "maxbidder" 1 0 0 8
@@ -926,18 +932,18 @@
     Play#0 output Play#0 1 "ysell" 1 1 0 -1
     Play#0 output Play#0 1 /11
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 14
+    Play#0 input xdump meta 15
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta lost 0
     Play#0 output Play#0 1 "timestamp" 1 0 0 -1
     Play#0 output Play#0 1 "owner" 1 0 0 8
-    Play#0 output Play#0 1 "type" 1 0 0 27
+    Play#0 output Play#0 1 "type" 1 0 0 28
     Play#0 output Play#0 1 "id" 1 0 0 -1
     Play#0 output Play#0 1 "x" 1 0 0 -1
     Play#0 output Play#0 1 "y" 1 0 0 -1
     Play#0 output Play#0 1 /6
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 15
+    Play#0 input xdump meta 16
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta realm 0
     Play#0 output Play#0 1 "cnum" 1 0 0 8
@@ -948,7 +954,7 @@
     Play#0 output Play#0 1 "yh" 1 0 0 -1
     Play#0 output Play#0 1 /6
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 16
+    Play#0 input xdump meta 17
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta game 0
     Play#0 output Play#0 1 "upd_disable" 1 0 0 -1
@@ -958,10 +964,10 @@
     Play#0 output Play#0 1 "rt" 1 1 0 -1
     Play#0 output Play#0 1 /5
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 17
+    Play#0 input xdump meta 18
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta item 0
-    Play#0 output Play#0 1 "uid" 1 0 0 17
+    Play#0 output Play#0 1 "uid" 1 0 0 18
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 "mnem" 3 0 0 -1
     Play#0 output Play#0 1 "power" 1 0 0 -1
@@ -971,37 +977,37 @@
     Play#0 output Play#0 1 "melt_denom" 1 0 0 -1
     Play#0 output Play#0 1 /8
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 18
+    Play#0 input xdump meta 19
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta product 0
-    Play#0 output Play#0 1 "uid" 1 0 0 18
+    Play#0 output Play#0 1 "uid" 1 0 0 19
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 "sname" 3 0 0 -1
-    Play#0 output Play#0 1 "ctype" 1 0 3 17
+    Play#0 output Play#0 1 "ctype" 1 0 3 18
     Play#0 output Play#0 1 "camt" 1 0 3 -1
-    Play#0 output Play#0 1 "type" 1 0 0 17
-    Play#0 output Play#0 1 "level" 1 0 0 32
+    Play#0 output Play#0 1 "type" 1 0 0 18
+    Play#0 output Play#0 1 "level" 1 0 0 33
     Play#0 output Play#0 1 "cost" 1 0 0 -1
-    Play#0 output Play#0 1 "nrndx" 1 0 0 46
+    Play#0 output Play#0 1 "nrndx" 1 0 0 47
     Play#0 output Play#0 1 "nrdep" 1 0 0 -1
-    Play#0 output Play#0 1 "nlndx" 1 0 0 32
+    Play#0 output Play#0 1 "nlndx" 1 0 0 33
     Play#0 output Play#0 1 "nlmin" 1 0 0 -1
     Play#0 output Play#0 1 "nllag" 1 0 0 -1
     Play#0 output Play#0 1 /13
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 19
+    Play#0 input xdump meta 20
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta sect-chr 0
-    Play#0 output Play#0 1 "uid" 1 0 0 19
+    Play#0 output Play#0 1 "uid" 1 0 0 20
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 "mnem" 3 0 0 -1
-    Play#0 output Play#0 1 "terrain" 1 0 0 19
-    Play#0 output Play#0 1 "prd" 1 0 0 18
+    Play#0 output Play#0 1 "terrain" 1 0 0 20
+    Play#0 output Play#0 1 "prd" 1 0 0 19
     Play#0 output Play#0 1 "peffic" 1 0 0 -1
     Play#0 output Play#0 1 "mob0" 2 0 0 -1
     Play#0 output Play#0 1 "mob1" 2 0 0 -1
-    Play#0 output Play#0 1 "nav" 1 0 0 48
-    Play#0 output Play#0 1 "pkg" 1 0 0 41
+    Play#0 output Play#0 1 "nav" 1 0 0 49
+    Play#0 output Play#0 1 "pkg" 1 0 0 42
     Play#0 output Play#0 1 "ostr" 2 0 0 -1
     Play#0 output Play#0 1 "dstr" 2 0 0 -1
     Play#0 output Play#0 1 "c_build" 1 0 0 -1
@@ -1022,13 +1028,13 @@
     Play#0 output Play#0 1 "cost" 1 0 0 -1
     Play#0 output Play#0 1 "maint" 1 0 0 -1
     Play#0 output Play#0 1 "maxpop" 1 0 0 -1
-    Play#0 output Play#0 1 "flags" 1 8 0 49
+    Play#0 output Play#0 1 "flags" 1 8 0 50
     Play#0 output Play#0 1 /31
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 20
+    Play#0 input xdump meta 21
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta ship-chr 0
-    Play#0 output Play#0 1 "type" 1 0 0 20
+    Play#0 output Play#0 1 "type" 1 0 0 21
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 "civil" 1 0 0 -1
     Play#0 output Play#0 1 "milit" 1 0 0 -1
@@ -1069,15 +1075,15 @@
     Play#0 output Play#0 1 "bwork" 1 0 0 -1
     Play#0 output Play#0 1 "tech" 1 0 0 -1
     Play#0 output Play#0 1 "cost" 1 0 0 -1
-    Play#0 output Play#0 1 "flags" 1 8 0 50
+    Play#0 output Play#0 1 "flags" 1 8 0 51
     Play#0 output Play#0 1 "nplanes" 1 0 0 -1
     Play#0 output Play#0 1 "nland" 1 0 0 -1
     Play#0 output Play#0 1 /44
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 21
+    Play#0 input xdump meta 22
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta plane-chr 0
-    Play#0 output Play#0 1 "type" 1 0 0 21
+    Play#0 output Play#0 1 "type" 1 0 0 22
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 "c_build" 1 0 0 -1
     Play#0 output Play#0 1 "m_build" 1 0 0 -1
@@ -1103,13 +1109,13 @@
     Play#0 output Play#0 1 "range" 1 0 0 -1
     Play#0 output Play#0 1 "fuel" 1 0 0 -1
     Play#0 output Play#0 1 "stealth" 1 0 0 -1
-    Play#0 output Play#0 1 "flags" 1 8 0 44
+    Play#0 output Play#0 1 "flags" 1 8 0 45
     Play#0 output Play#0 1 /27
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 22
+    Play#0 input xdump meta 23
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta land-chr 0
-    Play#0 output Play#0 1 "type" 1 0 0 22
+    Play#0 output Play#0 1 "type" 1 0 0 23
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 "civil" 1 0 0 -1
     Play#0 output Play#0 1 "milit" 1 0 0 -1
@@ -1154,15 +1160,15 @@
     Play#0 output Play#0 1 "dam" 1 0 0 -1
     Play#0 output Play#0 1 "ammo" 1 0 0 -1
     Play#0 output Play#0 1 "aaf" 1 0 0 -1
-    Play#0 output Play#0 1 "flags" 1 8 0 31
+    Play#0 output Play#0 1 "flags" 1 8 0 32
     Play#0 output Play#0 1 "nxlight" 1 0 0 -1
     Play#0 output Play#0 1 "nland" 1 0 0 -1
     Play#0 output Play#0 1 /48
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 23
+    Play#0 input xdump meta 24
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta nuke-chr 0
-    Play#0 output Play#0 1 "type" 1 0 0 23
+    Play#0 output Play#0 1 "type" 1 0 0 24
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 "c_build" 1 0 0 -1
     Play#0 output Play#0 1 "m_build" 1 0 0 -1
@@ -1184,19 +1190,19 @@
     Play#0 output Play#0 1 "tech" 1 0 0 -1
     Play#0 output Play#0 1 "cost" 1 0 0 -1
     Play#0 output Play#0 1 "weight" 1 0 0 -1
-    Play#0 output Play#0 1 "flags" 1 8 0 40
+    Play#0 output Play#0 1 "flags" 1 8 0 41
     Play#0 output Play#0 1 /23
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 24
+    Play#0 input xdump meta 25
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta news-chr 0
-    Play#0 output Play#0 1 "uid" 1 0 0 24
+    Play#0 output Play#0 1 "uid" 1 0 0 25
     Play#0 output Play#0 1 "newstory" 3 0 2 -1
     Play#0 output Play#0 1 "good_will" 1 0 0 -1
-    Play#0 output Play#0 1 "newspage" 1 0 0 42
+    Play#0 output Play#0 1 "newspage" 1 0 0 43
     Play#0 output Play#0 1 /4
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 25
+    Play#0 input xdump meta 26
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta infrastructure 0
     Play#0 output Play#0 1 "name" 3 0 0 -1
@@ -1219,20 +1225,20 @@
     Play#0 output Play#0 1 "enable" 1 0 0 -1
     Play#0 output Play#0 1 /18
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 26
+    Play#0 input xdump meta 27
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta updates 0
     Play#0 output Play#0 1 "time" 1 0 0 -1
     Play#0 output Play#0 1 /1
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 27
+    Play#0 input xdump meta 28
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta table 0
-    Play#0 output Play#0 1 "uid" 1 0 0 27
+    Play#0 output Play#0 1 "uid" 1 0 0 28
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 28
+    Play#0 input xdump meta 29
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta version 0
     Play#0 output Play#0 1 "version" 3 0 0 -1
@@ -1347,168 +1353,168 @@
     Play#0 output Play#0 1 "trade_ally_cut" 2 0 0 -1
     Play#0 output Play#0 1 /110
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 29
+    Play#0 input xdump meta 30
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta meta 0
     Play#0 output Play#0 1 "name" 3 0 0 -1
-    Play#0 output Play#0 1 "type" 1 0 0 34
-    Play#0 output Play#0 1 "flags" 1 8 0 33
+    Play#0 output Play#0 1 "type" 1 0 0 35
+    Play#0 output Play#0 1 "flags" 1 8 0 34
     Play#0 output Play#0 1 "len" 1 0 0 -1
-    Play#0 output Play#0 1 "table" 1 0 0 27
+    Play#0 output Play#0 1 "table" 1 0 0 28
     Play#0 output Play#0 1 /5
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 30
+    Play#0 input xdump meta 31
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta agreement-status 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 31
+    Play#0 input xdump meta 32
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta land-chr-flags 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 32
+    Play#0 input xdump meta 33
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta level 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 33
+    Play#0 input xdump meta 34
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta meta-flags 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 34
+    Play#0 input xdump meta 35
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta meta-type 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 35
+    Play#0 input xdump meta 36
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta missions 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 36
+    Play#0 input xdump meta 37
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta nation-flags 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 37
+    Play#0 input xdump meta 38
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta nation-rejects 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 38
+    Play#0 input xdump meta 39
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta nation-relationships 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 39
+    Play#0 input xdump meta 40
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta nation-status 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 40
+    Play#0 input xdump meta 41
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta nuke-chr-flags 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 41
+    Play#0 input xdump meta 42
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta packing 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 42
+    Play#0 input xdump meta 43
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta page-headings 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 43
+    Play#0 input xdump meta 44
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta plague-stages 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 44
+    Play#0 input xdump meta 45
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta plane-chr-flags 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 45
+    Play#0 input xdump meta 46
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta plane-flags 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 46
+    Play#0 input xdump meta 47
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta resources 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 47
+    Play#0 input xdump meta 48
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta retreat-flags 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 48
+    Play#0 input xdump meta 49
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta sector-navigation 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 49
+    Play#0 input xdump meta 50
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta sect-chr-flags 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 50
+    Play#0 input xdump meta 51
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta ship-chr-flags 0
     Play#0 output Play#0 1 "value" 1 0 0 -1
     Play#0 output Play#0 1 "name" 3 0 0 -1
     Play#0 output Play#0 1 /2
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 51
+    Play#0 input xdump meta 52
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta country 0
     Play#0 output Play#0 1 "cnum" 1 0 0 8
-    Play#0 output Play#0 1 "flags" 1 8 0 36
+    Play#0 output Play#0 1 "flags" 1 8 0 37
     Play#0 output Play#0 1 "ip" 3 0 0 -1
     Play#0 output Play#0 1 "userid" 3 0 0 -1
     Play#0 output Play#0 1 "xcap" 1 0 0 -1
@@ -1531,11 +1537,11 @@
     Play#0 output Play#0 1 "happiness" 2 0 0 -1
     Play#0 output Play#0 1 /22
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump meta 52
+    Play#0 input xdump meta 53
     Play#0 command xdump
     Play#0 output Play#0 1 Usage: xdump ["meta"] <TYPE> [<RECORDS>]
     Play#0 output Play#0 6 0 640
-    Play#0 input __cmd added 1 0 0
+    Play#0 input __cmd added 2 0 0
     Play#0 command __cmd
     Play#0 output Play#0 6 0 640
     Play#0 input xdump item *
@@ -1844,47 +1850,48 @@
     Play#0 output Play#0 1 6 "trade"
     Play#0 output Play#0 1 8 "nat"
     Play#0 output Play#0 1 9 "contact"
-    Play#0 output Play#0 1 10 "loan"
-    Play#0 output Play#0 1 13 "commodity"
-    Play#0 output Play#0 1 14 "lost"
-    Play#0 output Play#0 1 15 "realm"
-    Play#0 output Play#0 1 16 "game"
-    Play#0 output Play#0 1 17 "item"
-    Play#0 output Play#0 1 18 "product"
-    Play#0 output Play#0 1 19 "sect-chr"
-    Play#0 output Play#0 1 20 "ship-chr"
-    Play#0 output Play#0 1 21 "plane-chr"
-    Play#0 output Play#0 1 22 "land-chr"
-    Play#0 output Play#0 1 23 "nuke-chr"
-    Play#0 output Play#0 1 24 "news-chr"
-    Play#0 output Play#0 1 25 "infrastructure"
-    Play#0 output Play#0 1 26 "updates"
-    Play#0 output Play#0 1 27 "table"
-    Play#0 output Play#0 1 28 "version"
-    Play#0 output Play#0 1 29 "meta"
-    Play#0 output Play#0 1 30 "agreement-status"
-    Play#0 output Play#0 1 31 "land-chr-flags"
-    Play#0 output Play#0 1 32 "level"
-    Play#0 output Play#0 1 33 "meta-flags"
-    Play#0 output Play#0 1 34 "meta-type"
-    Play#0 output Play#0 1 35 "missions"
-    Play#0 output Play#0 1 36 "nation-flags"
-    Play#0 output Play#0 1 37 "nation-rejects"
-    Play#0 output Play#0 1 38 "nation-relationships"
-    Play#0 output Play#0 1 39 "nation-status"
-    Play#0 output Play#0 1 40 "nuke-chr-flags"
-    Play#0 output Play#0 1 41 "packing"
-    Play#0 output Play#0 1 42 "page-headings"
-    Play#0 output Play#0 1 43 "plague-stages"
-    Play#0 output Play#0 1 44 "plane-chr-flags"
-    Play#0 output Play#0 1 45 "plane-flags"
-    Play#0 output Play#0 1 46 "resources"
-    Play#0 output Play#0 1 47 "retreat-flags"
-    Play#0 output Play#0 1 48 "sector-navigation"
-    Play#0 output Play#0 1 49 "sect-chr-flags"
-    Play#0 output Play#0 1 50 "ship-chr-flags"
-    Play#0 output Play#0 1 51 "country"
-    Play#0 output Play#0 1 /49
+    Play#0 output Play#0 1 10 "reject"
+    Play#0 output Play#0 1 11 "loan"
+    Play#0 output Play#0 1 14 "commodity"
+    Play#0 output Play#0 1 15 "lost"
+    Play#0 output Play#0 1 16 "realm"
+    Play#0 output Play#0 1 17 "game"
+    Play#0 output Play#0 1 18 "item"
+    Play#0 output Play#0 1 19 "product"
+    Play#0 output Play#0 1 20 "sect-chr"
+    Play#0 output Play#0 1 21 "ship-chr"
+    Play#0 output Play#0 1 22 "plane-chr"
+    Play#0 output Play#0 1 23 "land-chr"
+    Play#0 output Play#0 1 24 "nuke-chr"
+    Play#0 output Play#0 1 25 "news-chr"
+    Play#0 output Play#0 1 26 "infrastructure"
+    Play#0 output Play#0 1 27 "updates"
+    Play#0 output Play#0 1 28 "table"
+    Play#0 output Play#0 1 29 "version"
+    Play#0 output Play#0 1 30 "meta"
+    Play#0 output Play#0 1 31 "agreement-status"
+    Play#0 output Play#0 1 32 "land-chr-flags"
+    Play#0 output Play#0 1 33 "level"
+    Play#0 output Play#0 1 34 "meta-flags"
+    Play#0 output Play#0 1 35 "meta-type"
+    Play#0 output Play#0 1 36 "missions"
+    Play#0 output Play#0 1 37 "nation-flags"
+    Play#0 output Play#0 1 38 "nation-rejects"
+    Play#0 output Play#0 1 39 "nation-relationships"
+    Play#0 output Play#0 1 40 "nation-status"
+    Play#0 output Play#0 1 41 "nuke-chr-flags"
+    Play#0 output Play#0 1 42 "packing"
+    Play#0 output Play#0 1 43 "page-headings"
+    Play#0 output Play#0 1 44 "plague-stages"
+    Play#0 output Play#0 1 45 "plane-chr-flags"
+    Play#0 output Play#0 1 46 "plane-flags"
+    Play#0 output Play#0 1 47 "resources"
+    Play#0 output Play#0 1 48 "retreat-flags"
+    Play#0 output Play#0 1 49 "sector-navigation"
+    Play#0 output Play#0 1 50 "sect-chr-flags"
+    Play#0 output Play#0 1 51 "ship-chr-flags"
+    Play#0 output Play#0 1 52 "country"
+    Play#0 output Play#0 1 /50
     Play#0 output Play#0 6 0 640
     Play#0 input xdump version *
     Play#0 command xdump
@@ -2221,17 +2228,17 @@
     Play#1 command xdump
     Play#1 output Play#1 1 XDUMP meta nat 0
     Play#1 output Play#1 1 "cnum" 1 0 0 8
-    Play#1 output Play#1 1 "stat" 1 0 0 39
+    Play#1 output Play#1 1 "stat" 1 0 0 40
     Play#1 output Play#1 1 "cname" 3 0 0 -1
-    Play#1 output Play#1 1 "relations" 1 16 99 38
-    Play#1 output Play#1 1 "rejects" 1 8 99 37
+    Play#1 output Play#1 1 "relations" 1 16 99 39
+    Play#1 output Play#1 1 "rejects" 1 8 99 38
     Play#1 output Play#1 1 /5
     Play#1 output Play#1 6 0 0
     Play#1 input xdump meta cou
     Play#1 command xdump
     Play#1 output Play#1 1 XDUMP meta country 0
     Play#1 output Play#1 1 "cnum" 1 0 0 8
-    Play#1 output Play#1 1 "flags" 1 8 0 36
+    Play#1 output Play#1 1 "flags" 1 8 0 37
     Play#1 output Play#1 1 "ip" 3 0 0 -1
     Play#1 output Play#1 1 "userid" 3 0 0 -1
     Play#1 output Play#1 1 "xcap" 1 0 0 -1
@@ -2495,47 +2502,48 @@
     Play#1 output Play#1 1 6 "trade"
     Play#1 output Play#1 1 8 "nat"
     Play#1 output Play#1 1 9 "contact"
-    Play#1 output Play#1 1 10 "loan"
-    Play#1 output Play#1 1 13 "commodity"
-    Play#1 output Play#1 1 14 "lost"
-    Play#1 output Play#1 1 15 "realm"
-    Play#1 output Play#1 1 16 "game"
-    Play#1 output Play#1 1 17 "item"
-    Play#1 output Play#1 1 18 "product"
-    Play#1 output Play#1 1 19 "sect-chr"
-    Play#1 output Play#1 1 20 "ship-chr"
-    Play#1 output Play#1 1 21 "plane-chr"
-    Play#1 output Play#1 1 22 "land-chr"
-    Play#1 output Play#1 1 23 "nuke-chr"
-    Play#1 output Play#1 1 24 "news-chr"
-    Play#1 output Play#1 1 25 "infrastructure"
-    Play#1 output Play#1 1 26 "updates"
-    Play#1 output Play#1 1 27 "table"
-    Play#1 output Play#1 1 28 "version"
-    Play#1 output Play#1 1 29 "meta"
-    Play#1 output Play#1 1 30 "agreement-status"
-    Play#1 output Play#1 1 31 "land-chr-flags"
-    Play#1 output Play#1 1 32 "level"
-    Play#1 output Play#1 1 33 "meta-flags"
-    Play#1 output Play#1 1 34 "meta-type"
-    Play#1 output Play#1 1 35 "missions"
-    Play#1 output Play#1 1 36 "nation-flags"
-    Play#1 output Play#1 1 37 "nation-rejects"
-    Play#1 output Play#1 1 38 "nation-relationships"
-    Play#1 output Play#1 1 39 "nation-status"
-    Play#1 output Play#1 1 40 "nuke-chr-flags"
-    Play#1 output Play#1 1 41 "packing"
-    Play#1 output Play#1 1 42 "page-headings"
-    Play#1 output Play#1 1 43 "plague-stages"
-    Play#1 output Play#1 1 44 "plane-chr-flags"
-    Play#1 output Play#1 1 45 "plane-flags"
-    Play#1 output Play#1 1 46 "resources"
-    Play#1 output Play#1 1 47 "retreat-flags"
-    Play#1 output Play#1 1 48 "sector-navigation"
-    Play#1 output Play#1 1 49 "sect-chr-flags"
-    Play#1 output Play#1 1 50 "ship-chr-flags"
-    Play#1 output Play#1 1 51 "country"
-    Play#1 output Play#1 1 /49
+    Play#1 output Play#1 1 10 "reject"
+    Play#1 output Play#1 1 11 "loan"
+    Play#1 output Play#1 1 14 "commodity"
+    Play#1 output Play#1 1 15 "lost"
+    Play#1 output Play#1 1 16 "realm"
+    Play#1 output Play#1 1 17 "game"
+    Play#1 output Play#1 1 18 "item"
+    Play#1 output Play#1 1 19 "product"
+    Play#1 output Play#1 1 20 "sect-chr"
+    Play#1 output Play#1 1 21 "ship-chr"
+    Play#1 output Play#1 1 22 "plane-chr"
+    Play#1 output Play#1 1 23 "land-chr"
+    Play#1 output Play#1 1 24 "nuke-chr"
+    Play#1 output Play#1 1 25 "news-chr"
+    Play#1 output Play#1 1 26 "infrastructure"
+    Play#1 output Play#1 1 27 "updates"
+    Play#1 output Play#1 1 28 "table"
+    Play#1 output Play#1 1 29 "version"
+    Play#1 output Play#1 1 30 "meta"
+    Play#1 output Play#1 1 31 "agreement-status"
+    Play#1 output Play#1 1 32 "land-chr-flags"
+    Play#1 output Play#1 1 33 "level"
+    Play#1 output Play#1 1 34 "meta-flags"
+    Play#1 output Play#1 1 35 "meta-type"
+    Play#1 output Play#1 1 36 "missions"
+    Play#1 output Play#1 1 37 "nation-flags"
+    Play#1 output Play#1 1 38 "nation-rejects"
+    Play#1 output Play#1 1 39 "nation-relationships"
+    Play#1 output Play#1 1 40 "nation-status"
+    Play#1 output Play#1 1 41 "nuke-chr-flags"
+    Play#1 output Play#1 1 42 "packing"
+    Play#1 output Play#1 1 43 "page-headings"
+    Play#1 output Play#1 1 44 "plague-stages"
+    Play#1 output Play#1 1 45 "plane-chr-flags"
+    Play#1 output Play#1 1 46 "plane-flags"
+    Play#1 output Play#1 1 47 "resources"
+    Play#1 output Play#1 1 48 "retreat-flags"
+    Play#1 output Play#1 1 49 "sector-navigation"
+    Play#1 output Play#1 1 50 "sect-chr-flags"
+    Play#1 output Play#1 1 51 "ship-chr-flags"
+    Play#1 output Play#1 1 52 "country"
+    Play#1 output Play#1 1 /50
     Play#1 output Play#1 6 0 0
     Play#1 input xdump version *
     Play#1 command xdump