edit &c: Report sector non-change differently

Print "unchanged" instead of "changed from X to X".  Affects edit,
setresource, setsector.  Suppress bulletin and news.  Affects only
edit sector key 'L'.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>

diff --git a/include/actofgod.h b/include/actofgod.h
index 767a646fdb13d449224e5f920071e499ba92a1be..786c53973da231cfde1ebc6cb7e1bf8491f7616d 100644 (file)
--- a/include/actofgod.h
+++ b/include/actofgod.h
@@ -40,5 +40,7 @@ extern void report_god_takes(char *, char *, natid);
 extern void report_god_gives(char *, char *, natid);
 extern void divine_sct_change(struct sctstr *, char *, int, int, char *, ...)
     ATTRIBUTE((format (printf, 5, 6)));
+#define divine_sct_change_quiet(sp, name, change, ...) \
+    divine_sct_change((sp), (name), -(change), 0, __VA_ARGS__)
 
 #endif

diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c
index f2a16440cc6a8a9c2d4d3784a7a5f081e004373e..b4f77354f160045bc5d2baeb96dccace1a5074da 100644 (file)
--- a/src/lib/commands/edit.c
+++ b/src/lib/commands/edit.c
@@ -416,9 +416,9 @@ edit_sect_i(struct sctstr *sect, char *key, int arg)
     case 'o':
        if (arg < 0 || arg >= MAXNOC)
            return RET_SYN;
