tests/fire: Use build command for setup

Setup uses edit to build units.  Stupid idea, because that misses unit
initialization normally done by build, directly or via
unit_wipe_orders().  Use build instead.

Changes test output harmlessly: ship xbuilt, ybuilt go from 0,0 to the
building sector, ship#0's builder goes from 98 to 0, all ships'
cargostart and cargoend go from 0 to -1, jhb range from 0 to 35, and
land unit retreat percentage from 0 to 42.

Setup no longer needs country 98.  Drop it.

Setup no longer copies 2,0 to 0,0 messing up its distribution center.
Harmless.

Setup doesn't need POGO's tech level anymore, so don't set it to 400.
Nukes are now built at their required tech level.  Also harmless.

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

diff --git a/tests/fire/99-POGO b/tests/fire/99-POGO
index faf95e8e3bc3d382d73e71a089eeda12e489b5d8..636dd7fecfcca30037487f10ac567f86517b7b6e 100644 (file)
--- a/tests/fire/99-POGO
+++ b/tests/fire/99-POGO
@@ -13,4 +13,3 @@ read 0
 read 1
 read 2
 read 3
-read 98

diff --git a/tests/fire/final.xdump b/tests/fire/final.xdump
index ab0cf86277020764fcb0e49534f633515988f6b6..484542ffb7089b0d9305ebd3e30b634aef6d86cb 100644 (file)
--- a/tests/fire/final.xdump
+++ b/tests/fire/final.xdump
@@ -1,6 +1,6 @@
 config sect
 owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist ydist avail elev work coastal newdes min gold fert ocontent uran oldown civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad c_dist m_dist s_dist g_dist p_dist i_dist d_dist b_dist f_dist o_dist l_dist h_dist u_dist r_dist c_del m_del s_del g_del p_del i_del d_del b_del f_del o_del l_del h_del u_del r_del mines pstage ptime che che_target fallout access road rail dfense
-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 healthy 0 0 0 0 0 0 0 0
+1 0 0 19 5 127 0 0 0 0 0 0 0 0 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 healthy 0 0 0 0 0 0 0 0
 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 74 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 healthy 0 0 0 0 0 0 0 0
 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 healthy 0 0 0 0 0 0 0 0
 0 6 0 0 0 0 0 0 0 0 0 0 0 6 0 0 0 0 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 healthy 0 0 0 0 0 0 0 0
@@ -259,31 +259,31 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 /config
 config ship
 uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet xstart xend ystart yend cargostart(0) cargostart(1) cargostart(2) cargostart(3) cargostart(4) cargostart(5) cargoend(0) cargoend(1) cargoend(2) cargoend(3) cargoend(4) cargoend(5) amtstart(0) amtstart(1) amtstart(2) amtstart(3) amtstart(4) amtstart(5) amtend(0) amtend(1) amtend(2) amtend(3) amtend(4) amtend(5) autonav civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access mquota path follow name xbuilt ybuilt builder rflags rpath
-0 2 -12 0 6 20 0 0 0 0 0 none 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 healthy 0 0 0 "" 0 "" 0 0 98 () ""
-1 1 3 1 13 59 127 0 150 0 0 none 0 "" 0 0 0 0 0 0 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 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-2 1 3 1 13 60 127 0 150 0 0 none 0 "" 0 0 0 0 0 0 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 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-3 1 3 1 13 100 87 0 150 0 0 none 0 "" 0 0 0 0 0 0 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 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+0 2 -12 0 6 20 0 0 0 0 0 none 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 healthy 0 0 0 "" 0 "" -12 0 0 () ""
+1 1 3 1 13 59 127 0 150 0 0 none 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 13 200 10 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" -12 0 0 () ""
+2 1 3 1 13 60 127 0 150 0 0 none 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 13 196 10 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" -12 0 0 () ""
+3 1 3 1 13 100 87 0 150 0 0 none 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 13 162 10 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" -12 0 0 () ""
 4 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-5 1 10 0 17 100 117 0 100 0 0 none 0 "" 0 0 0 0 0 0 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 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-6 1 3 3 17 100 127 0 100 0 0 none 0 "" 0 0 0 0 0 0 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 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+5 1 10 0 17 100 117 0 100 0 0 none 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 5 24 4 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" -12 0 0 () ""
