Deities get bulletins when they use edit, give, setsector and
setresource on stuff they own. Except for POGO, who can't own
anything.
The bulletins are annoying; suppress them.
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
{
pr("%s of %s changed from %d to %d\n",
name, xyas(sptr->sct_x, sptr->sct_y, player->cnum), old, new);
{
pr("%s of %s changed from %d to %d\n",
name, xyas(sptr->sct_x, sptr->sct_y, player->cnum), old, new);
- if (sptr->sct_own && new != old)
+ if (sptr->sct_own && sptr->sct_own != player->cnum && new != old)
wu(0, sptr->sct_own,
"%s in %s was changed from %d to %d by an act of %s\n",
name, xyas(sptr->sct_x, sptr->sct_y, sptr->sct_own),
wu(0, sptr->sct_own,
"%s in %s was changed from %d to %d by an act of %s\n",
name, xyas(sptr->sct_x, sptr->sct_y, sptr->sct_own),
prnatid(sect->sct_own), prnatid(arg));
if (arg == sect->sct_own)
break;
prnatid(sect->sct_own), prnatid(arg));
if (arg == sect->sct_own)
break;
+ if (sect->sct_own && sect->sct_own != player->cnum) {
wu(0, sect->sct_own,
"Sector %s taken from you by an act of %s!\n",
xyas(sect->sct_x, sect->sct_y, sect->sct_own),
wu(0, sect->sct_own,
"Sector %s taken from you by an act of %s!\n",
xyas(sect->sct_x, sect->sct_y, sect->sct_own),
}
benefit(sect->sct_own, -1);
sect->sct_own = arg;
}
benefit(sect->sct_own, -1);
sect->sct_own = arg;
+ if (arg && arg != player->cnum) {
wu(0, arg,
"Sector %s given to you by an act of %s!\n",
xyas(sect->sct_x, sect->sct_y, arg),
wu(0, arg,
"Sector %s given to you by an act of %s!\n",
xyas(sect->sct_x, sect->sct_y, arg),
np->nat_reserve, arg);
if (arg == np->nat_reserve)
break;
np->nat_reserve, arg);
if (arg == np->nat_reserve)
break;
- wu(0, nat,
- "Military reserves changed from %d to %d by an act of %s\n",
- np->nat_reserve, arg, cname(player->cnum));
+ if (nat != player->cnum)
+ wu(0, nat,
+ "Military reserves changed from %d to %d by an act of %s\n",
+ np->nat_reserve, arg, cname(player->cnum));
np->nat_reserve = arg;
break;
case 'c':
np->nat_reserve = arg;
break;
case 'c':
pr("Money changed from %d to %d\n", np->nat_money, arg);
if (arg == np->nat_money)
break;
pr("Money changed from %d to %d\n", np->nat_money, arg);
if (arg == np->nat_money)
break;
- wu(0, nat, "Money changed from %d to %d by an act of %s\n",
- np->nat_money, arg, cname(player->cnum));
+ if (nat != player->cnum)
+ wu(0, nat, "Money changed from %d to %d by an act of %s\n",
+ np->nat_money, arg, cname(player->cnum));
np->nat_money = arg;
break;
case 'T':
np->nat_money = arg;
break;
case 'T':
return RET_SYN;
if (arg == ship->shp_own)
break;
return RET_SYN;
if (arg == ship->shp_own)
break;
+ if (ship->shp_own && ship->shp_own != player->cnum)
wu(0, ship->shp_own, "%s taken from you by an act of %s!\n",
prship(ship), cname(player->cnum));
wu(0, ship->shp_own, "%s taken from you by an act of %s!\n",
prship(ship), cname(player->cnum));
+ if (arg && arg != player->cnum)
wu(0, arg, "%s given to you by an act of %s!\n",
prship(ship), cname(player->cnum));
ship->shp_own = arg;
wu(0, arg, "%s given to you by an act of %s!\n",
prship(ship), cname(player->cnum));
ship->shp_own = arg;
return RET_SYN;
if (arg == land->lnd_own)
break;
return RET_SYN;
if (arg == land->lnd_own)
break;
+ if (land->lnd_own && land->lnd_own != player->cnum)
wu(0, land->lnd_own, "%s taken from you by an act of %s!\n",
prland(land), cname(player->cnum));
wu(0, land->lnd_own, "%s taken from you by an act of %s!\n",
prland(land), cname(player->cnum));
+ if (arg && arg != player->cnum)
wu(0, arg, "%s given to you by an act of %s!\n",
prland(land), cname(player->cnum));
land->lnd_own = arg;
wu(0, arg, "%s given to you by an act of %s!\n",
prland(land), cname(player->cnum));
land->lnd_own = arg;
return RET_SYN;
if (arg == plane->pln_own)
break;
return RET_SYN;
if (arg == plane->pln_own)
break;
+ if (plane->pln_own && plane->pln_own != player->cnum)
wu(0, plane->pln_own, "%s taken from you by an act of %s!\n",
prplane(plane), cname(player->cnum));
wu(0, plane->pln_own, "%s taken from you by an act of %s!\n",
prplane(plane), cname(player->cnum));
+ if (arg && arg != player->cnum)
wu(0, arg, "%s given to you by an act of %s!\n",
prplane(plane), cname(player->cnum));
plane->pln_own = arg;
wu(0, arg, "%s given to you by an act of %s!\n",
prplane(plane), cname(player->cnum));
plane->pln_own = arg;
m = n + amt;
sect.sct_item[ip->i_uid] = m;
putsect(§);
m = n + amt;
sect.sct_item[ip->i_uid] = m;
putsect(§);
- if (sect.sct_own != 0 && m != n) {
+ if (sect.sct_own != 0 && sect.sct_own != player->cnum && m != n) {
if (m > n) {
if (opt_GODNEWS
&& getnatp(sect.sct_own)->nat_stat != STAT_GOD)
if (m > n) {
if (opt_GODNEWS
&& getnatp(sect.sct_own)->nat_stat != STAT_GOD)
prnatid(sect.sct_own), prnatid(amt));
if (amt == sect.sct_own)
break;
prnatid(sect.sct_own), prnatid(amt));
if (amt == sect.sct_own)
break;
+ if (sect.sct_own && sect.sct_own != player->cnum) {
wu(0, sect.sct_own,
"Sector %s taken from you by an act of %s!\n",
xyas(sect.sct_x, sect.sct_y, sect.sct_own),
cname(player->cnum));
}
wu(0, sect.sct_own,
"Sector %s taken from you by an act of %s!\n",
xyas(sect.sct_x, sect.sct_y, sect.sct_own),
cname(player->cnum));
}
+ if (amt && amt != player->cnum)
wu(0, amt,
"Sector %s given to you by an act of %s!\n",
xyas(sect.sct_x, sect.sct_y, amt),
wu(0, amt,
"Sector %s given to you by an act of %s!\n",
xyas(sect.sct_x, sect.sct_y, amt),
{
pr("%s of %s changed from %d to %d\n",
name, xyas(sptr->sct_x, sptr->sct_y, player->cnum), old, new);
{
pr("%s of %s changed from %d to %d\n",
name, xyas(sptr->sct_x, sptr->sct_y, player->cnum), old, new);
- if (sptr->sct_own && new != old)
+ if (sptr->sct_own && sptr->sct_own != player->cnum && new != old)
wu(0, sptr->sct_own,
"%s in %s was changed from %d to %d by an act of %s\n",
name, xyas(sptr->sct_x, sptr->sct_y, sptr->sct_own),
wu(0, sptr->sct_own,
"%s in %s was changed from %d to %d by an act of %s\n",
name, xyas(sptr->sct_x, sptr->sct_y, sptr->sct_own),