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

Correct spelling as one word and as two words

Browse source 
Signed-off-by: Markus Armbruster <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2017-08-05 18:29:36 +02:00
parent b6bfc14ab2
commit c5a2d136ec
18 changed files with 115 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files

2
info/Damage.t
View file

@ -27,7 +27,7 @@ Each bomb does the following damage:
blam: 1 + 1d6
Blam: 5 + 1d6
BLAM: 8 + 1d6
When pinbombing a ship, plane, or land unit, damage is doubled.
When pin-bombing a ship, plane, or land unit, damage is doubled.
Whether you get a blam, Blam, or a BLAM depends on the accuracy of the
plane and the difficulty of the target (see info bomb).

6
info/Hitchance.t
View file

@ -5,14 +5,14 @@ This page describes the chance of a mine, torpedo, ship anti-missile
defense, missile, or plane hitting its target.
.nf
Sea Mine hitchance
Sea mine hit chance
The chance of a ship hitting a mine at sea is (mines/(mines+20)). (For
example, with 20 mines, the chance of hitting one is 20/40 = 50%) The
damage is dependent upon the size of the ship and the spot that the
mine hits. (see \*Qinfo Damage\*U).
Land Mine Hitchance
Land mine hit chance
The chance of a land unit hitting a land mine is mines/(mines+35).
(For example, with 20 mines, the chance of hitting one is 20/55 =
36%). See \*Qinfo Damage\*U to find out how much damage things take
@ -115,7 +115,7 @@ hitchance is less than 20, then it is "belled up" using the following
curve:
hitchance = 5 + 300 / (40 - hitchance).
On the other hand, you can just find out the hitchance by pinbombing
On the other hand, you can just find out the hit chance by pin-bombing
or launching a missile--the hit chance is always printed! :-)
.fi
.SA "fire, launch, bomb, torpedo, Attacking, Damage, Interception, Combat"

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

