edit: Report sector loss and gain properly for key 'L'

[empserver] / tests / actofgod / journal.log

diff --git a/tests/actofgod/journal.log b/tests/actofgod/journal.log
index eed4ad3545871cf8fb8b14a033e916f8208065ec..58f99e10d59b0d515bcc33f9a62590576a31168c 100644 (file)
--- a/tests/actofgod/journal.log
+++ b/tests/actofgod/journal.log
@@ -127,9 +127,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,7 L 1,-7
     Play#0 command edit
+    Play#0 output Play#0 1 Sector 1,7 duplicated to 1,-7
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 3,-7 L 3,-7 L 1,0
     Play#0 command edit
+    Play#0 output Play#0 1 Sector 3,-7 duplicated to 3,-7
     Play#0 output Play#0 1 Usage: edit <country|land|ship|plane|unit> <NAT|SECT|SHIP|PLANE|LAND> [<KEY> <VALUE>]...
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,1 e 0
@@ -208,13 +210,13 @@
     Play#0 command edit
     Play#0 output Play#0 1 Iron ore content of 3,1 changed from 0 to 0
     Play#0 output Play#0 6 0 640
-    Play#0 input edit l 5,1 i 127
+    Play#0 input edit l 5,1 i 100
     Play#0 command edit
-    Play#0 output Play#0 1 Iron ore content of 5,1 changed from 0 to 127
+    Play#0 output Play#0 1 Iron ore content of 5,1 changed from 0 to 100
     Play#0 output Play#0 6 0 640
-    Play#0 input edit l 7,1 i 128
+    Play#0 input edit l 7,1 i 101
     Play#0 command edit
-    Play#0 output Play#0 1 Iron ore content of 7,1 changed from 0 to 127
+    Play#0 output Play#0 1 Iron ore content of 7,1 changed from 0 to 100
     Play#0 output Play#0 6 0 640
     Play#0 input setres i 2,2 0
     Play#0 command setresource
@@ -258,13 +260,13 @@
     Play#0 command edit
     Play#0 output Play#0 1 Gold content of 3,1 changed from 0 to 0
     Play#0 output Play#0 6 0 640
-    Play#0 input edit l 5,1 g 127
+    Play#0 input edit l 5,1 g 100
     Play#0 command edit
-    Play#0 output Play#0 1 Gold content of 5,1 changed from 0 to 127
+    Play#0 output Play#0 1 Gold content of 5,1 changed from 0 to 100
     Play#0 output Play#0 6 0 640
-    Play#0 input edit l 7,1 g 128
+    Play#0 input edit l 7,1 g 101
     Play#0 command edit
-    Play#0 output Play#0 1 Gold content of 7,1 changed from 0 to 127
+    Play#0 output Play#0 1 Gold content of 7,1 changed from 0 to 100
     Play#0 output Play#0 6 0 640
     Play#0 input setres g 2,2 0
     Play#0 command setresource
@@ -308,13 +310,13 @@
     Play#0 command edit
     Play#0 output Play#0 1 Fertility of 3,1 changed from 0 to 0
     Play#0 output Play#0 6 0 640
-    Play#0 input edit l 5,1 f 127
+    Play#0 input edit l 5,1 f 100
     Play#0 command edit
-    Play#0 output Play#0 1 Fertility of 5,1 changed from 0 to 127
+    Play#0 output Play#0 1 Fertility of 5,1 changed from 0 to 100
     Play#0 output Play#0 6 0 640
-    Play#0 input edit l 7,1 f 128
+    Play#0 input edit l 7,1 f 101
     Play#0 command edit
-    Play#0 output Play#0 1 Fertility of 7,1 changed from 0 to 127
+    Play#0 output Play#0 1 Fertility of 7,1 changed from 0 to 100
     Play#0 output Play#0 6 0 640
     Play#0 input setres f 2,2 0
     Play#0 command setresource
@@ -358,13 +360,13 @@
     Play#0 command edit
     Play#0 output Play#0 1 Oil content of 3,1 changed from 0 to 0
     Play#0 output Play#0 6 0 640
-    Play#0 input edit l 5,1 c 127
+    Play#0 input edit l 5,1 c 100
     Play#0 command edit
-    Play#0 output Play#0 1 Oil content of 5,1 changed from 0 to 127
+    Play#0 output Play#0 1 Oil content of 5,1 changed from 0 to 100
     Play#0 output Play#0 6 0 640
-    Play#0 input edit l 7,1 c 128
+    Play#0 input edit l 7,1 c 101
     Play#0 command edit
