Merge pull request #38593 from snipercup/Tool-modern-json

Tool name to object, volume to string, fix looks_like

data/json/items/items_holiday.json

@@ -52,7 +52,7 @@
   {
     "id": "decorative_wreath",
     "type": "TOOL",
-    "name": "yule wreath",
+    "name": { "str": "yule wreath" },
     "description": "This decorative wreath can be deployed as furniture to decorate for the winter holidays.",
     "weight": "1814 g",
     "volume": "4 L",
@@ -61,7 +61,7 @@
     "material": "wood",
     "symbol": "0",
     "color": "green",
-    "looks_like": "plate",
+    "looks_like": "steel_plate",
     "use_action": { "type": "deploy_furn", "furn_type": "f_winter_wreath" }
   }
 ]

data/json/items/melee/knives_kitchen.json

@@ -106,7 +106,7 @@
   },
   {
     "id": "knife_vegetable_cleaver",
-    "name": "vegetable cleaver",
+    "name": { "str": "vegetable cleaver" },
     "type": "TOOL",
     "category": "weapons",
     "description": "This is a menacing looking knife with a broad, square shaped blade, curved for fast vegetable chopping.  Its heft and sharpness would make it a decent weapon as well, although not as good as a meat cleaver.",

data/json/items/melee/swords_and_blades.json

@@ -767,7 +767,7 @@
     "id": "zweihander",
     "type": "TOOL",
     "category": "weapons",
-    "name": "zweihänder",
+    "name": { "str": "zweihänder" },
     "description": "This is a huge two-handed sword from Germany.  It packs a real wallop.",
     "weight": "3176 g",
     "volume": "3250 ml",
@@ -1275,7 +1275,7 @@
     "type": "TOOL",
     "symbol": "/",
     "color": "light_gray",
-    "name": "zweihänder",
+    "name": { "str": "zweihänder" },
     "description": "This is a huge two-handed sword from Germany.  You're not quite sure it's supposed to be that bendy.",
     "price": 160000,
     "material": "budget_steel",

data/json/items/tool/cooking.json

@@ -372,10 +372,10 @@
     "id": "heatpack_used",
     "type": "TOOL",
     "category": "other",
-    "name": "used heat pack",
+    "name": { "str": "used heat pack" },
     "description": "This is a chemical heat pack.  It's used to treat sports injuries and heat food.  This one has been used and is chemically inert, rendering it useless.",
     "weight": "226 g",
-    "volume": 0,
+    "volume": "250 ml",
     "price": 0,
     "to_hit": 1,
     "bashing": 1,
@@ -886,7 +886,7 @@
   {
     "id": "vac_sealer",
     "type": "TOOL",
-    "name": "vacuum sealer",
+    "name": { "str": "vacuum sealer" },
     "description": "This is a portable heat sealer unit with an air pump.  It's used for vacuum packing food to preserve it.",
     "weight": "2449 g",
     "volume": "1250 ml",
@@ -925,7 +925,7 @@
   {
     "id": "water_purifier",
     "type": "TOOL",
-    "name": "water purifier",
+    "name": { "str": "water purifier" },
     "description": "This is a battery-powered device designed to purify drinking water.  Using this item on a container full of water will purify the contents.  It could be useful for water taken from uncertain sources like a river, as it may be non-potable.",
     "weight": "1360 g",
     "volume": "3 L",

data/json/items/tool/deployable.json

@@ -233,7 +233,7 @@
   {
     "id": "water_mill",
     "type": "TOOL",
-    "name": "water mill",
+    "name": { "str": "water mill" },
     "description": "A small water-powered mill that can convert starchy products into flour.  Can be placed via the construction menu.",
     "weight": "120000 g",
     "volume": "22500 ml",
@@ -248,7 +248,7 @@
   {
     "id": "wind_mill",
     "type": "TOOL",
-    "name": "wind mill",
+    "name": { "str": "wind mill" },
     "description": "A small wind-powered mill that can convert starchy products into flour.  Can be placed via the construction menu.",
     "weight": "120000 g",
     "volume": "22500 ml",

data/json/items/tool/med.json

@@ -177,10 +177,10 @@
   {
     "id": "wrapped_rad_badge",
     "type": "TOOL",
-    "name": "wrapped radiation badge",
+    "name": { "str": "wrapped radiation badge" },
     "description": "This is a badge that detects radiation dosage sealed in a radiation-blocking bag.  Use it to remove it from the bag.",
     "weight": "20 g",
-    "volume": 0,
+    "volume": "15 ml",
     "price": 1000,
     "material": [ "plastic" ],
     "symbol": ",",

data/json/items/tool/misc.json

@@ -365,7 +365,7 @@
   {
     "id": "pheromone",
     "type": "TOOL",
-    "name": "zombie pheromone",
+    "name": { "str": "zombie pheromone" },
     "description": "This is a disgusting ball of rotting meat of zombie origin.  Squeezing this gland causes a small cloud of pheromones to spray into the air.  Apparently the foul secretion can change zombies' attitude towards you, and they may ignore you for a short period of time.  Perhaps they briefly consider you as one of them.",
     "weight": "238 g",
     "volume": "250 ml",
@@ -664,7 +664,7 @@
   {
     "id": "vortex_stone",
     "type": "TOOL",
-    "name": "vortex stone",
+    "name": { "str": "vortex stone" },
     "description": "This is a stone with spirals all over it, and holes around its perimeter.  Though it is fairly large, it weighs next to nothing.  Air seems to gather around it.",
     "weight": "1 g",
     "volume": "250 ml",
@@ -682,7 +682,7 @@
     "id": "whistle_multitool",
     "type": "TOOL",
     "category": "tools",
-    "name": "whistle multitool",
+    "name": { "str": "whistle multitool" },
     "description": "A cheap gadget combining a whistle, thermometer, magnifying glass, and compass.",
     "weight": "7 g",
     "volume": "25 ml",

data/json/items/tool/pets.json

@@ -65,7 +65,7 @@
     "id": "pet_carrier_wooden",
     "copy-from": "pet_carrier",
     "type": "TOOL",
-    "name": "wooden pet carrier",
+    "name": { "str": "wooden pet carrier" },
     "description": "A wooden container meant to hold pets for transport.  Use it on a suitable animal to capture, use it on an empty tile to release.",
     "weight": "1500 g",
     "volume": "6250 ml",

data/json/items/tool/science.json

@@ -378,7 +378,7 @@
     "id": "voltmeter",
     "type": "TOOL",
     "category": "tools",
-    "name": "voltmeter",
+    "name": { "str": "voltmeter" },
     "description": "This device has two probes that let you measure the electrical potential between two points.",
     "weight": "3000 g",
     "volume": "1500 ml",
@@ -440,7 +440,7 @@
     "id": "vortex",
     "type": "TOOL",
     "category": "tools",
-    "name": "vortex device",
+    "name": { "str": "vortex device" },
     "description": "This is a small, hefty, boring looking machine.  Its weighted trapezoidal frame has a single on-off switch and a speed dial, and on top of it sits a rubber receptacle.  Pressing a test tube into the receptacle would, with power, rapidly shake and mix the contents of the test tube.  It's surprisingly fun to use.",
     "weight": "3500 g",
     "volume": "750 ml",

data/json/items/tool/tailoring.json

@@ -116,7 +116,7 @@
   {
     "id": "needle_wood",
     "type": "TOOL",
-    "name": "wooden needle",
+    "name": { "str": "wooden needle" },
     "description": "This is a wooden needle whittled down to a sharp point.  It has a narrow hole carved into the head for threading.  Its low quality makes it rather unsuitable for anything requiring speed or precision, or involving tougher materials like Kevlar.",
     "weight": "85 g",
     "volume": "250 ml",

data/json/items/tool/toileteries.json

@@ -161,7 +161,7 @@
   {
     "id": "washboard",
     "type": "TOOL",
-    "name": "washboard",
+    "name": { "str": "washboard" },
     "description": "This is a wooden washboard.  You can use it to wash filthy clothing if it's supplied with cleansing agent.",
     "weight": "90 g",
     "volume": "250 ml",
@@ -176,7 +176,7 @@
   {
     "id": "wash_kit",
     "type": "TOOL",
-    "name": "washing kit",
+    "name": { "str": "washing kit" },
     "description": "A combination kit of a washboard and a scrubbing tool.  Everything you need to clean items after the apocalypse.",
     "weight": "80 g",
     "volume": "250 ml",

data/json/items/tool/woodworking.json

@@ -2,7 +2,7 @@
   {
     "id": "ax",
     "type": "TOOL",
-    "name": "wood axe",
+    "name": { "str": "wood axe" },
     "description": "This is a large, two-handed wood axe.  It makes a good melee weapon, but is a bit slow to recover between swings.",
     "weight": "2267 g",
     "volume": "2500 ml",
@@ -237,7 +237,7 @@
   {
     "id": "saw",
     "type": "TOOL",
-    "name": "wood saw",
+    "name": { "str": "wood saw" },
     "description": "This is a thin saw, useful for cutting through wood objects.",
     "weight": "283 g",
     "volume": "1 L",

data/json/items/tool/workshop.json

@@ -970,7 +970,7 @@
   {
     "id": "wood_smoother",
     "type": "TOOL",
-    "name": "wooden smoother",
+    "name": { "str": "wooden smoother" },
     "description": "This large makeshift tool is used in smoothing concrete or mortar in construction projects.  You could also use it as an improvised head-basher.",
     "weight": "2000 g",
     "volume": "3500 ml",
@@ -986,7 +986,7 @@
     "id": "wool_staple",
     "type": "TOOL",
     "category": "spare_parts",
-    "name": "wool staple",
+    "name": { "str": "wool staple" },
     "description": "The natural cluster of wool fibers.  Could be processed to the felt patches or yarns.",
     "weight": "200 g",
     "volume": "500 ml",