tests/fire: Cover firing with foreign assets

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

diff --git a/tests/fire/01-sector-1 b/tests/fire/01-sector-1
index 689af2de192fa68f0715188109eaa309ef6226c9..a85cc464cf896869bf5c6db70fdb518ab735c188 100644 (file)
--- a/tests/fire/01-sector-1
+++ b/tests/fire/01-sector-1
@@ -8,6 +8,9 @@ comm * ?shell>0
 || fort not firing
 | nonexistant sector
 fire se 1,0 6,0
 || fort not firing
 | nonexistant sector
 fire se 1,0 6,0

+| foreign sector
+fire se 2,2 6,0
+__cmd added 1 1 0

 | 100% highway
 fire se -4,0 6,0
 | 4% fort
 | 100% highway
 fire se -4,0 6,0
 | 4% fort

diff --git a/tests/fire/03-ship-1 b/tests/fire/03-ship-1
index 128fc121aa5686bb2c1377800f5e542f44130295..095af0c87eca2ee88f3abc64d46d7b29cc788630 100644 (file)
--- a/tests/fire/03-ship-1
+++ b/tests/fire/03-ship-1
@@ -8,6 +8,9 @@ carg * ?shell>0
 || ship not firing
 | nonexistant ship
 fire sh 666 6,0
 || ship not firing
 | nonexistant ship
 fire sh 666 6,0

+| foreign ship
+fire sh 11 6,0
+__cmd added 1 1 0

 | 100% cs
 fire sh 9 6,0
 | 59% bb
 | 100% cs
 fire sh 9 6,0
 | 59% bb

diff --git a/tests/fire/05-land-1 b/tests/fire/05-land-1
index a99c8a5fe61ad9432c3526ca599d049480b144c7..17c995335d6455b2575f42ea1713c8b1acef284f 100644 (file)
--- a/tests/fire/05-land-1
+++ b/tests/fire/05-land-1
@@ -8,7 +8,10 @@ lcarg * ?shell>0
 || land not firing
 | nonexistant land
 fire la 666 6,0
 || land not firing
 | nonexistant land
 fire la 666 6,0

-| 100% tra
+| foreign land
+fire la 13 6,0
+__cmd added 1 1 0
+| 100% sup

 fire la 9 6,0
 | 39% hat
 fire la 1 6,0
 fire la 9 6,0
 | 39% hat
 fire la 1 6,0

diff --git a/tests/fire/journal.log b/tests/fire/journal.log
index 3de19ac5ac68bc22e172d74314514638109fce2c..225171b9354c2d8a89da0c519f521232aa96cc74 100644 (file)
--- a/tests/fire/journal.log
+++ b/tests/fire/journal.log
@@ -47,6 +47,12 @@
     Play#1 input fire se 1,0 6,0
     Play#1 command fire
     Play#1 output Play#1 6 0 639
     Play#1 input fire se 1,0 6,0
     Play#1 command fire
     Play#1 output Play#1 6 0 639

+    Play#1 input fire se 2,2 6,0
+    Play#1 command fire
+    Play#1 output Play#1 6 0 638
+    Play#1 input __cmd added 1 1 0
+    Play#1 command __cmd
+    Play#1 output Play#1 6 0 639

     Play#1 input fire se -4,0 6,0
     Play#1 command fire
     Play#1 output Play#1 6 0 638
     Play#1 input fire se -4,0 6,0
     Play#1 command fire
     Play#1 output Play#1 6 0 638


@@ -492,6 +498,12 @@
     Play#1 input fire sh 666 6,0
     Play#1 command fire
     Play#1 output Play#1 6 0 594
     Play#1 input fire sh 666 6,0
     Play#1 command fire
     Play#1 output Play#1 6 0 594

+    Play#1 input fire sh 11 6,0
+    Play#1 command fire
+    Play#1 output Play#1 6 0 593
+    Play#1 input __cmd added 1 1 0
+    Play#1 command __cmd
+    Play#1 output Play#1 6 0 594

     Play#1 input fire sh 9 6,0
     Play#1 command fire
     Play#1 output Play#1 1 Ships 9 cannot fire guns!
     Play#1 input fire sh 9 6,0
     Play#1 command fire
     Play#1 output Play#1 1 Ships 9 cannot fire guns!


@@ -1001,6 +1013,12 @@
     Play#1 input fire la 666 6,0
     Play#1 command fire
     Play#1 output Play#1 6 0 537
     Play#1 input fire la 666 6,0
     Play#1 command fire
     Play#1 output Play#1 6 0 537

+    Play#1 input fire la 13 6,0
+    Play#1 command fire
+    Play#1 output Play#1 6 0 536
+    Play#1 input __cmd added 1 1 0
+    Play#1 command __cmd
+    Play#1 output Play#1 6 0 537

     Play#1 input fire la 9 6,0
     Play#1 command fire
     Play#1 output Play#1 1 Unit 9 cannot fire!
     Play#1 input fire la 9 6,0
     Play#1 command fire
     Play#1 output Play#1 1 Unit 9 cannot fire!