-    Play#0 output Play#0 1 Oil content of 7,1 changed from 0 to 127
+    Play#0 output Play#0 1 Oil content of 7,1 changed from 0 to 100
     Play#0 output Play#0 6 0 640
     Play#0 input setres o 2,2 0
     Play#0 command setresource
@@ -408,13 +410,13 @@
     Play#0 command edit
     Play#0 output Play#0 1 Uranium content of 3,1 changed from 0 to 0
     Play#0 output Play#0 6 0 640
-    Play#0 input edit l 5,1 u 127
+    Play#0 input edit l 5,1 u 100
     Play#0 command edit
-    Play#0 output Play#0 1 Uranium content of 5,1 changed from 0 to 127
+    Play#0 output Play#0 1 Uranium content of 5,1 changed from 0 to 100
     Play#0 output Play#0 6 0 640
-    Play#0 input edit l 7,1 u 128
+    Play#0 input edit l 7,1 u 101
     Play#0 command edit
-    Play#0 output Play#0 1 Uranium content of 7,1 changed from 0 to 127
+    Play#0 output Play#0 1 Uranium content of 7,1 changed from 0 to 100
     Play#0 output Play#0 6 0 640
     Play#0 input setres u 2,2 0
     Play#0 command setresource
@@ -680,6 +682,18 @@
     Play#0 command edit
     Play#0 output Play#0 1 Defense percentage of 7,1 changed from 0 to 100
     Play#0 output Play#0 6 0 640
+    Play#0 input edit l -1,-1 i 50
+    Play#0 command edit
+    Play#0 output Play#0 1 Iron ore content of -1,-1 changed from 0 to 50
+    Play#0 output Play#0 6 0 640
+    Play#0 input setres g -1,-1 50
+    Play#0 command setresource
+    Play#0 output Play#0 1 Gold content of -1,-1 changed from 0 to 50
+    Play#0 output Play#0 6 0 640
+    Play#0 input setsect f -1,-1 50
+    Play#0 command setsector
+    Play#0 output Play#0 1 Fertility content of -1,-1 changed from 0 to 50
+    Play#0 output Play#0 6 0 640
     Play#0 input setsect ol 1:3,-3 1
     Play#0 command setsector
     Play#0 output Play#0 1 Old owner of 1,-3 changed from 3 (#3) to 1 (#1).
@@ -1498,8 +1512,8 @@
     Play#0 output Play#0 1 Mobility in 3,1 was changed from 0 to -127 by an act of POGO
     Play#0 output Play#0 1 Mobility in 5,1 was changed from 0 to 127 by an act of POGO
     Play#0 output Play#0 1 Mobility in 7,1 was changed from 0 to 127 by an act of POGO
-    Play#0 output Play#0 1 Iron ore content in 5,1 was changed from 0 to 127 by an act of POGO
-    Play#0 output Play#0 1 Iron ore content in 7,1 was changed from 0 to 127 by an act of POGO
+    Play#0 output Play#0 1 Iron ore content in 5,1 was changed from 0 to 100 by an act of POGO
+    Play#0 output Play#0 1 Iron ore content in 7,1 was changed from 0 to 100 by an act of POGO
     Play#0 output Play#0 1 Iron ore content in 6,2 was changed from 0 to 100 by an act of POGO
     Play#0 output Play#0 1 Iron ore content in 8,2 was changed from 0 to 100 by an act of POGO
     Play#0 output Play#0 1 Iron ore content in 3,3 was changed from 0 to 1 by an act of POGO
@@ -1507,8 +1521,8 @@
     Play#0 output Play#0 1 Iron ore content in 7,3 was changed from 0 to 1 by an act of POGO
     Play#0 output Play#0 1 Iron ore content in 5,3 was changed from 1 to 0 by an act of POGO
     Play#0 output Play#0 1 Iron ore content in 7,3 was changed from 1 to 0 by an act of POGO
-    Play#0 output Play#0 1 Gold content in 5,1 was changed from 0 to 127 by an act of POGO
-    Play#0 output Play#0 1 Gold content in 7,1 was changed from 0 to 127 by an act of POGO
+    Play#0 output Play#0 1 Gold content in 5,1 was changed from 0 to 100 by an act of POGO
+    Play#0 output Play#0 1 Gold content in 7,1 was changed from 0 to 100 by an act of POGO
     Play#0 output Play#0 1 Gold content in 6,2 was changed from 0 to 100 by an act of POGO
     Play#0 output Play#0 1 Gold content in 8,2 was changed from 0 to 100 by an act of POGO
     Play#0 output Play#0 1 Gold content in 3,3 was changed from 0 to 1 by an act of POGO
