Merge branch 'master' of https://github.com/CleverRaven/Cataclysm-DDA …

…into iteminfo-cleanup

data/json/items/ammo.json

@@ -1130,8 +1130,7 @@
     "id": "tinder",
     "type": "AMMO",
     "category": "spare_parts",
-    "name": "tinder",
-    "name_plural": "tinder",
+    "name": { "str": "tinder", "str_pl": "tinder" },
     "description": "Flammable material, finely divided for easy combustion.",
     "weight": "10 g",
     "volume": "250 ml",

data/json/items/armor/ammo_pouch.json

@@ -101,8 +101,7 @@
   {
     "id": "chestpouch",
     "type": "ARMOR",
-    "name": "chest ammo pouch",
-    "name_plural": "chest ammo pouches",
+    "name": { "str": "chest ammo pouch", "str_pl": "chest ammo pouches" },
     "description": "A fabric ammo pouch that can be strapped to your chest which is capable of holding a single magazine close at hand.",
     "weight": "140 g",
     "volume": "250 ml",
@@ -129,8 +128,7 @@
   {
     "id": "chestrig",
     "type": "ARMOR",
-    "name": "chest rig",
-    "name_plural": "chest rig",
+    "name": { "str": "chest rig", "str_pl": "chest rig" },
     "description": "Popularized during the Vietnam War, chest rigs like these are typically plain, barebones affairs consisting of three or more pouches in a row, with straps to secure them on your chest.  This one can hold four magazines in its pouches.",
     "weight": "425 g",
     "volume": "500 ml",
@@ -158,8 +156,7 @@
   {
     "id": "javelin_bag",
     "type": "ARMOR",
-    "name": "javelin bag",
-    "name_plural": "javelin bags",
+    "name": { "str": "javelin bag" },
     "description": "An open medieval-looking bag, designed to store javelins for easy reach.",
     "weight": "600 g",
     "volume": "1250 ml",
@@ -214,8 +211,7 @@
   {
     "type": "ARMOR",
     "id": "legpouch_large",
-    "name": "leg ammo pouch",
-    "name_plural": "leg ammo pouches",
+    "name": { "str": "leg ammo pouch", "str_pl": "leg ammo pouches" },
     "description": "A fabric ammo pouch that can be strapped to your leg and capable of holding two magazine close at hand.",
     "weight": "120 g",
     "volume": "250 ml",

data/json/items/armor/arms_armor.json

@@ -3,8 +3,7 @@
     "id": "2byarm_guard",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of 2-by-arm guards",
-    "name_plural": "pairs of 2-by-arm guards",
+    "name": { "str": "pair of 2-by-arm guards", "str_pl": "pairs of 2-by-arm guards" },
     "description": "A pair of improvised arm guards made from broken pieces of a two by four that are tied to your arms with rags and string.  They offer good protection, but are really uncomfortable to wear.",
     "weight": "300 g",
     "volume": "1500 ml",

data/json/items/armor/bandolier.json

@@ -195,8 +195,7 @@
   {
     "id": "grenade_pouch",
     "type": "ARMOR",
-    "name": "grenade pouch",
-    "name_plural": "grenade pouches",
+    "name": { "str": "grenade pouch", "str_pl": "grenade pouches" },
     "description": "A small pouch for storing cartridge grenades with straps for attaching it to your belt or other webbing.",
     "weight": "90 g",
     "volume": "250 ml",
@@ -238,8 +237,7 @@
   {
     "id": "grenadebandolier",
     "type": "ARMOR",
-    "name": "large grenade pouch",
-    "name_plural": "large grenade pouches",
+    "name": { "str": "large grenade pouch", "str_pl": "large grenade pouches" },
     "description": "A pouch for holding up to four full-sized grenades of various types.",
     "weight": "600 g",
     "volume": "1250 ml",
@@ -248,7 +246,7 @@
     "rigid": false,
     "material": "cotton",
     "symbol": "[",
-    "looks_like": "belt",
+    "looks_like": "leather_belt",
     "color": "dark_gray",
     "covers": [ "TORSO" ],
     "coverage": 15,

data/json/items/armor/boots.json

@@ -332,8 +332,7 @@
     "id": "boots_plate",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of armored boots",
-    "name_plural": "pairs of armored boots",
+    "name": { "str": "pair of armored boots", "str_pl": "pairs of armored boots" },
     "description": "An extremely heavy set of armor plated boots.",
     "weight": "1890 g",
     "volume": "3250 ml",
@@ -515,8 +514,7 @@
     "id": "boots_xlsurvivor",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of XL survivor boots",
-    "name_plural": "pairs of XL survivor boots",
+    "name": { "str": "pair of XL survivor boots", "str_pl": "pairs of XL survivor boots" },
     "description": "A massive pair of customized leather boots, armored with kevlar and modified to provide maximum protection from harm and the elements, even when knee-deep in the dead.",
     "weight": "2460 g",
     "volume": "5 L",
@@ -1296,8 +1294,7 @@
   {
     "id": "socks_ankle",
     "type": "ARMOR",
-    "name": "pair of ankle socks",
-    "name_plural": "pairs of ankle socks",
+    "name": { "str": "pair of ankle socks", "str_pl": "pairs of ankle socks" },
     "description": "Short socks, commonly used for sports.  These are designed to protect your feet from friction, not temperature",
     "weight": "25 g",
     "volume": "200 ml",

data/json/items/armor/gloves.json

@@ -234,8 +234,7 @@
     "id": "gloves_fingerless_mod",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of armored fingerless gloves",
-    "name_plural": "pairs of armored fingerless gloves",
+    "name": { "str": "pair of armored fingerless gloves", "str_pl": "pairs of armored fingerless gloves" },
     "description": "A pair of leather gloves with no fingers, allowing greater manual dexterity.  These have been crudely reinforced with steel guards across the back.",
     "weight": "380 g",
     "volume": "500 ml",
@@ -758,8 +757,7 @@
     "id": "gloves_xlsurvivor",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of XL survivor gloves",
-    "name_plural": "pairs of XL survivor gloves",
+    "name": { "str": "pair of XL survivor gloves", "str_pl": "pairs of XL survivor gloves" },
     "description": "A massive pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.",
     "weight": "480 g",
     "volume": "1500 ml",

data/json/items/armor/hats.json

@@ -391,8 +391,7 @@
     "id": "kippah",
     "repairs_like": "balclava",
     "type": "ARMOR",
-    "name": "kippah",
-    "name_plural": "kippahs",
+    "name": { "str": "kippah" },
     "description": "A thin, rounded skullcap.  A traditional headdress in Judaism.",
     "weight": "80 g",
     "volume": "250 ml",
@@ -411,8 +410,7 @@
     "id": "kufi",
     "repairs_like": "balclava",
     "type": "ARMOR",
-    "name": "kufi cap",
-    "name_plural": "kufi caps",
+    "name": { "str": "kufi cap" },
     "description": "A brimless, short and rounded cap.",
     "weight": "88 g",
     "volume": "500 ml",

data/json/items/armor/helmets.json

@@ -289,8 +289,7 @@
     "id": "helmet_galea",
     "type": "ARMOR",
     "category": "armor",
-    "name": "galea",
-    "name_plural": "galeae",
+    "name": { "str": "galea", "str_pl": "galeae" },
     "description": "An Imperial Roman helmet, with distinct projections protecting the sides of the head.",
     "weight": "1310 g",
     "volume": "2500 ml",

data/json/items/armor/jewelry.json

@@ -224,8 +224,7 @@
   {
     "id": "diving_watch",
     "type": "ARMOR",
-    "name": "diver's watch",
-    "name_plural": "diver's watches",
+    "name": { "str": "diver's watch", "str_pl": "diver's watches" },
     "description": "A waterproof, self-winding watch on a stainless steel watchband.  Tells the time and current temperature.  Activate to check the digital thermometer.",
     "weight": "65 g",
     "volume": "250 ml",

data/json/items/armor/legs_armor.json

@@ -3,8 +3,7 @@
     "id": "2byshin_guard",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of 2-by-shin guards",
-    "name_plural": "pairs of 2-by-shin guards",
+    "name": { "str": "pair of 2-by-shin guards", "str_pl": "pairs of 2-by-shin guards" },
     "description": "A pair of improvised shin guards made from broken pieces of a two by four that are tied to your shins with rags and string.  They offer good protection, but are really hard to run with.",
     "weight": "300 g",
     "volume": "1500 ml",
@@ -53,8 +52,7 @@
     "id": "chainmail_legs",
     "type": "ARMOR",
     "category": "armor",
-    "name": "chainmail leggings",
-    "name_plural": "pairs of chainmail leggings",
+    "name": { "str": "chainmail leggings", "str_pl": "pairs of chainmail leggings" },
     "description": "Customized chainmail legs.  Their straps keep everything in place, and the lack of toes and heels allows them to work perfectly well with footwear.",
     "weight": "4212 g",
     "volume": "1500 ml",
@@ -73,8 +71,7 @@
   {
     "id": "chaps_leather",
     "type": "ARMOR",
-    "name": "leather chaps",
-    "name_plural": "leather chaps",
+    "name": { "str": "leather chaps", "str_pl": "leather chaps" },
     "description": "A pair of black leather chaps.  Very tough and light, but doesn't offer any storage.",
     "weight": "1414 g",
     "volume": "1250 ml",
@@ -95,8 +92,7 @@
     "id": "fencing_pants",
     "repairs_like": "survivor_suit",
     "type": "ARMOR",
-    "name": "fencing pants",
-    "name_plural": "fencing pants",
+    "name": { "str": "fencing pants", "str_pl": "fencing pants" },
     "description": "A pair of reinforced pants used by fencers to prevent injuries.",
     "weight": "450 g",
     "volume": "2 L",
@@ -271,15 +267,14 @@
     "id": "lsurvivor_pants",
     "type": "ARMOR",
     "category": "armor",
-    "name": "light survivor cargo pants",
-    "name_plural": "light survivor cargo pants",
+    "name": { "str": "light survivor cargo pants", "str_pl": "light survivor cargo pants" },
     "description": "Lightweight, Kevlar armored cargo pants designed to hold as much as possible.  Strong and mostly waterproof.",
     "weight": "920 g",
     "volume": "3500 ml",
     "price": 40000,
     "material": [ "kevlar", "cotton" ],
     "symbol": "[",
-    "looks_like": "survivor_pants",
+    "looks_like": "pants_survivor",
     "color": "green",
     "covers": [ "LEGS" ],
     "coverage": 95,
@@ -294,8 +289,7 @@
     "id": "motorbike_pants",
     "repairs_like": "survivor_suit",
     "type": "ARMOR",
-    "name": "motorcycle pants",
-    "name_plural": "pairs of motorcycle pants",
+    "name": { "str": "motorcycle pants", "str_pl": "pairs of motorcycle pants" },
     "description": "A pair of pants designed for dirt bikers and motorcyclists.",
     "weight": "1340 g",
     "volume": "750 ml",

data/json/items/armor/legs_clothes.json

@@ -23,8 +23,7 @@
   {
     "id": "breeches",
     "type": "ARMOR",
-    "name": "breeches",
-    "name_plural": "breeches",
+    "name": { "str": "breeches", "str_pl": "breeches" },
     "description": "A well-made pair of old-fashioned pants, made of stiff yet baggy material.  Comfortable, but lacks pockets.",
     "weight": "520 g",
     "volume": "1750 ml",
@@ -67,8 +66,7 @@
   {
     "id": "hot_pants",
     "type": "ARMOR",
-    "name": "hot pants",
-    "name_plural": "hot pants",
+    "name": { "str": "hot pants", "str_pl": "hot pants" },
     "description": "A simple pair of short shorts.",
     "weight": "92 g",
     "volume": "250 ml",
@@ -85,8 +83,7 @@
   {
     "id": "hot_pants_fur",
     "type": "ARMOR",
-    "name": "fur hot pants",
-    "name_plural": "fur hot pants",
+    "name": { "str": "fur hot pants", "str_pl": "fur hot pants" },
     "description": "A simple pair of fur short shorts.",
     "weight": "118 g",
     "volume": "250 ml",
@@ -104,8 +101,7 @@
   {
     "id": "hot_pants_leather",
     "type": "ARMOR",
-    "name": "leather hot pants",
-    "name_plural": "leather hot pants",
+    "name": { "str": "leather hot pants", "str_pl": "leather hot pants" },
     "description": "A simple pair of leather short shorts.",
     "weight": "106 g",
     "volume": "250 ml",
@@ -123,8 +119,7 @@
   {
     "id": "jeans",
     "type": "ARMOR",
-    "name": "jeans",
-    "name_plural": "jeans",
+    "name": { "str": "jeans", "str_pl": "jeans" },
     "description": "A pair of blue jeans with two deep pockets.",
     "weight": "600 g",
     "volume": "2 L",
@@ -206,8 +201,7 @@
   {
     "id": "leggings",
     "type": "ARMOR",
-    "name": "leggings",
-    "name_plural": "leggings",
+    "name": { "str": "leggings", "str_pl": "leggings" },
     "description": "Skin-tight nylon leggings, sometimes used when exercising, that keep your legs nice and warm.",
     "weight": "155 g",
     "volume": "500 ml",
@@ -397,8 +391,7 @@
   {
     "id": "pants_fur",
     "type": "ARMOR",
-    "name": "fur pants",
-    "name_plural": "fur pants",
+    "name": { "str": "fur pants", "str_pl": "fur pants" },
     "description": "A hefty pair of fur-lined pants.",
     "weight": "920 g",
     "volume": "4 L",
@@ -431,8 +424,7 @@
   {
     "id": "pants_leather",
     "type": "ARMOR",
-    "name": "leather pants",
-    "name_plural": "leather pants",
+    "name": { "str": "leather pants", "str_pl": "leather pants" },
     "description": "A pair of black leather pants.  Very tough, but cumbersome and without much storage.",
     "weight": "980 g",
     "volume": "2500 ml",
@@ -478,8 +470,7 @@
     "id": "postman_shorts",
     "repairs_like": "jeans",
     "type": "ARMOR",
-    "name": "mail carrier shorts",
-    "name_plural": "mail carrier shorts",
+    "name": { "str": "mail carrier shorts", "str_pl": "mail carrier shorts" },
     "description": "A pair of dark blue shorts, the kind used by postal service workers.",
     "weight": "230 g",
     "volume": "1 L",
@@ -521,8 +512,7 @@
   {
     "id": "shorts_cargo",
     "type": "ARMOR",
-    "name": "cargo shorts",
-    "name_plural": "cargo shorts",
+    "name": { "str": "cargo shorts", "str_pl": "cargo shorts" },
     "description": "A pair of shorts lined with pockets, offering decent storage.",
     "weight": "340 g",
     "volume": "1500 ml",
@@ -543,8 +533,7 @@
   {
     "id": "shorts_denim",
     "type": "ARMOR",
-    "name": "denim shorts",
-    "name_plural": "denim shorts",
+    "name": { "str": "denim shorts", "str_pl": "denim shorts" },
     "description": "A pair of denim shorts.  Thick and tough, they provide excellent protection from cuts.",
     "weight": "260 g",
     "volume": "1250 ml",

data/json/items/armor/masks.json

@@ -70,8 +70,7 @@
     "id": "bondage_mask_zipped",
     "copy-from": "bondage_mask",
     "type": "ARMOR",
-    "name": "bondage mask (zipped)",
-    "name_plural": "bondage masks (zipped)",
+    "name": { "str": "bondage mask (zipped)", "str_pl": "bondage masks (zipped)" },
     "description": "A tight mask made of black leather.  The eyes and mouth have been zipped closed.",
     "looks_like": "bondage_mask",
     "flags": [ "VARSIZE", "BLIND" ],

data/json/items/armor/storage.json

@@ -480,8 +480,7 @@
   {
     "id": "leather_pouch",
     "type": "ARMOR",
-    "name": "leather pouch",
-    "name_plural": "leather pouches",
+    "name": { "str": "leather pouch", "str_pl": "leather pouches" },
     "description": "A bag stitched together from leather scraps.  Doesn't hold an awful lot but is easy to wear.",
     "weight": "610 g",
     "volume": "500 ml",

data/json/items/armor/torso_armor.json

@@ -44,8 +44,7 @@
   {
     "id": "armor_lorica",
     "type": "ARMOR",
-    "name": "lorica segmentata",
-    "name_plural": "lorica segmentata",
+    "name": { "str": "lorica segmentata", "str_pl": "lorica segmentata" },
     "description": "An ancient Roman laminar armor, made of overlapping metal strips connected to internal leather straps.",
     "weight": "5286 g",
     "volume": "6 L",
@@ -131,8 +130,7 @@
     "id": "cuirass_lightplate",
     "type": "ARMOR",
     "category": "armor",
-    "name": "cuirass",
-    "name_plural": "cuirasses",
+    "name": { "str": "cuirass", "str_pl": "cuirasses" },
     "description": "A steel breastplate, and a vital part of plate armor.  Even as full armor went into decline, cuirasses remained in use among cavalry in Europe.",
     "weight": "4200 g",
     "volume": "6 L",