diff --git a/tests/update/99-POGO b/tests/update/99-POGO index 560e7d03..693708e1 100644 --- a/tests/update/99-POGO +++ b/tests/update/99-POGO @@ -174,7 +174,20 @@ ship 0:31,-16:-1 plane 0:31,-16:-1 land 0:31,-16:-1 || country#4 -| che take over -16:-14,-8 and spread; -14,-8 is a bank +| -16,-8 che take over by subversion, take over empty inf#20 +| -14,-8 bank, che win, kill inf#22, take over inf#21/23 +| BUG: empty inf#21 dies fighting guerrillas +| -12,-8 sec#25 raids, #27 doesn't, che win, kill sec#25/27/inf#26, +| BUG: spy#24 dies fighting guerrillas +| BUG: body count off, claims 110m, actually 70m +| BUG: "Sector -12,-8 has been retaken!" instead of takeover +| -10,-8 che win, don't take over +| -8,-8 che lose +| BUG: body count off, claims 7m, actually 11m +| BUG: che kill 4m more than they should +| -6,-8 che lose +| BUG: body count off, claims 26m, actually 50m +| BUG: inf#29 shouldn't die | plague stage 4 (dying) -16:-1,-6 ship#10 land#10 | -16,-6 reverts to deity | -14,-6 resets work etc. diff --git a/tests/update/final.xdump b/tests/update/final.xdump index d0816588..a0f44249 100644 --- a/tests/update/final.xdump +++ b/tests/update/final.xdump @@ -103,7 +103,7 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd 1 2 6 18 100 120 0 0 0 0 0 0 0 2 6 292 0 100 0 18 0 0 0 0 0 1 650 0 0 0 0 2 0 0 84 0 0 45 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 4 6 18 100 120 0 0 0 0 0 0 0 4 6 36 0 100 0 18 0 0 0 0 0 1 130 0 0 0 0 58 0 0 97 0 0 9999 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 6 6 4 39 120 0 0 0 0 0 0 0 6 6 39 0 100 0 4 0 0 0 0 0 1 130 0 0 0 0 0 0 0 97 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 8 6 19 100 120 0 0 0 0 0 0 0 8 6 564 0 100 0 19 0 0 0 0 0 1 1000 0 0 0 0 0 0 0 70 0 5 16 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 8 6 19 100 120 0 0 0 0 0 0 0 8 6 564 0 100 0 19 0 0 0 0 0 1 1000 0 0 0 0 0 0 0 70 0 5 15 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 10 6 26 100 120 0 0 0 0 0 0 0 10 6 544 0 100 0 26 0 0 0 0 0 1 1000 0 0 0 0 0 0 0 70 0 0 13 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 12 6 14 100 120 0 0 0 0 0 0 0 12 6 571 0 100 0 14 0 0 0 0 0 1 1000 10 0 0 0 0 0 0 70 0 0 8 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 14 6 12 100 120 0 0 0 0 0 0 0 14 6 440 0 100 1 12 0 0 0 0 0 1 1000 0 0 0 0 0 0 0 70 0 40 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 @@ -132,11 +132,11 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd 1 -3 7 4 39 120 0 0 0 0 0 0 0 -3 7 39 0 100 0 4 0 0 0 0 0 1 130 1 0 0 0 0 0 0 96 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 7 4 39 120 0 0 0 0 0 0 0 -1 7 39 0 100 0 4 0 0 0 0 0 1 130 1 0 0 0 0 0 0 97 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 6 0 8 5 100 120 0 0 0 0 0 0 0 0 8 395 0 100 1 5 0 0 0 0 0 6 650 20 0 0 0 0 0 0 84 0 400 400 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 -6 2 8 4 100 120 0 0 0 0 0 0 0 2 8 254 0 100 1 4 0 0 0 0 0 6 650 19 0 0 0 0 0 0 83 0 384 393 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 +6 2 8 4 100 120 0 0 0 0 0 0 0 2 8 254 0 100 1 4 0 0 0 0 0 6 650 19 0 0 0 0 0 0 83 0 384 394 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 6 4 8 19 100 120 0 0 0 0 0 0 0 4 8 408 0 100 1 19 0 0 0 0 0 6 650 20 0 0 0 0 0 0 83 0 391 396 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 6 6 8 14 100 120 0 0 0 0 0 0 0 6 8 387 0 100 1 14 0 0 0 0 0 6 650 18 0 0 0 0 0 0 84 0 386 396 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 6 8 8 12 100 120 0 0 0 0 0 0 0 8 8 445 0 100 1 12 0 0 0 0 0 6 650 20 0 0 0 0 0 0 83 0 400 400 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 -6 10 8 26 100 120 0 0 0 0 0 0 0 10 8 358 0 100 1 26 0 0 0 0 0 6 650 20 0 0 0 0 0 0 84 0 391 396 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 +6 10 8 26 100 120 0 0 0 0 0 0 0 10 8 358 0 100 1 26 0 0 0 0 0 6 650 20 0 0 0 0 0 0 84 0 391 395 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 6 12 8 14 100 120 0 0 0 0 0 0 0 12 8 366 0 100 1 14 0 0 0 0 0 6 650 19 0 0 0 0 0 0 83 0 393 398 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 6 14 8 12 100 120 0 0 0 0 0 0 0 14 8 395 0 100 1 12 0 0 0 0 0 6 650 20 0 0 0 0 0 0 83 0 400 400 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 7 -16 8 4 100 120 0 0 0 0 0 0 0 -16 8 295 0 100 1 4 0 0 0 0 0 7 650 20 0 0 0 0 0 0 83 0 400 400 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 @@ -155,12 +155,12 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd 3 10 -8 4 12 120 0 127 0 0 0 0 0 10 -8 13 0 54 1 4 0 0 0 0 0 3 130 0 0 0 0 0 0 0 97 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 3 12 -8 4 14 120 0 127 0 0 0 0 0 12 -8 15 0 45 1 4 0 0 0 0 0 3 130 0 0 0 0 0 0 0 97 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 3 14 -8 4 9 120 0 112 0 0 0 0 0 14 -8 9 0 34 1 4 0 0 0 0 0 3 130 0 0 0 0 0 0 0 97 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 -5 -16 -8 4 0 120 0 0 0 0 0 0 0 -16 -8 0 0 100 1 4 0 0 0 0 0 5 123 5 0 0 0 0 0 0 97 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 -5 -14 -8 29 100 120 0 0 0 0 0 0 0 -14 -8 0 0 100 1 29 0 0 0 0 0 5 124 5 0 0 0 0 20 100 96 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 -4 -12 -8 4 39 120 0 11 0 0 0 0 0 -12 -8 39 0 100 1 4 0 0 0 0 0 4 130 0 0 0 0 0 0 0 97 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 10 4 0 0 0 0 0 -4 -10 -8 4 39 120 0 0 0 0 0 0 0 -10 -8 39 0 100 1 4 0 0 0 0 0 4 130 0 0 0 0 0 0 0 97 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 -4 -8 -8 4 39 120 0 0 0 0 0 0 0 -8 -8 39 0 100 1 4 0 0 0 0 0 4 130 0 0 0 0 0 0 0 97 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 -4 -6 -8 4 39 120 0 0 0 0 0 0 0 -6 -8 39 0 100 1 4 0 0 0 0 0 4 130 0 0 0 0 0 0 0 97 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 +5 -16 -8 4 0 120 0 0 0 0 0 0 0 -16 -8 0 0 100 1 4 0 0 0 0 0 5 124 5 0 0 0 0 0 0 96 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 +5 -14 -8 29 100 120 0 0 0 0 0 0 0 -14 -8 0 0 100 1 29 0 0 0 0 0 5 124 5 0 0 0 0 20 100 97 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 +4 -12 -8 4 37 120 0 35 0 0 0 0 0 -12 -8 38 0 100 1 4 0 0 0 0 0 0 123 5 0 0 0 0 0 0 97 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 +4 -10 -8 4 39 120 0 0 0 0 0 0 0 -10 -8 39 0 100 1 4 0 0 0 0 0 4 130 0 0 0 0 0 0 0 97 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 15 4 0 0 0 0 0 +4 -8 -8 4 39 120 0 46 0 0 0 0 0 -8 -8 39 0 100 1 4 0 0 0 0 0 2 130 0 0 0 0 0 0 0 97 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 +4 -6 -8 4 39 120 0 51 0 0 0 0 0 -6 -8 39 0 100 1 4 0 0 0 0 0 2 130 0 0 0 0 0 0 0 97 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 4 -4 -8 4 39 120 0 0 0 0 0 0 0 -4 -8 39 0 100 1 4 0 0 0 0 0 4 130 0 0 0 0 0 0 0 96 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 4 -2 -8 4 39 120 0 0 0 0 0 0 0 -2 -8 39 0 100 1 4 0 0 0 0 0 4 130 0 0 0 0 0 0 0 97 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 3 1 -7 4 13 120 0 112 0 0 0 0 0 1 -7 13 0 51 0 4 0 0 0 0 0 3 130 0 0 0 0 0 0 0 97 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 @@ -171,9 +171,9 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd 3 11 -7 4 12 120 0 112 0 0 0 0 0 11 -7 12 0 44 0 4 0 0 0 0 0 3 130 0 0 0 0 0 0 0 97 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 3 13 -7 4 11 120 0 112 0 0 0 0 0 13 -7 12 0 38 0 4 0 0 0 0 0 3 130 0 0 0 0 0 0 0 97 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 3 15 -7 4 14 120 0 112 0 0 0 0 0 15 -7 14 0 57 1 4 0 0 0 0 0 3 130 0 0 0 0 0 0 0 97 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 -4 -15 -7 4 39 120 0 0 0 0 0 0 0 -15 -7 39 0 100 1 4 0 0 0 0 0 4 130 0 0 0 0 0 0 0 97 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 10 4 0 0 0 0 0 -4 -13 -7 4 39 120 0 0 0 0 0 0 0 -13 -7 39 0 100 0 4 0 0 0 0 0 4 130 0 0 0 0 0 0 0 97 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 -4 -11 -7 4 39 120 0 0 0 0 0 0 0 -11 -7 39 0 100 0 4 0 0 0 0 0 4 130 0 0 0 0 0 0 0 97 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 +4 -15 -7 4 41 120 0 0 0 0 0 0 0 -15 -7 41 0 100 1 4 0 0 0 0 0 4 130 20 0 0 0 0 0 0 97 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 +4 -13 -7 4 39 120 0 0 0 0 0 0 0 -13 -7 39 0 100 0 4 0 0 0 0 0 4 130 0 0 0 0 0 0 0 97 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 133 4 0 0 0 0 0 +4 -11 -7 4 41 120 0 0 0 0 0 0 0 -11 -7 42 0 100 0 4 0 0 0 0 0 4 130 20 0 0 0 0 0 0 96 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 4 -9 -7 4 39 120 0 0 0 0 0 0 0 -9 -7 39 0 100 0 4 0 0 0 0 0 4 130 0 0 0 0 0 0 0 97 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 4 -7 -7 4 39 120 0 0 0 0 0 0 0 -7 -7 39 0 100 0 4 0 0 0 0 0 4 130 0 0 0 0 0 0 0 96 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 4 -5 -7 4 39 120 0 0 0 0 0 0 0 -5 -7 39 0 100 0 4 0 0 0 0 0 4 130 0 0 0 0 0 0 0 96 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 @@ -373,6 +373,16 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h 17 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 incubate 76 -1 0 18 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 incubate 73 -1 0 19 4 -10 -6 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 incubate 47 -1 0 +20 5 -16 -8 2 20 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 10 0 0 0 0 0 healthy 0 -1 0 +21 0 -14 -8 2 0 0 0 50 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 10 0 0 0 0 0 healthy 0 -1 0 +22 0 -14 -8 2 0 0 0 50 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 10 0 0 0 0 0 healthy 0 -1 0 +23 5 -14 -8 2 20 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 10 0 0 0 0 0 healthy 0 -1 0 +24 0 -12 -8 8 0 0 0 170 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0 +25 0 -12 -8 20 0 -30 0 170 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 9 0 0 0 0 0 healthy 0 -1 0 +26 0 -12 -8 2 0 -30 0 50 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 10 0 0 0 0 0 healthy 0 -1 0 +27 0 -12 -8 20 0 0 0 170 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 9 0 0 0 0 0 healthy 0 -1 0 +28 4 -8 -8 1 60 40 0 50 0 0 none 0 "" -1 0 42 () "" 0 10 0 0 0 0 0 0 9 0 0 0 0 0 healthy 0 -1 0 +29 0 -6 -8 2 0 0 0 50 0 0 none 0 "" -1 0 42 () "" 0 0 0 0 0 0 0 0 8 0 0 0 0 0 healthy 0 -1 0 30 2 -16 0 2 88 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 healthy 0 -1 0 31 2 -16 0 2 10 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 healthy 0 -1 0 35 1 14 0 2 100 60 0 50 0 0 none 0 "" -1 0 42 () "" 0 100 0 0 0 0 0 0 7 0 0 0 0 0 healthy 0 -1 0 @@ -404,6 +414,9 @@ actor action victim times duration time 4 32 0 10 0 0 4 31 0 11 0 0 1 34 0 8 0 0 +5 38 4 1 0 0 +4 38 4 2 0 0 +2 38 4 2 0 0 /config config trade uid owner type unitid price maxbidder markettime xloc yloc @@ -414,8 +427,8 @@ cnum stat flags cname passwd ip userid xcap ycap xorg yorg update tgms ann timeu 1 active (flash beep coastwatch sonar techlists) "1" "1" "127.0.0.1" "tester" 0 0 0 0 0 1 0 15 255 0 0 10795 0 0 0 0 102.920 3.48828 21.0945 12.3379 neutral neutral neutral neutral neutral neutral allied friendly neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () 2 active (flash beep coastwatch sonar techlists) "2" "2" "127.0.0.1" "tester" -2 0 0 0 0 1 0 15 255 0 975 -6221 0 0 0 0 101.147 1.74414 15.2381 2.74222 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () 3 active (flash beep coastwatch sonar techlists) "3" "3" "127.0.0.1" "tester" 1 -1 0 0 0 1 0 15 255 0 0 4338 0 0 0 0 101.147 1.74414 15.2381 4.44444 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () -4 active (flash beep coastwatch sonar techlists) "4" "4" "127.0.0.1" "tester" -1 -1 0 0 0 1 0 15 255 0 0 18685 0 0 0 0 31.5848 1.74414 3.04762 4.44444 neutral allied neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () -5 active (flash beep coastwatch sonar techlists) "5" "5" "127.0.0.1" "tester" -16 -8 0 0 0 1 0 15 255 0 0 26497 0 0 0 0 101.147 1.74414 15.2381 4.44444 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () +4 active (flash beep coastwatch sonar techlists) "4" "4" "127.0.0.1" "tester" -1 -1 0 0 0 1 0 15 255 0 0 17769 0 0 0 0 31.5848 1.74414 3.04762 4.44444 neutral allied neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () +5 active (flash beep coastwatch sonar techlists) "5" "5" "127.0.0.1" "tester" -16 -8 0 0 0 1 0 15 255 0 0 26438 0 0 0 0 101.147 1.74414 15.2381 4.44444 neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () 6 active (flash beep coastwatch sonar techlists) "6" "6" "127.0.0.1" "tester" 0 8 0 0 0 1 0 15 255 0 0 24353 0 0 0 0 101.147 1.74414 15.2381 4.44444 allied allied allied allied allied allied neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () 7 active (flash beep coastwatch sonar techlists) "7" "7" "127.0.0.1" "tester" -2 8 0 0 0 1 0 15 255 0 0 25719 0 0 0 0 101.147 1.74414 15.2381 4.44444 friendly friendly friendly friendly friendly friendly friendly neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral neutral 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () /config @@ -428,7 +441,16 @@ uid owner type amount price maxbidder markettime xbuy ybuy xsell ysell config lost timestamp owner type id x y 0 4 0 0 -16 -8 +0 4 3 20 -16 -8 +0 4 3 21 -14 -8 +0 4 3 22 -14 -8 0 4 0 0 -14 -8 +0 4 3 23 -14 -8 +0 4 3 24 -12 -8 +0 4 3 26 -12 -8 +0 4 3 25 -12 -8 +0 4 3 27 -12 -8 +0 4 3 29 -6 -8 0 4 0 0 -16 -6 0 4 0 0 -8 -6 /config diff --git a/tests/update/journal.log b/tests/update/journal.log index 6389da90..5ba5cb9a 100644 --- a/tests/update/journal.log +++ b/tests/update/journal.log @@ -317,16 +317,16 @@ Play#4 output Play#4 1 Sector Type Production Cost Play#4 output Play#4 1 bank 4 bars 40 Play#4 output Play#4 1 Ship maintenance 10 ships 300 - Play#4 output Play#4 1 Unit maintenance 10 units 600 + Play#4 output Play#4 1 Unit maintenance 20 units 1230 Play#4 output Play#4 1 Sector maintenance 1 sector 60 - Play#4 output Play#4 1 Military payroll 1111 mil, 0 res 5555 - Play#4 output Play#4 1 Total expenses......................................................6554 + Play#4 output Play#4 1 Military payroll 1304 mil, 0 res 6520 + Play#4 output Play#4 1 Total expenses......................................................8149 Play#4 output Play#4 1 Income from taxes 23604 civs, 4100 uws +212 Play#4 output Play#4 1 Income from bars 100 bars +1500 Play#4 output Play#4 1 Total income.......................................................+1712 Play#4 output Play#4 1 Balance forward 25000 - Play#4 output Play#4 1 Estimated delta -4842 - Play#4 output Play#4 1 Estimated new treasury.............................................20158 + Play#4 output Play#4 1 Estimated delta -6437 + Play#4 output Play#4 1 Estimated new treasury.............................................18563 Play#4 output Play#4 6 0 99 Play#4 input production * Play#4 command production @@ -486,8 +486,8 @@ Play#0 output Play#0 1 912.48 Play#0 output Play#0 1 2 32 22% 7.1K 1.9K 0 0 0 0 1 5 3 3 3 100 Play#0 output Play#0 1 528.93 - Play#0 output Play#0 1 4 64 8% 25K 1.1K 0 0 0 20K 21 4.0K 0 10 10 25K - Play#0 output Play#0 1 293.10 + Play#0 output Play#0 1 4 64 8% 25K 1.3K 0 0 0 20K 21 4.0K 0 10 19 25K + Play#0 output Play#0 1 305.26 Play#0 output Play#0 1 3 64 14% 17K 170 0 0 0 0 0 0 0 0 0 -100 Play#0 output Play#0 1 251.70 Play#0 output Play#0 1 6 8 88% 4.0K 168 0 0 0 0 0 0 3 1 3 25K @@ -497,7 +497,7 @@ Play#0 output Play#0 1 5 0 0% 0 0 0 0 0 0 0 0 0 0 0 25K Play#0 output Play#0 1 60.00 Play#0 output Play#0 1 ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- ---- - Play#0 output Play#0 1 worldwide 272 35% 84K 4.7K 0 0 0 22K 362 4.6K 27 49 32 125K + Play#0 output Play#0 1 worldwide 272 35% 84K 4.9K 0 0 0 22K 362 4.6K 27 49 41 125K Play#0 output Play#0 1 Play#0 output Play#0 6 0 640 Play#0 input read 0 @@ -751,7 +751,7 @@ Play#0 output Play#0 1 1 2,6 k .......... .......... 0 0 0 2 0 0 0 0 45 0 Play#0 output Play#0 1 1 4,6 k .......... .......... 0 0 0 58 0 0 0 0 9999 0 Play#0 output Play#0 1 1 6,6 - .......... .......... 0 0 0 0 0 0 0 0 0 0 - Play#0 output Play#0 1 1 8,6 f .......... .......... 0 0 0 0 0 0 0 5 16 0 + Play#0 output Play#0 1 1 8,6 f .......... .......... 0 0 0 0 0 0 0 5 15 0 Play#0 output Play#0 1 1 10,6 ! .......... .......... 0 0 0 0 0 0 0 0 13 0 Play#0 output Play#0 1 1 12,6 * .......... .......... 0 0 0 0 0 0 0 0 8 0 Play#0 output Play#0 1 1 14,6 h .......... .......... 0 0 0 0 0 0 0 40 0 0 @@ -908,7 +908,7 @@ Play#0 command nation Play#0 output Play#0 1 Play#0 output Play#0 1 (#2) 2 Nation Report Thu Jan 1 00:00:00 1970 - Play#0 output Play#0 1 Nation status is ACTIVE Bureaucratic Time Units: 193 + Play#0 output Play#0 1 Nation status is ACTIVE Bureaucratic Time Units: 192 Play#0 output Play#0 1 10% eff capital at -2,0 has 130 civilians & 0 military Play#0 output Play#0 1 The treasury has $-6221.00 Military reserves: 975 Play#0 output Play#0 1 Education.......... 15.24 Happiness....... 2.74 @@ -1355,11 +1355,30 @@ Play#0 output Play#0 1 Outbreak of PLAGUE on inf infantry #15! Play#0 output Play#0 1 Outbreak of PLAGUE on inf infantry #19! Play#0 output Play#0 1 Revolutionary subversion reported in -16,-8! + Play#0 output Play#0 1 inf infantry #20 captured when 5 took -16,-8! Play#0 output Play#0 1 Partisans take over -16,-8! - Play#0 output Play#0 1 Revolutionary subversion reported in -14,-8! + Play#0 output Play#0 1 inf infantry #21 dies fighting guerrillas in -14,-8 + Play#0 output Play#0 1 inf infantry #22 dies fighting guerrillas in -14,-8 + Play#0 output Play#0 1 inf infantry #23 captured when 5 took -14,-8! + Play#0 output Play#0 1 Guerrilla warfare in -14,-8 + Play#0 output Play#0 1 rebels murder 2 military Play#0 output Play#0 1 Partisans take over -14,-8! - Play#0 output Play#0 1 Revolutionary subversion reported in -12,-8! - Play#0 output Play#0 1 Revolutionary subversion reported in -15,-7! + Play#0 output Play#0 1 sec security #25 kills 4 guerrillas in raid at -12,-8! + Play#0 output Play#0 1 spy infiltrator #24 dies fighting guerrillas in -12,-8 + Play#0 output Play#0 1 inf infantry #26 dies fighting guerrillas in -12,-8 + Play#0 output Play#0 1 sec security #25 dies fighting guerrillas in -12,-8 + Play#0 output Play#0 1 sec security #27 dies fighting guerrillas in -12,-8 + Play#0 output Play#0 1 Sector -12,-8 has been retaken! + Play#0 output Play#0 1 Guerrilla warfare in -12,-8 + Play#0 output Play#0 1 body count: troops: 110, rebels: 71 + Play#0 output Play#0 1 Guerrilla warfare in -10,-8 + Play#0 output Play#0 1 body count: troops: 10, rebels: 5 + Play#0 output Play#0 1 Guerrilla warfare in -8,-8 + Play#0 output Play#0 1 body count: troops: 7, rebels: 22 + Play#0 output Play#0 1 inf infantry #29 dies fighting guerrillas in -6,-8 + Play#0 output Play#0 1 Guerrilla warfare in -6,-8 + Play#0 output Play#0 1 body count: troops: 26, rebels: 52 + Play#0 output Play#0 1 Revolutionary subversion reported in -13,-7! Play#0 output Play#0 1 PLAGUE deaths reported in -16,-6 Play#0 output Play#0 1 PLAGUE deaths reported in -14,-6 Play#0 output Play#0 1 PLAGUE deaths reported in -12,-6 @@ -1393,10 +1412,10 @@ Play#0 output Play#0 1 Technology level too low to produce in -5,-1 (need 40) Play#0 output Play#0 1 Education level too low to produce in -3,-1 (need 5) Play#0 output Play#0 1 0 happiness, 0 education produced - Play#0 output Play#0 1 total pop was 24324, yielding 0.00 hap, 0.00 edu + Play#0 output Play#0 1 total pop was 24024, yielding 0.00 hap, 0.00 edu Play#0 output Play#0 1 1.7834 technology (0.0000 + 1.7834), 1.7551 research (0.0000 + 1.7551) produced - Play#0 output Play#0 1 Army delta $-600, Navy delta $-300, Air force delta $0 - Play#0 output Play#0 1 money delta was $-6315 for this update + Play#0 output Play#0 1 Army delta $-636, Navy delta $-300, Air force delta $0 + Play#0 output Play#0 1 money delta was $-7231 for this update Play#0 output Play#0 6 0 640 Play#0 input nation 4 Play#0 command nation @@ -1404,7 +1423,7 @@ Play#0 output Play#0 1 (#4) 4 Nation Report Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Nation status is ACTIVE Bureaucratic Time Units: 640 Play#0 output Play#0 1 100% eff capital at -1,-1 has 130 civilians & 0 military - Play#0 output Play#0 1 The treasury has $18685.00 Military reserves: 0 + Play#0 output Play#0 1 The treasury has $17769.00 Military reserves: 0 Play#0 output Play#0 1 Education.......... 3.05 Happiness....... 4.44 Play#0 output Play#0 1 Technology......... 31.58 Research........ 1.74 Play#0 output Play#0 1 Technology factor : 35.23% Plague factor : 1.29% @@ -1418,17 +1437,17 @@ Play#0 output Play#0 1 Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 CENSUS del dst Play#0 output Play#0 1 own sect eff prd mob uf uf old civ mil uw food work avail fall coa - Play#0 output Play#0 1 5 -16,-8 - 0% 120 .. .. 123 5 0 97 100% 0 0 1 - Play#0 output Play#0 1 5 -14,-8 b 100% 120 .. .. 124 5 0 96 100% 0 0 1 - Play#0 output Play#0 1 4 -12,-8 - 39% 120 .. .. 130 0 0 97 100% 39 0 1 + Play#0 output Play#0 1 5 -16,-8 - 0% 120 .. .. 124 5 0 96 100% 0 0 1 + Play#0 output Play#0 1 5 -14,-8 b 100% 120 .. .. 124 5 0 97 100% 0 0 1 + Play#0 output Play#0 1 4 -12,-8 - 37% 120 .. .. 0 123 5 0 97 100% 38 0 1 Play#0 output Play#0 1 4 -10,-8 - 39% 120 .. .. 130 0 0 97 100% 39 0 1 - Play#0 output Play#0 1 4 -8,-8 - 39% 120 .. .. 130 0 0 97 100% 39 0 1 - Play#0 output Play#0 1 4 -6,-8 - 39% 120 .. .. 130 0 0 97 100% 39 0 1 + Play#0 output Play#0 1 4 -8,-8 - 39% 120 .. .. 2 130 0 0 97 100% 39 0 1 + Play#0 output Play#0 1 4 -6,-8 - 39% 120 .. .. 2 130 0 0 97 100% 39 0 1 Play#0 output Play#0 1 4 -4,-8 - 39% 120 .. .. 130 0 0 96 100% 39 0 1 Play#0 output Play#0 1 4 -2,-8 - 39% 120 .. .. 130 0 0 97 100% 39 0 1 - Play#0 output Play#0 1 4 -15,-7 - 39% 120 .. .. 130 0 0 97 100% 39 0 1 + Play#0 output Play#0 1 4 -15,-7 - 41% 120 .. .. 130 20 0 97 100% 41 0 1 Play#0 output Play#0 1 4 -13,-7 - 39% 120 .. .. 130 0 0 97 100% 39 0 - Play#0 output Play#0 1 4 -11,-7 - 39% 120 .. .. 130 0 0 97 100% 39 0 + Play#0 output Play#0 1 4 -11,-7 - 41% 120 .. .. 130 20 0 96 100% 42 0 Play#0 output Play#0 1 4 -9,-7 - 39% 120 .. .. 130 0 0 97 100% 39 0 Play#0 output Play#0 1 4 -7,-7 - 39% 120 .. .. 130 0 0 96 100% 39 0 Play#0 output Play#0 1 4 -5,-7 - 39% 120 .. .. 130 0 0 96 100% 39 0 @@ -1562,15 +1581,15 @@ Play#0 output Play#0 1 own sect eff loyal cnum value stage time mines Play#0 output Play#0 1 5 -16,-8 - 0% 0 0 0 0 0 0 Play#0 output Play#0 1 5 -14,-8 b 100% 0 0 0 0 0 0 - Play#0 output Play#0 1 4 -12,-8 - 39% 11 4 10 0 0 0 - Play#0 output Play#0 1 4 -10,-8 - 39% 0 0 0 0 0 0 - Play#0 output Play#0 1 4 -8,-8 - 39% 0 0 0 0 0 0 - Play#0 output Play#0 1 4 -6,-8 - 39% 0 0 0 0 0 0 + Play#0 output Play#0 1 4 -12,-8 - 37% 35 0 0 0 0 0 + Play#0 output Play#0 1 4 -10,-8 - 39% 0 4 15 0 0 0 + Play#0 output Play#0 1 4 -8,-8 - 39% 46 0 0 0 0 0 + Play#0 output Play#0 1 4 -6,-8 - 39% 51 0 0 0 0 0 Play#0 output Play#0 1 4 -4,-8 - 39% 0 0 0 0 0 0 Play#0 output Play#0 1 4 -2,-8 - 39% 0 0 0 0 0 0 - Play#0 output Play#0 1 4 -15,-7 - 39% 0 4 10 0 0 0 - Play#0 output Play#0 1 4 -13,-7 - 39% 0 0 0 0 0 0 - Play#0 output Play#0 1 4 -11,-7 - 39% 0 0 0 0 0 0 + Play#0 output Play#0 1 4 -15,-7 - 41% 0 0 0 0 0 0 + Play#0 output Play#0 1 4 -13,-7 - 39% 0 4 133 0 0 0 + Play#0 output Play#0 1 4 -11,-7 - 41% 0 0 0 0 0 0 Play#0 output Play#0 1 4 -9,-7 - 39% 0 0 0 0 0 0 Play#0 output Play#0 1 4 -7,-7 - 39% 0 0 0 0 0 0 Play#0 output Play#0 1 4 -5,-7 - 39% 0 0 0 0 0 0 @@ -1661,18 +1680,24 @@ Play#0 output Play#0 1 4 17 inf infantry -10,-6 100% 100 0 60 7 50 42% 0 0 Play#0 output Play#0 1 4 18 inf infantry -10,-6 100% 100 0 60 7 50 42% 0 0 Play#0 output Play#0 1 4 19 inf infantry -10,-6 100% 100 0 60 7 50 42% 0 0 - Play#0 output Play#0 1 10 units + Play#0 output Play#0 1 5 20 inf infantry -16,-8 20% 0 0 60 10 50 42% 0 0 + Play#0 output Play#0 1 5 23 inf infantry -14,-8 20% 0 0 60 10 50 42% 0 0 + Play#0 output Play#0 1 4 28 linf light infa -8,-8 60% 10 0 40 9 50 42% 0 0 + Play#0 output Play#0 1 13 units Play#0 output Play#0 6 0 640 Play#0 input read 5 Play#0 command read Play#0 output Play#0 1 Play#0 output Play#0 1 > Production Report dated Thu Jan 1 00:00:00 1970 + Play#0 output Play#0 1 We have captured inf infantry #20! Play#0 output Play#0 1 Sector -16,-8 has been retaken! + Play#0 output Play#0 1 We have captured inf infantry #23! Play#0 output Play#0 1 Sector -14,-8 has been retaken! Play#0 output Play#0 1 0 happiness, 0 education produced Play#0 output Play#0 1 total pop was 190, yielding 0.00 hap, 0.00 edu Play#0 output Play#0 1 1.7834 technology (0.0000 + 1.7834), 1.7551 research (0.0000 + 1.7551) produced - Play#0 output Play#0 1 money delta was $1497 for this update + Play#0 output Play#0 1 Army delta $-60, Navy delta $0, Air force delta $0 + Play#0 output Play#0 1 money delta was $1438 for this update Play#0 output Play#0 6 0 640 Play#0 input nation 5 Play#0 command nation @@ -1680,7 +1705,7 @@ Play#0 output Play#0 1 (#5) 5 Nation Report Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 Nation status is ACTIVE Bureaucratic Time Units: 99 Play#0 output Play#0 1 No capital (was at -16,-8). - Play#0 output Play#0 1 The treasury has $26497.00 Military reserves: 0 + Play#0 output Play#0 1 The treasury has $26438.00 Military reserves: 0 Play#0 output Play#0 1 Education.......... 15.24 Happiness....... 4.44 Play#0 output Play#0 1 Technology.........101.15 Research........ 1.74 Play#0 output Play#0 1 Technology factor : 50.19% Plague factor : 1.98% @@ -1735,11 +1760,11 @@ Play#0 output Play#0 1 COMMODITIES deliver-- distribute Play#0 output Play#0 1 sect sgpidbolhr sgpidbolhr sh gun pet iron dust bar oil lcm hcm rad Play#0 output Play#0 1 6 0,8 c .......... .......... 0 0 0 0 0 0 0 400 400 0 - Play#0 output Play#0 1 6 2,8 - .......... .......... 0 0 0 0 0 0 0 384 393 0 + Play#0 output Play#0 1 6 2,8 - .......... .......... 0 0 0 0 0 0 0 384 394 0 Play#0 output Play#0 1 6 4,8 f .......... .......... 0 0 0 0 0 0 0 391 396 0 Play#0 output Play#0 1 6 6,8 * .......... .......... 0 0 0 0 0 0 0 386 396 0 Play#0 output Play#0 1 6 8,8 h .......... .......... 0 0 0 0 0 0 0 400 400 0 - Play#0 output Play#0 1 6 10,8 ! .......... .......... 0 0 0 0 0 0 0 391 396 0 + Play#0 output Play#0 1 6 10,8 ! .......... .......... 0 0 0 0 0 0 0 391 395 0 Play#0 output Play#0 1 6 12,8 * .......... .......... 0 0 0 0 0 0 0 393 398 0 Play#0 output Play#0 1 6 14,8 h .......... .......... 0 0 0 0 0 0 0 400 400 0 Play#0 output Play#0 1 8 sectors diff --git a/tests/update/setup-POGO b/tests/update/setup-POGO index 9d9fbc53..5537a8b2 100644 --- a/tests/update/setup-POGO +++ b/tests/update/setup-POGO @@ -103,12 +103,35 @@ give h -16:-1,8 400 give m -16:-1,8 20 || TODO fallout || guerrilla -| che take over -16:-14,-8 and spread; -14,-8 is a bank -edit l -16:-14,-8 x 10 X 4 O 5 l 50 +| subvert: 0m, inf#20 empty +edit l -16,-8 x 1 X 4 O 5 l 50 +| win shootout in bank: 1m, inf#22 1m, inf#21/23 empty +edit l -14,-8 x 10 X 4 O 5 l 50 des -14,-8 b give b -14,-8 100 give d -14,-8 20 -| TODO security, retiring che, shoot out, blow up, catch, move +give m -14,-8 1 +edit u 0 U 20 L -16,-8 O 4 f 10 U 21 L -14,-8 U 23 U 22 m 1 +| win shootout in old-owned sector, sec#25/27/inf#26 die, spy#24 watches +| sec#25 raids, #27 doesn't +edit l -12,-8 x 200 X 4 l 50 +give m -12,-8 10 +edit u 20 U 26 L -12,-8 m 20 U 25 T sec U 27 e 10 +edit u 25 U 24 T spy +| win shootout in loyal sector (no takeover) +edit l -10,-8 x 20 X 4 +give m -10,-8 10 +| lose shootout, linf#28 survives +edit l -8,-8 x 22 X 4 O 2 l 50 +give m -8,-8 1 +edit u 20 U 28 L -8,-8 T linf m 20 +| lose shootout, inf#29 dies +edit l -6,-8 x 52 X 4 O 2 l 50 +edit u 20 U 29 L -6,-8 e 40 m 50 +| military to direct moving che +give m -15,-7 20 +give m -11,-7 20 +| TODO retiring che, blow up, catch, move || plague | plague stage 1 (dying) -16:-1,-6 ship#10 land#10 | -16,-6 everybody dies, sector reverts to deity