Merge pull request #38388 from snipercup/Generic-modern-json

Generic name to object, flags to array, volume to string

data/json/items/generic.json

@@ -258,7 +258,7 @@
     "symbol": ",",
     "category": "spare_parts",
     "color": "brown",
-    "name": "bone glue",
+    "name": { "str": "bone glue" },
     "description": "Glue made from boiling animal bones.  The adhesive isn't strong enough for heavy-duty usages, but it can be used as a varnish or holding together small items.",
     "price": 1800,
     "material": "bone",
@@ -392,7 +392,7 @@
     "id": "biollante_bud",
     "symbol": ",",
     "color": "magenta",
-    "name": "biollante bud",
+    "name": { "str": "biollante bud" },
     "description": "An unopened biollante flower, brilliant purple in color.  It may still have its sap-producing organ intact.",
     "price": 0,
     "material": "veggy",
@@ -496,7 +496,7 @@
     "id": "blade",
     "symbol": "/",
     "color": "light_gray",
-    "name": "blade",
+    "name": { "str": "blade" },
     "description": "A large, relatively sharp blade.  Could be used to make bladed weaponry, or attached to a car.",
     "category": "spare_parts",
     "price": 28000,
@@ -652,13 +652,13 @@
     "id": "skewer_bone",
     "symbol": ",",
     "color": "white",
-    "name": "bone skewer",
+    "name": { "str": "bone skewer" },
     "description": "A thin skewer carved from bone.  Sadly, it won't make squirrel on a stick taste better.",
     "category": "other",
     "material": "bone",
     "flags": [ "NO_SALVAGE", "TRADER_AVOID" ],
     "weight": "10 g",
-    "volume": 0,
+    "volume": "25 ml",
     "to_hit": -5,
     "qualities": [ [ "COOK", 1 ] ]
   },
@@ -770,7 +770,7 @@
     "id": "thermostat",
     "symbol": ",",
     "color": "light_gray",
-    "name": "bimetal thermostat",
+    "name": { "str": "bimetal thermostat" },
     "category": "spare_parts",
     "description": "A simple thermostat controlled by thermal expansion of a bimetal strip.",
     "price": 1000,
@@ -1547,7 +1547,7 @@
     "id": "rag_bloody",
     "symbol": ",",
     "color": "red",
-    "name": "blood soaked rag",
+    "name": { "str": "blood soaked rag" },
     "description": "A large rag, drenched in blood.  It could be cleaned with boiling water.",
     "material": "cotton",
     "flags": [ "NO_SALVAGE", "TRADER_AVOID" ],
@@ -1862,7 +1862,7 @@
     "id": "brick",
     "symbol": ",",
     "color": "brown",
-    "name": "brick",
+    "name": { "str": "brick" },
     "category": "spare_parts",
     "description": "A fire hardened building block used in masonry construction.",
     "price": 2500,
@@ -1964,7 +1964,7 @@
     "id": "birchbark",
     "symbol": ",",
     "color": "brown",
-    "name": "birchbark",
+    "name": { "str": "birchbark" },
     "description": "A sheet of tough, water-resistant bark taken from a birch tree.",
     "price": 0,
     "material": "wood",
@@ -2214,7 +2214,7 @@
     "id": "bodypillow",
     "symbol": "[",
     "color": "white",
-    "name": "body pillow",
+    "name": { "str": "body pillow" },
     "description": "A big, body-sized pillow with a print of an anime character on the front and their scantily clad version on the back.",
     "price": 1500,
     "material": [ "cotton" ],

data/json/items/generic/toys_and_sports.json

@@ -112,7 +112,7 @@
     "id": "bowling_ball",
     "symbol": "*",
     "color": "blue",
-    "name": "bowling ball",
+    "name": { "str": "bowling ball" },
     "description": "A large, heavy ball.  Before the apocalypse, its main purpose was to be rolled along waxed floors.",
     "category": "other",
     "price": 30,

data/json/items/melee/bludgeons.json

