Add land units tests to nightly builds and improve economy

Up the bar production.  Start education and tech for player 08
Improve the general economy for player 08.  Add land units building
tests to player 01, including ensuring the tech is high to build.

diff --git a/src/scripts/nightly/tests/09/01 b/src/scripts/nightly/tests/09/01
index 9e917444be9129f4c36ab924bd2ea1fb5f2c85d5..9de059877172c9569dcb63cefb20270e6d091c96 100755 (executable)
--- a/src/scripts/nightly/tests/09/01
+++ b/src/scripts/nightly/tests/09/01
@@ -9,6 +9,7 @@ thres s -2,2 1
 thres o -2,2 0
 mov o -2,2 1 4,-2
 thres c * ?des#= 769
+thres c -1:1,3 100
 bmap #1
 cen *
 ship *

diff --git a/src/scripts/nightly/tests/09/08 b/src/scripts/nightly/tests/09/08
index 9d0ae3457e6442742b8f7f347f5e01e026e4f8ce..f6c4a1230d03093d82dd3776a08008067486b8e2 100755 (executable)
--- a/src/scripts/nightly/tests/09/08
+++ b/src/scripts/nightly/tests/09/08
@@ -11,10 +11,11 @@ thres c -6,-4 769
 thres c 6,-2 769
 thres c 1,-3 769
 des 4,0 b
-thres d 4,0 100
+thres d 4,0 300
 thres d 0:2,0 0
 mov d 0,0 1 4,0
 mov d 2,0 1 4,0
+thres i -3,-1 999
 bmap #
 cen *
 map #

diff --git a/src/scripts/nightly/tests/10/01 b/src/scripts/nightly/tests/10/01
index e966088273492c9a61964b1b52400b1d1d6cd922..016dfdbec5f272fd74cd3df16881ff9658734a1c 100755 (executable)
--- a/src/scripts/nightly/tests/10/01
+++ b/src/scripts/nightly/tests/10/01
@@ -42,6 +42,7 @@ mov d 10,2 1 -1,-1
 des 5,3 p
 thres l 5,3 75
 dist #1 5,-1
+thres c -1:1,3 769
 spy 11,-1
 bmap #1
 cen *

diff --git a/src/scripts/nightly/tests/10/08 b/src/scripts/nightly/tests/10/08
index f12a663c9e56b0dc0a78f767e00e30543afdab28..d2487f528686940ddf209874ec6375267b981701 100755 (executable)
--- a/src/scripts/nightly/tests/10/08
+++ b/src/scripts/nightly/tests/10/08
@@ -7,6 +7,9 @@ thres l -3,-1 1
 thres c 6,0 769
 thres d -3,-1 0
 mov d -3,-1 1 4,0
+thres l 1,-3 300
+thres i -1,1 999
+thres i 0,-4 999
 bmap #
 cen *
 map #

diff --git a/src/scripts/nightly/tests/11/01 b/src/scripts/nightly/tests/11/01
index 5e6ef8ffd1683a8be2d0f86b10979c5834a664dc..f64732b38c97f70f49e03d21157d03bb4f864811 100755 (executable)
--- a/src/scripts/nightly/tests/11/01
+++ b/src/scripts/nightly/tests/11/01
@@ -8,6 +8,7 @@ thres i 5,-1 1
 thres o 5,-1 1
 thres d 5,-1 1
 dist #1 6,2
+build l 10,2 cav
 bmap #1
 cen *
 ship *

diff --git a/src/scripts/nightly/tests/11/08 b/src/scripts/nightly/tests/11/08
index 4e326aae6d14ba9c25cd1a046ee05a94b259c133..bc29c7b0f466fa52cc079779204205aeb9a25a0c 100755 (executable)
--- a/src/scripts/nightly/tests/11/08
+++ b/src/scripts/nightly/tests/11/08
@@ -5,6 +5,17 @@ des -1,-1 m
 thres i -1,-1 1
 thres d -1,-1 0
 mov d -1,-1 1 4,0
+des 1,-3 l
+des -1,1 j
+thres l -1,1 1
+des 0,-4 k
+thres h 0,-4 1
+thres d 1,-3 0
+thres l 6,-2 300
+thres o 6,-2 150
+thres d 6,-2 30
+thres l 8,0 600
+thres h 8,0 300
 bmap #
 cen *
 map #

diff --git a/src/scripts/nightly/tests/12/01 b/src/scripts/nightly/tests/12/01
new file mode 100755 (executable)
index 0000000..def0760
--- /dev/null
+++ b/src/scripts/nightly/tests/12/01
@@ -0,0 +1,14 @@
+#!/bin/sh
+. "${SCRIPTDIR}"/common.sh
+runfeed 1 << EOF
+build l 10,2 cav 3
+build sh 5,-1 cs 2
+thres m 10,2 25
+bmap #1
+cen *
+ship *
+land *
+map #
+read y
+prod *
+EOF

diff --git a/src/scripts/nightly/tests/12/08 b/src/scripts/nightly/tests/12/08
new file mode 100755 (executable)
index 0000000..4c1417b
--- /dev/null
+++ b/src/scripts/nightly/tests/12/08
@@ -0,0 +1,15 @@
+#!/bin/sh
+. "${SCRIPTDIR}"/common.sh
+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
+bmap #
+cen *
+map #
+read y
+prod *
+EOF