tests/fire: Drop test of falling bridges

Now covered in tests/bridgefall.  Damage perturbed, because deleting
the bridges from the setup makes defend() roll fewer dice.

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

diff --git a/tests/fire/01-sector-1 b/tests/fire/01-sector-1
index faf73284cfa6ee4b8a812fa95a9b9ede572c78ed..69162b0e9a7f1ac7b72a91b0cbe379199ddb4bfc 100644 (file)
--- a/tests/fire/01-sector-1
+++ b/tests/fire/01-sector-1
@@ -65,9 +65,8 @@ fire se 0,0 -2,-2
 fire se 2,0 -2,-2
 fire se 4,0 -2,-2
 | at bridge, one splash
-fire se 0,0 4,2
-fire se 2,0 4,2
-fire se 4,0 1,3
+| firing at bridges is covered in bridgefall-test
+__cmd added -3 -3 0
 | at harbor with stuff
 fire se 0,0 2,2
 fire se 2,0 2,2

diff --git a/tests/fire/final.xdump b/tests/fire/final.xdump
index eaffaf7b4a7133bc22f95543803fd23d22d2a153..d46f6c8f9d98c660969ab918ab080d2e99ea305b 100644 (file)
--- a/tests/fire/final.xdump
+++ b/tests/fire/final.xdump
@@ -1,8 +1,8 @@
 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 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
+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 16 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 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 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 83 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
 0 8 0 0 0 0 0 0 0 0 0 0 0 8 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
 0 10 0 0 0 0 0 0 0 0 0 0 0 10 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
@@ -32,9 +32,9 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 0 -5 1 0 0 0 0 0 0 0 0 0 0 -5 1 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
 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 healthy 0 0 0 0 0 0 0 0
 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 healthy 0 0 0 0 0 0 0 0
-2 0 2 24 2 2 0 0 0 0 0 0 0 0 2 1 0 0 1 24 0 0 0 0 0 2 12 0 0 0 0 0 0 0 0 0 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 healthy 0 0 0 0 0 1 1 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 healthy 0 0 0 0 0 86 86 86
-2 4 2 28 98 125 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 healthy 0 0 0 0 0 98 98 98
+2 0 2 24 1 1 0 0 0 0 0 0 0 0 2 2 0 0 1 24 0 0 0 0 0 2 13 0 0 0 0 0 0 0 0 0 2 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 healthy 0 0 0 0 0 1 1 1
+2 2 2 12 86 0 0 0 0 0 0 0 0 2 2 87 0 0 1 12 0 0 0 0 0 2 86 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 healthy 0 0 0 0 0 86 86 86
+0 4 2 0 100 0 0 0 0 0 0 0 0 4 2 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
 0 6 2 0 0 0 0 0 0 0 0 0 0 6 2 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
 0 8 2 0 0 0 0 0 0 0 0 0 0 8 2 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
 0 10 2 0 0 0 0 0 0 0 0 0 0 10 2 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
@@ -48,7 +48,7 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
 0 -6 2 0 0 0 0 0 0 0 0 0 0 -6 2 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
 0 -4 2 0 0 0 0 0 0 0 0 0 0 -4 2 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
 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 healthy 0 0 0 0 0 100 100 100
-0 1 3 0 0 0 0 0 0 0 0 0 0 1 3 78 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 78 78 78
+0 1 3 0 0 0 0 0 0 0 0 0 0 1 3 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
 0 3 3 0 0 0 0 0 0 0 0 0 0 3 3 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
 0 5 3 0 0 0 0 0 0 0 0 0 0 5 3 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
 0 7 3 0 0 0 0 0 0 0 0 0 0 7 3 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
@@ -271,8 +271,8 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet xstar
 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 "" 9 "" -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 "" 10 "" -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 "" 11 "" -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 "" 12 "" -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 "" 13 "" -12 0 0 () ""
