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

Generic name to object

data/json/items/generic.json

@@ -577,7 +577,7 @@
     "id": "wire_barbed",
     "symbol": ";",
     "color": "light_gray",
-    "name": "barbed wire",
+    "name": { "str": "barbed wire" },
     "description": "A length of stiff wire, covered in sharp barbs.",
     "price": 20000,
     "price_postapoc": 500,

data/json/items/generic/spares.json

@@ -56,7 +56,7 @@
     "id": "filter_liquid",
     "copy-from": "spare_part",
     "type": "GENERIC",
-    "name": "automotive filter",
+    "name": { "str": "automotive filter" },
     "description": "A steel can containing filter paper designed for automotive use.",
     "material": [ "steel", "paper" ],
     "weight": "480 g",

data/json/items/generic/toys_and_sports.json

@@ -127,7 +127,7 @@
     "id": "baseball",
     "symbol": "*",
     "color": "white",
-    "name": "baseball",
+    "name": { "str": "baseball" },
     "category": "other",
     "description": "A baseball, good for throwing at enemies.  Getting hit with one of these hurts a lot more than you might think.",
     "price": 1000,
@@ -157,7 +157,7 @@
     "id": "basketball",
     "symbol": "*",
     "color": "brown",
-    "name": "basketball",
+    "name": { "str": "basketball" },
     "category": "other",
     "description": "A high-quality indoor basketball.  You may throw it at zombies.",
     "price": 1200,

data/json/items/melee/bludgeons.json

