Merge pull request #38506 from snipercup/Generic-name-to-object,-volu…

…me-to-string

Generic name to object, volume to string and add volume

data/json/items/chemicals_and_resources.json

@@ -1360,7 +1360,7 @@
     "id": "earthbag",
     "type": "GENERIC",
     "category": "other",
-    "name": "earthbag",
+    "name": { "str": "earthbag" },
     "description": "This is a canvas sack filled with soil.  It can be used to construct simple barricades.",
     "weight": "19500 g",
     "volume": "16L",

data/json/items/corpses/corpses.json

@@ -22,7 +22,7 @@
     "id": "rmi2_corpse",
     "symbol": "%",
     "color": "white",
-    "name": "desiccated corpse",
+    "name": { "str": "desiccated corpse" },
     "description": "A dead body, badly mangled and desiccated.  It seems whatever killed him did so with a gigantic claw.",
     "category": "other",
     "material": "hflesh",

data/json/items/generic.json

@@ -405,7 +405,7 @@
     "id": "canister_empty",
     "symbol": "*",
     "color": "light_gray",
-    "name": "empty canister",
+    "name": { "str": "empty canister" },
     "description": "An empty canister, which may have once held tear gas or other substances.",
     "material": "steel",
     "weight": "158 g",
@@ -467,13 +467,13 @@
     "id": "data_card",
     "symbol": ",",
     "color": "white",
-    "name": "data card",
+    "name": { "str": "data card" },
     "description": "Some type of advanced data storage device.  Useful for storing very large amounts of information.",
     "price": 10000,
     "price_postapoc": 100,
     "material": "plastic",
     "weight": "18 g",
