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

damage: Shield embarked planes and land units from sector damage

Browse source 
Damage to a ship or land unit, say via pinpoint bombing, doesn't
damage loaded planes and land units.

Damage to a sector, say via strategic bombing, doesn't damage ships
there, but it does damage planes, even when loaded on a land unit (but
not when loaded on a ship), and land units, even when loaded on a land
unit or a ship.

This makes no sense.  Sector damage spills over to land units that way
since Chainsaw 3 added them, and to planes since 4.0.9.

Change sectdamage() not to damage land units and planes loaded on
ships or land units.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2018-05-10 17:55:50 +02:00
parent b109430b8c
commit 7d8e2aed16
5 changed files with 74 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/lib/subs/sectdamage.c
View file

@ -29,6 +29,7 @@
* Known contributors to this file:
* Dave Pare, 1989
* Steve McClure, 1996
* Markus Armbruster, 2006-2018
*/
#include <config.h>
@ -96,6 +97,8 @@ sectdamage(struct sctstr *sp, int dam)
while (nxtitem(&ni, &land)) {
if (!land.lnd_own)
continue;
if (land.lnd_ship >= 0 || land.lnd_land >= 0)
continue;
landdamage(&land, dam);
putland(land.lnd_uid, &land);
}
@ -109,7 +112,7 @@ sectdamage(struct sctstr *sp, int dam)
continue;
if (plane.pln_flags & PLN_LAUNCHED)
continue;
if (plane.pln_ship >= 0)
if (plane.pln_ship >= 0 || plane.pln_land >= 0)
continue;
planedamage(&plane, dam);
putplane(plane.pln_uid, &plane);

25
tests/fire/final.xdump
View file

