From 2da09bc4b01e4dc35d4475e6d2e1a3e7907f2786 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 18 Jan 2014 16:34:07 +0100 Subject: [PATCH] tests/fire: Drop test of units tumbling down with bridges Now covered in tests/bridgefall. Signed-off-by: Markus Armbruster --- tests/fire/final.xdump | 20 +++++++------------- tests/fire/journal.log | 12 +++--------- tests/fire/setup-POGO | 13 ++++++------- 3 files changed, 16 insertions(+), 29 deletions(-) diff --git a/tests/fire/final.xdump b/tests/fire/final.xdump index 30bfe9cb..eaffaf7b 100644 --- a/tests/fire/final.xdump +++ b/tests/fire/final.xdump @@ -34,7 +34,7 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd 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 124 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 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 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 @@ -314,7 +314,7 @@ config plane uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range harden ship land flags access theta 0 2 2 2 27 100 127 0 180 0 0 none 0 "" 2 0 -1 -1 () 0 0.00000 1 2 2 2 12 100 127 0 150 0 0 none 0 "" 35 0 -1 -1 () 0 0.00000 -2 0 1 3 12 0 127 0 150 0 0 none 0 "" 35 0 -1 -1 () 0 0.00000 +2 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 3 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 4 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 5 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 @@ -342,8 +342,8 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range 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 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 +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 32 2 2 2 27 100 127 0 180 0 0 none 0 "" 2 0 -1 32 () 0 0.00000 33 2 2 2 27 100 127 0 180 0 0 none 0 "" 2 0 -1 33 () 0 0.00000 34 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 @@ -395,8 +395,8 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h 27 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 28 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 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 1 3 7 0 127 0 40 0 0 none 0 "" -1 0 42 () "" 0 10 0 0 0 0 0 0 0 0 100 100 0 0 healthy 0 -1 0 -31 0 1 3 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 +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 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 @@ -420,7 +420,7 @@ config nuke uid owner xloc yloc type effic mobil off tech opx opy mission radius stockpile plane 0 2 2 2 0 100 0 0 280 0 0 none 0 "" -1 1 2 2 2 0 100 0 0 280 0 0 none 0 "" 1 -2 0 1 3 0 0 0 0 280 0 0 none 0 "" -1 +2 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 3 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 4 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 5 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 @@ -590,12 +590,6 @@ uid owner type amount price maxbidder markettime xbuy ybuy xsell ysell /config config lost timestamp owner type id x y -0 2 3 30 1 3 -0 2 2 30 1 3 -0 2 3 31 1 3 -0 2 2 31 1 3 -0 2 2 2 1 3 -0 2 4 2 1 3 0 2 0 0 1 3 0 2 3 0 2 2 0 2 3 10 2 2 diff --git a/tests/fire/journal.log b/tests/fire/journal.log index 14b177d0..854fced9 100644 --- a/tests/fire/journal.log +++ b/tests/fire/journal.log @@ -368,7 +368,7 @@ 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% 124 .. .. 98 0 0 0 0% 98 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 6 0 640 @@ -876,7 +876,7 @@ 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% 124 .. .. 98 0 0 0 0% 98 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 6 0 640 @@ -1285,7 +1285,7 @@ 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% 124 .. .. 98 0 0 0 0% 98 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 6 0 640 @@ -1398,12 +1398,6 @@ 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 AARGH! tra train #30 tumbles to its doom! - Play#0 output Play#0 1 sam Sea Sparrow #30 lost! - Play#0 output Play#0 1 rad radar unit #31 lost! - Play#0 output Play#0 1 sam Sea Sparrow #31 lost! - Play#0 output Play#0 1 AARGH! jhb B-52 Strato-Fortress #2 tumbles to its doom! - Play#0 output Play#0 1 10kt fission warhead #2 lost! 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 diff --git a/tests/fire/setup-POGO b/tests/fire/setup-POGO index 62598d6b..4a5bda09 100644 --- a/tests/fire/setup-POGO +++ b/tests/fire/setup-POGO @@ -73,23 +73,22 @@ edit u 0 e 100 M 127 edit u 0 U 10 S 10 U 11 S 11 U 12 S 12 U 13 S 13 | rad on target cs edit u 0 U 20 T rad m 10 S 20 U 21 S 21 U 22 S 22 U 23 S 23 -| train on weak target bridge -edit u 0 U 30 T tra L 1,3 m 10 l 100 h 100 U 32 L 2,2 | tra in target harbor -edit u 0 U 31 T rad m 10 Y 30 U 33 Y 32 +edit u 0 U 32 T tra L 2,2 m 10 l 100 h 100 +edit u 0 U 33 T rad m 10 Y 32 || target planes -| sam & jhb in target harbor, jhb ob weak target bridge +| sam & jhb in target harbor build p 2,2 sam edit p 0 e 100 m 127 build p 2,2 jhb -edit p 1 e 100 m 127 U 2 l 1,3 +edit p 1 e 100 m 127 | 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 +edit p 0 U 32 y 32 U 33 y 33 || target nukes in target harbor and on target jhb build n 2,2 10kt -edit n 0 U 1 p 1 U 2 p 2 +edit n 0 U 1 p 1 || firing ships | bb range >=3, 59% 60% 100% edit s 0 U 1 t bb T 150 L 3,1 O 1 E 59 M 127 m 13 g 10 s 200 U 2 E 60 U 3 E 100