Merge pull request #38368 from snipercup/Generic-name-to-object

Generic name to object, volume to string

data/json/items/book/maps.json

@@ -3,7 +3,7 @@
     "abstract": "abstractmap",
     "type": "GENERIC",
     "category": "maps",
-    "name": "abstract map",
+    "name": { "str": "abstract map" },
     "description": "seeing this is a bug",
     "weight": "30 g",
     "volume": "250 ml",

data/json/items/comestibles/mre.json

@@ -4,7 +4,7 @@
     "type": "GENERIC",
     "symbol": ")",
     "color": "brown",
-    "name": "MRE",
+    "name": { "str": "MRE" },
     "category": "food",
     "description": "A generic MRE box, you shouldn't see this.",
     "price": 1500,

data/json/items/generic.json

@@ -453,13 +453,13 @@
     "id": "usb_drive",
     "symbol": ",",
     "color": "white",
-    "name": "USB drive",
+    "name": { "str": "USB drive" },
     "description": "A USB thumb drive.  Useful for holding software.",
     "price": 10000,
     "price_postapoc": 100,
     "material": "plastic",
     "weight": "18 g",
-    "volume": 0,
+    "volume": "5 ml",
     "to_hit": -3
   },
   {
@@ -1251,7 +1251,7 @@
     "id": "RAM",
     "symbol": ",",
     "color": "dark_gray",
-    "name": "RAM",
+    "name": { "str": "RAM" },
     "category": "spare_parts",
     "description": "A stick of memory.  Useful in advanced electronics crafting.",
     "price": 9000,
@@ -1280,7 +1280,7 @@
     "id": "amplifier",
     "symbol": ",",
     "color": "light_gray",
-    "name": "amplifier circuit",
+    "name": { "str": "amplifier circuit" },
     "category": "spare_parts",
     "description": "A circuit designed to amplify the strength of a signal.  Useful in lots of electronics recipes.",
     "price": 20000,
@@ -1436,7 +1436,7 @@
     "id": "antenna",
     "symbol": ",",
     "color": "light_gray",
-    "name": "antenna",
+    "name": { "str": "antenna" },
     "category": "spare_parts",
     "description": "A simple thin aluminum shaft.  Useful in lots of electronics recipes.",
     "price": 8000,
@@ -1698,14 +1698,14 @@
     "id": "mobile_memory_card",
     "symbol": ",",
     "color": "white",
-    "name": "SD-Memory card",
+    "name": { "str": "SD-Memory card" },
     "description": "A memory card, used.  Might be worth a look.",
     "price": 1000,
     "price_postapoc": 0,
     "material": "plastic",
     "flags": [ "MC_MOBILE", "MC_RANDOM_STUFF", "MC_MAY_BE_ENCRYPTED", "MC_TURN_USED" ],
     "weight": "5 g",
-    "volume": 0
+    "volume": "2 ml"
   },
   {
     "type": "GENERIC",
@@ -1919,10 +1919,10 @@
     "symbol": ",",
     "color": "yellow",
     "looks_like": "brick",
-    "name": "adobe brick",
+    "name": { "str": "adobe brick" },
     "description": "A compacted mass of soil and natural fibers, baked dry enough to harden into a brick.",
     "material": "soil",
-    "flags": "NONCONDUCTIVE",
+    "flags": [ "NONCONDUCTIVE" ],
     "weight": "1500 g",
     "volume": "750 ml",
     "bashing": 10,
@@ -2020,15 +2020,15 @@
     "id": "amethyst",
     "copy-from": "garnet",
     "color": "blue",
-    "name": "amethyst",
+    "name": { "str": "amethyst" },
     "description": "A sparkling amethyst."
   },
   {
     "type": "GENERIC",
     "id": "aquamarine",
     "copy-from": "garnet",
     "color": "cyan",
-    "name": "aquamarine",
+    "name": { "str": "aquamarine" },
     "description": "A sparkling aquamarine."
   },
   {
@@ -2044,7 +2044,7 @@
     "id": "alexandrite",
     "copy-from": "garnet",
     "color": "green",
-    "name": "alexandrite",
+    "name": { "str": "alexandrite" },
     "description": "A sparkling alexandrite."
   },
   {
@@ -2592,7 +2592,7 @@
     "type": "GENERIC",
     "symbol": "(",
     "color": "magenta",
-    "name": "TX-5LR Laser Cannon",
+    "name": { "str": "TX-5LR Laser Cannon" },
     "description": "A laser cannon stripped from the barrel of a TX-5LR Cerberus laser turret.  Unusable as a weapon on its own without the necessary parts.",
     "price": 5000000,
     "material": [ "steel", "plastic" ],
@@ -2798,7 +2798,7 @@
     "id": "amplifier_head",
     "symbol": ";",
     "color": "blue",
-    "name": "amplifier head",
+    "name": { "str": "amplifier head" },
     "description": "An amplifier head.  Typically paired with a speaker cabinet for amplifying musical instruments.  Basically only good for spare parts now.",
     "price": 25000,
     "price_postapoc": 2000,

data/json/items/generic/ammolink.json

@@ -3,7 +3,7 @@
     "abstract": "ammolink",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": "ammo belt linkage",
+    "name": { "str": "ammo belt linkage" },
     "description": "A small metal linkage from a disintegrating ammo belt.",
     "weight": "2 g",
     "volume": "2ml",

data/json/items/generic/currency.json

@@ -2,7 +2,7 @@
   {
     "type": "GENERIC",
     "id": "FMCNote",
-    "name": "Merch",
+    "name": { "str": "Merch" },
     "description": "The Free Merchant Certified Note, also known by names such as a 'c-note' or 'merch', is a currency based on old American bills.  Fifty dollar bills and larger are printed with a promissory note signed by the treasurer of the Free Merchants, along with a complex design.  The note explains that this can be exchanged for food, water, and other services through the Free Merchants in the Refugee Center.",
     "price": 5000,
     "price_postapoc": 320,

data/json/items/generic/spares.json

@@ -34,7 +34,7 @@
     "id": "filter_air",
     "copy-from": "spare_part",
     "type": "GENERIC",
-    "name": "air filter",
+    "name": { "str": "air filter" },
     "description": "A plastic box containing crêped paper used to filter the air supply for combustion engines or other industrial equipment.",
     "material": [ "plastic", "paper" ],
     "weight": "360 g",

data/json/items/melee/bludgeons.json

@@ -50,7 +50,7 @@
   {
     "type": "GENERIC",
     "id": "bat_metal",
-    "name": "aluminum bat",
+    "name": { "str": "aluminum bat" },
     "description": "An aluminum baseball bat, lighter than a wooden bat and a little easier to swing as a result.",
     "weight": "765 g",
     "to_hit": 3,
@@ -641,14 +641,14 @@
   {
     "type": "GENERIC",
     "id": "mjolnir",
-    "name": "Mjölnir",
+    "name": { "str": "Mjölnir" },
     "description": "A large hammer, forged from the heart of a dying star.  It bears the inscription:\n\nWhosoever holds this hammer,\nIf he be worthy,\nShall possess the power to…\nCRUSH!'",
     "weight": "5443 g",
     "color": "light_gray",
     "symbol": "/",
     "material": [ "wood", "steel" ],
     "techniques": [ "WBLOCK_1", "BRUTAL", "WIDE", "SWEEP" ],
-    "flags": "NONCONDUCTIVE",
+    "flags": [ "NONCONDUCTIVE" ],
     "volume": "2500 ml",
     "bashing": 9999,
     "price": 12000,

data/json/items/resources/alien.json

@@ -3,7 +3,7 @@
     "id": "resin_chunk",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": "alien resin chunk",
+    "name": { "str": "alien resin chunk" },
     "description": "This is a shattered fragment of alien resin.  It looks a bit like a large piece of sea glass, frosted and gritty with the edges rounded off.  It is somewhat warm to the touch.",
     "weight": "70 g",
     "volume": "250 ml",

data/json/items/resources/metal.json

@@ -73,7 +73,7 @@
     "id": "material_aluminium_ingot",
     "type": "GENERIC",
     "category": "spare_parts",
-    "name": "aluminum ingot",
+    "name": { "str": "aluminum ingot" },
     "description": "A small aluminum ingot, standardized for further processing.  Light but durable, this could be cast into various shapes for construction or ground down to a powder, for more… high-profile applications.",
     "weight": "675 g",
     "//": "Density 2.70g/cm³ = 675g/250ml",

data/json/items/robot_parts.json

@@ -72,7 +72,7 @@
   {
     "type": "GENERIC",
     "id": "ai_module_advanced",
-    "name": "advanced AI core",
+    "name": { "str": "advanced AI core" },
     "description": "An advanced AI core with impressive cognitive abilities.",
     "copy-from": "ai_module"
   },
@@ -203,7 +203,7 @@
   {
     "type": "GENERIC",
     "id": "android_chassis",
-    "name": "android skeleton",
+    "name": { "str": "android skeleton" },
     "description": "What's left when you strip an android body from its components.",
     "symbol": "c",
     "color": "light_gray",

data/json/items/vehicle/cargo.json

@@ -125,7 +125,7 @@
     "id": "animal_locker",
     "type": "GENERIC",
     "copy-from": "livestock_carrier",
-    "name": "animal locker",
+    "name": { "str": "animal locker" },
     "description": "A locker used to contain animals safely during transportation if installed properly.  There is room for animal food and other animal care goods.  It is meant to hold medium or smaller animals for transport.  Use it on a suitable animal to capture, use it on an empty tile to release.",
     "weight": "10000 g",
     "volume": "31250 ml"

data/json/items/vehicle/engineering.json

@@ -55,7 +55,7 @@
     "type": "GENERIC",
     "id": "v_airjack_item",
     "symbol": "&",
-    "name": "airjack",
+    "name": { "str": "airjack" },
     "color": "dark_gray",
     "description": "An extendable metal pylon used to replace a portable jack.  If mounted to a vehicle, it could be used to lift it up.",
     "weight": "21000 g",

data/json/items/vehicle/rigs.json

@@ -43,7 +43,7 @@
     "id": "kitchen_unit",
     "copy-from": "vehicle_rig",
     "type": "GENERIC",
-    "name": "RV kitchen unit",
+    "name": { "str": "RV kitchen unit" },
     "description": "A vehicle mountable electric range and sink unit with integrated tool storage for cooking utensils."
   },
   {