@ -9,8 +9,8 @@ owner xloc yloc des effic mobil off loyal terr0 terr1 terr2 terr3 dterr xdist yd
1 3 1 12 100 0 0 0 0 0 0 0 0 3 1 0 0 100 1 12 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 100 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 100 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
2 0 2 24 1 1 0 0 0 0 0 0 0 0 2 2 0 100 1 24 0 0 0 0 0 2 13 0 0 0 0 0 0 0 0 0 2 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 86 0 0 0 0 0 0 0 0 2 2 87 0 100 1 12 0 0 0 0 0 2 86 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 0 2 24 2 2 0 0 0 0 0 0 0 0 2 1 0 100 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 86 0 0 0 0 0 0 0 0 2 2 86 0 100 1 12 0 0 0 0 0 2 86 0 0 0 0 0 0 0 0 0 86 87 0 0 0 0 0 0 0 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 87
2 -2 2 24 100 127 0 0 0 0 0 0 0 -2 2 100 0 100 1 24 0 0 0 0 0 2 100 0 0 0 0 0 0 0 0 0 100 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 healthy 0 0 0 0 0 100 100 100
1 0 -2 24 100 127 0 0 0 0 0 0 0 0 -2 0 0 100 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 2 -2 2 100 127 0 0 0 0 0 0 0 2 -2 0 0 100 1 2 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
@ -34,12 +34,12 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius fleet civil
10 0 2 2 18 0 0 0 60 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () ""
11 0 6 0 18 0 0 0 60 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () ""
12 2 2 2 18 68 86 0 60 0 0 none 0 "" 0 3 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () ""
13 2 6 0 18 72 91 0 60 0 0 none 0 "" 0 3 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () ""
13 2 6 0 18 72 91 0 60 0 0 none 0 "" 0 4 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" -12 0 0 () ""
20 0 2 2 2 0 0 0 20 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 78 78 0 0 healthy 0 0 "" -12 0 0 () ""
21 0 6 0 2 0 0 0 20 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 80 80 0 0 healthy 0 0 "" -12 0 0 () ""
22 2 2 2 2 58 74 0 20 0 0 none 0 "" 0 3 0 0 0 0 0 0 0 0 58 59 0 0 healthy 0 0 "" -12 0 0 () ""
23 2 6 0 2 78 98 0 20 0 0 none 0 "" 0 4 0 0 0 0 0 0 0 0 78 78 0 0 healthy 0 0 "" -12 0 0 () ""
24 2 6 0 2 32 40 0 20 0 0 none 0 "" 0 2 0 0 0 0 0 0 0 0 32 32 0 0 healthy 0 0 "" -12 0 0 () ""
22 2 2 2 2 58 73 0 20 0 0 none 0 "" 0 3 0 0 0 0 0 0 0 0 58 58 0 0 healthy 0 0 "" -12 0 0 () ""
23 2 6 0 2 79 100 0 20 0 0 none 0 "" 0 4 0 0 0 0 0 0 0 0 78 78 0 0 healthy 0 0 "" -12 0 0 () ""
24 2 6 0 2 32 40 0 20 0 0 none 0 "" 0 1 0 0 0 0 0 0 0 0 32 32 0 0 healthy 0 0 "" -12 0 0 () ""
49 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 0 "" 0 0 0 () ""
/config
config plane
@ -70,14 +70,14 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h
9 1 1 1 6 100 0 0 50 0 0 none 0 "" -1 0 42 () "" 0 10 10 10 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
10 0 2 2 8 0 127 0 40 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
11 0 6 0 8 0 127 0 40 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
12 0 2 2 8 0 127 0 40 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
12 2 2 2 8 100 127 0 40 0 0 none 0 "" 12 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
13 2 6 0 8 100 127 0 40 0 0 none 0 "" 13 0 42 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
20 0 2 2 21 0 124 0 270 0 0 none 0 "" -1 0 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
20 0 2 2 21 0 127 0 270 0 0 none 0 "" -1 0 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
21 0 6 0 21 0 127 0 270 0 0 none 0 "" -1 0 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
22 2 2 2 21 97 124 0 270 0 0 none 0 "" 22 0 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
22 2 2 2 21 100 127 0 270 0 0 none 0 "" 22 0 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
23 2 6 0 21 100 127 0 270 0 0 none 0 "" 23 0 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
32 2 2 2 7 94 119 0 40 0 0 none 0 "" -1 0 42 () "" 0 10 0 0 0 0 0 0 0 0 94 94 0 0 healthy 0 -1 0
33 2 2 2 21 97 123 0 270 0 0 none 0 "" -1 0 42 () "" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 32 0
32 2 2 2 7 94 120 0 40 0 0 none 0 "" -1 0 42 () "" 0 9 0 0 0 0 0 0 0 0 94 94 0 0 healthy 0 -1 0
33 2 2 2 21 100 127 0 270 0 0 none 0 "" -1 0 42 () "" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 32 0
49 0 0 0 0 0 0 0 0 0 0 none 0 "" -1 0 0 () "" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
/config
config nuke
@ -126,8 +126,6 @@ uid owner type amount price maxbidder markettime xbuy ybuy xsell ysell
config lost
timestamp owner type id x y
0 2 3 0 2 2
0 2 3 10 2 2
0 2 3 12 2 2
0 2 1 21 6 0
0 2 2 21 6 0
0 2 3 21 6 0
@ -139,6 +137,7 @@ timestamp owner type id x y
0 2 1 11 6 0
0 2 3 11 6 0
0 2 1 10 2 2
0 2 3 10 2 2
/config
config realm
cnum realm xl xh yl yh

121
tests/fire/journal.log
View file