+6 1 3 3 17 100 127 0 100 0 0 none 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 5 36 4 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" -12 0 0 () ""
 7 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
 8 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-9 1 3 1 2 98 124 0 20 0 0 none 0 "" 0 0 0 0 0 0 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 9 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-10 0 2 2 18 0 0 0 60 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 (helpless depth-charged) "n"
-11 0 6 0 18 0 0 0 60 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 (injured helpless depth-charged) "j"
-12 2 3 3 18 68 62 0 60 0 0 none 0 "" 0 0 0 0 0 0 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 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-13 2 8 0 18 72 67 0 60 0 0 none 0 "" 0 0 0 0 0 0 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 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+9 1 3 1 2 98 124 0 20 0 0 none 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 10 10 9 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" -12 0 0 () ""
+10 0 2 2 18 0 0 0 60 0 0 none 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 healthy 0 0 0 "" 0 "" -12 0 0 (helpless depth-charged) "n"
+11 0 6 0 18 0 0 0 60 0 0 none 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 healthy 0 0 0 "" 0 "" -12 0 0 (injured helpless depth-charged) "j"
+12 2 3 3 18 68 62 0 60 0 0 none 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 4 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" -12 0 0 () ""
+13 2 8 0 18 72 67 0 60 0 0 none 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 4 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" -12 0 0 () ""
 14 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
 15 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
 16 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
 17 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
 18 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
 19 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-20 0 2 2 2 0 0 0 20 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 78 78 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-21 0 6 0 2 0 0 0 20 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 80 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-22 2 3 3 2 58 65 0 20 0 0 none 0 "" 0 0 0 0 0 0 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 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-23 2 8 0 2 78 88 0 20 0 0 none 0 "" 0 0 0 0 0 0 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 healthy 0 0 0 "" 0 "" 0 0 0 () ""
-24 2 6 0 2 32 40 0 20 0 0 none 0 "" 0 0 0 0 0 0 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 healthy 0 0 0 "" 0 "" 0 0 0 () ""
+20 0 2 2 2 0 0 0 20 0 0 none 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 78 78 0 0 healthy 0 0 0 "" 0 "" -12 0 0 () ""
+21 0 6 0 2 0 0 0 20 0 0 none 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 80 80 0 0 healthy 0 0 0 "" 0 "" -12 0 0 () ""
+22 2 3 3 2 58 65 0 20 0 0 none 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 3 0 0 0 0 0 0 0 0 59 58 0 0 healthy 0 0 0 "" 0 "" -12 0 0 () ""
+23 2 8 0 2 78 88 0 20 0 0 none 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 4 0 0 0 0 0 0 0 0 78 78 0 0 healthy 0 0 0 "" 0 "" -12 0 0 () ""
+24 2 6 0 2 32 40 0 20 0 0 none 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 1 0 0 0 0 0 0 0 0 32 32 0 0 healthy 0 0 0 "" 0 "" -12 0 0 () ""
 25 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
 26 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
 27 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 0 "" 0 0 0 () ""
@@ -313,8 +313,8 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet xstar
 config plane
 uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range harden ship land flags access theta
 0 2 2 2 27 100 127 0 180 0 0 none 0 "" 2 0 -1 -1 () 0 0.00000
-1 2 2 2 12 100 127 0 150 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-2 0 1 3 12 0 127 0 150 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
+1 2 2 2 12 100 127 0 150 0 0 none 0 "" 35 0 -1 -1 () 0 0.00000
+2 0 1 3 12 0 127 0 150 0 0 none 0 "" 35 0 -1 -1 () 0 0.00000
 3 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
 4 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
 5 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
