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.

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

Grammar/Spelling #38006

Merged
merged 7 commits into from
Feb 22, 2020
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
AmericanSpelling
  • Loading branch information
klorpa committed Jan 19, 2020
commit 6a90dbbc31970ae549d8ca648055ddd9bee418c2
10 changes: 5 additions & 5 deletions data/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ Basecamps: Use normal recipes and fake resources.
Allow professions to have starting pets.
Make crafting failure non-absolute.
Player now burns calories when doing activities.
Model NPC needs as a behavior tree based on Maslow's heirarchy of needs.
Model NPC needs as a behavior tree based on Maslow's hierarchy of needs.
Boats push creatures in water out of the way.
CBMs for NPCs 2: Active CBMs with AI control.
Allows trains to move and turn on railroad tiles.
Expand Down Expand Up @@ -175,7 +175,7 @@ Running/crouching while swimming will result in faster/slower swim speed.
Adds refluffed and modified plasma gun.
Moves allergen handling vitamin absorption to JSON.
Alternative night vision intensity.
Adds the possiblitiy to find an evil moose in the kitten finding game.
Adds the possibility to find an evil moose in the kitten finding game.
Add "classic literature" and "collector's edition" books.
Adds Free Merchant currency.
Joint Servo CBM - movement enhancer CBM.
Expand Down Expand Up @@ -1065,7 +1065,7 @@ Adds new vehicle part : a wind turbine.
Adds Free Merchant currency.
Adds methanol and ether as a possible Molotov components.
Add "classic literature" and "collector's edition" books, move choice book spawns to library, and adjust library/mansion book spawns overall.
Adds the possiblitiy to find an evil moose in the kitten finding game.
Adds the possibility to find an evil moose in the kitten finding game.
Adds new furniture flag that restricts vision when in the furniture.

