relations: Create EF_RELAT table of struct relatstr

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

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

diff --git a/include/file.h b/include/file.h
index 111b5b1d284f6e72de44294720f895dd3d9c5d43..9f6ae9971564e0289e37e743633b9459ccd5c640 100644 (file)
--- a/include/file.h
+++ b/include/file.h
@@ -155,6 +155,7 @@ enum {
     EF_TRADE,
     EF_POWER,
     EF_NATION,
+    EF_RELAT,
     EF_CONTACT,
     EF_REJECT,
     EF_LOAN,

diff --git a/include/nat.h b/include/nat.h
index fe5aeec5390c0f955682994db56c54720c5eb54f..dd5a73263d22047b353159246553a67c653c88a0 100644 (file)
--- a/include/nat.h
+++ b/include/nat.h
@@ -132,6 +132,16 @@ enum relations {
     ALLIED
 };
 
+struct relatstr {
+    /* initial part must match struct empobj */
+    signed ef_type: 8;
+    unsigned rel_seqno: 12;
+    unsigned rel_generation: 12;
+    int rel_uid;
+    time_t rel_timestamp;
+    /* end of part matching struct empobj */
+};
+
 /*
  * Number of updates contact lasts for various ways of making contact.
  * These are only useful with option LOSE_CONTACT, which implies
@@ -182,6 +192,10 @@ struct rejectstr {
 #define putnat(p) ef_write(EF_NATION, (p)->nat_cnum, (p))
 #define getnatp(n) ((struct natstr *)ef_ptr(EF_NATION, (n)))
 
+#define getrelat(n, p) ef_read(EF_RELAT, (n), (p))
+#define putrelat(p) ef_write(EF_RELAT, (p)->rel_uid, (p))
+#define getrelatp(n) ((struct relatstr *)ef_ptr(EF_RELAT, (n)))
+
 #define getcontact(n, p) ef_read(EF_CONTACT, (n), (p))
 #define putcontact(p) ef_write(EF_CONTACT, (p)->con_uid, (p))
 #define getcontactp(n) ((struct contactstr *)ef_ptr(EF_CONTACT, (n)))

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

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

diff --git a/src/lib/common/filetable.c b/src/lib/common/filetable.c
index c433758b74bd8b11dccdc3724149481a24aa49ec..23d2272fbbdd83dcdad1229a30db449bfafb0dbf 100644 (file)
--- a/src/lib/common/filetable.c
+++ b/src/lib/common/filetable.c
@@ -165,6 +165,9 @@ struct empfile empfile[] = {
     {EF_NATION, "nat", "nation", "nation", nat_ca, EF_BAD,
      UNMAPPED_CACHE(struct natstr, MAXNOC, EFF_TYPED | EFF_OWNER),
      nat_oninit, NULL, NULL, NULL},
+    {EF_RELAT, "relat", NULL, "relat", relat_ca, EF_BAD,
+     UNMAPPED_CACHE(struct relatstr, MAXNOC, EFF_TYPED),
+     NULL, NULL, NULL, NULL},
     {EF_CONTACT, "contact", NULL, "contact", contact_ca, EF_BAD,
      UNMAPPED_CACHE(struct contactstr, MAXNOC, EFF_TYPED),
      contact_oninit, NULL, NULL, NULL},

diff --git a/src/lib/common/nsc.c b/src/lib/common/nsc.c
index 83b3b1ae9b5675daaff780334c44942138d2b3d2..309a64cc31cd2e005753ca0b14ca16e816a16135 100644 (file)
--- a/src/lib/common/nsc.c
+++ b/src/lib/common/nsc.c
@@ -645,6 +645,15 @@ struct castr cou_ca[] = {
 struct castr nat_ca[sizeof(cou_ca) / sizeof(*cou_ca)];
 /* initialized by nsc_init() */
 
+struct castr relat_ca[] = {
+#define CURSTR struct relatstr
+    {"uid", fldoff(rel_uid), NSC_INT, 0, NULL, EF_RELAT, 0, CA_DUMP},
+    {"timestamp", fldoff(rel_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 contact_ca[] = {
 #define CURSTR struct contactstr
     {"uid", fldoff(con_uid), NSC_INT, 0, NULL, EF_CONTACT, 0, CA_DUMP},

diff --git a/src/lib/subs/fileinit.c b/src/lib/subs/fileinit.c
index 17214365cd0fdad9cf11a3d09d60bfa57d121fa8..adafab55058d3c75ed2aa7d6335c9b4815ef555b 100644 (file)
--- a/src/lib/subs/fileinit.c
+++ b/src/lib/subs/fileinit.c
@@ -109,6 +109,7 @@ ef_open_srv(void)
     failed |= !ef_open(EF_COMM, 0);
     failed |= !ef_open(EF_LOST, 0);
     failed |= !ef_open(EF_REALM, EFF_MEM);
+    failed |= !ef_open(EF_RELAT, EFF_MEM);
     failed |= !ef_open(EF_CONTACT, EFF_MEM);
     failed |= !ef_open(EF_REJECT, EFF_MEM);
     if (!failed)
@@ -139,6 +140,7 @@ ef_close_srv(void)
     ef_close(EF_BMAP);
     ef_close(EF_LOST);
     ef_close(EF_REALM);
+    ef_close(EF_RELAT);
     ef_close(EF_CONTACT);
     ef_close(EF_REJECT);
 }

diff --git a/tests/actofgod/final.xdump b/tests/actofgod/final.xdump
index 5977c7b07854ae5eb20685d8b6cbda1be22e5cc7..773e75fff837a457d095fd017ebf37fa247d6396 100644 (file)
--- a/tests/actofgod/final.xdump
+++ b/tests/actofgod/final.xdump
@@ -244,6 +244,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 7 unused (flash beep coastwatch sonar techlists) "7" "7" "" "" 0 0 0 0 0 65535 0 0 255 0 0 0 0 0 0 0 0.00000 0.00000 0.00000 0.00000 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 98 deity (flash beep coastwatch sonar techlists) "98" "98" "" "" 0 0 0 0 0 1 0 0 255 0 0 123456789 0 0 0 0 0.00000 0.00000 0.00000 0.00000 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 /config
+config relat
+uid
+/config
 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

diff --git a/tests/bridgefall/final.xdump b/tests/bridgefall/final.xdump
index 6ba72b13b0b38824208bf1681cf4915af1a9f847..7d2db4fba4d32ba1857562e1e3ccb7d034e8efe7 100644 (file)
--- a/tests/bridgefall/final.xdump
+++ b/tests/bridgefall/final.xdump
@@ -59,6 +59,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 1 active (flash beep coastwatch sonar techlists) "1" "1" "127.0.0.1" "tester" 0 0 0 0 0 0 0 30 255 0 0 25000 0 0 0 0 100.000 0.00000 0.00000 0.00000 neutral neutral hostile neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 2 active (flash beep coastwatch sonar techlists) "2" "2" "" "" 0 0 0 0 0 2 0 0 255 0 0 25000 0 0 0 0 100.000 0.00000 0.00000 0.00000 neutral hostile neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 /config
+config relat
+uid
+/config
 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

diff --git a/tests/build/final.xdump b/tests/build/final.xdump
index d319b0a59cad20e1a67d093f384c37d0a6589a7f..7752dddb6444dd46ea93881c4aab2f174f037b01 100644 (file)
--- a/tests/build/final.xdump
+++ b/tests/build/final.xdump
@@ -115,6 +115,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 7 active (flash beep coastwatch sonar techlists) "7" "7" "127.0.0.1" "tester" -2 -2 0 0 0 0 0 15 255 0 0 999 0 0 0 0 100.000 0.00000 0.00000 0.00000 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 9 active (flash beep coastwatch sonar techlists) "9" "9" "127.0.0.1" "tester" -2 -4 0 0 0 0 0 15 255 0 0 2999 0 0 0 0 100.000 0.00000 0.00000 0.00000 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 /config
+config relat
+uid
+/config
 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

diff --git a/tests/fairland/final.xdump b/tests/fairland/final.xdump
index c00d6fe3efdd92d9ad69e3b7123578369c6daaa3..62b0882a490941758726a1f7af974b99e7a4ade3 100644 (file)
--- a/tests/fairland/final.xdump
+++ b/tests/fairland/final.xdump
@@ -1047,6 +1047,9 @@ config nat
 cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeused btu access milreserve money login logout newstim annotim tech research education happiness relations(0) relations(1) relations(2) relations(3) relations(4) relations(5) relations(6) relations(7) relations(8) relations(9) relations(10) relations(11) relations(12) relations(13) relations(14) relations(15) relations(16) relations(17) relations(18) relations(19) relations(20) relations(21) relations(22) relations(23) relations(24) relations(25) relations(26) relations(27) relations(28) relations(29) relations(30) relations(31) relations(32) relations(33) relations(34) relations(35) relations(36) relations(37) relations(38) relations(39) relations(40) relations(41) relations(42) relations(43) relations(44) relations(45) relations(46) relations(47) relations(48) relations(49) relations(50) relations(51) relations(52) relations(53) relations(54) relations(55) relations(56) relations(57) relations(58) relations(59) relations(60) relations(61) relations(62) relations(63) relations(64) relations(65) relations(66) relations(67) relations(68) relations(69) relations(70) relations(71) relations(72) relations(73) relations(74) relations(75) relations(76) relations(77) relations(78) relations(79) relations(80) relations(81) relations(82) relations(83) relations(84) relations(85) relations(86) relations(87) relations(88) relations(89) relations(90) relations(91) relations(92) relations(93) relations(94) relations(95) relations(96) relations(97) relations(98)
 0 deity (flash beep coastwatch sonar techlists) "POGO" "peter" "" "" 0 0 0 0 0 0 0 0 255 0 0 123456789 0 0 0 0 0.00000 0.00000 0.00000 0.00000 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 /config
+config relat
+uid
+/config
 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

diff --git a/tests/files/final.xdump b/tests/files/final.xdump
index 56a4cbbad2f69ab73b0a2000cd56069276325288..d814bf3eff4d64312b689a3d0523ef5f8d7119ac 100644 (file)
--- a/tests/files/final.xdump
+++ b/tests/files/final.xdump
@@ -23,6 +23,9 @@ config nat
 cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeused btu access milreserve money login logout newstim annotim tech research education happiness relations(0) relations(1) relations(2) relations(3) relations(4) relations(5) relations(6) relations(7) relations(8) relations(9) relations(10) relations(11) relations(12) relations(13) relations(14) relations(15) relations(16) relations(17) relations(18) relations(19) relations(20) relations(21) relations(22) relations(23) relations(24) relations(25) relations(26) relations(27) relations(28) relations(29) relations(30) relations(31) relations(32) relations(33) relations(34) relations(35) relations(36) relations(37) relations(38) relations(39) relations(40) relations(41) relations(42) relations(43) relations(44) relations(45) relations(46) relations(47) relations(48) relations(49) relations(50) relations(51) relations(52) relations(53) relations(54) relations(55) relations(56) relations(57) relations(58) relations(59) relations(60) relations(61) relations(62) relations(63) relations(64) relations(65) relations(66) relations(67) relations(68) relations(69) relations(70) relations(71) relations(72) relations(73) relations(74) relations(75) relations(76) relations(77) relations(78) relations(79) relations(80) relations(81) relations(82) relations(83) relations(84) relations(85) relations(86) relations(87) relations(88) relations(89) relations(90) relations(91) relations(92) relations(93) relations(94) relations(95) relations(96) relations(97) relations(98)
 0 deity (flash beep coastwatch sonar techlists) "POGO" "peter" "" "" 0 0 0 0 0 0 0 0 255 0 0 123456789 0 0 0 0 0.00000 0.00000 0.00000 0.00000 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 /config
+config relat
+uid
+/config
 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

diff --git a/tests/fire/final.xdump b/tests/fire/final.xdump
index e0e77345ac9ec88edbff4866ded65efa1880a6a2..04eaceee9b2b80a41cd884fd87e6e10cc698b859 100644 (file)
--- a/tests/fire/final.xdump
+++ b/tests/fire/final.xdump
@@ -104,6 +104,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 2 active (flash beep coastwatch sonar techlists) "2" "2" "" "" 0 0 0 0 0 1 0 0 255 0 0 25000 0 0 0 0 100.000 0.00000 0.00000 0.00000 neutral at-war neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 3 new (flash beep coastwatch sonar techlists) "3" "3" "" "" 2 -2 0 0 0 0 0 0 255 0 0 25000 0 0 0 0 0.00000 0.00000 0.00000 0.00000 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 /config
+config relat
+uid
+/config
 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

diff --git a/tests/navi-march/final.xdump b/tests/navi-march/final.xdump
index 22f259074a1d9323272ee2bab4e5d92ae7f177af..d5ef8fdd82efb2a49044d61b28516ed8923c086b 100644 (file)
--- a/tests/navi-march/final.xdump
+++ b/tests/navi-march/final.xdump
@@ -299,6 +299,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 5 active (flash beep coastwatch sonar techlists) "5" "5" "" "" -14 2 0 0 0 1 0 0 255 0 0 25000 0 0 0 0 100.000 0.00000 0.00000 0.00000 neutral hostile neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 6 active (flash beep coastwatch sonar techlists) "6" "6" "" "" 14 2 0 0 0 0 0 0 255 0 0 25000 0 0 0 0 100.000 0.00000 0.00000 0.00000 neutral at-war neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 /config
+config relat
+uid
+/config
 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

diff --git a/tests/retreat/final.xdump b/tests/retreat/final.xdump
index 374a40d20d62fb2e335e069a9705c48e21baf010..c7ed083e004531ff01a11b01e2e472905c13f09b 100644 (file)
--- a/tests/retreat/final.xdump
+++ b/tests/retreat/final.xdump
@@ -178,6 +178,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 3 new (flash beep coastwatch sonar techlists) "3" "3" "" "" 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0.00000 0.00000 0.00000 0.00000 neutral neutral allied neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 4 new (flash beep coastwatch sonar techlists) "4" "4" "" "" 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0.00000 0.00000 0.00000 0.00000 neutral neutral friendly neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 /config
+config relat
+uid
+/config
 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

diff --git a/tests/smoke/99/00-POGO b/tests/smoke/99/00-POGO
index f8d9d0bbefb8264098481cb568a8b80422800358..24e972212524a5c8e1b61ebb7f6c08ef2fcf8285 100644 (file)
--- a/tests/smoke/99/00-POGO
+++ b/tests/smoke/99/00-POGO
@@ -7,9 +7,10 @@ xdump news *
 __cmd added -1 0 0
 xdump trade *
 xdump nat *
+xdump relat *
 xdump contact *
 xdump reject *
-__cmd added 2 0 0
+__cmd added 3 0 0
 xdump loan *
 xdump commodity *
 xdump lost *

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

diff --git a/tests/smoke/fairland.xdump b/tests/smoke/fairland.xdump
index 65488c3e862ebab2ac221efdd501dce6fa69ce7c..4df6cbde1f3e054d829173b90400cf8e4c375ebd 100644 (file)
--- a/tests/smoke/fairland.xdump
+++ b/tests/smoke/fairland.xdump
@@ -1047,6 +1047,9 @@ config nat
 cnum stat cname passwd ip userid xcap ycap xorg yorg update tgms ann timeused btu access milreserve money login logout newstim annotim tech research education happiness relations(0) relations(1) relations(2) relations(3) relations(4) relations(5) relations(6) relations(7) relations(8) relations(9) relations(10) relations(11) relations(12) relations(13) relations(14) relations(15) relations(16) relations(17) relations(18) relations(19) relations(20) relations(21) relations(22) relations(23) relations(24) relations(25) relations(26) relations(27) relations(28) relations(29) relations(30) relations(31) relations(32) relations(33) relations(34) relations(35) relations(36) relations(37) relations(38) relations(39) relations(40) relations(41) relations(42) relations(43) relations(44) relations(45) relations(46) relations(47) relations(48) relations(49) relations(50) relations(51) relations(52) relations(53) relations(54) relations(55) relations(56) relations(57) relations(58) relations(59) relations(60) relations(61) relations(62) relations(63) relations(64) relations(65) relations(66) relations(67) relations(68) relations(69) relations(70) relations(71) relations(72) relations(73) relations(74) relations(75) relations(76) relations(77) relations(78) relations(79) relations(80) relations(81) relations(82) relations(83) relations(84) relations(85) relations(86) relations(87) relations(88) relations(89) relations(90) relations(91) relations(92) relations(93) relations(94) relations(95) relations(96) relations(97) relations(98) flags
 0 deity "POGO" "peter" "" "" 0 0 0 0 0 0 0 0 0 0 0 123456789 0 0 0 0 0.00000 0.00000 0.00000 0.00000 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral (flash beep coastwatch sonar techlists)
 /config
+config relat
+uid
+/config
 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

diff --git a/tests/smoke/final.xdump b/tests/smoke/final.xdump
index cc2bd3840ba168b14896ccdbc501b43e1c220ca9..375403657ffc1d177bf23d529b01fba6d07c8b35 100644 (file)
--- a/tests/smoke/final.xdump
+++ b/tests/smoke/final.xdump
@@ -1100,6 +1100,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 10 active (flash beep coastwatch sonar techlists) "10" "10" "127.0.0.1" "tester" -12 -10 -12 -10 0 17 1 15 255 0 0 38119 0 0 0 0 27.3083 10.8558 0.00000 0.00000 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 11 visitor (flash beep coastwatch sonar techlists) "visitor" "visitor" "" "" 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0.00000 0.00000 0.00000 0.00000 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 /config
+config relat
+uid
+/config
 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

diff --git a/tests/smoke/journal.log b/tests/smoke/journal.log
index b7338cdc03b1e9988f2b3ff73d78a107f3cecb89..960040d1e17b5dcbe3ed166b1067843678f1bb7b 100644 (file)
--- a/tests/smoke/journal.log
+++ b/tests/smoke/journal.log
@@ -14075,6 +14075,23 @@
     Play#0 output Play#0 1 11 2 62 "visitor" "visitor" "" "" 0 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0.00000 0.00000 0.00000 0.00000 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
     Play#0 output Play#0 1 /12
     Play#0 output Play#0 6 0 640
+    Play#0 input xdump relat *
+    Play#0 command xdump
+    Play#0 output Play#0 1 XDUMP relat 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 xdump contact *
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP contact 0
@@ -14109,7 +14126,7 @@
     Play#0 output Play#0 1 11 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
     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 input __cmd added 3 0 0
     Play#0 command __cmd
     Play#0 output Play#0 6 0 640
     Play#0 input xdump loan *
@@ -14263,6 +14280,23 @@
     Play#1 output Play#1 1 11 2 "visitor" 2 2 2 2 2 2 2 2 2 2 2 2 255 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2 2
     Play#1 output Play#1 1 /12
     Play#1 output Play#1 6 0 640
+    Play#1 input xdump relat *
+    Play#1 command xdump
+    Play#1 output Play#1 1 XDUMP relat 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 xdump contact *
     Play#1 command xdump
     Play#1 output Play#1 1 XDUMP contact 0
@@ -14297,7 +14331,7 @@
     Play#1 output Play#1 1 11 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
     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 input __cmd added 3 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 3e705e9380424a18215141e087c6621a2a81ee20..d202fb8f6a76d3eabd9d18f4fdb2058ad24e2aef 100644 (file)
--- a/tests/torpedo/final.xdump
+++ b/tests/torpedo/final.xdump
@@ -95,6 +95,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 2 active (flash beep coastwatch sonar techlists) "2" "2" "" "" 0 0 0 0 0 1 0 0 255 0 0 25000 0 0 0 0 100.000 0.00000 0.00000 0.00000 neutral neutral neutral allied neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 3 active (flash beep coastwatch sonar techlists) "3" "3" "" "" 0 0 0 0 0 0 0 0 255 0 0 25000 0 0 0 0 100.000 0.00000 0.00000 0.00000 neutral at-war allied neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 /config
+config relat
+uid
+/config
 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

diff --git a/tests/update/final.xdump b/tests/update/final.xdump
index 22076b1e7bcacd75add64464ad1a305369c519f7..58d63f8e39dec2a92d736a0316c566a6a17b34fd 100644 (file)
--- a/tests/update/final.xdump
+++ b/tests/update/final.xdump
@@ -432,6 +432,9 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu
 6 active (flash beep coastwatch sonar techlists) "6" "6" "127.0.0.1" "tester" 0 8 0 0 0 1 0 15 255 0 0 24353 0 0 0 0 101.147 1.74414 15.2381 4.44444 allied allied allied allied allied allied neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 7 active (flash beep coastwatch sonar techlists) "7" "7" "127.0.0.1" "tester" -2 8 0 0 0 1 0 15 255 0 0 25719 0 0 0 0 101.147 1.74414 15.2381 4.44444 friendly friendly friendly friendly friendly friendly friendly neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral
 /config
+config relat
+uid
+/config
 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

diff --git a/tests/version/default/00-POGO b/tests/version/default/00-POGO
index ed5eb0ebcd2e182cca641ba582444e0ed39b8d80..2271baee9573edd3c86f7ac235b2d232570306bd 100644 (file)
--- a/tests/version/default/00-POGO
+++ b/tests/version/default/00-POGO
@@ -72,7 +72,8 @@ xdump meta 50
 xdump meta 51
 xdump meta 52
 xdump meta 53
-__cmd added 2 0 0
+xdump meta 54
+__cmd added 3 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 9c3c53a52754e463e29fe866dc6bdb17544ceab7..12458db8c29a196f64aea2f8359ecf7a05ffa5bd 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 20
+    Play#0 output Play#0 1 "des" 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
@@ -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 20
+    Play#0 output Play#0 1 "newdes" 1 0 0 21
     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 44
+    Play#0 output Play#0 1 "pstage" 1 1 0 45
     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 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 36
+    Play#0 output Play#0 1 "mission" 1 0 0 37
     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 44
+    Play#0 output Play#0 1 "pstage" 1 1 0 45
     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 48
+    Play#0 output Play#0 1 "rflags" 1 8 0 49
     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 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 36
+    Play#0 output Play#0 1 "mission" 1 0 0 37
     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 46
+    Play#0 output Play#0 1 "flags" 1 8 0 47
     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 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 36
+    Play#0 output Play#0 1 "mission" 1 0 0 37
     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 48
+    Play#0 output Play#0 1 "rflags" 1 8 0 49
     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 44
+    Play#0 output Play#0 1 "pstage" 1 1 0 45
     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 24
+    Play#0 output Play#0 1 "type" 1 0 0 25
     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 36
+    Play#0 output Play#0 1 "mission" 1 0 0 37
     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 25
+    Play#0 output Play#0 1 "action" 1 0 0 26
     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 28
+    Play#0 output Play#0 1 "type" 1 0 0 29
     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 40
-    Play#0 output Play#0 1 "flags" 1 9 0 37
+    Play#0 output Play#0 1 "stat" 1 0 0 41
+    Play#0 output Play#0 1 "flags" 1 9 0 38
     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,30 +876,36 @@
     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 39
+    Play#0 output Play#0 1 "relations" 1 16 99 40
     Play#0 output Play#0 1 /28
     Play#0 output Play#0 6 0 640
     Play#0 input xdump meta 9
     Play#0 command xdump
-    Play#0 output Play#0 1 XDUMP meta contact 0
+    Play#0 output Play#0 1 XDUMP meta relat 0
     Play#0 output Play#0 1 "uid" 1 0 0 9
-    Play#0 output Play#0 1 "contacts" 1 1 99 -1
-    Play#0 output Play#0 1 /2
+    Play#0 output Play#0 1 /1
     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 reject 0
+    Play#0 output Play#0 1 XDUMP meta contact 0
     Play#0 output Play#0 1 "uid" 1 0 0 10
-    Play#0 output Play#0 1 "rejects" 1 8 99 38
+    Play#0 output Play#0 1 "contacts" 1 1 99 -1
     Play#0 output Play#0 1 /2
     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 XDUMP meta reject 0
     Play#0 output Play#0 1 "uid" 1 0 0 11
+    Play#0 output Play#0 1 "rejects" 1 8 99 39
+    Play#0 output Play#0 1 /2
+    Play#0 output Play#0 6 0 640
+    Play#0 input xdump meta 12
+    Play#0 command xdump
+    Play#0 output Play#0 1 XDUMP meta loan 0
+    Play#0 output Play#0 1 "uid" 1 0 0 12
     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 31
+    Play#0 output Play#0 1 "status" 1 0 0 32
     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
@@ -908,20 +914,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 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 Usage: xdump ["meta"] <TYPE> [<RECORDS>]
     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 commodity 0
-    Play#0 output Play#0 1 "uid" 1 0 0 14
+    Play#0 output Play#0 1 "uid" 1 0 0 15
     Play#0 output Play#0 1 "owner" 1 0 0 8
-    Play#0 output Play#0 1 "type" 1 0 0 18
+    Play#0 output Play#0 1 "type" 1 0 0 19
     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
@@ -932,18 +938,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 15
+    Play#0 input xdump meta 16
     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 28
+    Play#0 output Play#0 1 "type" 1 0 0 29
     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 16
+    Play#0 input xdump meta 17
     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
@@ -954,7 +960,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 17
+    Play#0 input xdump meta 18
     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
@@ -964,10 +970,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 18
+    Play#0 input xdump meta 19
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta item 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 "mnem" 3 0 0 -1
     Play#0 output Play#0 1 "power" 1 0 0 -1
@@ -977,37 +983,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 19
+    Play#0 input xdump meta 20
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta product 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 "sname" 3 0 0 -1
-    Play#0 output Play#0 1 "ctype" 1 0 3 18
+    Play#0 output Play#0 1 "ctype" 1 0 3 19
     Play#0 output Play#0 1 "camt" 1 0 3 -1
-    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 "type" 1 0 0 19
+    Play#0 output Play#0 1 "level" 1 0 0 34
     Play#0 output Play#0 1 "cost" 1 0 0 -1
-    Play#0 output Play#0 1 "nrndx" 1 0 0 47
+    Play#0 output Play#0 1 "nrndx" 1 0 0 48
     Play#0 output Play#0 1 "nrdep" 1 0 0 -1
-    Play#0 output Play#0 1 "nlndx" 1 0 0 33
+    Play#0 output Play#0 1 "nlndx" 1 0 0 34
     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 20
+    Play#0 input xdump meta 21
     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 20
+    Play#0 output Play#0 1 "uid" 1 0 0 21
     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 20
-    Play#0 output Play#0 1 "prd" 1 0 0 19
+    Play#0 output Play#0 1 "terrain" 1 0 0 21
+    Play#0 output Play#0 1 "prd" 1 0 0 20
     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 49
-    Play#0 output Play#0 1 "pkg" 1 0 0 42
+    Play#0 output Play#0 1 "nav" 1 0 0 50
+    Play#0 output Play#0 1 "pkg" 1 0 0 43
     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
@@ -1028,13 +1034,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 50
+    Play#0 output Play#0 1 "flags" 1 8 0 51
     Play#0 output Play#0 1 /31
     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 ship-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 "civil" 1 0 0 -1
     Play#0 output Play#0 1 "milit" 1 0 0 -1
@@ -1075,15 +1081,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 51
+    Play#0 output Play#0 1 "flags" 1 8 0 52
     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 22
+    Play#0 input xdump meta 23
     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 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 "c_build" 1 0 0 -1
     Play#0 output Play#0 1 "m_build" 1 0 0 -1
@@ -1109,13 +1115,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 45
+    Play#0 output Play#0 1 "flags" 1 8 0 46
     Play#0 output Play#0 1 /27
     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 land-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 "civil" 1 0 0 -1
     Play#0 output Play#0 1 "milit" 1 0 0 -1
@@ -1160,15 +1166,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 32
+    Play#0 output Play#0 1 "flags" 1 8 0 33
     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 24
+    Play#0 input xdump meta 25
     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 24
+    Play#0 output Play#0 1 "type" 1 0 0 25
     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
@@ -1190,19 +1196,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 41
+    Play#0 output Play#0 1 "flags" 1 8 0 42
     Play#0 output Play#0 1 /23
     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 news-chr 0
-    Play#0 output Play#0 1 "uid" 1 0 0 25
+    Play#0 output Play#0 1 "uid" 1 0 0 26
     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 43
+    Play#0 output Play#0 1 "newspage" 1 0 0 44
     Play#0 output Play#0 1 /4
     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 infrastructure 0
     Play#0 output Play#0 1 "name" 3 0 0 -1
@@ -1225,20 +1231,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 27
+    Play#0 input xdump meta 28
     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 28
+    Play#0 input xdump meta 29
     Play#0 command xdump
     Play#0 output Play#0 1 XDUMP meta table 0
-    Play#0 output Play#0 1 "uid" 1 0 0 28
+    Play#0 output Play#0 1 "uid" 1 0 0 29
     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 29
+    Play#0 input xdump meta 30
     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
@@ -1353,168 +1359,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 30
+    Play#0 input xdump meta 31
     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 35
-    Play#0 output Play#0 1 "flags" 1 8 0 34
+    Play#0 output Play#0 1 "type" 1 0 0 36
+    Play#0 output Play#0 1 "flags" 1 8 0 35
     Play#0 output Play#0 1 "len" 1 0 0 -1
-    Play#0 output Play#0 1 "table" 1 0 0 28
+    Play#0 output Play#0 1 "table" 1 0 0 29
     Play#0 output Play#0 1 /5
     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 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 32
+    Play#0 input xdump meta 33
     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 33
+    Play#0 input xdump meta 34
     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 34
+    Play#0 input xdump meta 35
     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 35
+    Play#0 input xdump meta 36
     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 36
+    Play#0 input xdump meta 37
     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 37
+    Play#0 input xdump meta 38
     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 38
+    Play#0 input xdump meta 39
     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 39
+    Play#0 input xdump meta 40
     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 40
+    Play#0 input xdump meta 41
     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 41
+    Play#0 input xdump meta 42
     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 42
+    Play#0 input xdump meta 43
     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 43
+    Play#0 input xdump meta 44
     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 44
+    Play#0 input xdump meta 45
     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 45
+    Play#0 input xdump meta 46
     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 46
+    Play#0 input xdump meta 47
     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 47
+    Play#0 input xdump meta 48
     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 48
+    Play#0 input xdump meta 49
     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 49
+    Play#0 input xdump meta 50
     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 50
+    Play#0 input xdump meta 51
     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 51
+    Play#0 input xdump meta 52
     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 52
+    Play#0 input xdump meta 53
     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 37
+    Play#0 output Play#0 1 "flags" 1 8 0 38
     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
@@ -1537,11 +1543,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 53
+    Play#0 input xdump meta 54
     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 2 0 0
+    Play#0 input __cmd added 3 0 0
     Play#0 command __cmd
     Play#0 output Play#0 6 0 640
     Play#0 input xdump item *
@@ -1849,49 +1855,50 @@
     Play#0 output Play#0 1 5 "news"
     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 "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 1 9 "relat"
+    Play#0 output Play#0 1 10 "contact"
+    Play#0 output Play#0 1 11 "reject"
+    Play#0 output Play#0 1 12 "loan"
+    Play#0 output Play#0 1 15 "commodity"
+    Play#0 output Play#0 1 16 "lost"
+    Play#0 output Play#0 1 17 "realm"
+    Play#0 output Play#0 1 18 "game"
+    Play#0 output Play#0 1 19 "item"
+    Play#0 output Play#0 1 20 "product"
+    Play#0 output Play#0 1 21 "sect-chr"
+    Play#0 output Play#0 1 22 "ship-chr"
+    Play#0 output Play#0 1 23 "plane-chr"
+    Play#0 output Play#0 1 24 "land-chr"
+    Play#0 output Play#0 1 25 "nuke-chr"
+    Play#0 output Play#0 1 26 "news-chr"
+    Play#0 output Play#0 1 27 "infrastructure"
+    Play#0 output Play#0 1 28 "updates"
+    Play#0 output Play#0 1 29 "table"
+    Play#0 output Play#0 1 30 "version"
+    Play#0 output Play#0 1 31 "meta"
+    Play#0 output Play#0 1 32 "agreement-status"
+    Play#0 output Play#0 1 33 "land-chr-flags"
+    Play#0 output Play#0 1 34 "level"
+    Play#0 output Play#0 1 35 "meta-flags"
+    Play#0 output Play#0 1 36 "meta-type"
+    Play#0 output Play#0 1 37 "missions"
+    Play#0 output Play#0 1 38 "nation-flags"
+    Play#0 output Play#0 1 39 "nation-rejects"
+    Play#0 output Play#0 1 40 "nation-relationships"
+    Play#0 output Play#0 1 41 "nation-status"
+    Play#0 output Play#0 1 42 "nuke-chr-flags"
+    Play#0 output Play#0 1 43 "packing"
+    Play#0 output Play#0 1 44 "page-headings"
+    Play#0 output Play#0 1 45 "plague-stages"
+    Play#0 output Play#0 1 46 "plane-chr-flags"
+    Play#0 output Play#0 1 47 "plane-flags"
+    Play#0 output Play#0 1 48 "resources"
+    Play#0 output Play#0 1 49 "retreat-flags"
+    Play#0 output Play#0 1 50 "sector-navigation"
+    Play#0 output Play#0 1 51 "sect-chr-flags"
+    Play#0 output Play#0 1 52 "ship-chr-flags"
+    Play#0 output Play#0 1 53 "country"
+    Play#0 output Play#0 1 /51
     Play#0 output Play#0 6 0 640
     Play#0 input xdump version *
     Play#0 command xdump
@@ -2228,16 +2235,16 @@
     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 40
+    Play#1 output Play#1 1 "stat" 1 0 0 41
     Play#1 output Play#1 1 "cname" 3 0 0 -1
-    Play#1 output Play#1 1 "relations" 1 16 99 39
+    Play#1 output Play#1 1 "relations" 1 16 99 40
     Play#1 output Play#1 1 /4
     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 37
+    Play#1 output Play#1 1 "flags" 1 8 0 38
     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
@@ -2500,49 +2507,50 @@
     Play#1 output Play#1 1 5 "news"
     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 "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 1 9 "relat"
+    Play#1 output Play#1 1 10 "contact"
+    Play#1 output Play#1 1 11 "reject"
+    Play#1 output Play#1 1 12 "loan"
+    Play#1 output Play#1 1 15 "commodity"
+    Play#1 output Play#1 1 16 "lost"
+    Play#1 output Play#1 1 17 "realm"
+    Play#1 output Play#1 1 18 "game"
+    Play#1 output Play#1 1 19 "item"
+    Play#1 output Play#1 1 20 "product"
+    Play#1 output Play#1 1 21 "sect-chr"
+    Play#1 output Play#1 1 22 "ship-chr"
+    Play#1 output Play#1 1 23 "plane-chr"
+    Play#1 output Play#1 1 24 "land-chr"
+    Play#1 output Play#1 1 25 "nuke-chr"
+    Play#1 output Play#1 1 26 "news-chr"
+    Play#1 output Play#1 1 27 "infrastructure"
+    Play#1 output Play#1 1 28 "updates"
+    Play#1 output Play#1 1 29 "table"
+    Play#1 output Play#1 1 30 "version"
+    Play#1 output Play#1 1 31 "meta"
+    Play#1 output Play#1 1 32 "agreement-status"
+    Play#1 output Play#1 1 33 "land-chr-flags"
+    Play#1 output Play#1 1 34 "level"
+    Play#1 output Play#1 1 35 "meta-flags"
+    Play#1 output Play#1 1 36 "meta-type"
+    Play#1 output Play#1 1 37 "missions"
+    Play#1 output Play#1 1 38 "nation-flags"
+    Play#1 output Play#1 1 39 "nation-rejects"
+    Play#1 output Play#1 1 40 "nation-relationships"
+    Play#1 output Play#1 1 41 "nation-status"
+    Play#1 output Play#1 1 42 "nuke-chr-flags"
+    Play#1 output Play#1 1 43 "packing"
+    Play#1 output Play#1 1 44 "page-headings"
+    Play#1 output Play#1 1 45 "plague-stages"
+    Play#1 output Play#1 1 46 "plane-chr-flags"
+    Play#1 output Play#1 1 47 "plane-flags"
+    Play#1 output Play#1 1 48 "resources"
+    Play#1 output Play#1 1 49 "retreat-flags"
+    Play#1 output Play#1 1 50 "sector-navigation"
+    Play#1 output Play#1 1 51 "sect-chr-flags"
+    Play#1 output Play#1 1 52 "ship-chr-flags"
+    Play#1 output Play#1 1 53 "country"
+    Play#1 output Play#1 1 /51
     Play#1 output Play#1 6 0 0
     Play#1 input xdump version *
     Play#1 command xdump