Merge pull request #38037 from snipercup/Armor-name-to-object

Armor Name to object, volume to string

data/json/items/armor/arms_armor.json

@@ -26,8 +26,7 @@
     "id": "armguard_chitin",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of chitin arm guards",
-    "name_plural": "pairs of chitin arm guards",
+    "name": { "str": "pair of chitin arm guards", "str_pl": "pairs of chitin arm guards" },
     "description": "A pair of arm guards made from the exoskeletons of insects.  Light and durable.",
     "weight": "392 g",
     "volume": "2500 ml",
@@ -50,8 +49,7 @@
     "copy-from": "armguard_chitin",
     "looks_like": "armguard_chitin",
     "type": "ARMOR",
-    "name": "pair of biosilicified chitin arm guards",
-    "name_plural": "pairs of biosilicified chitin arm guards",
+    "name": { "str": "pair of biosilicified chitin arm guards", "str_pl": "pairs of biosilicified chitin arm guards" },
     "description": "A pair of arm guards crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants.  Acid-resistant and very durable.",
     "material": [ "acidchitin" ],
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25, "encumbrance": 1.5, "warmth": 1.5 },
@@ -219,8 +217,7 @@
     "id": "chainmail_arms",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of chainmail sleeves",
-    "name_plural": "pairs of chainmail sleeves",
+    "name": { "str": "pair of chainmail sleeves", "str_pl": "pairs of chainmail sleeves" },
     "description": "Customized chainmail arms.  Each sleeve has straps to connect them with each other.  The lack of fingers makes them less cumbersome and allows them to be used with gloves.",
     "weight": "2812 g",
     "volume": "750 ml",

data/json/items/armor/boots.json

