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

Fix spelling issues #45878

Merged
merged 19 commits into from
Dec 9, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
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
6 changes: 3 additions & 3 deletions data/changelog.txt
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ Move ascii arts to their own file to avoid bloat.
Enforce that functions should not have separate x, y parameters.
Add tests for sun-related functions.
Jsonize Anatomy: replace enum body_part with bodypart_id.
Implement installation requirment for CBMs.
Implement installation requirement for CBMs.
Fields can now override local light levels.
Convert itype_id to string_id<itype>.
Test and refactor item info display functions.
Expand Down Expand Up @@ -1217,7 +1217,7 @@ Include/Exclude filter for overmap search.
Carrion can now eat adjacent crops or food.
Allow place_monster to optionally place a randomized monster using a weighted list.
Adds firewood source that automatically adds fuel to fire when it is 2/3s consumed.
Make chickens and other small domestic birds tamable (Chickenfeed)
Make chickens and other small domestic birds tameable (Chickenfeed)
Vehicles: Open all doors.
Implement player faction base.
Artifact dreams.
Expand Down Expand Up @@ -2392,7 +2392,7 @@ Support loading worlds from CLI.
Always require RFC 4627 compliant JSON.
Include numeric to fix OSX compile.
Add a switch to retain debug symbols for profiling.
Update MXE ICE workaround to blacklist anything targetting x86_64-w64-mingw32.static
Update MXE ICE workaround to blacklist anything targeting x86_64-w64-mingw32.static
Don't keep _GLIBCXX_DEBUG when DEBUG_SYMBOLS is set.
Allow installation in a path with whitespaces.
Add a compile mode that checks for printf format errors.
Expand Down
2 changes: 1 addition & 1 deletion data/json/achievements.json
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@
"event_statistic": "avatar_last_crosses_mutation_threshold",
"is": "==",
"target": [ "mutation_category_id", "CEPHALOPOD" ],
"description": "crossed cephalapod mutation threshold",
"description": "crossed cephalopod mutation threshold",
"visible": "when_achievement_completed"
}
]
Expand Down
2 changes: 1 addition & 1 deletion data/json/furniture_and_terrain/furniture-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -959,7 +959,7 @@
"flags": [
"PLACE_ITEM",
"TRANSPARENT",
"FLAMABLE_ASH",
haveric marked this conversation as resolved.
Show resolved Hide resolved
"FLAMMABLE_ASH",
"MOUNTABLE",
"ALLOW_FIELD_EFFECT",
"EASY_DECONSTRUCT",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/book/misc_sports.json
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
"id": "book_nonf_hard_sports_bike",
"type": "BOOK",
"name": { "str": "Legendary Bike Rides", "str_pl": "copies of Bike Rides" },
"description": "This unweildy coffeetable book is titled \"LEGENDARY Bike Rides Around the WORLD.\" It provides a wealth of detail about paved bike trails in every part of the globe except New England. But if you make it to Patagonia on bike, you're all set.",
"description": "This unwieldy coffeetable book is titled \"LEGENDARY Bike Rides Around the WORLD.\" It provides a wealth of detail about paved bike trails in every part of the globe except New England. But if you make it to Patagonia on bike, you're all set.",
"//isbn13": 9781760340834,
"weight": "1589 g",
"volume": "1660 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/classes/gun.json
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@
"copy-from": "pistol_base",
"type": "GUN",
"name": { "str": "backup pistol" },
"//": "diminuitive backup pistols that lack underbarrel rails, sight dovetails and decent places to affix stocks.",
"//": "diminutive backup pistols that lack underbarrel rails, sight dovetails and decent places to affix stocks.",
"valid_mod_locations": [
[ "accessories", 2 ],
[ "barrel", 1 ],
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/comestibles/brewing.json
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@
"type": "COMESTIBLE",
"id": "young_yeast",
"name": "growing wild yeast",
"description": "Mixture of water, sugar and fruits with some naturally occuring yeast, that will eventually produce a more sizeable yeast culture.",
"description": "Mixture of water, sugar and fruits with some naturally occurring yeast, that will eventually produce a more sizeable yeast culture.",
"weight": "250 g",
"color": "yellow",
"container": "jug_plastic",
Expand Down
2 changes: 1 addition & 1 deletion data/json/items/gun/380.json
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"copy-from": "kp32",
"type": "GUN",
"name": { "str": "Kel-Tec P3AT" },
"description": "Essentially a slightly scaled up Kel-tec P32 in .380 ACP, the ever popular P3AT offers better ballistics in a small, concealable lightweight package. Handling leaves something to be desired due to snappier recoil and diminuitive controls.",
"description": "Essentially a slightly scaled up Kel-tec P32 in .380 ACP, the ever popular P3AT offers better ballistics in a small, concealable lightweight package. Handling leaves something to be desired due to snappier recoil and diminutive controls.",
"ascii_picture": "P3AT",
"weight": "218 g",
"volume": "163 ml",
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/Backgrounds/dreamer.json
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
{
"id": "CWH_DREAMER_IDEAS1",
"type": "talk_topic",
"dynamic_line": "So, like, there were some really bad riots, okay? Everyone got realy violent and nasty, and to be honest, I was on a bit of a spirit journey for a lot of it and I don't really remember too well. But the weirdest part is, nobody even *cared* about each other. It's like all our caring got sucked away. I think it was some kind of negative energy thing. And also that made the dead, like, come back to life and stuff. Plus, like, there were some monsters? I'm not really sure how they fit in.",
"dynamic_line": "So, like, there were some really bad riots, okay? Everyone got really violent and nasty, and to be honest, I was on a bit of a spirit journey for a lot of it and I don't really remember too well. But the weirdest part is, nobody even *cared* about each other. It's like all our caring got sucked away. I think it was some kind of negative energy thing. And also that made the dead, like, come back to life and stuff. Plus, like, there were some monsters? I'm not really sure how they fit in.",
"responses": [
{ "text": "You seem to know a lot, what do you think caused it all?", "topic": "CWH_DREAMER_IDEAS2" },
{ "text": "<done_conversation_section>", "topic": "TALK_NONE" },
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/destination_locations.json
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
},
{
"type": "overmap_location",
"id": "source_of_fabricaton",
"id": "source_of_fabrication",
"flags": [ "SOURCE_FABRICATION" ]
},
{
Expand Down
6 changes: 3 additions & 3 deletions data/json/npcs/godco/cook.json
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
{
"type": "talk_topic",
"id": "TALK_GODCO_cook_currency",
"dynamic_line": "We use religious icons as our currency. These were made before <the_cataclysm>, and the name of our community is written on the back. It's a lot more handy than old-world dollars, those are basicly just firestarters here.",
"dynamic_line": "We use religious icons as our currency. These were made before <the_cataclysm>, and the name of our community is written on the back. It's a lot more handy than old-world dollars, those are basically just firestarters here.",
"responses": [
{ "text": "Oh, okay.", "topic": "TALK_GODCO_cook_1" },
{ "text": "What can I buy here?", "topic": "TALK_GODCO_cook_ask_goods" }
Expand All @@ -209,7 +209,7 @@
"rejected": "It's okay, I can do without them. Just let me know if you reconsider.",
"advice": "There's a lot of places to look. They are common in house kitchens, restaurants or grocery stores.",
"inquire": "How is the search going? Have you found 'em?",
"success": "I really apreciate your help. Don't worry, you won't leave empty-handed.",
"success": "I really appreciate your help. Don't worry, you won't leave empty-handed.",
"success_lie": "Thanks for trying… I guess.",
"failure": "Don't worry about it, it's not that important."
},
Expand All @@ -232,7 +232,7 @@
"offer": "This task is bit more serious. I don't have enough jars to preserve perishables for the future, and we can't just store everything in salt. We could do our own canning if we had some more glass jars. I could get by with 5 for now.",
"accepted": "Thanks for accepting this task. It'll take a load off my shoulders. I finally won't have to worry about this problem anymore.",
"rejected": "Just let me know if you change your mind.",
"advice": "Glass jars are not that hard to find. I'd look for them in residental areas.",
"advice": "Glass jars are not that hard to find. I'd look for them in residential areas.",
"inquire": "Have you found the jars?",
"success": "Thank you for your help. Here's your reward. I have one more task to do.",
"success_lie": "Thanks for trying… I guess.",
Expand Down
2 changes: 1 addition & 1 deletion data/json/npcs/talk_tags.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
{
"type": "snippet",
"category": "<yes_to_lsd>",
"//": "Hallucinatry NPCs say these things to encourage the avatar to extend the hallucination",
"//": "Hallucinatory NPCs say these things to encourage the avatar to extend the hallucination",
"text": [
"Pink tablets! I love those!",
"Hey there's some pink tablets, take some!",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@
{
"type": "recipe",
"result": "faction_base_modular_shelter_2_well",
"description": "We should build a well, accross from the terminal. This will make our future here more secure.",
"description": "We should build a well, across from the terminal. This will make our future here more secure.",
"category": "CC_BUILDING",
"subcategory": "CSC_BUILDING_BASES",
"autolearn": false,
Expand Down
2 changes: 1 addition & 1 deletion data/json/recipes/food/dairy_products.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
"subcategory": "CSC_FOOD_OTHER",
"skill_used": "cooking",
"difficulty": 2,
"//": "Increased recipe size, due to such miniscule amounts would have excessive loss in the straining step otherwise. Made it X8",
"//": "Increased recipe size, due to such minuscule amounts would have excessive loss in the straining step otherwise. Made it X8",
"charges": 8,
"book_learn": [ [ "cookbook_indian", 1 ] ],
"time": "30 m",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Aftershock/npcs/milly_whately_dialogue.json
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
{
"type": "talk_topic",
"id": "TALK_millyficent_food",
"dynamic_line": "No, no, no! No food without succesfully completed experiments. We mustn't break the contract!",
"dynamic_line": "No, no, no! No food without successfully completed experiments. We mustn't break the contract!",
"responses": [
{ "text": "What do I have to do?", "topic": "TALK_MISSION_LIST" },
{ "text": "I don't think you are well.", "topic": "TALK_DONE" }
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Aftershock/npcs/prepnet_dialogue.json
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
"rejected": "It's okay, I can do without them. Just let me know if you reconsider.",
"advice": "There's a lot of places to look. The entire outdoors is full of wild animals.",
"inquire": "How is the search going? Have you found'em?",
"success": "I really apreciate your help. Don't worry, you won't leave empty-handed.",
"success": "I really appreciate your help. Don't worry, you won't leave empty-handed.",
"success_lie": "Thanks for trying… I guess.",
"failure": "Don't worry about it, it's not that important."
},
Expand All @@ -167,7 +167,7 @@
"offer": "Flour would let me break the monotony of fruit and meats.",
"accepted": "Thanks for accepting this task. Otherwise I might kill a stranger for a sandwich. Just kidding.",
"rejected": "Just let me know if you change your mind.",
"advice": "Flour is not that hard to find. I'd look for them in residental areas and professional kitchens or bakeries.",
"advice": "Flour is not that hard to find. I'd look for them in residential areas and professional kitchens or bakeries.",
"inquire": "Have you found the flour?",
"success": "Thank you for your help. Here's your reward.",
"success_lie": "Thanks for trying… I guess.",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Aftershock/player/professions.json
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@
"type": "profession",
"id": "afs_cecaelia_scientist",
"name": "Engineered Deep Sea Explorer",
"description": "Created with the exploration of the deep sea in mind Cecaelia are hybridized from cephalopod and fish dna. While you were mostly spared from the corporate wars by your scientific proclivities, the polite niceties of the surface are mostly forgotten underwater. You were on dry land when the Cataclysm occured and you have no idea if it's safer here or beneath the seas.",
"description": "Created with the exploration of the deep sea in mind Cecaelia are hybridized from cephalopod and fish dna. While you were mostly spared from the corporate wars by your scientific proclivities, the polite niceties of the surface are mostly forgotten underwater. You were on dry land when the Cataclysm occurred and you have no idea if it's safer here or beneath the seas.",
"points": 7,
"skills": [
{ "level": 4, "name": "chemistry" },
Expand Down
4 changes: 2 additions & 2 deletions data/mods/Generic_Guns/ammo/pistol_tiny.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
"name": { "str_sp": "tiny pistol ammo, ball" },
"ammo_type": "ammo_pistol_tiny",
"casing": "pistol_tiny_casing",
"description": "Miniscule pistol and rifle ammunition, for target practice or turn of the century sidearms. Sold in great quantities preceding the riots. 'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead.",
"description": "Minuscule pistol and rifle ammunition, for target practice or turn of the century sidearms. Sold in great quantities preceding the riots. 'Ball' is an old term for full metal jacketed bullets which offer reduced fouling, better reliability, and slightly improved penetration compared to plain lead.",
"relative": { "damage": { "damage_type": "bullet", "amount": -2, "armor_penetration": 3 } }
},
{
"id": "tiny_pistol_jhp",
"type": "AMMO",
"copy-from": "tiny_pistol_ball",
"name": { "str_sp": "tiny pistol ammo, JHP" },
"description": "Miniscule pistol and rifle ammunition, for target practice or turn of the century sidearms. Sold in great quantities preceding the riots. Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.",
"description": "Minuscule pistol and rifle ammunition, for target practice or turn of the century sidearms. Sold in great quantities preceding the riots. Jacketed Hollow Points are defensive/duty projectiles that are more destructive to tissue than plain ball ammunition, and slightly reduce overpenetration concerns.",
"relative": { "damage": { "damage_type": "bullet", "amount": 2, "armor_penetration": -3 } }
},
{
Expand Down
4 changes: 2 additions & 2 deletions doc/ACCESSIBILITY.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### Compatibility with screen readers

There are people who uses screen readers to play Cataclysm DDA. In order for screen
There are people who use screen readers to play Cataclysm DDA. In order for screen
readers to announce the most important information in a UI, the terminal cursor has
to be placed at the correct location. This information may be text such as selected
item names in a list, etc, and the cursor has to be placed exactly at the beginning
Expand Down Expand Up @@ -36,4 +36,4 @@ wrefresh( win );

As shown in the above example, it is preferable to record the intended cursor
position in a variable when the text is printed, and move the cursor later using
the variable to ensure consisitency.
the variable to ensure consistency.
4 changes: 2 additions & 2 deletions doc/BASECAMP.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Basecamps leverage many existing aspects of JSON data such as recipes and mapgen

A basecamp upgrade path is a series of basecamp upgrade missions that upgrade the camp. Upgrade missions are generally performed sequentially, but there is an option to have them branch. Branched missions optionally can have further missions that require missions from other branches.

Bascamp upgrade paths are defined by several related files:
Basecamp upgrade paths are defined by several related files:
* The recipe JSONs that define what the material, tool, and skill requirements to perform an upgrade mission and the blueprint mapgen, blueprint requirements, blueprint provides, and blueprint resources associated with each upgrade mission.
* The mapgen_update JSONs that define how the map will change when the upgrade mission is complete. These may include shared instances of nested mapgen, such a standard room or tent.
* The recipe_group JSONs that define what recipes can be crafted after completing the upgrade mission and what camps and expansions are available.
Expand All @@ -26,7 +26,7 @@ New field | Description
`"blueprint_resources"` | array of `"itype_id"`s. Items with those ids will be added to the camp inventory after the upgrade mission is completed and can be used for crafting or additional upgrade missions.

### blueprint requires, provides, and excludes
blueprint requires, blueprint provides, and blueprint exlcudes are abstract concepts or flags that an upgrade mission requires to start, or that are provided by a previous upgrade mission to satisfy the blueprint requirements of a current upgrade mission, or that prevent an upgrade mission from being available. Each one has an `"id"` and an `"amount"`. Multiple requires, provides, or excludes with the same `"id"` sum their `"amount"` if they're on the same basecamp expansion.
blueprint requires, blueprint provides, and blueprint excludes are abstract concepts or flags that an upgrade mission requires to start, or that are provided by a previous upgrade mission to satisfy the blueprint requirements of a current upgrade mission, or that prevent an upgrade mission from being available. Each one has an `"id"` and an `"amount"`. Multiple requires, provides, or excludes with the same `"id"` sum their `"amount"` if they're on the same basecamp expansion.

Every upgrade mission has its recipe `"result"` as a blueprint_provides and a blueprint_excludes, so upgrade missions will automatically prevent themselves from being repeatable.

Expand Down
2 changes: 1 addition & 1 deletion doc/EFFECTS_JSON.md
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ and hurt effects triggering. "harmful_cough" means that the coughs caused by thi
### Flags

"EFFECT_INVISIBLE" Character affected by an effect with this flag are invisible.
"EFFECT_IMPEDING" Character affected by an effect with this flag can't move until they break free from the effect. Breaking free requires a strenght check: `x_in_y( get_str(), 6 * get_effect_int( eff_id )`
"EFFECT_IMPEDING" Character affected by an effect with this flag can't move until they break free from the effect. Breaking free requires a strength check: `x_in_y( get_str(), 6 * get_effect_int( eff_id )`

### Effect effects
```C++
Expand Down
2 changes: 1 addition & 1 deletion doc/FACTIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Field | Meaning
`"id"` | string, unique faction id
`"name"` | string, the faction's common name
`"likes_u"` | integer, the faction's starting opinion of the player. `"likes_u"` can be increased or decreased in play. If it goes below -10, members of the faction will be hostile.
`"respects_u"` | integer, the faction's starting opinionof the player. Has no meaningful effect in game and may be removed in the future.
`"respects_u"` | integer, the faction's starting opinion of the player. Has no meaningful effect in game and may be removed in the future.
`"known_by_u"` | boolean, whether the player has met members of the faction. Can be changed in play. Unknown factions will not be displayed in the faction menu.
`"size"` | integer, an approximate count of the members of the faction. Has no effect in play currently.
`"power"` | integer, an approximation of the faction's power. Has no effect in play currently.
Expand Down
Loading