bomb: Include position when reporting bombed land unit

Use the exact same format as for ships.

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

diff --git a/src/lib/commands/bomb.c b/src/lib/commands/bomb.c
index dac7a2e4f081777e6e7a3d948d5082d99c77f181..c98c8656e423083ab5d60e2cd21b1add215d117b 100644 (file)
--- a/src/lib/commands/bomb.c
+++ b/src/lib/commands/bomb.c
@@ -667,8 +667,9 @@ land_bomb(struct emp_qelem *list, struct sctstr *target)
            dam = 100;
        own = land.lnd_own;
        if (own != player->cnum)
-           mpr(own, "%s pinpoint bombing raid did %d damage to %s\n",
-               cname(player->cnum), dam, prland(&land));
+           mpr(own, "%s bombs did %d%% damage to %s at %s\n",
+               cname(player->cnum), dam, prland(&land),
+               xyas(target->sct_x, target->sct_y, own));
        landdamage(&land, dam);
        if (dam && (land.lnd_rflags & RET_INJURED))
            retreat_land(&land, 'i');

diff --git a/tests/retreat/journal.log b/tests/retreat/journal.log
index fec6f55860b829c9094c629b93a6c5beadcf31df..cff5d05e2e3db02375801ac8d99e5112d7161ea6 100644 (file)
--- a/tests/retreat/journal.log
+++ b/tests/retreat/journal.log
@@ -1397,7 +1397,7 @@
     Play#0 output Play#0 1 tt   troop transport (#130) retreats along path gg
     Play#0 output Play#0 1 tt   troop transport (#130) stopped at -9,1
     Play#0 output Play#0 1 1 planes spotted over 0,2
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 44 damage to cav  cavalry #30
+    Play#0 output Play#0 1 1 bombs did 44% damage to cav  cavalry #30 at 0,2
     Play#0 output Play#0 1     cav  cavalry #30 takes 17
     Play#0 output Play#0 1 cav  cavalry #31 is on a ship, and can't retreat!
     Play#0 output Play#0 1 cav  cavalry #32 has no mil on it to guide it, and can't retreat!
@@ -1407,29 +1407,29 @@
     Play#0 output Play#0 1 0,2 takes 4% collateral damage
     Play#0 output Play#0 1     tra  train #9 takes 1
     Play#0 output Play#0 1 1 planes spotted over -1,1
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 40 damage to cav  cavalry #33
+    Play#0 output Play#0 1 1 bombs did 40% damage to cav  cavalry #33 at -1,1
     Play#0 output Play#0 1     cav  cavalry #33 takes 15
     Play#0 output Play#0 1 cav  cavalry #33 has been kidnapped by 1, and can't retreat!
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 24 damage to tra  train #37
+    Play#0 output Play#0 1 1 bombs did 24% damage to tra  train #37 at 1,1
     Play#0 output Play#0 1     tra  train #37 takes 14
     Play#0 output Play#0 1 tra  train #37 is stuck off the rail system, and can't retreat!
     Play#0 output Play#0 1 1,1 takes 2% collateral damage
     Play#0 output Play#0 1 1 planes spotted over -1,1
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 24 damage to cav  cavalry #40
+    Play#0 output Play#0 1 1 bombs did 24% damage to cav  cavalry #40 at 1,1
     Play#0 output Play#0 1     cav  cavalry #40 takes 9
     Play#0 output Play#0 1 cav  cavalry #40 retreats along path nu
     Play#0 output Play#0 1 cav  cavalry #40 is out of mobility & stays in 2,2
     Play#0 output Play#0 1 1,1 takes 2% collateral damage
     Play#0 output Play#0 1 1 planes spotted over -1,1
     Play#0 output Play#0 1 1 planes spotted over 1,1
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 28 damage to cav  cavalry #41
+    Play#0 output Play#0 1 1 bombs did 28% damage to cav  cavalry #41 at 1,1
     Play#0 output Play#0 1     cav  cavalry #41 takes 11
     Play#0 output Play#0 1 cav  cavalry #41 retreats along path jy
     Play#0 output Play#0 1 cav  cavalry #41 stopped at 2,0
     Play#0 output Play#0 1 1,1 takes 3% collateral damage
     Play#0 output Play#0 1     tra  train #37 takes 1
     Play#0 output Play#0 1 1 planes spotted over -1,1
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 36 damage to cav  cavalry #42
+    Play#0 output Play#0 1 1 bombs did 36% damage to cav  cavalry #42 at 1,1
     Play#0 output Play#0 1     cav  cavalry #42 takes 14
     Play#0 output Play#0 1 cav  cavalry #42 retreats along path g
     Play#0 output Play#0 1 can't go to -1,1
@@ -1439,7 +1439,7 @@
     Play#0 output Play#0 1 1 planes spotted over -1,1
     Play#0 output Play#0 1 1 planes spotted over 1,1
     Play#0 output Play#0 1 Flak! Firing flak guns from unit eng  engineer #44 (aa rating 1)
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 40 damage to eng  engineer #44
+    Play#0 output Play#0 1 1 bombs did 40% damage to eng  engineer #44 at 1,1
     Play#0 output Play#0 1     eng  engineer #44 takes 10
     Play#0 output Play#0 1 eng  engineer #44 retreats along path yu
     Play#0 output Play#0 1 eng  engineer #43 retreats with them
