retreat lretreat edit xdump: Change "torped" to "torpedoed"

[empserver] / tests / actofgod / journal.log

diff --git a/tests/actofgod/journal.log b/tests/actofgod/journal.log
index 04c8db58215c56de7361e3362441054ecdf45a71..536c5c86383c755910169d6bacbc32b02e778372 100644 (file)
--- a/tests/actofgod/journal.log
+++ b/tests/actofgod/journal.log
@@ -16,6 +16,9 @@
      Conn1 input play
      Conn1 login 0 127.0.0.1 tester
     Play#0 output Play#0 2 2
+    Play#0 output Play#0 1
+    Play#0 output Play#0 1 ***          Server configured for testing          ***
+    Play#0 output Play#0 1 *** If you see this in a game, it is misconfigured! ***
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 0,0 @ 0
     Play#0 command edit
@@ -125,9 +128,9 @@
     Play#0 command setsector
     Play#0 output Play#0 1 Owner of 11,7 changed from 1 (#1) to 2 (#2)
     Play#0 output Play#0 6 0 640
-    Play#0 input edit l 1,7 L 1,-7
+    Play#0 input edit l 1,7 L 5,-7
     Play#0 command edit
-    Play#0 output Play#0 1 Sector 1,7 duplicated to 1,-7
+    Play#0 output Play#0 1 Sector 1,7 duplicated to 5,-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
@@ -883,7 +886,7 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit s 3 L 1,-1
     Play#0 command edit
-    Play#0 output Play#0 1 Location of cs   cargo ship (#3) changed from 1,-1 to 1,-1
+    Play#0 output Play#0 1 Location of cs   cargo ship (#3) unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit p 0 @ 0
     Play#0 command edit
@@ -933,7 +936,7 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit p 3 l 1,-1
     Play#0 command edit
-    Play#0 output Play#0 1 Location of f1   Sopwith Camel #3 changed from 1,-1 to 1,-1
+    Play#0 output Play#0 1 Location of f1   Sopwith Camel #3 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit u 0 @ 0
     Play#0 command edit
@@ -983,7 +986,7 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit u 3 L 1,-1
     Play#0 command edit
-    Play#0 output Play#0 1 Location of sup  supply #3 changed from 1,-1 to 1,-1
+    Play#0 output Play#0 1 Location of sup  supply #3 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit n 0 @ 0
     Play#0 command edit
@@ -1033,17 +1036,15 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit n 3 L 1,-1
     Play#0 command edit
-    Play#0 output Play#0 1 Location of 10kt  fission warhead #3 changed from 1,-1 to 1,-1
+    Play#0 output Play#0 1 Location of 10kt  fission warhead #3 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit s 6 t lc O 1 t lc t hc g 8 t lc
     Play#0 command edit
     Play#0 output Play#0 1 Type of fb   fishing boat (#6) changed to lc   light cruiser
-    Play#0 output Play#0 1 Tech level of lc   light cruiser (#6) changed from 0 to 45
     Play#0 output Play#0 1 Owner of lc   light cruiser (#6) changed from POGO (#0) to 1 (#1)
     Play#0 output Play#0 1 Efficiency of lc   light cruiser (#6) changed from 0 to 20
     Play#0 output Play#0 1 Type of lc   light cruiser (#6) unchanged
     Play#0 output Play#0 1 Type of lc   light cruiser (#6) changed to hc   heavy cruiser
-    Play#0 output Play#0 1 Tech level of hc   heavy cruiser (#6) changed from 45 to 50
     Play#0 output Play#0 1 guns of hc   heavy cruiser (#6) changed from 0 to 8
     Play#0 output Play#0 1 Type of hc   heavy cruiser (#6) changed to lc   light cruiser
     Play#0 output Play#0 1 guns of lc   light cruiser (#6) changed from 8 to 5
@@ -1147,14 +1148,24 @@
     Play#0 input edit p 6 T mb O 1 T mb T hb T mb
     Play#0 command edit
     Play#0 output Play#0 1 Type of f1   Sopwith Camel #6 changed to mb   medium bomber
-    Play#0 output Play#0 1 Tech level of mb   medium bomber #6 changed from 0 to 80
     Play#0 output Play#0 1 Owner of mb   medium bomber #6 changed from POGO (#0) to 1 (#1)
     Play#0 output Play#0 1 Efficiency of mb   medium bomber #6 changed from 0 to 10
     Play#0 output Play#0 1 Type of mb   medium bomber #6 unchanged
     Play#0 output Play#0 1 Type of mb   medium bomber #6 changed to hb   B-26B Marauder
