diff --git a/data/json/items/generic.json b/data/json/items/generic.json index a1c03c55ad3d2..08e43f56c0ede 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -2505,14 +2505,14 @@ "type": "TOOL", "symbol": ",", "color": "yellow", - "name": "gold gas discount card", + "name": { "str": "gold gas discount card" }, "description": "This card gives you a good discount on the purchase of gasoline.", "category": "other", "price": 500, "material": "plastic", "flags": [ "GAS_DISCOUNT", "DISCOUNT_VALUE_2" ], "weight": "6 g", - "volume": 0, + "volume": "5 ml", "to_hit": -3 }, { diff --git a/data/json/items/melee/spears_and_polearms.json b/data/json/items/melee/spears_and_polearms.json index f3474ec18fa47..b60eb3ba85eb9 100644 --- a/data/json/items/melee/spears_and_polearms.json +++ b/data/json/items/melee/spears_and_polearms.json @@ -132,7 +132,7 @@ "id": "spear_homemade_halfpike", "type": "TOOL", "category": "weapons", - "name": "homemade halfpike", + "name": { "str": "homemade halfpike" }, "description": "A short do-it-yourself spear made out of a smooth wooden shaft with a metal spike seated and bound into place at its tip. Its functional grip and decent construction makes it a usable, if not effective, weapon.", "weight": "1814 g", "volume": "1500 ml", diff --git a/data/json/items/resources/glass.json b/data/json/items/resources/glass.json index 4168f83e34fee..ed0a8352edf62 100644 --- a/data/json/items/resources/glass.json +++ b/data/json/items/resources/glass.json @@ -4,7 +4,7 @@ "id": "glass_shard", "symbol": ",", "color": "light_cyan", - "name": "glass shard", + "name": { "str": "glass shard" }, "category": "other", "description": "A broken shard of glass covered in sharp edges. You could use it as a weapon, but you might want to wear gloves.", "material": "glass", diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json index 4398cec5f9408..812d1d9038dc5 100644 --- a/data/json/items/tool/cooking.json +++ b/data/json/items/tool/cooking.json @@ -265,7 +265,7 @@ { "id": "esbit_stove", "type": "TOOL", - "name": "hexamine stove", + "name": { "str": "hexamine stove" }, "description": "Known as an Esbit stove, this is a lightweight, folding stove designed to use small hexamine tablets for cooking.", "weight": "180 g", "volume": "750 ml", @@ -335,7 +335,7 @@ { "id": "gasoline_cooker", "type": "TOOL", - "name": "gasoline cooker", + "name": { "str": "gasoline cooker" }, "description": "This is a simple heater powered by gasoline. It is designed for cooking food.", "weight": "1944 g", "volume": "1250 ml", @@ -355,10 +355,10 @@ { "id": "heatpack", "type": "TOOL", - "name": "heat pack", + "name": { "str": "heat pack" }, "description": "This is a chemical heat pack. It's used to treat sports injuries and heat food. It is usable only once.", "weight": "226 g", - "volume": 0, + "volume": "100 ml", "price": 100, "to_hit": 1, "bashing": 1, @@ -387,7 +387,7 @@ { "id": "hobo_stove", "type": "TOOL", - "name": "hobo stove", + "name": { "str": "hobo stove" }, "description": "This is a small improvised wood stove, made from a metal can or similar container of the right size. Useful for defrosting and reheating food, uses simple tinder.", "weight": "500 g", "volume": "250 ml", @@ -405,7 +405,7 @@ { "id": "hotplate", "type": "TOOL", - "name": "hotplate", + "name": { "str": "hotplate" }, "description": "This is a small heating element on a stand, powered by batteries. It is indispensable for cooking and chemistry. Try not to burn yourself.", "weight": "2835 g", "volume": "1250 ml", diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json index 35fca3f730b43..366ea3d6c3679 100644 --- a/data/json/items/tool/electronics.json +++ b/data/json/items/tool/electronics.json @@ -292,7 +292,7 @@ "id": "hand_crank_charger", "type": "TOOL", "category": "tools", - "name": "hand-crank charger", + "name": { "str": "hand-crank charger" }, "description": "This is a hand-powered battery charger. It has an adjustable receptacle designed to accept a wide variety of rechargeable battery cells.", "weight": "2000 g", "volume": "500 ml", @@ -405,7 +405,7 @@ { "id": "portable_game", "type": "TOOL", - "name": "handheld game system", + "name": { "str": "handheld game system" }, "description": "This is a portable games console in working condition, with a backlit screen allowing you to play in the dark. You can use it to play it for a little while, but this requires batteries.", "weight": "200 g", "volume": "500 ml", diff --git a/data/json/items/tool/explosives.json b/data/json/items/tool/explosives.json index 726eeb3aed4b2..7fe6a9575ee65 100644 --- a/data/json/items/tool/explosives.json +++ b/data/json/items/tool/explosives.json @@ -585,7 +585,7 @@ "id": "grenade", "type": "TOOL", "category": "weapons", - "name": "grenade", + "name": { "str": "grenade" }, "description": "This is a military-grade fragmentary hand grenade. Use this item to pull the pin and light the fuse. You will then have five turns before it explodes; throwing it would be a good idea.", "weight": "397 g", "volume": "250 ml", diff --git a/data/json/items/tool/knives.json b/data/json/items/tool/knives.json index 964a07cec24a5..afe6ffd4b30b7 100644 --- a/data/json/items/tool/knives.json +++ b/data/json/items/tool/knives.json @@ -36,7 +36,7 @@ { "id": "honey_scraper", "type": "TOOL", - "name": "honey scraper", + "name": { "str": "honey scraper" }, "description": "A sharp, knife-like tool used in harvesting honey from beehives. Makes a passable melee weapon.", "weight": "580 g", "volume": "250 ml", diff --git a/data/json/items/tool/landscaping.json b/data/json/items/tool/landscaping.json index 4ffc390f2c8a3..bd1d49468abd5 100644 --- a/data/json/items/tool/landscaping.json +++ b/data/json/items/tool/landscaping.json @@ -34,7 +34,7 @@ { "id": "hoe", "type": "TOOL", - "name": "hoe", + "name": { "str": "hoe" }, "description": "This is a farming implement. You can use it to turn tillable land into a slow-to-cross pile of dirt, or dig a shallow pit.", "weight": "1088 g", "volume": "3500 ml", diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json index ef0aa8d6ab9ad..48ca6fa2c8646 100644 --- a/data/json/items/tool/lighting.json +++ b/data/json/items/tool/lighting.json @@ -269,7 +269,7 @@ { "id": "glowstick", "type": "TOOL", - "name": "glowstick", + "name": { "str": "glowstick" }, "description": "This is a small blue light glowstick. Use it to bend the plastic and break the glass cylinder inside to start the reaction. It will produce a small amount of light.", "weight": "29 g", "volume": "250 ml", diff --git a/data/json/items/tool/misc.json b/data/json/items/tool/misc.json index 5d304161a1049..2010f67654d45 100644 --- a/data/json/items/tool/misc.json +++ b/data/json/items/tool/misc.json @@ -150,7 +150,7 @@ "type": "TOOL", "category": "weapons", "id": "grip_hook", - "name": "grip hook", + "name": { "str": "grip hook" }, "description": "A simple steel meathook with a circular steel handle. Makes a passable melee weapon.", "weight": "900 g", "to_hit": 1, @@ -170,7 +170,7 @@ "type": "TOOL", "symbol": "/", "color": "blue", - "name": "hand pump", + "name": { "str": "hand pump" }, "description": "This pump is suitable for pumping air into inflatable objects.", "price": 400, "material": [ "aluminum", "plastic" ], diff --git a/data/json/items/tool/pets.json b/data/json/items/tool/pets.json index 5ff4e5c013bfa..281f4abdf4df2 100644 --- a/data/json/items/tool/pets.json +++ b/data/json/items/tool/pets.json @@ -32,7 +32,7 @@ { "id": "horse_tack", "type": "TOOL", - "name": "horse tack", + "name": { "str": "horse tack" }, "description": "A saddle, bridle, and associated tack that can be placed on a tamed animal that is capable of being ridden.", "weight": "2 kg", "volume": "7 L", diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json index 3813791e56843..456d182b02712 100644 --- a/data/json/items/tool/science.json +++ b/data/json/items/tool/science.json @@ -18,7 +18,7 @@ { "id": "canister_goo", "type": "TOOL", - "name": "goo canister", + "name": { "str": "goo canister" }, "description": "There is a label on this canister: \"Warning: contains highly toxic and corrosive materials. Contents may be sentient. Open at your own risk.\" You think you can feel something moving inside it.", "weight": "1596 g", "volume": "500 ml", @@ -97,7 +97,7 @@ { "id": "hydrogen_tank", "type": "TOOL", - "name": "hydrogen tank", + "name": { "str": "hydrogen tank" }, "description": "This is a tank of compressed hydrogen gas. If you need to make water from scratch, or lift a zeppelin, it could come in handy.", "weight": "2268 g", "volume": "1500 ml", diff --git a/data/json/items/tool/smoking.json b/data/json/items/tool/smoking.json index 31e249d2e5991..1e2baad5d6eb6 100644 --- a/data/json/items/tool/smoking.json +++ b/data/json/items/tool/smoking.json @@ -49,7 +49,7 @@ { "id": "pipe_glass", "type": "TOOL", - "name": "glass pipe", + "name": { "str": "glass pipe" }, "description": "This is a hand-blown glass pipe. It's of the type most commonly used to smoke recreational substances.", "weight": "163 g", "volume": "250 ml", diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json index 6aefceba44a5e..9aa163597cba8 100644 --- a/data/json/items/tool/workshop.json +++ b/data/json/items/tool/workshop.json @@ -250,7 +250,7 @@ { "id": "hacksaw", "type": "TOOL", - "name": "hacksaw", + "name": { "str": "hacksaw" }, "description": "This is a sturdy saw, useful for cutting through metal objects.", "weight": "952 g", "volume": "1 L", @@ -267,7 +267,7 @@ { "id": "hammer", "type": "TOOL", - "name": "hammer", + "name": { "str": "hammer" }, "description": "This is a demagnetized steel claw hammer with a wooden grip. With a hammer, nails, and two by fours in your inventory, you could board up adjacent doors and windows. It has myriad other uses as well.", "weight": "566 g", "volume": "500 ml", @@ -284,7 +284,7 @@ { "id": "hand_drill", "type": "TOOL", - "name": "hand drill", + "name": { "str": "hand drill" }, "description": "A primitive manual drill with a single drill bit. It is slow and it will exhaust you quickly.", "weight": "907 g", "volume": "250 ml", @@ -400,7 +400,7 @@ { "id": "large_repairkit", "type": "TOOL", - "name": "gunsmith repair kit", + "name": { "str": "gunsmith repair kit" }, "description": "This is a complete toolkit made to repair damaged firearms. Powered by standard batteries, it is a vital tool for long-term firearms maintenance. It requires 25 charges of battery power per use.", "weight": "9860 g", "volume": "2500 ml", diff --git a/data/json/items/vehicle/cables.json b/data/json/items/vehicle/cables.json index 318992dbbbe1c..269fe2d5daaaa 100644 --- a/data/json/items/vehicle/cables.json +++ b/data/json/items/vehicle/cables.json @@ -21,7 +21,7 @@ { "type": "TOOL", "id": "jumper_cable_heavy", - "name": "heavy-duty cable", + "name": { "str": "heavy-duty cable" }, "description": "A long, thick, heavy-duty cable with power leads on either end. It looks like you could use it to hook up two vehicles to each other, though you expect the power loss would be noticeable. Can also link other electrical systems.", "volume": "1500 ml", "weight": "750 g",