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

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