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

Spelling fixes #55748

Merged
merged 16 commits into from
Mar 8, 2022
2 changes: 1 addition & 1 deletion data/json/monsters/utility_bot.json
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
"flags": [ "SEES", "ELECTRONIC", "COLDPROOF", "NO_BREATHE", "FIREPROOF", "PUSH_MON", "HEARS", "PACIFIST", "STUN_IMMUNE" ]
},
{
"//": "nurse_bot and nurse_bot_defective look very similar, part of the trick is figuring out which one is the good one. So the sprites should probably look pretty similar to not give it away immediatly",
"//": "nurse_bot and nurse_bot_defective look very similar, part of the trick is figuring out which one is the good one. So the sprites should probably look pretty similar to not give it away immediately",
"id": "mon_nursebot_defective",
"type": "MONSTER",
"name": { "str": "nurse bot" },
Expand Down
2 changes: 1 addition & 1 deletion data/json/snippets/lab.json
Original file line number Diff line number Diff line change
Expand Up @@ -300,7 +300,7 @@
},
{
"id": "interview_2",
"text": "\"Please state your name for the record.\"\n\n\"Fuck off.\"\n\n\"You are in posession of a fake drivers's license issued to one Jonathan Smith, which is the alias you applied for employment with in our facility. We will find out your real name in time, but I'll refer to you as Mr. Smith for this interview. Is that acceptable, Mr. Smith?\"\n\n\"Fuck off. I want to talk to my lawyer.\"\n\n\"You don't have a lawyer.\"\n\n\"I know my rights, shithead. You won't get a word out of me before I talk to my lawyer.\"\n\n\"You seem to be confused about your situation, Mr. Smith. As far as the world is concerned you stopped existing the moment you entered this facility, and as far as we are concerned you stopped having rights as soon as you tried to access areas above your provisional clearence. Let me present your options going forward: You continue witholding information from us and you will suffer a meticulously-documented accident leaving no doubt to your demise even though no body will ever be found. Or you cooperate fully and without hesitation, in which case you will get to see the sky again and act like nothing has happened. Am I understood?\"\n\n\"…yes.\"\n\n\"Please state your name for the record.\"\n\n\"M-my name is Thomas Wright. I'm a, uh, a freelance journalist.\"\n\n\"What were you trying to accomplish in this facility, Mr. Wright?\"\n\n\"There was th-this guy offering good money for some pictures from the inside of this place.\"\n\n\"I don't suppose this man told you his name?\"\n\n\"No, no… He just handed me the application forms and the licence, paid quarter up front, and said to bring the pictures to the same spot in a week's time.\"\n\n\"What did he say to expect here?\"\n\n\"This place is… look, you can't expect people not to talk about it, right? You can't just put up a warehouse of a shipping company nobody's heard of practically overnight and act like it was always here. He said you guys were a, uh, top secret prison for political prisoners.\"\n\n\"That explains your attempts to clumsily pick the first closed door you came across. How did your employer contact you?\"\n\n\"A friend of a friend gave him my number, at least according to him. If you haven't noticed in here times are tough, so I couldn't really afford to be picky about work even before he started throwing cash around.\"\n\n\"Very well. While we verify that account my colleagues here will take you through a tour of our facility: You will take photographs with your \"hidden\" camera when and where they instruct you to. You will submit these pictures for review and remain in our custody until we can be certain of your compliance. You will be released and at the appointed time you will hand over the pictures to your employer. You will not mention this conversation to them, or to anybody outside of this room. You will enjoy your well-earned payment, far away from this facility. Am I understood?\"\n\n\"Yes, sir, I can do that.\"\n\n\"Excellent, Mr. Wright. I look forward to never seeing you again.\""
"text": "\"Please state your name for the record.\"\n\n\"Fuck off.\"\n\n\"You are in possession of a fake drivers's license issued to one Jonathan Smith, which is the alias you applied for employment with in our facility. We will find out your real name in time, but I'll refer to you as Mr. Smith for this interview. Is that acceptable, Mr. Smith?\"\n\n\"Fuck off. I want to talk to my lawyer.\"\n\n\"You don't have a lawyer.\"\n\n\"I know my rights, shithead. You won't get a word out of me before I talk to my lawyer.\"\n\n\"You seem to be confused about your situation, Mr. Smith. As far as the world is concerned you stopped existing the moment you entered this facility, and as far as we are concerned you stopped having rights as soon as you tried to access areas above your provisional clearence. Let me present your options going forward: You continue witholding information from us and you will suffer a meticulously-documented accident leaving no doubt to your demise even though no body will ever be found. Or you cooperate fully and without hesitation, in which case you will get to see the sky again and act like nothing has happened. Am I understood?\"\n\n\"…yes.\"\n\n\"Please state your name for the record.\"\n\n\"M-my name is Thomas Wright. I'm a, uh, a freelance journalist.\"\n\n\"What were you trying to accomplish in this facility, Mr. Wright?\"\n\n\"There was th-this guy offering good money for some pictures from the inside of this place.\"\n\n\"I don't suppose this man told you his name?\"\n\n\"No, no… He just handed me the application forms and the licence, paid quarter up front, and said to bring the pictures to the same spot in a week's time.\"\n\n\"What did he say to expect here?\"\n\n\"This place is… look, you can't expect people not to talk about it, right? You can't just put up a warehouse of a shipping company nobody's heard of practically overnight and act like it was always here. He said you guys were a, uh, top secret prison for political prisoners.\"\n\n\"That explains your attempts to clumsily pick the first closed door you came across. How did your employer contact you?\"\n\n\"A friend of a friend gave him my number, at least according to him. If you haven't noticed in here times are tough, so I couldn't really afford to be picky about work even before he started throwing cash around.\"\n\n\"Very well. While we verify that account my colleagues here will take you through a tour of our facility: You will take photographs with your \"hidden\" camera when and where they instruct you to. You will submit these pictures for review and remain in our custody until we can be certain of your compliance. You will be released and at the appointed time you will hand over the pictures to your employer. You will not mention this conversation to them, or to anybody outside of this room. You will enjoy your well-earned payment, far away from this facility. Am I understood?\"\n\n\"Yes, sir, I can do that.\"\n\n\"Excellent, Mr. Wright. I look forward to never seeing you again.\""
},
{
"id": "surveillance_1",
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Dark-Skies-Above/snippets/radio.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"kssht. Blue Jay, this is Black Rose, got your resupply, going in on vector 36, what's the status of the LZ? kssht. Black Rose, this is Blue Jay, what took you so long? LZ hot and unsecured, ammo black, bayonets in action, land on your own discretion, over. kssht. Roger that, hold on, Black Rose out. kssht.",
"To whomever is listening, this may be our last broadcast. Wish you luck. Can't stay in the studio any longer, station is being rewired to military frequencies for automatic broadcast. Stay safe, and bless you, people.",
"This is …kssht… we're holding the line so that …kssht… it's been a pleasure to serve, but there's too many of them …kssht… God bless America…",
"Attention. Attention. Do not fight. Do not resist. Become one with the family. Surrender. Recieve care. Be loved. Live. Do not throw your life away. Do not fight. Do not resist. Attention. Attention.",
"Attention. Attention. Do not fight. Do not resist. Become one with the family. Surrender. Receive care. Be loved. Live. Do not throw your life away. Do not fight. Do not resist. Attention. Attention.",
"This is an emergency broadcast from the National Emergency Alert System. This is not a test. Unknown military forces have been spotted nationwide. They are confirmed by law enforcement officials to be hostile. Please proceed to your local community shelter. If you are not in an evacuation zone, officials highly recommend you pack gear for evacuation. Make sure to include clean clothes, a blanket, and enough food and water to last a few days. More information will be released as it becomes available.",
"This is an emergency broadcast from the National Emergency Alert System. This is not a test. Seek immediate shelter. Multiple missile launches have been confirmed to be target designated military targets, including in urban areas. Seek immediate shelter. If a community shelter is not available, alternative shelter locations are basements, beneath stairwells, or central rooms with no windows. Ensure that you have sufficient protection from falling debris. Ensure that you have food and water for at least one week. Repeat. Seek immediate shelter."
]
Expand Down
2 changes: 1 addition & 1 deletion data/mods/MMA/martialarts.json
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
{
"id": "mma_buff_diamond_mind_onpause",
"name": "Quicksilver Motion",
"description": "Taking a moment to concentrate, you surge foward with incredible speed and act in the blink of an eye.\n\n+50 Speed.\nLasts 1 turn.",
"description": "Taking a moment to concentrate, you surge forward with incredible speed and act in the blink of an eye.\n\n+50 Speed.\nLasts 1 turn.",
"skill_requirements": [ { "name": "melee", "level": 5 } ],
"melee_allowed": true,
"buff_duration": 1,
Expand Down
2 changes: 1 addition & 1 deletion data/mods/Magiclysm/items/spellbooks.json
Original file line number Diff line number Diff line change
Expand Up @@ -437,7 +437,7 @@
"type": "BOOK",
"name": { "str": "Forbidden Tome" },
"//": "1 Magus spell, 1 Druid spell, 1 Animist spell",
"description": "A very, very old and heavy tome of various spells lost to the ages, either for good reason, or simply through the passage of time. There are very few copies in existance, usually owned by those of great power, and yet all of them seem to have the last dozen pages or so torn out, in haste.",
"description": "A very, very old and heavy tome of various spells lost to the ages, either for good reason, or simply through the passage of time. There are very few copies in existence, usually owned by those of great power, and yet all of them seem to have the last dozen pages or so torn out, in haste.",
"weight": "2400 g",
"volume": "5000 ml",
"price": 7500,
Expand Down
4 changes: 2 additions & 2 deletions data/mods/innawood/itemgroups/trash_and_debris.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
{
"type": "item_group",
"id": "trash_forest",
"//": "Naturally occuring glass is considered to be from lightning strikes, maybe?",
"//2": "Naturally occuring metal is considered to be sufficiently pure nuggets",
"//": "Naturally occurring glass is considered to be from lightning strikes, maybe?",
"//2": "Naturally occurring metal is considered to be sufficiently pure nuggets",
"items": [
[ "rock", 80000 ],
[ "rock_flaking", 80000 ],
Expand Down
2 changes: 1 addition & 1 deletion doc/JSON_INFO.md
Original file line number Diff line number Diff line change
Expand Up @@ -3153,7 +3153,7 @@ Guns can be defined like this:
"clip_size": 100, // Maximum amount of ammo that can be loaded
"ups_charges": 0, // Additionally to the normal ammo (if any), a gun can require some charges from an UPS. This also works on mods. Attaching a mod with ups_charges will add/increase ups drain on the weapon.
"ammo_to_fire" 1, // Amount of ammo used
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], // Firing modes on this gun, DEFAULT,AUTO, or MELEE followed by the name of the mode displayed in game, and finaly the number of shots of the mod.
"modes": [ [ "DEFAULT", "semi-auto", 1 ], [ "AUTO", "auto", 4 ] ], // Firing modes on this gun, DEFAULT,AUTO, or MELEE followed by the name of the mode displayed in game, and finally the number of shots of the mod.
"reload": 450, // Amount of time to reload, 100 = 1 second = 1 "turn"
"built_in_mods": ["m203"], //An array of mods that will be integrated in the weapon using the IRREMOVABLE tag.
"default_mods": ["m203"] //An array of mods that will be added to a weapon on spawn.
Expand Down
6 changes: 3 additions & 3 deletions doc/MONSTER_SPECIAL_ATTACKS.md
Original file line number Diff line number Diff line change
Expand Up @@ -183,8 +183,8 @@ The common type for JSON-defined attacks. Note, you don't have to declare it in
| `throw_strength` | Integer, if larger than 0 the attack will attempt to throw the target, every 10 strength equals one tile of distance thrown.
| `miss_msg_u` | String, message for missed attack against the player.
| `miss_msg_npc` | String, message for missed attack against an NPC.
| `hit_dmg_u` | String, message for succesful attack against the player.
| `hit_dmg_npc` | String, message for succesful attack against an NPC.
| `hit_dmg_u` | String, message for successful attack against the player.
| `hit_dmg_npc` | String, message for successful attack against an NPC.
| `no_dmg_msg_u` | String, message for a 0-damage attack against the player.
| `no_dmg_msg_npc` | String, message for a 0-damage attack against an NPC.
| `throw_msg_u` | String, message for a flinging attack against the player.
Expand Down Expand Up @@ -253,4 +253,4 @@ A special defense attack, triggered when the monster is attacked. It should cont

- ```ACIDSPLASH``` Splashes acid on the attacker
- ```NONE``` No special attack-back
- ```ZAPBACK``` Shocks attacker on hit
- ```ZAPBACK``` Shocks attacker on hit
2 changes: 1 addition & 1 deletion doc/NPCs.md
Original file line number Diff line number Diff line change
Expand Up @@ -518,7 +518,7 @@ Optional, if not defined, `"NONE"` is used. Otherwise one of `"NONE"`, `"LIE"`,

The `difficulty` is only required if type is not `"NONE"` or `"CONDITION"` and specifies the success chance in percent (it is however modified by various things like mutations). Higher difficulties are easier to pass.

An optional `mod` array takes any of the following modifiers and increases the difficulty by the NPC's opinion of your character or personality trait for that modifier multiplied by the value: `"ANGER"`, `"FEAR"`, `"TRUST"`, `"VALUE"`, `"AGRESSION"`, `"ALTRUISM"`, `"BRAVERY"`, `"COLLECTOR"`. The special `"POS_FEAR"` modifier treats NPC's fear of your character below 0 as though it were 0. The special `"TOTAL"` modifier sums all previous modifiers and then multiplies the result by its value and is used when setting the owed value.
An optional `mod` array takes any of the following modifiers and increases the difficulty by the NPC's opinion of your character or personality trait for that modifier multiplied by the value: `"ANGER"`, `"FEAR"`, `"TRUST"`, `"VALUE"`, `"AGGRESSION"`, `"ALTRUISM"`, `"BRAVERY"`, `"COLLECTOR"`. The special `"POS_FEAR"` modifier treats NPC's fear of your character below 0 as though it were 0. The special `"TOTAL"` modifier sums all previous modifiers and then multiplies the result by its value and is used when setting the owed value.

`"CONDITION"` trials take a mandatory `condition` instead of `difficulty`. The `success` object is chosen if the `condition` is true and the `failure` is chosen otherwise.

Expand Down
2 changes: 1 addition & 1 deletion src/diary_ui.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -320,7 +320,7 @@ void diary::edit_page_ui()
.title( title )
.width( max_note_length )
.text( new_text )
.description( "What happend Today?" )
.description( "What happened today?" )
.title_color( c_white )
.desc_color( c_light_gray )
.string_color( c_yellow )
Expand Down
4 changes: 2 additions & 2 deletions src/mapgen_functions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2155,7 +2155,7 @@ void mapgen_forest( mapgendata &dat )
* biome to forests so that forests don't fade out as they transition to roads).
*
* @param ot The type of terrain to determine the sparseness of.
* @return A discrete scale of the density of natural features occuring in \p ot.
* @return A discrete scale of the density of natural features occurring in \p ot.
*/
const auto get_sparseness_adjacency_factor = [&dat]( const oter_id & ot ) {
const auto biome = dat.region.forest_composition.biomes.find( ot );
Expand Down Expand Up @@ -2816,7 +2816,7 @@ void mapgen_lake_shore( mapgendata &dat )

// I'm pretty unhappy with this block of if statements that follows, but got frustrated/sidetracked
// in finding a more elegant solution. This is functional, but improvements that maintain the result
// are welcome. The basic jist is as follows:
// are welcome. The basic gist is as follows:
//
// Given our current location and the 8 adjacent locations, we classify them all as lake, lake shore,
// river bank, or something else that we don't care about. We then create a polygon with four points,
Expand Down
2 changes: 1 addition & 1 deletion src/ncurses_def.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -245,7 +245,7 @@ void catacurses::init_interface()
mousemask( BUTTON1_CLICKED | BUTTON3_CLICKED | REPORT_MOUSE_POSITION, nullptr );
#endif
// our curses wrapper does not support changing this behavior, ncurses must
// behave exactly like the wrapper, therefor:
// behave exactly like the wrapper, therefore:
noecho(); // Don't echo keypresses
cbreak(); // C-style breaks (e.g. ^C to SIGINT)
keypad( stdscr.get<::WINDOW>(), true ); // Numpad is numbers
Expand Down
2 changes: 1 addition & 1 deletion src/worldfactory.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ void worldfactory::init()

all_worlds.clear();

// The validity of a world is determined by the existance of any
// The validity of a world is determined by the existence of any
// option files or the master save file.
static const auto is_save_dir = []( const std::string & maybe_save_dir ) {
return file_exist( maybe_save_dir + "/" + PATH_INFO::worldoptions() ) ||
Expand Down
2 changes: 1 addition & 1 deletion tools/copy_mac_libs.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ def copy_and_rewrite(file):
return []
otool_ret = subprocess.run(["otool", "-L", file], capture_output=True)
if otool_ret.returncode != 0:
raise Exception("An error occured in calling otool -L:\n {}"
raise Exception("An error occurred in calling otool -L:\n {}"
.format(otool_ret.stderr.decode('utf-8')))
dependencies = []
for line in otool_ret.stdout.decode('utf-8').split('\n')[1:]:
Expand Down
2 changes: 1 addition & 1 deletion tools/gfx_tools/compose.py
Original file line number Diff line number Diff line change
Expand Up @@ -884,7 +884,7 @@ def main() -> Union[int, ComposingException]:
help='Only output the tile_config.json')
arg_parser.add_argument(
'--fail-fast', dest='fail_fast', action='store_true',
help='Stop immediately after an error has occured')
help='Stop immediately after an error has occurred')
arg_parser.add_argument(
'--loglevel', dest='loglevel',
choices=['INFO', 'WARNING', 'ERROR'], # 'DEBUG', 'CRITICAL'
Expand Down