Merge remote-tracking branch 'upstream/master' into Fix-Sauteed-Fiddl…

…eheads

data/json/items/book/martial.json

@@ -21,8 +21,7 @@
     "id": "manual_capoeira",
     "copy-from": "book_martial",
     "type": "GENERIC",
-    "name": "Capoeira 100",
-    "name_plural": "Capoeira 100",
+    "name": { "str": "Capoeira 100", "str_pl": "Capoeira 100" },
     "description": "A complete guide to Capoeira.",
     "book_data": { "martial_art": "style_capoeira" }
   },
@@ -75,8 +74,7 @@
     "id": "manual_judo",
     "copy-from": "book_martial",
     "type": "GENERIC",
-    "name": "Kodokan Judo",
-    "name_plural": "Kodokan Judo",
+    "name": { "str": "Kodokan Judo", "str_pl": "Kodokan Judo" },
     "description": "A complete guide to Judo.",
     "book_data": { "martial_art": "style_judo" }
   },
@@ -93,8 +91,7 @@
     "id": "manual_krav_maga",
     "copy-from": "book_martial",
     "type": "GENERIC",
-    "name": "Complete Krav Maga",
-    "name_plural": "Complete Krav Maga",
+    "name": { "str": "Complete Krav Maga", "str_pl": "Complete Krav Maga" },
     "description": "A complete guide to Krav Maga.",
     "book_data": { "martial_art": "style_krav_maga" }
   },
@@ -129,8 +126,7 @@
     "id": "manual_ninjutsu",
     "copy-from": "book_martial",
     "type": "GENERIC",
-    "name": "Essence of Ninjutsu",
-    "name_plural": "Essence of Ninjutsu",
+    "name": { "str": "Essence of Ninjutsu", "str_pl": "Essence of Ninjutsu" },
     "description": "A complete guide to Ninjutsu.",
     "book_data": { "martial_art": "style_ninjutsu" }
   },
@@ -183,17 +179,15 @@
     "id": "manual_taekwondo",
     "copy-from": "book_martial",
     "type": "GENERIC",
-    "name": "Official Taekwondo Training Manual",
-    "name_plural": "Official Taekwondo Training Manual",
+    "name": { "str": "Official Taekwondo Training Manual", "str_pl": "Official Taekwondo Training Manual" },
     "description": "A complete guide to Taekwondo.",
     "book_data": { "martial_art": "style_taekwondo" }
   },
   {
     "id": "manual_tai_chi",
     "copy-from": "book_martial",
     "type": "GENERIC",
-    "name": "Becoming One with the Tao",
-    "name_plural": "Becoming One with the Tao",
+    "name": { "str": "Becoming One with the Tao", "str_pl": "Becoming One with the Tao" },
     "description": "A complete guide to T'ai Chi Ch'uan.",
     "book_data": { "martial_art": "style_tai_chi" }
   },
@@ -246,26 +240,23 @@
     "id": "manual_wingchun",
     "copy-from": "book_martial",
     "type": "GENERIC",
-    "name": "Beautiful Springtime",
-    "name_plural": "Beautiful Springtime",
+    "name": { "str": "Beautiful Springtime", "str_pl": "Beautiful Springtime" },
     "description": "A complete guide to Wing Chun Kung-fu.",
     "book_data": { "martial_art": "style_wingchun" }
   },
   {
     "id": "manual_medievalpole",
     "copy-from": "book_martial",
     "type": "GENERIC",
-    "name": "Fior Di Battaglia",
-    "name_plural": "Fior Di Battaglia",
+    "name": { "str": "Fior Di Battaglia", "str_pl": "Fior Di Battaglia" },
     "description": "A completely translated medieval guide teaching various techniques with polearms, there is a chapter about the many variations of common polearms… there are even pictures!",
     "book_data": { "martial_art": "style_medievalpole" }
   },
   {
     "id": "manual_swordsmanship",
     "copy-from": "book_martial",
     "type": "GENERIC",
-    "name": "Historic European Swordfighting",
-    "name_plural": "Historic European Swordfighting",
+    "name": { "str": "Historic European Swordfighting", "str_pl": "Historic European Swordfighting" },
     "description": "A complete guide to medieval swordsmanship.  Compares the German and Italian traditions for longsword and side sword, in and out of armor, with and without shield.",
     "book_data": { "martial_art": "style_swordsmanship" }
   }

