From: Markus Armbruster Date: Tue, 26 Jul 2016 05:16:45 +0000 (+0200) Subject: update/revolt: Don't kill land units without military X-Git-Tag: v4.4.0~115 X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=8a3eb898ce756f4922ded52d39acb17dd81c94d4 update/revolt: Don't kill land units without military Land units without military can't contribute to the fight. They can still get killed, and whether they are depends on their UID. take_casualties() kills land units in UID order until the required number of casualties is reached. Killing a land unit without military provides none, but take_casualties() doesn't care. The land unit "dies fighting guerrillas", which makes no sense when it's doesn't have any military. If the rebels win, they attempt to capture any surviving land units. Spies hide or get executed instead. Same as for any other violent sector takeover. Normal ground combat ignores land units without military. Do the same here: ignore them in take_casualties(). This protects spies and other land units without military from the fighting, but exposes them to capture. Signed-off-by: Markus Armbruster --- diff --git a/src/lib/update/revolt.c b/src/lib/update/revolt.c index 822679fc7..9c353de1a 100644 --- a/src/lib/update/revolt.c +++ b/src/lib/update/revolt.c @@ -445,6 +445,8 @@ take_casualties(struct sctstr *sp, int mc) continue; if (lp->lnd_ship >= 0) continue; + if (!lp->lnd_item[I_MILIT]) + continue; nunits++; } @@ -461,6 +463,8 @@ take_casualties(struct sctstr *sp, int mc) continue; if (lp->lnd_ship >= 0) continue; + if (!lp->lnd_item[I_MILIT]) + continue; if (!(lchr[(int)lp->lnd_type].l_flags & L_SECURITY)) continue; @@ -486,6 +490,8 @@ take_casualties(struct sctstr *sp, int mc) continue; if (lp->lnd_ship >= 0) continue; + if (!lp->lnd_item[I_MILIT]) + continue; if (lchr[(int)lp->lnd_type].l_flags & L_SECURITY) continue; @@ -512,6 +518,8 @@ take_casualties(struct sctstr *sp, int mc) continue; if (lp->lnd_ship >= 0) continue; + if (!lp->lnd_item[I_MILIT]) + continue; if (lchr[(int)lp->lnd_type].l_flags & L_SECURITY) continue; @@ -529,6 +537,8 @@ take_casualties(struct sctstr *sp, int mc) continue; if (lp->lnd_ship >= 0) continue; + if (!lp->lnd_item[I_MILIT]) + continue; if (!(lchr[(int)lp->lnd_type].l_flags & L_SECURITY)) continue; diff --git a/tests/update/99-POGO b/tests/update/99-POGO index 97c73a49a..67fc8f547 100644 --- a/tests/update/99-POGO +++ b/tests/update/99-POGO @@ -176,9 +176,7 @@ land 0:31,-16:-1 || country#4 | -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: "Sector -12,-8 has been retaken!" instead of takeover | -10,-8 che win, don't take over | -8,-8 che lose diff --git a/tests/update/final.xdump b/tests/update/final.xdump index cb4fadffe..979cfc7be 100644 --- a/tests/update/final.xdump +++ b/tests/update/final.xdump @@ -156,7 +156,7 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd 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 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 +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 123 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 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 -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 @@ -374,10 +374,10 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h 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 +21 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 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 +23 0 -14 -8 2 0 0 1 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 4 -12 -8 8 100 60 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 @@ -427,7 +427,7 @@ 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 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () +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 17679 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 () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () () @@ -442,11 +442,10 @@ 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 21 -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 diff --git a/tests/update/journal.log b/tests/update/journal.log index 739ee3658..cbc9e9a03 100644 --- a/tests/update/journal.log +++ b/tests/update/journal.log @@ -1357,14 +1357,13 @@ 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 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 inf infantry #21 captured when 5 took -14,-8! + Play#0 output Play#0 1 inf infantry #23 blown up by the crew 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 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 @@ -1414,8 +1413,8 @@ Play#0 output Play#0 1 0 happiness, 0 education produced 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 $-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 1 Army delta $-726, Navy delta $-300, Air force delta $0 + Play#0 output Play#0 1 money delta was $-7321 for this update Play#0 output Play#0 6 0 640 Play#0 input nation 4 Play#0 command nation @@ -1423,7 +1422,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 $17769.00 Military reserves: 0 + Play#0 output Play#0 1 The treasury has $17679.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% @@ -1438,7 +1437,7 @@ 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 .. .. 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 5 -14,-8 b 100% 120 .. .. 123 5 0 97 100% 0 0 1 Play#0 output Play#0 1 4 -12,-8 - 37% 120 .. .. 0 123 5 0 96 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 .. .. 2 130 0 0 97 100% 39 0 1 @@ -1681,9 +1680,10 @@ 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 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 5 21 inf infantry -14,-8 20% 0 0 60 10 50 42% 0 0 + Play#0 output Play#0 1 4 24 spy infiltrato -12,-8 100% 0 0 60 0 170 42% 0 0 Play#0 output Play#0 1 4 28 linf light infa -8,-8 70% 14 0 45 9 50 42% 0 0 - Play#0 output Play#0 1 13 units + Play#0 output Play#0 1 14 units Play#0 output Play#0 6 0 640 Play#0 input read 5 Play#0 command read @@ -1691,7 +1691,8 @@ 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 We have captured inf infantry #21! + Play#0 output Play#0 1 inf infantry #23 blown up by the crew! 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