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

tests/actofgod: Fix owner of plane 7/8

Browse source 
Planes 7/8 aren't visible in output, because the test neglects to set
their owner.  Messed up in commit commit efec441, v4.3.33.  Correct
that oversight.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2017-08-27 14:23:07 +02:00
parent 16e565ed5f
commit 5363ef85d4
3 changed files with 19 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tests/actofgod/final.xdump
View file

@ -187,8 +187,8 @@ uid owner xloc yloc type effic mobil off tech opx opy mission radius wing range
4 3 3 -1 0 100 127 0 32767 0 0 none 0 "" 18 0 -1 4 () 0 0.00000 4 3 3 -1 0 100 127 0 32767 0 0 none 0 "" 18 0 -1 4 () 0 0.00000
5 3 1 -1 0 100 127 0 32767 1 -1 air\040defense 4 "" 18 0 -1 -1 () 0 0.00000 5 3 1 -1 0 100 127 0 32767 1 -1 air\040defense 4 "" 18 0 -1 -1 () 0 0.00000
6 1 0 0 9 10 0 0 90 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 6 1 0 0 9 10 0 0 90 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
7 0 0 0 9 0 0 0 90 0 0 none 0 "" 17 0 -1 -1 () 0 0.00000 7 1 0 0 9 10 0 0 90 0 0 none 0 "" 17 0 -1 -1 () 0 0.00000
8 0 0 0 0 0 0 0 90 0 0 none 0 "" 9 0 -1 -1 () 0 0.00000 8 1 0 0 0 10 0 0 90 0 0 none 0 "" 9 0 -1 -1 () 0 0.00000
49 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000 49 0 0 0 0 0 0 0 0 0 0 none 0 "" 0 0 -1 -1 () 0 0.00000
/config /config
config land config land
@ -218,7 +218,7 @@ actor action victim times duration time
0 44 1 32 0 0 0 44 1 32 0 0
0 43 2 6 0 0 0 43 2 6 0 0
0 44 3 28 0 0 0 44 3 28 0 0
0 43 1 74 0 0 0 43 1 76 0 0
0 42 1 20 0 0 0 42 1 20 0 0
1 45 0 3 0 0 1 45 0 3 0 0
0 43 3 38 0 0 0 43 3 38 0 0

4
tests/actofgod/geninput.pl
View file