-    Play#0 output Play#0 1 Tech level of hb   B-26B Marauder #6 changed from 80 to 90
     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 input edit p 7 r 255 T hb T mb
+    Play#0 command edit
+    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 hb   B-26B Marauder #7 changed to mb   medium bomber
+    Play#0 output Play#0 6 0 640
+    Play#0 input edit p 8 T hb r 255 T f1
+    Play#0 command edit
+    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 Type of hb   B-26B Marauder #8 changed to f1   Sopwith Camel
+    Play#0 output Play#0 6 0 640
     Play#0 input edit p 2 e 0
     Play#0 command edit
     Play#0 output Play#0 1 Efficiency of f1   Sopwith Camel #2 unchanged
@@ -1222,12 +1233,10 @@
     Play#0 input edit u 6 T art O 1 T art T hat g 12 T art
     Play#0 command edit
     Play#0 output Play#0 1 Type of cav  cavalry #6 changed to art  artillery
-    Play#0 output Play#0 1 Tech level of art  artillery #6 changed from 0 to 35
     Play#0 output Play#0 1 Owner of art  artillery #6 changed from POGO (#0) to 1 (#1)
     Play#0 output Play#0 1 Efficiency of art  artillery #6 changed from 0 to 10
     Play#0 output Play#0 1 Type of art  artillery #6 unchanged
     Play#0 output Play#0 1 Type of art  artillery #6 changed to hat  hvy artillery
-    Play#0 output Play#0 1 Tech level of hat  hvy artillery #6 changed from 35 to 100
     Play#0 output Play#0 1 guns of hat  hvy artillery #6 changed from 0 to 12
     Play#0 output Play#0 1 Type of hat  hvy artillery #6 changed to art  artillery
     Play#0 output Play#0 1 guns of art  artillery #6 changed from 12 to 10
@@ -1331,12 +1340,10 @@
     Play#0 input edit n 6 t 15kt O 1 t 15kt t 50kt t 15kt
     Play#0 command edit
     Play#0 output Play#0 1 Type of 10kt  fission warhead #6 changed to 15kt  fission
-    Play#0 output Play#0 1 Tech level of 15kt  fission warhead #6 changed from 0 to 290
     Play#0 output Play#0 1 Owner of 15kt  fission warhead #6 changed from POGO (#0) to 1 (#1)
     Play#0 output Play#0 1 Efficiency of 15kt  fission warhead #6 changed from 0 to 100
     Play#0 output Play#0 1 Type of 15kt  fission warhead #6 unchanged
     Play#0 output Play#0 1 Type of 15kt  fission warhead #6 changed to 50kt  fission
-    Play#0 output Play#0 1 Tech level of 50kt  fission warhead #6 changed from 290 to 300
     Play#0 output Play#0 1 Type of 50kt  fission warhead #6 changed to 15kt  fission
     Play#0 output Play#0 6 0 640
     Play#0 input edit n 2 T 280
@@ -1395,8 +1402,8 @@
     Play#0 input edit s 3 W 513 W 1030 W 2
     Play#0 command edit
     Play#0 output Play#0 1 Retreat conditions of cs   cargo ship (#3) changed: group, #9 set
-    Play#0 output Play#0 1 Retreat conditions of cs   cargo ship (#3) changed: injured, torped, #10 set, and group, #9 cleared
-    Play#0 output Play#0 1 Retreat conditions of cs   cargo ship (#3) changed: torped, #10 cleared
+    Play#0 output Play#0 1 Retreat conditions of cs   cargo ship (#3) changed: injured, torpedoed, #10 set, and group, #9 cleared
+    Play#0 output Play#0 1 Retreat conditions of cs   cargo ship (#3) changed: torpedoed, #10 cleared
     Play#0 output Play#0 6 0 640
     Play#0 input edit u 2 R ""
     Play#0 command edit
@@ -1414,8 +1421,8 @@
     Play#0 input edit u 3 W 513 W 1030 W 2
     Play#0 command edit
     Play#0 output Play#0 1 Retreat condition of sup  supply #3 changed: group, #9 set
-    Play#0 output Play#0 1 Retreat condition of sup  supply #3 changed: injured, torped, #10 set, and group, #9 cleared
-    Play#0 output Play#0 1 Retreat condition of sup  supply #3 changed: torped, #10 cleared
+    Play#0 output Play#0 1 Retreat condition of sup  supply #3 changed: injured, torpedoed, #10 set, and group, #9 cleared
+    Play#0 output Play#0 1 Retreat condition of sup  supply #3 changed: torpedoed, #10 cleared
     Play#0 output Play#0 6 0 640
     Play#0 input edit p 2 f 4
     Play#0 command edit
