tests/fire: Use commands designed for humans rather than xdump

Changed xdump output is too painful to review.  final.xdump should
still catch changes that are visible only in xdump.

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

diff --git a/tests/fire/02-POGO b/tests/fire/02-POGO
index 6777b3e1984cc78eebb7e3907e654c9c010defa3..f9b91fef706b910733b82ed9e46a18b7aacf7af6 100644 (file)
--- a/tests/fire/02-POGO
+++ b/tests/fire/02-POGO
@@ -1,7 +1,12 @@
-xdump sect * ?own#0
-xdump ship *
-xdump plane *
-xdump land *
-xdump nuke *
-xdump news *
+terr * ?terr=2&eff<100 1
+cens * ?terr=1
+comm * ?terr=1
+sinf * ?terr=1
+ship * ?eff<100
+carg * ?eff<100
+plane * ?eff<100
+land * ?eff<100
+lcarg * ?eff<100
+nuke *
+__cmd added 4 0 0
 edit c 1 b 640

diff --git a/tests/fire/04-POGO b/tests/fire/04-POGO
index 6777b3e1984cc78eebb7e3907e654c9c010defa3..f9b91fef706b910733b82ed9e46a18b7aacf7af6 100644 (file)
--- a/tests/fire/04-POGO
+++ b/tests/fire/04-POGO
@@ -1,7 +1,12 @@
-xdump sect * ?own#0
-xdump ship *
-xdump plane *
-xdump land *
-xdump nuke *
-xdump news *
+terr * ?terr=2&eff<100 1
+cens * ?terr=1
+comm * ?terr=1
+sinf * ?terr=1
+ship * ?eff<100
+carg * ?eff<100
+plane * ?eff<100
+land * ?eff<100
+lcarg * ?eff<100
+nuke *
+__cmd added 4 0 0
 edit c 1 b 640

diff --git a/tests/fire/99-POGO b/tests/fire/99-POGO
index a6a2788683881dcc14821c0ce3d36e2ae2627607..faf95e8e3bc3d382d73e71a089eeda12e489b5d8 100644 (file)
--- a/tests/fire/99-POGO
+++ b/tests/fire/99-POGO
@@ -1,3 +1,14 @@
+terr * ?terr=2&eff<100 1
+cens * ?terr=1
+comm * ?terr=1
+sinf * ?terr=1
+ship * ?eff<100
+carg * ?eff<100
+plane * ?eff<100
+land * ?eff<100
+lcarg * ?eff<100
+nuke *
+terr * 0
 read 0
 read 1
 read 2