@@ -34,7 +34,7 @@
   {
     "type": "GENERIC",
     "id": "bat",
-    "name": "baseball bat",
+    "name": { "str": "baseball bat" },
     "description": "A sturdy wood bat.  Makes a great melee weapon.",
     "weight": "1133 g",
     "to_hit": 3,
@@ -123,7 +123,7 @@
     "type": "GENERIC",
     "symbol": "/",
     "color": "light_gray",
-    "name": "battle axe",
+    "name": { "str": "battle axe" },
     "description": "This is a dull, cheaply made replica of a massive axe designed for warfare.",
     "price": 1050,
     "price_postapoc": 300,
@@ -267,7 +267,7 @@
   {
     "type": "GENERIC",
     "id": "bwirebat",
-    "name": "barbed wire bat",
+    "name": { "str": "barbed wire bat" },
     "description": "A baseball bat wrapped with barbed wire.  A brutal melee weapon.",
     "weight": "1420 g",
     "to_hit": 3,

data/json/items/melee/swords_and_blades.json

@@ -582,12 +582,12 @@
     "symbol": "/",
     "color": "light_gray",
     "looks_like": "arming_sword",
-    "name": "arming sword",
+    "name": { "str": "arming sword" },
     "description": "This is a dull, cheaply made replica of a classic medieval sword, just the right size to use one-handed.",
     "price": 10000,
     "price_postapoc": 0,
     "material": "aluminum",
-    "flags": "SHEATH_SWORD",
+    "flags": [ "SHEATH_SWORD" ],
     "techniques": [ "WBLOCK_2" ],
     "weight": "704 g",
     "volume": "2 L",

data/json/items/resources/misc.json

@@ -2,7 +2,7 @@
   {
     "type": "GENERIC",
     "id": "bee_sting",
-    "name": "bee sting",
+    "name": { "str": "bee sting" },
     "description": "A six-inch stinger from a giant bee.  Makes a mediocre melee weapon.",
     "weight": "540 g",
     "to_hit": -1,

data/json/items/robot_parts.json

@@ -64,7 +64,7 @@
   {
     "type": "GENERIC",
     "id": "ai_module_basic",
-    "name": "basic AI core",
+    "name": { "str": "basic AI core" },
     "description": "A very basic AI core with minimal cognitive abilities.",
     "weight": "125 g",
     "copy-from": "ai_module"

data/json/items/tool/cooking.json

@@ -3,7 +3,7 @@
     "id": "atomic_coffeepot",
     "type": "GENERIC",
     "category": "tools",
-    "name": "atomic coffee maker",
+    "name": { "str": "atomic coffee maker" },
     "description": "This is a Curie-G coffeemaker, by CuppaTech.  It famously uses a radioactive generator to heat water for coffee.  Normally the water is heated using energy stored in a capacitor, and makes ordinary coffee.  However, as a special feature, water from the RTG containment area can be used, giving the coffee a very special kick.  The Curie-G is illegal in most countries.",
     "weight": "6102 g",
     "volume": "1000 ml",

data/json/items/tool/explosives.json

@@ -498,7 +498,7 @@
     "copy-from": "gasbomb",
     "looks_like": "smokebomb_act",
     "type": "GENERIC",
-    "name": "armed fungicidal gas canister",
+    "name": { "str": "armed fungicidal gas canister" },
     "description": "This fungicidal bomb has had its pin removed and is expelling highly toxic gas.",
     "emits": [ "emit_fungicidal_stream" ],
     "countdown_interval": 50,
@@ -520,7 +520,7 @@
     "copy-from": "gasbomb",
     "looks_like": "smokebomb_act",
     "type": "GENERIC",
-    "name": "armed makeshift fungicidal gas canister",
+    "name": { "str": "armed makeshift fungicidal gas canister" },
     "description": "This makeshift fungicidal bomb has had its pin removed and is expelling highly toxic haze.",
     "emits": [ "emit_small_fungicidal_stream" ],
     "countdown_interval": 50,
@@ -758,7 +758,7 @@
     "id": "gasbomb_act",
     "copy-from": "gasbomb",
     "type": "GENERIC",
-    "name": "armed tear gas canister",
+    "name": { "str": "armed tear gas canister" },
     "description": "This smoke bomb has had its pin removed and is expelling highly toxic gas.",
     "emits": [ "emit_tear_gas_stream" ],
     "countdown_interval": 50,
@@ -780,7 +780,7 @@
     "copy-from": "gasbomb",
     "looks_like": "smokebomb_act",
     "type": "GENERIC",
-    "name": "armed insecticidal gas canister",
+    "name": { "str": "armed insecticidal gas canister" },
     "description": "This insecticidal bomb has had its pin removed and is expelling highly toxic haze.",
     "emits": [ "emit_insecticidal_stream" ],
     "countdown_interval": 50,
@@ -802,7 +802,7 @@
     "copy-from": "gasbomb",
     "looks_like": "smokebomb_act",
     "type": "GENERIC",
-    "name": "armed makeshift insecticidal gas canister",
+    "name": { "str": "armed makeshift insecticidal gas canister" },
     "description": "This makeshift insecticidal bomb has had its pin removed and is expelling highly toxic haze.",
     "emits": [ "emit_small_insecticidal_stream" ],
     "countdown_interval": 50,
@@ -1134,7 +1134,7 @@
     "id": "smokebomb_act",
     "copy-from": "smokebomb",
     "type": "GENERIC",
-    "name": "armed smoke bomb",
+    "name": { "str": "armed smoke bomb" },
     "description": "This smoke bomb has had its pin removed and is expelling thick smoke.",
     "emits": [ "emit_smoke_stream" ],
     "countdown_interval": 100,

data/json/items/tool/lighting.json

@@ -3,7 +3,7 @@
     "id": "atomic_lamp",
     "type": "GENERIC",
     "category": "tools",
-    "name": "atomic lamp",
+    "name": { "str": "atomic lamp" },
     "description": "Powered by the magic of nuclear decay and low-energy LEDs, this very expensive lamp will emit a small amount of light for at least a decade.  Before the Cataclysm, it was mostly an expensive way to show off your preparedness.  Now, it's actually pretty cool.  Use it to close the cover and hide the light.",
     "weight": "1438 g",
     "volume": "1 L",
@@ -43,7 +43,7 @@
     "id": "atomic_light",
     "type": "GENERIC",
     "category": "tools",
-    "name": "atomic reading light",
+    "name": { "str": "atomic reading light" },
     "description": "Powered by the magic of nuclear decay and low-energy LEDs, this extremely expensive little light will provide just enough light to read by for at least a decade.  It is also available with a cute cartoon bear cover to turn it into a nightlight for a very wealthy child with a fear of the dark.  Use it to close the cover and hide the light.",
     "weight": "214 g",
     "volume": "250 ml",

data/json/items/vehicle/alternator.json

@@ -32,7 +32,7 @@
     "id": "alternator_bicycle",
     "copy-from": "vehicle_alternator",
     "type": "GENERIC",
-    "name": "bicycle alternator",
+    "name": { "str": "bicycle alternator" },
     "description": "A very lightweight alternator used to power a bicycle's headlights.",
     "weight": "1100 g",
     "volume": "1 L",

data/json/items/vehicle/cargo.json

@@ -19,7 +19,7 @@
   {
     "id": "bike_rack",
     "type": "GENERIC",
-    "name": "bike rack",
+    "name": { "str": "bike rack" },
     "description": "A collection of pipes, cams, and straps, mounted on the edge of a vehicle and used to support another vehicle for transport.  It must be mounted on a vehicle to be used.",
     "weight": "4000 g",
     "volume": "6250 ml",
@@ -55,7 +55,7 @@
   {
     "type": "GENERIC",
     "id": "bike_basket",
-    "name": "bike basket",
+    "name": { "str": "bike basket" },
     "description": "A simple bike basket.  It is small and foldable.",
     "weight": "1200 g",
     "volume": "5 L",

data/json/items/vehicle/noise.json

@@ -19,7 +19,7 @@
   {
     "type": "GENERIC",
     "id": "beeper",
-    "name": "back-up beeper",
+    "name": { "str": "back-up beeper" },
     "description": "This is a safety device intended to warn passersby of a vehicle moving in reverse, but the usage of it now seems terribly unwise.",
     "weight": "360 g",
     "symbol": ";",