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

edit: Add remaining missing nation change reporting

Browse source 
Print a message describing the actual change for keys 't' (nat_tgms)
and 's' (nat_status).  The message is necessary to give the deity a
chance to catch unexpected changes, e.g. a player reading telegrams
just before the deity edits nat_tgms.

Send a bulletin to the country for key 's'.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2013-02-03 18:11:53 +01:00
parent d006791ed6
commit 2975ea02ae
2 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/lib/commands/edit.c
View file

@ -656,6 +656,9 @@ edit_nat(struct natstr *np, char *key, char *p)
break; break;
case 't': case 't':
arg = LIMIT_TO(arg, 0, USHRT_MAX); arg = LIMIT_TO(arg, 0, USHRT_MAX);
divine_nat_change_quiet(np, "Number of unread telegrams",
arg != np->nat_tgms,
"from %d to %d", np->nat_tgms, arg);
np->nat_tgms = arg; np->nat_tgms = arg;
break; break;
case 'b': case 'b':
@ -709,7 +712,11 @@ edit_nat(struct natstr *np, char *key, char *p)
np->nat_yorg = newy; np->nat_yorg = newy;
break; break;
case 's': case 's':
np->nat_stat = LIMIT_TO(arg, STAT_UNUSED, STAT_GOD); arg = LIMIT_TO(arg, STAT_UNUSED, STAT_GOD);
divine_nat_change(np, "Status",
(enum nat_status)arg != np->nat_stat,
0, "to %s", nation_status[arg].name);
np->nat_stat = arg;
break; break;
case 'u': case 'u':
arg = LIMIT_TO(arg, 0, m_m_p_d * 60); arg = LIMIT_TO(arg, 0, m_m_p_d * 60);

10
tests/actofgod/journal.log
View file

@ -1504,9 +1504,11 @@
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit c 6 t -1 Play#0 input edit c 6 t -1
Play#0 command edit Play#0 command edit
Play#0 output Play#0 1 Number of unread telegrams of 6 (#6) unchanged
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit c 7 t 65536 Play#0 input edit c 7 t 65536
Play#0 command edit Play#0 command edit
Play#0 output Play#0 1 Number of unread telegrams of 7 (#7) changed from 0 to 65535
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit c 1 T 3.14 Play#0 input edit c 1 T 3.14
Play#0 command edit Play#0 command edit
@ -1595,15 +1597,19 @@
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit c 6 s 0 Play#0 input edit c 6 s 0
Play#0 command edit Play#0 command edit
Play#0 output Play#0 1 Status of 6 (#6) changed to unused
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit c 7 s -1 Play#0 input edit c 7 s -1
Play#0 command edit Play#0 command edit
Play#0 output Play#0 1 Status of 7 (#7) changed to unused
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit c 4 s 5 Play#0 input edit c 4 s 5
Play#0 command edit Play#0 command edit
Play#0 output Play#0 1 Status of 4 (#4) changed to deity
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit c 5 s 6 Play#0 input edit c 5 s 6
Play#0 command edit Play#0 command edit
Play#0 output Play#0 1 Status of 5 (#5) changed to deity
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input edit c 5 Play#0 input edit c 5
Play#0 command edit Play#0 command edit
@ -1615,7 +1621,7 @@
Play#0 output Play#0 1 Technology <T>: 0.00 Research <R>: 0.00 Play#0 output Play#0 1 Technology <T>: 0.00 Research <R>: 0.00
Play#0 output Play#0 1 Education <E>: 0.00 Happiness <H>: 0.00 Play#0 output Play#0 1 Education <E>: 0.00 Happiness <H>: 0.00
Play#0 output Play#0 1 Money <M>: $ 0 Play#0 output Play#0 1 Money <M>: $ 0
Play#0 output Play#0 1 Telegrams <t>: 0 Play#0 output Play#0 1 Telegrams <t>: 1
Play#0 output Play#0 4 %c xxxxx -- thing value : Play#0 output Play#0 4 %c xxxxx -- thing value :
Play#0 input b 640 Play#0 input b 640
Play#0 output Play#0 1 BTUs of 5 (#5) changed from 0 to 640 Play#0 output Play#0 1 BTUs of 5 (#5) changed from 0 to 640
@ -1883,11 +1889,13 @@
Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970 Play#0 output Play#0 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 BTUs changed from 0 to 640 by an act of POGO! Play#0 output Play#0 1 BTUs changed from 0 to 640 by an act of POGO!
Play#0 output Play#0 1 Number of seconds used changed from 0 to 86400 by an act of POGO! Play#0 output Play#0 1 Number of seconds used changed from 0 to 86400 by an act of POGO!
Play#0 output Play#0 1 Status changed to deity by an act of POGO!
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640
Play#0 input read 5 Play#0 input read 5
Play#0 command read Play#0 command read
Play#0 output Play#0 1 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 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970
Play#0 output Play#0 1 Status changed to deity by an act of POGO!
Play#0 output Play#0 1 BTUs changed from 0 to 640 by an act of POGO! Play#0 output Play#0 1 BTUs changed from 0 to 640 by an act of POGO!
Play#0 output Play#0 1 Technology changed from 0.00 to 1.00 by an act of POGO! Play#0 output Play#0 1 Technology changed from 0.00 to 1.00 by an act of POGO!
Play#0 output Play#0 6 0 640 Play#0 output Play#0 6 0 640