diff --git a/tests/fire/journal.log b/tests/fire/journal.log
index 6fa0a5a23501c38c79dd3abba59963436d16d3cc..f1f329f5ab71efaf975a2296c1ee438f07cca65b 100644 (file)
--- a/tests/fire/journal.log
+++ b/tests/fire/journal.log
@@ -377,92 +377,112 @@
     Play#0 output Play#0 1 ***          Server configured for testing          ***
     Play#0 output Play#0 1 *** If you see this in a game, it is misconfigured! ***
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump sect * ?own#0
-    Play#0 command xdump
-    Play#0 output Play#0 1 XDUMP sect 0
-    Play#0 output Play#0 1 1 0 0 19 5 127 0 0 0 0 0 0 0 2 0 0 0 0 0 19 0 0 0 0 0 1 100 5 15 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
-    Play#0 output Play#0 1 1 2 0 19 100 120 0 0 0 0 0 0 0 2 0 0 0 0 0 19 0 0 0 0 0 1 100 5 75 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
-    Play#0 output Play#0 1 1 4 0 19 100 127 0 0 0 0 0 0 0 4 0 0 0 0 1 19 0 0 0 0 0 1 100 5 82 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 -4 0 24 100 127 0 0 0 0 0 0 0 -4 0 0 0 0 1 24 0 0 0 0 0 1 100 5 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
-    Play#0 output Play#0 1 1 -2 0 19 4 127 0 0 0 0 0 0 0 -2 0 0 0 0 0 19 0 0 0 0 0 1 100 5 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
-    Play#0 output Play#0 1 1 1 1 24 100 122 0 0 0 0 0 0 0 1 1 0 0 0 0 24 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 3 1 12 100 0 0 0 0 0 0 0 0 3 1 0 0 0 1 12 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 -3 1 24 100 127 0 0 0 0 0 0 0 -3 1 0 0 0 1 24 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 -1 1 24 100 127 0 0 0 0 0 0 0 -1 1 0 0 0 0 24 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 2 0 2 24 100 127 0 0 0 0 0 0 0 0 2 100 0 0 1 24 0 0 0 0 0 2 100 0 0 0 0 0 0 0 0 0 100 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 100 100 100
-    Play#0 output Play#0 1 2 2 2 12 87 0 0 0 0 0 0 0 0 2 2 86 0 0 1 12 0 0 0 0 0 2 87 0 0 0 0 0 0 0 0 0 86 86 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 86 86 86
-    Play#0 output Play#0 1 2 4 2 28 98 124 0 0 0 0 0 0 0 4 2 98 0 0 1 28 0 0 0 0 0 2 98 0 0 0 0 0 0 0 0 0 98 98 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 98 98 98
-    Play#0 output Play#0 1 2 -2 2 24 100 127 0 0 0 0 0 0 0 -2 2 100 0 0 1 24 0 0 0 0 0 2 100 0 0 0 0 0 0 0 0 0 100 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 100 100 100
-    Play#0 output Play#0 1 1 0 -2 24 100 127 0 0 0 0 0 0 0 0 -2 0 0 0 1 24 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 2 -2 2 100 127 0 0 0 0 0 0 0 2 -2 0 0 0 1 2 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 -2 -2 24 67 85 0 0 0 0 0 0 0 -2 -2 0 0 0 1 24 0 0 0 0 0 1 67 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 1 -1 5 100 127 0 0 0 0 0 0 0 1 -1 0 0 0 0 5 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 3 -1 24 100 127 0 0 0 0 0 0 0 3 -1 0 0 0 1 24 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 -3 -1 24 100 127 0 0 0 0 0 0 0 -3 -1 0 0 0 1 24 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 -1 -1 24 100 127 0 0 0 0 0 0 0 -1 -1 0 0 0 0 24 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 /20
+    Play#0 input terr * ?terr=2&eff<100 1
+    Play#0 command territory
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump ship *
-    Play#0 command xdump
-    Play#0 output Play#0 1 XDUMP ship 0
-    Play#0 output Play#0 1 0 2 -12 0 6 20 0 0 0 0 0 0 0 "" 0 0 0 0 -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 98 0 ""
-    Play#0 output Play#0 1 1 1 3 1 13 59 127 0 150 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 200 10 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 2 1 3 1 13 60 127 0 150 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 200 10 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 3 1 3 1 13 100 127 0 150 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 200 10 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 5 1 8 0 17 100 127 0 100 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 40 4 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 6 1 3 3 17 100 127 0 100 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 40 4 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 9 1 3 1 2 100 127 0 20 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 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 10 2 2 2 18 20 0 0 60 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 0 "" 0 0 0 80 "n"
-    Play#0 output Play#0 1 11 2 6 0 18 20 0 0 60 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 0 "" 0 0 0 82 "j"
-    Play#0 output Play#0 1 12 2 2 2 18 100 127 0 60 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 0 "" 0 0 0 80 "n"
-    Play#0 output Play#0 1 13 2 6 0 18 100 127 0 60 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 "" 0 "" 0 0 0 82 "j"
-    Play#0 output Play#0 1 22 2 2 2 2 58 74 0 20 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 59 58 0 0 0 0 0 0 "" 0 "" 0 0 0 80 "n"
-    Play#0 output Play#0 1 23 2 8 0 2 78 88 0 20 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 78 78 0 0 0 0 0 0 "" 0 "" 0 0 0 0 ""
-    Play#0 output Play#0 1 24 2 6 0 2 100 127 0 20 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 0 0 0 0 0 0 0 0 100 100 0 0 0 0 0 0 "" 0 "" 0 0 0 0 ""
-    Play#0 output Play#0 1 /14
+    Play#0 input cens * ?terr=1
+    Play#0 command census
+    Play#0 output Play#0 1 Thu Jan  1 00:00:00 1970
+    Play#0 output Play#0 1     CENSUS                   del dst
+    Play#0 output Play#0 1 own   sect        eff prd mob uf uf old  civ  mil   uw food work avail fall coa
+    Play#0 output Play#0 1   1   -2,-2   +   67%      85 .. ..       67    0    0    0   0%    0    0   1
+    Play#0 output Play#0 1   1    2,-2   s  100%     127 .. ..      100    0    0    0   0%    0    0   1
+    Play#0 output Play#0 1   0    6,0    .    0%       0 .. ..        0    0    0    0   0%    0    0   1
+    Play#0 output Play#0 1   0   14,0    .    0%       0 .. ..        0    0    0    0   0%    0    0   1
+    Play#0 output Play#0 1   2    0,2    +  100%     127 .. ..      100    0    0    0   0%  100    0   1
+    Play#0 output Play#0 1   2    2,2    h   87%       0 .. ..       87    0    0    0   0%   86    0   1
+    Play#0 output Play#0 1   2    4,2    =   98%     124 .. ..       98    0    0    0   0%   98    0   1
+    Play#0 output Play#0 1   0    1,3    .    0%       0 .. ..        0    0    0    0   0%   78    0   1
+    Play#0 output Play#0 1 8 sectors
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump plane *
-    Play#0 command xdump
-    Play#0 output Play#0 1 XDUMP plane 0
-    Play#0 output Play#0 1 0 2 2 2 27 100 127 0 180 0 0 0 0 "" 2 0 -1 -1 0 0 0.00000
-    Play#0 output Play#0 1 1 2 2 2 12 100 127 0 150 0 0 0 0 "" 0 0 -1 -1 0 0 0.00000
-    Play#0 output Play#0 1 22 2 2 2 27 100 127 0 180 0 0 0 0 "" 2 0 22 -1 0 0 0.00000
-    Play#0 output Play#0 1 23 2 8 0 27 100 127 0 180 0 0 0 0 "" 2 0 23 -1 0 0 0.00000
-    Play#0 output Play#0 1 32 2 2 2 27 100 127 0 180 0 0 0 0 "" 2 0 -1 32 0 0 0.00000
-    Play#0 output Play#0 1 33 2 2 2 27 100 127 0 180 0 0 0 0 "" 2 0 -1 33 0 0 0.00000
-    Play#0 output Play#0 1 /6
+    Play#0 input comm * ?terr=1
+    Play#0 command commodity
+    Play#0 output Play#0 1 Thu Jan  1 00:00:00 1970
+    Play#0 output Play#0 1    COMMODITIES deliver--  distribute
+    Play#0 output Play#0 1      sect      sgpidbolhr sgpidbolhr  sh gun  pet iron dust bar  oil  lcm  hcm rad
+    Play#0 output Play#0 1   1  -2,-2   + .......... ..........   0   0    0    0    0   0    0    0    0   0
+    Play#0 output Play#0 1   1   2,-2   s .......... ..........   0   0    0    0    0   0    0    0    0   0
+    Play#0 output Play#0 1   0   6,0    . .......... ..........   0   0    0    0    0   0    0    0    0   0
+    Play#0 output Play#0 1   0  14,0    . .......... ..........   0   0    0    0    0   0    0    0    0   0
+    Play#0 output Play#0 1   2   0,2    + .......... ..........   0   0    0    0    0   0    0  100  100   0
+    Play#0 output Play#0 1   2   2,2    h .......... ..........   0   0    0    0    0   0    0   86   86   0
+    Play#0 output Play#0 1   2   4,2    = .......... ..........   0   0    0    0    0   0    0   98   98   0
+    Play#0 output Play#0 1   0   1,3    . .......... ..........   0   0    0    0    0   0    0    0    0   0
+    Play#0 output Play#0 1 8 sectors
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump land *
-    Play#0 command xdump
-    Play#0 output Play#0 1 XDUMP land 0
-    Play#0 output Play#0 1 1 1 3 1 13 39 127 0 160 0 0 0 0 "" -1 0 0 0 "" 0 10 80 12 0 0 0 0 0 0 0 0 0 0 0 0 -1 0
-    Play#0 output Play#0 1 2 1 3 1 13 40 127 0 160 0 0 0 0 "" -1 0 0 0 "" 0 10 80 12 0 0 0 0 0 0 0 0 0 0 0 0 -1 0
-    Play#0 output Play#0 1 3 1 3 1 13 100 127 0 160 0 0 0 0 "" -1 0 0 0 "" 0 10 80 12 0 0 0 0 0 0 0 0 0 0 0 0 -1 0
-    Play#0 output Play#0 1 9 1 3 1 7 100 0 0 40 0 0 0 0 "" -1 0 0 0 "" 0 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 -1 0
-    Play#0 output Play#0 1 11 2 6 0 8 100 127 0 40 0 0 0 0 "" 11 0 42 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1 0
-    Play#0 output Play#0 1 13 2 6 0 8 100 127 0 40 0 0 0 0 "" 13 0 42 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1 0
-    Play#0 output Play#0 1 22 2 2 2 21 97 124 0 270 2 2 0 0 "" 22 0 0 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1 0
-    Play#0 output Play#0 1 23 2 8 0 21 100 127 0 270 8 0 0 0 "" 23 0 0 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1 0
-    Play#0 output Play#0 1 32 2 2 2 7 94 120 0 40 0 0 0 0 "" -1 0 0 0 "" 0 10 0 0 0 0 0 0 0 0 94 94 0 0 0 0 -1 0
-    Play#0 output Play#0 1 33 2 2 2 21 97 123 0 270 2 2 0 0 "" -1 0 0 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 32 0
-    Play#0 output Play#0 1 /10
+    Play#0 input sinf * ?terr=1
+    Play#0 command sinfrastructure
+    Play#0 output Play#0 1 Thu Jan  1 00:00:00 1970
+    Play#0 output Play#0 1                           road        rail       defense
+    Play#0 output Play#0 1 own   sect        eff   eff mcost   eff mcost   eff  fact
+    Play#0 output Play#0 1   1   -2,-2   +   67%    0% 0.132   yes 0.132   67%  1.00
+    Play#0 output Play#0 1   1    2,-2   s  100%    0%  N/A    yes  N/A   100% 99.00
+    Play#0 output Play#0 1   0    6,0    .    0%    0%  N/A     no  N/A     0%  0.00
+    Play#0 output Play#0 1   0   14,0    .    0%    0%  N/A     no  N/A     0%  0.00
+    Play#0 output Play#0 1   2    0,2    +  100%  100% 0.001   yes 0.020  100%  1.00
+    Play#0 output Play#0 1   2    2,2    h   87%   86% 0.051   yes 0.051   87%  1.44
+    Play#0 output Play#0 1   2    4,2    =   98%   98% 0.001   yes 0.020   98%  1.00
+    Play#0 output Play#0 1   0    1,3    .    0%   78%  N/A     no  N/A     0%  0.00
+    Play#0 output Play#0 1 8 sectors
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump nuke *
-    Play#0 command xdump
-    Play#0 output Play#0 1 XDUMP nuke 0
-    Play#0 output Play#0 1 0 2 2 2 0 100 0 0 400 0 0 0 0 "" -1
-    Play#0 output Play#0 1 1 2 2 2 0 100 0 0 400 0 0 0 0 "" 1
-    Play#0 output Play#0 1 /2
+    Play#0 input ship * ?eff<100
+    Play#0 command ship
+    Play#0 output Play#0 1 own shp#     ship type       x,y   fl   eff civ mil  uw  fd pn he xl ln mob tech
+    Play#0 output Play#0 1   2    0 frg  frigate      -12,0        20%   0   0   0   0  0  0  0  0   0    0
+    Play#0 output Play#0 1   1    1 bb   battleship     3,1        59%   0  13   0   0  0  0  0  0 127  150
+    Play#0 output Play#0 1   1    2 bb   battleship     3,1        60%   0  13   0   0  0  0  0  0 127  150
+    Play#0 output Play#0 1   2   10 sb   submarine      2,2        20%   0   0   0   0  0  0  0  0   0   60
+    Play#0 output Play#0 1   2   11 sb   submarine      6,0        20%   0   0   0   0  0  0  0  1   0   60
+    Play#0 output Play#0 1   2   22 cs   cargo ship     2,2        58%   0   3   0   0  0  0  1  1  74   20
+    Play#0 output Play#0 1   2   23 cs   cargo ship     8,0        78%   0   4   0   0  0  0  1  1  88   20
+    Play#0 output Play#0 1 7 ships
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump news *
-    Play#0 command xdump
-    Play#0 output Play#0 1 XDUMP news 0
-    Play#0 output Play#0 1 1 10 0 2 0 0
-    Play#0 output Play#0 1 1 10 1 4 0 0
-    Play#0 output Play#0 1 1 10 2 6 0 0
-    Play#0 output Play#0 1 1 11 1 1 0 0
-    Play#0 output Play#0 1 1 11 2 8 0 0
-    Play#0 output Play#0 1 /5
+    Play#0 input carg * ?eff<100
+    Play#0 command cargo
+    Play#0 output Play#0 1 shp#         x,y   flt eff  civ mil  uw  sh gun pet irn dst bar oil lcm hcm rad
+    Play#0 output Play#0 1    0 frg   -12,0       20%   0   0   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1    1 bb      3,1       59%   0  13   0 200  10   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1    2 bb      3,1       60%   0  13   0 200  10   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   10 sb      2,2       20%   0   0   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   11 sb      6,0       20%   0   0   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   22 cs      2,2       58%   0   3   0   0   0   0   0   0   0   0  59  58   0
+    Play#0 output Play#0 1   23 cs      8,0       78%   0   4   0   0   0   0   0   0   0   0  78  78   0
+    Play#0 output Play#0 1 7 ships
+    Play#0 output Play#0 6 0 640
+    Play#0 input plane * ?eff<100
+    Play#0 command plane
+    Play#0 output Play#0 1 *: No plane(s)
+    Play#0 output Play#0 1 command failed
+    Play#0 output Play#0 6 0 640
+    Play#0 input land * ?eff<100
+    Play#0 command land
+    Play#0 output Play#0 1 own    # unit type          x,y    a   eff mil frt  mu  fd tch retr xl ln carry
+    Play#0 output Play#0 1   1    1 hat  hvy artill    3,1        39%  10   0 127   0 160   0%  0  0
+    Play#0 output Play#0 1   1    2 hat  hvy artill    3,1        40%  10   0 127   0 160   0%  0  0
+    Play#0 output Play#0 1   2   22 rad  radar unit    2,2        97%  10   0 124   0 270   0%  0  0   22S
+    Play#0 output Play#0 1   2   32 tra  train         2,2        94%  10   0 120   0  40   0%  1  1
+    Play#0 output Play#0 1   2   33 rad  radar unit    2,2        97%  10   0 123   0 270   0%  1  0   32L
+    Play#0 output Play#0 1 5 units
+    Play#0 output Play#0 6 0 640
+    Play#0 input lcarg * ?eff<100
+    Play#0 command lcargo
+    Play#0 output Play#0 1 lnd# unit    x,y    a  eff  civ mil  uw  sh gun pet irn dst bar oil lcm hcm rad
+    Play#0 output Play#0 1    1 hat     3,1        39%   0  10   0  80  12   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1    2 hat     3,1        40%   0  10   0  80  12   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   22 rad     2,2        97%   0  10   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   32 tra     2,2        94%   0  10   0   0   0   0   0   0   0   0  94  94   0
+    Play#0 output Play#0 1   33 rad     2,2        97%   0  10   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1 5 units
+    Play#0 output Play#0 6 0 640
+    Play#0 input nuke *
+    Play#0 command nuke
+    Play#0 output Play#0 1 own    # nuke type              x,y    s   eff tech carry burst
+    Play#0 output Play#0 1 2      0 10kt  fission          2,2       100%  400
+    Play#0 output Play#0 1 2      1 10kt  fission          2,2       100%  400    1P ground
+    Play#0 output Play#0 1 2 nukes
+    Play#0 output Play#0 6 0 640
+    Play#0 input __cmd added 4 0 0
+    Play#0 command __cmd
     Play#0 output Play#0 6 0 640
     Play#0 input edit c 1 b 640
     Play#0 command edit