@ -371,7 +371,7 @@
Play#0 output Play#0 1 0 6,0 . 0% 0 .. .. 0 0 0 0 100% 0 0 1
Play#0 output Play#0 1 0 14,0 . 0% 0 .. .. 0 0 0 0 100% 0 0 1
Play#0 output Play#0 1 2 0,2 + 100% 127 .. .. 1000 0 0 0 100% 100 0 1
Play#0 output Play#0 1 2 2,2 h 86% 0 .. .. 86 0 0 0 100% 87 0 1
Play#0 output Play#0 1 2 2,2 h 86% 0 .. .. 86 0 0 0 100% 86 0 1
Play#0 output Play#0 1 6 sectors
Play#0 output Play#0 6 0 640
Play#0 input comm * ?terr=1
@ -384,7 +384,7 @@
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 2 0,2 + .......... .......... 0 0 0 0 0 0 0 100 100 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 87 0
Play#0 output Play#0 1 6 sectors
Play#0 output Play#0 6 0 640
Play#0 input sinf * ?terr=1
@ -407,10 +407,10 @@
Play#0 output Play#0 1 1 1 bb battleship 3,1 59% 0 13 0 0 0 0 0 0 127 150
Play#0 output Play#0 1 1 2 bb battleship 3,1 60% 0 13 0 0 0 0 0 0 127 150
Play#0 output Play#0 1 1 9 cs cargo ship 5,1 98% 0 10 0 0 0 0 0 0 124 20
Play#0 output Play#0 1 2 10 sb submarine 2,2 20% 0 0 0 0 0 0 0 0 0 60
Play#0 output Play#0 1 2 10 sb submarine 2,2 20% 0 0 0 0 0 0 0 1 0 60
Play#0 output Play#0 1 2 11 sb submarine 6,0 20% 0 0 0 0 0 0 0 1 0 60
Play#0 output Play#0 1 2 22 cs cargo ship 2,2 58% 0 3 0 0 0 0 1 1 74 20
Play#0 output Play#0 1 2 23 cs cargo ship 6,0 78% 0 4 0 0 0 0 1 1 98 20
Play#0 output Play#0 1 2 22 cs cargo ship 2,2 58% 0 3 0 0 0 0 1 1 73 20
Play#0 output Play#0 1 2 23 cs cargo ship 6,0 79% 0 4 0 0 0 0 1 1 100 20
Play#0 output Play#0 1 8 ships
Play#0 output Play#0 6 0 640
Play#0 input carg * ?eff<100
@ -422,8 +422,8 @@
Play#0 output Play#0 1 9 cs 5,1 98% 0 10 0 10 9 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 10 sb 2,2 20% 0 0 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 11 sb 6,0 20% 0 0 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 22 cs 2,2 58% 0 3 0 0 0 0 0 0 0 0 58 59 0
Play#0 output Play#0 1 23 cs 6,0 78% 0 4 0 0 0 0 0 0 0 0 78 78 0
Play#0 output Play#0 1 22 cs 2,2 58% 0 3 0 0 0 0 0 0 0 0 58 58 0
Play#0 output Play#0 1 23 cs 6,0 79% 0 4 0 0 0 0 0 0 0 0 78 78 0
Play#0 output Play#0 1 8 ships
Play#0 output Play#0 6 0 640
Play#0 input plane * ?eff<100
@ -436,20 +436,16 @@
Play#0 output Play#0 1 own # unit type x,y a eff mil frt mu fd tch retr xl ln carry
Play#0 output Play#0 1 1 1 hat hvy artill 3,1 39% 10 0 127 0 160 42% 0 0
Play#0 output Play#0 1 1 2 hat hvy artill 3,1 40% 10 0 127 0 160 42% 0 0
Play#0 output Play#0 1 2 22 rad radar unit 2,2 97% 10 0 124 0 270 42% 1 0 22S
Play#0 output Play#0 1 2 32 tra train 2,2 94% 10 0 119 0 40 42% 1 1
Play#0 output Play#0 1 2 33 rad radar unit 2,2 97% 9 0 123 0 270 42% 1 0 32L
Play#0 output Play#0 1 5 units
Play#0 output Play#0 1 2 32 tra train 2,2 94% 9 0 120 0 40 42% 1 1
Play#0 output Play#0 1 3 units
Play#0 output Play#0 6 0 640
Play#0 input lcarg * ?eff<100
Play#0 command lcargo
Play#0 output Play#0 1 lnd# unit x,y a eff civ mil uw sh gun pet irn dst bar oil lcm hcm rad
Play#0 output Play#0 1 1 hat 3,1 39% 0 10 0 40 12 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 2 hat 3,1 40% 0 10 0 40 12 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 22 rad 2,2 97% 0 10 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 32 tra 2,2 94% 0 10 0 0 0 0 0 0 0 0 94 94 0
Play#0 output Play#0 1 33 rad 2,2 97% 0 9 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 5 units
Play#0 output Play#0 1 32 tra 2,2 94% 0 9 0 0 0 0 0 0 0 0 94 94 0
Play#0 output Play#0 1 3 units
Play#0 output Play#0 6 0 640
Play#0 input nuke *
Play#0 command nuke
@ -893,8 +889,8 @@
Play#0 output Play#0 1 1 2,-2 s 100% 127 .. .. 100 0 0 0 100% 0 0 1
Play#0 output Play#0 1 0 6,0 . 0% 0 .. .. 0 0 0 0 100% 0 0 1
Play#0 output Play#0 1 0 14,0 . 0% 0 .. .. 0 0 0 0 100% 0 0 1
Play#0 output Play#0 1 2 0,2 + 7% 9 .. .. 72 0 0 0 100% 7 0 1
Play#0 output Play#0 1 2 2,2 h 86% 0 .. .. 86 0 0 0 100% 87 0 1
Play#0 output Play#0 1 2 0,2 + 7% 8 .. .. 73 0 0 0 100% 7 0 1
Play#0 output Play#0 1 2 2,2 h 86% 0 .. .. 86 0 0 0 100% 86 0 1
Play#0 output Play#0 1 6 sectors
Play#0 output Play#0 6 0 640
Play#0 input comm * ?terr=1
@ -906,8 +902,8 @@
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 14,0 . .......... .......... 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 2 0,2 + .......... .......... 0 0 0 0 0 0 0 7 7 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 0,2 + .......... .......... 0 0 0 0 0 0 0 7 8 0
Play#0 output Play#0 1 2 2,2 h .......... .......... 0 0 0 0 0 0 0 86 87 0
Play#0 output Play#0 1 6 sectors
Play#0 output Play#0 6 0 640
Play#0 input sinf * ?terr=1
@ -919,7 +915,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 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 2 0,2 + 7% 7% 0.349 yes 0.349 7% 1.00
Play#0 output Play#0 1 2 0,2 + 7% 8% 0.345 yes 0.345 7% 1.00
Play#0 output Play#0 1 2 2,2 h 86% 86% 0.052 yes 0.052 86% 1.43
Play#0 output Play#0 1 6 sectors
Play#0 output Play#0 6 0 640
@ -930,11 +926,11 @@
Play#0 output Play#0 1 1 1 bb battleship 3,1 59% 0 13 0 0 0 0 0 0 127 150
Play#0 output Play#0 1 1 2 bb battleship 3,1 60% 0 13 0 0 0 0 0 0 127 150
Play#0 output Play#0 1 1 9 cs cargo ship 5,1 98% 0 10 0 0 0 0 0 0 124 20
Play#0 output Play#0 1 2 12 sb submarine 2,2 68% 0 3 0 0 0 0 0 0 86 60
Play#0 output Play#0 1 2 13 sb submarine 6,0 72% 0 3 0 0 0 0 0 1 91 60
Play#0 output Play#0 1 2 22 cs cargo ship 2,2 58% 0 3 0 0 0 0 1 1 74 20
Play#0 output Play#0 1 2 23 cs cargo ship 6,0 78% 0 4 0 0 0 0 1 1 98 20
Play#0 output Play#0 1 2 24 cs cargo ship 6,0 32% 0 2 0 0 0 0 0 0 40 20
Play#0 output Play#0 1 2 12 sb submarine 2,2 68% 0 3 0 0 0 0 0 1 86 60
Play#0 output Play#0 1 2 13 sb submarine 6,0 72% 0 4 0 0 0 0 0 1 91 60
Play#0 output Play#0 1 2 22 cs cargo ship 2,2 58% 0 3 0 0 0 0 1 1 73 20
Play#0 output Play#0 1 2 23 cs cargo ship 6,0 79% 0 4 0 0 0 0 1 1 100 20
Play#0 output Play#0 1 2 24 cs cargo ship 6,0 32% 0 1 0 0 0 0 0 0 40 20
Play#0 output Play#0 1 9 ships
Play#0 output Play#0 6 0 640
Play#0 input carg * ?eff<100
@ -945,10 +941,10 @@
Play#0 output Play#0 1 2 bb 3,1 60% 0 13 0 96 10 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 9 cs 5,1 98% 0 10 0 10 9 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 12 sb 2,2 68% 0 3 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 13 sb 6,0 72% 0 3 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 22 cs 2,2 58% 0 3 0 0 0 0 0 0 0 0 58 59 0
Play#0 output Play#0 1 23 cs 6,0 78% 0 4 0 0 0 0 0 0 0 0 78 78 0
Play#0 output Play#0 1 24 cs 6,0 32% 0 2 0 0 0 0 0 0 0 0 32 32 0
Play#0 output Play#0 1 13 sb 6,0 72% 0 4 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 22 cs 2,2 58% 0 3 0 0 0 0 0 0 0 0 58 58 0
Play#0 output Play#0 1 23 cs 6,0 79% 0 4 0 0 0 0 0 0 0 0 78 78 0
Play#0 output Play#0 1 24 cs 6,0 32% 0 1 0 0 0 0 0 0 0 0 32 32 0
Play#0 output Play#0 1 9 ships
Play#0 output Play#0 6 0 640
Play#0 input plane * ?eff<100
@ -961,20 +957,16 @@
Play#0 output Play#0 1 own # unit type x,y a eff mil frt mu fd tch retr xl ln carry
Play#0 output Play#0 1 1 1 hat hvy artill 3,1 39% 10 0 127 0 160 42% 0 0
Play#0 output Play#0 1 1 2 hat hvy artill 3,1 40% 10 0 127 0 160 42% 0 0
Play#0 output Play#0 1 2 22 rad radar unit 2,2 97% 10 0 124 0 270 42% 1 0 22S
Play#0 output Play#0 1 2 32 tra train 2,2 94% 10 0 119 0 40 42% 1 1
Play#0 output Play#0 1 2 33 rad radar unit 2,2 97% 9 0 123 0 270 42% 1 0 32L
Play#0 output Play#0 1 5 units
Play#0 output Play#0 1 2 32 tra train 2,2 94% 9 0 120 0 40 42% 1 1
Play#0 output Play#0 1 3 units
Play#0 output Play#0 6 0 640
Play#0 input lcarg * ?eff<100
Play#0 command lcargo
Play#0 output Play#0 1 lnd# unit x,y a eff civ mil uw sh gun pet irn dst bar oil lcm hcm rad
Play#0 output Play#0 1 1 hat 3,1 39% 0 10 0 40 12 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 2 hat 3,1 40% 0 10 0 40 12 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 22 rad 2,2 97% 0 10 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 32 tra 2,2 94% 0 10 0 0 0 0 0 0 0 0 94 94 0
Play#0 output Play#0 1 33 rad 2,2 97% 0 9 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 5 units
Play#0 output Play#0 1 32 tra 2,2 94% 0 9 0 0 0 0 0 0 0 0 94 94 0
Play#0 output Play#0 1 3 units
Play#0 output Play#0 6 0 640
Play#0 input nuke *
Play#0 command nuke
@ -1334,8 +1326,8 @@
Play#0 output Play#0 1 1 2,-2 s 100% 127 .. .. 100 0 0 0 100% 0 0 1
Play#0 output Play#0 1 0 6,0 . 0% 0 .. .. 0 0 0 0 100% 0 0 1
Play#0 output Play#0 1 0 14,0 . 0% 0 .. .. 0 0 0 0 100% 0 0 1
Play#0 output Play#0 1 2 0,2 + 1% 1 .. .. 13 0 0 0 100% 2 0 1
Play#0 output Play#0 1 2 2,2 h 86% 0 .. .. 86 0 0 0 100% 87 0 1
Play#0 output Play#0 1 2 0,2 + 2% 2 .. .. 12 0 0 0 100% 1 0 1
Play#0 output Play#0 1 2 2,2 h 86% 0 .. .. 86 0 0 0 100% 86 0 1
Play#0 output Play#0 1 6 sectors
Play#0 output Play#0 6 0 640
Play#0 input comm * ?terr=1
@ -1347,8 +1339,8 @@
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 14,0 . .......... .......... 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 2 0,2 + .......... .......... 0 0 0 0 0 0 0 2 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 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 87 0
Play#0 output Play#0 1 6 sectors
Play#0 output Play#0 6 0 640
Play#0 input sinf * ?terr=1
@ -1360,7 +1352,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 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 2 0,2 + 1% 1% 0.392 no N/A 1% 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 86% 86% 0.052 no N/A 86% 1.43
Play#0 output Play#0 1 6 sectors
Play#0 output Play#0 6 0 640
@ -1376,11 +1368,11 @@
Play#0 output Play#0 1 1 6 dd destroyer 3,3 100% 0 5 0 0 0 0 0 0 127 100
Play#0 output Play#0 1 1 8 cs cargo ship 3,1 100% 0 0 0 0 0 0 0 0 0 20
Play#0 output Play#0 1 1 9 cs cargo ship 5,1 98% 0 10 0 0 0 0 0 0 124 20
Play#0 output Play#0 1 2 12 sb submarine 2,2 68% 0 3 0 0 0 0 0 0 86 60
Play#0 output Play#0 1 2 13 sb submarine 6,0 72% 0 3 0 0 0 0 0 1 91 60
Play#0 output Play#0 1 2 22 cs cargo ship 2,2 58% 0 3 0 0 0 0 1 1 74 20
Play#0 output Play#0 1 2 23 cs cargo ship 6,0 78% 0 4 0 0 0 0 1 1 98 20
Play#0 output Play#0 1 2 24 cs cargo ship 6,0 32% 0 2 0 0 0 0 0 0 40 20
Play#0 output Play#0 1 2 12 sb submarine 2,2 68% 0 3 0 0 0 0 0 1 86 60
Play#0 output Play#0 1 2 13 sb submarine 6,0 72% 0 4 0 0 0 0 0 1 91 60
Play#0 output Play#0 1 2 22 cs cargo ship 2,2 58% 0 3 0 0 0 0 1 1 73 20
Play#0 output Play#0 1 2 23 cs cargo ship 6,0 79% 0 4 0 0 0 0 1 1 100 20
Play#0 output Play#0 1 2 24 cs cargo ship 6,0 32% 0 1 0 0 0 0 0 0 40 20
Play#0 output Play#0 1 14 ships
Play#0 output Play#0 6 0 640
Play#0 input carg *
@ -1396,10 +1388,10 @@
Play#0 output Play#0 1 8 cs 3,1 100% 0 0 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 9 cs 5,1 98% 0 10 0 10 9 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 12 sb 2,2 68% 0 3 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 13 sb 6,0 72% 0 3 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 22 cs 2,2 58% 0 3 0 0 0 0 0 0 0 0 58 59 0
Play#0 output Play#0 1 23 cs 6,0 78% 0 4 0 0 0 0 0 0 0 0 78 78 0
Play#0 output Play#0 1 24 cs 6,0 32% 0 2 0 0 0 0 0 0 0 0 32 32 0
Play#0 output Play#0 1 13 sb 6,0 72% 0 4 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 22 cs 2,2 58% 0 3 0 0 0 0 0 0 0 0 58 58 0
Play#0 output Play#0 1 23 cs 6,0 79% 0 4 0 0 0 0 0 0 0 0 78 78 0
Play#0 output Play#0 1 24 cs 6,0 32% 0 1 0 0 0 0 0 0 0 0 32 32 0
Play#0 output Play#0 1 14 ships
Play#0 output Play#0 6 0 640
Play#0 input miss s * ?mission#0 q
@ -1430,12 +1422,13 @@
Play#0 output Play#0 1 1 5 hat hvy artill 0,-2 100% 10 0 127 0 160 42% 0 0
Play#0 output Play#0 1 1 8 tra train 3,1 100% 0 0 127 0 40 42% 0 0
Play#0 output Play#0 1 1 9 sup supply 1,1 100% 10 0 0 0 50 42% 0 0
Play#0 output Play#0 1 2 12 spy infiltrato 2,2 100% 0 0 127 0 40 42% 0 0 12S
Play#0 output Play#0 1 2 13 spy infiltrato 6,0 100% 0 0 127 0 40 42% 0 0 13S
Play#0 output Play#0 1 2 22 rad radar unit 2,2 97% 10 0 124 0 270 42% 1 0 22S
Play#0 output Play#0 1 2 22 rad radar unit 2,2 100% 10 0 127 0 270 42% 1 0 22S
Play#0 output Play#0 1 2 23 rad radar unit 6,0 100% 10 0 127 0 270 42% 1 0 23S
Play#0 output Play#0 1 2 32 tra train 2,2 94% 10 0 119 0 40 42% 1 1
Play#0 output Play#0 1 2 33 rad radar unit 2,2 97% 9 0 123 0 270 42% 1 0 32L
Play#0 output Play#0 1 12 units
Play#0 output Play#0 1 2 32 tra train 2,2 94% 9 0 120 0 40 42% 1 1
Play#0 output Play#0 1 2 33 rad radar unit 2,2 100% 10 0 127 0 270 42% 1 0 32L
Play#0 output Play#0 1 13 units
Play#0 output Play#0 6 0 638
Play#0 input lcarg *
Play#0 command lcargo
@ -1447,12 +1440,13 @@
Play#0 output Play#0 1 5 hat 0,-2 100% 0 10 0 16 12 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 8 tra 3,1 100% 0 0 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 9 sup 1,1 100% 0 10 0 10 10 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 12 spy 2,2 100% 0 0 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 13 spy 6,0 100% 0 0 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 22 rad 2,2 97% 0 10 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 22 rad 2,2 100% 0 10 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 23 rad 6,0 100% 0 10 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 32 tra 2,2 94% 0 10 0 0 0 0 0 0 0 0 94 94 0
Play#0 output Play#0 1 33 rad 2,2 97% 0 9 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 12 units
Play#0 output Play#0 1 32 tra 2,2 94% 0 9 0 0 0 0 0 0 0 0 94 94 0
Play#0 output Play#0 1 33 rad 2,2 100% 0 10 0 0 0 0 0 0 0 0 0 0 0
Play#0 output Play#0 1 13 units
Play#0 output Play#0 6 0 638
Play#0 input miss l * ?mission#0 q
Play#0 command mission
@ -1484,17 +1478,9 @@
Play#0 output Play#0 1 Country #1 shelled sector 2,2 for 0 damage.
Play#0 output Play#0 1 Country #1 shelled sector 2,2 for 5 damage.
Play#0 output Play#0 1 spy infiltrator #0 takes 1
Play#0 output Play#0 1 spy infiltrator #10 takes 1
Play#0 output Play#0 1 spy infiltrator #12 takes 1
Play#0 output Play#0 1 rad radar unit #20 takes 1
Play#0 output Play#0 1 rad radar unit #22 takes 1
Play#0 output Play#0 1 tra train #32 takes 1
Play#0 output Play#0 1 rad radar unit #33 takes 1
Play#0 output Play#0 1 Country #1 shelled sector 2,2 for 21 damage.
Play#0 output Play#0 1 rad radar unit #20 takes 2
Play#0 output Play#0 1 rad radar unit #22 takes 2
Play#0 output Play#0 1 tra train #32 takes 5
Play#0 output Play#0 1 rad radar unit #33 takes 2
Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#23) in 6,0 for 0 damage.
Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#23) in 6,0 for 2 damage.
Play#0 output Play#0 1 cs cargo ship (#23) takes 1
@ -1538,6 +1524,7 @@
Play#0 output Play#0 1 Country #1 shelled sb submarine (#10) in 2,2 for 34 damage.
Play#0 output Play#0 1 sb submarine (#10) takes 27
Play#0 output Play#0 1 sb submarine (#10) sunk!
Play#0 output Play#0 1 spy infiltrator #10 lost!
Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#24) in 6,0 for 43 damage.
Play#0 output Play#0 1 cs cargo ship (#24) takes 35
Play#0 output Play#0 1 Country #1 shelled cs cargo ship (#24) in 6,0 for 35 damage.