+12 2 3 3 18 68 61 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 3 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 12 "" -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 3 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 0 "" 13 "" -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 () ""
@@ -281,9 +281,9 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet xstar
 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 -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 "" 20 "" -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 "" 21 "" -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 "" 22 "" -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 "" 23 "" -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 "" 24 "" -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 58 59 0 0 healthy 0 0 0 "" 22 "" -12 0 0 () ""
+23 2 8 0 2 78 86 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 "" 23 "" -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 2 0 0 0 0 0 0 0 0 32 32 0 0 healthy 0 0 0 "" 24 "" -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 () ""
@@ -385,7 +385,7 @@ 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 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
+20 0 2 2 21 0 124 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
 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
@@ -397,8 +397,8 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h
 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 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
 31 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
-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
+32 2 2 2 7 94 119 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 9 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
@@ -473,7 +473,7 @@ config news
 actor action victim times duration time
 1 10 0 4 0 0
 1 10 1 6 0 0
-1 10 2 22 0 0
+1 10 2 19 0 0
 1 11 1 2 0 0
 1 11 2 11 0 0
 /config
@@ -590,7 +590,6 @@ uid owner type amount price maxbidder markettime xbuy ybuy xsell ysell
 /config
 config lost
 timestamp owner type id x y
-0 2 0 0 1 3
 0 2 3 0 2 2
 0 2 3 10 2 2
 0 2 3 12 2 2

diff --git a/tests/fire/journal.log b/tests/fire/journal.log
index 854fced9ec7113151b40cd5556dd1934fbf548b9..0c080e15f03f6e7def5f93ba26a2f4fae8c5ce7c 100644 (file)
--- a/tests/fire/journal.log
+++ b/tests/fire/journal.log
@@ -206,26 +206,8 @@
     Play#1 output Play#1 1 \007Kaboom!!!
     Play#1 output Play#1 1 Shells hit sector -2,-2 for 43 damage.
     Play#1 output Play#1 6 0 610
-    Play#1 input fire se 0,0 4,2
-    Play#1 command fire
-    Play#1 output Play#1 1 Sector 0,0 ready to fire
-    Play#1 output Play#1 1 range is 3.00 (3.50)
-    Play#1 output Play#1 1 \007Kaboom!!!
-    Play#1 output Play#1 1 Shells hit sector 4,2 for 0 damage.
-    Play#1 output Play#1 6 0 609
-    Play#1 input fire se 2,0 4,2
-    Play#1 command fire
-    Play#1 output Play#1 1 Sector 2,0 ready to fire
-    Play#1 output Play#1 1 range is 5.00 (4.50)
-    Play#1 output Play#1 1 \007Kaboom!!!
-    Play#1 output Play#1 1 Shells hit sector 4,2 for 3 damage.
-    Play#1 output Play#1 6 0 608
-    Play#1 input fire se 4,0 1,3
-    Play#1 command fire
-    Play#1 output Play#1 1 Sector 4,0 ready to fire
-    Play#1 output Play#1 1 range is 5.00 (4.50)
-    Play#1 output Play#1 1 \007Kaboom!!!
-    Play#1 output Play#1 1 Shells hit sector 1,3 for 29 damage.
+    Play#1 input __cmd added -3 -3 0
+    Play#1 command __cmd
     Play#1 output Play#1 6 0 607
     Play#1 input fire se 0,0 2,2
     Play#1 command fire
@@ -331,9 +313,9 @@
     Play#1 output Play#1 1   sect      sgpidbolhr sgpidbolhr  sh gun  pet iron dust bar  oil  lcm  hcm rad
     Play#1 output Play#1 1   -4,0    + .......... ..........   1   1    0    0    0   0    0    0    0   0
     Play#1 output Play#1 1   -2,0    f .......... ..........   1   1    0    0    0   0    0    0    0   0
