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

bomb: Suppress bulletin when player bombs his own assets

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-01-11 15:02:16 +01:00
parent df6b13ce89
commit a2beecf26c
2 changed files with 22 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

43
src/lib/commands/bomb.c
View file

@ -288,11 +288,11 @@ eff_bomb(struct emp_qelem *list, struct sctstr *target)
pr("did %d%% damage to efficiency in %s\n", pr("did %d%% damage to efficiency in %s\n",
oldeff - target->sct_effic, oldeff - target->sct_effic,
xyas(target->sct_x, target->sct_y, player->cnum)); xyas(target->sct_x, target->sct_y, player->cnum));
if (target->sct_own) if (target->sct_own != player->cnum)
wu(0, target->sct_own, mpr(target->sct_own,
"%s bombing raid did %d%% damage in %s\n", "%s bombing raid did %d%% damage in %s\n",
cname(player->cnum), oldeff - target->sct_effic, cname(player->cnum), oldeff - target->sct_effic,
xyas(target->sct_x, target->sct_y, target->sct_own)); xyas(target->sct_x, target->sct_y, target->sct_own));
bridge_damaged(target); bridge_damaged(target);
putsect(&sect); putsect(&sect);
collateral_damage(target->sct_x, target->sct_y, dam); collateral_damage(target->sct_x, target->sct_y, dam);
@ -361,11 +361,11 @@ comm_bomb(struct emp_qelem *list, struct sctstr *target)
pr("did %.2f%% damage to %s in %s\n", pr("did %.2f%% damage to %s in %s\n",
b, ip->i_name, xyas(target->sct_x, target->sct_y, player->cnum)); b, ip->i_name, xyas(target->sct_x, target->sct_y, player->cnum));
nreport(player->cnum, N_SCT_BOMB, target->sct_own, 1); nreport(player->cnum, N_SCT_BOMB, target->sct_own, 1);
if (target->sct_own != 0) if (target->sct_own != player->cnum)
wu(0, target->sct_own, mpr(target->sct_own,
"%s precision bombing raid did %.2f%% damage to %s in %s\n", "%s precision bombing raid did %.2f%% damage to %s in %s\n",
cname(player->cnum), b, ip->i_name, cname(player->cnum), b, ip->i_name,
xyas(target->sct_x, target->sct_y, target->sct_own)); xyas(target->sct_x, target->sct_y, target->sct_own));
putsect(&sect); putsect(&sect);
collateral_damage(target->sct_x, target->sct_y, dam); collateral_damage(target->sct_x, target->sct_y, dam);
} }
@ -469,11 +469,11 @@ ship_bomb(struct emp_qelem *list, struct sctstr *target)
nreport(player->cnum, N_SUB_BOMB, ship.shp_own, 1); nreport(player->cnum, N_SUB_BOMB, ship.shp_own, 1);
else else
nreport(player->cnum, N_SHP_BOMB, ship.shp_own, 1); nreport(player->cnum, N_SHP_BOMB, ship.shp_own, 1);
if (ship.shp_own) { if (ship.shp_own != player->cnum) {
wu(0, ship.shp_own, "%s bombs did %d damage to %s at %s\n", mpr(ship.shp_own, "%s bombs did %d damage to %s at %s\n",
cname(player->cnum), dam, cname(player->cnum), dam,
prship(&ship), prship(&ship),
xyas(target->sct_x, target->sct_y, ship.shp_own)); xyas(target->sct_x, target->sct_y, ship.shp_own));
} }
pr("\n"); pr("\n");
shipdamage(&ship, dam); shipdamage(&ship, dam);
@ -666,8 +666,9 @@ land_bomb(struct emp_qelem *list, struct sctstr *target)
if (dam > 100) if (dam > 100)
dam = 100; dam = 100;
own = land.lnd_own; own = land.lnd_own;
mpr(own, "%s pinpoint bombing raid did %d damage to %s\n", if (own != player->cnum)
cname(player->cnum), dam, prland(&land)); mpr(own, "%s pinpoint bombing raid did %d damage to %s\n",
cname(player->cnum), dam, prland(&land));
landdamage(&land, dam); landdamage(&land, dam);
if (dam && (land.lnd_rflags & RET_INJURED)) if (dam && (land.lnd_rflags & RET_INJURED))
retreat_land(&land, 'i'); retreat_land(&land, 'i');
@ -700,10 +701,10 @@ strat_bomb(struct emp_qelem *list, struct sctstr *target)
return; return;
getsect(target->sct_x, target->sct_y, &sect); getsect(target->sct_x, target->sct_y, &sect);
target = &sect; target = &sect;
if (target->sct_own) if (target->sct_own != player->cnum)
wu(0, target->sct_own, "%s bombing raid did %d damage in %s\n", mpr(target->sct_own, "%s bombing raid did %d damage in %s\n",
cname(player->cnum), PERCENT_DAMAGE(dam), cname(player->cnum), PERCENT_DAMAGE(dam),
xyas(target->sct_x, target->sct_y, target->sct_own)); xyas(target->sct_x, target->sct_y, target->sct_own));
sectdamage(target, dam); sectdamage(target, dam);

1
tests/retreat/journal.log
View file

@ -1073,7 +1073,6 @@
Play#1 output Play#1 4 ac AH-64 Apache #30, 1 bombs. Target ('~' to skip)? Play#1 output Play#1 4 ac AH-64 Apache #30, 1 bombs. Target ('~' to skip)?
Play#1 input 2 Play#1 input 2
Play#1 output Play#1 1 73% hitchance...Blam Play#1 output Play#1 1 73% hitchance...Blam
Play#1 output Play#1 1 1 pinpoint bombing raid did 36 damage to inf infantry #2
Play#1 output Play#1 1 inf infantry #2 takes 22 Play#1 output Play#1 1 inf infantry #2 takes 22
Play#1 output Play#1 1 -3,1 takes 4% collateral damage Play#1 output Play#1 1 -3,1 takes 4% collateral damage
Play#1 output Play#1 1 inf infantry #0 takes 1 Play#1 output Play#1 1 inf infantry #0 takes 1