@@ -1879,23 +1886,19 @@
     Play#0 output Play#0 1 POGO stole 1 civilians from 8,6
     Play#0 output Play#0 1 lc   light cruiser (#6) given to you by an act of POGO!
     Play#0 output Play#0 1 Type of lc   light cruiser (#6) changed to hc   heavy cruiser by an act of POGO
-    Play#0 output Play#0 1 Tech level of hc   heavy cruiser (#6) changed from 45 to 50 by an act of POGO
     Play#0 output Play#0 1 POGO gave you 8 guns in hc   heavy cruiser (#6)
     Play#0 output Play#0 1 Type of hc   heavy cruiser (#6) changed to lc   light cruiser by an act of POGO
     Play#0 output Play#0 1 POGO stole 3 guns from lc   light cruiser (#6)
     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 Tech level of hb   B-26B Marauder #6 changed from 80 to 90 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 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 Tech level of hat  hvy artillery #6 changed from 35 to 100 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 Type of hat  hvy artillery #6 changed to art  artillery by an act of POGO
     Play#0 output Play#0 1 POGO stole 2 guns from art  artillery #6
     Play#0 output Play#0 1 15kt  fission warhead #6 given to you by an act of POGO!
     Play#0 output Play#0 1 Type of 15kt  fission warhead #6 changed to 50kt  fission by an act of POGO
-    Play#0 output Play#0 1 Tech level of 50kt  fission warhead #6 changed from 290 to 300 by an act of POGO
     Play#0 output Play#0 1 Type of 50kt  fission warhead #6 changed to 15kt  fission by an act of POGO
     Play#0 output Play#0 1 Money changed from 0 to -2147483648 by an act of POGO!
     Play#0 output Play#0 1 Technology changed from 0.00 to 3.14 by an act of POGO!
@@ -1941,7 +1944,7 @@
     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 5,-7 taken from you by an act of POGO!
     Play#0 output Play#0 1 Old owner of 1,-3 changed from 3 (#3) to 1 (#1) by an act of POGO
     Play#0 output Play#0 1 Old owner of 3,-3 changed from 3 (#3) to 1 (#1) by an act of POGO
     Play#0 output Play#0 1 Sector -2,2 swapped with 2,-2 by an act of POGO!
@@ -2019,12 +2022,12 @@
     Play#0 output Play#0 1 Assignment of sup  supply #3 changed from army ~ to a by an act of POGO
     Play#0 output Play#0 1 Retreat path of cs   cargo ship (#3) changed from  to jj by an act of POGO
     Play#0 output Play#0 1 Retreat conditions of cs   cargo ship (#3) changed by an act of POGO: group set
-    Play#0 output Play#0 1 Retreat conditions of cs   cargo ship (#3) changed by an act of POGO: injured, torped set and group cleared
-    Play#0 output Play#0 1 Retreat conditions of cs   cargo ship (#3) changed by an act of POGO: torped cleared
+    Play#0 output Play#0 1 Retreat conditions of cs   cargo ship (#3) changed by an act of POGO: injured, torpedoed set and group cleared
+    Play#0 output Play#0 1 Retreat conditions of cs   cargo ship (#3) changed by an act of POGO: torpedoed cleared
     Play#0 output Play#0 1 Retreat path of sup  supply #3 changed from  to jj by an act of POGO
     Play#0 output Play#0 1 Retreat condition of sup  supply #3 changed by an act of POGO: group set
-    Play#0 output Play#0 1 Retreat condition of sup  supply #3 changed by an act of POGO: injured, torped set and group cleared
-    Play#0 output Play#0 1 Retreat condition of sup  supply #3 changed by an act of POGO: torped cleared
+    Play#0 output Play#0 1 Retreat condition of sup  supply #3 changed by an act of POGO: injured, torpedoed set and group cleared
+    Play#0 output Play#0 1 Retreat condition of sup  supply #3 changed by an act of POGO: torpedoed cleared
     Play#0 output Play#0 1 f1   Sopwith Camel #3 loaded onto ship #3 by an act of POGO!
     Play#0 output Play#0 1 f1   Sopwith Camel #4 loaded onto ship #4 by an act of POGO!
     Play#0 output Play#0 1 f1   Sopwith Camel #4 unloaded from ship #4 by an act of POGO!