-    Play#1 output Play#1 1    0,0    f .......... ..........  15   1    0    0    0   0    0    0    0   0
-    Play#1 output Play#1 1    2,0    f .......... ..........  74   1    0    0    0   0    0    0    0   0
-    Play#1 output Play#1 1    4,0    f .......... ..........  82   7    0    0    0   0    0    0    0   0
+    Play#1 output Play#1 1    0,0    f .......... ..........  16   1    0    0    0   0    0    0    0   0
+    Play#1 output Play#1 1    2,0    f .......... ..........  75   1    0    0    0   0    0    0    0   0
+    Play#1 output Play#1 1    4,0    f .......... ..........  83   7    0    0    0   0    0    0    0   0
     Play#1 output Play#1 1 5 sectors
     Play#1 output Play#1 6 0 595
     Play#1 input ctld
@@ -367,10 +349,8 @@
     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 .. ..     1000    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%     125 .. ..       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 1   2    2,2    h   86%       0 .. ..       86    0    0    0   0%   87    0   1
+    Play#0 output Play#0 1 6 sectors
     Play#0 output Play#0 6 0 640
     Play#0 input comm * ?terr=1
     Play#0 command commodity
@@ -383,9 +363,7 @@
     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 1 6 sectors
     Play#0 output Play#0 6 0 640
     Play#0 input sinf * ?terr=1
     Play#0 command sinfrastructure
@@ -397,10 +375,8 @@
     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 1   2    2,2    h   86%   86% 0.052   yes 0.052   86%  1.43
+    Play#0 output Play#0 1 6 sectors
     Play#0 output Play#0 6 0 640
     Play#0 input ship * ?eff<100
     Play#0 command ship
@@ -412,7 +388,7 @@
     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     3,3        58%   0   3   0   0  0  0  1  1  65   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   23 cs   cargo ship     8,0        78%   0   4   0   0  0  0  1  1  86   20
     Play#0 output Play#0 1 8 ships
     Play#0 output Play#0 6 0 640
     Play#0 input carg * ?eff<100
@@ -424,7 +400,7 @@
     Play#0 output Play#0 1    9 cs      3,1       98%   0  10   0  10   9   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      3,3       58%   0   3   0   0   0   0   0   0   0   0  59  58   0
+    Play#0 output Play#0 1   22 cs      3,3       58%   0   3   0   0   0   0   0   0   0   0  58  59   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 8 ships
     Play#0 output Play#0 6 0 640
@@ -439,8 +415,8 @@
     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   2   32 tra  train         2,2        94%  10   0 119   0  40  42%  1  1
+    Play#0 output Play#0 1   2   33 rad  radar unit    2,2        97%   9   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
@@ -450,7 +426,7 @@
     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     3,3        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   33 rad     2,2        97%   0   9   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 *
@@ -874,11 +850,9 @@
     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 .. ..       72    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%     125 .. ..       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 1   2    0,2    +    7%       9 .. ..       72    0    0    0   0%    7    0   1
+    Play#0 output Play#0 1   2    2,2    h   86%       0 .. ..       86    0    0    0   0%   87    0   1
+    Play#0 output Play#0 1 6 sectors
     Play#0 output Play#0 6 0 640
     Play#0 input comm * ?terr=1
     Play#0 command commodity
@@ -891,9 +865,7 @@
     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 1 6 sectors
     Play#0 output Play#0 6 0 640
     Play#0 input sinf * ?terr=1
     Play#0 command sinfrastructure
@@ -905,10 +877,8 @@
     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 1   2    2,2    h   86%   86% 0.052   yes 0.052   86%  1.43
+    Play#0 output Play#0 1 6 sectors
     Play#0 output Play#0 6 0 640
     Play#0 input ship * ?eff<100
     Play#0 command ship
@@ -917,11 +887,11 @@
     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   1    9 cs   cargo ship     3,1        98%   0  10   0   0  0  0  0  0 124   20