data/json/items/comestibles/mre.json

@@ -87,8 +87,7 @@
     "id": "mre_spaghetti_box",
     "type": "GENERIC",
     "copy-from": "mre_box",
-    "name": "MRE - Spaghetti",
-    "name_plural": "MREs - Spaghetti",
+    "name": { "str": "MRE - Spaghetti", "str_pl": "MREs - Spaghetti" },
     "description": "A 'Meal Ready to Eat' with a spaghetti entree and everything a hungry soldier needs.  The contents will begin to rot once they're removed from this sealed bag.  Activate or disassemble it to get to its contents.",
     "looks_like": "mre_veggy_box"
   },
@@ -131,8 +130,7 @@
     "id": "mre_chilimac_box",
     "type": "GENERIC",
     "copy-from": "mre_box",
-    "name": "MRE - Chili & Macaroni",
-    "name_plural": "MREs - Chili & Macaroni",
+    "name": { "str": "MRE - Chili & Macaroni", "str_pl": "MREs - Chili & Macaroni" },
     "description": "A 'Meal Ready to Eat' with a chili & macaroni entree and everything a hungry soldier needs.  The contents will begin to rot once they're removed from this sealed bag.  Activate or disassemble it to get to its contents.",
     "looks_like": "mre_veggy_box"
   },
@@ -147,35 +145,31 @@
     "id": "mre_macaronimarinara_box",
     "type": "GENERIC",
     "copy-from": "mre_box",
-    "name": "MRE - Macaroni Marinara",
-    "name_plural": "MREs - Macaroni Marinara",
+    "name": { "str": "MRE - Macaroni Marinara", "str_pl": "MREs - Macaroni Marinara" },
     "description": "A 'Meal Ready to Eat' with a macaroni marinara entree and everything a hungry soldier needs.  The contents will begin to rot once they're removed from this sealed bag.  Activate or disassemble it to get to its contents.",
     "looks_like": "mre_veggy_box"
   },
   {
     "id": "mre_cheesetort_box",
     "type": "GENERIC",
     "copy-from": "mre_box",
-    "name": "MRE - Cheese Tortellini",
-    "name_plural": "MREs - Cheese Tortellini",
+    "name": { "str": "MRE - Cheese Tortellini", "str_pl": "MREs - Cheese Tortellini" },
     "description": "A 'Meal Ready to Eat' with a cheese tortellini entree and everything a hungry soldier needs.  The contents will begin to rot once they're removed from this sealed bag.  Activate or disassemble it to get to its contents.",
     "looks_like": "mre_veggy_box"
   },
   {
     "id": "mre_mushroomfettuccine_box",
     "type": "GENERIC",
     "copy-from": "mre_box",
-    "name": "MRE - Mushroom Fettuccine",
-    "name_plural": "MREs - Mushroom Fettuccine",
+    "name": { "str": "MRE - Mushroom Fettuccine", "str_pl": "MREs - Mushroom Fettuccine" },
     "description": "A 'Meal Ready to Eat' with a mushroom fettuccine entree and everything a hungry soldier needs.  The contents will begin to rot once they're removed from this sealed bag.  Activate or disassemble it to get to its contents.",
     "looks_like": "mre_veggy_box"
   },
   {
     "id": "mre_mexicanchickenstew_box",
     "type": "GENERIC",
     "copy-from": "mre_box",
-    "name": "MRE - Mexican Chicken Stew",
-    "name_plural": "MREs - Mexican Chicken Stew",
+    "name": { "str": "MRE - Mexican Chicken Stew", "str_pl": "MREs - Mexican Chicken Stew" },
     "description": "A 'Meal Ready to Eat' with a Mexican chicken stew entree and everything a hungry soldier needs.  The contents will begin to rot once they're removed from this sealed bag.  Activate or disassemble it to get to its contents.",
     "looks_like": "mre_beef_box"
   },