4
tests/retreat/final.xdump
View file

@ -125,10 +125,10 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius army ship h
28 2 2 2 0 100 107 0 50 3 1 none 3 "g" -1 0 42 (group injured) "g" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
29 2 4 0 0 100 127 0 50 4 0 reserve 3 "g" -1 127 42 (group bombed) "bhg" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
30 0 0 2 0 0 105 0 50 0 2 reserve 3 "c" -1 127 42 (group bombed) "j" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
31 2 0 2 0 99 126 0 50 0 2 reserve 3 "c" 35 0 42 (group bombed) "j" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
31 2 0 2 0 100 127 0 50 0 2 reserve 3 "c" 35 0 42 (group bombed) "j" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
32 2 0 2 0 100 127 0 50 0 2 reserve 3 "c" -1 127 42 (group bombed) "j" 0 0 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
33 2 -1 1 0 85 108 0 50 -1 1 reserve 3 "" -1 127 42 (bombed) "j" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
34 2 0 2 0 99 126 0 50 0 2 reserve 3 "c" -1 0 42 (group bombed) "j" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 9 0
34 2 0 2 0 100 127 0 50 0 2 reserve 3 "c" -1 0 42 (group bombed) "j" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 9 0
35 2 0 2 0 100 0 0 50 0 2 reserve 3 "c" -1 127 42 (group bombed) "j" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
36 2 0 2 0 100 127 0 50 0 2 reserve 3 "c" -1 127 42 (group bombed) "j" 0 10 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0
37 2 1 1 7 82 105 0 50 0 0 none 0 "" -1 127 42 (bombed) "j" 0 9 0 0 0 0 0 0 0 0 0 0 0 0 healthy 0 -1 0

