Add scrap and scuttle tests to nightly builds

Also general improvements to economy for player 08.

diff --git a/src/scripts/nightly/tests/11/08 b/src/scripts/nightly/tests/11/08
index bc29c7b0f466fa52cc079779204205aeb9a25a0c..c3cfb6989feba5a828f64f210aa1145159770e7f 100755 (executable)
--- a/src/scripts/nightly/tests/11/08
+++ b/src/scripts/nightly/tests/11/08
@@ -16,6 +16,9 @@ thres o 6,-2 150
 thres d 6,-2 30
 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  
 bmap #
 cen *
 map #

diff --git a/src/scripts/nightly/tests/12/01 b/src/scripts/nightly/tests/12/01
index def0760d1bf285e59d63bb830f13397eb2b8623f..05e624479a525984079cef8f3aad66bb91c614e4 100755 (executable)
--- a/src/scripts/nightly/tests/12/01
+++ b/src/scripts/nightly/tests/12/01
@@ -1,9 +1,11 @@
 #!/bin/sh
 . "${SCRIPTDIR}"/common.sh
 runfeed 1 << EOF
-build l 10,2 cav 3
-build sh 5,-1 cs 2
+build l 10,2 cav 5
+build sh 5,-1 cs 3
 thres m 10,2 25
+thres i -4:-2,-2 999
+thres i 1,-3 999
 bmap #1
 cen *
 ship *

diff --git a/src/scripts/nightly/tests/12/08 b/src/scripts/nightly/tests/12/08
index 4c1417b4267772880aceb27127131963a1336ee4..522846e203f7868f0590551f4bd3166378977f16 100755 (executable)
--- a/src/scripts/nightly/tests/12/08
+++ b/src/scripts/nightly/tests/12/08
@@ -7,6 +7,11 @@ thres d 6,0 0
 des 8,0 i
 thres l 6,0 200
 thres h 6,0 200
+thres c 4,0 400
+thres c -2:4,-2 769
+thres i 4,-2 999
+des 4,-2 j
+thres i -3,1 999
 bmap #
 cen *
 map #

diff --git a/src/scripts/nightly/tests/13/01 b/src/scripts/nightly/tests/13/01
new file mode 100755 (executable)
index 0000000..43a06e7
--- /dev/null
+++ b/src/scripts/nightly/tests/13/01
@@ -0,0 +1,58 @@
+#!/bin/sh
+. "${SCRIPTDIR}"/common.sh
+runfeed 1 << EOF
+des -2,-2 j
+thres l -2,-2 1
+des -4,-2 k
+thres h -4,-2 1
+thres o -4:-2,-2 0
+des 1,-3 j
+thres l -2,-2 1
+des -1,3 o
+thres o -1,3 1
+des 2,2 m
+thres i 2,2 1
+thres h 2,2 0
+des 3,-1 m
+thres l 3,-1 0
+thres i 3,-1 1
+thres l 6,-2 400
+radar 11,-1
+lload m 0 20
+lload m 1/2/3 1
+march 0/1/2/3 5,-1
+load m 1 25
+load c 1 300
+load l 1 100
+load h 1 100
+load c 2 10
+load c 3 10
+load land 1 0
+load land 2 1
+load land 3 2
+load land 3 3
+build l 10,2 art
+nav 2 nh
+scrap l 1
+y
+scrap s 2
+y
+scuttle l 1
+y
+scuttle s 2
+y
+comm 5,-1
+scrap l 2
+y
+comm 5,-1
+scrap s 3
+y
+comm 5,-1
+bmap #1
+cen *
+ship *
+land *
+map #
+read y
+prod *
+EOF

diff --git a/src/scripts/nightly/tests/13/08 b/src/scripts/nightly/tests/13/08
new file mode 100755 (executable)
index 0000000..b8c69f5
--- /dev/null
+++ b/src/scripts/nightly/tests/13/08
@@ -0,0 +1,20 @@
+#!/bin/sh
+. "${SCRIPTDIR}"/common.sh
+runfeed 8 << EOF
+thres c -2,0 769
+thres c 1,1 769
+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 0:2,0 512
+thres d -3,1 0
+thres l -3,1 1
+des -3,1 j
+bmap #
+cen *
+map #
+read y
+prod *
+EOF