Generic modern json

data/json/items/comestibles/bread.json

@@ -23,7 +23,7 @@
     "id": "sourdough_young",
     "type": "GENERIC",
     "category": "food",
-    "name": "juvenile sourdough starter",
+    "name": { "str": "juvenile sourdough starter" },
     "description": "This jar contains a floury paste that is slowly going bad.  Someday it will be sourdough.",
     "weight": "52 g",
     "volume": "250 ml",

data/json/items/comestibles/carnivore.json

@@ -695,7 +695,7 @@
     "type": "GENERIC",
     "id": "bone_human",
     "copy-from": "bone",
-    "name": "human bone",
+    "name": { "str": "human bone" },
     "description": "A bone from a human being.  Could be used to make some stuff, if you're feeling sufficiently ghoulish.",
     "flags": [ "CANNIBALISM" ]
   },

data/json/items/generic.json

@@ -710,7 +710,7 @@
     "id": "lawnmower",
     "symbol": ";",
     "color": "green",
-    "name": "lawnmower",
+    "name": { "str": "lawnmower" },
     "description": "A motorized pushmower that seems to be broken.  You could take it apart if you had a wrench.",
     "category": "other",
     "price": 10000,
@@ -741,7 +741,7 @@
     "id": "largebroketent",
     "symbol": ";",
     "color": "green",
-    "name": "large damaged tent",
+    "name": { "str": "large damaged tent" },
     "description": "A family sized tent, very bulky but with plenty of space.  This tent is broken and can not be deployed.",
     "price": 10000,
     "material": [ "plastic", "aluminum" ],
@@ -836,7 +836,7 @@
     "id": "laptop",
     "symbol": ",",
     "color": "dark_gray",
-    "name": "laptop computer",
+    "name": { "str": "laptop computer" },
     "category": "other",
     "description": "A broken laptop, basically a paperweight now.",
     "price": 1000,
@@ -1322,7 +1322,7 @@
     "id": "large_lcd_screen",
     "symbol": ",",
     "color": "dark_gray",
-    "name": "large LCD screen",
+    "name": { "str": "large LCD screen" },
     "category": "spare_parts",
     "description": "A large backlit screen, used for displaying images.  Useful in some electronics recipes.",
     "price": 10000,