@ -255,8 +255,8 @@ edit_int('ship', 2, (
# plane: type # plane: type
edit('plane', 6, 'T', 'mb', 'O', 1, 'T', 'mb', 'T', 'hb', 'T', 'mb'); edit('plane', 6, 'T', 'mb', 'O', 1, 'T', 'mb', 'T', 'hb', 'T', 'mb');
edit('plane', 7, 'r', 255, 'T', 'hb', 'T', 'mb'); edit('plane', 7, 'O', 1, 'r', 255, 'T', 'hb', 'T', 'mb');
edit('plane', 8, 'T', 'hb', 'r', 255, 'T', 'f1'); edit('plane', 8, 'O', 1, 'T', 'hb', 'r', 255, 'T', 'f1');
# plane: effic mobil range tech # plane: effic mobil range tech
edit_int('plane', 2, ( edit_int('plane', 2, (

16
tests/actofgod/journal.log
View file

@ -1210,14 +1210,18 @@
Play#0 output Play#0 1 Type of mb medium bomber #6 changed to hb B-26B Marauder Play#0 output Play#0 1 Type of mb medium bomber #6 changed to hb B-26B Marauder
Play#0 output Play#0 1 Type of hb B-26B Marauder #6 changed to mb medium bomber Play#0 output Play#0 1 Type of hb B-26B Marauder #6 changed to mb medium bomber
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit p 7 r 255 T hb T mb Play#0 input edit p 7 O 1 r 255 T hb T mb
Play#0 command edit Play#0 command edit
Play#0 output Play#0 1 Owner of f1 Sopwith Camel #7 changed from POGO (#0) to 1 (#1)
Play#0 output Play#0 1 Efficiency of f1 Sopwith Camel #7 changed from 0 to 10
Play#0 output Play#0 1 Range of f1 Sopwith Camel #7 changed from 0 to 4 Play#0 output Play#0 1 Range of f1 Sopwith Camel #7 changed from 0 to 4
Play#0 output Play#0 1 Type of f1 Sopwith Camel #7 changed to hb B-26B Marauder Play#0 output Play#0 1 Type of f1 Sopwith Camel #7 changed to hb B-26B Marauder
Play#0 output Play#0 1 Type of hb B-26B Marauder #7 changed to mb medium bomber Play#0 output Play#0 1 Type of hb B-26B Marauder #7 changed to mb medium bomber
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit p 8 T hb r 255 T f1 Play#0 input edit p 8 O 1 T hb r 255 T f1
Play#0 command edit Play#0 command edit
Play#0 output Play#0 1 Owner of f1 Sopwith Camel #8 changed from POGO (#0) to 1 (#1)
Play#0 output Play#0 1 Efficiency of f1 Sopwith Camel #8 changed from 0 to 10
Play#0 output Play#0 1 Type of f1 Sopwith Camel #8 changed to hb B-26B Marauder Play#0 output Play#0 1 Type of f1 Sopwith Camel #8 changed to hb B-26B Marauder
Play#0 output Play#0 1 Range of hb B-26B Marauder #8 changed from 0 to 15 Play#0 output Play#0 1 Range of hb B-26B Marauder #8 changed from 0 to 15
Play#0 output Play#0 1 Type of hb B-26B Marauder #8 changed to f1 Sopwith Camel Play#0 output Play#0 1 Type of hb B-26B Marauder #8 changed to f1 Sopwith Camel
@ -2074,6 +2078,14 @@
Play#0 output Play#0 1 mb medium bomber #6 given to you by an act of POGO! Play#0 output Play#0 1 mb medium bomber #6 given to you by an act of POGO!
Play#0 output Play#0 1 Type of mb medium bomber #6 changed to hb B-26B Marauder by an act of POGO Play#0 output Play#0 1 Type of mb medium bomber #6 changed to hb B-26B Marauder by an act of POGO
Play#0 output Play#0 1 Type of hb B-26B Marauder #6 changed to mb medium bomber by an act of POGO Play#0 output Play#0 1 Type of hb B-26B Marauder #6 changed to mb medium bomber by an act of POGO
Play#0 output Play#0 1 f1 Sopwith Camel #7 given to you by an act of POGO!
Play#0 output Play#0 1 Range of f1 Sopwith Camel #7 changed from 0 to 4 by an act of POGO
Play#0 output Play#0 1 Type of f1 Sopwith Camel #7 changed to hb B-26B Marauder by an act of POGO
Play#0 output Play#0 1 Type of hb B-26B Marauder #7 changed to mb medium bomber by an act of POGO
Play#0 output Play#0 1 f1 Sopwith Camel #8 given to you by an act of POGO!
Play#0 output Play#0 1 Type of f1 Sopwith Camel #8 changed to hb B-26B Marauder by an act of POGO
Play#0 output Play#0 1 Range of hb B-26B Marauder #8 changed from 0 to 15 by an act of POGO
Play#0 output Play#0 1 Type of hb B-26B Marauder #8 changed to f1 Sopwith Camel by an act of POGO
Play#0 output Play#0 1 art artillery #6 given to you by an act of POGO! Play#0 output Play#0 1 art artillery #6 given to you by an act of POGO!
Play#0 output Play#0 1 Type of art artillery #6 changed to hat hvy artillery by an act of POGO Play#0 output Play#0 1 Type of art artillery #6 changed to hat hvy artillery by an act of POGO
Play#0 output Play#0 1 POGO gave you 12 guns in hat hvy artillery #6 Play#0 output Play#0 1 POGO gave you 12 guns in hat hvy artillery #6