diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index 20dd1876a3054..fe118349125f8 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -113,7 +113,7 @@ "id": "plant_fibre", "category": "spare_parts", "price": 0, - "name": "plant fiber", + "name": { "str": "plant fiber" }, "symbol": "=", "color": "light_green", "looks_like": "thread", @@ -179,7 +179,7 @@ "id": "rolling_paper", "symbol": ",", "color": "white", - "name": "rolling paper", + "name": { "str": "rolling paper" }, "description": "These are thin paper strips intended for the rolling of cigarettes.", "price": 150, "material": "paper", @@ -210,7 +210,7 @@ "id": "plut_cell", "category": "spare_parts", "price": 150000, - "name": "plutonium fuel cell", + "name": { "str": "plutonium fuel cell" }, "symbol": "=", "color": "green", "description": "This is neither a fuel cell, nor nuclear, but the name stuck. It uses plutonium-244 as a catalyst to stabilize a complicated nanocompound that can store enormous amounts of power. Unfortunately it cannot be recharged by conventional means: expended cells had to be sent to a central reprocessing facility that almost certainly doesn't exist anymore.", @@ -228,7 +228,7 @@ "id": "plut_slurry_dense", "category": "spare_parts", "price": 250, - "name": "plutonium slurry", + "name": { "str": "plutonium slurry" }, "symbol": "=", "color": "green", "description": "Highly radioactive slurry. It is probably best to get far away from this.", @@ -262,12 +262,12 @@ "id": "rock", "symbol": "*", "color": "light_gray", - "name": "rock", + "name": { "str": "rock" }, "description": "A rock the size of a baseball. Makes a decent melee weapon, and is also good for throwing at enemies.", "category": "spare_parts", "material": "stone", "ammo_type": "rock", - "flags": "TRADER_AVOID", + "flags": [ "TRADER_AVOID" ], "weight": "657 g", "volume": "250 ml", "bashing": 7, @@ -283,7 +283,7 @@ "type": "AMMO", "id": "pebble", "price": 100, - "name": "pebble", + "name": { "str": "pebble" }, "symbol": "=", "color": "light_gray", "description": "A handful of pebbles, useful as ammunition for slings or slingshots.", @@ -547,7 +547,7 @@ "id": "oxy_powder", "category": "chems", "price": 3000, - "name": "oxidizer powder", + "name": { "str": "oxidizer powder" }, "symbol": "=", "color": "white", "description": "Volatile powdered chemical oxidizer.", @@ -660,7 +660,7 @@ "id": "rubber_slug", "category": "spare_parts", "price": 1000, - "name": "rubber slug", + "name": { "str": "rubber slug" }, "symbol": "=", "color": "dark_gray", "description": "Rubber slugs from a shotgun beanbag round. You could use them to make new beanbag rounds.", @@ -780,11 +780,11 @@ "type": "AMMO", "id": "generic_no_ammo", "price": 0, - "name": "placeholder ammunition", + "name": { "str": "placeholder ammunition" }, "symbol": "=", "color": "red", "description": "IF YOU ARE SEEING THIS IT IS A BUG.", - "volume": 0, + "volume": "0 ml", "ammo_type": "NULL", "flags": [ "UNRECOVERABLE" ] }, @@ -897,7 +897,7 @@ "id": "rebreather_filter", "category": "spare_parts", "price": 2500, - "name": "rebreather filter cartridge", + "name": { "str": "rebreather filter cartridge" }, "symbol": "=", "color": "light_gray", "description": "A replacement filter cartridge for a rebreather.", @@ -954,7 +954,7 @@ "id": "nicotine_liquid", "category": "drugs", "price": 1000, - "name": "nicotine liquid", + "name": { "str": "nicotine liquid" }, "symbol": "=", "color": "yellow", "description": "A liquid that is made up of propylene glycol, vegetable glycerin, flavorings and nicotine.", diff --git a/data/json/items/ammo/barb.json b/data/json/items/ammo/barb.json index 64f7bc372af4d..78ede62b74eaa 100644 --- a/data/json/items/ammo/barb.json +++ b/data/json/items/ammo/barb.json @@ -3,7 +3,7 @@ "type": "AMMO", "id": "barb_paralysis", "price": 400, - "name": "paralyzing barb", + "name": { "str": "paralyzing barb" }, "symbol": "=", "color": "green", "description": "Tiny droplets of venom trickle out of the sponge-like tissue of this sharp barb.", diff --git a/data/json/items/ammo/flintlock.json b/data/json/items/ammo/flintlock.json index 93e6293996b35..240c94f915556 100644 --- a/data/json/items/ammo/flintlock.json +++ b/data/json/items/ammo/flintlock.json @@ -2,7 +2,7 @@ { "id": "flintlock_ammo", "type": "AMMO", - "name": "paper cartridge", + "name": { "str": "paper cartridge" }, "description": "A paper cartridge containing black powder and a metallic projectile. Historically used to reload muzzleloaders in a more reasonable time.", "weight": "40 g", "volume": "250 ml", @@ -24,7 +24,7 @@ { "id": "flintlock_shot", "type": "AMMO", - "name": "paper shot cartridge", + "name": { "str": "paper shot cartridge" }, "description": "A paper cartridge containing black powder and metallic shot. Historically used to reload muzzleloaders in a more reasonable time.", "weight": "40 g", "volume": "250 ml", diff --git a/data/json/items/ammo/metal_rail.json b/data/json/items/ammo/metal_rail.json index 64a7289cb2c7f..69c52d0f148c1 100644 --- a/data/json/items/ammo/metal_rail.json +++ b/data/json/items/ammo/metal_rail.json @@ -2,7 +2,7 @@ { "id": "rebar_rail", "type": "AMMO", - "name": "rebar rail", + "name": { "str": "rebar rail" }, "description": "A short piece of ferromagnetic rebar which has been straightened and sharpened on one end. Could be used as a projectile by a sufficiently powerful electromagnetic weapon.", "weight": "160 g", "volume": "25ml", diff --git a/data/json/items/ammo/paintball.json b/data/json/items/ammo/paintball.json index 0b28014399196..ad5e1d6103d3f 100644 --- a/data/json/items/ammo/paintball.json +++ b/data/json/items/ammo/paintball.json @@ -4,7 +4,7 @@ "id": "paintball", "price": 1000, "price_postapoc": 500, - "name": "paintball", + "name": { "str": "paintball" }, "symbol": "=", "color": "red", "description": "A tube of small paintballs. They deal virtually no damage.", diff --git a/data/json/items/ammo/shotcanister.json b/data/json/items/ammo/shotcanister.json index 21cfa5ec3bc36..d4ced8dc5ddcd 100644 --- a/data/json/items/ammo/shotcanister.json +++ b/data/json/items/ammo/shotcanister.json @@ -26,7 +26,7 @@ "id": "shotcanister_pebble", "price": 1000, "price_postapoc": 1000, - "name": "pebble shotcanister", + "name": { "str": "pebble shotcanister" }, "symbol": "=", "color": "green", "description": "This small paper canister resembling a crude shotshell is filled to the brim with tiny pebbles. Damage is pathetic but flight is much more stable than scrap", diff --git a/data/json/items/ammo/shotpaper.json b/data/json/items/ammo/shotpaper.json index eba6e91816b27..2b65ef4caf217 100644 --- a/data/json/items/ammo/shotpaper.json +++ b/data/json/items/ammo/shotpaper.json @@ -13,7 +13,7 @@ "id": "shot_paper_dragon", "copy-from": "shot_paper_00", "type": "AMMO", - "name": "pyrotechnic paper cartridge", + "name": { "str": "pyrotechnic paper cartridge" }, "description": "A paper cartridge containing a premeasured amount of black powder and an equal volume of flammable metals. When fired, burning chunks of metal and sparks will shoot out of the barrel, igniting everything in their path.", "proportional": { "damage": 0.2, "recoil": 0.6, "loudness": 0.8, "dispersion": 1.2, "range": 0.5 }, "extend": { "effects": [ "INCENDIARY", "STREAM", "NOGIB" ] } diff --git a/data/json/items/ammo/weldgas.json b/data/json/items/ammo/weldgas.json index e855c765f014c..a9e607c6f1020 100644 --- a/data/json/items/ammo/weldgas.json +++ b/data/json/items/ammo/weldgas.json @@ -2,7 +2,7 @@ { "id": "oxyacetylene", "type": "AMMO", - "name": "oxyacetylene", + "name": { "str": "oxyacetylene" }, "description": "A highly explosive fuel mixture composed of equal parts of oxygen and acetylene gas.", "weight": "40 g", "volume": "250 ml", diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index 575a7db29470b..96832265293cc 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -1374,7 +1374,7 @@ "id": "rosin", "type": "AMMO", "category": "chems", - "name": "rosin", + "name": { "str": "rosin" }, "description": "This is a chunk of yellowish rosin, usable as a flux for soldering.", "weight": "1 g", "volume": "10 ml", diff --git a/data/json/items/resources/chemicals.json b/data/json/items/resources/chemicals.json index 3a7716e81c52e..b6c8aac3309fa 100644 --- a/data/json/items/resources/chemicals.json +++ b/data/json/items/resources/chemicals.json @@ -3,7 +3,7 @@ "id": "chem_potassium_alum", "type": "AMMO", "category": "chems", - "name": "potassium alum", + "name": { "str": "potassium alum" }, "description": "Small water-soluble white crystals with watery metallic odor, historically used for many different purposes. Also known as potash alum and potassium aluminum sulfate; often called simply alum, as it's the most important member of the generic class of compounds called alums.", "container": "bottle_plastic_small", "weight": "1725 mg", diff --git a/data/json/items/resources/fasteners.json b/data/json/items/resources/fasteners.json index a791272426190..ad2430d10ddfe 100644 --- a/data/json/items/resources/fasteners.json +++ b/data/json/items/resources/fasteners.json @@ -17,7 +17,7 @@ "id": "button_plastic", "type": "AMMO", "category": "spare_parts", - "name": "plastic button", + "name": { "str": "plastic button" }, "description": "A plastic button, usually found on clothing.", "weight": "1 g", "volume": "20 ml", diff --git a/data/json/items/resources/home_improvement.json b/data/json/items/resources/home_improvement.json index 2e3ea3f31e938..085da699737bc 100644 --- a/data/json/items/resources/home_improvement.json +++ b/data/json/items/resources/home_improvement.json @@ -94,7 +94,7 @@ "id": "r_carpet", "category": "other", "price": 120, - "name": "red carpet", + "name": { "str": "red carpet" }, "symbol": "}", "color": "red", "description": "A roll of red carpet.", @@ -139,7 +139,7 @@ "id": "p_carpet", "category": "other", "price": 120, - "name": "purple carpet", + "name": { "str": "purple carpet" }, "symbol": "}", "color": "magenta", "description": "A roll of purple carpet.", diff --git a/data/json/items/resources/misc.json b/data/json/items/resources/misc.json index 8698ce7ec088f..d66607baf87b6 100644 --- a/data/json/items/resources/misc.json +++ b/data/json/items/resources/misc.json @@ -143,7 +143,7 @@ "id": "sole_rubber", "type": "AMMO", "category": "spare_parts", - "name": "rubber sole", + "name": { "str": "rubber sole" }, "description": "This is a sole made from rubber, usually found on the bottoms of boots. Can be used for making actual boots.", "weight": "140 g", "volume": "500 ml",