@@ -366,15 +366,15 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range
 config land
 uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship harden retreat rflags rpath civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime land access
 0 0 2 2 8 0 127 0 40 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-1 1 3 1 13 39 127 0 160 0 0 none 0 "" -1 0 0 () "" 0 10 80 12 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-2 1 3 1 13 40 127 0 160 0 0 none 0 "" -1 0 0 () "" 0 10 76 12 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-3 1 0 -2 13 100 51 0 160 0 0 none 0 "" -1 0 0 () "" 0 10 23 12 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+1 1 3 1 13 39 127 0 160 0 0 none 0 "" -1 0 42 () "" 0 10 80 12 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+2 1 3 1 13 40 127 0 160 0 0 none 0 "" -1 0 42 () "" 0 10 76 12 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+3 1 0 -2 13 100 51 0 160 0 0 none 0 "" -1 0 42 () "" 0 10 23 12 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 4 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 5 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 6 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 7 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 8 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-9 1 3 1 7 100 0 0 40 0 0 none 0 "" -1 0 0 () "" 0 10 10 10 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+9 1 3 1 7 100 0 0 40 0 0 none 0 "" -1 0 42 () "" 0 10 10 10 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 10 0 2 2 8 0 127 0 40 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 11 0 6 0 8 0 127 0 40 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 12 0 2 2 8 0 127 0 40 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
@@ -385,20 +385,20 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h
 17 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 18 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 19 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-20 0 2 2 21 0 122 0 270 2 2 none 0 "" -1 0 0 () "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-21 0 6 0 21 0 127 0 270 6 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-22 2 3 3 21 97 124 0 270 3 3 none 0 "" 22 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-23 2 8 0 21 100 127 0 270 8 0 none 0 "" 23 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+20 0 2 2 21 0 122 0 270 0 0 none 0 "" -1 0 42 () "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+21 0 6 0 21 0 127 0 270 0 0 none 0 "" -1 0 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+22 2 3 3 21 97 124 0 270 0 0 none 0 "" 22 0 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+23 2 8 0 21 100 127 0 270 0 0 none 0 "" 23 0 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 24 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 25 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 26 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 27 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 28 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 29 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-30 0 1 3 7 0 127 0 40 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 100 100 0 0 healthy 0 -1 0
-31 0 1 3 21 0 127 0 270 1 3 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
-32 2 2 2 7 94 120 0 40 0 0 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 94 94 0 0 healthy 0 -1 0
-33 2 2 2 21 97 123 0 270 2 2 none 0 "" -1 0 0 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 32 0
+30 0 1 3 7 0 127 0 40 0 0 none 0 "" -1 0 42 () "" 0 10 0 0 0 0 0 0 0 0 100 100 0 0 healthy 0 -1 0
+31 0 1 3 21 0 127 0 270 0 0 none 0 "" -1 0 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
+32 2 2 2 7 94 120 0 40 0 0 none 0 "" -1 0 42 () "" 0 10 0 0 0 0 0 0 0 0 94 94 0 0 healthy 0 -1 0
+33 2 2 2 21 97 123 0 270 0 0 none 0 "" -1 0 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 32 0
 34 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 35 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
 36 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
@@ -418,9 +418,9 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h
 /config
 config nuke
 uid owner xloc yloc type effic mobil off tech opx opy mission radius stockpile plane
-0 2 2 2 0 100 0 0 400 0 0 none 0 "" -1
-1 2 2 2 0 100 0 0 400 0 0 none 0 "" 1
-2 0 1 3 0 0 0 0 400 0 0 none 0 "" -1
+0 2 2 2 0 100 0 0 280 0 0 none 0 "" -1
+1 2 2 2 0 100 0 0 280 0 0 none 0 "" 1
+2 0 1 3 0 0 0 0 280 0 0 none 0 "" -1
 3 0 0 0 0 0 0 0 0 0 0 none 0 "" -1
 4 0 0 0 0 0 0 0 0 0 0 none 0 "" -1
 5 0 0 0 0 0 0 0 0 0 0 none 0 "" -1
@@ -482,7 +482,7 @@ uid owner type unitid price maxbidder markettime xloc yloc
 /config
 config nat
 cnum stat flags cname passwd ip hostname 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" "127.0.0.1" "" "tester" 0 0 0 0 0 0 0 255 640 0 0 123456789 0 0 0 0 400.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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () ()
