tests/fire: Add another salvo at own ship

The existing one does no damage.  Add one that does.

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

diff --git a/tests/fire/01-1 b/tests/fire/01-1
index 212b40df34f3ebd0c25e3bde170c91b61d371595..faf73284cfa6ee4b8a812fa95a9b9ede572c78ed 100644 (file)
--- a/tests/fire/01-1
+++ b/tests/fire/01-1
@@ -74,6 +74,8 @@ fire se 2,0 2,2
 fire se 4,0 2,2
 | at own cs
 fire se 0,0 9
+fire se 2,0 9
+__cmd added 1 1 0
 | at cs at sea, one retreat, one sinking
 fire se 0,0 23
 fire se 2,0 23

diff --git a/tests/fire/final.xdump b/tests/fire/final.xdump
index 6a3faaf499859e549bfd2f96b0d6825b2ff21593..20f78b88393a5fa428a35ce35d3f7fb401ccf3a9 100644 (file)
--- a/tests/fire/final.xdump
+++ b/tests/fire/final.xdump
@@ -1,7 +1,7 @@
 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 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 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
 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
@@ -268,7 +268,7 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet xstar
 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 () ""
 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 100 127 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 10 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 () ""
@@ -474,7 +474,7 @@ 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 11 1 1 0 0
+1 11 1 2 0 0
 1 11 2 11 0 0
 /config
 config treaty

diff --git a/tests/fire/journal.log b/tests/fire/journal.log
index 5e89ed219669136b0c7d0865bf3d604ba1a85d15..2b529e8b21d1fdfa115c7c3009952777d269919c 100644 (file)
--- a/tests/fire/journal.log
+++ b/tests/fire/journal.log
@@ -281,6 +281,19 @@
     Play#1 output Play#1 1 Shells hit cs   cargo ship (#9) in 3,1 for 0 damage.
     Play#1 output Play#1 1 You have a new telegram waiting ...
     Play#1 output Play#1 6 0 603
+    Play#1 input fire se 2,0 9
+    Play#1 command fire
+    Play#1 output Play#1 1
+    Play#1 output Play#1 1 Sector 2,0 firing
+    Play#1 output Play#1 1 range is 4.00 (4.50)
+    Play#1 output Play#1 1 \007Kaboom!!!
+    Play#1 output Play#1 1 Shells hit cs   cargo ship (#9) in 3,1 for 3 damage.
+    Play#1 output Play#1 1     cs   cargo ship (#9) takes 2
+    Play#1 output Play#1 1 You have a new telegram waiting ...
+    Play#1 output Play#1 6 0 602
+    Play#1 input __cmd added 1 1 0
+    Play#1 command __cmd
+    Play#1 output Play#1 6 0 603
     Play#1 input fire se 0,0 23
     Play#1 command fire
     Play#1 output Play#1 1
@@ -355,7 +368,7 @@
     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 .......... ..........  75   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 5 sectors
     Play#1 output Play#1 6 0 595
@@ -431,11 +444,12 @@
     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   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   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 1 8 ships
     Play#0 output Play#0 6 0 640
     Play#0 input carg * ?eff<100
     Play#0 command cargo
@@ -443,11 +457,12 @@
     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    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      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 1 8 ships
     Play#0 output Play#0 6 0 640
     Play#0 input plane * ?eff<100
     Play#0 command plane
@@ -510,7 +525,7 @@
     Play#1 output Play#1 1    3 bb   battleship     3,1       100%   0  13   0   0  0  0  0  0 127  150
     Play#1 output Play#1 1    5 dd   destroyer      8,0       100%   0   5   0   0  0  0  0  0 127  100
     Play#1 output Play#1 1    6 dd   destroyer      3,3       100%   0   5   0   0  0  0  0  0 127  100
-    Play#1 output Play#1 1    9 cs   cargo ship     3,1       100%   0  10   0   0  0  0  0  0 127   20
+    Play#1 output Play#1 1    9 cs   cargo ship     3,1        98%   0  10   0   0  0  0  0  0 124   20
     Play#1 output Play#1 1 6 ships
     Play#1 output Play#1 6 0 595
     Play#1 input carg * ?shell>0
@@ -521,7 +536,7 @@
     Play#1 output Play#1 1    3 bb      3,1      100%   0  13   0 200  10   0   0   0   0   0   0   0   0
     Play#1 output Play#1 1    5 dd      8,0      100%   0   5   0  40   4   0   0   0   0   0   0   0   0
     Play#1 output Play#1 1    6 dd      3,3      100%   0   5   0  40   4   0   0   0   0   0   0   0   0
-    Play#1 output Play#1 1    9 cs      3,1      100%   0  10   0  10  10   0   0   0   0   0   0   0   0
+    Play#1 output Play#1 1    9 cs      3,1       98%   0  10   0  10   9   0   0   0   0   0   0   0   0
     Play#1 output Play#1 1 6 ships
     Play#1 output Play#1 6 0 595
     Play#1 input fire sh 666 6,0
@@ -833,7 +848,7 @@
     Play#1 output Play#1 1    3 bb      3,1      100%   0  13   0 162  10   0   0   0   0   0   0   0   0
     Play#1 output Play#1 1    5 dd     10,0      100%   0   5   0  24   4   0   0   0   0   0   0   0   0
     Play#1 output Play#1 1    6 dd      3,3      100%   0   5   0  36   4   0   0   0   0   0   0   0   0
-    Play#1 output Play#1 1    9 cs      3,1      100%   0  10   0  10  10   0   0   0   0   0   0   0   0
+    Play#1 output Play#1 1    9 cs      3,1       98%   0  10   0  10   9   0   0   0   0   0   0   0   0
     Play#1 output Play#1 1 6 ships
     Play#1 output Play#1 6 0 538
     Play#1 input ctld
@@ -908,12 +923,13 @@
     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   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   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 1 9 ships
     Play#0 output Play#0 6 0 640
     Play#0 input carg * ?eff<100
     Play#0 command cargo
@@ -921,12 +937,13 @@
     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    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      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 1 9 ships
     Play#0 output Play#0 6 0 640
     Play#0 input plane * ?eff<100
     Play#0 command plane
@@ -1296,12 +1313,13 @@
     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   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   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 1 9 ships
     Play#0 output Play#0 6 0 640
     Play#0 input carg * ?eff<100
     Play#0 command cargo
@@ -1309,12 +1327,13 @@
     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    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      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 1 9 ships
     Play#0 output Play#0 6 0 640
     Play#0 input plane * ?eff<100
     Play#0 command plane
@@ -1360,6 +1379,7 @@
     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 cs   cargo ship (#9) in 3,1 for 0 damage.
+    Play#0 output Play#0 1 Country #1 shelled cs   cargo ship (#9) in 3,1 for 3 damage.
     Play#0 output Play#0 6 0 640
     Play#0 input read 2
     Play#0 command read