@@ -839,89 +859,114 @@
     Play#0 output Play#0 1 ***          Server configured for testing          ***
     Play#0 output Play#0 1 *** If you see this in a game, it is misconfigured! ***
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump sect * ?own#0
-    Play#0 command xdump
-    Play#0 output Play#0 1 XDUMP sect 0
-    Play#0 output Play#0 1 1 0 0 19 5 127 0 0 0 0 0 0 0 2 0 0 0 0 0 19 0 0 0 0 0 1 100 5 15 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
-    Play#0 output Play#0 1 1 2 0 19 100 120 0 0 0 0 0 0 0 2 0 0 0 0 0 19 0 0 0 0 0 1 100 5 75 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
-    Play#0 output Play#0 1 1 4 0 19 100 127 0 0 0 0 0 0 0 4 0 0 0 0 1 19 0 0 0 0 0 1 100 5 82 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 -4 0 24 100 127 0 0 0 0 0 0 0 -4 0 0 0 0 1 24 0 0 0 0 0 1 100 5 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
-    Play#0 output Play#0 1 1 -2 0 19 4 127 0 0 0 0 0 0 0 -2 0 0 0 0 0 19 0 0 0 0 0 1 100 5 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
-    Play#0 output Play#0 1 1 1 1 24 100 122 0 0 0 0 0 0 0 1 1 0 0 0 0 24 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 3 1 12 100 0 0 0 0 0 0 0 0 3 1 0 0 0 1 12 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 -3 1 24 100 127 0 0 0 0 0 0 0 -3 1 0 0 0 1 24 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 -1 1 24 100 127 0 0 0 0 0 0 0 -1 1 0 0 0 0 24 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 2 0 2 24 7 8 0 0 0 0 0 0 0 0 2 7 0 0 1 24 0 0 0 0 0 2 6 0 0 0 0 0 0 0 0 0 7 7 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 7 8 7
-    Play#0 output Play#0 1 2 2 2 12 87 0 0 0 0 0 0 0 0 2 2 86 0 0 1 12 0 0 0 0 0 2 87 0 0 0 0 0 0 0 0 0 86 86 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 86 86 86
-    Play#0 output Play#0 1 2 4 2 28 98 124 0 0 0 0 0 0 0 4 2 98 0 0 1 28 0 0 0 0 0 2 98 0 0 0 0 0 0 0 0 0 98 98 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 98 98 98
-    Play#0 output Play#0 1 2 -2 2 24 100 127 0 0 0 0 0 0 0 -2 2 100 0 0 1 24 0 0 0 0 0 2 100 0 0 0 0 0 0 0 0 0 100 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 100 100 100
-    Play#0 output Play#0 1 1 0 -2 24 100 127 0 0 0 0 0 0 0 0 -2 0 0 0 1 24 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 2 -2 2 100 127 0 0 0 0 0 0 0 2 -2 0 0 0 1 2 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 -2 -2 24 67 85 0 0 0 0 0 0 0 -2 -2 0 0 0 1 24 0 0 0 0 0 1 67 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 1 -1 5 100 127 0 0 0 0 0 0 0 1 -1 0 0 0 0 5 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 3 -1 24 100 127 0 0 0 0 0 0 0 3 -1 0 0 0 1 24 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 -3 -1 24 100 127 0 0 0 0 0 0 0 -3 -1 0 0 0 1 24 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 1 -1 -1 24 100 127 0 0 0 0 0 0 0 -1 -1 0 0 0 0 24 0 0 0 0 0 1 100 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 /20
+    Play#0 input terr * ?terr=2&eff<100 1
+    Play#0 command territory
+    Play#0 output Play#0 6 0 640
+    Play#0 input cens * ?terr=1
+    Play#0 command census
+    Play#0 output Play#0 1 Thu Jan  1 00:00:00 1970
+    Play#0 output Play#0 1     CENSUS                   del dst
+    Play#0 output Play#0 1 own   sect        eff prd mob uf uf old  civ  mil   uw food work avail fall coa
+    Play#0 output Play#0 1   1   -2,-2   +   67%      85 .. ..       67    0    0    0   0%    0    0   1
+    Play#0 output Play#0 1   1    2,-2   s  100%     127 .. ..      100    0    0    0   0%    0    0   1
+    Play#0 output Play#0 1   0    6,0    .    0%       0 .. ..        0    0    0    0   0%    0    0   1
+    Play#0 output Play#0 1   0   14,0    .    0%       0 .. ..        0    0    0    0   0%    0    0   1
+    Play#0 output Play#0 1   2    0,2    +    7%       8 .. ..        6    0    0    0   0%    7    0   1
+    Play#0 output Play#0 1   2    2,2    h   87%       0 .. ..       87    0    0    0   0%   86    0   1
+    Play#0 output Play#0 1   2    4,2    =   98%     124 .. ..       98    0    0    0   0%   98    0   1
+    Play#0 output Play#0 1   0    1,3    .    0%       0 .. ..        0    0    0    0   0%   78    0   1
+    Play#0 output Play#0 1 8 sectors
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump ship *
-    Play#0 command xdump
-    Play#0 output Play#0 1 XDUMP ship 0
-    Play#0 output Play#0 1 0 2 -12 0 6 20 0 0 0 0 0 0 0 "" 0 0 0 0 -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 98 0 ""
-    Play#0 output Play#0 1 1 1 3 1 13 59 127 0 150 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 200 10 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 2 1 3 1 13 60 127 0 150 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 196 10 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 3 1 3 1 13 100 87 0 150 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 13 162 10 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 5 1 10 0 17 100 117 0 100 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 24 4 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 6 1 3 3 17 100 127 0 100 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 5 36 4 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 9 1 3 1 2 100 127 0 20 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 10 10 10 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 2 3 3 18 68 62 0 60 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 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 13 2 8 0 18 72 67 0 60 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 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 22 2 2 2 2 58 74 0 20 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 3 0 0 0 0 0 0 0 0 59 58 0 0 0 0 0 0 "" 0 "" 0 0 0 80 "n"
-    Play#0 output Play#0 1 23 2 8 0 2 78 88 0 20 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 4 0 0 0 0 0 0 0 0 78 78 0 0 0 0 0 0 "" 0 "" 0 0 0 0 ""
-    Play#0 output Play#0 1 24 2 6 0 2 32 40 0 20 0 0 0 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 1 0 0 0 0 0 0 0 0 32 32 0 0 0 0 0 0 "" 0 "" 0 0 0 0 ""
-    Play#0 output Play#0 1 /12
+    Play#0 input comm * ?terr=1
+    Play#0 command commodity
+    Play#0 output Play#0 1 Thu Jan  1 00:00:00 1970
+    Play#0 output Play#0 1    COMMODITIES deliver--  distribute
+    Play#0 output Play#0 1      sect      sgpidbolhr sgpidbolhr  sh gun  pet iron dust bar  oil  lcm  hcm rad
+    Play#0 output Play#0 1   1  -2,-2   + .......... ..........   0   0    0    0    0   0    0    0    0   0
+    Play#0 output Play#0 1   1   2,-2   s .......... ..........   0   0    0    0    0   0    0    0    0   0
+    Play#0 output Play#0 1   0   6,0    . .......... ..........   0   0    0    0    0   0    0    0    0   0
+    Play#0 output Play#0 1   0  14,0    . .......... ..........   0   0    0    0    0   0    0    0    0   0
+    Play#0 output Play#0 1   2   0,2    + .......... ..........   0   0    0    0    0   0    0    7    7   0
+    Play#0 output Play#0 1   2   2,2    h .......... ..........   0   0    0    0    0   0    0   86   86   0
+    Play#0 output Play#0 1   2   4,2    = .......... ..........   0   0    0    0    0   0    0   98   98   0
+    Play#0 output Play#0 1   0   1,3    . .......... ..........   0   0    0    0    0   0    0    0    0   0
+    Play#0 output Play#0 1 8 sectors
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump plane *
-    Play#0 command xdump
-    Play#0 output Play#0 1 XDUMP plane 0
-    Play#0 output Play#0 1 0 2 2 2 27 100 127 0 180 0 0 0 0 "" 2 0 -1 -1 0 0 0.00000
-    Play#0 output Play#0 1 1 2 2 2 12 100 127 0 150 0 0 0 0 "" 0 0 -1 -1 0 0 0.00000
-    Play#0 output Play#0 1 22 2 2 2 27 100 127 0 180 0 0 0 0 "" 2 0 22 -1 0 0 0.00000
-    Play#0 output Play#0 1 23 2 8 0 27 100 127 0 180 0 0 0 0 "" 2 0 23 -1 0 0 0.00000
-    Play#0 output Play#0 1 32 2 2 2 27 100 127 0 180 0 0 0 0 "" 2 0 -1 32 0 0 0.00000
-    Play#0 output Play#0 1 33 2 2 2 27 100 127 0 180 0 0 0 0 "" 2 0 -1 33 0 0 0.00000
-    Play#0 output Play#0 1 /6
+    Play#0 input sinf * ?terr=1
+    Play#0 command sinfrastructure
+    Play#0 output Play#0 1 Thu Jan  1 00:00:00 1970
+    Play#0 output Play#0 1                           road        rail       defense
+    Play#0 output Play#0 1 own   sect        eff   eff mcost   eff mcost   eff  fact
+    Play#0 output Play#0 1   1   -2,-2   +   67%    0% 0.132   yes 0.132   67%  1.00
+    Play#0 output Play#0 1   1    2,-2   s  100%    0%  N/A    yes  N/A   100% 99.00
+    Play#0 output Play#0 1   0    6,0    .    0%    0%  N/A     no  N/A     0%  0.00
+    Play#0 output Play#0 1   0   14,0    .    0%    0%  N/A     no  N/A     0%  0.00
+    Play#0 output Play#0 1   2    0,2    +    7%    7% 0.349   yes 0.349    7%  1.00
+    Play#0 output Play#0 1   2    2,2    h   87%   86% 0.051   yes 0.051   87%  1.44
+    Play#0 output Play#0 1   2    4,2    =   98%   98% 0.001   yes 0.020   98%  1.00
+    Play#0 output Play#0 1   0    1,3    .    0%   78%  N/A     no  N/A     0%  0.00
+    Play#0 output Play#0 1 8 sectors
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump land *
-    Play#0 command xdump
-    Play#0 output Play#0 1 XDUMP land 0
-    Play#0 output Play#0 1 1 1 3 1 13 39 127 0 160 0 0 0 0 "" -1 0 0 0 "" 0 10 80 12 0 0 0 0 0 0 0 0 0 0 0 0 -1 0
-    Play#0 output Play#0 1 2 1 3 1 13 40 127 0 160 0 0 0 0 "" -1 0 0 0 "" 0 10 80 12 0 0 0 0 0 0 0 0 0 0 0 0 -1 0
-    Play#0 output Play#0 1 3 1 3 1 13 100 127 0 160 0 0 0 0 "" -1 0 0 0 "" 0 10 80 12 0 0 0 0 0 0 0 0 0 0 0 0 -1 0
-    Play#0 output Play#0 1 9 1 3 1 7 100 0 0 40 0 0 0 0 "" -1 0 0 0 "" 0 10 10 10 0 0 0 0 0 0 0 0 0 0 0 0 -1 0
-    Play#0 output Play#0 1 13 2 8 0 8 100 127 0 40 0 0 0 0 "" 13 0 42 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1 0
-    Play#0 output Play#0 1 22 2 2 2 21 97 124 0 270 2 2 0 0 "" 22 0 0 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1 0
-    Play#0 output Play#0 1 23 2 8 0 21 100 127 0 270 8 0 0 0 "" 23 0 0 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 -1 0
-    Play#0 output Play#0 1 32 2 2 2 7 94 120 0 40 0 0 0 0 "" -1 0 0 0 "" 0 10 0 0 0 0 0 0 0 0 94 94 0 0 0 0 -1 0
-    Play#0 output Play#0 1 33 2 2 2 21 97 123 0 270 2 2 0 0 "" -1 0 0 0 "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 0 0 32 0
-    Play#0 output Play#0 1 /9
+    Play#0 input ship * ?eff<100
+    Play#0 command ship
+    Play#0 output Play#0 1 own shp#     ship type       x,y   fl   eff civ mil  uw  fd pn he xl ln mob tech
+    Play#0 output Play#0 1   2    0 frg  frigate      -12,0        20%   0   0   0   0  0  0  0  0   0    0
+    Play#0 output Play#0 1   1    1 bb   battleship     3,1        59%   0  13   0   0  0  0  0  0 127  150
+    Play#0 output Play#0 1   1    2 bb   battleship     3,1        60%   0  13   0   0  0  0  0  0 127  150
+    Play#0 output Play#0 1   2   12 sb   submarine      3,3        68%   0   4   0   0  0  0  0  0  62   60
+    Play#0 output Play#0 1   2   13 sb   submarine      8,0        72%   0   4   0   0  0  0  0  1  67   60
+    Play#0 output Play#0 1   2   22 cs   cargo ship     2,2        58%   0   3   0   0  0  0  1  1  74   20
+    Play#0 output Play#0 1   2   23 cs   cargo ship     8,0        78%   0   4   0   0  0  0  1  1  88   20
+    Play#0 output Play#0 1   2   24 cs   cargo ship     6,0        32%   0   1   0   0  0  0  0  0  40   20
+    Play#0 output Play#0 1 8 ships
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump nuke *
-    Play#0 command xdump
-    Play#0 output Play#0 1 XDUMP nuke 0
-    Play#0 output Play#0 1 0 2 2 2 0 100 0 0 400 0 0 0 0 "" -1
-    Play#0 output Play#0 1 1 2 2 2 0 100 0 0 400 0 0 0 0 "" 1
-    Play#0 output Play#0 1 /2
+    Play#0 input carg * ?eff<100
+    Play#0 command cargo
+    Play#0 output Play#0 1 shp#         x,y   flt eff  civ mil  uw  sh gun pet irn dst bar oil lcm hcm rad
+    Play#0 output Play#0 1    0 frg   -12,0       20%   0   0   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1    1 bb      3,1       59%   0  13   0 200  10   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1    2 bb      3,1       60%   0  13   0 196  10   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   12 sb      3,3       68%   0   4   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   13 sb      8,0       72%   0   4   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   22 cs      2,2       58%   0   3   0   0   0   0   0   0   0   0  59  58   0
+    Play#0 output Play#0 1   23 cs      8,0       78%   0   4   0   0   0   0   0   0   0   0  78  78   0
+    Play#0 output Play#0 1   24 cs      6,0       32%   0   1   0   0   0   0   0   0   0   0  32  32   0
+    Play#0 output Play#0 1 8 ships
     Play#0 output Play#0 6 0 640
