From 25cc3f554c91625787e5e4d01925bbe265688db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jianxiang=20Wang=20=28=E7=8E=8B=E5=81=A5=E7=BF=94=29?= Date: Fri, 3 Sep 2021 00:38:00 +0800 Subject: [PATCH] Fix plurals and other text issues (#51255) --- data/json/items/book/electronics.json | 2 +- data/json/items/corpses/dead_yrax.json | 2 +- data/json/items/gunmod/conversions.json | 2 +- data/json/monsters/insect_spider.json | 6 +++--- data/json/snippets/lab.json | 2 +- data/json/vehicleparts/engineering.json | 2 +- data/mods/Aftershock/items/armor.json | 2 +- data/mods/Aftershock/items/inactiverobot.json | 2 +- data/mods/Aftershock/items/tools.json | 2 +- data/mods/Aftershock/mobs/robots.json | 2 +- src/crafting.cpp | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) diff --git a/data/json/items/book/electronics.json b/data/json/items/book/electronics.json index f796691e43977..2d85d2e24f9d7 100644 --- a/data/json/items/book/electronics.json +++ b/data/json/items/book/electronics.json @@ -213,7 +213,7 @@ { "id": "robofac_yrax_deactivation_manual", "type": "BOOK", - "name": { "str": "trifacet handling procedures" }, + "name": { "str_sp": "trifacet handling procedures" }, "description": "A heavy and disparate binder detailing the deactivation, storage and transport procedures for a so called \"Trifacet\" UVG. The pages and schematics within have been compiled from the internal reports of a vast array of governmental agencies, many of which you had never heard of before.", "weight": "1409 g", "volume": "500 ml", diff --git a/data/json/items/corpses/dead_yrax.json b/data/json/items/corpses/dead_yrax.json index 29b2075f25013..b897bf6f8c6d1 100644 --- a/data/json/items/corpses/dead_yrax.json +++ b/data/json/items/corpses/dead_yrax.json @@ -4,7 +4,7 @@ "id": "broken_yrax_trifacet", "symbol": ",", "color": "light_gray", - "name": { "str": "trifacet remains" }, + "name": { "str_sp": "trifacet remains" }, "category": "other", "description": "A split open facet reveals an interior full of closely fit geometric primitives among chipped strips of milk-white quartz. Lending you no clues as to how this machine ever functioned.", "price": 1000, diff --git a/data/json/items/gunmod/conversions.json b/data/json/items/gunmod/conversions.json index ade5599d3fb2b..d15720b74a69b 100644 --- a/data/json/items/gunmod/conversions.json +++ b/data/json/items/gunmod/conversions.json @@ -24,7 +24,7 @@ { "id": "staff_sling_grenade_cradle", "type": "GUNMOD", - "name": { "str": "grenade cradle for staff sling" }, + "name": { "str": "grenade cradle for staff sling", "str_pl": "grenade cradles for staff slings" }, "description": "A larger crade with a longer sling for fitting to a staff sling to enable it to throw grenades.", "weight": "96 g", "volume": "250 ml", diff --git a/data/json/monsters/insect_spider.json b/data/json/monsters/insect_spider.json index 8c57feb2b5cbc..ad17e45b1333d 100644 --- a/data/json/monsters/insect_spider.json +++ b/data/json/monsters/insect_spider.json @@ -2080,7 +2080,7 @@ { "id": "mon_mantis_small", "type": "MONSTER", - "name": { "str": "huge praying mantis" }, + "name": { "str": "huge praying mantis", "str_pl": "huge praying mantises" }, "description": "A green mutant insect with sharp grappling spikes on its front legs. It's a little smaller than an adult person.", "copy-from": "mon_mantis_giant", "proportional": { "hp": 0.5, "speed": 1.1, "morale": 0.67, "melee_dice_sides": 0.67 }, @@ -2096,7 +2096,7 @@ { "id": "mon_mantis_giant", "type": "MONSTER", - "name": { "str": "giant praying mantis" }, + "name": { "str": "giant praying mantis", "str_pl": "giant praying mantises" }, "description": "An enormous green creature grown about the size of a bear. It dances weirdly and looks ready to chop your head off at any moment.", "default_faction": "mantis", "bodytype": "insect", @@ -2136,7 +2136,7 @@ { "id": "mon_mantis_mega", "type": "MONSTER", - "name": { "str": "great mantis" }, + "name": { "str": "great mantis", "str_pl": "great mantises" }, "description": "This ferocious creature is lurking through the land. It's probably capable of killing a moose with its powerful arms.", "copy-from": "mon_mantis_giant", "proportional": { "hp": 20, "speed": 0.25, "vision_day": 2 }, diff --git a/data/json/snippets/lab.json b/data/json/snippets/lab.json index 97b1a569c5f7a..41fd663cbde87 100644 --- a/data/json/snippets/lab.json +++ b/data/json/snippets/lab.json @@ -17,7 +17,7 @@ }, { "id": "mutant_kid_boss_4", - "text": "A faded crayon drawing on the back of a bureocratic form. It shows a small child sitting on a chair surrounded by many adults. Most of them are only an indistinct blob of white and black, but a single figure stands out by being lovingly colored - and labelled with a large \"T\".", + "text": "A faded crayon drawing on the back of a bureocratic form. It shows a small child sitting on a chair surrounded by many adults. Most of them are only indistinct blobs of white and black, but a single figure stands out by being lovingly colored - and labelled with a large \"T\".", "//": "TODO: when descriptions allow nesting snippets replace with a random monogramm." }, { diff --git a/data/json/vehicleparts/engineering.json b/data/json/vehicleparts/engineering.json index 7a700e61683a3..9b0ccce83a3ba 100644 --- a/data/json/vehicleparts/engineering.json +++ b/data/json/vehicleparts/engineering.json @@ -3,7 +3,7 @@ "id": "crane_pseudo_item", "type": "TOOL", "copy-from": "butchery_rack_pseudo", - "name": { "str": "suspending for butchering" } + "name": { "str_sp": "suspending for butchering" } }, { "id": "crane_medium", diff --git a/data/mods/Aftershock/items/armor.json b/data/mods/Aftershock/items/armor.json index c04754148cf53..e0b9a02d9b06d 100644 --- a/data/mods/Aftershock/items/armor.json +++ b/data/mods/Aftershock/items/armor.json @@ -40,7 +40,7 @@ "id": "afs_holo_cloak_mk2", "type": "TOOL_ARMOR", "copy-from": "afs_sentinel_cloak", - "name": { "str": "hologram cloak mk.2" }, + "name": { "str": "hologram cloak mk.2", "str_pl": "hologram cloaks mk.2" }, "description": "When activated, creates an holographic decoy of its wearer. Powered by an experimental n-space energy generator, it slowly recharges itself for free, probably by syphoning excess energy from some unknown hyperdimensional space.", "charges_per_use": 1, "//": "Change charges and charge_regen only", diff --git a/data/mods/Aftershock/items/inactiverobot.json b/data/mods/Aftershock/items/inactiverobot.json index aff33347f7ea8..ae7149dc4cfd9 100644 --- a/data/mods/Aftershock/items/inactiverobot.json +++ b/data/mods/Aftershock/items/inactiverobot.json @@ -177,7 +177,7 @@ { "id": "bot_sentinel_lx", "type": "TOOL", - "name": { "str": "inactive sentinel-lx" }, + "name": { "str": "inactive sentinel-lx", "str_pl": "inactive sentinels-lx" }, "description": "Crouched and dead still, this armored luxurious robot resembles an ancient knight immersed in deep prayer. If reprogrammed and rewired successfully the robot will identify you as a friendly, and will protect you from nearby foes.", "weight": "40750 g", "volume": "30 L", diff --git a/data/mods/Aftershock/items/tools.json b/data/mods/Aftershock/items/tools.json index a603f3090d975..284e63519b85f 100644 --- a/data/mods/Aftershock/items/tools.json +++ b/data/mods/Aftershock/items/tools.json @@ -53,7 +53,7 @@ { "id": "afs_plasma_torch", "type": "TOOL", - "name": { "str": "377-UASTA plasma torch" }, + "name": { "str": "377-UASTA plasma torch", "str_pl": "377-UASTA plasma torches" }, "description": "One of the many versions of UASTA certified plasma torches, essentially a civilian plasma railgun used to deliver focused waves of plasma for precision welding or metal cutting. It is an indispensable tool for construction or demolition work, and is sometimes transformed into weapon by mining & salvage outfits of questionable repute.", "weight": "4200 g", "volume": "4500 ml", diff --git a/data/mods/Aftershock/mobs/robots.json b/data/mods/Aftershock/mobs/robots.json index e32e304e99668..5c03863dd0d95 100644 --- a/data/mods/Aftershock/mobs/robots.json +++ b/data/mods/Aftershock/mobs/robots.json @@ -173,7 +173,7 @@ { "id": "afs_mon_sentinel_lx", "type": "MONSTER", - "name": { "str": "Wraitheon Sentinel-lx" }, + "name": { "str": "Wraitheon Sentinel-lx", "str_pl": "Wraitheon Sentinels-lx" }, "description": "Its exterior plates are sable and gold, this luxurious variant of a Wraitheon drone was once kept as a bodyguard by society's wealthiest. Still with its wrist sword extended, it resembles an ancient knight, standing an eternal watch.", "default_faction": "WraitheonRobotics", "species": [ "ROBOT" ], diff --git a/src/crafting.cpp b/src/crafting.cpp index e7396a4c40956..b85cb12b3f4c0 100644 --- a/src/crafting.cpp +++ b/src/crafting.cpp @@ -2534,7 +2534,7 @@ void Character::complete_disassemble( item_location &target, const recipe &dis ) if( this->is_avatar() ) { add_msg( m_bad, _( "You fail to recover %1$s from the %2$s." ), newit.tname(), dis_item.tname() ); } else { - add_msg_if_player_sees( *this, m_bad, _( "%1s fails to recover recover %2$s from the %3$s." ), + add_msg_if_player_sees( *this, m_bad, _( "%1s fails to recover %2$s from the %3$s." ), this->disp_name( false, true ), newit.tname(), dis_item.tname() ); } continue;