diff --git a/tests/bridgefall/final.xdump b/tests/bridgefall/final.xdump index 784c0de8..59ae4417 100644 --- a/tests/bridgefall/final.xdump +++ b/tests/bridgefall/final.xdump @@ -106,12 +106,162 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet xstar /config config plane uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range harden ship land flags access theta +0 0 0 -2 27 0 0 0 180 0 0 none 0 "" 2 0 -1 -1 () 0 0.00000 +1 0 0 -2 27 0 0 0 180 0 0 none 0 "" 2 0 -1 -1 () 0 0.00000 +2 0 0 -2 12 0 0 0 150 0 0 none 0 "" 35 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 +6 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +7 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +8 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +9 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +10 0 1 -3 27 0 0 0 180 0 0 none 0 "" 2 0 -1 -1 () 0 0.00000 +11 0 1 -3 27 0 0 0 180 0 0 none 0 "" 2 0 -1 -1 () 0 0.00000 +12 0 1 -3 12 0 0 0 150 0 0 none 0 "" 35 0 -1 -1 () 0 0.00000 +13 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +14 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +15 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +16 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +17 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +18 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +19 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +20 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +21 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +22 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +23 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -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 +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 +32 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +33 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +34 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +35 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +36 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +37 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +38 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +39 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +40 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +41 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +42 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +43 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +44 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +45 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +46 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +47 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +48 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 +49 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 /config config land uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship harden retreat rflags rpath civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime land access +0 0 0 -2 7 0 0 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 +1 0 0 -2 21 0 0 0 270 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 +2 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 +3 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 +4 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 +5 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 +6 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 +7 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 +8 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 +9 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 +10 0 1 -3 7 0 0 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 1 -3 21 0 0 0 270 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 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 +13 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 +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 +17 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 +18 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 +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 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 +21 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 +22 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 +23 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 +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 +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 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 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 +33 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 +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 +35 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 +36 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 +37 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 +38 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 +39 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 +40 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 +41 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 +42 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 +43 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 +44 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 +45 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 +46 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 +47 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 +48 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 +49 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 /config config nuke uid owner xloc yloc type effic mobil off tech opx opy mission radius stockpile plane +0 0 0 -2 0 0 0 0 280 0 0 none 0 "" -1 +1 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +2 0 0 -2 0 0 0 0 280 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 +6 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +7 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +8 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +9 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +10 0 1 -3 0 0 0 0 280 0 0 none 0 "" -1 +11 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +12 0 1 -3 0 0 0 0 280 0 0 none 0 "" -1 +13 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +14 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +15 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +16 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +17 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +18 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +19 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +20 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +21 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +22 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +23 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +24 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +25 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +26 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +27 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +28 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +29 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +30 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +31 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +32 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +33 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +34 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +35 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +36 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +37 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +38 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +39 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +40 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +41 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +42 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +43 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +44 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +45 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +46 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +47 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +48 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 +49 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 /config config news actor action victim times duration time @@ -234,7 +384,21 @@ uid owner type amount price maxbidder markettime xbuy ybuy xsell ysell config lost timestamp owner type id x y 0 2 0 0 -1 1 +0 1 3 0 0 -2 +0 1 2 0 0 -2 +0 1 3 1 0 -2 +0 1 2 1 0 -2 +0 1 2 2 0 -2 +0 1 4 2 0 -2 +0 1 4 0 0 -2 0 1 0 0 3 1 +0 2 3 10 1 -3 +0 2 2 10 1 -3 +0 2 3 11 1 -3 +0 2 2 11 1 -3 +0 2 2 12 1 -3 +0 2 4 12 1 -3 +0 2 4 10 1 -3 /config config realm cnum realm xl xh yl yh diff --git a/tests/bridgefall/journal.log b/tests/bridgefall/journal.log index a1f9fe69..d7dc5cfb 100644 --- a/tests/bridgefall/journal.log +++ b/tests/bridgefall/journal.log @@ -41,6 +41,13 @@ Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 Shells hit sector 0,-2 for 30 damage. Play#1 output Play#1 1 Crumble... SCREEEECH! Splash! Bridge falls at 0,-2! + Play#1 output Play#1 1 AARGH! tra train #0 tumbles to its doom! + Play#1 output Play#1 1 sam Sea Sparrow #0 lost! + Play#1 output Play#1 1 rad radar unit #1 lost! + Play#1 output Play#1 1 sam Sea Sparrow #1 lost! + Play#1 output Play#1 1 AARGH! jhb B-52 Strato-Fortress #2 tumbles to its doom! + Play#1 output Play#1 1 10kt fission warhead #2 lost! + Play#1 output Play#1 1 10kt fission warhead #0 sinks to the bottom of the sea! Play#1 output Play#1 6 0 637 Play#1 input fire se 2,0 6,0 Play#1 command fire @@ -249,6 +256,13 @@ Play#0 output Play#0 1 Country #1 shelled sector 6,0 for 46 damage. Play#0 output Play#0 1 Country #1 shelled sector 1,-3 for 23 damage. Play#0 output Play#0 1 Crumble... SCREEEECH! Splash! Bridge tower falls at 1,-3! + Play#0 output Play#0 1 AARGH! tra train #10 tumbles to its doom! + Play#0 output Play#0 1 sam Sea Sparrow #10 lost! + Play#0 output Play#0 1 rad radar unit #11 lost! + Play#0 output Play#0 1 sam Sea Sparrow #11 lost! + Play#0 output Play#0 1 AARGH! jhb B-52 Strato-Fortress #12 tumbles to its doom! + Play#0 output Play#0 1 10kt fission warhead #12 lost! + Play#0 output Play#0 1 10kt fission warhead #10 sinks to the bottom of the sea! Play#0 output Play#0 1 Crumble... SCREEEECH! Splash! Bridge falls at 3,-3! Play#0 output Play#0 1 Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970 diff --git a/tests/bridgefall/setup-POGO b/tests/bridgefall/setup-POGO index ed3c9191..b79503db 100644 --- a/tests/bridgefall/setup-POGO +++ b/tests/bridgefall/setup-POGO @@ -46,10 +46,33 @@ edit l * ?des=# e 20 terr * ?des== 1 terr * ?des=# 1 terr * ?des=@ 1 +|| put some victims on bridges +build l 0,-2 tra +build l 0,-2 rad +edit u 1 Y 0 +build p 0,-2 sam +edit p 0 y 0 +edit p 0 U 1 y 1 +build p 0,-2 jhb +build n 0,-2 10kt +edit n 0 U 2 p 2 +edit u 0 U 10 L 1,-3 O 2 +edit u 1 U 11 Y 10 O 2 +edit p 0 U 10 L +edit p 0 U 10 O 2 y 10 +edit p 1 U 11 O 2 y 11 +edit p 2 U 12 O 2 l 1,-3 +edit n 0 U 10 O 2 L 1,-3 +edit n 2 U 12 O 2 p 12 +edit p * e 100 +edit u * e 100 || relations decl h 1 2 decl h 2 1 || show initial state here to help maintainers cens * ?des#. comm * ?des#. +plane * +land * +nuke * map *