From d5757a4735cbf6ca253eaac3d96ecf6295893c3a Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Sat, 10 Jan 2015 09:08:25 +0100 Subject: [PATCH] info torpedo: Say "torpedo", not "torp" Documentation and player output should use proper words. "torp" ain't one. Signed-off-by: Markus Armbruster --- info/newspaper.t | 2 +- info/torpedo.t | 2 +- src/lib/commands/torp.c | 4 ++-- tests/retreat/journal.log | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/info/newspaper.t b/info/newspaper.t index 018550c34..ea311cb39 100644 --- a/info/newspaper.t +++ b/info/newspaper.t @@ -68,7 +68,7 @@ and what news to see with the ?action selector. Actions are: 49) Trade between countries 50) Pirates fence loot 51) Pirates keep loot - 52) Ship torps ship + 52) Ship torpedoes ship 53) Sub bombed by ASW plane 55) Unit bombed 56) Unit hits land mine diff --git a/info/torpedo.t b/info/torpedo.t index 1143be036..d3524ea10 100644 --- a/info/torpedo.t +++ b/info/torpedo.t @@ -35,7 +35,7 @@ level. Currently the range formula looks like this: .fi .s1 If the target is out of range, you will be told so, -(after your torp is in the water). +(after your torpedo is in the water). See \*Qinfo Hitchance\*U for the chance of a torpedo hitting its target. .s1 If the target ship is not in a direct line of sight diff --git a/src/lib/commands/torp.c b/src/lib/commands/torp.c index d49dda553..6b01b7195 100644 --- a/src/lib/commands/torp.c +++ b/src/lib/commands/torp.c @@ -82,7 +82,7 @@ torp(void) continue; ntorping++; } - pr("%d ships are eligible to torp\n", ntorping); + pr("%d ships are eligible to torpedo\n", ntorping); snxtitem_rewind(&nbst); while (nxtitem(&nbst, &sub)) { if (!sub.shp_own) @@ -320,7 +320,7 @@ fire_torp(struct shpstr *sp, struct shpstr *targ, int ntargets) pr("Missed!\n"); if (sp->shp_own != 0) wu(0, sp->shp_own, - "%s missed %s with a torp at %s\n", + "%s missed %s with a torpedo at %s\n", prship(sp), prsub(targ), xyas(sp->shp_x, sp->shp_y, sp->shp_own)); } diff --git a/tests/retreat/journal.log b/tests/retreat/journal.log index 83320f2ae..918643a20 100644 --- a/tests/retreat/journal.log +++ b/tests/retreat/journal.log @@ -604,7 +604,7 @@ Play#1 output Play#1 6 0 590 Play#1 input torp 6 100 Play#1 command torpedo - Play#1 output Play#1 1 1 ships are eligible to torp + Play#1 output Play#1 1 1 ships are eligible to torpedo Play#1 output Play#1 1 Effective torpedo range is 2.0 Play#1 output Play#1 1 Whooosh... Hitchance = 51% Play#1 output Play#1 1 BOOM!... @@ -612,14 +612,14 @@ Play#1 output Play#1 6 0 587 Play#1 input torp 6 101 Play#1 command torpedo - Play#1 output Play#1 1 1 ships are eligible to torp + Play#1 output Play#1 1 1 ships are eligible to torpedo Play#1 output Play#1 1 Effective torpedo range is 2.0 Play#1 output Play#1 1 Whooosh... Hitchance = 51% Play#1 output Play#1 1 Missed Play#1 output Play#1 6 0 584 Play#1 input torp 6 102 Play#1 command torpedo - Play#1 output Play#1 1 1 ships are eligible to torp + Play#1 output Play#1 1 1 ships are eligible to torpedo Play#1 output Play#1 1 Effective torpedo range is 2.0 Play#1 output Play#1 1 Whooosh... Hitchance = 51% Play#1 output Play#1 1 BOOM!... @@ -627,7 +627,7 @@ Play#1 output Play#1 6 0 581 Play#1 input torp 6 103 Play#1 command torpedo - Play#1 output Play#1 1 1 ships are eligible to torp + Play#1 output Play#1 1 1 ships are eligible to torpedo Play#1 output Play#1 1 Effective torpedo range is 2.0 Play#1 output Play#1 1 Whooosh... Hitchance = 51% Play#1 output Play#1 1 BOOM!... @@ -635,7 +635,7 @@ Play#1 output Play#1 6 0 578 Play#1 input torp 6 104 Play#1 command torpedo - Play#1 output Play#1 1 1 ships are eligible to torp + Play#1 output Play#1 1 1 ships are eligible to torpedo Play#1 output Play#1 1 Effective torpedo range is 2.0 Play#1 output Play#1 1 Whooosh... Hitchance = 51% Play#1 output Play#1 1 Missed -- 2.43.0