+0 deity (flash beep coastwatch sonar techlists) "POGO" "peter" "127.0.0.1" "" "tester" 0 0 0 0 0 0 0 255 640 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 active (flash beep coastwatch sonar techlists) "1" "1" "127.0.0.1" "" "tester" 1 -1 0 0 0 0 0 255 494 0 0 25000 0 0 0 0 100.000 0.00000 0.00000 0.00000 neutral 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () ()
 2 active (flash beep coastwatch sonar techlists) "2" "2" "" "" "" 0 0 0 0 0 1 0 255 640 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 new (flash beep coastwatch sonar techlists) "3" "3" "" "" "" 2 -2 0 0 0 0 0 255 640 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () ()
@@ -580,7 +580,7 @@ cnum stat flags cname passwd ip hostname userid xcap ycap xorg yorg update tgms
 95 unused () "" "" "" "" "" 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0.00000 0.00000 0.00000 0.00000 at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () ()
 96 unused () "" "" "" "" "" 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0.00000 0.00000 0.00000 0.00000 at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () ()
 97 unused () "" "" "" "" "" 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0.00000 0.00000 0.00000 0.00000 at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 deity (flash beep coastwatch sonar techlists) "98" "98" "" "" "" 0 0 0 0 0 0 0 255 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 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 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 unused () "" "" "" "" "" 0 0 0 0 0 0 0 255 0 0 0 0 0 0 0 0 0.00000 0.00000 0.00000 0.00000 at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war at-war 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () ()
 /config
 config loan
 uid loaner loanee status irate ldur amtpaid amtdue lastpay duedate

diff --git a/tests/fire/journal.log b/tests/fire/journal.log
index ff44e90a43093b9dd3a95d01b84ec71cca133636..99a9f8dcfff6c8c10a7bc04ac37d845c194080bd 100644 (file)
--- a/tests/fire/journal.log
+++ b/tests/fire/journal.log
@@ -436,11 +436,11 @@
     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    3,3        97%  10   0 124   0 270   0%  1  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   1    1 hat  hvy artill    3,1        39%  10   0 127   0 160  42%  0  0
+    Play#0 output Play#0 1   1    2 hat  hvy artill    3,1        40%  10   0 127   0 160  42%  0  0
+    Play#0 output Play#0 1   2   22 rad  radar unit    3,3        97%  10   0 124   0 270  42%  1  0   22S
+    Play#0 output Play#0 1   2   32 tra  train         2,2        94%  10   0 120   0  40  42%  1  1
+    Play#0 output Play#0 1   2   33 rad  radar unit    2,2        97%  10   0 123   0 270  42%  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
@@ -456,8 +456,8 @@
     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      0 10kt  fission          2,2       100%  280
+    Play#0 output Play#0 1 2      1 10kt  fission          2,2       100%  280    1P ground
     Play#0 output Play#0 1 2 nukes
     Play#0 output Play#0 6 0 640
     Play#0 input __cmd added 3 0 0
@@ -946,11 +946,11 @@
     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    3,3        97%  10   0 124   0 270   0%  1  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   1    1 hat  hvy artill    3,1        39%  10   0 127   0 160  42%  0  0
+    Play#0 output Play#0 1   1    2 hat  hvy artill    3,1        40%  10   0 127   0 160  42%  0  0
+    Play#0 output Play#0 1   2   22 rad  radar unit    3,3        97%  10   0 124   0 270  42%  1  0   22S
+    Play#0 output Play#0 1   2   32 tra  train         2,2        94%  10   0 120   0  40  42%  1  1
+    Play#0 output Play#0 1   2   33 rad  radar unit    2,2        97%  10   0 123   0 270  42%  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
@@ -966,8 +966,8 @@
     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      0 10kt  fission          2,2       100%  280
+    Play#0 output Play#0 1 2      1 10kt  fission          2,2       100%  280    1P ground
     Play#0 output Play#0 1 2 nukes
     Play#0 output Play#0 6 0 640
     Play#0 input __cmd added 3 0 0
@@ -994,10 +994,10 @@
     Play#1 input land * ?shell>0
     Play#1 command land
     Play#1 output Play#1 1    # unit type          x,y    a   eff mil frt  mu  fd tch retr xl ln carry