-    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   12 sb   submarine      3,3        68%   0   3   0   0  0  0  0  0  61   60
+    Play#0 output Play#0 1   2   13 sb   submarine      8,0        72%   0   3   0   0  0  0  0  1  67   60
     Play#0 output Play#0 1   2   22 cs   cargo ship     3,3        58%   0   3   0   0  0  0  1  1  65   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   2   23 cs   cargo ship     8,0        78%   0   4   0   0  0  0  1  1  86   20
+    Play#0 output Play#0 1   2   24 cs   cargo ship     6,0        32%   0   2   0   0  0  0  0  0  40   20
     Play#0 output Play#0 1 9 ships
     Play#0 output Play#0 6 0 640
     Play#0 input carg * ?eff<100
@@ -931,11 +901,11 @@
     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    9 cs      3,1       98%   0  10   0  10   9   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      3,3       58%   0   3   0   0   0   0   0   0   0   0  59  58   0
+    Play#0 output Play#0 1   12 sb      3,3       68%   0   3   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   13 sb      8,0       72%   0   3   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   22 cs      3,3       58%   0   3   0   0   0   0   0   0   0   0  58  59   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   24 cs      6,0       32%   0   2   0   0   0   0   0   0   0   0  32  32   0
     Play#0 output Play#0 1 9 ships
     Play#0 output Play#0 6 0 640
     Play#0 input plane * ?eff<100
@@ -949,8 +919,8 @@
     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   2   32 tra  train         2,2        94%  10   0 119   0  40  42%  1  1
+    Play#0 output Play#0 1   2   33 rad  radar unit    2,2        97%   9   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
@@ -960,7 +930,7 @@
     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     3,3        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   33 rad     2,2        97%   0   9   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 *
@@ -1283,11 +1253,9 @@
     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    +    2%       2 .. ..       12    0    0    0   0%    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%     125 .. ..       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 1   2    0,2    +    1%       1 .. ..       13    0    0    0   0%    2    0   1
+    Play#0 output Play#0 1   2    2,2    h   86%       0 .. ..       86    0    0    0   0%   87    0   1
+    Play#0 output Play#0 1 6 sectors
     Play#0 output Play#0 6 0 640
     Play#0 input comm * ?terr=1
     Play#0 command commodity
@@ -1298,11 +1266,9 @@
     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    1    1   0
+    Play#0 output Play#0 1   2   0,2    + .......... ..........   0   0    0    0    0   0    0    2    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 1 6 sectors
     Play#0 output Play#0 6 0 640
     Play#0 input sinf * ?terr=1
     Play#0 command sinfrastructure
@@ -1313,11 +1279,9 @@
     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    +    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 1   2    0,2    +    1%    1% 0.392    no  N/A     1%  1.00
+    Play#0 output Play#0 1   2    2,2    h   86%   86% 0.052    no  N/A    86%  1.43
+    Play#0 output Play#0 1 6 sectors
     Play#0 output Play#0 6 0 640
     Play#0 input ship * ?eff<100
     Play#0 command ship
@@ -1326,11 +1290,11 @@
     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   1    9 cs   cargo ship     3,1        98%   0  10   0   0  0  0  0  0 124   20
-    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   12 sb   submarine      3,3        68%   0   3   0   0  0  0  0  0  61   60
+    Play#0 output Play#0 1   2   13 sb   submarine      8,0        72%   0   3   0   0  0  0  0  1  67   60
     Play#0 output Play#0 1   2   22 cs   cargo ship     3,3        58%   0   3   0   0  0  0  1  1  65   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   2   23 cs   cargo ship     8,0        78%   0   4   0   0  0  0  1  1  86   20
+    Play#0 output Play#0 1   2   24 cs   cargo ship     6,0        32%   0   2   0   0  0  0  0  0  40   20
     Play#0 output Play#0 1 9 ships
     Play#0 output Play#0 6 0 640
     Play#0 input carg * ?eff<100
