tests/fire: Clean up setup a bit

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/tests/fire/setup-POGO b/tests/fire/setup-POGO
index 389de8bdf6789ca881a2a2d074c3bfd635210d47..a117db4ad7b38aadae270cba97e31403ffe4f34a 100644 (file)
--- a/tests/fire/setup-POGO
+++ b/tests/fire/setup-POGO
@@ -1,12 +1,14 @@
-|| an island
-des @0,0:2 +
+|| create land
+desi @0,0:2 +
 edit l 4,2 e 100
 give c * ?des#. 100
 || country#1
 add 1 1 1 p
-des -2:4,0 f
-des 1,-1 c
-des 3,1 h
+desi 1,-1 c
+edit c 1 c 1,-1 s 4 b 640 M 25000 T 100
+desi 3,1 h
+| one highway, four forts (4% 5% 100% 100%), all with mil, guns & shells
+desi -2:4,0 f
 edit l * ?des#. o 1 O 1
 give m -4:4,0 5
 give g -4:4,0 1
@@ -15,11 +17,11 @@ edit l -2,0 e 4
 edit l 0,0 e 5
 give g 4,0 6
 give s 2:4,0 99
-edit c 1 c 1,-1 s 4 b 640 M 25000 T 100
 || country#2
-| target harbor, highways
-des 2,2 h
 add 2 2 2 p
+edit c 2 s 4 b 640 M 25000 T 100
+| target harbor, highways
+desi 2,2 h
 edit l -2:4,2:3 ?des#. o 2 O 2
 give l * ?own=2 100
 give h * ?own=2 100
@@ -27,13 +29,11 @@ edit l * ?own=2 a 100 R 100 r 100 d 100
 | 0,2 is at risk of getting shelled to deity
 | can upset the rest of the test when it happens, avoid by adding more civs
 give c 0,2 900
-| make country active, so it gets bulletins
-edit c 2 s 4 b 640 M 25000 T 100
 || country#3
 | just a sanctuary @ 2,-2
-des 2,-2 s
 add 3 3 3 p
 edit c 3 c 2,-2 b 640 M 25000
+desi 2,-2 s
 || finishing touches to land
 edit l * ?des#.&eff=0 e 100
 edit l * ?des#.&des#h m 127