empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tests/fire: Protect against unintended shelling to deity

Browse source 
Sector 0,2 takes a lot of damage.  When it gets shot to deity, the
rest of the test can be upset.  Avoid by putting more civilians there.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2014-01-18 16:32:39 +01:00
parent e2c8b7d145
commit 57f53293e6
3 changed files with 10 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
tests/fire/final.xdump
View file

@ -32,7 +32,7 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
0 -5 1 0 0 0 0 0 0 0 0 0 0 -5 1 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 0 -5 1 0 0 0 0 0 0 0 0 0 0 -5 1 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
1 -3 1 24 100 127 0 0 0 0 0 0 0 -3 1 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 -3 1 24 100 127 0 0 0 0 0 0 0 -3 1 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 -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 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
0 0 2 24 2 0 0 0 0 0 0 0 0 0 2 1 0 100 1 24 0 0 0 0 0 2 0 0 0 0 0 0 0 0 0 0 1 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 0 2 24 2 2 0 0 0 0 0 0 0 0 2 1 0 0 1 24 0 0 0 0 0 2 12 0 0 0 0 0 0 0 0 0 1 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 87 0 0 0 0 0 0 0 0 2 2 86 0 0 1 12 0 0 0 0 0 2 87 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 2 2 2 12 87 0 0 0 0 0 0 0 0 2 2 86 0 0 1 12 0 0 0 0 0 2 87 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
2 4 2 28 98 124 0 0 0 0 0 0 0 4 2 98 0 0 1 28 0 0 0 0 0 2 98 0 0 0 0 0 0 0 0 0 98 98 0 0 0 0 0 0 0 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 98 98 98 2 4 2 28 98 124 0 0 0 0 0 0 0 4 2 98 0 0 1 28 0 0 0 0 0 2 98 0 0 0 0 0 0 0 0 0 98 98 0 0 0 0 0 0 0 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 98 98 98
0 6 2 0 0 0 0 0 0 0 0 0 0 6 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 0 6 2 0 0 0 0 0 0 0 0 0 0 6 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
@ -596,7 +596,7 @@ timestamp owner type id x y
0 2 2 31 1 3 0 2 2 31 1 3
0 2 2 2 1 3 0 2 2 2 1 3
0 2 4 2 1 3 0 2 4 2 1 3
0 2 0 0 0 2 0 2 0 0 1 3
0 2 3 0 2 2 0 2 3 0 2 2
0 2 3 10 2 2 0 2 3 10 2 2
0 2 3 12 2 2 0 2 3 12 2 2

10
tests/fire/journal.log
View file