6
tests/retreat/journal.log
View file

@ -1427,8 +1427,6 @@
Play#0 output Play#0 1 cav cavalry #36 is on the trading block, and can't retreat!
Play#0 output Play#0 1 0,2 takes 4% collateral damage
Play#0 output Play#0 1 tra train #9 takes 1
Play#0 output Play#0 1 cav cavalry #31 takes 1
Play#0 output Play#0 1 cav cavalry #34 takes 1
Play#0 output Play#0 1 1 planes spotted over -1,1
Play#0 output Play#0 1 1 bombs did 40% damage to cav cavalry #33 at -1,1
Play#0 output Play#0 1 cav cavalry #33 takes 15
@ -1683,10 +1681,10 @@
Play#0 output Play#0 1 2 27 cav cavalry 3,1 g 100% 10 127 127 0 50 42% 0 0
Play#0 output Play#0 1 2 28 cav cavalry 2,2 g 100% 10 0 107 0 50 42% 0 0
Play#0 output Play#0 1 2 29 cav cavalry 4,0 g 100% 10 127 127 0 50 42% 0 0
Play#0 output Play#0 1 2 31 cav cavalry 0,2 c 99% 10 0 126 0 50 42% 0 0 35S
Play#0 output Play#0 1 2 31 cav cavalry 0,2 c 100% 10 0 127 0 50 42% 0 0 35S
Play#0 output Play#0 1 2 32 cav cavalry 0,2 c 100% 0 127 127 0 50 42% 0 0
Play#0 output Play#0 1 2 33 cav cavalry -1,1 85% 9 127 108 0 50 42% 0 0
Play#0 output Play#0 1 2 34 cav cavalry 0,2 c 99% 10 0 126 0 50 42% 0 0 9L
Play#0 output Play#0 1 2 34 cav cavalry 0,2 c 100% 10 0 127 0 50 42% 0 0 9L
Play#0 output Play#0 1 2 35 cav cavalry 0,2 c 100% 10 127 0 0 50 42% 0 0
Play#0 output Play#0 1 2 36 cav cavalry 0,2 c 100% 10 127 127 0 50 42% 0 0
Play#0 output Play#0 1 2 37 tra train 1,1 82% 9 127 105 0 50 42% 0 0