@@ -1459,7 +1459,7 @@
     Play#0 output Play#0 1     tra  train #37 takes 1
     Play#0 output Play#0 1 1 planes spotted over -1,1
     Play#0 output Play#0 1 1 planes spotted over 0,-2
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 28 damage to tra  train #45
+    Play#0 output Play#0 1 1 bombs did 28% damage to tra  train #45 at 0,-2
     Play#0 output Play#0 1     tra  train #45 takes 16
     Play#0 output Play#0 1 tra  train #45 retreats along path nb
     Play#0 output Play#0 1 cav  cavalry #46 can't rail-march with the leading train, and can't retreat!
@@ -1468,7 +1468,7 @@
     Play#0 output Play#0 1 0,-2 takes 3% collateral damage
     Play#0 output Play#0 1 1 planes spotted over 0,0
     Play#0 output Play#0 1 1 planes spotted over 1,-1
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 24 damage to cav  cavalry #47
+    Play#0 output Play#0 1 1 bombs did 24% damage to cav  cavalry #47 at 1,-1
     Play#0 output Play#0 1     cav  cavalry #47 takes 9
     Play#0 output Play#0 1 cav  cavalry #47 retreats along path g
     Play#0 output Play#0 1 spy  infiltrator #48 retreats with them
@@ -1476,27 +1476,27 @@
     Play#0 output Play#0 1 spy  infiltrator #48 stopped at -1,-1
     Play#0 output Play#0 1 1,-1 takes 2% collateral damage
     Play#0 output Play#0 1 1 planes spotted over 1,1
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 44 damage to cav  cavalry #10
+    Play#0 output Play#0 1 1 bombs did 44% damage to cav  cavalry #10 at 1,1
     Play#0 output Play#0 1     cav  cavalry #10 takes 17
     Play#0 output Play#0 1 cav  cavalry #10 retreats along path jh
     Play#0 output Play#0 1 cav  cavalry #10 stopped at 3,1
     Play#0 output Play#0 1 1,1 takes 4% collateral damage
     Play#0 output Play#0 1     tra  train #37 takes 1
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 36 damage to cav  cavalry #10
+    Play#0 output Play#0 1 1 bombs did 36% damage to cav  cavalry #10 at 3,1
     Play#0 output Play#0 1     cav  cavalry #10 takes 27
     Play#0 output Play#0 1 cav  cavalry #10 retreats along path h
     Play#0 output Play#0 1 cav  cavalry #10 stopped at 3,1
     Play#0 output Play#0 1 3,1 takes 4% collateral damage
     Play#0 output Play#0 1     cav  cavalry #10 takes 1
     Play#0 output Play#0 1 1 planes spotted over -1,1
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 40 damage to cav  cavalry #10
+    Play#0 output Play#0 1 1 bombs did 40% damage to cav  cavalry #10 at 3,1
     Play#0 output Play#0 1     cav  cavalry #10 takes 30
     Play#0 output Play#0 1 cav  cavalry #10 retreats along path uy
     Play#0 output Play#0 1 cav  cavalry #10 stopped at 3,-1
     Play#0 output Play#0 1 3,1 takes 4% collateral damage
     Play#0 output Play#0 1 1 planes spotted over -1,1
     Play#0 output Play#0 1 1 planes spotted over 3,1
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 24 damage to cav  cavalry #25
+    Play#0 output Play#0 1 1 bombs did 24% damage to cav  cavalry #25 at 3,1
     Play#0 output Play#0 1     cav  cavalry #25 takes 9
     Play#0 output Play#0 1 cav  cavalry #25 retreats along path bh
     Play#0 output Play#0 1 cav  cavalry #28 retreats with them
@@ -1505,7 +1505,7 @@
     Play#0 output Play#0 1 3,1 takes 2% collateral damage
     Play#0 output Play#0 1 1 planes spotted over -1,1
     Play#0 output Play#0 1 1 planes spotted over 0,0
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 72 damage to cav  cavalry #60
+    Play#0 output Play#0 1 1 bombs did 72% damage to cav  cavalry #60 at 0,0
     Play#0 output Play#0 1     cav  cavalry #60 takes 27
     Play#0 output Play#0 1 cav  cavalry #60 retreats along path nj
     Play#0 output Play#0 1 cav  cavalry #60 stopped at 3,1
@@ -1513,7 +1513,7 @@
     Play#0 output Play#0 1 0,0 takes 4% collateral damage
     Play#0 output Play#0 1 0,0 takes 3% collateral damage
     Play#0 output Play#0 1 0,0 takes 4% collateral damage
-    Play#0 output Play#0 1 1 pinpoint bombing raid did 68 damage to cav  cavalry #64
+    Play#0 output Play#0 1 1 bombs did 68% damage to cav  cavalry #64 at 0,0
     Play#0 output Play#0 1     cav  cavalry #64 takes 26
     Play#0 output Play#0 1 cav  cavalry #64 retreats along path nj
     Play#0 output Play#0 1 cav  cavalry #64 stopped at 3,1