-    Play#0 input xdump news *
-    Play#0 command xdump
-    Play#0 output Play#0 1 XDUMP news 0
-    Play#0 output Play#0 1 1 10 0 3 0 0
-    Play#0 output Play#0 1 1 10 1 5 0 0
-    Play#0 output Play#0 1 1 10 2 16 0 0
-    Play#0 output Play#0 1 1 11 1 1 0 0
-    Play#0 output Play#0 1 1 11 2 11 0 0
-    Play#0 output Play#0 1 /5
+    Play#0 input plane * ?eff<100
+    Play#0 command plane
+    Play#0 output Play#0 1 *: No plane(s)
+    Play#0 output Play#0 1 command failed
+    Play#0 output Play#0 6 0 640
+    Play#0 input land * ?eff<100
+    Play#0 command land
+    Play#0 output Play#0 1 own    # unit type          x,y    a   eff mil frt  mu  fd tch retr xl ln carry
+    Play#0 output Play#0 1   1    1 hat  hvy artill    3,1        39%  10   0 127   0 160   0%  0  0
+    Play#0 output Play#0 1   1    2 hat  hvy artill    3,1        40%  10   0 127   0 160   0%  0  0
+    Play#0 output Play#0 1   2   22 rad  radar unit    2,2        97%  10   0 124   0 270   0%  0  0   22S
+    Play#0 output Play#0 1   2   32 tra  train         2,2        94%  10   0 120   0  40   0%  1  1
+    Play#0 output Play#0 1   2   33 rad  radar unit    2,2        97%  10   0 123   0 270   0%  1  0   32L
+    Play#0 output Play#0 1 5 units
+    Play#0 output Play#0 6 0 640
+    Play#0 input lcarg * ?eff<100
+    Play#0 command lcargo
+    Play#0 output Play#0 1 lnd# unit    x,y    a  eff  civ mil  uw  sh gun pet irn dst bar oil lcm hcm rad
+    Play#0 output Play#0 1    1 hat     3,1        39%   0  10   0  80  12   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1    2 hat     3,1        40%   0  10   0  80  12   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   22 rad     2,2        97%   0  10   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   32 tra     2,2        94%   0  10   0   0   0   0   0   0   0   0  94  94   0
+    Play#0 output Play#0 1   33 rad     2,2        97%   0  10   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1 5 units
+    Play#0 output Play#0 6 0 640
+    Play#0 input nuke *
+    Play#0 command nuke
+    Play#0 output Play#0 1 own    # nuke type              x,y    s   eff tech carry burst
+    Play#0 output Play#0 1 2      0 10kt  fission          2,2       100%  400
+    Play#0 output Play#0 1 2      1 10kt  fission          2,2       100%  400    1P ground
+    Play#0 output Play#0 1 2 nukes
+    Play#0 output Play#0 6 0 640
+    Play#0 input __cmd added 4 0 0
+    Play#0 command __cmd
     Play#0 output Play#0 6 0 640
     Play#0 input edit c 1 b 640
     Play#0 command edit
