From 9308a7238365b9985bd0c0cc23e44bca95f96bc8 Mon Sep 17 00:00:00 2001 From: detahramet Date: Mon, 9 Oct 2023 15:56:32 -0700 Subject: [PATCH 1/8] Fixed a Mound of Typos! --- .../furniture-terrains.json | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json index 2adca4944ca5b..83e5e1d08e00e 100644 --- a/data/json/furniture_and_terrain/furniture-terrains.json +++ b/data/json/furniture_and_terrain/furniture-terrains.json @@ -1328,7 +1328,7 @@ "looks_like": "f_dirtmound_shallow_seed", "move_cost_mod": 3, "coverage": 40, - "description": "An area of heaped dirt, not easily traversable. There is a fully grown plant, and will need closer examination to harvest..", + "description": "An area of heaped dirt, not easily traversable. There is a fully grown plant, and will need closer examination to harvest.", "required_str": -1, "flags": [ "PLANT", @@ -1510,7 +1510,7 @@ "looks_like": "f_dirtmound_pile_seed", "move_cost_mod": 5, "coverage": 40, - "description": "An area of dirt heaped up to your shoulders, not easily traversable. There is a fully grown plant, and will need closer examination to harvest..", + "description": "An area of dirt heaped up to your shoulders, not easily traversable. There is a fully grown plant, and will need closer examination to harvest.", "required_str": -1, "flags": [ "PLANT", @@ -1679,7 +1679,7 @@ "move_cost_mod": -1, "examine_action": "chainfence", "coverage": 100, - "description": "An area of gravel heaped well above your head, difficult to climb", + "description": "An area of gravel heaped well above your head, difficult to climb over", "required_str": -1, "flags": [ "NOITEM", "EASY_DECONSTRUCT", "MINEABLE", "PERMEABLE", "CLIMBABLE" ], "deconstruct": { "items": [ { "item": "material_gravel", "count": 4000 } ], "furn_set": "f_gravel_mound_mid" }, @@ -1742,7 +1742,7 @@ "move_cost_mod": -1, "examine_action": "chainfence", "coverage": 100, - "description": "An area of pebbles heaped well above your head, difficult to climb.", + "description": "An area of pebbles heaped well above your head, difficult to climb over.", "required_str": -1, "flags": [ "NOITEM", "EASY_DECONSTRUCT", "MINEABLE", "PERMEABLE", "CLIMBABLE" ], "deconstruct": { "items": [ { "item": "pebble", "count": 4000 } ], "furn_set": "f_pebble_mound_mid" }, @@ -1763,7 +1763,7 @@ "color": "brown", "move_cost_mod": 4, "coverage": 40, - "description": "An area of heaped clay, not easily traversable", + "description": "An area of heaped clay, not easily traversable.", "required_str": -1, "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "THIN_OBSTACLE", "PERMEABLE" ], "deconstruct": { "items": [ { "item": "clay_lump", "count": 4000 } ] }, @@ -1805,7 +1805,7 @@ "move_cost_mod": -1, "examine_action": "chainfence", "coverage": 100, - "description": "An area of clay heaped well above your head, difficult to climb.", + "description": "An area of clay heaped well above your head, difficult to climb over.", "required_str": -1, "flags": [ "NOITEM", "EASY_DECONSTRUCT", "MINEABLE", "PERMEABLE", "CLIMBABLE" ], "deconstruct": { "items": [ { "item": "clay_lump", "count": 4000 } ], "furn_set": "f_clay_mound_mid" }, @@ -1826,7 +1826,7 @@ "color": "light_cyan", "move_cost_mod": 4, "coverage": 40, - "description": "An area of heaped glass shards, not safely traversable. Just looking at it feel like you'll get tetanus", + "description": "An area of heaped glass shards, not safely traversable. Just looking at it feel like you'll get tetanus.", "required_str": -1, "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "THIN_OBSTACLE", "PERMEABLE", "ROUGH", "SHARP" ], "deconstruct": { "items": [ { "item": "glass_shard", "count": 4096 } ] }, @@ -1846,7 +1846,7 @@ "color": "light_cyan", "move_cost_mod": 5, "coverage": 60, - "description": "An area of broken heaped up to your shoulders, not safely traversable. Just looking at it feel like you'll get tetanus", + "description": "An area of broken glass shards heaped up to your shoulders, not safely traversable. Just looking at it feel like you'll get tetanus.", "required_str": -1, "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "THIN_OBSTACLE", "PERMEABLE", "ROUGH", "SHARP" ], "deconstruct": { "items": [ { "item": "glass_shard", "count": 4096 } ], "furn_set": "f_glass_mound_short" }, @@ -1868,7 +1868,7 @@ "move_cost_mod": -1, "examine_action": "chainfence", "coverage": 100, - "description": "An area of broken glass heaped well above your head, unsafe to climb. Just looking at it feel like you'll get tetanus", + "description": "An area of broken glass heaped well above your head, unsafe to climb. Just looking at it feel like you'll get tetanus.", "required_str": -1, "flags": [ "NOITEM", "EASY_DECONSTRUCT", "MINEABLE", "PERMEABLE", "CLIMBABLE", "ROUGH", "SHARP" ], "deconstruct": { "items": [ { "item": "glass_shard", "count": 4096 } ], "furn_set": "f_glass_mound_mid" }, @@ -1889,7 +1889,7 @@ "color": "dark_gray", "move_cost_mod": 4, "coverage": 40, - "description": "An area of heaped rocks, not easily traversable", + "description": "An area of heaped rocks, not easily traversable.", "required_str": -1, "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "THIN_OBSTACLE", "PERMEABLE" ], "deconstruct": { "items": [ { "item": "rock", "count": 4000 } ] }, @@ -1931,7 +1931,7 @@ "move_cost_mod": -1, "examine_action": "chainfence", "coverage": 100, - "description": "An area of rocks heaped well above your head, difficult to climb.", + "description": "An area of rocks heaped well above your head, difficult to climb over.", "required_str": -1, "flags": [ "NOITEM", "EASY_DECONSTRUCT", "MINEABLE", "PERMEABLE", "CLIMBABLE" ], "deconstruct": { "items": [ { "item": "rock", "count": 4000 } ], "furn_set": "f_rock_mound_mid" }, @@ -1994,7 +1994,7 @@ "move_cost_mod": -1, "examine_action": "chainfence", "coverage": 100, - "description": "An area of large rocks heaped well above your head, difficult to climb.", + "description": "An area of large rocks heaped well above your head, difficult to climb over.", "required_str": -1, "flags": [ "NOITEM", "EASY_DECONSTRUCT", "MINEABLE", "PERMEABLE", "CLIMBABLE" ], "deconstruct": { "items": [ { "item": "rock_large", "count": 166 } ], "furn_set": "f_rock_large_mound_mid" }, @@ -2120,7 +2120,7 @@ "move_cost_mod": -1, "examine_action": "chainfence", "coverage": 100, - "description": "planks stacked well above your head.", + "description": "Planks stacked well above your head.", "required_str": -1, "flags": [ "TRANSPARENT", "EASY_DECONSTRUCT", "THIN_OBSTACLE", "PERMEABLE", "ORGANIC", "FLAMMABLE_ASH" ], "deconstruct": { "items": [ { "item": "2x4", "count": 242 } ], "furn_set": "f_plank_stack_mid" }, @@ -2492,13 +2492,13 @@ { "type": "furniture", "id": "f_pipe_stack_tall", - "name": "tall stack of pipe", + "name": "tall stack of pipes", "symbol": "#", "color": "light_gray", "move_cost_mod": -1, "examine_action": "chainfence", "coverage": 100, - "description": "Pipe stacked well above your head.", + "description": "Pipes stacked well above your head.", "required_str": -1, "flags": [ "NOITEM", "EASY_DECONSTRUCT", "MINEABLE", "PERMEABLE", "CLIMBABLE" ], "deconstruct": { "items": [ { "item": "pipe", "count": 2702 } ], "furn_set": "f_pipe_stack_mid" }, From 13b347863b631deb733da7ef9e9a4837f6aac711 Mon Sep 17 00:00:00 2001 From: detahramet Date: Mon, 9 Oct 2023 17:24:16 -0700 Subject: [PATCH 2/8] Non-Mound Related typo fixes. --- data/json/achievements.json | 2 +- data/json/effects_on_condition/example_eocs.json | 2 +- data/json/furniture_and_terrain/terrain-floors-indoor.json | 2 +- data/json/items/armor/legs_prosthetics.json | 6 +++--- data/json/items/book/maps.json | 2 +- data/json/items/comestibles/veggy_dishes.json | 2 +- data/json/items/gun/22.json | 2 +- data/json/mutations/mutations.json | 4 ++-- data/json/npcs/Backgrounds/left_for_dead_3.json | 2 +- data/mods/Xedra_Evolved/effects/effects.json | 4 ++-- data/mods/Xedra_Evolved/items/armor/integrated.json | 2 +- .../mutations/paraclesians/salamander_mutations.json | 2 +- data/mods/innawood/npcs/Backgrounds/left_for_dead_3.json | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/data/json/achievements.json b/data/json/achievements.json index a99cf347a732d..a55fde0e9d4fe 100644 --- a/data/json/achievements.json +++ b/data/json/achievements.json @@ -970,7 +970,7 @@ { "id": "achievement_lvl_4_mechanics", "type": "achievement", - "name": "Amatuer Mechanic", + "name": "Amateur Mechanic", "description": "Righty tighty, lefty loosey.", "requirements": [ { diff --git a/data/json/effects_on_condition/example_eocs.json b/data/json/effects_on_condition/example_eocs.json index fa5cce4e8e2cd..2bfef15b6180b 100644 --- a/data/json/effects_on_condition/example_eocs.json +++ b/data/json/effects_on_condition/example_eocs.json @@ -98,7 +98,7 @@ { "math": [ "u_skill_exp('swimming')", "+=", "10" ] }, { "math": [ "u_skill_test", "=", "u_skill_exp('swimming')" ] }, { "u_message": "Swimming skill experience after: " }, - { "u_message": "[Wight and volume test]" }, + { "u_message": "[Weight and volume test]" }, { "run_eocs": [ "EOC_variable_weight_volume_test1" ] }, { "u_run_inv_eocs": "all", "true_eocs": [ "EOC_variable_weight_volume_test2" ] } ] diff --git a/data/json/furniture_and_terrain/terrain-floors-indoor.json b/data/json/furniture_and_terrain/terrain-floors-indoor.json index 668692cd593e7..3a3e52abeeddd 100644 --- a/data/json/furniture_and_terrain/terrain-floors-indoor.json +++ b/data/json/furniture_and_terrain/terrain-floors-indoor.json @@ -430,7 +430,7 @@ "type": "terrain", "id": "t_marble_floor", "name": "marble floor", - "description": "A smooth and flat flooring made of marble tiles. Beatiful and expensive.", + "description": "A smooth and flat flooring made of marble tiles. Beautiful and expensive.", "looks_like": "t_rock_floor", "symbol": ".", "color": "light_gray", diff --git a/data/json/items/armor/legs_prosthetics.json b/data/json/items/armor/legs_prosthetics.json index 7515f53652b4e..648afb60f0fe6 100644 --- a/data/json/items/armor/legs_prosthetics.json +++ b/data/json/items/armor/legs_prosthetics.json @@ -2,8 +2,8 @@ { "id": "right_leg_prosthetic", "type": "ARMOR", - "name": { "str_sp": "prosthetic right leg" }, - "description": "A prosthetic leg, used as a replacement limb for those missing one. Its modern design and sleek ergonomics make it very comfortable and highly suitable for use, and advanced makes it look exactly like the original. This one is for the right leg.", + "name": { "str_sp": "prosthetic right leg", "str_pl": "prosthetic right legs" }, + "description": "A prosthetic leg, used as a replacement limb for those missing one. Its modern design and sleek ergonomics make it very comfortable and highly suitable for use, and advanced designing makes it look exactly like the original. This one is for the right leg.", "weight": "3629 g", "volume": "10 L", "longest_side": "122 cm", @@ -22,7 +22,7 @@ { "id": "left_leg_prosthetic", "type": "ARMOR", - "name": { "str_sp": "prosthetic left leg" }, + "name": { "str_sp": "prosthetic left leg", "str_pl": "prosthetic left legs" }, "description": "A prosthetic leg, used as a replacement limb for those missing one. Its modern design and sleek ergonomics make it very comfortable and highly suitable for use, and advanced designing makes it look exactly like the original. This one is for the left leg.", "weight": "3629 g", "volume": "10 L", diff --git a/data/json/items/book/maps.json b/data/json/items/book/maps.json index d988e7f53dbac..cf67691165b9d 100644 --- a/data/json/items/book/maps.json +++ b/data/json/items/book/maps.json @@ -343,7 +343,7 @@ "copy-from": "abstractmap", "type": "GENERIC", "name": { "str": "get active pamphlet" }, - "description": "A small pamphlet advertising various local buisnesses encouraging you to get fit. Using it will add roads, gyms and pools along with shops where you can buy sporting gear to your map.", + "description": "A small pamphlet advertising various local businesses' encouraging you to get fit. Using it will add roads, gyms and pools along with shops where you can buy sporting gear to your map.", "color": "light_blue", "use_action": { "type": "reveal_map", diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json index f1e4d94cd9f56..696d53c07a82b 100644 --- a/data/json/items/comestibles/veggy_dishes.json +++ b/data/json/items/comestibles/veggy_dishes.json @@ -679,7 +679,7 @@ { "type": "COMESTIBLE", "id": "carrot_glazed", - "name": { "str": "glazed carrot" }, + "name": { "str": "glazed carrots", "str_pl": "glazed carrots" }, "weight": "72 g", "color": "light_red", "spoils_in": "2 days", diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index 814016e53ff46..735ee85b1ba22 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -119,7 +119,7 @@ "copy-from": "pistol_base", "type": "GUN", "name": { "str": ".22 deringer pistol" }, - "description": "A four barrelled, adorably tiny pocket pistol, firing the equally miniscule .22 LR cartridge. Produced in the early 20th century for trappers, its combat effectiveness is questionable to say the least.", + "description": "A four barreled, adorably tiny pocket pistol, firing the equally minuscule .22 LR cartridge. Produced in the early 20th century for trappers, its combat effectiveness is questionable to say the least.", "variant_type": "gun", "variants": [ { diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 5d4ee9039cd66..846cf4518e02b 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -339,7 +339,7 @@ "points": 0, "valid": false, "purifiable": false, - "description": "Wether by a serious accident, birth defect, or other means, you have lost your right leg. You can hobble around, but will likely need a wheelchair or other means of locomotion to get somewhere far.", + "description": "Whether by a serious accident, birth defect, or other means, you have lost your right leg. You can hobble around, but will likely need a wheelchair or other means of locomotion to get somewhere far.", "no_cbm_on_bp": [ "leg_knee_r", "leg_lower_r", "leg_draped_r", "foot_r" ], "restricts_gear": [ "foot_r" ], "prereqs": "HAS_RIGHT_LEG", @@ -353,7 +353,7 @@ "points": 0, "valid": false, "purifiable": false, - "description": "Wether by a serious accident, birth defect, or other means, you have lost your left leg. You can hobble around, but will likely need a wheelchair or other means of locomotion to get somewhere far.", + "description": "Whether by a serious accident, birth defect, or other means, you have lost your left leg. You can hobble around, but will likely need a wheelchair or other means of locomotion to get somewhere far.", "no_cbm_on_bp": [ "leg_knee_l", "leg_lower_l", "leg_draped_l", "foot_l" ], "restricts_gear": [ "foot_l" ], "prereqs": "HAS_LEFT_LEG", diff --git a/data/json/npcs/Backgrounds/left_for_dead_3.json b/data/json/npcs/Backgrounds/left_for_dead_3.json index 2779da096bd42..60230e00bbd6e 100644 --- a/data/json/npcs/Backgrounds/left_for_dead_3.json +++ b/data/json/npcs/Backgrounds/left_for_dead_3.json @@ -13,7 +13,7 @@ { "id": "BGSS_LEFT_FOR_DEAD_3_STORY2", "type": "talk_topic", - "dynamic_line": "Yeah, you're telling me. The rioters… they weren't even like humans, let alone protestors. Nothing like any protest I'd ever been in before. That didn't stop me. I joined them, and I was as bad as a bunch of them. Smashed windows, beat up bystanders, burnt cars. I remember ripping riot gear off a cop and… nevermind. I don't want to remember that.", + "dynamic_line": "Yeah, you're telling me. The rioters… they weren't even like humans, let alone protesters. Nothing like any protest I'd ever been in before. That didn't stop me. I joined them, and I was as bad as a bunch of them. Smashed windows, beat up bystanders, burnt cars. I remember ripping riot gear off a cop and… nevermind. I don't want to remember that.", "responses": [ { "text": "How did you survive?", "topic": "BGSS_LEFT_FOR_DEAD_3_STORY3" }, { "text": "What made you come back?", "topic": "BGSS_LEFT_FOR_DEAD_3_STORY4" }, diff --git a/data/mods/Xedra_Evolved/effects/effects.json b/data/mods/Xedra_Evolved/effects/effects.json index 8514b9d90c26e..9444f3c206e10 100644 --- a/data/mods/Xedra_Evolved/effects/effects.json +++ b/data/mods/Xedra_Evolved/effects/effects.json @@ -259,7 +259,7 @@ "type": "effect_type", "id": "cheval_overdose", "//": "Intensity 1 is a standard dosage of the drug. Further intensities reflect taking pills while the first dose hasn't worn off. It is not wise to do so.", - "name": [ "Energized", "Enflamed", "Arythmic", "Tachycardiac" ], + "name": [ "Energized", "Enflamed", "Arrhythmic", "Tachycardiac" ], "apply_message": [ [ "These magickal trucker pills have kicked in and you feel great!", "good" ], [ @@ -907,7 +907,7 @@ { "type": "effect_type", "id": "effect_salamander_emit_heat", - "name": [ "Burning Furnance" ], + "name": [ "Burning Furnace" ], "desc": [ "You are throwing off a large amount of heat." ], "apply_message": "The air around you heats up.", "remove_message": "The air around you cools down.", diff --git a/data/mods/Xedra_Evolved/items/armor/integrated.json b/data/mods/Xedra_Evolved/items/armor/integrated.json index 025a1c96a51f9..25cf1733def05 100644 --- a/data/mods/Xedra_Evolved/items/armor/integrated.json +++ b/data/mods/Xedra_Evolved/items/armor/integrated.json @@ -266,7 +266,7 @@ "type": "ARMOR", "category": "armor", "name": { "str_sp": "burning coals skin" }, - "description": "Your skin has has magickal flames flaring out of it on occasion. You can operate in warmer climates than normal humans but begin to take damage from getting wet.", + "description": "Your skin has magickal flames flaring out of it on occasion. You can operate in warmer climates than normal humans but begin to take damage from getting wet.", "weight": "1 kg", "volume": "900 ml", "price": 0, diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json index fe4cec3fcb092..7b8188560581e 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json @@ -18,7 +18,7 @@ "points": 2, "visibility": 4, "ugliness": 3, - "description": "Your skin has has magickal flames flaring out of it on occasion. You can operate in warmer climates than normal humans but begin to take damage from getting wet.", + "description": "Your skin has magickal flames flaring out of it on occasion. You can operate in warmer climates than normal humans but begin to take damage from getting wet.", "types": [ "SKIN" ], "category": [ "SALAMANDER" ], "prereqs": [ "SALAMANDER_SKIN_1" ], diff --git a/data/mods/innawood/npcs/Backgrounds/left_for_dead_3.json b/data/mods/innawood/npcs/Backgrounds/left_for_dead_3.json index 026358dae2f1c..c67e1fab840f9 100644 --- a/data/mods/innawood/npcs/Backgrounds/left_for_dead_3.json +++ b/data/mods/innawood/npcs/Backgrounds/left_for_dead_3.json @@ -13,7 +13,7 @@ { "id": "BGSS_LEFT_FOR_DEAD_3_STORY2", "type": "talk_topic", - "dynamic_line": "Yeah, you're telling me. The rioters… they weren't even like humans, let alone protestors. Nothing like any protest I'd ever been in before. That didn't stop me. I joined them, and I was as bad as a bunch of them. Smashed stuff, beat up bystanders, set stuff on fire. I remember ripping all the gear off this big bruiser and… nevermind. I don't want to remember that.", + "dynamic_line": "Yeah, you're telling me. The rioters… they weren't even like humans, let alone protesters. Nothing like any protest I'd ever been in before. That didn't stop me. I joined them, and I was as bad as a bunch of them. Smashed stuff, beat up bystanders, set stuff on fire. I remember ripping all the gear off this big bruiser and… nevermind. I don't want to remember that.", "responses": [ { "text": "How did you survive?", "topic": "BGSS_LEFT_FOR_DEAD_3_STORY3" }, { "text": "What made you come back?", "topic": "BGSS_LEFT_FOR_DEAD_3_STORY4" }, From 4079469345c7f827c4ce7bb976dde9af18485139 Mon Sep 17 00:00:00 2001 From: detahramet Date: Mon, 9 Oct 2023 19:06:01 -0700 Subject: [PATCH 3/8] Shortened No Leg Description Fixes error with description length --- data/json/mutations/mutations.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 846cf4518e02b..4002c69a7267b 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -339,7 +339,7 @@ "points": 0, "valid": false, "purifiable": false, - "description": "Whether by a serious accident, birth defect, or other means, you have lost your right leg. You can hobble around, but will likely need a wheelchair or other means of locomotion to get somewhere far.", + "description": "Whether by an accident, birth defect, or other means, you have lost your right leg. You can hobble around, but will likely need a wheelchair or other means of locomotion to get somewhere far.", "no_cbm_on_bp": [ "leg_knee_r", "leg_lower_r", "leg_draped_r", "foot_r" ], "restricts_gear": [ "foot_r" ], "prereqs": "HAS_RIGHT_LEG", @@ -353,7 +353,7 @@ "points": 0, "valid": false, "purifiable": false, - "description": "Whether by a serious accident, birth defect, or other means, you have lost your left leg. You can hobble around, but will likely need a wheelchair or other means of locomotion to get somewhere far.", + "description": "Whether by an accident, birth defect, or other means, you have lost your left leg. You can hobble around, but will likely need a wheelchair or other means of locomotion to get somewhere far.", "no_cbm_on_bp": [ "leg_knee_l", "leg_lower_l", "leg_draped_l", "foot_l" ], "restricts_gear": [ "foot_l" ], "prereqs": "HAS_LEFT_LEG", From 9d754f3281ed46f06bb03fb8b111b95eb0bfc21c Mon Sep 17 00:00:00 2001 From: detahramet Date: Mon, 9 Oct 2023 19:25:22 -0700 Subject: [PATCH 4/8] Update legs_prosthetics.json --- data/json/mutations/mutations.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/mutations/mutations.json b/data/json/mutations/mutations.json index 4002c69a7267b..460ea6150ee0e 100644 --- a/data/json/mutations/mutations.json +++ b/data/json/mutations/mutations.json @@ -339,7 +339,7 @@ "points": 0, "valid": false, "purifiable": false, - "description": "Whether by an accident, birth defect, or other means, you have lost your right leg. You can hobble around, but will likely need a wheelchair or other means of locomotion to get somewhere far.", + "description": "Whether by a serious accident, birth defect, or other means, you have lost your right leg. You can hobble around, but will likely need a wheelchair or other means of locomotion to get somewhere far.", "no_cbm_on_bp": [ "leg_knee_r", "leg_lower_r", "leg_draped_r", "foot_r" ], "restricts_gear": [ "foot_r" ], "prereqs": "HAS_RIGHT_LEG", @@ -353,7 +353,7 @@ "points": 0, "valid": false, "purifiable": false, - "description": "Whether by an accident, birth defect, or other means, you have lost your left leg. You can hobble around, but will likely need a wheelchair or other means of locomotion to get somewhere far.", + "description": "Whether by a serious accident, birth defect, or other means, you have lost your left leg. You can hobble around, but will likely need a wheelchair or other means of locomotion to get somewhere far.", "no_cbm_on_bp": [ "leg_knee_l", "leg_lower_l", "leg_draped_l", "foot_l" ], "restricts_gear": [ "foot_l" ], "prereqs": "HAS_LEFT_LEG", From 26340832499150a44e4e71e04cbca7be99899282 Mon Sep 17 00:00:00 2001 From: detahramet Date: Mon, 9 Oct 2023 19:29:23 -0700 Subject: [PATCH 5/8] Update legs_prosthetics.json --- data/json/items/armor/legs_prosthetics.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/data/json/items/armor/legs_prosthetics.json b/data/json/items/armor/legs_prosthetics.json index 648afb60f0fe6..2edcacfa87b8a 100644 --- a/data/json/items/armor/legs_prosthetics.json +++ b/data/json/items/armor/legs_prosthetics.json @@ -2,7 +2,7 @@ { "id": "right_leg_prosthetic", "type": "ARMOR", - "name": { "str_sp": "prosthetic right leg", "str_pl": "prosthetic right legs" }, + "name": { "str": "prosthetic right leg", "str_pl": "prosthetic right legs" }, "description": "A prosthetic leg, used as a replacement limb for those missing one. Its modern design and sleek ergonomics make it very comfortable and highly suitable for use, and advanced designing makes it look exactly like the original. This one is for the right leg.", "weight": "3629 g", "volume": "10 L", @@ -22,7 +22,7 @@ { "id": "left_leg_prosthetic", "type": "ARMOR", - "name": { "str_sp": "prosthetic left leg", "str_pl": "prosthetic left legs" }, + "name": { "str": "prosthetic left leg", "str_pl": "prosthetic left legs" }, "description": "A prosthetic leg, used as a replacement limb for those missing one. Its modern design and sleek ergonomics make it very comfortable and highly suitable for use, and advanced designing makes it look exactly like the original. This one is for the left leg.", "weight": "3629 g", "volume": "10 L", From 57eaa104c0f5de2056b44950c1c017fd8b764f45 Mon Sep 17 00:00:00 2001 From: Maleclypse <54345792+Maleclypse@users.noreply.github.com> Date: Tue, 10 Oct 2023 22:30:46 -0500 Subject: [PATCH 6/8] Apply suggestions from code review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jianxiang Wang (王健翔) --- data/json/furniture_and_terrain/furniture-terrains.json | 2 +- data/json/items/armor/legs_prosthetics.json | 6 +++--- data/json/items/book/maps.json | 2 +- data/json/items/comestibles/veggy_dishes.json | 2 +- data/json/items/gun/22.json | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/json/furniture_and_terrain/furniture-terrains.json b/data/json/furniture_and_terrain/furniture-terrains.json index 83e5e1d08e00e..6d1550008621c 100644 --- a/data/json/furniture_and_terrain/furniture-terrains.json +++ b/data/json/furniture_and_terrain/furniture-terrains.json @@ -1679,7 +1679,7 @@ "move_cost_mod": -1, "examine_action": "chainfence", "coverage": 100, - "description": "An area of gravel heaped well above your head, difficult to climb over", + "description": "An area of gravel heaped well above your head, difficult to climb over.", "required_str": -1, "flags": [ "NOITEM", "EASY_DECONSTRUCT", "MINEABLE", "PERMEABLE", "CLIMBABLE" ], "deconstruct": { "items": [ { "item": "material_gravel", "count": 4000 } ], "furn_set": "f_gravel_mound_mid" }, diff --git a/data/json/items/armor/legs_prosthetics.json b/data/json/items/armor/legs_prosthetics.json index 2edcacfa87b8a..089fd6f1abaae 100644 --- a/data/json/items/armor/legs_prosthetics.json +++ b/data/json/items/armor/legs_prosthetics.json @@ -2,8 +2,8 @@ { "id": "right_leg_prosthetic", "type": "ARMOR", - "name": { "str": "prosthetic right leg", "str_pl": "prosthetic right legs" }, - "description": "A prosthetic leg, used as a replacement limb for those missing one. Its modern design and sleek ergonomics make it very comfortable and highly suitable for use, and advanced designing makes it look exactly like the original. This one is for the right leg.", + "name": { "str": "prosthetic right leg" }, + "description": "A prosthetic leg, used as a replacement limb for those missing one. Its modern design and sleek ergonomics make it very comfortable and highly suitable for use, and advanced designing makes it look exactly like the original. This one is for the right leg.", "weight": "3629 g", "volume": "10 L", "longest_side": "122 cm", @@ -22,7 +22,7 @@ { "id": "left_leg_prosthetic", "type": "ARMOR", - "name": { "str": "prosthetic left leg", "str_pl": "prosthetic left legs" }, + "name": { "str": "prosthetic left leg" }, "description": "A prosthetic leg, used as a replacement limb for those missing one. Its modern design and sleek ergonomics make it very comfortable and highly suitable for use, and advanced designing makes it look exactly like the original. This one is for the left leg.", "weight": "3629 g", "volume": "10 L", diff --git a/data/json/items/book/maps.json b/data/json/items/book/maps.json index cf67691165b9d..572a393b3fcc5 100644 --- a/data/json/items/book/maps.json +++ b/data/json/items/book/maps.json @@ -343,7 +343,7 @@ "copy-from": "abstractmap", "type": "GENERIC", "name": { "str": "get active pamphlet" }, - "description": "A small pamphlet advertising various local businesses' encouraging you to get fit. Using it will add roads, gyms and pools along with shops where you can buy sporting gear to your map.", + "description": "A small pamphlet advertising various local businesses encouraging you to get fit. Using it will add roads, gyms and pools along with shops where you can buy sporting gear to your map.", "color": "light_blue", "use_action": { "type": "reveal_map", diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json index 696d53c07a82b..ce1ec4955f20d 100644 --- a/data/json/items/comestibles/veggy_dishes.json +++ b/data/json/items/comestibles/veggy_dishes.json @@ -679,7 +679,7 @@ { "type": "COMESTIBLE", "id": "carrot_glazed", - "name": { "str": "glazed carrots", "str_pl": "glazed carrots" }, + "name": { "str_sp": "glazed carrots" }, "weight": "72 g", "color": "light_red", "spoils_in": "2 days", diff --git a/data/json/items/gun/22.json b/data/json/items/gun/22.json index 735ee85b1ba22..e1efba1cf083d 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -119,7 +119,7 @@ "copy-from": "pistol_base", "type": "GUN", "name": { "str": ".22 deringer pistol" }, - "description": "A four barreled, adorably tiny pocket pistol, firing the equally minuscule .22 LR cartridge. Produced in the early 20th century for trappers, its combat effectiveness is questionable to say the least.", + "description": "A four barreled, adorably tiny pocket pistol, firing the equally minuscule .22 LR cartridge. Produced in the early 20th century for trappers, its combat effectiveness is questionable to say the least.", "variant_type": "gun", "variants": [ { From 4652d00db1bb1e047fe8675c4731f3d224ff6031 Mon Sep 17 00:00:00 2001 From: detahramet Date: Thu, 12 Oct 2023 11:01:47 -0700 Subject: [PATCH 7/8] Update data/mods/Xedra_Evolved/items/armor/integrated.json MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Jianxiang Wang (王健翔) --- data/mods/Xedra_Evolved/items/armor/integrated.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/items/armor/integrated.json b/data/mods/Xedra_Evolved/items/armor/integrated.json index 25cf1733def05..f615772e95623 100644 --- a/data/mods/Xedra_Evolved/items/armor/integrated.json +++ b/data/mods/Xedra_Evolved/items/armor/integrated.json @@ -266,7 +266,7 @@ "type": "ARMOR", "category": "armor", "name": { "str_sp": "burning coals skin" }, - "description": "Your skin has magickal flames flaring out of it on occasion. You can operate in warmer climates than normal humans but begin to take damage from getting wet.", + "description": "Your skin has magical flames flaring out of it on occasion. You can operate in warmer climates than normal humans but begin to take damage from getting wet.", "weight": "1 kg", "volume": "900 ml", "price": 0, From 11ceadba754f25e1370e1d5b0de5445ffbe7e562 Mon Sep 17 00:00:00 2001 From: detahramet Date: Thu, 12 Oct 2023 13:24:17 -0700 Subject: [PATCH 8/8] Update salamander_mutations.json --- .../mutations/paraclesians/salamander_mutations.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json index 7b8188560581e..c8715f684b5e8 100644 --- a/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json +++ b/data/mods/Xedra_Evolved/mutations/paraclesians/salamander_mutations.json @@ -18,7 +18,7 @@ "points": 2, "visibility": 4, "ugliness": 3, - "description": "Your skin has magickal flames flaring out of it on occasion. You can operate in warmer climates than normal humans but begin to take damage from getting wet.", + "description": "Your skin has magickal flames flaring out of it on occasion. You can operate in warmer climates than normal humans but begin to take damage from getting wet.", "types": [ "SKIN" ], "category": [ "SALAMANDER" ], "prereqs": [ "SALAMANDER_SKIN_1" ],