@@ -1516,8 +1530,8 @@
     Play#0 output Play#0 1 Gold content in 7,3 was changed from 0 to 1 by an act of POGO
     Play#0 output Play#0 1 Gold content in 5,3 was changed from 1 to 0 by an act of POGO
     Play#0 output Play#0 1 Gold content in 7,3 was changed from 1 to 0 by an act of POGO
-    Play#0 output Play#0 1 Fertility in 5,1 was changed from 0 to 127 by an act of POGO
-    Play#0 output Play#0 1 Fertility in 7,1 was changed from 0 to 127 by an act of POGO
+    Play#0 output Play#0 1 Fertility in 5,1 was changed from 0 to 100 by an act of POGO
+    Play#0 output Play#0 1 Fertility in 7,1 was changed from 0 to 100 by an act of POGO
     Play#0 output Play#0 1 Fertility content in 6,2 was changed from 0 to 100 by an act of POGO
     Play#0 output Play#0 1 Fertility content in 8,2 was changed from 0 to 100 by an act of POGO
     Play#0 output Play#0 1 Fertility content in 3,3 was changed from 0 to 1 by an act of POGO
@@ -1525,8 +1539,8 @@
     Play#0 output Play#0 1 Fertility content in 7,3 was changed from 0 to 1 by an act of POGO
     Play#0 output Play#0 1 Fertility content in 5,3 was changed from 1 to 0 by an act of POGO
     Play#0 output Play#0 1 Fertility content in 7,3 was changed from 1 to 0 by an act of POGO
-    Play#0 output Play#0 1 Oil content in 5,1 was changed from 0 to 127 by an act of POGO
-    Play#0 output Play#0 1 Oil content in 7,1 was changed from 0 to 127 by an act of POGO
+    Play#0 output Play#0 1 Oil content in 5,1 was changed from 0 to 100 by an act of POGO
+    Play#0 output Play#0 1 Oil content in 7,1 was changed from 0 to 100 by an act of POGO
     Play#0 output Play#0 1 Oil content in 6,2 was changed from 0 to 100 by an act of POGO
     Play#0 output Play#0 1 Oil content in 8,2 was changed from 0 to 100 by an act of POGO
     Play#0 output Play#0 1 Oil content in 3,3 was changed from 0 to 1 by an act of POGO
@@ -1534,8 +1548,8 @@
     Play#0 output Play#0 1 Oil content in 7,3 was changed from 0 to 1 by an act of POGO
     Play#0 output Play#0 1 Oil content in 5,3 was changed from 1 to 0 by an act of POGO
     Play#0 output Play#0 1 Oil content in 7,3 was changed from 1 to 0 by an act of POGO
-    Play#0 output Play#0 1 Uranium content in 5,1 was changed from 0 to 127 by an act of POGO
-    Play#0 output Play#0 1 Uranium content in 7,1 was changed from 0 to 127 by an act of POGO
+    Play#0 output Play#0 1 Uranium content in 5,1 was changed from 0 to 100 by an act of POGO
+    Play#0 output Play#0 1 Uranium content in 7,1 was changed from 0 to 100 by an act of POGO
     Play#0 output Play#0 1 Uranium content in 6,2 was changed from 0 to 100 by an act of POGO
     Play#0 output Play#0 1 Uranium content in 8,2 was changed from 0 to 100 by an act of POGO
     Play#0 output Play#0 1 Uranium content in 3,3 was changed from 0 to 1 by an act of POGO
@@ -1583,6 +1597,9 @@
     Play#0 command read
     Play#0 output Play#0 1 
     Play#0 output Play#0 1 > BULLETIN from POGO, (#0)  dated Thu Jan  1 00:00:00 1970
+    Play#0 output Play#0 1 Sector 1,-7 taken from you by an act of POGO!
+    Play#0 output Play#0 1 Sector 3,-7 taken from you by an act of POGO!
+    Play#0 output Play#0 1 Sector 3,-7 given to you by an act of POGO!
     Play#0 output Play#0 1 cs   cargo ship (#0) taken from you by an act of POGO!
     Play#0 output Play#0 1 cs   cargo ship (#1) taken from you by an act of POGO!
     Play#0 output Play#0 1 cs   cargo ship (#2) taken from you by an act of POGO!