@@ -1207,6 +1252,115 @@
     Play#0 output Play#0 1 ***          Server configured for testing          ***
     Play#0 output Play#0 1 *** If you see this in a game, it is misconfigured! ***
     Play#0 output Play#0 6 0 640
+    Play#0 input terr * ?terr=2&eff<100 1
+    Play#0 command territory
+    Play#0 output Play#0 6 0 640
+    Play#0 input cens * ?terr=1
+    Play#0 command census
+    Play#0 output Play#0 1 Thu Jan  1 00:00:00 1970
+    Play#0 output Play#0 1     CENSUS                   del dst
+    Play#0 output Play#0 1 own   sect        eff prd mob uf uf old  civ  mil   uw food work avail fall coa
+    Play#0 output Play#0 1   1   -2,-2   +   67%      85 .. ..       67    0    0    0   0%    0    0   1
+    Play#0 output Play#0 1   1    2,-2   s  100%     127 .. ..      100    0    0    0   0%    0    0   1
+    Play#0 output Play#0 1   0    6,0    .    0%       0 .. ..        0    0    0    0   0%    0    0   1
+    Play#0 output Play#0 1   0   14,0    .    0%       0 .. ..        0    0    0    0   0%    0    0   1
+    Play#0 output Play#0 1   0    0,2    +    2%       0 .. ..   2    0    0    0    0 100%    1    0   1
+    Play#0 output Play#0 1   2    2,2    h   87%       0 .. ..       87    0    0    0   0%   86    0   1
+    Play#0 output Play#0 1   2    4,2    =   98%     124 .. ..       98    0    0    0   0%   98    0   1
+    Play#0 output Play#0 1   0    1,3    .    0%       0 .. ..        0    0    0    0   0%   78    0   1
+    Play#0 output Play#0 1 8 sectors
+    Play#0 output Play#0 6 0 640
+    Play#0 input comm * ?terr=1
+    Play#0 command commodity
+    Play#0 output Play#0 1 Thu Jan  1 00:00:00 1970
+    Play#0 output Play#0 1    COMMODITIES deliver--  distribute
+    Play#0 output Play#0 1      sect      sgpidbolhr sgpidbolhr  sh gun  pet iron dust bar  oil  lcm  hcm rad
+    Play#0 output Play#0 1   1  -2,-2   + .......... ..........   0   0    0    0    0   0    0    0    0   0
+    Play#0 output Play#0 1   1   2,-2   s .......... ..........   0   0    0    0    0   0    0    0    0   0
+    Play#0 output Play#0 1   0   6,0    . .......... ..........   0   0    0    0    0   0    0    0    0   0
+    Play#0 output Play#0 1   0  14,0    . .......... ..........   0   0    0    0    0   0    0    0    0   0
+    Play#0 output Play#0 1   0   0,2    + .......... ..........   0   0    0    0    0   0    0    1    1   0
+    Play#0 output Play#0 1   2   2,2    h .......... ..........   0   0    0    0    0   0    0   86   86   0
+    Play#0 output Play#0 1   2   4,2    = .......... ..........   0   0    0    0    0   0    0   98   98   0
+    Play#0 output Play#0 1   0   1,3    . .......... ..........   0   0    0    0    0   0    0    0    0   0
+    Play#0 output Play#0 1 8 sectors
+    Play#0 output Play#0 6 0 640
+    Play#0 input sinf * ?terr=1
+    Play#0 command sinfrastructure
+    Play#0 output Play#0 1 Thu Jan  1 00:00:00 1970
+    Play#0 output Play#0 1                           road        rail       defense
+    Play#0 output Play#0 1 own   sect        eff   eff mcost   eff mcost   eff  fact
+    Play#0 output Play#0 1   1   -2,-2   +   67%    0% 0.132   yes 0.132   67%  1.00
+    Play#0 output Play#0 1   1    2,-2   s  100%    0%  N/A    yes  N/A   100% 99.00
+    Play#0 output Play#0 1   0    6,0    .    0%    0%  N/A     no  N/A     0%  0.00
+    Play#0 output Play#0 1   0   14,0    .    0%    0%  N/A     no  N/A     0%  0.00
+    Play#0 output Play#0 1   0    0,2    +    2%    1% 0.388    no  N/A     2%  1.00
+    Play#0 output Play#0 1   2    2,2    h   87%   86% 0.051   yes 0.051   87%  1.44
+    Play#0 output Play#0 1   2    4,2    =   98%   98% 0.001   yes 0.020   98%  1.00
+    Play#0 output Play#0 1   0    1,3    .    0%   78%  N/A     no  N/A     0%  0.00
+    Play#0 output Play#0 1 8 sectors
+    Play#0 output Play#0 6 0 640
+    Play#0 input ship * ?eff<100
+    Play#0 command ship
+    Play#0 output Play#0 1 own shp#     ship type       x,y   fl   eff civ mil  uw  fd pn he xl ln mob tech
+    Play#0 output Play#0 1   2    0 frg  frigate      -12,0        20%   0   0   0   0  0  0  0  0   0    0
+    Play#0 output Play#0 1   1    1 bb   battleship     3,1        59%   0  13   0   0  0  0  0  0 127  150
+    Play#0 output Play#0 1   1    2 bb   battleship     3,1        60%   0  13   0   0  0  0  0  0 127  150
+    Play#0 output Play#0 1   2   12 sb   submarine      3,3        68%   0   4   0   0  0  0  0  0  62   60
+    Play#0 output Play#0 1   2   13 sb   submarine      8,0        72%   0   4   0   0  0  0  0  1  67   60
+    Play#0 output Play#0 1   2   22 cs   cargo ship     2,2        58%   0   3   0   0  0  0  1  1  74   20
+    Play#0 output Play#0 1   2   23 cs   cargo ship     8,0        78%   0   4   0   0  0  0  1  1  88   20
+    Play#0 output Play#0 1   2   24 cs   cargo ship     6,0        32%   0   1   0   0  0  0  0  0  40   20
+    Play#0 output Play#0 1 8 ships
+    Play#0 output Play#0 6 0 640
+    Play#0 input carg * ?eff<100
+    Play#0 command cargo
+    Play#0 output Play#0 1 shp#         x,y   flt eff  civ mil  uw  sh gun pet irn dst bar oil lcm hcm rad
+    Play#0 output Play#0 1    0 frg   -12,0       20%   0   0   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1    1 bb      3,1       59%   0  13   0 200  10   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1    2 bb      3,1       60%   0  13   0 196  10   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   12 sb      3,3       68%   0   4   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   13 sb      8,0       72%   0   4   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   22 cs      2,2       58%   0   3   0   0   0   0   0   0   0   0  59  58   0
+    Play#0 output Play#0 1   23 cs      8,0       78%   0   4   0   0   0   0   0   0   0   0  78  78   0
+    Play#0 output Play#0 1   24 cs      6,0       32%   0   1   0   0   0   0   0   0   0   0  32  32   0
+    Play#0 output Play#0 1 8 ships
+    Play#0 output Play#0 6 0 640
+    Play#0 input plane * ?eff<100
+    Play#0 command plane
+    Play#0 output Play#0 1 *: No plane(s)
+    Play#0 output Play#0 1 command failed
+    Play#0 output Play#0 6 0 640
+    Play#0 input land * ?eff<100
+    Play#0 command land
+    Play#0 output Play#0 1 own    # unit type          x,y    a   eff mil frt  mu  fd tch retr xl ln carry
+    Play#0 output Play#0 1   1    1 hat  hvy artill    3,1        39%  10   0 127   0 160   0%  0  0
+    Play#0 output Play#0 1   1    2 hat  hvy artill    3,1        40%  10   0 127   0 160   0%  0  0
+    Play#0 output Play#0 1   2   22 rad  radar unit    2,2        97%  10   0 124   0 270   0%  0  0   22S
+    Play#0 output Play#0 1   2   32 tra  train         2,2        94%  10   0 120   0  40   0%  1  1
+    Play#0 output Play#0 1   2   33 rad  radar unit    2,2        97%  10   0 123   0 270   0%  1  0   32L
+    Play#0 output Play#0 1 5 units
+    Play#0 output Play#0 6 0 640
+    Play#0 input lcarg * ?eff<100
+    Play#0 command lcargo
+    Play#0 output Play#0 1 lnd# unit    x,y    a  eff  civ mil  uw  sh gun pet irn dst bar oil lcm hcm rad
+    Play#0 output Play#0 1    1 hat     3,1        39%   0  10   0  80  12   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1    2 hat     3,1        40%   0  10   0  76  12   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   22 rad     2,2        97%   0  10   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   32 tra     2,2        94%   0  10   0   0   0   0   0   0   0   0  94  94   0
+    Play#0 output Play#0 1   33 rad     2,2        97%   0  10   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1 5 units
+    Play#0 output Play#0 6 0 640
+    Play#0 input nuke *
+    Play#0 command nuke
+    Play#0 output Play#0 1 own    # nuke type              x,y    s   eff tech carry burst
+    Play#0 output Play#0 1 2      0 10kt  fission          2,2       100%  400
+    Play#0 output Play#0 1 2      1 10kt  fission          2,2       100%  400    1P ground
+    Play#0 output Play#0 1 2 nukes
+    Play#0 output Play#0 6 0 640
+    Play#0 input terr * 0
+    Play#0 command territory
+    Play#0 output Play#0 6 0 640
     Play#0 input read 0
     Play#0 command read
     Play#0 output Play#0 1 No telegrams for you at the moment...

diff --git a/tests/fire/setup-POGO b/tests/fire/setup-POGO
index 3ddbfc60c2716b4313fecad4938ad4d4c2a2ada0..21b08c68b584006da682f730418c4ba9d49dc540 100644 (file)
--- a/tests/fire/setup-POGO
+++ b/tests/fire/setup-POGO
@@ -62,6 +62,16 @@ edit l * ?des#.&des#h m 127
 || relations
 decl w 1 2
 decl w 2 1
+|| mark target sectors
+terr * ?own#0&eff=100 2
+terr 14,0 1
+terr 2,-2 1
+terr -2,-2 1
+terr 4,2 1
+terr 1,3 1
+terr 2,2 1
+terr 0,2 1
+terr 6,0 1
 || target ships
 | frg far away
 edit s 0 t frg L -12,0 O 2
@@ -117,3 +127,4 @@ land *
 lcar *
 plan *
 nuke *
+sinf * ?own#0