diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index 68232d23180fb..2ebcf0912f468 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -180,8 +180,7 @@ "id": "material_zincite", "category": "spare_parts", "price": 250, - "name": "zincite", - "name_plural": "zincite", + "name": { "str": "zincite", "str_pl": "zincite" }, "symbol": "*", "color": "red", "description": "A chunk of zincite. Could be refined into zinc oxide, then into zinc by reduction with a source of carbon.", diff --git a/data/json/items/fake.json b/data/json/items/fake.json index ad0af3ea4cc95..c9fe654c7d179 100644 --- a/data/json/items/fake.json +++ b/data/json/items/fake.json @@ -139,8 +139,7 @@ "id": "fake_smoke_plume", "copy-from": "fake_item", "type": "GENERIC", - "name": "smoldering embers", - "name_plural": "smoldering embers", + "name": { "str": "smoldering embers", "str_pl": "smoldering embers" }, "description": "A handful of smoldering embers emitting smoke. They are fading away even when you look at them.", "emits": [ "emit_small_smoke_plume" ], "flags": [ "TRADER_AVOID", "FAKE_SMOKE" ] diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 5207f16fadbf0..1274d3c1d9d84 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -45,12 +45,11 @@ "id": "wind", "symbol": "?", "color": "white", - "name": "wind", - "name_plural": "none", + "name": { "str": "wind", "str_pl": "none" }, "description": "seeing this is a bug", "stackable": true, "price": 0, - "volume": 0, + "volume": "0 ml", "flags": [ "PSEUDO", "PERPETUAL" ], "fuel": { "energy": 1 } }, @@ -60,12 +59,11 @@ "id": "sunlight", "symbol": "?", "color": "white", - "name": "sun light", - "name_plural": "none", + "name": { "str": "sun light", "str_pl": "none" }, "description": "seeing this is a bug", "stackable": true, "price": 0, - "volume": 0, + "volume": "0 ml", "flags": [ "PSEUDO", "PERPETUAL" ], "fuel": { "energy": 1 } }, @@ -1368,14 +1366,13 @@ "id": "lens_small", "symbol": ".", "color": "light_cyan", - "name": "small high-quality lens", - "name_plural": "small high-quality lenses", + "name": { "str": "small high-quality lens", "str_pl": "small high-quality lenses" }, "category": "spare_parts", "description": "A small high-quality lens, useful for focusing or diffusing light. Might be useful for crafting.", "price": 6000, "material": "glass", "weight": "15 g", - "volume": 0 + "volume": "1 ml" }, { "type": "GENERIC", @@ -1896,8 +1893,7 @@ "category": "spare_parts", "symbol": ",", "color": "brown", - "name": "soft adobe brick", - "name_plural": "soft adobe bricks", + "name": { "str": "soft adobe brick" }, "description": "A compacted mass of soil and natural fibers, still too wet to build with. Load it onto a pallet and leave it to dry.", "price": 0, "material": "soil", @@ -2134,8 +2130,7 @@ "id": "tanned_hide", "symbol": ",", "color": "brown", - "name": "tanned hide", - "name_plural": "tanned hides", + "name": { "str": "tanned hide" }, "description": "A folded sheet of leather made from carefully tanned animal hide. Can be cut up or used as is.", "price": 5000, "material": [ "leather" ], @@ -2164,8 +2159,7 @@ "id": "tanned_pelt", "symbol": ",", "color": "brown", - "name": "tanned pelt", - "name_plural": "tanned pelts", + "name": { "str": "tanned pelt" }, "description": "A folded sheet of leather made from carefully tanned animal hide, with the fur still intact. Can be cut up or used as is.", "price": 5000, "material": [ "fur" ], @@ -2193,8 +2187,7 @@ "id": "straw_doll", "symbol": "o", "color": "light_gray", - "name": "straw doll", - "name_plural": "straw dolls", + "name": { "str": "straw doll" }, "description": "Old straw doll. Represents a woman in a dress.", "price": 100, "material": [ "paper" ], diff --git a/data/json/items/generic/spares.json b/data/json/items/generic/spares.json index 7814edabf8aa4..be22d767488cb 100644 --- a/data/json/items/generic/spares.json +++ b/data/json/items/generic/spares.json @@ -3,8 +3,7 @@ "abstract": "spare_part", "type": "GENERIC", "category": "spare_parts", - "name": "spare parts", - "name_plural": "spare parts", + "name": { "str": "spare parts", "str_pl": "spare parts" }, "description": "Items with are not themselves useful but are instead requirements for crafting or repairs", "symbol": ";", "color": "dark_gray" diff --git a/data/json/items/melee/bludgeons.json b/data/json/items/melee/bludgeons.json index 708832ebd6f9a..8264b54b815f6 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -834,8 +834,7 @@ "id": "sharp_toothbrush", "symbol": ",", "color": "light_blue", - "name": "sharpened toothbrush", - "name_plural": "sharpened toothbrushes", + "name": { "str": "sharpened toothbrush", "str_pl": "sharpened toothbrushes" }, "description": "A personal hygiene item turned into a shank.", "category": "weapons", "price": 400, diff --git a/data/json/items/melee/spears_and_polearms.json b/data/json/items/melee/spears_and_polearms.json index 2834cee72979b..f3474ec18fa47 100644 --- a/data/json/items/melee/spears_and_polearms.json +++ b/data/json/items/melee/spears_and_polearms.json @@ -366,8 +366,7 @@ { "type": "GENERIC", "id": "spear_survivor", - "name": "survivor naginata", - "name_plural": "survivor naginata", + "name": { "str": "survivor naginata", "str_pl": "survivor naginata" }, "description": "This sturdy steel shaft with a sword blade at the end is good for both slashing and stabbing.", "weight": "1700 g", "to_hit": 2, diff --git a/data/json/items/melee/unarmed_weapons.json b/data/json/items/melee/unarmed_weapons.json index 170b28facdeb4..42feba05e490b 100644 --- a/data/json/items/melee/unarmed_weapons.json +++ b/data/json/items/melee/unarmed_weapons.json @@ -2,8 +2,7 @@ { "type": "GENERIC", "id": "bagh_nakha", - "name": "tiger claws", - "name_plural": "tiger claws", + "name": { "str": "tiger claws", "str_pl": "tiger claws" }, "description": "Also called bagh nakha or iron paw, this is a small claw-like bladed weapon from India designed to be concealed under and against the palm.", "weight": "92 g", "to_hit": 3, diff --git a/data/json/items/newspaper.json b/data/json/items/newspaper.json index 0031dc793c23f..a34ccf53bd6e9 100644 --- a/data/json/items/newspaper.json +++ b/data/json/items/newspaper.json @@ -19,15 +19,14 @@ "category": "books", "symbol": ",", "color": "white", - "name": "survivor's note", - "name_plural": "survivor's notes", + "name": { "str": "survivor's note" }, "snippet_category": "note", "description": "A scrap of paper. Something's written on it, scrawled in bad handwriting.", "price": 0, "material": "paper", - "flags": "TRADER_AVOID", + "flags": [ "TRADER_AVOID" ], "weight": "3 g", - "volume": 0 + "volume": "1 ml" }, { "type": "GENERIC", @@ -150,14 +149,13 @@ "category": "books", "symbol": ",", "color": "white", - "name": "vault leaflet", - "name_plural": "vault leaflets", + "name": { "str": "vault leaflet" }, "snippet_category": "necropolis_intro", "description": "A folded glossy handout that appears to be an introduction to living in a massive underground complex.", "price": 0, "material": "paper", "weight": "1 g", - "volume": 0 + "volume": "1 ml" }, { "type": "GENERIC", diff --git a/data/json/items/ranged/throwing.json b/data/json/items/ranged/throwing.json index bddf19574612d..c2a93368484d4 100644 --- a/data/json/items/ranged/throwing.json +++ b/data/json/items/ranged/throwing.json @@ -98,8 +98,7 @@ "id": "throwing_knife", "category": "weapons", "price": 5200, - "name": "throwing knife", - "name_plural": "throwing knives", + "name": { "str": "throwing knife", "str_pl": "throwing knives" }, "symbol": ";", "color": "light_gray", "description": "A thin and flat knife made for throwing. Its ineffective cutting edge and odd shape makes it unsuitable for use as a tool.", diff --git a/data/json/items/resources/glass.json b/data/json/items/resources/glass.json index 69a7e86f0144f..4168f83e34fee 100644 --- a/data/json/items/resources/glass.json +++ b/data/json/items/resources/glass.json @@ -26,8 +26,7 @@ "id": "glass_sheet", "symbol": "]", "color": "light_cyan", - "name": "sheet of glass", - "name_plural": "sheets of glass", + "name": { "str": "sheet of glass", "str_pl": "sheets of glass" }, "description": "A large sheet of glass. Easily shattered. Useful for repairing windows.", "category": "spare_parts", "price": 5000, @@ -49,8 +48,7 @@ "id": "reinforced_glass_sheet", "symbol": "]", "color": "light_blue", - "name": "sheet of reinforced glass", - "name_plural": "sheets of reinforced glass", + "name": { "str": "sheet of reinforced glass", "str_pl": "sheets of reinforced glass" }, "description": "A large sheet of glass strengthened with steel wiring.", "category": "spare_parts", "price": 10000, diff --git a/data/json/items/robot_parts.json b/data/json/items/robot_parts.json index 77e21f5fb5170..cf7a49019339e 100644 --- a/data/json/items/robot_parts.json +++ b/data/json/items/robot_parts.json @@ -177,8 +177,7 @@ { "type": "GENERIC", "id": "turret_chassis", - "name": "turret interior chassis", - "name_plural": "turret interior chassis", + "name": { "str": "turret interior chassis", "str_pl": "turret interior chassis" }, "description": "What's left when you remove all moving parts and electronics. It's the skeleton of a turret.", "symbol": "c", "color": "light_gray", diff --git a/data/json/items/software.json b/data/json/items/software.json index 429cf681d3710..fbbdc9630bad6 100644 --- a/data/json/items/software.json +++ b/data/json/items/software.json @@ -60,8 +60,7 @@ "id": "software_train_data", "copy-from": "software", "type": "GENERIC", - "name": "train data", - "name_plural": "train data", + "name": { "str": "train data", "str_pl": "train data" }, "description": "Logistical data on subterranean train routes and schedules.", "price": 200 }, diff --git a/data/json/items/vehicle/battery.json b/data/json/items/vehicle/battery.json index 6415edc3a6474..e9cddffd49f9d 100644 --- a/data/json/items/vehicle/battery.json +++ b/data/json/items/vehicle/battery.json @@ -43,8 +43,7 @@ { "type": "GENERIC", "id": "it_battery_mount", - "name": "storage battery case", - "name_plural": "storage battery cases", + "name": { "str": "storage battery case" }, "description": "An empty case that can hold a storage battery. Complete with charging controller chip and connecting wires.", "weight": "1231 g", "to_hit": -3, diff --git a/data/json/items/vehicle/boat.json b/data/json/items/vehicle/boat.json index 37b6f5c772eaa..a3ed91e721f2a 100644 --- a/data/json/items/vehicle/boat.json +++ b/data/json/items/vehicle/boat.json @@ -4,8 +4,7 @@ "id": "boat_board", "symbol": "o", "color": "brown", - "name": "wood boat hull", - "name_plural": "wood boat hulls", + "name": { "str": "wood boat hull" }, "description": "A wooden board that keeps the boat afloat. Add boat hulls to a vehicle until it floats. Then attach oars or a motor to get the boat to move.", "price": 8000, "material": [ "wood" ], diff --git a/data/json/items/vehicle/controls.json b/data/json/items/vehicle/controls.json index 8b8d4cae38881..9b6d324b5f838 100644 --- a/data/json/items/vehicle/controls.json +++ b/data/json/items/vehicle/controls.json @@ -30,8 +30,7 @@ { "type": "GENERIC", "id": "vehicle_controls", - "name": "vehicle controls", - "name_plural": "sets of vehicle controls", + "name": { "str": "vehicle controls", "str_pl": "sets of vehicle controls" }, "description": "A set of various vehicle controls. Useful for crafting.", "weight": "6000 g", "to_hit": -4, diff --git a/data/json/items/vehicle/farming.json b/data/json/items/vehicle/farming.json index 2af6639255b66..1f342ab4fc63e 100644 --- a/data/json/items/vehicle/farming.json +++ b/data/json/items/vehicle/farming.json @@ -2,10 +2,9 @@ { "type": "GENERIC", "id": "v_scoop_item", - "name": "vehicle scoop", + "name": { "str": "vehicle scoop" }, "symbol": "u", "color": "light_gray", - "name_plural": "vehicle scoops", "description": "An assembly of motors and sheet metal that allows a vehicle to clean the road surface by removing debris and contaminants.", "weight": "22666 g", "bashing": 1, diff --git a/data/json/items/vehicle/utilities.json b/data/json/items/vehicle/utilities.json index 473dfa64a1395..0033b5f41aca8 100644 --- a/data/json/items/vehicle/utilities.json +++ b/data/json/items/vehicle/utilities.json @@ -34,8 +34,7 @@ { "type": "GENERIC", "id": "mountable_cooler", - "name": "vehicle cooler", - "name_plural": "vehicle coolers", + "name": { "str": "vehicle cooler" }, "description": "A vehicle-mounted area cooler.", "weight": "12500 g", "to_hit": -4, @@ -50,8 +49,7 @@ { "type": "GENERIC", "id": "mountable_heater", - "name": "vehicle heater", - "name_plural": "vehicle heaters", + "name": { "str": "vehicle heater" }, "description": "A vehicle-mounted area heater.", "weight": "12500 g", "to_hit": -4,