-       pr("Owner of %s changed from %s to %s\n",
-          xyas(sect->sct_x, sect->sct_y, player->cnum),
-          prnatid(sect->sct_own), prnatid(arg));
+       divine_sct_change_quiet(sect, "Owner", arg != sect->sct_own,
+                               "from %s to %s",
+                               prnatid(sect->sct_own), prnatid(arg));
        if (arg == sect->sct_own)
            break;
        report_god_takes("Sector ",
@@ -479,40 +479,40 @@ edit_sect_i(struct sctstr *sect, char *key, int arg)
        break;
     case 'l':
        new = LIMIT_TO(arg, 0, 127);
-       pr("Loyalty of %s changed from %d to %d\n",
-          xyas(sect->sct_x, sect->sct_y, player->cnum),
-          sect->sct_loyal, new);
+       divine_sct_change_quiet(sect, "Loyalty", new != sect->sct_loyal,
+                               "from %d to %d", sect->sct_loyal, new);
        sect->sct_loyal = (unsigned char)new;
        break;
     case 'x':
        new = LIMIT_TO(arg, 0, CHE_MAX);
-       pr("Guerillas of %s changed from %d to %d\n",
-          xyas(sect->sct_x, sect->sct_y, player->cnum),
-          sect->sct_che, new);
+       divine_sct_change_quiet(sect, "Guerillas", new != sect->sct_che,
+                               "from %d to %d", sect->sct_che, new);
        sect->sct_che = new;
        break;
     case 'X':
        if (arg < 0 || arg >= MAXNOC)
            return RET_SYN;
-       pr("Che target of %s changed from %s to %s\n",
-          xyas(sect->sct_x, sect->sct_y, player->cnum),
-          prnatid(sect->sct_che_target), prnatid(arg));
+       divine_sct_change_quiet(sect, "Che target",
+                               arg != sect->sct_che_target,
+                               "from %s to %s",
+                               prnatid(sect->sct_che_target),
+                               prnatid(arg));
        sect->sct_che_target = arg;
        if (arg == 0)
            sect->sct_che = 0;
        break;
     case 'p':
        new = LIMIT_TO(arg, 0, PLG_EXPOSED);
-       pr("Plague stage of %s changed from %d to %d\n",
-          xyas(sect->sct_x, sect->sct_y, player->cnum),
-          sect->sct_pstage, new);
+       divine_sct_change_quiet(sect, "Plague stage",
+                               new != sect->sct_pstage,
+                               "from %d to %d", sect->sct_pstage, new);
        sect->sct_pstage = new;
        break;
     case 't':
        new = LIMIT_TO(arg, 0, 32767);
-       pr("Plague time of %s changed from %d to %d\n",
-          xyas(sect->sct_x, sect->sct_y, player->cnum),
-          sect->sct_ptime, new);
+       divine_sct_change_quiet(sect, "Plague time",
+                               new != sect->sct_ptime,
+                               "from %d to %d", sect->sct_ptime, new);
        sect->sct_ptime = new;
        break;
     case 'F':
@@ -530,9 +530,8 @@ edit_sect_i(struct sctstr *sect, char *key, int arg)
        if (sect->sct_own == sect->sct_oldown)
            noise(sect, "Mines", sect->sct_mines, new);
        else
-           pr("Mines of %s changed from %d to %d\n",
-              xyas(sect->sct_x, sect->sct_y, player->cnum),
-              sect->sct_mines, new);
+           divine_sct_change_quiet(sect, "Mines", new != sect->sct_mines,
+                             "from %d to %d", sect->sct_mines, new);
        sect->sct_mines = new;
        break;
     case 'R':
@@ -568,6 +567,10 @@ edit_sect(struct sctstr *sect, char *key, char *p)
     case 'L':
        if (!sarg_xy(p, &newx, &newy))
            return RET_SYN;
+       if (newx == sect->sct_x && newy == sect->sct_y) {
+           pr("Sector %s unchanged\n", xyas(newx, newy, player->cnum));
+           break;
+       }
        getsect(newx, newy, &newsect);
        pr("Sector %s duplicated to %s\n",
           xyas(sect->sct_x, sect->sct_y, player->cnum),
@@ -583,10 +586,11 @@ edit_sect(struct sctstr *sect, char *key, char *p)
     case 'D':
        if (!sarg_xy(p, &newx, &newy))
            return RET_SYN;
-       pr("Distribution sector of %s changed from %s to %s\n",
-          xyas(sect->sct_x, sect->sct_y, player->cnum),
-          xyas(sect->sct_dist_x, sect->sct_dist_y, player->cnum),
-          xyas(newx, newy, player->cnum));
+       divine_sct_change_quiet(sect, "Distribution sector",
+               newx != sect->sct_dist_x || newy != sect->sct_dist_y,
+               "from %s to %s",
+               xyas(sect->sct_dist_x, sect->sct_dist_y, player->cnum),
+               xyas(newx, newy, player->cnum));
        if (newx == sect->sct_dist_x && newy == sect->sct_dist_y)
            break;
        if (sect->sct_own && sect->sct_own != player->cnum)

diff --git a/src/lib/subs/actofgod.c b/src/lib/subs/actofgod.c
index e51d72b20cbda58c23c48f8141c675e9f8e3c9a2..c71b2d00a057a8d2c651162a21ee9d32dc41c5c8 100644 (file)
--- a/src/lib/subs/actofgod.c
+++ b/src/lib/subs/actofgod.c
@@ -74,6 +74,7 @@ report_god_gives(char *prefix, char *what, natid to)
  * report news (sometimes).
  * NAME names what is being changed in the sector.
  * If CHANGE is zero, the meddling is a no-op (bulletin suppressed).
+ * If CHANGE is negative, it's secret (bulletin suppressed).
  * If a bulletin is sent, report N_AIDS news for positive GOODNESS,
  * N_HURTS news for negative GOODNESS
  * The bulletin's text is like "NAME of sector X,Y changed <how> by an
@@ -91,9 +92,15 @@ divine_sct_change(struct sctstr *sp, char *name,
     vsnprintf(buf, sizeof(buf), fmt, ap);
     va_end(ap);
 
+    if (!change) {
+       pr("%s of %s unchanged\n",
+          name, xyas(sp->sct_x, sp->sct_y, player->cnum));
+       return;
+    }
+
     pr("%s of %s changed %s\n",
        name, xyas(sp->sct_x, sp->sct_y, player->cnum), buf);
-    if (change && sp->sct_own && sp->sct_own != player->cnum) {
+    if (change > 0 && sp->sct_own && sp->sct_own != player->cnum) {
        wu(0, sp->sct_own, "%s of %s changed %s by an act of %s\n",
           name, xyas(sp->sct_x, sp->sct_y, sp->sct_own),
           buf, cname(player->cnum));

diff --git a/tests/actofgod/actofgod.xdump b/tests/actofgod/actofgod.xdump
index c6c5a84191f6e35cc38c3248c9b696befc3b13a5..d6a3652d22c54f28a0e5f81848c7ca4d72d45f32 100644 (file)
--- a/tests/actofgod/actofgod.xdump
+++ b/tests/actofgod/actofgod.xdump
@@ -366,11 +366,11 @@ actor action victim times duration time
 0 44 3 1 0 0
 0 44 1 32 0 0
 0 43 2 2 0 0
-0 44 3 2 0 0
-0 43 3 2 0 0
+0 44 3 1 0 0
 0 43 1 67 0 0
 0 42 1 4 0 0
 1 45 0 1 0 0
+0 43 3 1 0 0
 /config
 config treaty
 uid cna cnb status acond bcond exp

diff --git a/tests/actofgod/journal.log b/tests/actofgod/journal.log
index ac9f3e9cb233845971f578a6d1c0ad7194ac45ff..13fa985456725ff2c61b4e69757030d134a823e0 100644 (file)
--- a/tests/actofgod/journal.log
+++ b/tests/actofgod/journal.log
@@ -71,7 +71,7 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,7 X 0
     Play#0 command edit
-    Play#0 output Play#0 1 Che target of 1,7 changed from POGO (#0) to POGO (#0)
+    Play#0 output Play#0 1 Che target of 1,7 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,7 X -1
     Play#0 command edit
@@ -131,16 +131,16 @@
     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 Sector 3,-7 unchanged
     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
     Play#0 command edit
-    Play#0 output Play#0 1 Efficiency of 1,1 changed from 0 to 0
+    Play#0 output Play#0 1 Efficiency of 1,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 3,1 e -1
     Play#0 command edit
-    Play#0 output Play#0 1 Efficiency of 3,1 changed from 0 to 0
+    Play#0 output Play#0 1 Efficiency of 3,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 5,1 e 100
     Play#0 command edit
@@ -152,7 +152,7 @@
     Play#0 output Play#0 6 0 640
     Play#0 input setsect e 1,3 -2147483648
     Play#0 command setsector
-    Play#0 output Play#0 1 Efficiency of 1,3 changed from 0 to 0
+    Play#0 output Play#0 1 Efficiency of 1,3 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setsect e 3:7,3 1
     Play#0 command setsector
@@ -204,11 +204,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,1 i 0
     Play#0 command edit
-    Play#0 output Play#0 1 Iron ore content of 1,1 changed from 0 to 0
+    Play#0 output Play#0 1 Iron ore content of 1,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 3,1 i -1
     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 1 Iron ore content of 3,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 5,1 i 100
     Play#0 command edit
@@ -220,11 +220,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input setres i 2,2 0
     Play#0 command setresource
-    Play#0 output Play#0 1 Iron ore content of 2,2 changed from 0 to 0
+    Play#0 output Play#0 1 Iron ore content of 2,2 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setres i 4,2 -1
     Play#0 command setresource
-    Play#0 output Play#0 1 Iron ore content of 4,2 changed from 0 to 0
+    Play#0 output Play#0 1 Iron ore content of 4,2 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setres i 6,2 100
     Play#0 command setresource
@@ -236,7 +236,7 @@
     Play#0 output Play#0 6 0 640
     Play#0 input setsect i 1,3 -2147483648
     Play#0 command setsector
-    Play#0 output Play#0 1 Iron ore content of 1,3 changed from 0 to 0
+    Play#0 output Play#0 1 Iron ore content of 1,3 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setsect i 3:7,3 1
     Play#0 command setsector
@@ -254,11 +254,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,1 g 0
     Play#0 command edit
-    Play#0 output Play#0 1 Gold content of 1,1 changed from 0 to 0
+    Play#0 output Play#0 1 Gold content of 1,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 3,1 g -1
     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 1 Gold content of 3,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 5,1 g 100
     Play#0 command edit
@@ -270,11 +270,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input setres g 2,2 0
     Play#0 command setresource
-    Play#0 output Play#0 1 Gold content of 2,2 changed from 0 to 0
+    Play#0 output Play#0 1 Gold content of 2,2 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setres g 4,2 -1
     Play#0 command setresource
-    Play#0 output Play#0 1 Gold content of 4,2 changed from 0 to 0
+    Play#0 output Play#0 1 Gold content of 4,2 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setres g 6,2 100
     Play#0 command setresource
@@ -286,7 +286,7 @@
     Play#0 output Play#0 6 0 640
     Play#0 input setsect g 1,3 -2147483648
     Play#0 command setsector
-    Play#0 output Play#0 1 Gold content of 1,3 changed from 0 to 0
+    Play#0 output Play#0 1 Gold content of 1,3 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setsect g 3:7,3 1
     Play#0 command setsector
@@ -304,11 +304,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,1 f 0
     Play#0 command edit
-    Play#0 output Play#0 1 Fertility of 1,1 changed from 0 to 0
+    Play#0 output Play#0 1 Fertility of 1,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 3,1 f -1
     Play#0 command edit
-    Play#0 output Play#0 1 Fertility of 3,1 changed from 0 to 0
+    Play#0 output Play#0 1 Fertility of 3,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 5,1 f 100
     Play#0 command edit
@@ -320,11 +320,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input setres f 2,2 0
     Play#0 command setresource
-    Play#0 output Play#0 1 Fertility of 2,2 changed from 0 to 0
+    Play#0 output Play#0 1 Fertility of 2,2 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setres f 4,2 -1
     Play#0 command setresource
-    Play#0 output Play#0 1 Fertility of 4,2 changed from 0 to 0
+    Play#0 output Play#0 1 Fertility of 4,2 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setres f 6,2 100
     Play#0 command setresource
@@ -336,7 +336,7 @@
     Play#0 output Play#0 6 0 640
     Play#0 input setsect f 1,3 -2147483648
     Play#0 command setsector
-    Play#0 output Play#0 1 Fertility of 1,3 changed from 0 to 0
+    Play#0 output Play#0 1 Fertility of 1,3 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setsect f 3:7,3 1
     Play#0 command setsector
@@ -354,11 +354,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,1 c 0
     Play#0 command edit
-    Play#0 output Play#0 1 Oil content of 1,1 changed from 0 to 0
+    Play#0 output Play#0 1 Oil content of 1,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 3,1 c -1
     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 1 Oil content of 3,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 5,1 c 100
     Play#0 command edit
@@ -370,11 +370,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input setres o 2,2 0
     Play#0 command setresource
-    Play#0 output Play#0 1 Oil content of 2,2 changed from 0 to 0
+    Play#0 output Play#0 1 Oil content of 2,2 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setres o 4,2 -1
     Play#0 command setresource
-    Play#0 output Play#0 1 Oil content of 4,2 changed from 0 to 0
+    Play#0 output Play#0 1 Oil content of 4,2 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setres o 6,2 100
     Play#0 command setresource
@@ -386,7 +386,7 @@
     Play#0 output Play#0 6 0 640
     Play#0 input setsect oi 1,3 -2147483648
     Play#0 command setsector
-    Play#0 output Play#0 1 Oil content of 1,3 changed from 0 to 0
+    Play#0 output Play#0 1 Oil content of 1,3 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setsect oi 3:7,3 1
     Play#0 command setsector
@@ -404,11 +404,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,1 u 0
     Play#0 command edit
-    Play#0 output Play#0 1 Uranium content of 1,1 changed from 0 to 0
+    Play#0 output Play#0 1 Uranium content of 1,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 3,1 u -1
     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 1 Uranium content of 3,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 5,1 u 100
     Play#0 command edit
@@ -420,11 +420,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input setres u 2,2 0
     Play#0 command setresource
-    Play#0 output Play#0 1 Uranium content of 2,2 changed from 0 to 0
+    Play#0 output Play#0 1 Uranium content of 2,2 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setres u 4,2 -1
     Play#0 command setresource
-    Play#0 output Play#0 1 Uranium content of 4,2 changed from 0 to 0
+    Play#0 output Play#0 1 Uranium content of 4,2 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setres u 6,2 100
     Play#0 command setresource
@@ -436,7 +436,7 @@
     Play#0 output Play#0 6 0 640
     Play#0 input setsect u 1,3 -2147483648
     Play#0 command setsector
-    Play#0 output Play#0 1 Uranium content of 1,3 changed from 0 to 0
+    Play#0 output Play#0 1 Uranium content of 1,3 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setsect u 3:7,3 1
     Play#0 command setsector
@@ -462,11 +462,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 5,1 w 100
     Play#0 command edit
-    Play#0 output Play#0 1 Workforce percentage of 5,1 changed from 100 to 100
+    Play#0 output Play#0 1 Workforce percentage of 5,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 7,1 w 101
     Play#0 command edit
-    Play#0 output Play#0 1 Workforce percentage of 7,1 changed from 100 to 100
+    Play#0 output Play#0 1 Workforce percentage of 7,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setsect w 1,3 -2147483648
     Play#0 command setsector
@@ -474,9 +474,9 @@
     Play#0 output Play#0 6 0 640
     Play#0 input setsect w 3:7,3 1
     Play#0 command setsector
-    Play#0 output Play#0 1 Workforce percentage of 3,3 changed from 100 to 100
-    Play#0 output Play#0 1 Workforce percentage of 5,3 changed from 100 to 100
-    Play#0 output Play#0 1 Workforce percentage of 7,3 changed from 100 to 100
+    Play#0 output Play#0 1 Workforce percentage of 3,3 unchanged
+    Play#0 output Play#0 1 Workforce percentage of 5,3 unchanged
+    Play#0 output Play#0 1 Workforce percentage of 7,3 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setsect w 5,3 2147483647
     Play#0 command setsector
@@ -488,11 +488,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,1 l 0
     Play#0 command edit
-    Play#0 output Play#0 1 Loyalty of 1,1 changed from 0 to 0
+    Play#0 output Play#0 1 Loyalty of 1,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 3,1 l -1
     Play#0 command edit
-    Play#0 output Play#0 1 Loyalty of 3,1 changed from 0 to 0
+    Play#0 output Play#0 1 Loyalty of 3,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 5,1 l 127
     Play#0 command edit
@@ -504,11 +504,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,1 x 0
     Play#0 command edit
-    Play#0 output Play#0 1 Guerillas of 1,1 changed from 0 to 0
+    Play#0 output Play#0 1 Guerillas of 1,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 3,1 x -1
     Play#0 command edit
-    Play#0 output Play#0 1 Guerillas of 3,1 changed from 0 to 0
+    Play#0 output Play#0 1 Guerillas of 3,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 5,1 x 255
     Play#0 command edit
@@ -520,11 +520,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,1 p 0
     Play#0 command edit
-    Play#0 output Play#0 1 Plague stage of 1,1 changed from 0 to 0
+    Play#0 output Play#0 1 Plague stage of 1,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 3,1 p -1
     Play#0 command edit
-    Play#0 output Play#0 1 Plague stage of 3,1 changed from 0 to 0
+    Play#0 output Play#0 1 Plague stage of 3,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 5,1 p 4
     Play#0 command edit
@@ -536,11 +536,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,1 t 0
     Play#0 command edit
-    Play#0 output Play#0 1 Plague time of 1,1 changed from 0 to 0
+    Play#0 output Play#0 1 Plague time of 1,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 3,1 t -1
     Play#0 command edit
-    Play#0 output Play#0 1 Plague time of 3,1 changed from 0 to 0
+    Play#0 output Play#0 1 Plague time of 3,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 5,1 t 32767
     Play#0 command edit
@@ -552,11 +552,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,1 F 0
     Play#0 command edit
-    Play#0 output Play#0 1 Fallout of 1,1 changed from 0 to 0
+    Play#0 output Play#0 1 Fallout of 1,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 3,1 F -1
     Play#0 command edit
-    Play#0 output Play#0 1 Fallout of 3,1 changed from 0 to 0
+    Play#0 output Play#0 1 Fallout of 3,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 5,1 F 9999
     Play#0 command edit
@@ -568,11 +568,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,1 a 0
     Play#0 command edit
-    Play#0 output Play#0 1 Available workforce of 1,1 changed from 0 to 0
+    Play#0 output Play#0 1 Available workforce of 1,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 3,1 a -1
     Play#0 command edit
-    Play#0 output Play#0 1 Available workforce of 3,1 changed from 0 to 0
+    Play#0 output Play#0 1 Available workforce of 3,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 5,1 a 9999
     Play#0 command edit
@@ -584,7 +584,7 @@
     Play#0 output Play#0 6 0 640
     Play#0 input setsect a 1,3 -2147483648
     Play#0 command setsector
-    Play#0 output Play#0 1 Available workforce of 1,3 changed from 0 to 0
+    Play#0 output Play#0 1 Available workforce of 1,3 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setsect a 3:7,3 1
     Play#0 command setsector
@@ -602,11 +602,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,1 M 0
     Play#0 command edit
-    Play#0 output Play#0 1 Mines of 1,1 changed from 0 to 0
+    Play#0 output Play#0 1 Mines of 1,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 3,1 M -1
     Play#0 command edit
-    Play#0 output Play#0 1 Mines of 3,1 changed from 0 to 0
+    Play#0 output Play#0 1 Mines of 3,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 5,1 M 32767
     Play#0 command edit
@@ -618,7 +618,7 @@
     Play#0 output Play#0 6 0 640
     Play#0 input setsect mi 1,3 -2147483648
     Play#0 command setsector
-    Play#0 output Play#0 1 Mines of 1,3 changed from 0 to 0
+    Play#0 output Play#0 1 Mines of 1,3 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input setsect mi 3:7,3 1
     Play#0 command setsector
@@ -636,11 +636,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,1 R 0
     Play#0 command edit
-    Play#0 output Play#0 1 Road percentage of 1,1 changed from 0 to 0
+    Play#0 output Play#0 1 Road percentage of 1,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 3,1 R -1
     Play#0 command edit
-    Play#0 output Play#0 1 Road percentage of 3,1 changed from 0 to 0
+    Play#0 output Play#0 1 Road percentage of 3,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 5,1 R 100
     Play#0 command edit
@@ -652,11 +652,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,1 r 0
     Play#0 command edit
-    Play#0 output Play#0 1 Rail percentage of 1,1 changed from 0 to 0
+    Play#0 output Play#0 1 Rail percentage of 1,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 3,1 r -1
     Play#0 command edit
-    Play#0 output Play#0 1 Rail percentage of 3,1 changed from 0 to 0
+    Play#0 output Play#0 1 Rail percentage of 3,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 5,1 r 100
     Play#0 command edit
@@ -668,11 +668,11 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 1,1 d 0
     Play#0 command edit
-    Play#0 output Play#0 1 Defense percentage of 1,1 changed from 0 to 0
+    Play#0 output Play#0 1 Defense percentage of 1,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 3,1 d -1
     Play#0 command edit
-    Play#0 output Play#0 1 Defense percentage of 3,1 changed from 0 to 0
+    Play#0 output Play#0 1 Defense percentage of 3,1 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 5,1 d 100
     Play#0 command edit
@@ -713,7 +713,7 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 4,4 D 4,4
     Play#0 command edit
-    Play#0 output Play#0 1 Distribution sector of 4,4 changed from 4,4 to 4,4
+    Play#0 output Play#0 1 Distribution sector of 4,4 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 6,4 s +
     Play#0 command edit
@@ -721,7 +721,7 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 6,4 s +
     Play#0 command edit
-    Play#0 output Play#0 1 Designation of 6,4 changed from + to +
+    Play#0 output Play#0 1 Designation of 6,4 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 8,4 s +
     Play#0 command edit
@@ -737,7 +737,7 @@
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 6,4 S +
     Play#0 command edit
-    Play#0 output Play#0 1 New designation of 6,4 changed from + to +
+    Play#0 output Play#0 1 New designation of 6,4 unchanged
     Play#0 output Play#0 6 0 640
     Play#0 input edit l 8,4 S +
     Play#0 command edit
@@ -1627,8 +1627,6 @@
     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 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!