@@ -2360,7 +2360,7 @@
   {
     "type": "GENERIC",
     "id": "joint_lit",
-    "name": "joint",
+    "name": { "str": "joint" },
     "color": "light_green",
     "symbol": "!",
     "description": "The smell of skunk permeates the air as a thin trail of smoke floats off of this joint.",
@@ -2564,13 +2564,13 @@
     "looks_like": "id_science",
     "symbol": ",",
     "color": "green",
-    "name": "industrial ID card",
+    "name": { "str": "industrial ID card" },
     "description": "This ID card once belonged to a high level technician.  The reverse side describes protocol for using it; this could grant access at one control panel, if you can find one.",
     "price": 120000,
     "price_postapoc": 10000,
     "material": "plastic",
     "weight": "6 g",
-    "volume": 0,
+    "volume": "5 ml",
     "to_hit": -3
   },
   {
@@ -2603,7 +2603,7 @@
   {
     "id": "light_bulb",
     "type": "GENERIC",
-    "name": "light bulb",
+    "name": { "str": "light bulb" },
     "description": "A rather outdated light bulb used in all sorts of light equipment.",
     "symbol": ",",
     "color": "white",
@@ -2757,7 +2757,7 @@
     "id": "craft",
     "symbol": "%",
     "color": "white",
-    "name": "in progress craft",
+    "name": { "str": "in progress craft" },
     "description": "This is an in progress craft.",
     "price": 0,
     "weight": "1 g",

data/json/items/generic/currency.json

@@ -57,7 +57,7 @@
   {
     "type": "GENERIC",
     "id": "icon",
-    "name": "icon",
+    "name": { "str": "icon" },
     "description": "This is a small picture, about the same size as an ID card, symbolizing a religious figure.  On the back, there is a text that faintly reads 'New England Church Community'.",
     "price": 200,
     "price_postapoc": 320,

data/json/items/generic/toys_and_sports.json

@@ -172,7 +172,7 @@
     "id": "puck",
     "symbol": "*",
     "color": "dark_gray",
-    "name": "hockey puck",
+    "name": { "str": "hockey puck" },
     "category": "other",
     "description": "A heavy circular block of solid rubber, normally used for playing hockey.  You can throw it to cause some serious harm.",
     "price": 1000,

data/json/items/melee/bludgeons.json

@@ -436,7 +436,7 @@
     "id": "hockey_stick",
     "symbol": ";",
     "color": "white",
-    "name": "hockey stick",
+    "name": { "str": "hockey stick" },
     "description": "A curved wooden stick with a wide and flat end.  Commonly used by hockey players.",
     "price": 11000,
     "price_postapoc": 2000,
@@ -451,7 +451,7 @@
   {
     "type": "GENERIC",
     "id": "homewrecker",
-    "name": "homewrecker",
+    "name": { "str": "homewrecker" },
     "description": "A long piece of wood with several chunks of steel firmly tied to it.  The resulting weapon is unwieldy and slow but very heavy hitting.",
     "weight": "3024 g",
     "to_hit": -3,

data/json/items/melee/spears_and_polearms.json

@@ -404,7 +404,7 @@
   {
     "type": "GENERIC",
     "id": "javelin_iron",
-    "name": "iron javelin",
+    "name": { "str": "iron javelin" },
     "description": "An iron-tipped wooden throwing spear.  The grip area has been carved and covered for better grip.",
     "weight": "960 g",
     "to_hit": 2,

data/json/items/melee/swords_and_blades.json

@@ -1061,7 +1061,7 @@
     "type": "GENERIC",
     "symbol": "/",
     "color": "brown",
-    "name": "hollow cane",
+    "name": { "str": "hollow cane" },
     "description": "A cane designed to conceal blade.  This was a popular fashion accessory for the wealthy during the 18th and 19th centuries.",
     "price": 2000,
     "price_postapoc": 1000,
@@ -1218,13 +1218,13 @@
     "type": "GENERIC",
     "symbol": "/",
     "color": "light_gray",
-    "name": "katana",
+    "name": { "str": "katana" },
     "description": "This is a dull, cheaply made replica of a rare sword from Japan.",
     "price": 5000,
     "price_postapoc": 0,
     "material": "aluminum",
     "techniques": [ "RAPID", "WBLOCK_2" ],
-    "flags": "SHEATH_SWORD",
+    "flags": [ "SHEATH_SWORD" ],
     "weight": "753 g",
     "volume": "2 L",
     "bashing": 10,
@@ -1522,7 +1522,7 @@
     "id": "lajatang",
     "symbol": "/",
     "color": "brown",
-    "name": "lajatang",
+    "name": { "str": "lajatang" },
     "description": "An exotic weapon comprised of a long pole of wood with curved blades on each end.  It can be deadly in skilled hands.",
     "price": 12000,
     "material": [ "wood", "iron" ],

data/json/items/ranged/throwing.json

@@ -66,7 +66,7 @@
     "id": "lawn_dart",
     "category": "weapons",
     "price": 1000,
-    "name": "lawn dart",
+    "name": { "str": "lawn dart" },
     "symbol": ";",
     "color": "yellow",
     "description": "A large plastic dart made for outdoor games.",

data/json/items/resources/wood.json

@@ -144,7 +144,7 @@
   {
     "type": "GENERIC",
     "id": "wood_sheet",
-    "name": "large wooden sheet",
+    "name": { "str": "large wooden sheet" },
     "description": "A standard 4x8 sheet of flat wood - usually plywood, OSB, or MDF.  Heavy and bulky, this is extremely useful for all manner of construction, but you might have to cut it to size before doing smaller projects.",
     "//": "Weight and volume assumes 32 square feet of 1/2 inch plywood.  Due to its enormously bulky shape, volume is higher than actual displacement volume",
     "category": "spare_parts",

data/json/items/robot_parts.json

@@ -22,7 +22,7 @@
   {
     "type": "GENERIC",
     "id": "identification_module",
-    "name": "identification module",
+    "name": { "str": "identification module" },
     "description": "This module continuously runs image recognition algorithms to identify friends from foe.",
     "copy-from": "robot_module_abstract"
   },

data/json/items/tool/explosives.json

@@ -770,7 +770,7 @@
     "copy-from": "grenade_canister",
     "looks_like": "smokebomb",
     "type": "GENERIC",
-    "name": "insecticidal gas grenade",
+    "name": { "str": "insecticidal gas grenade" },
     "price": 3600,
     "description": "This is a canister grenade filled with insecticidal solution.  Use this item to pull the pin and light the fuse, turning it into an active insecticidal grenade.  In five turns it will begin to expel a volatile spray that is highly toxic to insect life forms.",
     "countdown_action": { "menu_text": "Pull pin", "type": "transform", "target": "insecticidalbomb_act" }

data/json/items/tool/fishing.json

@@ -31,10 +31,10 @@
   {
     "id": "fishing_hook_bone",
     "type": "GENERIC",
-    "name": "improvised fishing hook",
+    "name": { "str": "improvised fishing hook" },
     "description": "An improvised fishing hook carved from wood or bone.",
     "weight": "1 g",
-    "volume": 0,
+    "volume": "1 ml",
     "price": 25,
     "cutting": 3,
     "material": "bone",

data/json/items/vehicle/engine.json

@@ -230,7 +230,7 @@
     "id": "engine_block_large",
     "copy-from": "spare_part",
     "type": "GENERIC",
-    "name": "large engine block",
+    "name": { "str": "large engine block" },
     "description": "The beginnings of a large gas or diesel engine.  It's not good for much of anything on its own.",
     "material": "iron",
     "weight": "190000 g",

data/json/items/vehicle/mills.json

@@ -17,7 +17,7 @@
   {
     "type": "GENERIC",
     "id": "xl_wind_turbine",
-    "name": "large wind turbine",
+    "name": { "str": "large wind turbine" },
     "description": "A large turbine that can convert wind into electric power.",
     "weight": "150000 g",
     "to_hit": -7,
@@ -43,7 +43,7 @@
   {
     "type": "GENERIC",
     "id": "xl_water_wheel",
-    "name": "large water wheel",
+    "name": { "str": "large water wheel" },
     "description": "A large water wheel with wooden supports.  Will recharge the vehicle's electrical power when built over shallow moving water.",
     "weight": "600000 g",
     "symbol": "o",

data/json/items/vehicle/motors.json

@@ -37,7 +37,7 @@
   {
     "type": "GENERIC",
     "id": "motor_large",
-    "name": "large electric motor",
+    "name": { "str": "large electric motor" },
     "description": "A large and very powerful electric motor.  Useful for crafting.",
     "weight": "75 kg",
     "to_hit": -3,

data/json/items/vehicle/seating.json

@@ -19,7 +19,7 @@
     "type": "GENERIC",
     "copy-from": "seat",
     "id": "seat_leather",
-    "name": "leather seat",
+    "name": { "str": "leather seat" },
     "description": "A soft car seat covered with leather.",
     "material": [ "leather", "cotton", "aluminum" ],
     "price": 60000,