## Interface:
Expand Down Expand Up @@ -1143,7 +1143,7 @@ Vision and targeting changes, 3D-ification.
Display moves when disposing of items.
Escapable menu for sorting items in advanced inventory.
Prevent window minimize on fullscreen borderless when focus lost.
Rearange main rendering method to place curses cursor on @ at the end.
Rearrange main rendering method to place curses cursor on @ at the end.
Add a cache refresh before drawing pixel minimap.
Add option to select which video display is used.
Add option to limit lifetime of sidebar messages.
Expand Down Expand Up @@ -1295,7 +1295,7 @@ Have vehicles become dark inside when that makes sense.
Allow toggling display of forest trails on the overmap.
Added 'center' action for look around mode.
Vehicle: display engine power and electrical drain/production.
Bandage/Disinfactant display/compare/apply improvements.
Bandage/Disinfectant display/compare/apply improvements.
Allow hiding of recipe categories from crafting menu.
Player: don't create the reload prompt if there's only one option.
Better scrolling through requirements list in crafting GUI.
Expand Down
4 changes: 2 additions & 2 deletions data/json/itemgroups/clothing.json
Original file line number Diff line number Diff line change
Expand Up @@ -389,7 +389,7 @@
{
"id": "clothing_work_torso",
"type": "item_group",
"//": "Shirts and jackets often worn by technicians and labourers.",
"//": "Shirts and jackets often worn by technicians and laborers.",
"items": [
{
"collection": [
Expand All @@ -406,7 +406,7 @@
"id": "clothing_work_set",
"type": "item_group",
"subtype": "collection",
"//": "Set of clothes worn by technicians and labourers including protective gear",
"//": "Set of clothes worn by technicians and laborers including protective gear",
"items": [
{ "group": "clothing_work_boots" },
{ "group": "clothing_work_glasses", "prob": 60 },
Expand Down
40 changes: 20 additions & 20 deletions data/json/npcs/expertise_traits.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"traits": [ { "trait": "Exp_Agriculture1" }, { "trait": "Exp_Agriculture1" }, { "trait": "Exp_Agriculture2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Agriculture_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -149,7 +149,7 @@
"traits": [ { "trait": "Exp_Biochemistry1" }, { "trait": "Exp_Biochemistry1" }, { "trait": "Exp_Biochemistry2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Biochemistry_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -227,7 +227,7 @@
"traits": [ { "trait": "Exp_Biology1" }, { "trait": "Exp_Biology1" }, { "trait": "Exp_Biology2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Biology_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -305,7 +305,7 @@
"traits": [ { "trait": "Exp_Bookkeeping1" }, { "trait": "Exp_Bookkeeping1" }, { "trait": "Exp_Bookkeeping2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Bookkeeping_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -383,7 +383,7 @@
"traits": [ { "trait": "Exp_Botany1" }, { "trait": "Exp_Botany1" }, { "trait": "Exp_Botany2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Botany_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -461,7 +461,7 @@
"traits": [ { "trait": "Exp_Chemistry1" }, { "trait": "Exp_Chemistry1" }, { "trait": "Exp_Chemistry2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Chemistry_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -539,7 +539,7 @@
"traits": [ { "trait": "Exp_Culinary1" }, { "trait": "Exp_Culinary1" }, { "trait": "Exp_Culinary2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Culinary_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -617,7 +617,7 @@
"traits": [ { "trait": "Exp_Eng_Electrical1" }, { "trait": "Exp_Eng_Electrical1" }, { "trait": "Exp_Eng_Electrical2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Eng_Electrical_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -695,7 +695,7 @@
"traits": [ { "trait": "Exp_Eng_Mechanical1" }, { "trait": "Exp_Eng_Mechanical1" }, { "trait": "Exp_Eng_Mechanical2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Eng_Electrical_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -773,7 +773,7 @@
"traits": [ { "trait": "Exp_Eng_Software1" }, { "trait": "Exp_Eng_Software1" }, { "trait": "Exp_Eng_Software2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Eng_Software_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -851,7 +851,7 @@
"traits": [ { "trait": "Exp_Eng_Structural1" }, { "trait": "Exp_Eng_Structural1" }, { "trait": "Exp_Eng_Structural2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Eng_Structural_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -929,7 +929,7 @@
"traits": [ { "trait": "Exp_Entomology1" }, { "trait": "Exp_Entomology1" }, { "trait": "Exp_Entomology2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Entomology_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -1007,7 +1007,7 @@
"traits": [ { "trait": "Exp_Geology1" }, { "trait": "Exp_Geology1" }, { "trait": "Exp_Geology2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Geology_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -1085,7 +1085,7 @@
"traits": [ { "trait": "Exp_Medicine1" }, { "trait": "Exp_Medicine1" }, { "trait": "Exp_Medicine2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Medicine_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -1163,7 +1163,7 @@
"traits": [ { "trait": "Exp_Mycology1" }, { "trait": "Exp_Mycology1" }, { "trait": "Exp_Mycology2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Mycology_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -1241,7 +1241,7 @@
"traits": [ { "trait": "Exp_Physics1" }, { "trait": "Exp_Physics1" }, { "trait": "Exp_Physics2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Physics_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -1319,7 +1319,7 @@
"traits": [ { "trait": "Exp_Psychology1" }, { "trait": "Exp_Psychology1" }, { "trait": "Exp_Psychology2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Psychology_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -1397,7 +1397,7 @@
"traits": [ { "trait": "Exp_Sanitation1" }, { "trait": "Exp_Sanitation1" }, { "trait": "Exp_Sanitation2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Sanitation_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -1475,7 +1475,7 @@
"traits": [ { "trait": "Exp_Teaching1" }, { "trait": "Exp_Teaching1" }, { "trait": "Exp_Teaching2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Teaching_Group",
"subtype": "distribution",
Expand Down Expand Up @@ -1553,7 +1553,7 @@
"traits": [ { "trait": "Exp_Veterinary1" }, { "trait": "Exp_Veterinary1" }, { "trait": "Exp_Veterinary2" } ]
},
{
"//": "This trait group guarantees one of the associated traits, distributed in favour of real traits but with a chance of fakes.",
"//": "This trait group guarantees one of the associated traits, distributed in favor of real traits but with a chance of fakes.",
"type": "trait_group",
"id": "Exp_Veterinary_Group",
"subtype": "distribution",
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/godco/foodguard.json
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@
{
"type": "talk_topic",
"id": "TALK_GODCO_food_guard_books",
"dynamic_line": "It doesn't matter, I can read anything. But mystery books were almost my favourite. I wish I had more of them.",
"dynamic_line": "It doesn't matter, I can read anything. But mystery books were almost my favorite. I wish I had more of them.",
"responses": [
{ "text": "Let's talk about something else.", "topic": "TALK_GODCO_food_guard_1" },
{ "text": "I can get you some mystery novels.", "topic": "TALK_MISSION_LIST" }
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@
{
"type": "talk_topic",
"id": "TALK_REFUGEE_Pablo_Tacoma2",
"dynamic_line": "This is amazing news! Thank you so much! I've talked to some of the traders who have been there and I really think I can help, mostly with the manual labour but also with the bookkeeping end. It sounds so much better than this place. Thanks, my friend! We'll get packing, and see if we can get a place on the next caravan out. It'll be a little while I'm sure, but at least our child won't be born in captivity."
"dynamic_line": "This is amazing news! Thank you so much! I've talked to some of the traders who have been there and I really think I can help, mostly with the manual labor but also with the bookkeeping end. It sounds so much better than this place. Thanks, my friend! We'll get packing, and see if we can get a place on the next caravan out. It'll be a little while I'm sure, but at least our child won't be born in captivity."
},
{
"type": "talk_topic",
Expand Down
2 changes: 1 addition & 1 deletion data/json/snippets/music.json
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@
"electronic",
"house",
"metal",
"reaggae",
"reggae",
"ska",
"punk",
"thrash",
Expand Down
4 changes: 2 additions & 2 deletions data/json/snippets/newspapers.json
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
},
{
"id": "many_years_old_news_7",
"text": "ALIENS AMONG US! Janine Galfrizowich, of Martha's Vineyard, wrote in to our Paranormal Investigation Staff with this cryptic gem. \"They're always watching, always watching from the shadows. Stealing my avocadoes and watching! They took my neighbour and made him into one of them!\" Our journalists are trying to track Mrs Galfrizowich down, but it is clear enough that this ties into the well known Avocado Conspiracy (see issue 24, volume 7)."
"text": "ALIENS AMONG US! Janine Galfrizowich, of Martha's Vineyard, wrote in to our Paranormal Investigation Staff with this cryptic gem. \"They're always watching, always watching from the shadows. Stealing my avocadoes and watching! They took my neighbor and made him into one of them!\" Our journalists are trying to track Mrs Galfrizowich down, but it is clear enough that this ties into the well known Avocado Conspiracy (see issue 24, volume 7)."
},
{
"id": "many_years_old_news_8",
Expand Down Expand Up @@ -123,7 +123,7 @@
},
{
"id": "years_old_news_12",
"text": "CHINESE SUPER SOLDIERS. At a global press conference, the People's Republic of China unveiled their new bionic-powered supersoldiers. These soldiers are equipped with an analogous compact module technology, known as 'XFS' in press release documents, believed to be similar to CBM technology favoured by NATO forces. \"We're not concerned by these announcements,\" DARPA spokesperson Linda Iridani told our reporters. \"We've been keeping an eye on Chinese developments in bionics for some time, and XFS technology is many years behind our own military-grade CBMs.\""
"text": "CHINESE SUPER SOLDIERS. At a global press conference, the People's Republic of China unveiled their new bionic-powered supersoldiers. These soldiers are equipped with an analogous compact module technology, known as 'XFS' in press release documents, believed to be similar to CBM technology favored by NATO forces. \"We're not concerned by these announcements,\" DARPA spokesperson Linda Iridani told our reporters. \"We've been keeping an eye on Chinese developments in bionics for some time, and XFS technology is many years behind our own military-grade CBMs.\""
}
]
},
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Graphical_Overmap/readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@ Optional:
- For a more muted palette to increase readability move 'base_colors.json' into your /config folder and overwrite. The crossroads with manhole (road_nesw_manhole) actually uses the dark_gray (60,60,60) from this palette, so may look slightly off if you are using a different dark_gray.

Issues:
- MAJOR: Mod doesn't work for people using cyrillic script or diacritic glyphs.
- MAJOR: Mod doesn't work for people using Cyrillic script or diacritic glyphs.
- MAJOR: You may have problems (usually color based) when running this on anything but Windows.
- MINOR: The arbitrary symbol I have used to represent each icon will appear at the top of the sidebar on the overmap screen when the tile is selected.
- MINOR: Some locations are hidden in forests. However, some of these have the symbol and colour of a forest, while their name reveals what they really are (eg. "cabin_aban1"). Not sure whether to make them look like forests or as their name suggests. So far have made them the symbol of their name, but green.
- MINOR: Some locations are hidden in forests. However, some of these have the symbol and color of a forest, while their name reveals what they really are (eg. "cabin_aban1"). Not sure whether to make them look like forests or as their name suggests. So far have made them the symbol of their name, but green.
- MINOR: I know it's possible to change dirt roads, although getting the angles right confused me so I left it for now.

Happy cartography,
Expand Down
2 changes: 1 addition & 1 deletion doxygen_doc/doxygen_conf.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1304,7 +1304,7 @@ SEARCHENGINE = YES

# When the SERVER_BASED_SEARCH tag is enabled the search engine will be
# implemented using a web server instead of a web client using Javascript.
# There are two flavours of web server based search depending on the
# There are two flavors of web server based search depending on the
# EXTERNAL_SEARCH setting. When disabled, doxygen will generate a PHP script for
# searching and an index file used by the script. When EXTERNAL_SEARCH is
# enabled the indexing and searching needs to be provided by external tools.
Expand Down