@@ -23,8 +23,7 @@
   {
     "id": "boots",
     "type": "ARMOR",
-    "name": "pair of boots",
-    "name_plural": "pairs of boots",
+    "name": { "str": "pair of boots", "str_pl": "pairs of boots" },
     "description": "Tough leather boots.  Very durable.",
     "weight": "1060 g",
     "volume": "2500 ml",
@@ -48,8 +47,7 @@
     "id": "boots_bone",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of bone armor boots",
-    "name_plural": "pairs of bone armor boots",
+    "name": { "str": "pair of bone armor boots", "str_pl": "pairs of bone armor boots" },
     "description": "Leather boots armored with reinforcements made from bone.  Light and strong.",
     "weight": "1824 g",
     "volume": "4250 ml",
@@ -98,8 +96,7 @@
     "id": "boots_chitin",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of chitinous boots",
-    "name_plural": "pairs of chitinous boots",
+    "name": { "str": "pair of chitinous boots", "str_pl": "pairs of chitinous boots" },
     "description": "Boots made from the exoskeletons of insects.  Light and durable.",
     "weight": "1620 g",
     "volume": "4250 ml",
@@ -992,8 +989,7 @@
   {
     "id": "shoes_birchbark",
     "type": "ARMOR",
-    "name": "pair of birchbark shoes",
-    "name_plural": "pairs of birchbark shoes",
+    "name": { "str": "pair of birchbark shoes", "str_pl": "pairs of birchbark shoes" },
     "description": "Simple shoes woven from strips of birch bark.  Not very comfortable, but better than going barefoot.",
     "weight": "345 g",
     "volume": "500 ml",
@@ -1014,8 +1010,7 @@
     "id": "shoes_bowling",
     "repairs_like": "boots",
     "type": "ARMOR",
-    "name": "pair of bowling shoes",
-    "name_plural": "pairs of bowling shoes",
+    "name": { "str": "pair of bowling shoes", "str_pl": "pairs of bowling shoes" },
     "description": "A pair of flat-soled shoes designed to give you a grip on slippery surfaces.",
     "weight": "840 g",
     "volume": "1500 ml",
@@ -1311,8 +1306,7 @@
   {
     "id": "socks_bag",
     "type": "ARMOR",
-    "name": "pair of bag socks",
-    "name_plural": "pairs of bag socks",
+    "name": { "str": "pair of bag socks", "str_pl": "pairs of bag socks" },
     "description": "A pair of disposable plastic bags, adapted to be used as socks.",
     "weight": "6 g",
     "volume": "250 ml",

data/json/items/armor/eyewear.json

@@ -69,8 +69,7 @@
     "id": "glasses_bal",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of ballistic glasses",
-    "name_plural": "pairs of ballistic glasses",
+    "name": { "str": "pair of ballistic glasses", "str_pl": "pairs of ballistic glasses" },
     "description": "Modern tactical eyewear that protects from small projectiles and fragments.  Provides excellent protection from environmental dangers.",
     "weight": "184 g",
     "volume": "250 ml",
@@ -92,8 +91,7 @@
   {
     "id": "glasses_bifocal",
     "type": "ARMOR",
-    "name": "pair of bifocal glasses",
-    "name_plural": "pairs of bifocal glasses",
+    "name": { "str": "pair of bifocal glasses", "str_pl": "pairs of bifocal glasses" },
     "description": "A pair of bifocal glasses for those who are both near-sighted and far-sighted.  You can use them to focus sunlight.",
     "weight": "30 g",
     "volume": "250 ml",

data/json/items/armor/gloves.json

@@ -3,8 +3,7 @@
     "id": "beekeeping_gloves",
     "repairs_like": "gloves_light",
     "type": "ARMOR",
-    "name": "pair of beekeeping gloves",
-    "name_plural": "pairs of beekeeping gloves",
+    "name": { "str": "pair of beekeeping gloves", "str_pl": "pairs of beekeeping gloves" },
     "description": "A pair of white beekeeping gloves made out of smooth leather.",
     "weight": "120 g",
     "volume": "250 ml",
@@ -26,8 +25,7 @@
     "id": "boxing_gloves",
     "repairs_like": "gauntlets_larmor",
     "type": "ARMOR",
-    "name": "pair of boxing gloves",
-    "name_plural": "pairs of boxing gloves",
+    "name": { "str": "pair of boxing gloves", "str_pl": "pairs of boxing gloves" },
     "description": "A pair of big, red, 8 oz. boxing gloves.  They make dexterous tasks near impossible, but provide ample protection.",
     "weight": "453 g",
     "volume": "1 L",
@@ -92,8 +90,7 @@
     "id": "gauntlets_chitin",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of chitinous gauntlets",
-    "name_plural": "pairs of chitinous gauntlets",
+    "name": { "str": "pair of chitinous gauntlets", "str_pl": "pairs of chitinous gauntlets" },
     "description": "Gauntlets made from the exoskeletons of insects.  Very light and durable.",
     "weight": "760 g",
     "volume": "1750 ml",
@@ -117,8 +114,7 @@
     "copy-from": "gauntlets_chitin",
     "looks_like": "gauntlets_chitin",
     "type": "ARMOR",
-    "name": "pair of biosilicified chitin gauntlets",
-    "name_plural": "pairs of biosilicified chitin gauntlets",
+    "name": { "str": "pair of biosilicified chitin gauntlets", "str_pl": "pairs of biosilicified chitin gauntlets" },
     "description": "Gauntlets crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants.  Acid-resistant and very durable.",
     "material": [ "acidchitin" ],
     "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25, "encumbrance": 1.5, "warmth": 1.5 },
@@ -193,8 +189,7 @@
   {
     "id": "gloves_bag",
     "type": "ARMOR",
-    "name": "pair of bag gloves",
-    "name_plural": "pairs of bag gloves",
+    "name": { "str": "pair of bag gloves", "str_pl": "pairs of bag gloves" },
     "description": "A pair of disposable plastic bags, adapted to be used as gloves.",
     "weight": "6 g",
     "volume": "250 ml",
@@ -472,8 +467,7 @@
     "id": "gloves_plate",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of armored gauntlets",
-    "name_plural": "pairs of armored gauntlets",
+    "name": { "str": "pair of armored gauntlets", "str_pl": "pairs of armored gauntlets" },
     "description": "An extremely heavy set of armor-plated leather gloves.",
     "weight": "980 g",
     "volume": "1500 ml",
@@ -882,8 +876,7 @@
     "id": "winter_gloves_army",
     "repairs_like": "gloves_light",
     "type": "ARMOR",
-    "name": "pair of army winter gloves",
-    "name_plural": "pairs of army winter gloves",
+    "name": { "str": "pair of army winter gloves", "str_pl": "pairs of army winter gloves" },
     "description": "A pair of padded gloves.  Favored by the military.",
     "weight": "218 g",
     "volume": "750 ml",

data/json/items/armor/jewelry.json

@@ -18,11 +18,10 @@
   {
     "id": "bead_ear",
     "type": "ARMOR",
-    "name": "pair of beaded earrings",
-    "name_plural": "pairs of beaded earrings",
+    "name": { "str": "pair of beaded earrings", "str_pl": "pairs of 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,
+    "volume": "1 ml",
     "price": 100,
     "price_postapoc": 100,
     "material": [ "wood" ],

data/json/items/armor/legs_armor.json

@@ -133,8 +133,7 @@
     "id": "legguard_bronze",
     "type": "ARMOR",
     "category": "armor",
-    "name": "pair of bronze greaves",
-    "name_plural": "pairs of bronze greaves",
+    "name": { "str": "pair of bronze greaves", "str_pl": "pairs of bronze greaves" },
     "description": "A pair of bronze leg guards with a simple leather lining.",
     "weight": "2520 g",
     "volume": "5500 ml",