@ -366,7 +366,7 @@
Play#0 output Play#0 1 1 2,-2 s 100% 127 .. .. 100 0 0 0 0% 0 0 1 Play#0 output Play#0 1 1 2,-2 s 100% 127 .. .. 100 0 0 0 0% 0 0 1
Play#0 output Play#0 1 0 6,0 . 0% 0 .. .. 0 0 0 0 0% 0 0 1 Play#0 output Play#0 1 0 6,0 . 0% 0 .. .. 0 0 0 0 0% 0 0 1
Play#0 output Play#0 1 0 14,0 . 0% 0 .. .. 0 0 0 0 0% 0 0 1 Play#0 output Play#0 1 0 14,0 . 0% 0 .. .. 0 0 0 0 0% 0 0 1
Play#0 output Play#0 1 2 0,2 + 100% 127 .. .. 100 0 0 0 0% 100 0 1 Play#0 output Play#0 1 2 0,2 + 100% 127 .. .. 1000 0 0 0 0% 100 0 1
Play#0 output Play#0 1 2 2,2 h 87% 0 .. .. 87 0 0 0 0% 86 0 1 Play#0 output Play#0 1 2 2,2 h 87% 0 .. .. 87 0 0 0 0% 86 0 1
Play#0 output Play#0 1 2 4,2 = 98% 124 .. .. 98 0 0 0 0% 98 0 1 Play#0 output Play#0 1 2 4,2 = 98% 124 .. .. 98 0 0 0 0% 98 0 1
Play#0 output Play#0 1 0 1,3 . 0% 0 .. .. 0 0 0 0 0% 78 0 1 Play#0 output Play#0 1 0 1,3 . 0% 0 .. .. 0 0 0 0 0% 78 0 1
@ -874,7 +874,7 @@
Play#0 output Play#0 1 1 2,-2 s 100% 127 .. .. 100 0 0 0 0% 0 0 1 Play#0 output Play#0 1 1 2,-2 s 100% 127 .. .. 100 0 0 0 0% 0 0 1
Play#0 output Play#0 1 0 6,0 . 0% 0 .. .. 0 0 0 0 0% 0 0 1 Play#0 output Play#0 1 0 6,0 . 0% 0 .. .. 0 0 0 0 0% 0 0 1
Play#0 output Play#0 1 0 14,0 . 0% 0 .. .. 0 0 0 0 0% 0 0 1 Play#0 output Play#0 1 0 14,0 . 0% 0 .. .. 0 0 0 0 0% 0 0 1
Play#0 output Play#0 1 2 0,2 + 7% 8 .. .. 6 0 0 0 0% 7 0 1 Play#0 output Play#0 1 2 0,2 + 7% 8 .. .. 72 0 0 0 0% 7 0 1
Play#0 output Play#0 1 2 2,2 h 87% 0 .. .. 87 0 0 0 0% 86 0 1 Play#0 output Play#0 1 2 2,2 h 87% 0 .. .. 87 0 0 0 0% 86 0 1
Play#0 output Play#0 1 2 4,2 = 98% 124 .. .. 98 0 0 0 0% 98 0 1 Play#0 output Play#0 1 2 4,2 = 98% 124 .. .. 98 0 0 0 0% 98 0 1
Play#0 output Play#0 1 0 1,3 . 0% 0 .. .. 0 0 0 0 0% 78 0 1 Play#0 output Play#0 1 0 1,3 . 0% 0 .. .. 0 0 0 0 0% 78 0 1
@ -1283,7 +1283,7 @@
Play#0 output Play#0 1 1 2,-2 s 100% 127 .. .. 100 0 0 0 0% 0 0 1 Play#0 output Play#0 1 1 2,-2 s 100% 127 .. .. 100 0 0 0 0% 0 0 1
Play#0 output Play#0 1 0 6,0 . 0% 0 .. .. 0 0 0 0 0% 0 0 1 Play#0 output Play#0 1 0 6,0 . 0% 0 .. .. 0 0 0 0 0% 0 0 1
Play#0 output Play#0 1 0 14,0 . 0% 0 .. .. 0 0 0 0 0% 0 0 1 Play#0 output Play#0 1 0 14,0 . 0% 0 .. .. 0 0 0 0 0% 0 0 1
Play#0 output Play#0 1 0 0,2 + 2% 0 .. .. 2 0 0 0 0 100% 1 0 1 Play#0 output Play#0 1 2 0,2 + 2% 2 .. .. 12 0 0 0 0% 1 0 1
Play#0 output Play#0 1 2 2,2 h 87% 0 .. .. 87 0 0 0 0% 86 0 1 Play#0 output Play#0 1 2 2,2 h 87% 0 .. .. 87 0 0 0 0% 86 0 1
Play#0 output Play#0 1 2 4,2 = 98% 124 .. .. 98 0 0 0 0% 98 0 1 Play#0 output Play#0 1 2 4,2 = 98% 124 .. .. 98 0 0 0 0% 98 0 1
Play#0 output Play#0 1 0 1,3 . 0% 0 .. .. 0 0 0 0 0% 78 0 1 Play#0 output Play#0 1 0 1,3 . 0% 0 .. .. 0 0 0 0 0% 78 0 1
@ -1298,7 +1298,7 @@
Play#0 output Play#0 1 1 2,-2 s .......... .......... 0 0 0 0 0 0 0 0 0 0 Play#0 output Play#0 1 1 2,-2 s .......... .......... 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 0 6,0 . .......... .......... 0 0 0 0 0 0 0 0 0 0 Play#0 output Play#0 1 0 6,0 . .......... .......... 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 0 14,0 . .......... .......... 0 0 0 0 0 0 0 0 0 0 Play#0 output Play#0 1 0 14,0 . .......... .......... 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 0 0,2 + .......... .......... 0 0 0 0 0 0 0 1 1 0 Play#0 output Play#0 1 2 0,2 + .......... .......... 0 0 0 0 0 0 0 1 1 0
Play#0 output Play#0 1 2 2,2 h .......... .......... 0 0 0 0 0 0 0 86 86 0 Play#0 output Play#0 1 2 2,2 h .......... .......... 0 0 0 0 0 0 0 86 86 0
Play#0 output Play#0 1 2 4,2 = .......... .......... 0 0 0 0 0 0 0 98 98 0 Play#0 output Play#0 1 2 4,2 = .......... .......... 0 0 0 0 0 0 0 98 98 0
Play#0 output Play#0 1 0 1,3 . .......... .......... 0 0 0 0 0 0 0 0 0 0 Play#0 output Play#0 1 0 1,3 . .......... .......... 0 0 0 0 0 0 0 0 0 0
@ -1313,7 +1313,7 @@
Play#0 output Play#0 1 1 2,-2 s 100% 0% N/A yes N/A 100% 99.00 Play#0 output Play#0 1 1 2,-2 s 100% 0% N/A yes N/A 100% 99.00
Play#0 output Play#0 1 0 6,0 . 0% 0% N/A no N/A 0% 0.00 Play#0 output Play#0 1 0 6,0 . 0% 0% N/A no N/A 0% 0.00
Play#0 output Play#0 1 0 14,0 . 0% 0% N/A no N/A 0% 0.00 Play#0 output Play#0 1 0 14,0 . 0% 0% N/A no N/A 0% 0.00
Play#0 output Play#0 1 0 0,2 + 2% 1% 0.388 no N/A 2% 1.00 Play#0 output Play#0 1 2 0,2 + 2% 1% 0.388 no N/A 2% 1.00
Play#0 output Play#0 1 2 2,2 h 87% 86% 0.051 yes 0.051 87% 1.44 Play#0 output Play#0 1 2 2,2 h 87% 86% 0.051 yes 0.051 87% 1.44
Play#0 output Play#0 1 2 4,2 = 98% 98% 0.001 yes 0.020 98% 1.00 Play#0 output Play#0 1 2 4,2 = 98% 98% 0.001 yes 0.020 98% 1.00
Play#0 output Play#0 1 0 1,3 . 0% 78% N/A no N/A 0% 0.00 Play#0 output Play#0 1 0 1,3 . 0% 78% N/A no N/A 0% 0.00

3
tests/fire/setup-POGO
View file

@ -26,6 +26,9 @@ edit l -2:4,2:3 ?des#. o 2 O 2
give l * ?own=2 100 give l * ?own=2 100
give h * ?own=2 100 give h * ?own=2 100
edit l * ?own=2 a 100 R 100 r 100 d 100 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 | make country active, so it gets bulletins
edit c 2 s 4 b 640 M 25000 T 100 edit c 2 s 4 b 640 M 25000 T 100
|| country#3 || country#3