@@ -1340,11 +1304,11 @@
     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    9 cs      3,1       98%   0  10   0  10   9   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      3,3       58%   0   3   0   0   0   0   0   0   0   0  59  58   0
+    Play#0 output Play#0 1   12 sb      3,3       68%   0   3   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   13 sb      8,0       72%   0   3   0   0   0   0   0   0   0   0   0   0   0
+    Play#0 output Play#0 1   22 cs      3,3       58%   0   3   0   0   0   0   0   0   0   0  58  59   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   24 cs      6,0       32%   0   2   0   0   0   0   0   0   0   0  32  32   0
     Play#0 output Play#0 1 9 ships
     Play#0 output Play#0 6 0 640
     Play#0 input plane * ?eff<100
@@ -1358,8 +1322,8 @@
     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   2   32 tra  train         2,2        94%  10   0 119   0  40  42%  1  1
+    Play#0 output Play#0 1   2   33 rad  radar unit    2,2        97%   9   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
@@ -1369,7 +1333,7 @@
     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     3,3        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   33 rad     2,2        97%   0   9   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 *
@@ -1394,10 +1358,6 @@
     Play#0 command read
     Play#0 output Play#0 1
     Play#0 output Play#0 1 > BULLETIN from POGO, (#0)  dated Thu Jan  1 00:00:00 1970
-    Play#0 output Play#0 1 Country #1 shelled sector 4,2 for 0 damage.
-    Play#0 output Play#0 1 Country #1 shelled sector 4,2 for 3 damage.
-    Play#0 output Play#0 1 Country #1 shelled sector 1,3 for 29 damage.
-    Play#0 output Play#0 1 Crumble... SCREEEECH!  Splash! Bridge falls at 1,3!
     Play#0 output Play#0 1 Country #1 shelled sector 2,2 for 0 damage.
     Play#0 output Play#0 1 Country #1 shelled sector 2,2 for 5 damage.
     Play#0 output Play#0 1     spy  infiltrator #0 takes 1
@@ -1439,10 +1399,8 @@
     Play#0 output Play#0 1 Country #1 shelled sector 0,2 for 14 damage.
     Play#0 output Play#0 1 Country #1 shelled sector 0,2 for 25 damage.
     Play#0 output Play#0 1 Country #1 shelled sector 0,2 for 32 damage.
-    Play#0 output Play#0 1 1 bb   battleship (#3) sighted at 5,1
     Play#0 output Play#0 1 Country #1 shelled sector 0,2 for 21 damage.
     Play#0 output Play#0 1 1 bb   battleship (#3) sighted at 3,1
-    Play#0 output Play#0 1 1 bb   battleship (#3) sighted at 5,1
     Play#0 output Play#0 1 Country #1 shelled sector 0,2 for 50 damage.
     Play#0 output Play#0 1 1 bb   battleship (#3) sighted at 3,1
     Play#0 output Play#0 1 Country #1 shelled sector 0,2 for 12 damage.

diff --git a/tests/fire/setup-POGO b/tests/fire/setup-POGO
index 4a5bda0949c356d96bbaca66e22df13476445d07..a662a605d61739946cb736fb38ee71c7caa4b016 100644 (file)
--- a/tests/fire/setup-POGO
+++ b/tests/fire/setup-POGO
@@ -1,7 +1,5 @@
 || an island
 des @0,0:2 +
-build b 2,2 j
-build b 2,2 b
 edit l 4,2 e 100
 give c * ?des#. 100
 || country#1
@@ -19,7 +17,7 @@ give g 4,0 6
 give s 2:4,0 99
 edit c 1 c 1,-1 s 4 b 640 M 25000 T 100
 || country#2
-| target harbor, highways, a strong bridge, a weak bridge
+| target harbor, highways
 des 2,2 h
 add 2 2 2 p
 edit l -2:4,2:3 ?des#. o 2 O 2
@@ -48,8 +46,6 @@ 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