-    Play#1 output Play#1 1    1 hat  hvy artill    3,1        39%  10   0 127   0 160   0%  0  0
-    Play#1 output Play#1 1    2 hat  hvy artill    3,1        40%  10   0 127   0 160   0%  0  0
-    Play#1 output Play#1 1    3 hat  hvy artill    3,1       100%  10   0 127   0 160   0%  0  0
-    Play#1 output Play#1 1    9 tra  train         3,1       100%  10   0   0   0  40   0%  0  0
+    Play#1 output Play#1 1    1 hat  hvy artill    3,1        39%  10   0 127   0 160  42%  0  0
+    Play#1 output Play#1 1    2 hat  hvy artill    3,1        40%  10   0 127   0 160  42%  0  0
+    Play#1 output Play#1 1    3 hat  hvy artill    3,1       100%  10   0 127   0 160  42%  0  0
+    Play#1 output Play#1 1    9 tra  train         3,1       100%  10   0   0   0  40  42%  0  0
     Play#1 output Play#1 1 4 units
     Play#1 output Play#1 6 0 538
     Play#1 input lcarg * ?shell>0
@@ -1355,11 +1355,11 @@
     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    3,3        97%  10   0 124   0 270   0%  1  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   1    1 hat  hvy artill    3,1        39%  10   0 127   0 160  42%  0  0
+    Play#0 output Play#0 1   1    2 hat  hvy artill    3,1        40%  10   0 127   0 160  42%  0  0
+    Play#0 output Play#0 1   2   22 rad  radar unit    3,3        97%  10   0 124   0 270  42%  1  0   22S
+    Play#0 output Play#0 1   2   32 tra  train         2,2        94%  10   0 120   0  40  42%  1  1
+    Play#0 output Play#0 1   2   33 rad  radar unit    2,2        97%  10   0 123   0 270  42%  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
@@ -1375,8 +1375,8 @@
     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      0 10kt  fission          2,2       100%  280
+    Play#0 output Play#0 1 2      1 10kt  fission          2,2       100%  280    1P ground
     Play#0 output Play#0 1 2 nukes
     Play#0 output Play#0 6 0 640
     Play#0 input terr * 0
@@ -1488,10 +1488,6 @@
     Play#0 command read
     Play#0 output Play#0 1 No telegrams for 3 at the moment...
     Play#0 output Play#0 6 0 640
-    Play#0 input read 98
-    Play#0 command read
-    Play#0 output Play#0 1 No telegrams for 98 at the moment...
-    Play#0 output Play#0 6 0 640
     Play#0 input ctld
     Play#0 output Play#0 1 Bye-bye
     Play#0 logout 0

diff --git a/tests/fire/setup-POGO b/tests/fire/setup-POGO
index dfc54cf26eb6692fe09d96c6b928d70bb81258ae..4c3cd26b90969e7fd79f177ba805f9d0975c5571 100644 (file)
--- a/tests/fire/setup-POGO
+++ b/tests/fire/setup-POGO
@@ -1,30 +1,8 @@
-|| pre-extend unit files
-edit c 0 T 400
-add 98 98 98 g
-des 0,0 h
-give m 0,0 100
-edit l 0,0 o 98 O 98 a 9999
-give l 0,0 9999
-give h 0,0 9999
-give o 0,0 9999
-give r 0,0 9999
-build s 0,0 frg
-edit s 0 O 0 T 0
-des 0,0 *
-build p 0,0 f1
-edit p 0 O 0 t 0
-des 0,0 !
-build l 0,0 cav
-edit u 0 O 0 t 0
-des 0,0 n
-build n 0,0 10kt
-edit n 0 O 0 t 0
-edit l 2,0 L 0,0
-|
 || an island
 des @0,0:2 +
-edit l 4,2 e 100 s = S =
-edit l 1,3 e 20 s = S =
+build b 2,2 j
+build b 2,2 b
+edit l 4,2 e 100
 give c * ?des#. 100
 || country#1
 add 1 1 1 p
@@ -74,49 +52,54 @@ terr 0,2 1
 terr 6,0 1
 || target ships
 | frg far away
-edit s 0 t frg L -12,0 O 2
+build s -12,0 frg
+edit s 0 O 2
 | sub at sea and in port