@@ -161,7 +161,7 @@
     "type": "GENERIC",
     "symbol": "/",
     "color": "dark_gray",
-    "name": "blackjack",
+    "name": { "str": "blackjack" },
     "description": "This is a short, easily concealed bludgeoning weapon consisting of a weight embedded at the end of a short leather shaft.  Formerly used by law enforcement, this weapon is meant to stun or knock out the subject, although head strikes have a high risk of causing a permanent, disabling brain injury or being fatal.",
     "price": 17500,
     "material": [ "leather", "lead" ],
@@ -178,7 +178,7 @@
     "type": "GENERIC",
     "symbol": "/",
     "color": "brown",
-    "name": "bokken",
+    "name": { "str": "bokken" },
     "description": "This is a solid wood 'training' katana, exactingly crafted to mimic the weight and balance of the real thing.  Despite its lack of a sharp metal edge, it's still quite capable of inflicting deadly wounds.",
     "price": 55000,
     "material": "wood",
@@ -198,7 +198,7 @@
     "symbol": "/",
     "color": "brown",
     "looks_like": "bokken",
-    "name": "bokken",
+    "name": { "str": "bokken" },
     "description": "This is a solid wood 'training' katana, but feels far too light to make an effective weapon.",
     "price": 12500,
     "material": "wood",
@@ -217,7 +217,7 @@
     "symbol": "/",
     "color": "brown",
     "looks_like": "bokken",
-    "name": "bokken",
+    "name": { "str": "bokken" },
     "description": "This is a solid wood 'training' katana, but it looks to be mass-produced, and not quite as effective as the real deal.",
     "price": 12500,
     "material": "wood",
@@ -251,7 +251,7 @@
   {
     "type": "GENERIC",
     "id": "bowling_pin",
-    "name": "bowling pin",
+    "name": { "str": "bowling pin" },
     "description": "A blunt bowling pin.  Makes a decent melee weapon, if somewhat short.",
     "weight": "1530 g",
     "to_hit": -1,

data/json/items/melee/swords_and_blades.json

@@ -1294,12 +1294,12 @@
     "type": "GENERIC",
     "symbol": "/",
     "color": "light_gray",
-    "name": "broadsword",
+    "name": { "str": "broadsword" },
     "description": "This is a dull, cheaply made replica of an early modern sword seeing use in the 16th, 17th, and 18th centuries.  Called 'broad' to contrast with the slimmer rapiers.",
     "price": 12000,
     "price_postapoc": 500,
     "material": "aluminum",
-    "flags": "SHEATH_SWORD",
+    "flags": [ "SHEATH_SWORD" ],
     "techniques": "WBLOCK_2",
     "weight": "753 g",
     "volume": "1750 ml",

data/json/items/tool/tailoring.json

@@ -3,7 +3,7 @@
     "id": "awl_bone",
     "type": "GENERIC",
     "category": "tools",
-    "name": "bone sewing awl",
+    "name": { "str": "bone sewing awl" },
     "description": "This is a crude sharpened bone awl; those were used for leatherworking before metal was discovered.  It can also serve as an improvised stabbing weapon, but will break quickly.",
     "weight": "200 g",
     "volume": "250 ml",

data/json/items/vehicle/plating.json

@@ -162,7 +162,7 @@
     "type": "GENERIC",
     "id": "acidchitin_plate",
     "copy-from": "chitin_plate",
-    "name": "biosilicified chitin armor kit",
+    "name": { "str": "biosilicified chitin armor kit" },
     "description": "Durable silica-coated chitin plating made for a vehicle.",
     "material": [ "acidchitin" ],
     "proportional": { "price": 1.333, "weight": 1.2, "volume": 1.18, "bashing": 1.25 }
@@ -172,7 +172,7 @@
     "id": "bone_plate",
     "symbol": "]",
     "color": "white",
-    "name": "bone armor kit",
+    "name": { "str": "bone armor kit" },
     "description": "Bone plating made for a vehicle.",
     "price": 1200,
     "material": [ "bone" ],