@ -421,7 +421,7 @@ ship_bomb(struct emp_qelem *list, struct sctstr *target)
pr("%d%% hit chance...", hitchance);
}
if (pct_chance(hitchance)) {
/* pinbombing is more accurate than normal bombing */
/* pin-bombing is more accurate than normal bombing */
dam = 2 * pln_damage(&plp->plane, 'p', "");
} else {
pr("splash\n");
@ -519,7 +519,7 @@ plane_bomb(struct emp_qelem *list, struct sctstr *target)
pr("%d%% hit chance...", hitchance);
}
if (pct_chance(hitchance)) {
/* pinbombing is more accurate than normal bombing */
/* pin-bombing is more accurate than normal bombing */
dam = 2 * pln_damage(&plp->plane, 'p', "");
} else {
pr("thud\n");

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

@ -24,7 +24,7 @@
*
* ---
*
* demo.c: De-mobilize "n" military in a given sector
* demo.c: Demobilize "n" military in a given sector
*
* Known contributors to this file:
* Dave Pare, 1986
@ -57,7 +57,7 @@ demo(void)
natp = getnatp(player->cnum);
if (!snxtsct(&nstr, player->argp[1]))
return RET_SYN;
if (!(p = getstarg(player->argp[2], "Number to de-mobilize : ", buf)))
if (!(p = getstarg(player->argp[2], "Number to demobilize : ", buf)))
return RET_SYN;
number = atoi(p);
p = getstarg(player->argp[3],

6
src/lib/global/news.c
View file

@ -76,9 +76,9 @@ struct rptstr rpt[] = {
"gunners decimate %s aggressors" } },
{ N_BROKE_SANCT, 0, N_FOR, { "breaks sanctuary",
"no longer has a sanctuary" } },
{ N_SCT_BOMB, -2, N_SKY, { "planes divebomb one of %s's sectors",
{ N_SCT_BOMB, -2, N_SKY, { "planes dive-bomb one of %s's sectors",
"bombers wreak havoc on %s" } },
{ N_SHP_BOMB, -2, N_SEA, { "divebombs a ship flying the flag of %s",
{ N_SHP_BOMB, -2, N_SEA, { "dive-bombs a ship flying the flag of %s",
"air force bombs %s ships" } },
{ N_BOARD_SHIP, -2, N_SEA, { "seadogs board one of %s's ships",
"pirates board %s ship" } },
@ -147,7 +147,7 @@ struct rptstr rpt[] = {
{ N_SUB_BOMB, 0, N_SEA, { "planes bomb a skulking %s submarine",
"planes drop depth-charges on a %s sub" } },
{ 54, 0, 0, { no_news, no_news } },
{ N_UNIT_BOMB, -2, N_SKY, { "divebombs a brave %s unit",
{ N_UNIT_BOMB, -2, N_SKY, { "dive-bombs a brave %s unit",
"air force bombs %s units" } },
{ N_LHIT_MINE, 0, N_FRONT, { "troops run afoul of a landmine",
"troops severely damaged in mine field" } },

2
src/lib/subs/mission.c
View file

@ -1057,7 +1057,7 @@ air_damage(struct emp_qelem *bombers, coord x, coord y, int mission,
prplane(pp), cname(victim), s, xyas(x, y, pp->pln_own));
} else {
wu(0, pp->pln_own,
"\t%s pinbombing %s %s in %s\n",
"\t%s pin-bombing %s %s in %s\n",
prplane(pp), cname(victim), s, xyas(x, y, pp->pln_own));
}

2
tests/smoke/journal.log
View file

@ -13173,7 +13173,7 @@
Play#1 output Play#1 1
Play#1 output Play#1 1 > BULLETIN from POGO, (#0) dated Thu Jan 1 00:00:00 1970
Play#1 output Play#1 1 Flying a support mission from 11,-1 to 12,-2
Play#1 output Play#1 1 f1 Sopwith Camel #2 pinbombing 8 in 12,-2
Play#1 output Play#1 1 f1 Sopwith Camel #2 pin-bombing 8 in 12,-2
Play#1 output Play#1 1 hit 8 for 26 damage
Play#1 output Play#1 1
Play#1 output Play#1 6 0 611

12
tests/version/journal.log
View file

@ -1771,8 +1771,8 @@
Play#0 output Play#0 1 13 "ships\\040torpedoed\\040by\\040enemy\\040wolf-packs" "ships\\040torpedoed\\040by\\040marauding\\040U-boats" 0 3
Play#0 output Play#0 1 14 "gunners\\040fire\\040on\\040%s\\040in\\040self-defense" "gunners\\040decimate\\040%s\\040aggressors" 0 6
Play#0 output Play#0 1 15 "breaks\\040sanctuary" "no\\040longer\\040has\\040a\\040sanctuary" 0 1
Play#0 output Play#0 1 16 "planes\\040divebomb\\040one\\040of\\040%s's\\040sectors" "bombers\\040wreak\\040havoc\\040on\\040%s" -2 4
Play#0 output Play#0 1 17 "divebombs\\040a\\040ship\\040flying\\040the\\040flag\\040of\\040%s" "airforce\\040bombs\\040%s\\040ships" -2 3
Play#0 output Play#0 1 16 "planes\\040dive-bomb\\040one\\040of\\040%s's\\040sectors" "bombers\\040wreak\\040havoc\\040on\\040%s" -2 4
Play#0 output Play#0 1 17 "dive-bombs\\040a\\040ship\\040flying\\040the\\040flag\\040of\\040%s" "air\\040force\\040bombs\\040%s\\040ships" -2 3
Play#0 output Play#0 1 18 "seadogs\\040board\\040one\\040of\\040%s's\\040ships" "pirates\\040board\\040%s\\040ship" -2 3
Play#0 output Play#0 1 19 "is\\040repelled\\040by\\040%s\\040while\\040attempting\\040to\\040board\\040a\\040ship" "pirates\\040prove\\040inept\\040at\\040boarding\\040%s's\\040ships" -3 3
Play#0 output Play#0 1 21 "seizes\\040a\\040sector\\040from\\040%s\\040to\\040collect\\040on\\040a\\040loan" "collects\\040one\\040of\\040%s's\\040sectors\\040in\\040repayment\\040of\\040a\\040loan" -2 7
@ -1803,7 +1803,7 @@
Play#0 output Play#0 1 51 "pirates\\040keep\\040their\\040%s\\040booty" "buccaneers\\040laugh\\040and\\040bury\\040their\\040%s\\040goods" 0 7
Play#0 output Play#0 1 52 "ships\\040torpedoed\\040by\\040%s\\040torpedo-boats" "ships\\040sunk\\040by\\040marauding\\040%s\\040torpedo-boats" 0 3
Play#0 output Play#0 1 53 "planes\\040bomb\\040a\\040skulking\\040%s\\040submarine" "planes\\040drop\\040depth-charges\\040on\\040a\\040%s\\040sub" 0 3
Play#0 output Play#0 1 55 "divebombs\\040a\\040brave\\040%s\\040unit" "airforce\\040bombs\\040%s\\040units" -2 4
Play#0 output Play#0 1 55 "dive-bombs\\040a\\040brave\\040%s\\040unit" "air\\040force\\040bombs\\040%s\\040units" -2 4
Play#0 output Play#0 1 56 "troops\\040run\\040afoul\\040of\\040a\\040landmine" "troops\\040severely\\040damaged\\040in\\040mine\\040field" 0 2
Play#0 output Play#0 1 57 "fortress\\040gunners\\040support\\040troops\\040attacking\\040%s" "fortress\\040artillery\\040massacres\\040%s\\040defenders" -2 6
Play#0 output Play#0 1 58 "gunners\\040support\\040troops\\040attacking\\040%s" "artillery\\040battery\\040massacres\\040%s\\040defenders" -2 6
@ -2422,8 +2422,8 @@
Play#1 output Play#1 1 13 "ships\\040torpedoed\\040by\\040enemy\\040wolf-packs" "ships\\040torpedoed\\040by\\040marauding\\040U-boats" 0 3
Play#1 output Play#1 1 14 "gunners\\040fire\\040on\\040%s\\040in\\040self-defense" "gunners\\040decimate\\040%s\\040aggressors" 0 6
Play#1 output Play#1 1 15 "breaks\\040sanctuary" "no\\040longer\\040has\\040a\\040sanctuary" 0 1
Play#1 output Play#1 1 16 "planes\\040divebomb\\040one\\040of\\040%s's\\040sectors" "bombers\\040wreak\\040havoc\\040on\\040%s" -2 4
Play#1 output Play#1 1 17 "divebombs\\040a\\040ship\\040flying\\040the\\040flag\\040of\\040%s" "airforce\\040bombs\\040%s\\040ships" -2 3
Play#1 output Play#1 1 16 "planes\\040dive-bomb\\040one\\040of\\040%s's\\040sectors" "bombers\\040wreak\\040havoc\\040on\\040%s" -2 4
Play#1 output Play#1 1 17 "dive-bombs\\040a\\040ship\\040flying\\040the\\040flag\\040of\\040%s" "air\\040force\\040bombs\\040%s\\040ships" -2 3
Play#1 output Play#1 1 18 "seadogs\\040board\\040one\\040of\\040%s's\\040ships" "pirates\\040board\\040%s\\040ship" -2 3
Play#1 output Play#1 1 19 "is\\040repelled\\040by\\040%s\\040while\\040attempting\\040to\\040board\\040a\\040ship" "pirates\\040prove\\040inept\\040at\\040boarding\\040%s's\\040ships" -3 3
Play#1 output Play#1 1 21 "seizes\\040a\\040sector\\040from\\040%s\\040to\\040collect\\040on\\040a\\040loan" "collects\\040one\\040of\\040%s's\\040sectors\\040in\\040repayment\\040of\\040a\\040loan" -2 7
@ -2454,7 +2454,7 @@
Play#1 output Play#1 1 51 "pirates\\040keep\\040their\\040%s\\040booty" "buccaneers\\040laugh\\040and\\040bury\\040their\\040%s\\040goods" 0 7
Play#1 output Play#1 1 52 "ships\\040torpedoed\\040by\\040%s\\040torpedo-boats" "ships\\040sunk\\040by\\040marauding\\040%s\\040torpedo-boats" 0 3
Play#1 output Play#1 1 53 "planes\\040bomb\\040a\\040skulking\\040%s\\040submarine" "planes\\040drop\\040depth-charges\\040on\\040a\\040%s\\040sub" 0 3
Play#1 output Play#1 1 55 "divebombs\\040a\\040brave\\040%s\\040unit" "airforce\\040bombs\\040%s\\040units" -2 4
Play#1 output Play#1 1 55 "dive-bombs\\040a\\040brave\\040%s\\040unit" "air\\040force\\040bombs\\040%s\\040units" -2 4
Play#1 output Play#1 1 56 "troops\\040run\\040afoul\\040of\\040a\\040landmine" "troops\\040severely\\040damaged\\040in\\040mine\\040field" 0 2
Play#1 output Play#1 1 57 "fortress\\040gunners\\040support\\040troops\\040attacking\\040%s" "fortress\\040artillery\\040massacres\\040%s\\040defenders" -2 6
Play#1 output Play#1 1 58 "gunners\\040support\\040troops\\040attacking\\040%s" "artillery\\040battery\\040massacres\\040%s\\040defenders" -2 6