tests/fire: Give all land unit targets SAM cargo

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

diff --git a/tests/fire/final.xdump b/tests/fire/final.xdump
index 20f78b88393a5fa428a35ce35d3f7fb401ccf3a9..ebdd4368eb71193f5af9543bbed6d6c3f905e832 100644 (file)
--- a/tests/fire/final.xdump
+++ b/tests/fire/final.xdump
@@ -337,10 +337,10 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range
 22 2 2 2 27 100 127 0 180 0 0 none 0 "" 2 0 22 -1 () 0 0.00000
 23 2 8 0 27 100 127 0 180 0 0 none 0 "" 2 0 23 -1 () 0 0.00000
 24 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-25 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-26 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-27 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
-28 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
+25 0 2 2 27 0 127 0 180 0 0 none 0 "" 2 0 -1 -1 () 0 0.00000
+26 0 6 0 27 0 127 0 180 0 0 none 0 "" 2 0 -1 -1 () 0 0.00000
+27 2 2 2 27 100 127 0 180 0 0 none 0 "" 2 0 -1 22 () 0 0.00000
+28 2 8 0 27 100 127 0 180 0 0 none 0 "" 2 0 -1 23 () 0 0.00000
 29 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
 30 0 1 3 27 0 127 0 180 0 0 none 0 "" 2 0 -1 -1 () 0 0.00000
 31 0 1 3 27 0 127 0 180 0 0 none 0 "" 2 0 -1 -1 () 0 0.00000
@@ -612,9 +612,11 @@ timestamp owner type id x y
 0 2 1 21 6 0
 0 2 2 21 6 0
 0 2 3 21 6 0
+0 2 2 26 6 0
 0 2 1 20 2 2
 0 2 2 20 2 2
 0 2 3 20 2 2
+0 2 2 25 2 2
 0 2 1 11 6 0
 0 2 3 11 6 0
 0 2 1 10 2 2

diff --git a/tests/fire/journal.log b/tests/fire/journal.log
index 2b529e8b21d1fdfa115c7c3009952777d269919c..7c4073446ab76a16b227709452e3485920fa5109 100644 (file)
--- a/tests/fire/journal.log
+++ b/tests/fire/journal.log
@@ -474,7 +474,7 @@
     Play#0 output Play#0 1 own    # unit type          x,y    a   eff mil frt  mu  fd tch retr xl ln carry
     Play#0 output Play#0 1   1    1 hat  hvy artill    3,1        39%  10   0 127   0 160   0%  0  0
     Play#0 output Play#0 1   1    2 hat  hvy artill    3,1        40%  10   0 127   0 160   0%  0  0
-    Play#0 output Play#0 1   2   22 rad  radar unit    2,2        97%  10   0 124   0 270   0%  0  0   22S
+    Play#0 output Play#0 1   2   22 rad  radar unit    2,2        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 5 units
@@ -955,7 +955,7 @@
     Play#0 output Play#0 1 own    # unit type          x,y    a   eff mil frt  mu  fd tch retr xl ln carry
     Play#0 output Play#0 1   1    1 hat  hvy artill    3,1        39%  10   0 127   0 160   0%  0  0
     Play#0 output Play#0 1   1    2 hat  hvy artill    3,1        40%  10   0 127   0 160   0%  0  0
-    Play#0 output Play#0 1   2   22 rad  radar unit    2,2        97%  10   0 124   0 270   0%  0  0   22S
+    Play#0 output Play#0 1   2   22 rad  radar unit    2,2        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 5 units
@@ -1345,7 +1345,7 @@
     Play#0 output Play#0 1 own    # unit type          x,y    a   eff mil frt  mu  fd tch retr xl ln carry
     Play#0 output Play#0 1   1    1 hat  hvy artill    3,1        39%  10   0 127   0 160   0%  0  0
     Play#0 output Play#0 1   1    2 hat  hvy artill    3,1        40%  10   0 127   0 160   0%  0  0
-    Play#0 output Play#0 1   2   22 rad  radar unit    2,2        97%  10   0 124   0 270   0%  0  0   22S
+    Play#0 output Play#0 1   2   22 rad  radar unit    2,2        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 5 units
@@ -1420,6 +1420,7 @@
     Play#0 output Play#0 1     cs   cargo ship (#21) sunk!
     Play#0 output Play#0 1 sam  Sea Sparrow #21 lost!
     Play#0 output Play#0 1 rad  radar unit #21 lost!
+    Play#0 output Play#0 1 sam  Sea Sparrow #26 lost!
     Play#0 output Play#0 1 Country #1 shelled cs   cargo ship (#22) in 2,2 for 0 damage.
     Play#0 output Play#0 1 cs   cargo ship (#22) was fired upon with no one able to defend it, and retreated to 3,3
     Play#0 output Play#0 1 Country #1 shelled cs   cargo ship (#22) in 2,2 for 4 damage.
@@ -1433,6 +1434,7 @@
     Play#0 output Play#0 1     cs   cargo ship (#20) sunk!
     Play#0 output Play#0 1 sam  Sea Sparrow #20 lost!
     Play#0 output Play#0 1 rad  radar unit #20 lost!
+    Play#0 output Play#0 1 sam  Sea Sparrow #25 lost!
     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.

diff --git a/tests/fire/setup-POGO b/tests/fire/setup-POGO
index 21b08c68b584006da682f730418c4ba9d49dc540..dfc54cf26eb6692fe09d96c6b928d70bb81258ae 100644 (file)
--- a/tests/fire/setup-POGO
+++ b/tests/fire/setup-POGO
@@ -100,6 +100,7 @@ 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
 | 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