diff --git a/src/scripts/nightly/tests/06/01 b/src/scripts/nightly/tests/06/01 index 408e8e75..93eed5eb 100755 --- a/src/scripts/nightly/tests/06/01 +++ b/src/scripts/nightly/tests/06/01 @@ -13,7 +13,7 @@ thres d 3,1 1 thres c 3,1 769 des 0,0 m deliver i 0,0 0 g -thres d -1,-1 75 +thres d -1,-1 300 thres d 0,0 0 mov d 0,0 1 -1,-1 thres c 0,-2 100 diff --git a/src/scripts/nightly/tests/10/01 b/src/scripts/nightly/tests/10/01 index 016dfdbe..691582e6 100755 --- a/src/scripts/nightly/tests/10/01 +++ b/src/scripts/nightly/tests/10/01 @@ -8,6 +8,7 @@ thres c 9,-1 77 mov u 7,-1 12 4,0 thres u 2,0 579 thres u 4,0 869 +thres i 4,0 1200 thres u 11,-1 1 thres l 6,-2 250 des 7,1 d diff --git a/src/scripts/nightly/tests/11/08 b/src/scripts/nightly/tests/11/08 index c3cfb698..18aec92f 100755 --- a/src/scripts/nightly/tests/11/08 +++ b/src/scripts/nightly/tests/11/08 @@ -18,7 +18,7 @@ thres l 8,0 600 thres h 8,0 300 thres c -3:-1,1 769 thres c 0,-4 769 -thres c 8,0 769 +thres c 8,0 769 bmap # cen * map # diff --git a/src/scripts/nightly/tests/12/08 b/src/scripts/nightly/tests/12/08 index 522846e2..fea65f13 100755 --- a/src/scripts/nightly/tests/12/08 +++ b/src/scripts/nightly/tests/12/08 @@ -4,9 +4,10 @@ runfeed 8 << EOF des 6,-2 t des 6,0 h thres d 6,0 0 -des 8,0 i thres l 6,0 200 thres h 6,0 200 +des 8,0 i +thres s 8,0 1 thres c 4,0 400 thres c -2:4,-2 769 thres i 4,-2 999 diff --git a/src/scripts/nightly/tests/13/01 b/src/scripts/nightly/tests/13/01 index 43a06e77..d1c3fa35 100755 --- a/src/scripts/nightly/tests/13/01 +++ b/src/scripts/nightly/tests/13/01 @@ -7,7 +7,8 @@ des -4,-2 k thres h -4,-2 1 thres o -4:-2,-2 0 des 1,-3 j -thres l -2,-2 1 +thres l 1,-3 1 +thres o 1,-3 0 des -1,3 o thres o -1,3 1 des 2,2 m @@ -48,6 +49,9 @@ comm 5,-1 scrap s 3 y comm 5,-1 +thres i 5,-1 0 +thres d 5,-1 0 +thres o 5,-1 0 bmap #1 cen * ship * diff --git a/src/scripts/nightly/tests/13/02 b/src/scripts/nightly/tests/13/02 new file mode 100755 index 00000000..07c26b50 --- /dev/null +++ b/src/scripts/nightly/tests/13/02 @@ -0,0 +1,93 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 2 << EOF +explore c 2,0 1 uh +explore c 2,0 1 jh +explore c 2,0 1 bh +explore c 2,0 1 nh +des * ?des=- + +explore c 2,0 1 yuh +explore c 2,0 1 ygh +explore c 2,0 1 juh +explore c 2,0 1 ggh +explore c 2,0 1 bgh +explore c 2,0 1 bbh +explore c 2,0 1 bnh +des * ?des=- + +explore c 2,0 1 jujh +explore c 2,0 1 gggh +explore c 2,0 1 bggh +explore c 2,0 1 bbgh +explore c 2,0 1 bbbh +explore c 2,0 1 bbnh +explore c 2,0 1 bnnh +des * ?des=- + +explore c 2,0 1 gggyh +explore c 2,0 1 ggggh +explore c 2,0 1 bgggh +explore c 2,0 1 bbggh +explore c 2,0 1 bbbgh +des * ?des=- + +explore c 2,0 1 gggyuh +des * ?des=- + +explore c 0,0 1 yh +explore c 0,0 1 gh +explore c 0,0 1 bh +explore c 0,0 1 nh +des * ?des=- + +explore c 0,0 1 uuh +explore c 0,0 1 juh +explore c 0,0 1 ggh +explore c 0,0 1 jjh +explore c 0,0 1 bgh +explore c 0,0 1 jnh +explore c 0,0 1 bbh +explore c 0,0 1 bnh +explore c 0,0 1 nnh +des * ?des=- + +explore c 0,0 1 ggyh +explore c 0,0 1 jjuh +explore c 0,0 1 gggh +explore c 0,0 1 bggh +explore c 0,0 1 bbgh +explore c 0,0 1 bbbh +explore c 0,0 1 bbnh +explore c 0,0 1 bnnh +explore c 0,0 1 nnnh +des * ?des=- + +explore c 0,0 1 ggyyh +explore c 0,0 1 ggyuh +explore c 0,0 1 ggygh +explore c 0,0 1 jjujh +explore c 0,0 1 bgggh +des * ?des=- + +designate 2,-2 c +capital 2,-2 +des * ?gold>10 g +thres d * ?gold>10 1 +des -1,-1 o +thres o -1,-1 1 +des 1,-1 b +thres d 1,-1 300 +thres c * ?des#+ 769 +thres c -4,-2 230 +thres c 2,-2 50 +thres c 1,-1 385 +thres c 3,-1 300 +thres c 5,-1 600 +des -4,-2 w +distr * 1,-1 +mov c 1,1 231 -4,-2 +demob 0:2,0 55 +y +mov c 0,0 260 3,-1 +mov c 2,0 165 3,-1 +mov c 2,0 100 5,-1 +thres u 0:2,0 579 +thres u -5,-1 579 +bmap #1 +cen * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/13/08 b/src/scripts/nightly/tests/13/08 index b8c69f5b..319450c5 100755 --- a/src/scripts/nightly/tests/13/08 +++ b/src/scripts/nightly/tests/13/08 @@ -7,10 +7,13 @@ thres c 5,-1 769 thres c -5,-3 769 thres c -4,-2 769 thres c -1,-3 769 -thres u -1,-1 512 +thres u -1:3,-1 512 thres u 0:2,0 512 thres d -3,1 0 thres l -3,1 1 +thres i 2,-2 999 +des 2,-2 k +thres h 2,-2 1 des -3,1 j bmap # cen * diff --git a/src/scripts/nightly/tests/14/01 b/src/scripts/nightly/tests/14/01 new file mode 100755 index 00000000..0c577c71 --- /dev/null +++ b/src/scripts/nightly/tests/14/01 @@ -0,0 +1,30 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 1 << EOF +lload m 4/5 5 +lload s 5 200 +lload g 5 20 +march 4/5 ggyyh +thres l 6,-2 450 +des 11,-1 * +thres l 11,-1 200 +thres h 11,-1 200 +thres p 11,-1 200 +thres u 3:5,1 579 +des 2,-2 o +build s 5,-1 tk +load c 2 200 +telegram 2 +Want an alliance? +. +declare war 8 +declare alliance 2 +bmap #1 +cen * +ship * +land * +plane * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/14/02 b/src/scripts/nightly/tests/14/02 new file mode 100755 index 00000000..27cd4a17 --- /dev/null +++ b/src/scripts/nightly/tests/14/02 @@ -0,0 +1,25 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 2 << EOF +des 0:2,0 m +thres i 0:2,0 1 +thres i -5,-1 999 +dist * -4,-2 +thres o 4,0 1 +wall +Sure +. +declare alliance 1 +declare hostile 8 +wire y +announce +Hello World +. +wire y +flash 1 Testing Flash +bmap #1 +cen * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/14/08 b/src/scripts/nightly/tests/14/08 new file mode 100755 index 00000000..c4aafd71 --- /dev/null +++ b/src/scripts/nightly/tests/14/08 @@ -0,0 +1,20 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 8 << EOF +thres c * 769 +thres i -2:0,-2 1 +des -2:0,-2 m +thres d -2:2,-2 0 +thres o 5,-1 10 +thres l 5,-1 50 +thres h 5,-1 100 +thres h -6,-4 100 +declare war 1 +declare hostile 2 +wire y +bmap # +cen * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/15/01 b/src/scripts/nightly/tests/15/01 new file mode 100755 index 00000000..69560fad --- /dev/null +++ b/src/scripts/nightly/tests/15/01 @@ -0,0 +1,26 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 1 << EOF +build p 11,-1 f1 3 +thres s 11,-1 200 +thres p 11,-1 200 +des 2,-2 % +thres p 2,-2 1 +thres s 5,-1 200 +thres g 5,-1 10 +thres d -1,-1 0 +thres c * 0 +march 4/5 ujjjh +build s 5,-1 od +load c 3 200 +build s 5,-1 ft +load c 4 200 +bmap #1 +cen * +ship * +land * +plane * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/15/02 b/src/scripts/nightly/tests/15/02 new file mode 100755 index 00000000..af0204a8 --- /dev/null +++ b/src/scripts/nightly/tests/15/02 @@ -0,0 +1,15 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 2 << EOF +des -5,-1 j +thres l -5,-1 1 +thres l 3,-1 300 +thres c 5,-1 769 +thres i 5,-1 999 +thres c 7,-1 400 +bmap #1 +cen * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/15/08 b/src/scripts/nightly/tests/15/08 new file mode 100755 index 00000000..001b5eee --- /dev/null +++ b/src/scripts/nightly/tests/15/08 @@ -0,0 +1,33 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 8 << EOF +des 5,-1 d +thres g 5,-1 1 +des -6,-4 f +thres g -6,-4 7 +thres s -6,-4 200 +des -4,-2 * +thres l -4,-2 200 +thres h -4,-2 200 +thres s -4,-2 200 +thres d -4,-2 0 +des -1,-3 ! +thres l -1,-3 200 +thres h -1,-3 200 +thres s -1,-3 200 +thres g -1,-3 10 +thres d -1,-3 0 +des -2,0 p +thres d -2,0 0 +thres l -2,0 75 +des 1,1 k +thres i 1,1 999 +thres h 1,1 1 +thres l 1,-3 400 +mov m 0,0 55 -6,-4 +bmap # +cen * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/16/01 b/src/scripts/nightly/tests/16/01 new file mode 100755 index 00000000..ca98b4d5 --- /dev/null +++ b/src/scripts/nightly/tests/16/01 @@ -0,0 +1,37 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 1 << EOF +mov c 1,-1 230 jjh +mov c 3,-1 230 jh +mov c 2,-2 230 njh +mov c 4,-2 230 nh +mov c 6,-2 230 bh +load c 3/4 999 +nav 3 6,0 +h +nav 3 vh +order 3 des 5,-1 6,0 +order 3 level 1 end oil 1 +nav 4 nvh +order 4 des 5,-1 6,0 +order 4 level 1 start food 30 +order 4 level 1 end food 30 +reco 0 . 11,-1 ujbgh +bomb 1 . stat 11,-1 ujh +mission p 2 o . 2 +fire l 5 12,-2 +attack 12,-2 0 0 0 0 +0 +N +attack 12,-2 +1 +y +bmap #1 +cen * +ship * +land * +plane * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/16/02 b/src/scripts/nightly/tests/16/02 new file mode 100755 index 00000000..73ebd39f --- /dev/null +++ b/src/scripts/nightly/tests/16/02 @@ -0,0 +1,20 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 2 << EOF +des 3,-1 l +thres d 3,-1 0 +des 5,-1 k +thres d 5,-1 0 +thres h 5,-1 1 +thres c 7,-1 769 +thres i 7,-1 999 +thres l -6,0 300 +thres o -6,0 150 +thres d -6,0 30 +thres c -6,0 400 +bmap #1 +cen * +map # +read y +prod * +EOF diff --git a/src/scripts/nightly/tests/16/08 b/src/scripts/nightly/tests/16/08 new file mode 100755 index 00000000..593352f5 --- /dev/null +++ b/src/scripts/nightly/tests/16/08 @@ -0,0 +1,12 @@ +#!/bin/sh +. "${SCRIPTDIR}"/common.sh +runfeed 8 << EOF +des -4,-4 o +thres o -4,-4 1 +thres o -5,-3 0 +bmap # +cen * +map # +read y +prod * +EOF