Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

several fixes of typos in rules #6

Merged
merged 1 commit into from
Nov 6, 2013
Merged

several fixes of typos in rules #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
several fixes of typos in rules 
this is a cherry-pick of
8003a25
  • Loading branch information
@pradd
pradd committed Nov 6, 2013
commit bfcd00e4a479b583447753390622709b5bc00a32
12 changes: 6 additions & 6 deletions genrules.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@ int Game::GenRules(const AString &rules, const AString &css,
temp += "and apprentices ";
temp += "the faction may have. (More information on all of the "
"faction activities is in further sections of the rules). Here "
"is a chart detailing the limits on factions by Faction Points.";
"is a chart detailing the limits on factions by Faction Points:";
f.Paragraph(temp);
f.LinkRef("tablefactionpoints");
f.Enclose(1, "CENTER");
Expand Down Expand Up @@ -2387,7 +2387,7 @@ int Game::GenRules(const AString &rules, const AString &css,
"construction tends to depend on the Shipbuilding skill, not "
"the Building skill. ";
if(Globals->FACTION_LIMIT_TYPE == GameDefs::FACLIM_FACTION_TYPES) {
temp += "Only faction with at least one faction point spent on "
temp += "Only factions with at least one faction point spent on "
"trade can issue ";
temp += f.Link("#build", "BUILD") + " orders. ";
}
Expand Down Expand Up @@ -2469,7 +2469,7 @@ int Game::GenRules(const AString &rules, const AString &css,
"All units may ";
temp += f.Link("#work", "WORK") + ", regardless of skills";
if(Globals->FACTION_LIMIT_TYPE == GameDefs::FACLIM_FACTION_TYPES)
temp += "or faction type";
temp += " or faction type";
temp += ".";
f.Paragraph(temp);
if(!(SkillDefs[S_ENTERTAINMENT].flags & SkillType::DISABLED)) {
Expand Down Expand Up @@ -4083,7 +4083,7 @@ int Game::GenRules(const AString &rules, const AString &css,
f.LinkRef("evict");
f.TagText("H4", "EVICT [unit] ...");
temp = "Evict the specified unit from the object of which you are "
"currently the owner. If multipe EVICT orders are given, all "
"currently the owner. If multiple EVICT orders are given, all "
"of the units will be evicted.";
f.Paragraph(temp);
f.Paragraph("Example:");
Expand Down Expand Up @@ -4260,7 +4260,7 @@ int Game::GenRules(const AString &rules, const AString &css,
"final form of the GIVE order gives the entire unit to the "
"specified unit's faction.";
f.Paragraph(temp);
temp = "The classes of items which are exceptable for the fourth form of "
temp = "The classes of items which are acceptable for the fourth form of "
"this order are, NORMAL, ADVANCED, TRADE, MAN or MEN, MONSTER or "
"MONSTERS, MAGIC, WEAPON OR WEAPONS, ARMOR, MOUNT or MOUNTS, BATTLE, "
"SPECIAL, TOOL or TOOLS, FOOD, and ITEM or ITEMS (which is the "
Expand Down Expand Up @@ -4970,7 +4970,7 @@ int Game::GenRules(const AString &rules, const AString &css,
temp = "Use unclaimed funds to aquire basic items that you need. "
"If you do not have sufficient unclaimed, or if you try "
"withdraw any other than a basic item, an error will be given. "
"Withdraw can NOT be used in the Nexus (to prevent building "
"Withdraw CANNOT be used in the Nexus (to prevent building "
"towers and such there). The first form is the same as "
"WITHDRAW 1 [item] in the second form.";
f.Paragraph(temp);
Expand Down
2 changes: 1 addition & 1 deletion skillshows.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ AString *ShowSkill::Report(Faction *f)
case S_LUMBERJACK:
if(level > 1) break;
*str += "This skill deals with all aspects of various wood "
"production. Woods are more often found in forests, but "
"production. Wood is most often found in forests, but "
"may also be found elsewhere.";
break;
case S_QUARRYING:
Expand Down