From e841debdfbe9958d302bd2acfee9a090af904a64 Mon Sep 17 00:00:00 2001 From: Binrui Dong Date: Fri, 2 Dec 2022 22:39:35 +0800 Subject: [PATCH 1/3] Misc typo fixes --- data/json/items/armor/cloaks.json | 2 +- data/json/items/chemicals_and_resources.json | 2 +- data/json/items/comestibles/junkfood.json | 2 +- data/json/items/resources/chemicals.json | 2 +- data/json/items/tool_armor.json | 10 +++++----- data/json/monsters/mutant_mammal.json | 2 +- data/json/monsters/zed_soldiers.json | 2 +- data/json/ui/spacebar/spacebar_envirament_block.json | 2 +- data/mods/MMA/mutations.json | 2 +- data/mods/TropiCataclysm/monsters/tropical_fungus.json | 2 +- .../furniture_and_terrain/furniture-flora.json | 4 ++-- data/mods/innawood/npcs/Backgrounds/high_school_1.json | 2 +- data/mods/innawood/npcs/missiondef.json | 2 +- 13 files changed, 18 insertions(+), 18 deletions(-) diff --git a/data/json/items/armor/cloaks.json b/data/json/items/armor/cloaks.json index abf241b327db5..5fd2fe9222e69 100644 --- a/data/json/items/armor/cloaks.json +++ b/data/json/items/armor/cloaks.json @@ -137,7 +137,7 @@ { "id": "leather_pride_flag", "name": { "str": "leather flag" }, - "description": "A large black and blue leather flag. A horizontally striped black and blue flag with a white band in the midle and red heart in a corner. The black represents leather; the blue represents devotion, loyalty, and community; the white represents purity and innocence; and the red heart represents love for the community.", + "description": "A large black and blue leather flag. A horizontally striped black and blue flag with a white band in the middle and red heart in a corner. The black represents leather; the blue represents devotion, loyalty, and community; the white represents purity and innocence; and the red heart represents love for the community.", "weight": 1 }, { diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index f0fdd7e95e950..350cb0f7b4f33 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -950,7 +950,7 @@ "name": { "str_sp": "acetic acid" }, "symbol": "~", "color": "white", - "description": "Concentrated acetic acid, typically used as a chemical reagent and antifungal agent. Despite its horrid smell, it was used to prepare several types of perfumes, but would making perfume not be too fancy for postapocalyptic New England?", + "description": "Concentrated acetic acid, typically used as a chemical reagent and antifungal agent. Despite its horrid smell, it was used to prepare several types of perfumes, but would making perfume not be too fancy for post-apocalyptic New England?", "volume": "250 ml", "weight": "300 g", "bashing": 1, diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index ce75390eb9fd3..a6ad3cafc108b 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -997,7 +997,7 @@ "quench": -12, "healthy": -1, "calories": 434, - "description": "A small, microwaveable steak & cheese burrito, like those found at gas stations.", + "description": "A small, microwavable steak & cheese burrito, like those found at gas stations.", "price": 200, "price_postapoc": 200, "material": [ "flesh", "junk", "milk" ], diff --git a/data/json/items/resources/chemicals.json b/data/json/items/resources/chemicals.json index 3d49d44e56836..b710284cebf9c 100644 --- a/data/json/items/resources/chemicals.json +++ b/data/json/items/resources/chemicals.json @@ -42,7 +42,7 @@ "name": { "str_sp": "calcium chloride" }, "symbol": "=", "color": "white", - "description": "A white odorless strongly hygroscopic powder with an extremely salty taste. Often used as a de-icing agent or as dessicant.", + "description": "A white odorless strongly hygroscopic powder with an extremely salty taste. Often used as a de-icing agent or as desiccant.", "container": "bag_canvas", "material": [ "powder_nonflam" ], "volume": "250 ml", diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index d8c1624f03e5c..f76a18c45ff5f 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -49,7 +49,7 @@ "id": "tourniquet_upper", "type": "ARMOR", "name": { "str": "tourniquet (arm)", "str_pl": "tourniquets (arm)" }, - "description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleedings, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.", + "description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleeding, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.", "weight": "300 g", "volume": "300 ml", "price": 20000, @@ -69,7 +69,7 @@ "id": "tourniquet_upper_XL", "type": "ARMOR", "name": { "str": "tourniquet (arm XL)", "str_pl": "tourniquets (arm XL)" }, - "description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleedings, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.", + "description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleeding, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.", "copy-from": "tourniquet_upper", "looks_like": "tourniquet_upper", "sided": true, @@ -80,7 +80,7 @@ "id": "tourniquet_upper_XS", "type": "ARMOR", "name": { "str": "tourniquet (arm XS)", "str_pl": "tourniquets (arm XS)" }, - "description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleedings, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.", + "description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleeding, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.", "copy-from": "tourniquet_upper", "looks_like": "tourniquet_upper", "covers": [ "arm_l", "arm_r" ], @@ -92,7 +92,7 @@ "id": "tourniquet_lower", "type": "ARMOR", "name": { "str": "tourniquet (leg)", "str_pl": "tourniquets (leg)" }, - "description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleedings, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.", + "description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleeding, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.", "copy-from": "tourniquet_upper", "looks_like": "tourniquet_upper", "sided": true, @@ -105,7 +105,7 @@ "id": "tourniquet_lower_XL", "type": "ARMOR", "name": { "str": "tourniquet (leg)", "str_pl": "tourniquets (leg)" }, - "description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleedings, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.", + "description": "First aid device used to apply pressure to a limb or extremity in order to limit blood flow. Should be employed only to manage heavy bleeding, because prolonged use will harm the limb. It can be adjusted in size to fit different limbs.", "copy-from": "tourniquet_upper", "looks_like": "tourniquet_upper", "sided": true, diff --git a/data/json/monsters/mutant_mammal.json b/data/json/monsters/mutant_mammal.json index 73d115c6fb10c..622038c89abb4 100644 --- a/data/json/monsters/mutant_mammal.json +++ b/data/json/monsters/mutant_mammal.json @@ -497,7 +497,7 @@ "type": "MONSTER", "copy-from": "mon_dog_auscattle_pup", "name": { "str": "translucent puppy", "str_pl": "translucent puppies" }, - "description": "This little rascal doesn't cast a shadow, and is near seethrough in the right light. Its condition doesn't appear to cause it any harm, but it does have a hard time chasing its own tail.", + "description": "This little rascal doesn't cast a shadow, and is near see-through in the right light. Its condition doesn't appear to cause it any harm, but it does have a hard time chasing its own tail.", "upgrades": { "age_grow": 42, "into": "mon_dog_incorporeal" } }, { diff --git a/data/json/monsters/zed_soldiers.json b/data/json/monsters/zed_soldiers.json index 7ae571c6ba667..4a21fd9d8ffb9 100644 --- a/data/json/monsters/zed_soldiers.json +++ b/data/json/monsters/zed_soldiers.json @@ -341,7 +341,7 @@ "id": "mon_zombie_sailor", "type": "MONSTER", "name": { "str": "zombie mariner" }, - "description": "Still dressed in the ragged remains of deep blue naval fatigues, it’s clear that this walking corpse was once a sailor of some description. The US Navy’s insignia is embroidered on the shredded sleave and shoulder of its bloodied jacket, the dead crewman’s battered cap is beaten into the remains of its fractured skull and its inky black eyes are scanning the area around it as dark ooze drips from its limply hanging maw.", + "description": "Still dressed in the ragged remains of deep blue naval fatigues, it’s clear that this walking corpse was once a sailor of some description. The US Navy’s insignia is embroidered on the shredded sleeve and shoulder of its bloodied jacket, the dead crewman’s battered cap is beaten into the remains of its fractured skull and its inky black eyes are scanning the area around it as dark ooze drips from its limply hanging maw.", "copy-from": "mon_zombie_milbase_personnel", "looks_like": "mon_zombie_soldier", "armor_bash": 2, diff --git a/data/json/ui/spacebar/spacebar_envirament_block.json b/data/json/ui/spacebar/spacebar_envirament_block.json index 8545f0b1845b6..f79705903e9ee 100644 --- a/data/json/ui/spacebar/spacebar_envirament_block.json +++ b/data/json/ui/spacebar/spacebar_envirament_block.json @@ -12,7 +12,7 @@ "id": "enviroment_conditions_block_2", "type": "widget", "style": "layout", - "label": "enviroment block", + "label": "environment block", "arrange": "minimum_columns", "width": 56, "widgets": [ "time_layout", "wether_layout" ] diff --git a/data/mods/MMA/mutations.json b/data/mods/MMA/mutations.json index 145fe5edcb58f..fe2dfa227abed 100644 --- a/data/mods/MMA/mutations.json +++ b/data/mods/MMA/mutations.json @@ -69,7 +69,7 @@ "id": "MMA_MARTIAL_ARTS_POKKEN", "name": { "str": "Pokken Master" }, "points": 2, - "description": "You are well versed in the monsterous Pocket Fist martial art. Train well, because it is your destiny to be a master.", + "description": "You are well versed in the monstrous Pocket Fist martial art. Train well, because it is your destiny to be a master.", "starting_trait": true, "initial_ma_styles": [ "style_mma_pokken" ], "valid": false diff --git a/data/mods/TropiCataclysm/monsters/tropical_fungus.json b/data/mods/TropiCataclysm/monsters/tropical_fungus.json index 330105f8ea9e2..e3b0946d3e593 100644 --- a/data/mods/TropiCataclysm/monsters/tropical_fungus.json +++ b/data/mods/TropiCataclysm/monsters/tropical_fungus.json @@ -291,7 +291,7 @@ "id": "mon_fungaloid_breather", "type": "MONSTER", "name": { "str": "fungal dispersor" }, - "description": "A strange fungal creature similar to a moving ballon. It releases a cloud of spores in all directions.", + "description": "A strange fungal creature similar to a moving balloon. It releases a cloud of spores in all directions.", "default_faction": "fungus", "species": [ "FUNGUS" ], "volume": "62500 ml", diff --git a/data/mods/innawood/furniture_and_terrain/furniture-flora.json b/data/mods/innawood/furniture_and_terrain/furniture-flora.json index 752d09e9f9170..313451491c67d 100644 --- a/data/mods/innawood/furniture_and_terrain/furniture-flora.json +++ b/data/mods/innawood/furniture_and_terrain/furniture-flora.json @@ -17,8 +17,8 @@ { "type": "furniture", "id": "f_wildsbeet", - "name": "wild sugarbeet", - "description": "Sugarbeet plant, growing wild without human touch.", + "name": "wild sugar beet", + "description": "Sugar beet plant, growing wild without human touch.", "symbol": "f", "color": "magenta", "looks_like": "f_dandelion", diff --git a/data/mods/innawood/npcs/Backgrounds/high_school_1.json b/data/mods/innawood/npcs/Backgrounds/high_school_1.json index 68b87ecba9fb6..68e2a60a778e6 100644 --- a/data/mods/innawood/npcs/Backgrounds/high_school_1.json +++ b/data/mods/innawood/npcs/Backgrounds/high_school_1.json @@ -12,7 +12,7 @@ { "id": "BGSS_HIGH_SCHOOL_1_STORY2", "type": "talk_topic", - "dynamic_line": "I guess it got worse, because the teachers decided to tie us up and drink. For hours. And then a bunch of sweaty men with spears came to take us to the camps. They tooks us away in batches and I was in on the of the last batches and they didn't come back for us. The men with spears weren't much older than me… they didn't look like they knew what was going on. I lived nearby. I snuck off.", + "dynamic_line": "I guess it got worse, because the teachers decided to tie us up and drink. For hours. And then a bunch of sweaty men with spears came to take us to the camps. They took us away in batches and I was in on the of the last batches and they didn't come back for us. The men with spears weren't much older than me… they didn't look like they knew what was going on. I lived nearby. I snuck off.", "responses": [ { "text": "Did you get home?", "topic": "BGSS_HIGH_SCHOOL_1_STORY3" }, { "text": "", "topic": "TALK_FRIEND" }, diff --git a/data/mods/innawood/npcs/missiondef.json b/data/mods/innawood/npcs/missiondef.json index 46daa98697819..5b9f1b43a143b 100644 --- a/data/mods/innawood/npcs/missiondef.json +++ b/data/mods/innawood/npcs/missiondef.json @@ -190,7 +190,7 @@ "offer": "There's some important notes on my special stick that I need.", "accepted": "Thanks! Just get the stick and bring it to me.", "rejected": "Seriously? It's an easy job…", - "advice": "Don't worry, you'll know the stick when you see it, it is unmistakeable.", + "advice": "Don't worry, you'll know the stick when you see it, it is unmistakable.", "inquire": "So, do you have my stick yet?", "success": "Excellent, thank you!", "success_lie": "What?! You liar!", From ba2f479fdd03d6f37d8859ebceffdf09b38968f7 Mon Sep 17 00:00:00 2001 From: Binrui Dong Date: Sat, 3 Dec 2022 09:58:58 +0800 Subject: [PATCH 2/3] Rename spacebar_environment_block.json --- ...ebar_envirament_block.json => spacebar_environment_block.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename data/json/ui/spacebar/{spacebar_envirament_block.json => spacebar_environment_block.json} (100%) diff --git a/data/json/ui/spacebar/spacebar_envirament_block.json b/data/json/ui/spacebar/spacebar_environment_block.json similarity index 100% rename from data/json/ui/spacebar/spacebar_envirament_block.json rename to data/json/ui/spacebar/spacebar_environment_block.json From d1411164d76f08463b8e44c31ca8bf8cd48acc62 Mon Sep 17 00:00:00 2001 From: Binrui Dong Date: Sat, 3 Dec 2022 10:04:47 +0800 Subject: [PATCH 3/3] Fix typo in "weather" widget label --- data/json/ui/spacebar/spacebar_environment_block.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/ui/spacebar/spacebar_environment_block.json b/data/json/ui/spacebar/spacebar_environment_block.json index f79705903e9ee..7182665bad816 100644 --- a/data/json/ui/spacebar/spacebar_environment_block.json +++ b/data/json/ui/spacebar/spacebar_environment_block.json @@ -29,7 +29,7 @@ { "id": "wether_layout", "type": "widget", - "label": "wether", + "label": "weather", "style": "layout", "arrange": "rows", "width": 28,