data/json/items/fluff.json

@@ -3,8 +3,7 @@
     "id": "magic_8_ball",
     "type": "GENERIC",
     "category": "other",
-    "name": "Magic 8-Ball",
-    "name_plural": "Magic 8-Balls",
+    "name": { "str": "Magic 8-Ball" },
     "description": "A fortune-telling device from the 1950s.  The kind of moral support you didn't know you needed.",
     "weight": "40 g",
     "volume": "250 ml",

data/json/items/generic.json

@@ -237,8 +237,7 @@
     "category": "spare_parts",
     "symbol": ",",
     "color": "light_gray",
-    "name": "Nomex patch",
-    "name_plural": "Nomex patches",
+    "name": { "str": "Nomex patch", "str_pl": "Nomex patches" },
     "description": "A small bolt of Nomex fire-resistant fabric.",
     "price": 4000,
     "price_postapoc": 200,
@@ -1624,8 +1623,7 @@
     "type": "GENERIC",
     "symbol": ")",
     "color": "brown",
-    "name": "Home Frontier Starter Pack",
-    "name_plural": "Home Frontier Starter Packs",
+    "name": { "str": "Home Frontier Starter Pack", "str_pl": "Home Frontier Starter Packs" },
     "category": "other",
     "description": "This not-so-little bundle of joy contains Leadworks, LLC's premier offerings: the Enforcer autorevolver (with holster) and Long Ranger rifle.  Maintenance kit, batteries for same, and a complimentary copy of the Gun Owner's Handbook are included.  The perfect investment for a new family starting out!  Disassemble to unpack and enjoy.",
     "price": 463500,
@@ -1639,8 +1637,7 @@
     "type": "GENERIC",
     "symbol": ")",
     "color": "light_gray",
-    "name": "Mosin-Nagant classic conversion kit",
-    "name_plural": "Mosin-Nagant classic conversion kits",
+    "name": { "str": "Mosin-Nagant classic conversion kit" },
     "category": "other",
     "description": "A beautiful wooden stock and hardware built to support common Mosin-Nagant actions.  With gunsmithing tools, some skill, and a few hours, you could take a 'tacti-cool' rifle and convert it to the classic Russian design.",
     "price": 12000,
@@ -1654,8 +1651,7 @@
     "type": "GENERIC",
     "symbol": ")",
     "color": "light_gray",
-    "name": "Mosin-Nagant EBR conversion kit",
-    "name_plural": "Mosin-Nagant EBR conversion kits",
+    "name": { "str": "Mosin-Nagant EBR conversion kit" },
     "category": "spare_parts",
     "description": "A synthetic stock and hardware designed to accommodate common Mosin-Nagant actions.  With gunsmithing tools, some skill, and a few hours, you could give the classic Russian design modern furniture and customization capacity.",
     "price": 12000,
@@ -1669,8 +1665,7 @@
     "type": "GENERIC",
     "symbol": ")",
     "color": "light_gray",
-    "name": "L523-CAR conversion",
-    "name_plural": "L523-CAR conversions",
+    "name": { "str": "L523-CAR conversion" },
     "category": "spare_parts",
     "description": "All the parts necessary to convert an L523 to the Carbine configuration, Leadworks LLC's choice for close-quarters work.  In order to reconfigure an already-configured L523, you'll need to disassemble it to the base platform, then assemble with the parts you prefer.",
     "price": 170000,
@@ -1684,8 +1679,7 @@
     "type": "GENERIC",
     "symbol": ")",
     "color": "light_gray",
-    "name": "L523-MBR conversion",
-    "name_plural": "L523-MBR conversions",
+    "name": { "str": "L523-MBR conversion" },
     "category": "spare_parts",
     "description": "All the parts necessary to convert an L523 to a Main Battle Rifle, a balanced weapon for all situations.  In order to reconfigure an already-configured L523, you'll need to disassemble it to the base platform, then assemble with the parts you prefer.",
     "price": 170000,
@@ -1699,8 +1693,7 @@
     "type": "GENERIC",
     "symbol": ")",
     "color": "light_gray",
