From: Markus Armbruster Date: Tue, 15 Jan 2013 18:25:40 +0000 (+0100) Subject: edit: Don't show loyalty, plague stage and time as percentages X-Git-Tag: v4.3.32~79 X-Git-Url: http://git.pond.sub.org/?p=empserver;a=commitdiff_plain;h=aa07f3393a9280225cde7297934a2309a49983b9;hp=53d0edc83893304420637e72854ba5b4b911757f edit: Don't show loyalty, plague stage and time as percentages Signed-off-by: Markus Armbruster --- diff --git a/src/lib/commands/edit.c b/src/lib/commands/edit.c index 183979d38..1dd1e1eb3 100644 --- a/src/lib/commands/edit.c +++ b/src/lib/commands/edit.c @@ -507,7 +507,7 @@ edit_sect(struct sctstr *sect, char op, int arg, char *p) break; case 'l': new = LIMIT_TO(arg, 0, 127); - pr("Loyalty of %s changed from %d to %d%%\n", + pr("Loyalty of %s changed from %d to %d\n", xyas(sect->sct_x, sect->sct_y, player->cnum), sect->sct_loyal, new); sect->sct_loyal = (unsigned char)new; @@ -532,14 +532,14 @@ edit_sect(struct sctstr *sect, char op, int arg, char *p) case 'p': old = sect->sct_pstage; new = LIMIT_TO(arg, 0, PLG_EXPOSED); - pr("Plague stage of %s changed from %d to %d%%\n", + pr("Plague stage of %s changed from %d to %d\n", xyas(sect->sct_x, sect->sct_y, player->cnum), old, new); sect->sct_pstage = new; break; case 't': old = sect->sct_ptime; new = LIMIT_TO(arg, 0, 255); - pr("Plague time of %s changed from %d to %d%%\n", + pr("Plague time of %s changed from %d to %d\n", xyas(sect->sct_x, sect->sct_y, player->cnum), old, new); sect->sct_ptime = new; break; diff --git a/tests/actofgod/journal.log b/tests/actofgod/journal.log index a925013fe..e33d7b84a 100644 --- a/tests/actofgod/journal.log +++ b/tests/actofgod/journal.log @@ -486,19 +486,19 @@ 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 changed from 0 to 0 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 changed from 0 to 0 Play#0 output Play#0 6 0 640 Play#0 input edit l 5,1 l 127 Play#0 command edit - Play#0 output Play#0 1 Loyalty of 5,1 changed from 0 to 127% + Play#0 output Play#0 1 Loyalty of 5,1 changed from 0 to 127 Play#0 output Play#0 6 0 640 Play#0 input edit l 7,1 l 128 Play#0 command edit - Play#0 output Play#0 1 Loyalty of 7,1 changed from 0 to 127% + Play#0 output Play#0 1 Loyalty of 7,1 changed from 0 to 127 Play#0 output Play#0 6 0 640 Play#0 input edit l 1,1 x 0 Play#0 command edit @@ -518,35 +518,35 @@ 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 changed from 0 to 0 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 changed from 0 to 0 Play#0 output Play#0 6 0 640 Play#0 input edit l 5,1 p 4 Play#0 command edit - Play#0 output Play#0 1 Plague stage of 5,1 changed from 0 to 4% + Play#0 output Play#0 1 Plague stage of 5,1 changed from 0 to 4 Play#0 output Play#0 6 0 640 Play#0 input edit l 7,1 p 5 Play#0 command edit - Play#0 output Play#0 1 Plague stage of 7,1 changed from 0 to 4% + Play#0 output Play#0 1 Plague stage of 7,1 changed from 0 to 4 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 changed from 0 to 0 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 changed from 0 to 0 Play#0 output Play#0 6 0 640 Play#0 input edit l 5,1 t 32767 Play#0 command edit - Play#0 output Play#0 1 Plague time of 5,1 changed from 0 to 255% + Play#0 output Play#0 1 Plague time of 5,1 changed from 0 to 255 Play#0 output Play#0 6 0 640 Play#0 input edit l 7,1 t 32768 Play#0 command edit - Play#0 output Play#0 1 Plague time of 7,1 changed from 0 to 255% + Play#0 output Play#0 1 Plague time of 7,1 changed from 0 to 255 Play#0 output Play#0 6 0 640 Play#0 input edit l 1,1 F 0 Play#0 command edit