From 6d3106a5823073f28ff096c9b45450dc74d64eab Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 7 Feb 2015 17:34:32 +0100 Subject: [PATCH] tests/fire: Cover mission clearing Signed-off-by: Markus Armbruster --- tests/fire/03-ship-1 | 52 +++--- tests/fire/05-land-1 | 47 ++--- tests/fire/99-POGO | 2 + tests/fire/final.xdump | 28 +-- tests/fire/journal.log | 400 +++++++++++++++++++++++------------------ tests/fire/setup-POGO | 27 ++- 6 files changed, 311 insertions(+), 245 deletions(-) diff --git a/tests/fire/03-ship-1 b/tests/fire/03-ship-1 index e85ea44d1..128fc121a 100644 --- a/tests/fire/03-ship-1 +++ b/tests/fire/03-ship-1 @@ -27,9 +27,12 @@ unload g 2 10 fire sh 2 6,0 load g 2 10 | likewise no shells -unload s 2 200 +unload s 2 100 fire sh 2 6,0 -load s 2 200 +load s 2 100 +| show mission +miss s * ?mission#0 q +__cmd added 1 2 0 | || ship firing nowhere (shells consumed) | 100% bb @@ -52,31 +55,30 @@ fire sh 3 2,-2 || ship firing at undefended target | 100% bb with 1, 2, 3 guns | at empty highway -unload g 3 -1 -fire sh 3 0,2 -load g 3 1 -fire sh 3 0,2 -load g 3 1 -fire sh 3 0,2 -load g 3 7 +unload g 4 -1 +fire sh 4 0,2 +load g 4 1 +fire sh 4 0,2 +load g 4 1 +fire sh 4 0,2 +load g 4 7 | likewise 1, 2 shell (take care to avoid automatic supply) -unload s 3 -1 -navi 3 jh -fire sh 3 0,2 -navi 3 gh -load s 3 2 -navi 3 jh -fire sh 3 0,2 -navi 3 gh -load s 3 169 +unload s 4 -1 +load s 3 100 +fire sh 4 0,2 +tend s 3 2 4 +__cmd added -2 -2 0 +fire sh 4 0,2 +tend s 3 93 4 +__cmd added -1 -1 0 | likewise 1, 2, 3 mil -unload m 3 -1 -fire sh 3 0,2 -load m 3 1 -fire sh 3 0,2 -load m 3 1 -fire sh 3 0,2 -load m 3 10 +unload m 4 -1 +fire sh 4 0,2 +load m 4 1 +fire sh 4 0,2 +load m 4 1 +fire sh 4 0,2 +load m 4 10 | 60% bb fire sh 2 0,2 | 100% bb diff --git a/tests/fire/05-land-1 b/tests/fire/05-land-1 index 9d381d989..a99c8a5fe 100644 --- a/tests/fire/05-land-1 +++ b/tests/fire/05-land-1 @@ -27,17 +27,20 @@ lunload g 2 12 fire la 2 6,0 lload g 2 12 | likewise no shells -lunload s 2 80 +lunload s 2 40 fire la 2 6,0 -lload s 2 80 +lload s 2 40 | likewise on ship -load land 9 2 +load land 8 2 fire la 2 6,0 -unload land 9 2 +unload land 8 2 | likewise on land -lload land 9 2 +lload land 8 2 fire la 2 6,0 -lunload land 9 2 +lunload land 8 2 +| show mission +miss l * ?mission#0 q +__cmd added 1 2 0 | || land firing nowhere (shells consumed) | 100% hat @@ -60,28 +63,28 @@ fire la 3 2,-2 || land firing at undefended target | 100% hat with one gun | at empty highway -lunload g 3 -1 -fire la 3 0,2 -lload g 3 11 +lunload g 4 -1 +fire la 4 0,2 +lload g 4 11 | likewise one shell (take care to avoid automatic supply) -lunload s 3 -1 -march 3 gh -fire la 3 0,2 -march 3 jh -lload s 3 51 +lunload s 4 -1 +lload s 3 40 +fire la 4 0,2 +lunload s 3 35 +lload s 4 35 | 40% hat fire la 2 0,2 | 100% hat -fire la 3 0,2 +fire la 4 0,2 | 100% hat | at sector, fractional range, ~50% chance -march 3 yyyh -fire la 3 0,2 -fire la 3 0,2 -fire la 3 0,2 -fire la 3 0,2 -fire la 3 0,2 -fire la 3 0,2 +__cmd added -1 -1 0 +fire la 5 0,2 +fire la 5 0,2 +fire la 5 0,2 +fire la 5 0,2 +fire la 5 0,2 +fire la 5 0,2 | || show shell use lcarg * ?shell>0 diff --git a/tests/fire/99-POGO b/tests/fire/99-POGO index f164f8d72..d99c0702a 100644 --- a/tests/fire/99-POGO +++ b/tests/fire/99-POGO @@ -4,9 +4,11 @@ comm * ?terr=1 sinf * ?terr=1 ship * carg * +miss s * ?mission#0 q plane * land * lcarg * +miss l * ?mission#0 q nuke * terr * 0 read 0 diff --git a/tests/fire/final.xdump b/tests/fire/final.xdump index c8ce71e69..0483034b5 100644 --- a/tests/fire/final.xdump +++ b/tests/fire/final.xdump @@ -11,7 +11,6 @@ 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 1 1 0 0 0 0 0 0 0 0 2 2 0 0 1 24 0 0 0 0 0 2 13 0 0 0 0 0 0 0 0 0 2 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 86 0 0 0 0 0 0 0 0 2 2 87 0 0 1 12 0 0 0 0 0 2 86 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 -0 4 2 0 100 0 0 0 0 0 0 0 0 4 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 2 -2 2 24 100 127 0 0 0 0 0 0 0 -2 2 100 0 0 1 24 0 0 0 0 0 2 100 0 0 0 0 0 0 0 0 0 100 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 healthy 0 0 0 0 0 100 100 100 1 0 -2 24 100 127 0 0 0 0 0 0 0 0 -2 0 0 0 1 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 1 2 -2 2 100 127 0 0 0 0 0 0 0 2 -2 0 0 0 1 2 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 @@ -24,12 +23,14 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd config ship uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil milit shell gun petrol iron dust bar food oil lcm hcm uw rad pstage ptime access name xbuilt ybuilt builder rflags rpath 0 2 -12 0 6 20 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () "" -1 1 3 1 13 59 127 0 150 0 0 none 0 "" 0 13 200 10 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () "" -2 1 3 1 13 60 127 0 150 0 0 none 0 "" 0 13 196 10 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () "" -3 1 3 1 13 100 87 0 150 0 0 none 0 "" 0 13 162 10 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () "" -5 1 10 0 17 100 117 0 100 0 0 none 0 "" 0 5 24 4 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () "" -6 1 3 3 17 100 127 0 100 0 0 none 0 "" 0 5 36 4 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () "" -9 1 3 1 2 98 124 0 20 0 0 none 0 "" 0 10 10 9 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () "" +1 1 3 1 13 59 127 0 150 3 1 interdiction 4 "" 0 13 100 10 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () "" +2 1 3 1 13 60 127 0 150 3 1 interdiction 4 "" 0 13 96 10 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () "" +3 1 3 1 13 100 127 0 150 3 1 none 4 "" 0 13 72 10 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () "" +4 1 3 1 13 100 127 0 150 3 1 interdiction 4 "" 0 13 90 10 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () "" +5 1 10 0 17 100 117 0 100 8 0 none 2 "" 0 5 24 4 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () "" +6 1 3 3 17 100 127 0 100 3 3 interdiction 2 "" 0 5 36 4 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () "" +8 1 3 1 2 100 0 0 20 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () "" +9 1 5 1 2 98 124 0 20 0 0 none 0 "" 0 10 10 9 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () "" 10 0 2 2 18 0 0 0 60 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () "" 11 0 6 0 18 0 0 0 60 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () "" 12 2 2 2 18 68 86 0 60 0 0 none 0 "" 0 3 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () "" @@ -60,10 +61,13 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range 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 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 -1 1 3 1 13 39 127 0 160 0 0 none 0 "" -1 0 42 () "" 0 10 80 12 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 -2 1 3 1 13 40 127 0 160 0 0 none 0 "" -1 0 42 () "" 0 10 76 12 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 -3 1 0 -2 13 100 51 0 160 0 0 none 0 "" -1 0 42 () "" 0 10 23 12 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 -9 1 3 1 7 100 0 0 40 0 0 none 0 "" -1 0 42 () "" 0 10 10 10 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 +1 1 3 1 13 39 127 0 160 3 1 interdiction 4 "" -1 0 42 () "" 0 10 40 12 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 +2 1 3 1 13 40 127 0 160 3 1 interdiction 4 "" -1 0 42 () "" 0 10 36 12 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 +3 1 3 1 13 100 127 0 160 3 1 none 4 "" -1 0 42 () "" 0 10 16 12 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 +4 1 3 1 13 100 127 0 160 3 1 interdiction 4 "" -1 0 42 () "" 0 10 31 12 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 +5 1 0 -2 13 100 127 0 160 0 -2 none 4 "" -1 0 42 () "" 0 10 16 12 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 +8 1 3 1 7 100 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 +9 1 1 1 6 100 0 0 50 0 0 none 0 "" -1 0 42 () "" 0 10 10 10 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 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 @@ -95,7 +99,7 @@ uid owner type unitid price maxbidder markettime xloc yloc /config config nat cnum stat flags cname passwd ip hostname userid xcap ycap xorg yorg update tgms ann timeused btu access milreserve money login logout newstim annotim tech research education happiness relations(0) relations(1) relations(2) relations(3) relations(4) relations(5) relations(6) relations(7) relations(8) relations(9) relations(10) relations(11) relations(12) relations(13) relations(14) relations(15) relations(16) relations(17) relations(18) relations(19) relations(20) relations(21) relations(22) relations(23) relations(24) relations(25) relations(26) relations(27) relations(28) relations(29) relations(30) relations(31) relations(32) relations(33) relations(34) relations(35) relations(36) relations(37) relations(38) relations(39) relations(40) relations(41) relations(42) relations(43) relations(44) relations(45) relations(46) relations(47) relations(48) relations(49) relations(50) relations(51) relations(52) relations(53) relations(54) relations(55) relations(56) relations(57) relations(58) relations(59) relations(60) relations(61) relations(62) relations(63) relations(64) relations(65) relations(66) relations(67) relations(68) relations(69) relations(70) relations(71) relations(72) relations(73) relations(74) relations(75) relations(76) relations(77) relations(78) relations(79) relations(80) relations(81) relations(82) relations(83) relations(84) relations(85) relations(86) relations(87) relations(88) relations(89) relations(90) relations(91) relations(92) relations(93) relations(94) relations(95) relations(96) relations(97) relations(98) contacts(0) contacts(1) contacts(2) contacts(3) contacts(4) contacts(5) contacts(6) contacts(7) contacts(8) contacts(9) contacts(10) contacts(11) contacts(12) contacts(13) contacts(14) contacts(15) contacts(16) contacts(17) contacts(18) contacts(19) contacts(20) contacts(21) contacts(22) contacts(23) contacts(24) contacts(25) contacts(26) contacts(27) contacts(28) contacts(29) contacts(30) contacts(31) contacts(32) contacts(33) contacts(34) contacts(35) contacts(36) contacts(37) contacts(38) contacts(39) contacts(40) contacts(41) contacts(42) contacts(43) contacts(44) contacts(45) contacts(46) contacts(47) contacts(48) contacts(49) contacts(50) contacts(51) contacts(52) contacts(53) contacts(54) contacts(55) contacts(56) contacts(57) contacts(58) contacts(59) contacts(60) contacts(61) contacts(62) contacts(63) contacts(64) contacts(65) contacts(66) contacts(67) contacts(68) contacts(69) contacts(70) contacts(71) contacts(72) contacts(73) contacts(74) contacts(75) contacts(76) contacts(77) contacts(78) contacts(79) contacts(80) contacts(81) contacts(82) contacts(83) contacts(84) contacts(85) contacts(86) contacts(87) contacts(88) contacts(89) contacts(90) contacts(91) contacts(92) contacts(93) contacts(94) contacts(95) contacts(96) contacts(97) contacts(98) rejects(0) rejects(1) rejects(2) rejects(3) rejects(4) rejects(5) rejects(6) rejects(7) rejects(8) rejects(9) rejects(10) rejects(11) rejects(12) rejects(13) rejects(14) rejects(15) rejects(16) rejects(17) rejects(18) rejects(19) rejects(20) rejects(21) rejects(22) rejects(23) rejects(24) rejects(25) rejects(26) rejects(27) rejects(28) rejects(29) rejects(30) rejects(31) rejects(32) rejects(33) rejects(34) rejects(35) rejects(36) rejects(37) rejects(38) rejects(39) rejects(40) rejects(41) rejects(42) rejects(43) rejects(44) rejects(45) rejects(46) rejects(47) rejects(48) rejects(49) rejects(50) rejects(51) rejects(52) rejects(53) rejects(54) rejects(55) rejects(56) rejects(57) rejects(58) rejects(59) rejects(60) rejects(61) rejects(62) rejects(63) rejects(64) rejects(65) rejects(66) rejects(67) rejects(68) rejects(69) rejects(70) rejects(71) rejects(72) rejects(73) rejects(74) rejects(75) rejects(76) rejects(77) rejects(78) rejects(79) rejects(80) rejects(81) rejects(82) rejects(83) rejects(84) rejects(85) rejects(86) rejects(87) rejects(88) rejects(89) rejects(90) rejects(91) rejects(92) rejects(93) rejects(94) rejects(95) rejects(96) rejects(97) rejects(98) -0 deity (flash beep coastwatch sonar techlists) "POGO" "peter" "127.0.0.1" "" "tester" 0 0 0 0 0 0 0 255 640 0 0 123456789 0 0 0 0 0.00000 0.00000 0.00000 0.00000 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () +0 deity (flash beep coastwatch sonar techlists) "POGO" "peter" "127.0.0.1" "" "tester" 0 0 0 0 0 0 0 255 636 0 0 123456789 0 0 0 0 0.00000 0.00000 0.00000 0.00000 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () 1 active (flash beep coastwatch sonar techlists) "1" "1" "127.0.0.1" "" "tester" 1 -1 0 0 0 0 0 255 494 0 0 25000 0 0 0 0 100.000 0.00000 0.00000 0.00000 neutral neutral at-war neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () 2 active (flash beep coastwatch sonar techlists) "2" "2" "" "" "" 0 0 0 0 0 1 0 255 640 0 0 25000 0 0 0 0 100.000 0.00000 0.00000 0.00000 neutral at-war neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () 3 new (flash beep coastwatch sonar techlists) "3" "3" "" "" "" 2 -2 0 0 0 0 0 255 640 0 0 25000 0 0 0 0 0.00000 0.00000 0.00000 0.00000 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () diff --git a/tests/fire/journal.log b/tests/fire/journal.log index 5295799a1..1ae2d8b43 100644 --- a/tests/fire/journal.log +++ b/tests/fire/journal.log @@ -235,14 +235,14 @@ Play#1 output Play#1 1 Sector 0,0 ready to fire Play#1 output Play#1 1 range is 4.00 (3.50) Play#1 output Play#1 1 \007Kaboom!!! - Play#1 output Play#1 1 Shells hit cs cargo ship (#9) in 3,1 for 0 damage. + Play#1 output Play#1 1 Shells hit cs cargo ship (#9) in 5,1 for 0 damage. Play#1 output Play#1 6 0 603 Play#1 input fire se 2,0 9 Play#1 command fire Play#1 output Play#1 1 Sector 2,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 (#9) in 3,1 for 3 damage. + Play#1 output Play#1 1 Shells hit cs cargo ship (#9) in 5,1 for 3 damage. Play#1 output Play#1 1 cs cargo ship (#9) takes 2 Play#1 output Play#1 6 0 602 Play#1 input __cmd added 1 1 0 @@ -384,7 +384,7 @@ Play#0 output Play#0 1 2 0 frg frigate -12,0 20% 0 0 0 0 0 0 0 0 0 0 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 1 9 cs cargo ship 5,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 2,2 58% 0 3 0 0 0 0 1 1 74 20 @@ -395,9 +395,9 @@ Play#0 command cargo Play#0 output Play#0 1 shp# x,y flt eff civ mil uw sh gun pet irn dst bar oil lcm hcm rad Play#0 output Play#0 1 0 frg -12,0 20% 0 0 0 0 0 0 0 0 0 0 0 0 0 - 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 200 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 1 bb 3,1 59% 0 13 0 100 10 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 2 bb 3,1 60% 0 13 0 100 10 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 9 cs 5,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 2,2 58% 0 3 0 0 0 0 0 0 0 0 58 59 0 @@ -422,8 +422,8 @@ Play#0 input lcarg * ?eff<100 Play#0 command lcargo 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 1 hat 3,1 39% 0 10 0 40 12 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 2 hat 3,1 40% 0 10 0 40 12 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 @@ -463,21 +463,23 @@ Play#1 output Play#1 1 1 bb battleship 3,1 59% 0 13 0 0 0 0 0 0 127 150 Play#1 output Play#1 1 2 bb battleship 3,1 60% 0 13 0 0 0 0 0 0 127 150 Play#1 output Play#1 1 3 bb battleship 3,1 100% 0 13 0 0 0 0 0 0 127 150 + Play#1 output Play#1 1 4 bb battleship 3,1 100% 0 13 0 0 0 0 0 0 127 150 Play#1 output Play#1 1 5 dd destroyer 8,0 100% 0 5 0 0 0 0 0 0 127 100 Play#1 output Play#1 1 6 dd destroyer 3,3 100% 0 5 0 0 0 0 0 0 127 100 - Play#1 output Play#1 1 9 cs cargo ship 3,1 98% 0 10 0 0 0 0 0 0 124 20 - Play#1 output Play#1 1 6 ships + Play#1 output Play#1 1 9 cs cargo ship 5,1 98% 0 10 0 0 0 0 0 0 124 20 + Play#1 output Play#1 1 7 ships Play#1 output Play#1 6 0 595 Play#1 input carg * ?shell>0 Play#1 command cargo Play#1 output Play#1 1 shp# x,y flt eff civ mil uw sh gun pet irn dst bar oil lcm hcm rad - Play#1 output Play#1 1 1 bb 3,1 59% 0 13 0 200 10 0 0 0 0 0 0 0 0 - Play#1 output Play#1 1 2 bb 3,1 60% 0 13 0 200 10 0 0 0 0 0 0 0 0 - Play#1 output Play#1 1 3 bb 3,1 100% 0 13 0 200 10 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 1 bb 3,1 59% 0 13 0 100 10 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 2 bb 3,1 60% 0 13 0 100 10 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 3 bb 3,1 100% 0 13 0 100 10 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 4 bb 3,1 100% 0 13 0 100 10 0 0 0 0 0 0 0 0 Play#1 output Play#1 1 5 dd 8,0 100% 0 5 0 40 4 0 0 0 0 0 0 0 0 Play#1 output Play#1 1 6 dd 3,3 100% 0 5 0 40 4 0 0 0 0 0 0 0 0 - Play#1 output Play#1 1 9 cs 3,1 98% 0 10 0 10 9 0 0 0 0 0 0 0 0 - Play#1 output Play#1 1 6 ships + Play#1 output Play#1 1 9 cs 5,1 98% 0 10 0 10 9 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 7 ships Play#1 output Play#1 6 0 595 Play#1 input fire sh 666 6,0 Play#1 command fire @@ -533,20 +535,33 @@ Play#1 output Play#1 1 10 guns loaded onto bb battleship (#2) at 3,1 Play#1 output Play#1 1 1 ship loaded Play#1 output Play#1 6 0 583 - Play#1 input unload s 2 200 + Play#1 input unload s 2 100 Play#1 command unload - Play#1 output Play#1 1 200 shells unloaded from bb battleship (#2) at 3,1 + Play#1 output Play#1 1 100 shells unloaded from bb battleship (#2) at 3,1 Play#1 output Play#1 1 1 ship unloaded Play#1 output Play#1 6 0 582 Play#1 input fire sh 2 6,0 Play#1 command fire Play#1 output Play#1 1 Not enough shells on ship #2 Play#1 output Play#1 6 0 581 - Play#1 input load s 2 200 + Play#1 input load s 2 100 Play#1 command load - Play#1 output Play#1 1 200 shells loaded onto bb battleship (#2) at 3,1 + Play#1 output Play#1 1 100 shells loaded onto bb battleship (#2) at 3,1 Play#1 output Play#1 1 1 ship loaded Play#1 output Play#1 6 0 580 + Play#1 input miss s * ?mission#0 q + Play#1 command mission + Play#1 output Play#1 1 Thing x,y op-sect rad mission + Play#1 output Play#1 1 bb battleship (#1) 3,1 3,1 4 is on an interdiction mission + Play#1 output Play#1 1 bb battleship (#2) 3,1 3,1 4 is on an interdiction mission + Play#1 output Play#1 1 bb battleship (#3) 3,1 3,1 4 is on an interdiction mission + Play#1 output Play#1 1 bb battleship (#4) 3,1 3,1 4 is on an interdiction mission + Play#1 output Play#1 1 dd destroyer (#5) 8,0 8,0 2 is on an interdiction mission + Play#1 output Play#1 1 dd destroyer (#6) 3,3 3,3 2 is on an interdiction mission + Play#1 output Play#1 6 0 578 + Play#1 input __cmd added 1 2 0 + Play#1 command __cmd + Play#1 output Play#1 6 0 580 Play#1 input fire sh 3 -12,0 Play#1 command fire Play#1 output Play#1 1 bb battleship (#3) ready to fire @@ -585,135 +600,124 @@ Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 Shells hit sector 2,-2 for 87 damage. Play#1 output Play#1 6 0 574 - Play#1 input unload g 3 -1 + Play#1 input unload g 4 -1 Play#1 command unload - Play#1 output Play#1 1 9 guns unloaded from bb battleship (#3) at 3,1 + Play#1 output Play#1 1 9 guns unloaded from bb battleship (#4) at 3,1 Play#1 output Play#1 1 1 ship unloaded Play#1 output Play#1 6 0 573 - Play#1 input fire sh 3 0,2 + Play#1 input fire sh 4 0,2 Play#1 command fire - Play#1 output Play#1 1 bb battleship (#3) ready to fire + Play#1 output Play#1 1 bb battleship (#4) ready to fire Play#1 output Play#1 1 range is 4.00 (3.71) Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 Shells hit sector 0,2 for 14 damage. Play#1 output Play#1 6 0 572 - Play#1 input load g 3 1 + Play#1 input load g 4 1 Play#1 command load - Play#1 output Play#1 1 1 guns loaded onto bb battleship (#3) at 3,1 + Play#1 output Play#1 1 1 guns loaded onto bb battleship (#4) at 3,1 Play#1 output Play#1 1 1 ship loaded Play#1 output Play#1 6 0 571 - Play#1 input fire sh 3 0,2 + Play#1 input fire sh 4 0,2 Play#1 command fire - Play#1 output Play#1 1 bb battleship (#3) ready to fire + Play#1 output Play#1 1 bb battleship (#4) ready to fire Play#1 output Play#1 1 range is 4.00 (3.71) Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 Shells hit sector 0,2 for 25 damage. Play#1 output Play#1 6 0 570 - Play#1 input load g 3 1 + Play#1 input load g 4 1 Play#1 command load - Play#1 output Play#1 1 1 guns loaded onto bb battleship (#3) at 3,1 + Play#1 output Play#1 1 1 guns loaded onto bb battleship (#4) at 3,1 Play#1 output Play#1 1 1 ship loaded Play#1 output Play#1 6 0 569 - Play#1 input fire sh 3 0,2 + Play#1 input fire sh 4 0,2 Play#1 command fire - Play#1 output Play#1 1 bb battleship (#3) ready to fire + Play#1 output Play#1 1 bb battleship (#4) ready to fire Play#1 output Play#1 1 range is 4.00 (3.71) Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 Shells hit sector 0,2 for 32 damage. Play#1 output Play#1 6 0 568 - Play#1 input load g 3 7 + Play#1 input load g 4 7 Play#1 command load - Play#1 output Play#1 1 7 guns loaded onto bb battleship (#3) at 3,1 + Play#1 output Play#1 1 7 guns loaded onto bb battleship (#4) at 3,1 Play#1 output Play#1 1 1 ship loaded Play#1 output Play#1 6 0 567 - Play#1 input unload s 3 -1 + Play#1 input unload s 4 -1 Play#1 command unload - Play#1 output Play#1 1 171 shells unloaded from bb battleship (#3) at 3,1 + Play#1 output Play#1 1 95 shells unloaded from bb battleship (#4) at 3,1 Play#1 output Play#1 1 1 ship unloaded Play#1 output Play#1 6 0 566 - Play#1 input navi 3 jh - Play#1 command navigate - Play#1 output Play#1 1 Flagship is bb battleship (#3) - Play#1 output Play#1 1 bb battleship (#3) stopped at 5,1 + Play#1 input load s 3 100 + Play#1 command load + Play#1 output Play#1 1 95 shells loaded onto bb battleship (#3) at 3,1 + Play#1 output Play#1 1 1 ship loaded Play#1 output Play#1 6 0 565 - Play#1 input fire sh 3 0,2 + Play#1 input fire sh 4 0,2 Play#1 command fire - Play#1 output Play#1 1 bb battleship (#3) ready to fire + Play#1 output Play#1 1 bb battleship (#4) ready to fire Play#1 output Play#1 1 range is 4.00 (3.71) Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 Shells hit sector 0,2 for 21 damage. Play#1 output Play#1 6 0 564 - Play#1 input navi 3 gh - Play#1 command navigate - Play#1 output Play#1 1 Flagship is bb battleship (#3) - Play#1 output Play#1 1 bb battleship (#3) stopped at 3,1 + Play#1 input tend s 3 2 4 + Play#1 command tend + Play#1 output Play#1 1 2 total shells transferred off of bb battleship (#3) Play#1 output Play#1 6 0 563 - Play#1 input load s 3 2 - Play#1 command load - Play#1 output Play#1 1 2 shells loaded onto bb battleship (#3) at 3,1 - Play#1 output Play#1 1 1 ship loaded - Play#1 output Play#1 6 0 562 - Play#1 input navi 3 jh - Play#1 command navigate - Play#1 output Play#1 1 Flagship is bb battleship (#3) - Play#1 output Play#1 1 bb battleship (#3) stopped at 5,1 + Play#1 input __cmd added -2 -2 0 + Play#1 command __cmd Play#1 output Play#1 6 0 561 - Play#1 input fire sh 3 0,2 + Play#1 input fire sh 4 0,2 Play#1 command fire - Play#1 output Play#1 1 bb battleship (#3) ready to fire + Play#1 output Play#1 1 bb battleship (#4) ready to fire Play#1 output Play#1 1 range is 3.00 (3.71) Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 Shells hit sector 0,2 for 50 damage. Play#1 output Play#1 6 0 560 - Play#1 input navi 3 gh - Play#1 command navigate - Play#1 output Play#1 1 Flagship is bb battleship (#3) - Play#1 output Play#1 1 bb battleship (#3) stopped at 3,1 + Play#1 input tend s 3 93 4 + Play#1 command tend + Play#1 output Play#1 1 93 total shells transferred off of bb battleship (#3) Play#1 output Play#1 6 0 559 - Play#1 input load s 3 169 - Play#1 command load - Play#1 output Play#1 1 169 shells loaded onto bb battleship (#3) at 3,1 - Play#1 output Play#1 1 1 ship loaded + Play#1 input __cmd added -1 -1 0 + Play#1 command __cmd Play#1 output Play#1 6 0 558 - Play#1 input unload m 3 -1 + Play#1 input unload m 4 -1 Play#1 command unload - Play#1 output Play#1 1 12 military unloaded from bb battleship (#3) at 3,1 + Play#1 output Play#1 1 12 military unloaded from bb battleship (#4) at 3,1 Play#1 output Play#1 1 1 ship unloaded Play#1 output Play#1 6 0 557 - Play#1 input fire sh 3 0,2 + Play#1 input fire sh 4 0,2 Play#1 command fire - Play#1 output Play#1 1 bb battleship (#3) ready to fire + Play#1 output Play#1 1 bb battleship (#4) ready to fire Play#1 output Play#1 1 range is 4.00 (3.71) Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 Shells hit sector 0,2 for 12 damage. Play#1 output Play#1 6 0 556 - Play#1 input load m 3 1 + Play#1 input load m 4 1 Play#1 command load - Play#1 output Play#1 1 1 military loaded onto bb battleship (#3) at 3,1 + Play#1 output Play#1 1 1 military loaded onto bb battleship (#4) at 3,1 Play#1 output Play#1 1 1 ship loaded Play#1 output Play#1 6 0 555 - Play#1 input fire sh 3 0,2 + Play#1 input fire sh 4 0,2 Play#1 command fire - Play#1 output Play#1 1 bb battleship (#3) ready to fire + Play#1 output Play#1 1 bb battleship (#4) ready to fire Play#1 output Play#1 1 range is 3.00 (3.71) Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 Shells hit sector 0,2 for 12 damage. Play#1 output Play#1 6 0 554 - Play#1 input load m 3 1 + Play#1 input load m 4 1 Play#1 command load - Play#1 output Play#1 1 1 military loaded onto bb battleship (#3) at 3,1 + Play#1 output Play#1 1 1 military loaded onto bb battleship (#4) at 3,1 Play#1 output Play#1 1 1 ship loaded Play#1 output Play#1 6 0 553 - Play#1 input fire sh 3 0,2 + Play#1 input fire sh 4 0,2 Play#1 command fire - Play#1 output Play#1 1 bb battleship (#3) ready to fire + Play#1 output Play#1 1 bb battleship (#4) ready to fire Play#1 output Play#1 1 range is 4.00 (3.71) Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 Shells hit sector 0,2 for 23 damage. Play#1 output Play#1 6 0 552 - Play#1 input load m 3 10 + Play#1 input load m 4 10 Play#1 command load - Play#1 output Play#1 1 10 military loaded onto bb battleship (#3) at 3,1 + Play#1 output Play#1 1 10 military loaded onto bb battleship (#4) at 3,1 Play#1 output Play#1 1 1 ship loaded Play#1 output Play#1 6 0 551 Play#1 input fire sh 2 0,2 @@ -807,13 +811,14 @@ Play#1 input carg * ?shell>0 Play#1 command cargo Play#1 output Play#1 1 shp# x,y flt eff civ mil uw sh gun pet irn dst bar oil lcm hcm rad - Play#1 output Play#1 1 1 bb 3,1 59% 0 13 0 200 10 0 0 0 0 0 0 0 0 - Play#1 output Play#1 1 2 bb 3,1 60% 0 13 0 196 10 0 0 0 0 0 0 0 0 - Play#1 output Play#1 1 3 bb 3,1 100% 0 13 0 162 10 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 1 bb 3,1 59% 0 13 0 100 10 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 2 bb 3,1 60% 0 13 0 96 10 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 3 bb 3,1 100% 0 13 0 72 10 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 4 bb 3,1 100% 0 13 0 90 10 0 0 0 0 0 0 0 0 Play#1 output Play#1 1 5 dd 10,0 100% 0 5 0 24 4 0 0 0 0 0 0 0 0 Play#1 output Play#1 1 6 dd 3,3 100% 0 5 0 36 4 0 0 0 0 0 0 0 0 - Play#1 output Play#1 1 9 cs 3,1 98% 0 10 0 10 9 0 0 0 0 0 0 0 0 - Play#1 output Play#1 1 6 ships + Play#1 output Play#1 1 9 cs 5,1 98% 0 10 0 10 9 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 7 ships Play#1 output Play#1 6 0 538 Play#1 input ctld Play#1 output Play#1 1 Bye-bye @@ -881,7 +886,7 @@ Play#0 output Play#0 1 2 0 frg frigate -12,0 20% 0 0 0 0 0 0 0 0 0 0 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 1 9 cs cargo ship 5,1 98% 0 10 0 0 0 0 0 0 124 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 @@ -893,9 +898,9 @@ Play#0 command cargo Play#0 output Play#0 1 shp# x,y flt eff civ mil uw sh gun pet irn dst bar oil lcm hcm rad Play#0 output Play#0 1 0 frg -12,0 20% 0 0 0 0 0 0 0 0 0 0 0 0 0 - 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 1 bb 3,1 59% 0 13 0 100 10 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 2 bb 3,1 60% 0 13 0 96 10 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 9 cs 5,1 98% 0 10 0 10 9 0 0 0 0 0 0 0 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 @@ -921,8 +926,8 @@ Play#0 input lcarg * ?eff<100 Play#0 command lcargo 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 1 hat 3,1 39% 0 10 0 40 12 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 2 hat 3,1 40% 0 10 0 40 12 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 @@ -962,17 +967,21 @@ Play#1 output Play#1 1 1 hat hvy artill 3,1 39% 10 0 127 0 160 42% 0 0 Play#1 output Play#1 1 2 hat hvy artill 3,1 40% 10 0 127 0 160 42% 0 0 Play#1 output Play#1 1 3 hat hvy artill 3,1 100% 10 0 127 0 160 42% 0 0 - Play#1 output Play#1 1 9 tra train 3,1 100% 10 0 0 0 40 42% 0 0 - Play#1 output Play#1 1 4 units + Play#1 output Play#1 1 4 hat hvy artill 3,1 100% 10 0 127 0 160 42% 0 0 + Play#1 output Play#1 1 5 hat hvy artill 0,-2 100% 10 0 127 0 160 42% 0 0 + Play#1 output Play#1 1 9 sup supply 1,1 100% 10 0 0 0 50 42% 0 0 + Play#1 output Play#1 1 6 units Play#1 output Play#1 6 0 538 Play#1 input lcarg * ?shell>0 Play#1 command lcargo Play#1 output Play#1 1 lnd# unit x,y a eff civ mil uw sh gun pet irn dst bar oil lcm hcm rad - Play#1 output Play#1 1 1 hat 3,1 39% 0 10 0 80 12 0 0 0 0 0 0 0 0 - Play#1 output Play#1 1 2 hat 3,1 40% 0 10 0 80 12 0 0 0 0 0 0 0 0 - Play#1 output Play#1 1 3 hat 3,1 100% 0 10 0 80 12 0 0 0 0 0 0 0 0 - Play#1 output Play#1 1 9 tra 3,1 100% 0 10 0 10 10 0 0 0 0 0 0 0 0 - Play#1 output Play#1 1 4 units + Play#1 output Play#1 1 1 hat 3,1 39% 0 10 0 40 12 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 2 hat 3,1 40% 0 10 0 40 12 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 3 hat 3,1 100% 0 10 0 40 12 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 4 hat 3,1 100% 0 10 0 40 12 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 5 hat 0,-2 100% 0 10 0 40 12 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 9 sup 1,1 100% 0 10 0 10 10 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 6 units Play#1 output Play#1 6 0 538 Play#1 input fire la 666 6,0 Play#1 command fire @@ -1028,48 +1037,60 @@ Play#1 output Play#1 1 12 guns loaded onto hat hvy artillery #2 at 3,1 Play#1 output Play#1 1 1 unit loaded Play#1 output Play#1 6 0 526 - Play#1 input lunload s 2 80 + Play#1 input lunload s 2 40 Play#1 command lunload - Play#1 output Play#1 1 80 shells unloaded from hat hvy artillery #2 at 3,1 + Play#1 output Play#1 1 40 shells unloaded from hat hvy artillery #2 at 3,1 Play#1 output Play#1 1 1 unit unloaded Play#1 output Play#1 6 0 525 Play#1 input fire la 2 6,0 Play#1 command fire Play#1 output Play#1 1 hat hvy artillery #2 -- not enough shells Play#1 output Play#1 6 0 524 - Play#1 input lload s 2 80 + Play#1 input lload s 2 40 Play#1 command lload - Play#1 output Play#1 1 80 shells loaded onto hat hvy artillery #2 at 3,1 + Play#1 output Play#1 1 40 shells loaded onto hat hvy artillery #2 at 3,1 Play#1 output Play#1 1 1 unit loaded Play#1 output Play#1 6 0 523 - Play#1 input load land 9 2 + Play#1 input load land 8 2 Play#1 command load - Play#1 output Play#1 1 hat hvy artillery #2 loaded onto cs cargo ship (#9) at 3,1. + Play#1 output Play#1 1 hat hvy artillery #2 loaded onto cs cargo ship (#8) at 3,1. Play#1 output Play#1 1 1 ship loaded Play#1 output Play#1 6 0 522 Play#1 input fire la 2 6,0 Play#1 command fire Play#1 output Play#1 1 Unit 2 cannot fire because it is on a ship! Play#1 output Play#1 6 0 521 - Play#1 input unload land 9 2 + Play#1 input unload land 8 2 Play#1 command unload - Play#1 output Play#1 1 hat hvy artillery #2 unloaded from cs cargo ship (#9) at 3,1. + Play#1 output Play#1 1 hat hvy artillery #2 unloaded from cs cargo ship (#8) at 3,1. Play#1 output Play#1 1 1 ship unloaded Play#1 output Play#1 6 0 520 - Play#1 input lload land 9 2 + Play#1 input lload land 8 2 Play#1 command lload - Play#1 output Play#1 1 hat hvy artillery #2 loaded onto tra train #9 at 3,1. + Play#1 output Play#1 1 hat hvy artillery #2 loaded onto tra train #8 at 3,1. Play#1 output Play#1 1 1 unit loaded Play#1 output Play#1 6 0 519 Play#1 input fire la 2 6,0 Play#1 command fire Play#1 output Play#1 1 Unit 2 cannot fire because it is on a land unit! Play#1 output Play#1 6 0 518 - Play#1 input lunload land 9 2 + Play#1 input lunload land 8 2 Play#1 command lunload - Play#1 output Play#1 1 hat hvy artillery #2 unloaded from tra train #9 at 3,1. + Play#1 output Play#1 1 hat hvy artillery #2 unloaded from tra train #8 at 3,1. Play#1 output Play#1 1 1 unit unloaded Play#1 output Play#1 6 0 517 + Play#1 input miss l * ?mission#0 q + Play#1 command mission + Play#1 output Play#1 1 Thing x,y op-sect rad mission + Play#1 output Play#1 1 hat hvy artillery #1 3,1 3,1 4 is on an interdiction mission + Play#1 output Play#1 1 hat hvy artillery #2 3,1 3,1 4 is on an interdiction mission + Play#1 output Play#1 1 hat hvy artillery #3 3,1 3,1 4 is on an interdiction mission + Play#1 output Play#1 1 hat hvy artillery #4 3,1 3,1 4 is on an interdiction mission + Play#1 output Play#1 1 hat hvy artillery #5 0,-2 0,-2 4 is on an interdiction mission + Play#1 output Play#1 6 0 515 + Play#1 input __cmd added 1 2 0 + Play#1 command __cmd + Play#1 output Play#1 6 0 517 Play#1 input fire la 3 -12,0 Play#1 command fire Play#1 output Play#1 1 hat hvy artillery #3 ready to fire @@ -1108,48 +1129,48 @@ Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 Shells hit sector 2,-2 for 66 damage. Play#1 output Play#1 6 0 511 - Play#1 input lunload g 3 -1 + Play#1 input lunload g 4 -1 Play#1 command lunload - Play#1 output Play#1 1 11 guns unloaded from hat hvy artillery #3 at 3,1 + Play#1 output Play#1 1 11 guns unloaded from hat hvy artillery #4 at 3,1 Play#1 output Play#1 1 1 unit unloaded Play#1 output Play#1 6 0 510 - Play#1 input fire la 3 0,2 + Play#1 input fire la 4 0,2 Play#1 command fire - Play#1 output Play#1 1 hat hvy artillery #3 ready to fire + Play#1 output Play#1 1 hat hvy artillery #4 ready to fire Play#1 output Play#1 1 range is 4.00 (3.50) Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 Shells hit sector 0,2 for 9 damage. Play#1 output Play#1 6 0 509 - Play#1 input lload g 3 11 + Play#1 input lload g 4 11 Play#1 command lload - Play#1 output Play#1 1 11 guns loaded onto hat hvy artillery #3 at 3,1 + Play#1 output Play#1 1 11 guns loaded onto hat hvy artillery #4 at 3,1 Play#1 output Play#1 1 1 unit loaded Play#1 output Play#1 6 0 508 - Play#1 input lunload s 3 -1 + Play#1 input lunload s 4 -1 Play#1 command lunload - Play#1 output Play#1 1 51 shells unloaded from hat hvy artillery #3 at 3,1 + Play#1 output Play#1 1 35 shells unloaded from hat hvy artillery #4 at 3,1 Play#1 output Play#1 1 1 unit unloaded Play#1 output Play#1 6 0 507 - Play#1 input march 3 gh - Play#1 command march - Play#1 output Play#1 1 Leader is hat hvy artillery #3 - Play#1 output Play#1 1 hat hvy artillery #3 stopped at 1,1 + Play#1 input lload s 3 40 + Play#1 command lload + Play#1 output Play#1 1 35 shells loaded onto hat hvy artillery #3 at 3,1 + Play#1 output Play#1 1 1 unit loaded Play#1 output Play#1 6 0 506 - Play#1 input fire la 3 0,2 + Play#1 input fire la 4 0,2 Play#1 command fire - Play#1 output Play#1 1 hat hvy artillery #3 ready to fire + Play#1 output Play#1 1 hat hvy artillery #4 ready to fire Play#1 output Play#1 1 range is 3.00 (3.50) Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 Shells hit sector 0,2 for 15 damage. Play#1 output Play#1 6 0 505 - Play#1 input march 3 jh - Play#1 command march - Play#1 output Play#1 1 Leader is hat hvy artillery #3 - Play#1 output Play#1 1 hat hvy artillery #3 stopped at 3,1 + Play#1 input lunload s 3 35 + Play#1 command lunload + Play#1 output Play#1 1 35 shells unloaded from hat hvy artillery #3 at 3,1 + Play#1 output Play#1 1 1 unit unloaded Play#1 output Play#1 6 0 504 - Play#1 input lload s 3 51 + Play#1 input lload s 4 35 Play#1 command lload - Play#1 output Play#1 1 51 shells loaded onto hat hvy artillery #3 at 3,1 + Play#1 output Play#1 1 35 shells loaded onto hat hvy artillery #4 at 3,1 Play#1 output Play#1 1 1 unit loaded Play#1 output Play#1 6 0 503 Play#1 input fire la 2 0,2 @@ -1159,64 +1180,64 @@ Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 Shells hit sector 0,2 for 20 damage. Play#1 output Play#1 6 0 502 - Play#1 input fire la 3 0,2 + Play#1 input fire la 4 0,2 Play#1 command fire - Play#1 output Play#1 1 hat hvy artillery #3 ready to fire + Play#1 output Play#1 1 hat hvy artillery #4 ready to fire Play#1 output Play#1 1 range is 3.00 (3.50) Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 Shells hit sector 0,2 for 60 damage. Play#1 output Play#1 6 0 501 - Play#1 input march 3 yyyh - Play#1 command march - Play#1 output Play#1 1 Leader is hat hvy artillery #3 - Play#1 output Play#1 1 hat hvy artillery #3 stopped at 0,-2 + Play#1 input __cmd added -1 -1 0 + Play#1 command __cmd Play#1 output Play#1 6 0 500 - Play#1 input fire la 3 0,2 + Play#1 input fire la 5 0,2 Play#1 command fire - Play#1 output Play#1 1 hat hvy artillery #3 ready to fire + Play#1 output Play#1 1 hat hvy artillery #5 ready to fire Play#1 output Play#1 1 range is 3.00 (3.50) Play#1 output Play#1 1 Target out of range. Play#1 output Play#1 6 0 499 - Play#1 input fire la 3 0,2 + Play#1 input fire la 5 0,2 Play#1 command fire - Play#1 output Play#1 1 hat hvy artillery #3 ready to fire + Play#1 output Play#1 1 hat hvy artillery #5 ready to fire Play#1 output Play#1 1 range is 4.00 (3.50) Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 Shells hit sector 0,2 for 52 damage. Play#1 output Play#1 6 0 498 - Play#1 input fire la 3 0,2 + Play#1 input fire la 5 0,2 Play#1 command fire - Play#1 output Play#1 1 hat hvy artillery #3 ready to fire + Play#1 output Play#1 1 hat hvy artillery #5 ready to fire Play#1 output Play#1 1 range is 3.00 (3.50) Play#1 output Play#1 1 Target out of range. Play#1 output Play#1 6 0 497 - Play#1 input fire la 3 0,2 + Play#1 input fire la 5 0,2 Play#1 command fire - Play#1 output Play#1 1 hat hvy artillery #3 ready to fire + Play#1 output Play#1 1 hat hvy artillery #5 ready to fire Play#1 output Play#1 1 range is 4.00 (3.50) Play#1 output Play#1 1 \007Kaboom!!! Play#1 output Play#1 1 Shells hit sector 0,2 for 62 damage. Play#1 output Play#1 6 0 496 - Play#1 input fire la 3 0,2 + Play#1 input fire la 5 0,2 Play#1 command fire - Play#1 output Play#1 1 hat hvy artillery #3 ready to fire + Play#1 output Play#1 1 hat hvy artillery #5 ready to fire Play#1 output Play#1 1 range is 3.00 (3.50) Play#1 output Play#1 1 Target out of range. Play#1 output Play#1 6 0 495 - Play#1 input fire la 3 0,2 + Play#1 input fire la 5 0,2 Play#1 command fire - Play#1 output Play#1 1 hat hvy artillery #3 ready to fire + Play#1 output Play#1 1 hat hvy artillery #5 ready to fire Play#1 output Play#1 1 range is 3.00 (3.50) Play#1 output Play#1 1 Target out of range. Play#1 output Play#1 6 0 494 Play#1 input lcarg * ?shell>0 Play#1 command lcargo Play#1 output Play#1 1 lnd# unit x,y a eff civ mil uw sh gun pet irn dst bar oil lcm hcm rad - Play#1 output Play#1 1 1 hat 3,1 39% 0 10 0 80 12 0 0 0 0 0 0 0 0 - Play#1 output Play#1 1 2 hat 3,1 40% 0 10 0 76 12 0 0 0 0 0 0 0 0 - Play#1 output Play#1 1 3 hat 0,-2 100% 0 10 0 23 12 0 0 0 0 0 0 0 0 - Play#1 output Play#1 1 9 tra 3,1 100% 0 10 0 10 10 0 0 0 0 0 0 0 0 - Play#1 output Play#1 1 4 units + Play#1 output Play#1 1 1 hat 3,1 39% 0 10 0 40 12 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 2 hat 3,1 40% 0 10 0 36 12 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 3 hat 3,1 100% 0 10 0 16 12 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 4 hat 3,1 100% 0 10 0 31 12 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 5 hat 0,-2 100% 0 10 0 16 12 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 9 sup 1,1 100% 0 10 0 10 10 0 0 0 0 0 0 0 0 + Play#1 output Play#1 1 6 units Play#1 output Play#1 6 0 494 Play#1 input ctld Play#1 output Play#1 1 Bye-bye @@ -1284,34 +1305,46 @@ Play#0 output Play#0 1 2 0 frg frigate -12,0 20% 0 0 0 0 0 0 0 0 0 0 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 3 bb battleship 3,1 100% 0 13 0 0 0 0 0 0 87 150 + Play#0 output Play#0 1 1 3 bb battleship 3,1 100% 0 13 0 0 0 0 0 0 127 150 + Play#0 output Play#0 1 1 4 bb battleship 3,1 100% 0 13 0 0 0 0 0 0 127 150 Play#0 output Play#0 1 1 5 dd destroyer 10,0 100% 0 5 0 0 0 0 0 0 117 100 Play#0 output Play#0 1 1 6 dd destroyer 3,3 100% 0 5 0 0 0 0 0 0 127 100 - 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 1 8 cs cargo ship 3,1 100% 0 0 0 0 0 0 0 0 0 20 + Play#0 output Play#0 1 1 9 cs cargo ship 5,1 98% 0 10 0 0 0 0 0 0 124 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 12 ships + Play#0 output Play#0 1 14 ships Play#0 output Play#0 6 0 640 Play#0 input carg * Play#0 command cargo Play#0 output Play#0 1 shp# x,y flt eff civ mil uw sh gun pet irn dst bar oil lcm hcm rad Play#0 output Play#0 1 0 frg -12,0 20% 0 0 0 0 0 0 0 0 0 0 0 0 0 - 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 3 bb 3,1 100% 0 13 0 162 10 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 1 bb 3,1 59% 0 13 0 100 10 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 2 bb 3,1 60% 0 13 0 96 10 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 3 bb 3,1 100% 0 13 0 72 10 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 4 bb 3,1 100% 0 13 0 90 10 0 0 0 0 0 0 0 0 Play#0 output Play#0 1 5 dd 10,0 100% 0 5 0 24 4 0 0 0 0 0 0 0 0 Play#0 output Play#0 1 6 dd 3,3 100% 0 5 0 36 4 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 8 cs 3,1 100% 0 0 0 0 0 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 9 cs 5,1 98% 0 10 0 10 9 0 0 0 0 0 0 0 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 12 ships + Play#0 output Play#0 1 14 ships Play#0 output Play#0 6 0 640 + Play#0 input miss s * ?mission#0 q + Play#0 command mission + Play#0 output Play#0 1 Thing x,y op-sect rad mission + Play#0 output Play#0 1 bb battleship (#1) 3,1 3,1 4 is on an interdiction mission + Play#0 output Play#0 1 bb battleship (#2) 3,1 3,1 4 is on an interdiction mission + Play#0 output Play#0 1 bb battleship (#4) 3,1 3,1 4 is on an interdiction mission + Play#0 output Play#0 1 dd destroyer (#6) 3,3 3,3 2 is on an interdiction mission + Play#0 output Play#0 6 0 638 Play#0 input plane * Play#0 command plane Play#0 output Play#0 1 own # type x,y w eff mu def tech ran hard carry special @@ -1324,53 +1357,66 @@ Play#0 output Play#0 1 2 32 sam Sea Sparrow 2,2 100% 127 18 180 2 0 32L Play#0 output Play#0 1 2 33 sam Sea Sparrow 2,2 100% 127 18 180 2 0 33L Play#0 output Play#0 1 8 planes - Play#0 output Play#0 6 0 640 + Play#0 output Play#0 6 0 638 Play#0 input land * Play#0 command land 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 1 3 hat hvy artill 0,-2 100% 10 0 51 0 160 42% 0 0 - Play#0 output Play#0 1 1 9 tra train 3,1 100% 10 0 0 0 40 42% 0 0 + Play#0 output Play#0 1 1 3 hat hvy artill 3,1 100% 10 0 127 0 160 42% 0 0 + Play#0 output Play#0 1 1 4 hat hvy artill 3,1 100% 10 0 127 0 160 42% 0 0 + Play#0 output Play#0 1 1 5 hat hvy artill 0,-2 100% 10 0 127 0 160 42% 0 0 + Play#0 output Play#0 1 1 8 tra train 3,1 100% 0 0 127 0 40 42% 0 0 + Play#0 output Play#0 1 1 9 sup supply 1,1 100% 10 0 0 0 50 42% 0 0 Play#0 output Play#0 1 2 13 spy infiltrato 6,0 100% 0 0 127 0 40 42% 0 0 13S 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 23 rad radar unit 6,0 100% 10 0 127 0 270 42% 1 0 23S 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 9 units - Play#0 output Play#0 6 0 640 + Play#0 output Play#0 1 12 units + Play#0 output Play#0 6 0 638 Play#0 input lcarg * Play#0 command lcargo 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 3 hat 0,-2 100% 0 10 0 23 12 0 0 0 0 0 0 0 0 - Play#0 output Play#0 1 9 tra 3,1 100% 0 10 0 10 10 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 1 hat 3,1 39% 0 10 0 40 12 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 2 hat 3,1 40% 0 10 0 36 12 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 3 hat 3,1 100% 0 10 0 16 12 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 4 hat 3,1 100% 0 10 0 31 12 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 5 hat 0,-2 100% 0 10 0 16 12 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 8 tra 3,1 100% 0 0 0 0 0 0 0 0 0 0 0 0 0 + Play#0 output Play#0 1 9 sup 1,1 100% 0 10 0 10 10 0 0 0 0 0 0 0 0 Play#0 output Play#0 1 13 spy 6,0 100% 0 0 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 23 rad 6,0 100% 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 9 units - Play#0 output Play#0 6 0 640 + Play#0 output Play#0 1 12 units + Play#0 output Play#0 6 0 638 + Play#0 input miss l * ?mission#0 q + Play#0 command mission + Play#0 output Play#0 1 Thing x,y op-sect rad mission + Play#0 output Play#0 1 hat hvy artillery #1 3,1 3,1 4 is on an interdiction mission + Play#0 output Play#0 1 hat hvy artillery #2 3,1 3,1 4 is on an interdiction mission + Play#0 output Play#0 1 hat hvy artillery #4 3,1 3,1 4 is on an interdiction mission + Play#0 output Play#0 6 0 636 Play#0 input nuke * Play#0 command nuke Play#0 output Play#0 1 own # nuke type x,y s eff tech carry burst Play#0 output Play#0 1 2 0 10kt fission 2,2 100% 280 Play#0 output Play#0 1 2 1 10kt fission 2,2 100% 280 1P ground Play#0 output Play#0 1 2 nukes - Play#0 output Play#0 6 0 640 + Play#0 output Play#0 6 0 636 Play#0 input terr * 0 Play#0 command territory - Play#0 output Play#0 6 0 640 + Play#0 output Play#0 6 0 636 Play#0 input read 0 Play#0 command read Play#0 output Play#0 1 No telegrams for you at the moment... - Play#0 output Play#0 6 0 640 + Play#0 output Play#0 6 0 636 Play#0 input read 1 Play#0 command read Play#0 output Play#0 1 No telegrams for 1 at the moment... - Play#0 output Play#0 6 0 640 + Play#0 output Play#0 6 0 636 Play#0 input read 2 Play#0 command read Play#0 output Play#0 1 @@ -1415,9 +1461,7 @@ 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. Play#0 output Play#0 1 Country #1 shelled sector 0,2 for 21 damage. - Play#0 output Play#0 1 1 bb battleship (#3) sighted at 3,1 Play#0 output Play#0 1 Country #1 shelled sector 0,2 for 50 damage. - Play#0 output Play#0 1 1 bb battleship (#3) sighted at 3,1 Play#0 output Play#0 1 Country #1 shelled sector 0,2 for 12 damage. Play#0 output Play#0 1 Country #1 shelled sector 0,2 for 12 damage. Play#0 output Play#0 1 Country #1 shelled sector 0,2 for 23 damage. @@ -1446,11 +1490,11 @@ Play#0 output Play#0 1 Country #1 shelled sector 0,2 for 60 damage. Play#0 output Play#0 1 Country #1 shelled sector 0,2 for 52 damage. Play#0 output Play#0 1 Country #1 shelled sector 0,2 for 62 damage. - Play#0 output Play#0 6 0 640 + Play#0 output Play#0 6 0 636 Play#0 input read 3 Play#0 command read Play#0 output Play#0 1 No telegrams for 3 at the moment... - Play#0 output Play#0 6 0 640 + Play#0 output Play#0 6 0 636 Play#0 input ctld Play#0 output Play#0 1 Bye-bye Play#0 logout 0 diff --git a/tests/fire/setup-POGO b/tests/fire/setup-POGO index a117db4ad..241dd2d9a 100644 --- a/tests/fire/setup-POGO +++ b/tests/fire/setup-POGO @@ -1,6 +1,5 @@ || create land desi @0,0:2 + -edit l 4,2 e 100 give c * ?des#. 100 || country#1 add 1 1 1 p @@ -84,19 +83,31 @@ edit p 0 U 32 y 32 U 33 y 33 build n 2,2 10kt 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 +| bb range >=3, 59% 60% 100% 100% +edit s 0 U 1 t bb T 150 L 3,1 O 1 E 59 M 127 m 13 g 10 s 100 +edit s 1 U 2 E 60 U 3 E 100 U 4 | cs -edit s 0 U 9 t cs L 3,1 O 1 E 100 M 127 m 10 g 10 s 10 +edit s 0 U 8 t cs L 3,1 O 1 E 100 +edit s 8 U 9 L 5,1 M 127 m 10 g 10 s 10 +| note: away from bb to avoid unwanted supply | dd range 1.5 edit s 0 U 5 t dd T 100 L 8,0 O 1 E 100 M 127 m 5 g 4 s 40 edit s 5 U 6 L 3,3 +| missions for fire to clear +| (not all ships can perform missions) +miss s * ?own=1 int . || firing lands -| hat range 3.5 39% 40% 100% -edit u 0 U 1 T hat t 160 L 3,1 O 1 e 39 m 10 g 12 s 80 U 2 e 40 U 3 e 100 +| hat range 3.5 39% 40% 100% 100% 100% +edit u 0 U 1 T hat t 160 L 3,1 O 1 e 39 m 10 g 12 s 40 +edit u 1 U 2 e 40 U 3 e 100 U 4 U 5 L 0,-2 | tra -edit u 0 U 9 T tra L 3,1 O 1 M 0 m 10 g 10 s 10 -| note: no mob in train to avoid unwanted supply +edit u 0 U 8 T tra L 3,1 O 1 +| sup +edit u 0 U 9 T sup L 1,1 O 1 M 0 m 10 g 10 s 10 +| note: no mob in sup to avoid unwanted supply +| missions for fire to clear +| (not all land units can perform missions) +miss l * ?own=1 int . || show initial state here to help maintainers map * cens * ?own#0 -- 2.43.0