-    "name": "L523-DSR conversion",
-    "name_plural": "L523-DSR conversions",
+    "name": { "str": "L523-DSR conversion" },
     "category": "spare_parts",
     "description": "All the parts necessary to convert an L523 to a Designated Shootist Rifle, suitable for long-ranged work.  In order to reconfigure an already-configured L523, you'll need to disassemble it to the base platform, then assemble with the parts you prefer.",
     "price": 200000,
@@ -1714,8 +1707,7 @@
     "type": "GENERIC",
     "symbol": ")",
     "color": "light_gray",
-    "name": "L523-LMG conversion",
-    "name_plural": "L523-LMG conversions",
+    "name": { "str": "L523-LMG conversion" },
     "category": "spare_parts",
     "description": "All the parts necessary to convert an L523 to a light machine gun.  In order to reconfigure an already-configured L523, you'll need to disassemble it to the base platform, then assemble with the parts you prefer.",
     "price": 270000,

data/json/items/melee/knives_kitchen.json

@@ -60,8 +60,7 @@
   },
   {
     "id": "knife_chef",
-    "name": "chef knife",
-    "name_plural": "chef knives",
+    "name": { "str": "chef knife", "str_pl": "chef knives" },
     "type": "TOOL",
     "category": "weapons",
     "description": "This is a long-bladed kitchen knife.  The blade is wider than the handle, giving room for the wielder's knuckles, and it has a characteristic curve for a fast rocking action for chopping vegetables.  It makes a good melee weapon, but the wide blade is unwieldy for butchering.",
@@ -77,8 +76,7 @@
   },
   {
     "id": "knife_carving",
-    "name": "carving knife",
-    "name_plural": "carving knives",
+    "name": { "str": "carving knife", "str_pl": "carving knives" },
     "type": "TOOL",
     "category": "weapons",
     "description": "This is a long-bladed kitchen knife with a thin, slightly curved blade for deftly slicing meat either in flat sheets or around the bone.  It would be a decent melee weapon, and excellent for butchery.",
@@ -94,8 +92,7 @@
   },
   {
     "id": "knife_bread",
-    "name": "bread knife",
-    "name_plural": "bread knives",
+    "name": { "str": "bread knife", "str_pl": "bread knives" },
     "type": "TOOL",
     "category": "weapons",
     "description": "This knife has quite a long blade with a scalloped edge for cutting bread.  It's not that sharp, but its length and heft mean it could do a bit of damage and cause some nasty tearing.",

data/json/items/melee/swords_and_blades.json

@@ -85,8 +85,7 @@
     "id": "knife_combat",
     "type": "TOOL",
     "category": "weapons",
-    "name": "combat knife",
-    "name_plural": "combat knives",
+    "name": { "str": "combat knife", "str_pl": "combat knives" },
     "description": "This is a military combat knife.  It is light and extremely sharp, and could be deadly in either the right hands or when attached as a bayonet.",
     "weight": "558 g",
     "volume": "500 ml",
@@ -163,8 +162,7 @@
     "id": "knife_rm42",
     "type": "TOOL",
     "category": "weapons",
-    "name": "RM42 fighting knife",
-    "name_plural": "RM42 fighting knives",
+    "name": { "str": "RM42 fighting knife", "str_pl": "RM42 fighting knives" },
     "description": "This sturdy matte black Rivtech combat dagger features a long and slim double-edged blade with a spear-point and a distinctive slip-resistant grip which can also be used to affix it to a suitable firearm.  Originally manufactured for the military, it was very popular in films and among collectors due to its fearsome appearance.",
     "weight": "188 g",
     "volume": "750 ml",
@@ -189,12 +187,11 @@
   {
     "id": "knife_swissarmy",
     "type": "TOOL",
-    "name": "Swiss Army knife",
-    "name_plural": "Swiss Army knives",
+    "name": { "str": "Swiss Army knife", "str_pl": "Swiss Army knives" },
     "//": "The swiss army knife is a bit more of a knife than a toolkit.",
     "description": "An iconic pocket knife imported from Europe.  Its red plastic handle conceals many small tools.",
     "weight": "246 g",
-    "volume": 0,
+    "volume": "5 ml",
     "price": 3000,
     "to_hit": -2,
     "cutting": 6,
@@ -672,8 +669,7 @@
     "id": "dao",
     "type": "TOOL",
     "category": "weapons",
-    "name": "dao",
-    "name_plural": "dao",
+    "name": { "str": "dao", "str_pl": "dao" },
     "description": "An ancient Chinese sword consisting of a curved blade and a guard with a cupped design.  Existing since the Shang dynasty, this one is made of bronze.  One of the four major weapons in folklore, alongside the jian sword, qiang spear, and gun staff.",
     "weight": "850 g",
     "volume": "1750 ml",
@@ -879,8 +875,7 @@
     "id": "nodachi",
     "type": "TOOL",
     "category": "weapons",
-    "name": "nodachi",
-    "name_plural": "nodachi",
+    "name": { "str": "nodachi", "str_pl": "nodachi" },
     "description": "This is a huge, curved, two-handed sword from Japan.  It is surprisingly light for its size.",
     "weight": "2822 g",
     "volume": "3250 ml",
@@ -1181,8 +1176,7 @@
     "type": "TOOL",
     "symbol": "/",
     "color": "dark_gray",
-    "name": "cutlass",
-    "name_plural": "cutlasses",
+    "name": { "str": "cutlass", "str_pl": "cutlasses" },
     "description": "This is a broad saber known for its use by sailors and pirates.  This sword appears to be made very poorly, but it should still stand up to a few swings.",
     "price": 96000,
     "material": "budget_steel",
@@ -1431,8 +1425,7 @@
     "type": "TOOL",
     "symbol": "/",
     "color": "light_gray",
-    "name": "pair of butterfly swords",
-    "name_plural": "pairs of butterfly swords",
+    "name": { "str": "pair of butterfly swords", "str_pl": "pairs of 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,
@@ -1511,8 +1504,7 @@
     "id": "ecs_lajatang_on",
     "copy-from": "ecs_lajatang_off",
     "type": "TOOL",
-    "name": "electric chainsaw lajatang (on)",
-    "name_plural": "electric chainsaw lajatangs (on)",
+    "name": { "str": "electric chainsaw lajatang (on)", "str_pl": "electric chainsaw lajatangs (on)" },
     "description": "A long wooden pole with electric chainsaws impractically attached to both ends.  They are currently on and draining power; use this item to turn them off.",
     "bashing": 4,
     "cutting": 140,
@@ -1527,8 +1519,7 @@
     "id": "cutlass",
     "type": "TOOL",
     "category": "weapons",
-    "name": "cutlass",
-    "name_plural": "cutlasses",
+    "name": { "str": "cutlass", "str_pl": "cutlasses" },
     "description": "This is a broad saber known for its use by sailors and pirates, as its short blade is easy to handle in close quarters.",
     "weight": "955 g",
     "volume": "1250 ml",
@@ -1628,8 +1619,7 @@
     "id": "e_combatsaw_on",
     "copy-from": "e_combatsaw_off",
     "type": "TOOL",
-    "name": "electric combat chainsaw (on)",
-    "name_plural": "electric combat chainsaws (on)",
+    "name": { "str": "electric combat chainsaw (on)", "str_pl": "electric combat chainsaws (on)" },
     "description": "This electric combat chainsaw is on, and is continuously draining power.  Use it to turn it off.",
     "to_hit": -4,
     "cutting": 82,

data/json/items/software.json

@@ -30,17 +30,15 @@
     "id": "software_medical",
     "copy-from": "software",
     "type": "GENERIC",
-    "name": "MediSoft",
-    "name_plural": "MediSoft",
+    "name": { "str": "MediSoft", "str_pl": "MediSoft" },
     "description": "A piece of medical software.",
     "price": 600
   },
   {
     "id": "software_math",
     "copy-from": "software",
     "type": "GENERIC",
-    "name": "MatheMAX",
-    "name_plural": "MatheMAX",
+    "name": { "str": "MatheMAX", "str_pl": "MatheMAX" },
     "description": "A piece of mathematical software.",
     "price": 500
   },