From 4b4df53485d92c74412fa7cbc7cf1f1d9bfce8c7 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 25 Oct 2016 19:33:19 +0200 Subject: [PATCH] contact: Create EF_CONTACT table of struct contactstr New struct contactstr is basically empty so far. The next commit will move contact state from struct natstr to struct contactstr. Signed-off-by: Markus Armbruster --- include/file.h | 1 + include/nat.h | 16 +- include/nsc.h | 1 + src/lib/common/empobj.c | 6 +- src/lib/common/filetable.c | 3 + src/lib/common/nsc.c | 9 + src/lib/subs/fileinit.c | 4 +- tests/actofgod/final.xdump | 3 + tests/bridgefall/final.xdump | 3 + tests/build/final.xdump | 3 + tests/fairland/final.xdump | 3 + tests/files/final.xdump | 3 + tests/fire/final.xdump | 3 + tests/navi-march/final.xdump | 3 + tests/retreat/final.xdump | 3 + tests/smoke/99/00-POGO | 2 + tests/smoke/99/01-1 | 2 + tests/smoke/fairland.xdump | 3 + tests/smoke/final.xdump | 3 + tests/smoke/journal.log | 40 ++++ tests/torpedo/final.xdump | 3 + tests/update/final.xdump | 3 + tests/version/default/00-POGO | 2 + tests/version/journal.log | 377 +++++++++++++++++----------------- 24 files changed, 313 insertions(+), 186 deletions(-) diff --git a/include/file.h b/include/file.h index 8e0247e60..ab8cefd1d 100644 --- a/include/file.h +++ b/include/file.h @@ -155,6 +155,7 @@ enum { EF_TRADE, EF_POWER, EF_NATION, + EF_CONTACT, EF_LOAN, EF_MAP, EF_BMAP, diff --git a/include/nat.h b/include/nat.h index 955ce95c1..8ce7d8fe8 100644 --- a/include/nat.h +++ b/include/nat.h @@ -31,7 +31,7 @@ * Ken Stevens, 1995 * Steve McClure, 1998-2000 * Ron Koenderink, 2005-2008 - * Markus Armbruster, 2005-2014 + * Markus Armbruster, 2005-2016 */ #ifndef NAT_H @@ -149,6 +149,16 @@ struct natstr { /* Coastwatch and skywatch */ #define FOUND_COAST 3 +struct contactstr { + /* initial part must match struct empobj */ + signed ef_type: 8; + unsigned con_seqno: 12; + unsigned con_generation: 12; + int con_uid; + time_t con_timestamp; + /* end of part matching struct empobj */ +}; + extern char *relates[]; /* procedures relating to nation stuff */ @@ -156,6 +166,10 @@ extern char *relates[]; #define putnat(p) ef_write(EF_NATION, (p)->nat_cnum, (p)) #define getnatp(n) ((struct natstr *)ef_ptr(EF_NATION, (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))) + #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 bc3c0afee..beeea10eb 100644 --- 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 contact_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 353b78034..b8cceeeaa 100644 --- a/src/lib/common/empobj.c +++ b/src/lib/common/empobj.c @@ -29,7 +29,7 @@ * * Known contributors to this file: * Ron Koenderink, 2006 - * Markus Armbruster, 2006-2008 + * Markus Armbruster, 2006-2016 */ #include @@ -73,6 +73,10 @@ empobj_in_use(int type, void *p) case EF_NATION: case EF_COUNTRY: return ((struct natstr *)p)->nat_stat != STAT_UNUSED; + case EF_CONTACT: + return empobj_in_use(EF_NATION, + ef_ptr(EF_NATION, + ((struct ef_typedstr *)p)->uid)); case EF_NEWS: return ((struct nwsstr *)p)->nws_vrb != 0; case EF_LOAN: diff --git a/src/lib/common/filetable.c b/src/lib/common/filetable.c index 72b38b63b..53ce4a44c 100644 --- a/src/lib/common/filetable.c +++ b/src/lib/common/filetable.c @@ -164,6 +164,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_CONTACT, "contact", NULL, "contact", contact_ca, EF_BAD, + UNMAPPED_CACHE(struct contactstr, 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 91d21028e..1a1adbec0 100644 --- a/src/lib/common/nsc.c +++ b/src/lib/common/nsc.c @@ -650,6 +650,15 @@ struct castr cou_ca[] = { struct castr nat_ca[sizeof(cou_ca) / sizeof(*cou_ca)]; /* initialized by nsc_init() */ +struct castr contact_ca[] = { +#define CURSTR struct contactstr + {"uid", fldoff(con_uid), NSC_INT, 0, NULL, EF_CONTACT, 0, CA_DUMP}, + {"timestamp", fldoff(con_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 8b5c9bee5..43ae627ae 100644 --- a/src/lib/subs/fileinit.c +++ b/src/lib/subs/fileinit.c @@ -28,7 +28,7 @@ * * Known contributors to this file: * Ron Koenderink, 2005 - * Markus Armbruster, 2005-2011 + * Markus Armbruster, 2005-2016 */ #include @@ -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_CONTACT, EFF_MEM); if (!failed) failed |= ef_open_view(EF_COUNTRY); if (failed) { @@ -137,4 +138,5 @@ ef_close_srv(void) ef_close(EF_BMAP); ef_close(EF_LOST); ef_close(EF_REALM); + ef_close(EF_CONTACT); } diff --git a/tests/actofgod/final.xdump b/tests/actofgod/final.xdump index 97c6bb806..2b03df7a2 100644 --- 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () /config +config contact +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 9a0b574be..ffd3ac1a6 100644 --- 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () /config +config contact +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 c36a75f87..7d4e3428f 100644 --- 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () /config +config contact +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 136b5224f..ba99222d4 100644 --- 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) 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) rejects(0) rejects(1) rejects(2) rejects(3) rejects(4) rejects(5) rejects(6) rejects(7) rejects(8) rejects(9) rejects(10) rejects(11) rejects(12) rejects(13) rejects(14) rejects(15) rejects(16) rejects(17) rejects(18) rejects(19) rejects(20) rejects(21) rejects(22) rejects(23) rejects(24) rejects(25) rejects(26) rejects(27) rejects(28) rejects(29) rejects(30) rejects(31) rejects(32) rejects(33) rejects(34) rejects(35) rejects(36) rejects(37) rejects(38) rejects(39) rejects(40) rejects(41) rejects(42) rejects(43) rejects(44) rejects(45) rejects(46) rejects(47) rejects(48) rejects(49) rejects(50) rejects(51) rejects(52) rejects(53) rejects(54) rejects(55) rejects(56) rejects(57) rejects(58) rejects(59) rejects(60) rejects(61) rejects(62) rejects(63) rejects(64) rejects(65) rejects(66) rejects(67) rejects(68) rejects(69) rejects(70) rejects(71) rejects(72) rejects(73) rejects(74) rejects(75) rejects(76) rejects(77) rejects(78) rejects(79) rejects(80) rejects(81) rejects(82) rejects(83) rejects(84) rejects(85) rejects(86) rejects(87) rejects(88) rejects(89) rejects(90) rejects(91) rejects(92) rejects(93) rejects(94) rejects(95) rejects(96) rejects(97) rejects(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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () /config +config contact +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 a17cd9d39..2a7e926d1 100644 --- 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) 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) rejects(0) rejects(1) rejects(2) rejects(3) rejects(4) rejects(5) rejects(6) rejects(7) rejects(8) rejects(9) rejects(10) rejects(11) rejects(12) rejects(13) rejects(14) rejects(15) rejects(16) rejects(17) rejects(18) rejects(19) rejects(20) rejects(21) rejects(22) rejects(23) rejects(24) rejects(25) rejects(26) rejects(27) rejects(28) rejects(29) rejects(30) rejects(31) rejects(32) rejects(33) rejects(34) rejects(35) rejects(36) rejects(37) rejects(38) rejects(39) rejects(40) rejects(41) rejects(42) rejects(43) rejects(44) rejects(45) rejects(46) rejects(47) rejects(48) rejects(49) rejects(50) rejects(51) rejects(52) rejects(53) rejects(54) rejects(55) rejects(56) rejects(57) rejects(58) rejects(59) rejects(60) rejects(61) rejects(62) rejects(63) rejects(64) rejects(65) rejects(66) rejects(67) rejects(68) rejects(69) rejects(70) rejects(71) rejects(72) rejects(73) rejects(74) rejects(75) rejects(76) rejects(77) rejects(78) rejects(79) rejects(80) rejects(81) rejects(82) rejects(83) rejects(84) rejects(85) rejects(86) rejects(87) rejects(88) rejects(89) rejects(90) rejects(91) rejects(92) rejects(93) rejects(94) rejects(95) rejects(96) rejects(97) rejects(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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () /config +config contact +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 631a85a66..4954baf53 100644 --- 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () /config +config contact +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 11a790faa..ca805d3ca 100644 --- 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () /config +config contact +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 4ffb20d3f..1ba74db0d 100644 --- 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () /config +config contact +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 7673a7217..188b81cc2 100644 --- a/tests/smoke/99/00-POGO +++ b/tests/smoke/99/00-POGO @@ -7,6 +7,8 @@ xdump news * __cmd added -1 0 0 xdump trade * xdump nat * +xdump contact * +__cmd added 1 0 0 xdump loan * xdump commodity * xdump lost * diff --git a/tests/smoke/99/01-1 b/tests/smoke/99/01-1 index 430a252c6..a8be579d7 100644 --- a/tests/smoke/99/01-1 +++ b/tests/smoke/99/01-1 @@ -7,6 +7,8 @@ xdump news * __cmd added -1 0 0 xdump trade * xdump nat * +xdump contact * +__cmd added 1 0 0 xdump loan * xdump commodity * xdump lost * diff --git a/tests/smoke/fairland.xdump b/tests/smoke/fairland.xdump index 0cd477042..4251a9885 100644 --- 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) 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) rejects(0) rejects(1) rejects(2) rejects(3) rejects(4) rejects(5) rejects(6) rejects(7) rejects(8) rejects(9) rejects(10) rejects(11) rejects(12) rejects(13) rejects(14) rejects(15) rejects(16) rejects(17) rejects(18) rejects(19) rejects(20) rejects(21) rejects(22) rejects(23) rejects(24) rejects(25) rejects(26) rejects(27) rejects(28) rejects(29) rejects(30) rejects(31) rejects(32) rejects(33) rejects(34) rejects(35) rejects(36) rejects(37) rejects(38) rejects(39) rejects(40) rejects(41) rejects(42) rejects(43) rejects(44) rejects(45) rejects(46) rejects(47) rejects(48) rejects(49) rejects(50) rejects(51) rejects(52) rejects(53) rejects(54) rejects(55) rejects(56) rejects(57) rejects(58) rejects(59) rejects(60) rejects(61) rejects(62) rejects(63) rejects(64) rejects(65) rejects(66) rejects(67) rejects(68) rejects(69) rejects(70) rejects(71) rejects(72) rejects(73) rejects(74) rejects(75) rejects(76) rejects(77) rejects(78) rejects(79) rejects(80) rejects(81) rejects(82) rejects(83) rejects(84) rejects(85) rejects(86) rejects(87) rejects(88) rejects(89) rejects(90) rejects(91) rejects(92) rejects(93) rejects(94) rejects(95) rejects(96) rejects(97) rejects(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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () (flash beep coastwatch sonar techlists) /config +config contact +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 7f5974d87..e2c076f7a 100644 --- 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () /config +config contact +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 f614ebe8b..d0bb3b874 100644 --- a/tests/smoke/journal.log +++ b/tests/smoke/journal.log @@ -14075,6 +14075,26 @@ 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 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 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 xdump contact * + Play#0 command xdump + Play#0 output Play#0 1 XDUMP contact 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 1 0 0 + Play#0 command __cmd + Play#0 output Play#0 6 0 640 Play#0 input xdump loan * Play#0 command xdump Play#0 output Play#0 1 XDUMP loan 0 @@ -14226,6 +14246,26 @@ 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 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 xdump contact * + Play#1 command xdump + Play#1 output Play#1 1 XDUMP contact 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 1 0 0 + Play#1 command __cmd + Play#1 output Play#1 6 0 640 Play#1 input xdump loan * Play#1 command xdump Play#1 output Play#1 1 XDUMP loan 0 diff --git a/tests/torpedo/final.xdump b/tests/torpedo/final.xdump index f05ce9953..a1faddb8a 100644 --- 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () /config +config contact +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 7256188ac..539be0117 100644 --- 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () /config +config contact +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 e3ba0c76d..5a4fc7577 100644 --- a/tests/version/default/00-POGO +++ b/tests/version/default/00-POGO @@ -70,6 +70,8 @@ xdump meta 48 xdump meta 49 xdump meta 50 xdump meta 51 +xdump meta 52 +__cmd added 1 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 1bfe5e1bd..8422f2b9c 100644 --- 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 18 + Play#0 output Play#0 1 "des" 1 0 0 19 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 18 + Play#0 output Play#0 1 "newdes" 1 0 0 19 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 42 + Play#0 output Play#0 1 "pstage" 1 1 0 43 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 19 + Play#0 output Play#0 1 "type" 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 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 34 + Play#0 output Play#0 1 "mission" 1 0 0 35 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 42 + Play#0 output Play#0 1 "pstage" 1 1 0 43 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 46 + Play#0 output Play#0 1 "rflags" 1 8 0 47 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 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 34 + Play#0 output Play#0 1 "mission" 1 0 0 35 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 44 + Play#0 output Play#0 1 "flags" 1 8 0 45 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 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 34 + Play#0 output Play#0 1 "mission" 1 0 0 35 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 46 + Play#0 output Play#0 1 "rflags" 1 8 0 47 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 42 + Play#0 output Play#0 1 "pstage" 1 1 0 43 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 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 34 + Play#0 output Play#0 1 "mission" 1 0 0 35 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 23 + Play#0 output Play#0 1 "action" 1 0 0 24 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 26 + Play#0 output Play#0 1 "type" 1 0 0 27 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 38 - Play#0 output Play#0 1 "flags" 1 9 0 35 + 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 "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,18 +876,24 @@ 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 37 + Play#0 output Play#0 1 "relations" 1 16 99 38 Play#0 output Play#0 1 "contacts" 1 1 99 -1 - Play#0 output Play#0 1 "rejects" 1 8 99 36 + Play#0 output Play#0 1 "rejects" 1 8 99 37 Play#0 output Play#0 1 /30 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 loan 0 + Play#0 output Play#0 1 XDUMP meta contact 0 Play#0 output Play#0 1 "uid" 1 0 0 9 + 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 loan 0 + Play#0 output Play#0 1 "uid" 1 0 0 10 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 29 + Play#0 output Play#0 1 "status" 1 0 0 30 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 @@ -896,20 +902,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 10 + Play#0 input xdump meta 11 Play#0 command xdump Play#0 output Play#0 1 Usage: xdump ["meta"] [] 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"] [] 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 XDUMP meta commodity 0 - Play#0 output Play#0 1 "uid" 1 0 0 12 + Play#0 output Play#0 1 "uid" 1 0 0 13 Play#0 output Play#0 1 "owner" 1 0 0 8 - Play#0 output Play#0 1 "type" 1 0 0 16 + Play#0 output Play#0 1 "type" 1 0 0 17 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 @@ -920,18 +926,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 13 + Play#0 input xdump meta 14 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 26 + Play#0 output Play#0 1 "type" 1 0 0 27 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 14 + Play#0 input xdump meta 15 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 @@ -942,7 +948,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 15 + Play#0 input xdump meta 16 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 @@ -952,10 +958,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 16 + Play#0 input xdump meta 17 Play#0 command xdump Play#0 output Play#0 1 XDUMP meta item 0 - Play#0 output Play#0 1 "uid" 1 0 0 16 + Play#0 output Play#0 1 "uid" 1 0 0 17 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 @@ -965,37 +971,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 17 + Play#0 input xdump meta 18 Play#0 command xdump Play#0 output Play#0 1 XDUMP meta product 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 "sname" 3 0 0 -1 - Play#0 output Play#0 1 "ctype" 1 0 3 16 + Play#0 output Play#0 1 "ctype" 1 0 3 17 Play#0 output Play#0 1 "camt" 1 0 3 -1 - Play#0 output Play#0 1 "type" 1 0 0 16 - Play#0 output Play#0 1 "level" 1 0 0 31 + 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 "cost" 1 0 0 -1 - Play#0 output Play#0 1 "nrndx" 1 0 0 45 + Play#0 output Play#0 1 "nrndx" 1 0 0 46 Play#0 output Play#0 1 "nrdep" 1 0 0 -1 - Play#0 output Play#0 1 "nlndx" 1 0 0 31 + Play#0 output Play#0 1 "nlndx" 1 0 0 32 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 18 + Play#0 input xdump meta 19 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 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 "terrain" 1 0 0 18 - Play#0 output Play#0 1 "prd" 1 0 0 17 + 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 "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 47 - Play#0 output Play#0 1 "pkg" 1 0 0 40 + 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 "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 @@ -1016,13 +1022,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 48 + Play#0 output Play#0 1 "flags" 1 8 0 49 Play#0 output Play#0 1 /31 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 ship-chr 0 - Play#0 output Play#0 1 "type" 1 0 0 19 + Play#0 output Play#0 1 "type" 1 0 0 20 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 @@ -1063,15 +1069,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 49 + Play#0 output Play#0 1 "flags" 1 8 0 50 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 20 + Play#0 input xdump meta 21 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 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 "c_build" 1 0 0 -1 Play#0 output Play#0 1 "m_build" 1 0 0 -1 @@ -1097,13 +1103,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 43 + Play#0 output Play#0 1 "flags" 1 8 0 44 Play#0 output Play#0 1 /27 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 land-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 @@ -1148,15 +1154,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 30 + Play#0 output Play#0 1 "flags" 1 8 0 31 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 22 + Play#0 input xdump meta 23 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 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 @@ -1178,19 +1184,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 39 + Play#0 output Play#0 1 "flags" 1 8 0 40 Play#0 output Play#0 1 /23 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 news-chr 0 - Play#0 output Play#0 1 "uid" 1 0 0 23 + Play#0 output Play#0 1 "uid" 1 0 0 24 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 41 + Play#0 output Play#0 1 "newspage" 1 0 0 42 Play#0 output Play#0 1 /4 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 infrastructure 0 Play#0 output Play#0 1 "name" 3 0 0 -1 @@ -1213,20 +1219,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 25 + Play#0 input xdump meta 26 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 26 + Play#0 input xdump meta 27 Play#0 command xdump Play#0 output Play#0 1 XDUMP meta table 0 - Play#0 output Play#0 1 "uid" 1 0 0 26 + Play#0 output Play#0 1 "uid" 1 0 0 27 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 27 + Play#0 input xdump meta 28 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 @@ -1341,168 +1347,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 28 + Play#0 input xdump meta 29 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 33 - Play#0 output Play#0 1 "flags" 1 8 0 32 + 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 "len" 1 0 0 -1 - Play#0 output Play#0 1 "table" 1 0 0 26 + Play#0 output Play#0 1 "table" 1 0 0 27 Play#0 output Play#0 1 /5 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 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 30 + Play#0 input xdump meta 31 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 31 + Play#0 input xdump meta 32 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 32 + Play#0 input xdump meta 33 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 33 + Play#0 input xdump meta 34 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 34 + Play#0 input xdump meta 35 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 35 + Play#0 input xdump meta 36 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 36 + Play#0 input xdump meta 37 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 37 + Play#0 input xdump meta 38 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 38 + Play#0 input xdump meta 39 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 39 + Play#0 input xdump meta 40 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 40 + Play#0 input xdump meta 41 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 41 + Play#0 input xdump meta 42 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 42 + Play#0 input xdump meta 43 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 43 + Play#0 input xdump meta 44 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 44 + Play#0 input xdump meta 45 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 45 + Play#0 input xdump meta 46 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 46 + Play#0 input xdump meta 47 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 47 + Play#0 input xdump meta 48 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 48 + Play#0 input xdump meta 49 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 49 + Play#0 input xdump meta 50 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 50 + Play#0 input xdump meta 51 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 35 + Play#0 output Play#0 1 "flags" 1 8 0 36 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 @@ -1525,10 +1531,13 @@ 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 51 + Play#0 input xdump meta 52 Play#0 command xdump Play#0 output Play#0 1 Usage: xdump ["meta"] [] Play#0 output Play#0 6 0 640 + Play#0 input __cmd added 1 0 0 + Play#0 command __cmd + Play#0 output Play#0 6 0 640 Play#0 input xdump item * Play#0 command xdump Play#0 output Play#0 1 XDUMP item 0 @@ -1834,47 +1843,48 @@ 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 "loan" - Play#0 output Play#0 1 12 "commodity" - Play#0 output Play#0 1 13 "lost" - Play#0 output Play#0 1 14 "realm" - Play#0 output Play#0 1 15 "game" - Play#0 output Play#0 1 16 "item" - Play#0 output Play#0 1 17 "product" - Play#0 output Play#0 1 18 "sect-chr" - Play#0 output Play#0 1 19 "ship-chr" - Play#0 output Play#0 1 20 "plane-chr" - Play#0 output Play#0 1 21 "land-chr" - Play#0 output Play#0 1 22 "nuke-chr" - Play#0 output Play#0 1 23 "news-chr" - Play#0 output Play#0 1 24 "infrastructure" - Play#0 output Play#0 1 25 "updates" - Play#0 output Play#0 1 26 "table" - Play#0 output Play#0 1 27 "version" - Play#0 output Play#0 1 28 "meta" - Play#0 output Play#0 1 29 "agreement-status" - Play#0 output Play#0 1 30 "land-chr-flags" - Play#0 output Play#0 1 31 "level" - Play#0 output Play#0 1 32 "meta-flags" - Play#0 output Play#0 1 33 "meta-type" - Play#0 output Play#0 1 34 "missions" - Play#0 output Play#0 1 35 "nation-flags" - Play#0 output Play#0 1 36 "nation-rejects" - Play#0 output Play#0 1 37 "nation-relationships" - Play#0 output Play#0 1 38 "nation-status" - Play#0 output Play#0 1 39 "nuke-chr-flags" - Play#0 output Play#0 1 40 "packing" - Play#0 output Play#0 1 41 "page-headings" - Play#0 output Play#0 1 42 "plague-stages" - Play#0 output Play#0 1 43 "plane-chr-flags" - Play#0 output Play#0 1 44 "plane-flags" - Play#0 output Play#0 1 45 "resources" - Play#0 output Play#0 1 46 "retreat-flags" - Play#0 output Play#0 1 47 "sector-navigation" - Play#0 output Play#0 1 48 "sect-chr-flags" - Play#0 output Play#0 1 49 "ship-chr-flags" - Play#0 output Play#0 1 50 "country" - Play#0 output Play#0 1 /48 + 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 6 0 640 Play#0 input xdump version * Play#0 command xdump @@ -2211,17 +2221,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 38 + Play#1 output Play#1 1 "stat" 1 0 0 39 Play#1 output Play#1 1 "cname" 3 0 0 -1 - Play#1 output Play#1 1 "relations" 1 16 99 37 - Play#1 output Play#1 1 "rejects" 1 8 99 36 + 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 /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 35 + Play#1 output Play#1 1 "flags" 1 8 0 36 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 @@ -2484,47 +2494,48 @@ 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 "loan" - Play#1 output Play#1 1 12 "commodity" - Play#1 output Play#1 1 13 "lost" - Play#1 output Play#1 1 14 "realm" - Play#1 output Play#1 1 15 "game" - Play#1 output Play#1 1 16 "item" - Play#1 output Play#1 1 17 "product" - Play#1 output Play#1 1 18 "sect-chr" - Play#1 output Play#1 1 19 "ship-chr" - Play#1 output Play#1 1 20 "plane-chr" - Play#1 output Play#1 1 21 "land-chr" - Play#1 output Play#1 1 22 "nuke-chr" - Play#1 output Play#1 1 23 "news-chr" - Play#1 output Play#1 1 24 "infrastructure" - Play#1 output Play#1 1 25 "updates" - Play#1 output Play#1 1 26 "table" - Play#1 output Play#1 1 27 "version" - Play#1 output Play#1 1 28 "meta" - Play#1 output Play#1 1 29 "agreement-status" - Play#1 output Play#1 1 30 "land-chr-flags" - Play#1 output Play#1 1 31 "level" - Play#1 output Play#1 1 32 "meta-flags" - Play#1 output Play#1 1 33 "meta-type" - Play#1 output Play#1 1 34 "missions" - Play#1 output Play#1 1 35 "nation-flags" - Play#1 output Play#1 1 36 "nation-rejects" - Play#1 output Play#1 1 37 "nation-relationships" - Play#1 output Play#1 1 38 "nation-status" - Play#1 output Play#1 1 39 "nuke-chr-flags" - Play#1 output Play#1 1 40 "packing" - Play#1 output Play#1 1 41 "page-headings" - Play#1 output Play#1 1 42 "plague-stages" - Play#1 output Play#1 1 43 "plane-chr-flags" - Play#1 output Play#1 1 44 "plane-flags" - Play#1 output Play#1 1 45 "resources" - Play#1 output Play#1 1 46 "retreat-flags" - Play#1 output Play#1 1 47 "sector-navigation" - Play#1 output Play#1 1 48 "sect-chr-flags" - Play#1 output Play#1 1 49 "ship-chr-flags" - Play#1 output Play#1 1 50 "country" - Play#1 output Play#1 1 /48 + 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 6 0 0 Play#1 input xdump version * Play#1 command xdump -- 2.43.0