Skip to content

Commit

Permalink
Remove "pair of" from item names
Browse files Browse the repository at this point in the history
  • Loading branch information
Kodiologist committed Dec 1, 2019
1 parent 847e182 commit d650bc2
Show file tree
Hide file tree
Showing 13 changed files with 186 additions and 372 deletions.
285 changes: 95 additions & 190 deletions data/json/items/armor.json

Large diffs are not rendered by default.

159 changes: 53 additions & 106 deletions data/json/items/armor/boots.json

Large diffs are not rendered by default.

24 changes: 8 additions & 16 deletions data/json/items/armor/jewelry.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@
{
"id": "bead_ear",
"type": "ARMOR",
"name": "pair of beaded earrings",
"name_plural": "pairs of beaded earrings",
"name": { "str": "beaded earrings", "str_pl": "beaded earrings" },
"description": "A simple pair of earrings made of string and wooden beads. You can wear it if you like, but it won't provide any effects.",
"weight": "7 g",
"volume": 0,
Expand Down Expand Up @@ -162,8 +161,7 @@
{
"id": "copper_ear",
"type": "ARMOR",
"name": "pair of copper earrings",
"name_plural": "pairs of copper earrings",
"name": { "str": "copper earrings", "str_pl": "copper earrings" },
"description": "A pair of copper earrings. It's pretty heavy. You can wear it if you like, but it won't provide any effects.",
"weight": "50 g",
"volume": 0,
Expand Down Expand Up @@ -304,8 +302,7 @@
{
"id": "gold_ear",
"type": "ARMOR",
"name": "pair of gold earrings",
"name_plural": "pairs of gold earrings",
"name": { "str": "gold earrings", "str_pl": "gold earrings" },
"description": "A pair of shiny gold earrings. You can wear it if you like, but it won't provide any effects.",
"weight": "10 g",
"volume": 0,
Expand Down Expand Up @@ -451,8 +448,7 @@
{
"id": "silver_ear",
"type": "ARMOR",
"name": "pair of silver earrings",
"name_plural": "pairs of silver earrings",
"name": { "str": "silver earrings", "str_pl": "silver earrings" },
"description": "A pair of beautiful silver earrings. You can wear it if you like, but it won't provide any effects.",
"weight": "9 g",
"volume": 0,
Expand Down Expand Up @@ -594,8 +590,7 @@
{
"id": "platinum_ear",
"type": "ARMOR",
"name": "pair of platinum earrings",
"name_plural": "pairs of platinum earrings",
"name": { "str": "platinum earrings", "str_pl": "platinum earrings" },
"description": "A pair of plain platinum earrings - if gold is getting boring, just use another rare metal. You can wear it if you like, but it won't provide any effects.",
"weight": "15 g",
"volume": 0,
Expand Down Expand Up @@ -914,8 +909,7 @@
{
"id": "fur_cat_ears",
"type": "ARMOR",
"name": "pair of fuzzy cat ears",
"name_plural": "pairs of fuzzy cat ears",
"name": { "str": "fuzzy cat ears", "str_pl": "fuzzy cat ears" },
"description": "A fuzzy pair of brownish cat ears on a headband. It does nothing, but there's no reason not to look good even if no one's looking.",
"weight": "20 g",
"volume": "250 ml",
Expand All @@ -930,8 +924,7 @@
"id": "faux_fur_cat_ears",
"type": "ARMOR",
"copy-from": "fur_cat_ears",
"name": "pair of faux fur cat ears",
"name_plural": "pairs of faux fur cat ears",
"name": { "str": "faux fur cat ears", "str_pl": "faux fur cat ears" },
"description": "A fuzzy pair of garishly colored cat ears on a headband. It does nothing, but there's no reason not to look good even if no one's looking.",
"material": [ "faux_fur" ],
"color": "pink"
Expand Down Expand Up @@ -986,8 +979,7 @@
{
"id": "leather_cat_ears",
"type": "ARMOR",
"name": "pair of leather cat ears",
"name_plural": "pairs of leather cat ears",
"name": { "str": "leather cat ears", "str_pl": "leather cat ears" },
"description": "A shiny pair of black cat ears on a headband. It does nothing, but there's no reason not to look good even if no one's looking.",
"weight": "20 g",
"volume": "250 ml",
Expand Down
12 changes: 4 additions & 8 deletions data/json/items/armor/swimming.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,7 @@
{
"id": "trunks",
"type": "ARMOR",
"name": "pair of swimming trunks",
"name_plural": "pairs of swimming trunks",
"name": { "str": "swimming trunks", "str_pl": "swimming trunks" },
"description": "A pair of swimming trunks, with netting.",
"weight": "210 g",
"volume": "750 ml",
Expand Down Expand Up @@ -111,8 +110,7 @@
"id": "gloves_h20survivor",
"type": "ARMOR",
"category": "armor",
"name": "pair of survivor wetsuit gloves",
"name_plural": "pairs of survivor wetsuit gloves",
"name": { "str": "survivor wetsuit gloves", "str_pl": "survivor wetsuit gloves" },
"description": "A pair of customized, Kevlar armored neoprene gloves, modified to be easy to wear while providing maximum protection under extreme conditions.",
"weight": "390 g",
"volume": "750 ml",
Expand Down Expand Up @@ -195,8 +193,7 @@
{
"id": "goggles_swim",
"type": "ARMOR",
"name": "pair of swim goggles",
"name_plural": "pairs of swim goggles",
"name": { "str": "swim goggles", "str_pl": "swim goggles" },
"description": "A small pair of goggles made for swimming.",
"weight": "81 g",
"volume": "250 ml",
Expand All @@ -217,8 +214,7 @@
{
"id": "wetsuit_gloves",
"type": "ARMOR",
"name": "pair of swimming gloves",
"name_plural": "pairs of swimming gloves",
"name": { "str": "swimming gloves", "str_pl": "swimming gloves" },
"description": "A pair of very flexible neoprene-silicone rubber gloves, suitable for underwater use.",
"weight": "93 g",
"volume": "500 ml",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/comestibles/med.json
Original file line number Diff line number Diff line change
Expand Up @@ -402,8 +402,7 @@
"id": "contacts",
"type": "COMESTIBLE",
"comestible_type": "MED",
"name": "pair of contact lenses",
"name_plural": "pairs of contact lenses",
"name": { "str": "contact lenses", "str_pl": "contact lenses" },
"description": "A pair of extended wear contacts with soft lenses designed to be discarded after a week of use. They are a great replacement to wearing glasses and sit comfortably on the surface of the eye.",
"weight": "1 g",
"volume": "250 ml",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/generic.json
Original file line number Diff line number Diff line change
Expand Up @@ -1493,8 +1493,7 @@
"id": "glass_tinted",
"symbol": ".",
"color": "dark_gray",
"name": "pair of tinted glass",
"name_plural": "pairs of tinted glass",
"name": { "str": "tinted glass", "str_pl": "tinted glass" },
"category": "spare_parts",
"description": "A pair of small darkened glass, like the one that sunglasses are made of.",
"price": 1000,
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/generic/dining_kitchen.json
Original file line number Diff line number Diff line change
Expand Up @@ -508,8 +508,7 @@
"type": "GENERIC",
"category": "other",
"id": "chopsticks",
"name": "chopsticks",
"name_plural": "pairs of chopsticks",
"name": { "str": "chopsticks", "str_pl": "chopsticks" },
"description": "One of the most popular eating utensils in the world. Does double duty as a way of dealing with especially fragile vampires.",
"flags": [ "STAB" ],
"symbol": "X",
Expand Down
9 changes: 3 additions & 6 deletions data/json/items/melee.json
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,7 @@
"id": "knuckle_nail",
"symbol": "]",
"color": "brown",
"name": "pair of nail knuckles",
"name_plural": "pairs of nail knuckles",
"name": { "str": "nail knuckles", "str_pl": "nail knuckles" },
"description": "A pair of knuckles consisting of two small squares of wood with several nails coming through them. Useful in nasty street fights.",
"material": "wood",
"volume": "250 ml",
Expand Down Expand Up @@ -382,8 +381,7 @@
"id": "knuckle_steel",
"symbol": "3",
"color": "dark_gray",
"name": "pair of steel knuckles",
"name_plural": "pairs of steel knuckles",
"name": { "str": "steel knuckles", "str_pl": "steel knuckles" },
"description": "A mass of scrap metal crudely beat into shape, with folded rags underneath to protect the wearers knuckles. A good, quick weapon - but you have to get within punching range to use it.",
"material": "steel",
"volume": "250 ml",
Expand Down Expand Up @@ -428,8 +426,7 @@
"id": "knuckle_brass",
"symbol": "3",
"color": "yellow",
"name": "pair of brass knuckles",
"name_plural": "pairs of brass knuckles",
"name": { "str": "brass knuckles", "str_pl": "brass knuckles" },
"category": "weapons",
"description": "A metal weapon made of brass, designed to be gripped in the palm and cause punches to do extra damage. A good, quick weapon - but you have to get within punching range to use it.",
"material": "brass",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/melee/swords_and_blades.json
Original file line number Diff line number Diff line change
Expand Up @@ -1679,8 +1679,7 @@
"type": "TOOL",
"symbol": "/",
"color": "light_gray",
"name": "pair of butterfly swords",
"name_plural": "pairs of butterfly swords",
"name": { "str": "butterfly swords", "str_pl": "butterfly swords" },
"description": "This is a matched pair of traditional Shaolin butterfly swords. They are about the size of machetes but have hand guards and wider blades.",
"//": "basically 2x the weight, 1.3x the damage, 2.5x the resources of a single machete to cover the fact that it's two weapons, each with a hand guard",
"price": 50000,
Expand Down
6 changes: 2 additions & 4 deletions data/json/items/obsolete.json
Original file line number Diff line number Diff line change
Expand Up @@ -465,8 +465,7 @@
"id": "armguard_bone",
"type": "ARMOR",
"category": "armor",
"name": "pair of bone arm guards",
"name_plural": "pairs of bone arm guards",
"name": { "str": "bone arm guards", "str_pl": "bone arm guards" },
"description": "A pair of arm guards made from leather, reinforced with bone. Light and strong.",
"weight": "645 g",
"volume": "3 L",
Expand Down Expand Up @@ -508,8 +507,7 @@
"id": "gauntlets_bone",
"type": "ARMOR",
"category": "armor",
"name": "pair of bone armor gauntlets",
"name_plural": "pairs of bone armor gauntlets",
"name": { "str": "bone armor gauntlets", "str_pl": "bone armor gauntlets" },
"description": "Leather gauntlets with bone armor reinforcement. Very light and strong.",
"weight": "690 g",
"volume": "1250 ml",
Expand Down
33 changes: 11 additions & 22 deletions data/json/items/tool_armor.json
Original file line number Diff line number Diff line change
Expand Up @@ -230,8 +230,7 @@
"category": "clothing",
"symbol": "[",
"color": "light_gray",
"name": "pair of thermal electric socks",
"name_plural": "pairs of thermal electric socks",
"name": { "str": "thermal electric socks", "str_pl": "thermal electric socks" },
"description": "This is a pair of socks with internal battery-powered heating elements. Use it to turn it on.",
"flags": [ "VARSIZE", "SKINTIGHT" ],
"price": 5000,
Expand Down Expand Up @@ -272,8 +271,7 @@
"id": "thermal_socks_on",
"copy-from": "thermal_socks",
"type": "TOOL_ARMOR",
"name": "pair of thermal electric socks (on)",
"name_plural": "pairs of thermal electric socks (on)",
"name": { "str": "thermal electric socks (on)", "str_pl": "thermal electric socks (on)" },
"description": "This is a pair of socks with internal battery-powered heating elements. They are currently on, and continually draining batteries. Use it to turn them off.",
"flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID" ],
"power_draw": 7500,
Expand Down Expand Up @@ -345,8 +343,7 @@
"category": "clothing",
"symbol": "[",
"color": "light_gray",
"name": "pair of thermal electric gloves",
"name_plural": "pairs of thermal electric gloves",
"name": { "str": "thermal electric gloves", "str_pl": "thermal electric gloves" },
"description": "This is a pair of gloves with internal battery-powered heating elements. Use it to turn it on.",
"flags": [ "VARSIZE", "SKINTIGHT" ],
"price": 5000,
Expand Down Expand Up @@ -387,8 +384,7 @@
"id": "thermal_gloves_on",
"copy-from": "thermal_gloves",
"type": "TOOL_ARMOR",
"name": "pair of thermal electric gloves (on)",
"name_plural": "pairs of thermal electric gloves (on)",
"name": { "str": "thermal electric gloves (on)", "str_pl": "thermal electric gloves (on)" },
"description": "This is a pair of gloves with internal battery-powered heating elements. They are currently on, and continually draining batteries. Use it to turn them off.",
"flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID" ],
"power_draw": 7500,
Expand Down Expand Up @@ -460,8 +456,7 @@
"category": "clothing",
"symbol": ";",
"color": "dark_gray",
"name": "pair of binoculars",
"name_plural": "pairs of binoculars",
"name": { "str": "binoculars", "str_pl": "binoculars" },
"description": "A pair of optics with a neck strap attached. Useful for seeing long distances. Wearing this item or carrying it in your inventory will double the distance around you that is mapped during your travels. You could also use them to focus the sunlight.",
"price": 30000,
"material": [ "plastic", "glass" ],
Expand Down Expand Up @@ -1238,8 +1233,7 @@
"category": "clothing",
"symbol": "[",
"color": "dark_gray",
"name": "pair of light amp goggles",
"name_plural": "pairs of light amp goggles",
"name": { "str": "light amp goggles", "str_pl": "light amp goggles" },
"description": "A pair of battery-powered goggles that amplify ambient light, allowing you to see in the dark. Use it to turn them on.",
"flags": [ "FRAGILE" ],
"price": 92000,
Expand Down Expand Up @@ -1283,8 +1277,7 @@
"id": "goggles_nv_on",
"copy-from": "goggles_nv",
"type": "TOOL_ARMOR",
"name": "pair of light amp goggles (on)",
"name_plural": "pairs of light amp goggles (on)",
"name": { "str": "light amp goggles (on)", "str_pl": "light amp goggles (on)" },
"description": "A pair of battery-powered light amplifying goggles with an infrared illuminator, allowing you to see in the dark. It is turned on, and continually draining batteries. Use it to turn them off.",
"flags": [ "GNV_EFFECT", "FRAGILE", "TRADER_AVOID" ],
"//": "2019 commercial models can operate at under 0.375W with the IR illuminator on",
Expand All @@ -1301,8 +1294,7 @@
"category": "clothing",
"symbol": "[",
"color": "dark_gray",
"name": "pair of infrared goggles",
"name_plural": "pairs of infrared goggles",
"name": { "str": "infrared goggles", "str_pl": "infrared goggles" },
"description": "A pair of battery-powered goggles that grant infrared vision, allowing you to see warm-blooded creatures in the dark. Use it to turn them on.",
"flags": [ "FRAGILE" ],
"price": 92000,
Expand Down Expand Up @@ -1346,8 +1338,7 @@
"id": "goggles_ir_on",
"copy-from": "goggles_ir",
"type": "TOOL_ARMOR",
"name": "pair of infrared goggles (on)",
"name_plural": "pairs of infrared goggles (on)",
"name": { "str": "infrared goggles (on)", "str_pl": "infrared goggles (on)" },
"description": "A pair of battery-powered goggles that grant infrared vision, allowing you to see warm-blooded creatures in the dark. Use it to turn them off.",
"flags": [ "IR_EFFECT", "FRAGILE", "TRADER_AVOID" ],
"power_draw": 1000,
Expand Down Expand Up @@ -2910,8 +2901,7 @@
{
"id": "attached_ear_plugs_on",
"type": "ARMOR",
"name": "pair of attached ear plugs (in)",
"name_plural": "pairs of attached ear plugs (in)",
"name": { "str": "attached ear plugs (in)", "str_pl": "attached ear plugs (in)" },
"description": "A pair of industrial grade ear plugs attached together by some string. They are inside your ears, activate them to take them out.",
"copy-from": "ear_plugs",
"use_action": {
Expand All @@ -2925,8 +2915,7 @@
{
"id": "attached_ear_plugs_off",
"type": "ARMOR",
"name": "pair of attached ear plugs (out)",
"name_plural": "pairs of attached ear plugs (out)",
"name": { "str": "attached ear plugs (out)", "str_pl": "attached ear plugs (out)" },
"description": "A pair of industrial grade ear plugs, they are attached together by some string. They hang around your neck, use them to plug them in.",
"copy-from": "attached_ear_plugs_on",
"use_action": {
Expand Down
15 changes: 5 additions & 10 deletions data/json/items/tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -523,8 +523,7 @@
{
"id": "boltcutters",
"type": "TOOL",
"name": "pair of bolt cutters",
"name_plural": "pairs of bolt cutters",
"name": { "str": "bolt cutters", "str_pl": "bolt cutters" },
"description": "This is a large pair of bolt cutters. You could use them to cut padlocks or heavy gauge wire.",
"weight": "1224 g",
"volume": "750 ml",
Expand Down Expand Up @@ -907,8 +906,7 @@
"id": "carding_paddles",
"type": "GENERIC",
"category": "tools",
"name": "carding paddles",
"name_plural": "pairs of carding paddles",
"name": { "str": "carding paddles", "str_pl": "carding paddles" },
"description": "A pair of toothy wooden paddles used to clean fibers for use in textile production.",
"weight": "360 g",
"volume": "500 ml",
Expand Down Expand Up @@ -3359,8 +3357,7 @@
"id": "knitting_needles",
"type": "GENERIC",
"category": "tools",
"name": "knitting needles",
"name_plural": "pairs of knitting needles",
"name": { "str": "knitting needles", "str_pl": "knitting needles" },
"description": "A pair of stout wooden needles with round ends used to turn thread and yarn into cloth.",
"weight": "56 g",
"volume": 0,
Expand Down Expand Up @@ -5085,8 +5082,7 @@
{
"id": "scissors",
"type": "TOOL",
"name": "pair of scissors",
"name_plural": "pairs of scissors",
"name": { "str": "scissors", "str_pl": "scissors" },
"description": "These are a long pair of heavy duty scissors. Use scissors to cut items made from cotton (like clothing) into rags.",
"weight": "113 g",
"volume": "250 ml",
Expand Down Expand Up @@ -5950,8 +5946,7 @@
{
"id": "tongs",
"type": "TOOL",
"name": "pair of metal tongs",
"name_plural": "pairs of metal tongs",
"name": { "str": "metal tongs", "str_pl": "metal tongs" },
"description": "These are long, metal tongs. They are commonly used for cooking or in metalworking fabrication recipes.",
"weight": "540 g",
"volume": "500 ml",
Expand Down
3 changes: 1 addition & 2 deletions data/json/items/vehicle/wheel.json
Original file line number Diff line number Diff line change
Expand Up @@ -280,8 +280,7 @@
"id": "wheel_wheelchair",
"type": "WHEEL",
"category": "veh_parts",
"name": "pair of wheelchair wheels",
"name_plural": "pairs of wheelchair wheels",
"name": { "str": "wheelchair wheels", "str_pl": "wheelchair wheels" },
"description": "A pair of wheels for a wheelchair.",
"weight": "3000 g",
"volume": "12500 ml",
Expand Down

0 comments on commit d650bc2

Please sign in to comment.