-    "volume": 0,
+    "volume": "1 ml",
     "to_hit": -3
   },
   {
@@ -726,7 +726,7 @@
     "id": "broketent",
     "symbol": ";",
     "color": "green",
-    "name": "damaged tent",
+    "name": { "str": "damaged tent" },
     "description": "A small tent, just big enough to fit a person comfortably.  This tent is broken and cannot be deployed.",
     "price": 6500,
     "material": [ "plastic", "aluminum" ],
@@ -1477,13 +1477,13 @@
     "id": "e_scrap",
     "symbol": ",",
     "color": "green",
-    "name": "electronic scrap",
+    "name": { "str": "electronic scrap" },
     "category": "spare_parts",
     "description": "A random collection of resistors, capacitors, and diodes which have been stripped from printed circuits.",
     "price": 3000,
     "material": "aluminum",
     "weight": "14 g",
-    "volume": 0,
+    "volume": "5 ml",
     "to_hit": 2
   },
   {
@@ -1506,7 +1506,7 @@
     "id": "fan",
     "symbol": ",",
     "color": "light_gray",
-    "name": "desk fan",
+    "name": { "str": "desk fan" },
     "description": "A small fan, used to propel air around a room.",
     "price": 1000,
     "price_postapoc": 100,
@@ -1992,7 +1992,7 @@
     "id": "diamond",
     "symbol": "*",
     "color": "white",
-    "name": "diamond",
+    "name": { "str": "diamond" },
     "description": "A sparkling diamond.",
     "price": 1000000,
     "price_postapoc": 100,
@@ -2036,7 +2036,7 @@
     "id": "emerald",
     "copy-from": "garnet",
     "color": "green",
-    "name": "emerald",
+    "name": { "str": "emerald" },
     "description": "A sparkling emerald."
   },
   {
@@ -2228,7 +2228,7 @@
     "id": "down_pillow",
     "symbol": ",",
     "color": "blue",
-    "name": "down-filled pillow",
+    "name": { "str": "down-filled pillow" },
     "description": "A fluffy pillow to rest your head on when sleeping.",
     "price": 1000,
     "material": [ "cotton" ],

data/json/items/generic/bathroom_house.json

@@ -196,7 +196,7 @@
   },
   {
     "id": "curling_iron",
-    "name": "curling iron",
+    "name": { "str": "curling iron" },
     "type": "GENERIC",
     "description": "A wand made of heat-resistant ceramics.  When plugged into an outlet, it is hot enough to shape your hair into curls.  Too bad the power's out.",
     "symbol": "/",

data/json/items/generic/spares.json

@@ -12,7 +12,7 @@
     "id": "drivebelt",
     "copy-from": "spare_part",
     "type": "GENERIC",
-    "name": "drive belt",
+    "name": { "str": "drive belt" },
     "description": "A synthetic rubber V-belt with steel reinforcement fibers commonly fitted to engines or other industrial equipment.",
     "material": [ "plastic", "steel" ],
     "weight": "850 g",

data/json/items/melee/bludgeons.json

@@ -301,7 +301,7 @@
   {
     "type": "GENERIC",
     "id": "cudgel",
-    "name": "cudgel",
+    "name": { "str": "cudgel" },
     "description": "A slender long rod of wood, while traditionally intended as a training tool for many dueling moves, it still makes a good melee weapon in a pinch.",
     "weight": "875 g",
     "to_hit": 2,
@@ -399,7 +399,7 @@
   {
     "type": "GENERIC",
     "id": "hammer_sledge_engineer",
-    "name": "engineer's hammer",
+    "name": { "str": "engineer's hammer" },
     "description": "A stout and hefty hammer, more akin to a sledge than a typical ball-peen.  Useful for portable demolition work, but is very unwieldy as a weapon.",
     "weight": "2000 g",
     "color": "brown",

data/json/items/melee/swords_and_blades.json

@@ -34,7 +34,7 @@
     "id": "sword_crude",
     "symbol": "!",
     "color": "light_gray",
-    "name": "crude sword",
+    "name": { "str": "crude sword" },
     "description": "Several bits of thin scrap metal crudely beat into the semblance of an edge over a wooden sword.  The added weight is unbalanced, but the jagged edge offers a good bit of slashing power.",
     "material": "wood",
     "volume": "2 L",

data/json/items/ranged/throwing.json

@@ -20,7 +20,7 @@
     "id": "disc_golf",
     "category": "weapons",
     "price": 1000,
-    "name": "disc",
+    "name": { "str": "disc" },
     "symbol": "o",
     "color": "red",
     "description": "A plastic disc made for playing disc golf, it is smaller and denser then a normal frisbee.",

data/json/items/tool/landscaping.json

@@ -2,7 +2,7 @@
   {
     "id": "digging_stick",
     "type": "GENERIC",
-    "name": "digging stick",
+    "name": { "str": "digging stick" },
     "category": "tools",
     "description": "This is a large stick, with the end carved into a broad blade for digging.  It could be used to dig shallow pits, but not deep ones.",
     "weight": "1133 g",

data/json/items/vehicle/controls.json

@@ -75,7 +75,7 @@
   {
     "type": "GENERIC",
     "id": "vehicle_dashboard",
-    "name": "dashboard",
+    "name": { "str": "dashboard" },
     "description": "A vehicle instrument panel with various gauges and switches.  Useful for crafting.",
     "weight": "2721 g",
     "to_hit": -2,
@@ -91,7 +91,7 @@
     "type": "GENERIC",
     "id": "electronics_controls",
     "copy-from": "vehicle_dashboard",
-    "name": "electronics control unit",
+    "name": { "str": "electronics control unit" },
     "description": "A vehicle instrument panel with various gauges and switches.  Useful for crafting.",
     "weight": "1311 g",
     "to_hit": -4,

data/json/items/vehicle/lights.json

@@ -93,7 +93,7 @@
   {
     "type": "GENERIC",
     "id": "directed_floodlight",
-    "name": "directed floodlight",
+    "name": { "str": "directed floodlight" },
     "description": "A large and heavy light designed to illuminate a wide area in a half-circular cone.",
     "copy-from": "floodlight"
   }

data/json/items/vehicle/motors.json

@@ -2,7 +2,7 @@
   {
     "type": "GENERIC",
     "id": "motor",
-    "name": "electric motor",
+    "name": { "str": "electric motor" },
     "description": "A powerful electric motor.  Useful for crafting.",
     "weight": "25 kg",
     "color": "light_cyan",
@@ -16,7 +16,7 @@
   {
     "type": "GENERIC",
     "id": "motor_enhanced",
-    "name": "enhanced electric motor",
+    "name": { "str": "enhanced electric motor" },
     "description": "A very powerful and yet lightweight electric motor.  Useful for crafting.",
     "weight": "100 kg",
     "material": [ "superalloy" ],

data/json/items/vehicle/utilities.json

@@ -153,7 +153,7 @@
   {
     "type": "GENERIC",
     "id": "dishwasher",
-    "name": "dishwasher",
+    "name": { "str": "dishwasher" },
     "description": "A very small dishwasher designed for use in vehicles.",
     "looks_like": "washing_machine",
     "copy-from": "washing_machine"