-edit s 10 t sb L 2,2 O 2 U 11 L 6,0
+edit s 0 U 10 t sb L 2,2 U 11 L 6,0
 edit s 10 U 12 m 5 E 100 M 127 U 13 L 6,0
 | cs at sea and in port
-edit s 20 t cs L 2,2 O 2 l 100 h 100 U 21 L 6,0
+edit s 0 U 20 t cs L 2,2 O 2 l 100 h 100 U 21 L 6,0
 edit s 20 U 22 m 5 E 100 M 127 U 23 L 6,0 U 24
 retreat 11/13/23 j idh
 retreat 10/12/22 n dh
 || target lands
 | spy in target harbor
-edit u 0 T spy L 2,2 O 2 e 100 M 127
+build l 2,2 spy
+edit u 0 e 100 M 127
 | spy on target subs
 edit u 0 U 10 S 10 U 11 S 11 U 12 S 12 U 13 S 13
 | rad on target cs
-edit u 20 T rad O 2 e 100 M 127 m 10 S 20 U 21 S 21 U 22 S 22 U 23 S 23
+edit u 0 U 20 T rad m 10 S 20 U 21 S 21 U 22 S 22 U 23 S 23
 | train on weak target bridge
-edit u 30 T tra L 1,3 O 2 e 100 m 10 l 100 h 100 M 127 U 32 L 2,2
+edit u 0 U 30 T tra L 1,3 m 10 l 100 h 100 U 32 L 2,2
 | tra in target harbor
-edit u 31 T rad O 2 e 100 M 127 m 10 Y 30 U 33 Y 32
+edit u 0 U 31 T rad m 10 Y 30 U 33 Y 32
 || target planes
 | sam & jhb in target harbor, jhb ob weak target bridge
-edit p 0 T sam l 2,2 O 2 e 100 m 127
-edit p 1 T jhb l 2,2 O 2 e 100 m 127 U 2 l 1,3
+build p 2,2 sam
+edit p 0 e 100 m 127
+build p 2,2 jhb
+edit p 1 e 100 m 127 U 2 l 1,3
 | sam in target cs and rad
 edit p 0 U 20 s 20 U 21 s 21 U 22 s 22 U 23 s 23
 edit p 0 U 25 y 20 U 26 y 21 U 27 y 22 U 28 y 23
 edit p 0 U 30 y 30 U 31 y 31 U 32 y 32 U 33 y 33
 || target nukes in target harbor and on target jhb
-edit n 0 t 10kt L 2,2 O 2 U 1 p 1 U 2 p 2
+build n 2,2 10kt
+edit n 0 U 1 p 1 U 2 p 2
 || firing ships
 | bb range >=3, 59% 60% 100%
-edit s 1 t bb T 150 L 3,1 O 1 E 59 M 127 m 13 g 10 s 200 U 2 E 60 U 3 E 100
+edit s 0 U 1 t bb T 150 L 3,1 O 1 E 59 M 127 m 13 g 10 s 200 U 2 E 60 U 3 E 100
 | cs
-edit s 9 t cs L 3,1 O 1 E 100 M 127 m 10 g 10 s 10
+edit s 0 U 9 t cs L 3,1 O 1 E 100 M 127 m 10 g 10 s 10
 | dd range 1.5
-edit s 5 t dd T 100 L 8,0 O 1 E 100 M 127 m 5 g 4 s 40
+edit s 0 U 5 t dd T 100 L 8,0 O 1 E 100 M 127 m 5 g 4 s 40
 edit s 5 U 6 L 3,3
 || firing lands
 | hat range 3.5 39% 40% 100%
-edit u 1 T hat t 160 L 3,1 O 1 e 39 M 127 m 10 g 12 s 80 U 2 e 40 U 3 e 100
+edit u 0 U 1 T hat t 160 L 3,1 O 1 e 39 m 10 g 12 s 80 U 2 e 40 U 3 e 100
 | tra
-edit u 9 T tra L 3,1 O 1 e 100 m 10 g 10 s 10
+edit u 0 U 9 T tra L 3,1 O 1 M 0 m 10 g 10 s 10
 | note: no mob in train to avoid unwanted supply
 || show initial state here to help maintainers
 map *