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

info torpedo: Say "torpedo", not "torp"

Browse source 
Documentation and player output should use proper words.  "torp" ain't
one.

Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2015-01-10 09:08:25 +01:00
parent d5d92caf94
commit d5757a4735
4 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
info/newspaper.t
View file

@ -68,7 +68,7 @@ and what news to see with the ?action selector. Actions are:
49) Trade between countries 49) Trade between countries
50) Pirates fence loot 50) Pirates fence loot
51) Pirates keep loot 51) Pirates keep loot
52) Ship torps ship 52) Ship torpedoes ship
53) Sub bombed by ASW plane 53) Sub bombed by ASW plane
55) Unit bombed 55) Unit bombed
56) Unit hits land mine 56) Unit hits land mine

2
info/torpedo.t
View file

@ -35,7 +35,7 @@ level. Currently the range formula looks like this:
.fi .fi
.s1 .s1
If the target is out of range, you will be told so, 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. See \*Qinfo Hitchance\*U for the chance of a torpedo hitting its target.
.s1 .s1
If the target ship is not in a direct line of sight If the target ship is not in a direct line of sight

4
src/lib/commands/torp.c
View file

@ -82,7 +82,7 @@ torp(void)
continue; continue;
ntorping++; ntorping++;
} }
pr("%d ships are eligible to torp\n", ntorping); pr("%d ships are eligible to torpedo\n", ntorping);
snxtitem_rewind(&nbst); snxtitem_rewind(&nbst);
while (nxtitem(&nbst, &sub)) { while (nxtitem(&nbst, &sub)) {
if (!sub.shp_own) if (!sub.shp_own)
@ -320,7 +320,7 @@ fire_torp(struct shpstr *sp, struct shpstr *targ, int ntargets)
pr("Missed!\n"); pr("Missed!\n");
if (sp->shp_own != 0) if (sp->shp_own != 0)
wu(0, sp->shp_own, 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), prship(sp), prsub(targ),
xyas(sp->shp_x, sp->shp_y, sp->shp_own)); xyas(sp->shp_x, sp->shp_y, sp->shp_own));
} }

10
tests/retreat/journal.log
View file

@ -604,7 +604,7 @@
Play#1 output Play#1 6 0 590 Play#1 output Play#1 6 0 590
Play#1 input torp 6 100 Play#1 input torp 6 100
Play#1 command torpedo 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 Effective torpedo range is 2.0
Play#1 output Play#1 1 Whooosh... Hitchance = 51% Play#1 output Play#1 1 Whooosh... Hitchance = 51%
Play#1 output Play#1 1 BOOM!... Play#1 output Play#1 1 BOOM!...
@ -612,14 +612,14 @@
Play#1 output Play#1 6 0 587 Play#1 output Play#1 6 0 587
Play#1 input torp 6 101 Play#1 input torp 6 101
Play#1 command torpedo 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 Effective torpedo range is 2.0
Play#1 output Play#1 1 Whooosh... Hitchance = 51% Play#1 output Play#1 1 Whooosh... Hitchance = 51%
Play#1 output Play#1 1 Missed Play#1 output Play#1 1 Missed
Play#1 output Play#1 6 0 584 Play#1 output Play#1 6 0 584
Play#1 input torp 6 102 Play#1 input torp 6 102
Play#1 command torpedo 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 Effective torpedo range is 2.0
Play#1 output Play#1 1 Whooosh... Hitchance = 51% Play#1 output Play#1 1 Whooosh... Hitchance = 51%
Play#1 output Play#1 1 BOOM!... Play#1 output Play#1 1 BOOM!...
@ -627,7 +627,7 @@
Play#1 output Play#1 6 0 581 Play#1 output Play#1 6 0 581
Play#1 input torp 6 103 Play#1 input torp 6 103
Play#1 command torpedo 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 Effective torpedo range is 2.0
Play#1 output Play#1 1 Whooosh... Hitchance = 51% Play#1 output Play#1 1 Whooosh... Hitchance = 51%
Play#1 output Play#1 1 BOOM!... Play#1 output Play#1 1 BOOM!...
@ -635,7 +635,7 @@
Play#1 output Play#1 6 0 578 Play#1 output Play#1 6 0 578
Play#1 input torp 6 104 Play#1 input torp 6 104
Play#1 command torpedo 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 Effective torpedo range is 2.0
Play#1 output Play#1 1 Whooosh... Hitchance = 51% Play#1 output Play#1 1 Whooosh... Hitchance = 51%
Play#1 output Play#1 1 Missed Play#1 output Play#1 1 Missed