From a963b4e70330f9362111052ddf8236e1b376ac2b Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 20 Jan 2014 19:56:30 +0100 Subject: [PATCH] tests/fire: Drop test of ship retreat Now covered in tests/retreat. Signed-off-by: Markus Armbruster --- tests/fire/01-sector-1 | 4 +-- tests/fire/03-ship-1 | 2 +- tests/fire/final.xdump | 26 ++++++++-------- tests/fire/journal.log | 70 +++++++++++++++++++----------------------- tests/fire/setup-POGO | 2 -- 5 files changed, 48 insertions(+), 56 deletions(-) diff --git a/tests/fire/01-sector-1 b/tests/fire/01-sector-1 index 69162b0e..e7e79f2f 100644 --- a/tests/fire/01-sector-1 +++ b/tests/fire/01-sector-1 @@ -75,12 +75,12 @@ fire se 4,0 2,2 fire se 0,0 9 fire se 2,0 9 __cmd added 1 1 0 -| at cs at sea, one retreat, one sinking +| at cs at sea, one sunk fire se 0,0 23 fire se 2,0 23 fire se 4,0 23 fire se 4,0 21 -| at cs in port, one retreat, one sinking +| at cs in port, one sunk fire se 0,0 22 fire se 2,0 22 fire se 4,0 22 diff --git a/tests/fire/03-ship-1 b/tests/fire/03-ship-1 index 3296385c..e85ea44d 100644 --- a/tests/fire/03-ship-1 +++ b/tests/fire/03-ship-1 @@ -82,7 +82,7 @@ fire sh 2 0,2 | 100% bb fire sh 3 0,2 | 100% dd -| at sub, two retreat, two sink +| at sub, two sunk fire sh 5 13 fire sh 6 12 fire sh 5 11 diff --git a/tests/fire/final.xdump b/tests/fire/final.xdump index d46f6c8f..a2e4d296 100644 --- a/tests/fire/final.xdump +++ b/tests/fire/final.xdump @@ -269,10 +269,10 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet xstar 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 -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 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 () "" +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 () "" +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 () "" +12 2 2 2 18 68 86 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 6 0 18 72 91 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,8 +281,8 @@ 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 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 () "" +22 2 2 2 2 58 74 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 6 0 2 78 98 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 () "" @@ -334,13 +334,13 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range 19 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 20 0 2 2 27 0 127 0 180 0 0 none 0 "" 2 0 -1 -1 () 0 0.00000 21 0 6 0 27 0 127 0 180 0 0 none 0 "" 2 0 -1 -1 () 0 0.00000 -22 2 3 3 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 +22 2 2 2 27 100 127 0 180 0 0 none 0 "" 2 0 22 -1 () 0 0.00000 +23 2 6 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 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 3 3 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 +27 2 2 2 27 100 127 0 180 0 0 none 0 "" 2 0 -1 22 () 0 0.00000 +28 2 6 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 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 31 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 @@ -378,7 +378,7 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h 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 -13 2 8 0 8 100 127 0 40 0 0 none 0 "" 13 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 +13 2 6 0 8 100 127 0 40 0 0 none 0 "" 13 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 14 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 15 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 16 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 @@ -387,8 +387,8 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h 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 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 +22 2 2 2 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 6 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 diff --git a/tests/fire/journal.log b/tests/fire/journal.log index 0c080e15..48cab9d0 100644 --- a/tests/fire/journal.log +++ b/tests/fire/journal.log @@ -267,7 +267,7 @@ Play#1 output Play#1 1 Sector 4,0 ready to fire 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 (#23) in 8,0 for 26 damage. + Play#1 output Play#1 1 Shells hit cs cargo ship (#23) in 6,0 for 26 damage. Play#1 output Play#1 6 0 600 Play#1 input fire se 4,0 21 Play#1 command fire @@ -289,14 +289,14 @@ 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 cs cargo ship (#22) in 3,3 for 4 damage. + Play#1 output Play#1 1 Shells hit cs cargo ship (#22) in 2,2 for 4 damage. Play#1 output Play#1 6 0 597 Play#1 input fire se 4,0 22 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 cs cargo ship (#22) in 3,3 for 49 damage. + Play#1 output Play#1 1 Shells hit cs cargo ship (#22) in 2,2 for 49 damage. Play#1 output Play#1 6 0 596 Play#1 input fire se 4,0 20 Play#1 command fire @@ -387,8 +387,8 @@ 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 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 86 20 + 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 6,0 78% 0 4 0 0 0 0 1 1 98 20 Play#0 output Play#0 1 8 ships Play#0 output Play#0 6 0 640 Play#0 input carg * ?eff<100 @@ -400,8 +400,8 @@ 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 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 22 cs 2,2 58% 0 3 0 0 0 0 0 0 0 0 58 59 0 + Play#0 output Play#0 1 23 cs 6,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 Play#0 input plane * ?eff<100 @@ -414,7 +414,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 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 22 rad radar unit 2,2 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 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 @@ -424,7 +424,7 @@ Play#0 output Play#0 1 lnd# unit x,y a eff civ mil uw sh gun pet irn dst bar oil lcm hcm rad Play#0 output Play#0 1 1 hat 3,1 39% 0 10 0 80 12 0 0 0 0 0 0 0 0 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 22 rad 2,2 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 9 0 0 0 0 0 0 0 0 0 0 0 Play#0 output Play#0 1 5 units @@ -887,10 +887,10 @@ 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 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 86 20 + Play#0 output Play#0 1 2 12 sb submarine 2,2 68% 0 3 0 0 0 0 0 0 86 60 + Play#0 output Play#0 1 2 13 sb submarine 6,0 72% 0 3 0 0 0 0 0 1 91 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 6,0 78% 0 4 0 0 0 0 1 1 98 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 @@ -901,10 +901,10 @@ 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 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 12 sb 2,2 68% 0 3 0 0 0 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 13 sb 6,0 72% 0 3 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 58 59 0 + Play#0 output Play#0 1 23 cs 6,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 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 @@ -918,7 +918,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 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 22 rad radar unit 2,2 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 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 @@ -928,7 +928,7 @@ Play#0 output Play#0 1 lnd# unit x,y a eff civ mil uw sh gun pet irn dst bar oil lcm hcm rad Play#0 output Play#0 1 1 hat 3,1 39% 0 10 0 80 12 0 0 0 0 0 0 0 0 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 22 rad 2,2 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 9 0 0 0 0 0 0 0 0 0 0 0 Play#0 output Play#0 1 5 units @@ -1290,10 +1290,10 @@ 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 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 86 20 + Play#0 output Play#0 1 2 12 sb submarine 2,2 68% 0 3 0 0 0 0 0 0 86 60 + Play#0 output Play#0 1 2 13 sb submarine 6,0 72% 0 3 0 0 0 0 0 1 91 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 6,0 78% 0 4 0 0 0 0 1 1 98 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 @@ -1304,10 +1304,10 @@ 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 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 12 sb 2,2 68% 0 3 0 0 0 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 13 sb 6,0 72% 0 3 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 58 59 0 + Play#0 output Play#0 1 23 cs 6,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 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 @@ -1321,7 +1321,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 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 22 rad radar unit 2,2 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 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 @@ -1331,7 +1331,7 @@ Play#0 output Play#0 1 lnd# unit x,y a eff civ mil uw sh gun pet irn dst bar oil lcm hcm rad Play#0 output Play#0 1 1 hat 3,1 39% 0 10 0 80 12 0 0 0 0 0 0 0 0 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 22 rad 2,2 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 9 0 0 0 0 0 0 0 0 0 0 0 Play#0 output Play#0 1 5 units @@ -1375,8 +1375,7 @@ Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#23) in 6,0 for 0 damage. Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#23) in 6,0 for 2 damage. Play#0 output Play#0 1 cs cargo ship (#23) takes 1 - Play#0 output Play#0 1 cs cargo ship (#23) was damaged, and retreated to 8,0 - Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#23) in 8,0 for 26 damage. + Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#23) in 6,0 for 26 damage. Play#0 output Play#0 1 cs cargo ship (#23) takes 21 Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#21) in 6,0 for 24 damage. Play#0 output Play#0 1 cs cargo ship (#21) takes 20 @@ -1385,10 +1384,9 @@ 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 3,3 for 4 damage. + Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#22) in 2,2 for 4 damage. Play#0 output Play#0 1 cs cargo ship (#22) takes 3 - Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#22) in 3,3 for 49 damage. + Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#22) in 2,2 for 49 damage. Play#0 output Play#0 1 cs cargo ship (#22) takes 40 Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#20) in 2,2 for 27 damage. Play#0 output Play#0 1 cs cargo ship (#20) takes 22 @@ -1410,14 +1408,10 @@ Play#0 output Play#0 1 Country #1 shelled sector 0,2 for 88 damage. Play#0 output Play#0 1 Country #1 shelled sb submarine (#13) in 6,0 for 35 damage. Play#0 output Play#0 1 sb submarine (#13) takes 28 - Play#0 output Play#0 1 sb submarine (#13) was damaged, and retreated to 8,0 Play#0 output Play#0 1 Country #1 shelled sb submarine (#12) in 2,2 for 40 damage. Play#0 output Play#0 1 sb submarine (#12) takes 32 - Play#0 output Play#0 1 sb submarine (#12) was depth-charged, and retreated to 3,3 Play#0 output Play#0 1 Country #1 shelled sb submarine (#11) in 6,0 for 37 damage. Play#0 output Play#0 1 sb submarine (#11) takes 29 - Play#0 output Play#0 1 sb submarine (#11) was damaged, - Play#0 output Play#0 1 but it died in the attack, and so couldn't retreat! Play#0 output Play#0 1 sb submarine (#11) sunk! Play#0 output Play#0 1 spy infiltrator #11 lost! Play#0 output Play#0 1 Country #1 shelled sb submarine (#10) in 2,2 for 34 damage. diff --git a/tests/fire/setup-POGO b/tests/fire/setup-POGO index a662a605..389de8bd 100644 --- a/tests/fire/setup-POGO +++ b/tests/fire/setup-POGO @@ -59,8 +59,6 @@ edit s 10 U 12 m 5 E 100 M 127 U 13 L 6,0 | cs at sea and in port 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 build l 2,2 spy