diff --git a/data/core/basic.json b/data/core/basic.json index cb45312e4dc72..b77ac7ae65582 100644 --- a/data/core/basic.json +++ b/data/core/basic.json @@ -10,8 +10,7 @@ "type": "COMESTIBLE", "comestible_type": "DRINK", "category": "food", - "name": "water", - "name_plural": "water", + "name": { "str": "water", "str_pl": "water" }, "description": "Water, the stuff of life, the best thirst-quencher available. It would be safer to drink once purified.", "weight": 250, "volume": 1, diff --git a/data/json/items/ammo.json b/data/json/items/ammo.json index 56cabbb624e90..c7c1d9ed0ea12 100644 --- a/data/json/items/ammo.json +++ b/data/json/items/ammo.json @@ -4,8 +4,7 @@ "id": "battery", "category": "spare_parts", "price": 12000, - "name": "battery", - "name_plural": "batteries", + "name": { "str": "battery", "str_pl": "batteries" }, "symbol": "=", "color": "yellow", "description": "Some free-floating battery charge. This can be reloaded into rechargable battery cells, but can never be unloaded.", @@ -343,8 +342,7 @@ "type": "AMMO", "id": "bearing", "price": 100, - "name": "bearings", - "name_plural": "bearings", + "name": { "str": "bearings", "str_pl": "bearings" }, "symbol": "=", "color": "dark_gray", "looks_like": "pebble", @@ -829,8 +827,7 @@ "id": "cac2powder", "category": "spare_parts", "price": 200, - "name": "calcium carbide premix", - "name_plural": "calcium carbide premix", + "name": { "str": "calcium carbide premix", "str_pl": "calcium carbide premix" }, "symbol": "=", "color": "dark_gray", "description": "A powdered mixture of coke and lime ready to be smelted into usable calcium carbide in an arc furnace.", @@ -1004,8 +1001,7 @@ "category": "spare_parts", "price": 12000, "//": "This seems like the larger medical tank, not an instant-use model with mask attached", - "name": "oxygen", - "name_plural": "oxygen", + "name": { "str": "oxygen", "str_pl": "oxygen" }, "symbol": "=", "color": "light_gray", "description": "A canister of oxygen.", @@ -1120,8 +1116,7 @@ "id": "nitrox", "category": "chems", "price": 500, - "name": "nitrox", - "name_plural": "nitrox", + "name": { "str": "nitrox", "str_pl": "nitrox" }, "symbol": "=", "color": "white", "container": "bottle_plastic", @@ -1135,8 +1130,7 @@ "id": "tinder", "type": "AMMO", "category": "spare_parts", - "name": "tinder", - "name_plural": "tinder", + "name": { "str": "tinder", "str_pl": "tinder" }, "description": "Flammable material, finely divided for easy combustion.", "weight": "10 g", "volume": "250 ml", @@ -1154,8 +1148,7 @@ "type": "AMMO", "id": "RPG_die", "price": 10, - "name": "RPG die", - "name_plural": "RPG dice", + "name": { "str": "RPG die", "str_pl": "RPG dice" }, "symbol": "=", "color": "light_gray", "looks_like": "marble", @@ -1176,8 +1169,7 @@ "type": "AMMO", "id": "metal_RPG_die", "price": 50, - "name": "metal RPG die", - "name_plural": "metal RPG dice", + "name": { "str": "metal RPG die", "str_pl": "metal RPG dice" }, "symbol": "=", "color": "light_gray", "looks_like": "marble", @@ -1198,8 +1190,7 @@ "id": "scrap_bronze", "type": "AMMO", "category": "spare_parts", - "name": "bronze", - "name_plural": "bronze", + "name": { "str": "bronze", "str_pl": "bronze" }, "description": "Decent-sized chunks of bronze, for fashioning some old-school items.", "weight": "218 g", "volume": "250 ml", diff --git a/data/json/items/ammo/357mag.json b/data/json/items/ammo/357mag.json index 2961e82f53a4b..b35a72474e7e8 100644 --- a/data/json/items/ammo/357mag.json +++ b/data/json/items/ammo/357mag.json @@ -52,16 +52,14 @@ "id": "reloaded_357mag_fmj", "copy-from": "357mag_fmj", "type": "AMMO", - "name": ".357 Magnum FMJ, reloaded", - "name_plural": ".357 Magnum FMJ, reloaded", + "name": { "str": ".357 Magnum FMJ, reloaded", "str_pl": ".357 Magnum FMJ, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 } }, { "id": "reloaded_357mag_jhp", "copy-from": "357mag_jhp", "type": "AMMO", - "name": ".357 Magnum JHP, reloaded", - "name_plural": ".357 Magnum JHP, reloaded", + "name": { "str": ".357 Magnum JHP, reloaded", "str_pl": ".357 Magnum JHP, reloaded" }, "proportional": { "price": 0.7, "damage": 0.9, "dispersion": 1.1, "recoil": 0.9 } } ] diff --git a/data/json/items/archery.json b/data/json/items/archery.json index 14a9e2de34ba1..2c4c753d6fc52 100644 --- a/data/json/items/archery.json +++ b/data/json/items/archery.json @@ -404,8 +404,7 @@ "id": "compbow_high", "copy-from": "compbow", "type": "GUN", - "name": "compound bow (high)", - "name_plural": "compound bows (high)", + "name": { "str": "compound bow (high)", "str_pl": "compound bows (high)" }, "description": "A high-power bow with shaped cams and extra cables for high velocity shots that can be used effectively by very strong archers. Currently set to a high weight, and ready to cause some real damage - if you can draw it.", "min_strength": 8, "dispersion": 85, @@ -424,8 +423,7 @@ "id": "compbow_low", "copy-from": "compbow", "type": "GUN", - "name": "compound bow (low)", - "name_plural": "compound bows (low)", + "name": { "str": "compound bow (low)", "str_pl": "compound bows (low)" }, "description": "A high-power bow with shaped cams and extra cables for high velocity shots that can be used effectively by average archers. Currently set to a low weight, making it much easier to draw.", "min_strength": 4, "dispersion": 115, @@ -658,8 +656,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/armor.json b/data/json/items/armor.json index 3600d44c8f6df..0d6a8f01d09a7 100644 --- a/data/json/items/armor.json +++ b/data/json/items/armor.json @@ -23,8 +23,7 @@ "id": "2byarm_guard", "type": "ARMOR", "category": "armor", - "name": "pair of 2-by-arm guards", - "name_plural": "pairs of 2-by-arm guards", + "name": { "str": "pair of 2-by-arm guards", "str_pl": "pairs of 2-by-arm guards" }, "description": "A pair of improvised arm guards made from broken pieces of a two by four that are tied to your arms with rags and string. They offer good protection, but are really uncomfortable to wear.", "weight": "300 g", "volume": "1500 ml", @@ -47,8 +46,7 @@ "id": "2byshin_guard", "type": "ARMOR", "category": "armor", - "name": "pair of 2-by-shin guards", - "name_plural": "pairs of 2-by-shin guards", + "name": { "str": "pair of 2-by-shin guards", "str_pl": "pairs of 2-by-shin guards" }, "description": "A pair of improvised shin guards made from broken pieces of a two by four that are tied to your shins with rags and string. They offer good protection, but are really hard to run with.", "weight": "300 g", "volume": "1500 ml", @@ -166,8 +164,7 @@ { "id": "arm_warmers", "type": "ARMOR", - "name": "pair of arm warmers", - "name_plural": "pairs of arm warmers", + "name": { "str": "pair of arm warmers", "str_pl": "pairs of arm warmers" }, "description": "Snug, soft cloth sleeves to keep your arms warm.", "weight": "32 g", "volume": "250 ml", @@ -187,8 +184,7 @@ "id": "armguard_chitin", "type": "ARMOR", "category": "armor", - "name": "pair of chitin arm guards", - "name_plural": "pairs of chitin arm guards", + "name": { "str": "pair of chitin arm guards", "str_pl": "pairs of chitin arm guards" }, "description": "A pair of arm guards made from the exoskeletons of insects. Light and durable.", "weight": "392 g", "volume": "2500 ml", @@ -211,8 +207,7 @@ "copy-from": "armguard_chitin", "looks_like": "armguard_chitin", "type": "ARMOR", - "name": "pair of biosilicified chitin arm guards", - "name_plural": "pairs of biosilicified chitin arm guards", + "name": { "str": "pair of biosilicified chitin arm guards", "str_pl": "pairs of biosilicified chitin arm guards" }, "description": "A pair of arm guards crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Acid-resistant and very durable.", "material": [ "acidchitin" ], "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25, "encumbrance": 1.5, "warmth": 1.5 }, @@ -222,8 +217,7 @@ "id": "armguard_hard", "type": "ARMOR", "category": "armor", - "name": "pair of hard arm guards", - "name_plural": "pairs of hard arm guards", + "name": { "str": "pair of hard arm guards", "str_pl": "pairs of hard arm guards" }, "description": "A pair of neoprene arm sleeves covered with molded plastic sheaths.", "weight": "350 g", "volume": "3 L", @@ -244,8 +238,7 @@ "id": "armguard_larmor", "type": "ARMOR", "category": "armor", - "name": "pair of leather arm guards", - "name_plural": "pairs of leather arm guards", + "name": { "str": "pair of leather arm guards", "str_pl": "pairs of leather arm guards" }, "description": "A pair of tough leather arm guards. Light and comfortable.", "weight": "430 g", "volume": "2 L", @@ -267,8 +260,7 @@ "id": "armguard_lightplate", "type": "ARMOR", "category": "armor", - "name": "pair of steel arm guards", - "name_plural": "pairs of steel arm guards", + "name": { "str": "pair of steel arm guards", "str_pl": "pairs of steel arm guards" }, "description": "A full assembly of medieval arm protection. Rerebraces, couters, and vambraces, with leather straps to secure each piece and connect it as part of a set.", "weight": "2720 g", "volume": "5500 ml", @@ -289,8 +281,7 @@ "id": "armguard_metal", "type": "ARMOR", "category": "armor", - "name": "pair of metal arm guards", - "name_plural": "pairs of metal arm guards", + "name": { "str": "pair of metal arm guards", "str_pl": "pairs of metal arm guards" }, "//": "They're not actually FANCY, so calling them 'very stylish' seemed inaccurate.", "description": "A pair of arm guards hammered out from metal. Perfect for the Post-Apocalyptic Warrior look.", "weight": "1080 g", @@ -312,8 +303,7 @@ "id": "armguard_paper", "type": "ARMOR", "category": "armor", - "name": "pair of paper arm guards", - "name_plural": "pairs of paper arm guards", + "name": { "str": "pair of paper arm guards", "str_pl": "pairs of paper arm guards" }, "description": "Arm guards made of stacked paper sheets held together with duct tape.", "weight": "360 g", "volume": "500 ml", @@ -334,8 +324,7 @@ "id": "armguard_scrap", "type": "ARMOR", "category": "armor", - "name": "pair of scrap arm guards", - "name_plural": "pairs of scrap arm guards", + "name": { "str": "pair of scrap arm guards", "str_pl": "pairs of scrap arm guards" }, "description": "A pair of arm guards made from scraps of metal secured by simple strings; the loose collection of plates provides decent but not the most convenient protection.", "weight": "3064 g", "volume": "4750 ml", @@ -358,8 +347,7 @@ "id": "armguard_soft", "type": "ARMOR", "category": "armor", - "name": "pair of neoprene arm sleeves", - "name_plural": "pairs of neoprene arm sleeves", + "name": { "str": "pair of neoprene arm sleeves", "str_pl": "pairs of neoprene arm sleeves" }, "description": "A pair of soft neoprene arm sleeves. Often used in contact sports.", "weight": "258 g", "volume": "1500 ml", @@ -461,8 +449,7 @@ { "id": "armor_lamellar", "type": "ARMOR", - "name": "lamellar cuirass", - "name_plural": "lamellar cuirasses", + "name": { "str": "lamellar cuirass", "str_pl": "lamellar cuirasses" }, "description": "A cuirass made of multiple pieces of tough leather, laced together for durable yet flexible protection.", "weight": "2108 g", "volume": "9250 ml", @@ -528,8 +515,7 @@ { "id": "armor_lorica", "type": "ARMOR", - "name": "lorica segmentata", - "name_plural": "lorica segmentata", + "name": { "str": "lorica segmentata", "str_pl": "lorica segmentata" }, "description": "An ancient Roman laminar armor, made of overlapping metal strips connected to internal leather straps.", "weight": "5286 g", "volume": "6 L", @@ -774,8 +760,7 @@ { "id": "b_shorts", "type": "ARMOR", - "name": "basketball shorts", - "name_plural": "basketball shorts", + "name": { "str": "basketball shorts", "str_pl": "basketball shorts" }, "description": "A pair of basketball shorts. Comfortable and light.", "weight": "190 g", "volume": "1 L", @@ -1156,8 +1141,7 @@ "id": "bondage_mask_zipped", "copy-from": "bondage_mask", "type": "ARMOR", - "name": "bondage mask (zipped)", - "name_plural": "bondage masks (zipped)", + "name": { "str": "bondage mask (zipped)", "str_pl": "bondage masks (zipped)" }, "description": "A tight mask made of black leather. The eyes and mouth have been zipped closed.", "looks_like": "bondage_mask", "flags": [ "VARSIZE", "BLIND" ], @@ -1288,8 +1272,7 @@ { "id": "boxer_briefs", "type": "ARMOR", - "name": "boxer briefs", - "name_plural": "boxer briefs", + "name": { "str": "boxer briefs", "str_pl": "boxer briefs" }, "description": "The age-old question, boxers or briefs? Your answer? Yes.", "weight": "37 g", "volume": "250 ml", @@ -1307,8 +1290,7 @@ { "id": "boxer_shorts", "type": "ARMOR", - "name": "boxer shorts", - "name_plural": "boxer shorts", + "name": { "str": "boxer shorts", "str_pl": "boxer shorts" }, "description": "Men's boxer shorts. More fashionable than briefs and just as comfortable.", "weight": "42 g", "volume": "250 ml", @@ -1326,8 +1308,7 @@ { "id": "boy_shorts", "type": "ARMOR", - "name": "boy shorts", - "name_plural": "boy shorts", + "name": { "str": "boy shorts", "str_pl": "boy shorts" }, "description": "Female underwear similar to men's boxer shorts, but much more close-fitting.", "weight": "42 g", "volume": "250 ml", @@ -1363,8 +1344,7 @@ { "id": "breeches", "type": "ARMOR", - "name": "breeches", - "name_plural": "breeches", + "name": { "str": "breeches", "str_pl": "breeches" }, "description": "A well-made pair of old-fashioned pants, made of stiff yet baggy material. Comfortable, but lacks pockets.", "weight": "520 g", "volume": "1750 ml", @@ -1416,8 +1396,7 @@ { "id": "briefs", "type": "ARMOR", - "name": "briefs", - "name_plural": "briefs", + "name": { "str": "briefs", "str_pl": "briefs" }, "description": "A pair of briefs. Comfortable underwear worn by men.", "weight": "32 g", "volume": "250 ml", @@ -1487,8 +1466,7 @@ "id": "bunker_pants", "type": "ARMOR", "category": "armor", - "name": "turnout trousers", - "name_plural": "turnout trousers", + "name": { "str": "turnout trousers", "str_pl": "turnout trousers" }, "//": "Fire-resistant outerwear ain't cheap.", "description": "A heavy pair of protective overalls worn by firefighters. Highly resistant to heat and flame, they provide excellent protection from injury.", "weight": "2290 g", @@ -1550,8 +1528,7 @@ { "id": "cassock", "type": "ARMOR", - "name": "cassock", - "name_plural": "cassocks", + "name": { "str": "cassock", "str_pl": "cassocks" }, "description": "A piece of clerical clothing, usually worn by Christian priests.", "weight": "1200 g", "volume": "5 L", @@ -1572,8 +1549,7 @@ "id": "chainmail_arms", "type": "ARMOR", "category": "armor", - "name": "pair of chainmail sleeves", - "name_plural": "pairs of chainmail sleeves", + "name": { "str": "pair of chainmail sleeves", "str_pl": "pairs of chainmail sleeves" }, "description": "Customized chainmail arms. Each sleeve has straps to connect them with each other. The lack of fingers makes them less cumbersome and allows them to be used with gloves.", "weight": "2812 g", "volume": "750 ml", @@ -1613,8 +1589,7 @@ "id": "chainmail_legs", "type": "ARMOR", "category": "armor", - "name": "chainmail leggings", - "name_plural": "pairs of chainmail leggings", + "name": { "str": "chainmail leggings", "str_pl": "pairs of chainmail leggings" }, "description": "Customized chainmail legs. Their straps keep everything in place, and the lack of toes and heels allows them to work perfectly well with footwear.", "weight": "4212 g", "volume": "1500 ml", @@ -1714,8 +1689,7 @@ { "id": "chaps_leather", "type": "ARMOR", - "name": "leather chaps", - "name_plural": "leather chaps", + "name": { "str": "leather chaps", "str_pl": "leather chaps" }, "description": "A pair of black leather chaps. Very tough and light, but doesn't offer any storage.", "weight": "1414 g", "volume": "1250 ml", @@ -2232,8 +2206,7 @@ "id": "cuirass_lightplate", "type": "ARMOR", "category": "armor", - "name": "cuirass", - "name_plural": "cuirasses", + "name": { "str": "cuirass", "str_pl": "cuirasses" }, "description": "A steel breastplate, and a vital part of plate armor. Even as full armor went into decline, cuirasses remained in use among cavalry in Europe.", "weight": "4200 g", "volume": "6 L", @@ -2254,8 +2227,7 @@ "id": "cuirass_scrap", "type": "ARMOR", "category": "armor", - "name": "scrap cuirass", - "name_plural": "scrap cuirasses", + "name": { "str": "scrap cuirass", "str_pl": "scrap cuirasses" }, "description": "A cuirass made from scraps of metal secured by simple strings; the loose collection of plates provides decent but not the most convenient protection.", "weight": "3366 g", "volume": "5750 ml", @@ -2389,8 +2361,7 @@ { "id": "dress", "type": "ARMOR", - "name": "dress", - "name_plural": "dresses", + "name": { "str": "dress", "str_pl": "dresses" }, "description": "A long cotton dress. Though comfortable to wear, it lacks any storage space.", "weight": "680 g", "volume": "3500 ml", @@ -2449,8 +2420,7 @@ { "id": "dress_wedding", "type": "ARMOR", - "name": "wedding dress", - "name_plural": "wedding dresses", + "name": { "str": "wedding dress", "str_pl": "wedding dresses" }, "description": "A beautiful white wedding dress. What good will it be now?", "weight": "9333 g", "volume": "18 L", @@ -2470,8 +2440,7 @@ { "id": "dump_pouch", "type": "ARMOR", - "name": "tactical dump pouch", - "name_plural": "tactical dump pouches", + "name": { "str": "tactical dump pouch", "str_pl": "tactical dump pouches" }, "description": "An expandable pouch secured with straps. Provides a bit of extra storage with minimal encumbrance.", "weight": "288 g", "volume": "500 ml", @@ -2596,8 +2565,7 @@ { "id": "ear_plugs", "type": "ARMOR", - "name": "pair of ear plugs", - "name_plural": "pairs of ear plugs", + "name": { "str": "pair of ear plugs", "str_pl": "pairs of ear plugs" }, "description": "Industrial grade ear plugs. They fit inside the ear.", "weight": "10 g", "volume": "10 ml", @@ -2631,8 +2599,7 @@ "id": "elbow_pads", "type": "ARMOR", "category": "armor", - "name": "pair of elbow pads", - "name_plural": "pairs of elbow pads", + "name": { "str": "pair of elbow pads", "str_pl": "pairs of elbow pads" }, "description": "A pair of elbow pads made of stout plastic and cloth.", "weight": "110 g", "volume": "750 ml", @@ -2650,8 +2617,7 @@ { "id": "fancy_sunglasses", "type": "ARMOR", - "name": "pair of stylish sunglasses", - "name_plural": "pairs of stylish sunglasses", + "name": { "str": "pair of stylish sunglasses", "str_pl": "pairs of stylish sunglasses" }, "description": "A pair of stylish sunglasses. Look good while keeping the glare out of your eyes.", "weight": "42 g", "volume": "250 ml", @@ -2728,8 +2694,7 @@ { "id": "fencing_jacket", "type": "ARMOR", - "name": "fencing jacket", - "name_plural": "fencing jackets", + "name": { "str": "fencing jacket", "str_pl": "fencing jackets" }, "description": "A padded jacket with the zipper on the back used by fencers to prevent accidents. It doesn't have any storage room, but it is very comfortable.", "weight": "800 g", "volume": "2500 ml", @@ -2803,8 +2768,7 @@ { "id": "fencing_pants", "type": "ARMOR", - "name": "fencing pants", - "name_plural": "fencing pants", + "name": { "str": "fencing pants", "str_pl": "fencing pants" }, "description": "A pair of reinforced pants used by fencers to prevent injuries.", "weight": "450 g", "volume": "2 L", @@ -2874,8 +2838,7 @@ { "id": "fishing_waders", "type": "ARMOR", - "name": "pair of fishing waders", - "name_plural": "pairs of fishing waders", + "name": { "str": "pair of fishing waders", "str_pl": "pairs of fishing waders" }, "description": "Waterproof plastic fishing waders with a single large front pocket.", "weight": "1360 g", "volume": "9500 ml", @@ -2896,8 +2859,7 @@ { "id": "fitover_sunglasses", "type": "ARMOR", - "name": "pair of fit-over sunglasses", - "name_plural": "pairs of fit-over sunglasses", + "name": { "str": "pair of fit-over sunglasses", "str_pl": "pairs of fit-over sunglasses" }, "description": "A pair of fit-over sunglasses designed to be worn over a pair of corrective glasses. Good for keeping the glare out of your eyes.", "weight": "45 g", "volume": "250 ml", @@ -3066,8 +3028,7 @@ "id": "glasses_bal", "type": "ARMOR", "category": "armor", - "name": "pair of ballistic glasses", - "name_plural": "pairs of ballistic glasses", + "name": { "str": "pair of ballistic glasses", "str_pl": "pairs of ballistic glasses" }, "description": "Modern tactical eyewear that protects from small projectiles and fragments. Provides excellent protection from environmental dangers.", "weight": "184 g", "volume": "250 ml", @@ -3089,8 +3050,7 @@ { "id": "eclipse_glasses", "type": "ARMOR", - "name": "pair of eclipse glasses", - "name_plural": "pairs of eclipse glasses", + "name": { "str": "pair of eclipse glasses", "str_pl": "pairs of eclipse glasses" }, "description": "A pair of cardboard-framed glasses with UV and IR-filtered lenses topped with a layer of aluminum coating. They allow safe viewing of extremely bright and harmful sources of light, like the sun during a solar eclipse.", "weight": "27 g", "volume": "250 ml", @@ -3111,8 +3071,7 @@ { "id": "glasses_bifocal", "type": "ARMOR", - "name": "pair of bifocal glasses", - "name_plural": "pairs of bifocal glasses", + "name": { "str": "pair of bifocal glasses", "str_pl": "pairs of bifocal glasses" }, "description": "A pair of bifocal glasses for those who are both near-sighted and far-sighted. You can use them to focus sunlight.", "weight": "30 g", "volume": "250 ml", @@ -3132,8 +3091,7 @@ { "id": "glasses_eye", "type": "ARMOR", - "name": "pair of eyeglasses", - "name_plural": "pairs of eyeglasses", + "name": { "str": "pair of eyeglasses", "str_pl": "pairs of eyeglasses" }, "description": "A pair of glasses for the near-sighted. The concave lenses diffuse the sunlight, rendering them useless for starting fires.", "weight": "30 g", "volume": "250 ml", @@ -3172,8 +3130,7 @@ { "id": "glasses_reading", "type": "ARMOR", - "name": "pair of reading glasses", - "name_plural": "pairs of reading glasses", + "name": { "str": "pair of reading glasses", "str_pl": "pairs of reading glasses" }, "description": "A pair of glasses for the far-sighted. Useless for anyone else. You can use them to focus sunlight.", "weight": "30 g", "volume": "250 ml", @@ -3193,8 +3150,7 @@ { "id": "glasses_safety", "type": "ARMOR", - "name": "pair of safety glasses", - "name_plural": "pairs of safety glasses", + "name": { "str": "pair of safety glasses", "str_pl": "pairs of safety glasses" }, "description": "A pair of plastic glasses, used in workshops, sports, chemistry labs, and many other places. Provides great protection from damage.", "weight": "60 g", "volume": "250 ml", @@ -3245,8 +3201,7 @@ { "id": "goggles_ski", "type": "ARMOR", - "name": "pair of ski goggles", - "name_plural": "pairs of ski goggles", + "name": { "str": "pair of ski goggles", "str_pl": "pairs of ski goggles" }, "description": "A large pair of goggles that completely seal off your eyes. Provides excellent protection from environmental dangers.", "weight": "354 g", "volume": "500 ml", @@ -3268,8 +3223,7 @@ { "id": "goggles_welding", "type": "ARMOR", - "name": "pair of welding goggles", - "name_plural": "pairs of welding goggles", + "name": { "str": "pair of welding goggles", "str_pl": "pairs of welding goggles" }, "description": "A dark pair of goggles. They make seeing very difficult, but protect you from bright flashes.", "weight": "153 g", "volume": "250 ml", @@ -3824,8 +3778,7 @@ "id": "helmet_galea", "type": "ARMOR", "category": "armor", - "name": "galea", - "name_plural": "galeae", + "name": { "str": "galea", "str_pl": "galeae" }, "description": "An Imperial Roman helmet, with distinct projections protecting the sides of the head.", "weight": "1310 g", "volume": "2500 ml", @@ -4356,8 +4309,7 @@ { "id": "hot_pants", "type": "ARMOR", - "name": "hot pants", - "name_plural": "hot pants", + "name": { "str": "hot pants", "str_pl": "hot pants" }, "description": "A simple pair of short shorts.", "weight": "92 g", "volume": "250 ml", @@ -4374,8 +4326,7 @@ { "id": "hot_pants_fur", "type": "ARMOR", - "name": "fur hot pants", - "name_plural": "fur hot pants", + "name": { "str": "fur hot pants", "str_pl": "fur hot pants" }, "description": "A simple pair of fur short shorts.", "weight": "118 g", "volume": "250 ml", @@ -4393,8 +4344,7 @@ { "id": "hot_pants_leather", "type": "ARMOR", - "name": "leather hot pants", - "name_plural": "leather hot pants", + "name": { "str": "leather hot pants", "str_pl": "leather hot pants" }, "description": "A simple pair of leather short shorts.", "weight": "106 g", "volume": "250 ml", @@ -4458,8 +4408,7 @@ { "id": "iggaak", "type": "ARMOR", - "name": "pair of snow goggles", - "name_plural": "pairs of snow goggles", + "name": { "str": "pair of snow goggles", "str_pl": "pairs of snow goggles" }, "description": "Eyewear carved from from wood or bone, with only a thin slit to see out of. Helps reduce glare, traditionally used by the Inuit to protect against snow blindness.", "weight": "70 g", "volume": "250 ml", @@ -4480,8 +4429,7 @@ { "id": "jacket_army", "type": "ARMOR", - "name": "army jacket", - "name_plural": "army jacket", + "name": { "str": "army jacket", "str_pl": "army jacket" }, "description": "A tough jacket with lots of pockets. Favored by the military.", "weight": "780 g", "volume": "3 L", @@ -4697,8 +4645,7 @@ { "id": "jeans", "type": "ARMOR", - "name": "jeans", - "name_plural": "jeans", + "name": { "str": "jeans", "str_pl": "jeans" }, "description": "A pair of blue jeans with two deep pockets.", "weight": "600 g", "volume": "2 L", @@ -4719,8 +4666,7 @@ { "id": "jeans_red", "type": "ARMOR", - "name": "red jeans", - "name_plural": "red jeans", + "name": { "str": "red jeans", "str_pl": "red jeans" }, "description": "A pair of tight-fitting candy-apple-red jeans with two deep pockets.", "weight": "600 g", "volume": "2 L", @@ -5173,8 +5119,7 @@ { "id": "kippah", "type": "ARMOR", - "name": "kippah", - "name_plural": "kippahs", + "name": { "str": "kippah", "str_pl": "kippahs" }, "description": "A thin, rounded skullcap. A traditional headdress in Judaism.", "weight": "80 g", "volume": "250 ml", @@ -5192,8 +5137,7 @@ { "id": "kittel", "type": "ARMOR", - "name": "kittel", - "name_plural": "kittels", + "name": { "str": "kittel", "str_pl": "kittels" }, "description": "A white, knee-length cotton robe, traditionally worn by Jews on special occasions.", "weight": "1000 g", "volume": "4 L", @@ -5215,8 +5159,7 @@ "id": "knee_pads", "type": "ARMOR", "category": "armor", - "name": "pair of knee pads", - "name_plural": "pairs of knee pads", + "name": { "str": "pair of knee pads", "str_pl": "pairs of knee pads" }, "description": "A pair of knee pads made of stout plastic and cloth.", "weight": "210 g", "volume": "1500 ml", @@ -5234,8 +5177,7 @@ { "id": "kufi", "type": "ARMOR", - "name": "kufi cap", - "name_plural": "kufi caps", + "name": { "str": "kufi cap", "str_pl": "kufi caps" }, "description": "A brimless, short and rounded cap.", "weight": "88 g", "volume": "500 ml", @@ -5280,8 +5222,7 @@ { "id": "leather_pouch", "type": "ARMOR", - "name": "leather pouch", - "name_plural": "leather pouches", + "name": { "str": "leather pouch", "str_pl": "leather pouches" }, "description": "A bag stitched together from leather scraps. Doesn't hold an awful lot but is easy to wear.", "weight": "610 g", "volume": "500 ml", @@ -5302,8 +5243,7 @@ { "id": "ammo_pouch", "type": "ARMOR", - "name": "ammo pouch", - "name_plural": "ammo pouches", + "name": { "str": "ammo pouch", "str_pl": "ammo pouches" }, "description": "A small pouch that can be used to store most types of small ammunition, rockets will not fit. Activate to store ammunition.", "weight": "490 g", "rigid": false, @@ -5406,8 +5346,7 @@ { "id": "leg_warmers", "type": "ARMOR", - "name": "pair of leg warmers", - "name_plural": "pairs of leg warmers", + "name": { "str": "pair of leg warmers", "str_pl": "pairs of leg warmers" }, "description": "Snug, soft cloth sleeves to keep your legs warm.", "weight": "46 g", "volume": "500 ml", @@ -5426,8 +5365,7 @@ { "id": "leg_warmers_xl", "type": "ARMOR", - "name": "pair of XL leg warmers", - "name_plural": "pairs of XL leg warmers", + "name": { "str": "pair of XL leg warmers", "str_pl": "pairs of XL leg warmers" }, "description": "Large, soft, snug cloth sleeves to keep your exotic anatomy warm.", "weight": "50 g", "volume": "750 ml", @@ -5446,8 +5384,7 @@ { "id": "leggings", "type": "ARMOR", - "name": "leggings", - "name_plural": "leggings", + "name": { "str": "leggings", "str_pl": "leggings" }, "description": "Skin-tight nylon leggings, sometimes used when exercising, that keep your legs nice and warm.", "weight": "155 g", "volume": "500 ml", @@ -5466,8 +5403,7 @@ "id": "legguard_hard", "type": "ARMOR", "category": "armor", - "name": "pair of hard leg guards", - "name_plural": "pairs of hard leg guards", + "name": { "str": "pair of hard leg guards", "str_pl": "pairs of hard leg guards" }, "description": "A pair of polyurethane leg guards with neoprene backing.", "weight": "625 g", "volume": "3 L", @@ -5489,8 +5425,7 @@ "id": "legguard_lightplate", "type": "ARMOR", "category": "armor", - "name": "pair of steel leg guards", - "name_plural": "pairs of steel leg guards", + "name": { "str": "pair of steel leg guards", "str_pl": "pairs of steel leg guards" }, "description": "A full assembly of medieval leg protection. Cuisses, poleyns, and greaves, with leather straps to secure each piece and connect it as part of a set.", "weight": "4080 g", "volume": "6 L", @@ -5511,8 +5446,7 @@ "id": "legguard_metal", "type": "ARMOR", "category": "armor", - "name": "pair of iron greaves", - "name_plural": "pairs of iron greaves", + "name": { "str": "pair of iron greaves", "str_pl": "pairs of iron greaves" }, "description": "A pair of iron leg guards with a simple leather lining.", "weight": "2260 g", "volume": "5500 ml", @@ -5532,8 +5466,7 @@ { "id": "legguard_paper", "type": "ARMOR", - "name": "pair of paper leg guards", - "name_plural": "pairs of paper leg guards", + "name": { "str": "pair of paper leg guards", "str_pl": "pairs of paper leg guards" }, "description": "Leg guards made of stacked paper sheets held together with duct tape.", "weight": "370 g", "volume": "500 ml", @@ -5554,8 +5487,7 @@ "id": "legguard_scrap", "type": "ARMOR", "category": "armor", - "name": "pair of scrap leg guards", - "name_plural": "pairs of scrap leg guards", + "name": { "str": "pair of scrap leg guards", "str_pl": "pairs of scrap leg guards" }, "description": "A pair of leg guards made from scraps of metal secured by simple strings; the loose collection of plates provides decent but not the most convenient protection.", "weight": "3104 g", "volume": "5 L", @@ -5577,8 +5509,7 @@ { "id": "legrig", "type": "ARMOR", - "name": "pair of drop leg pouches", - "name_plural": "pairs of drop leg pouches", + "name": { "str": "pair of drop leg pouches", "str_pl": "pairs of drop leg pouches" }, "description": "A set of pouches that can be worn on the thighs using buckled straps. This variety is favored by the military.", "weight": "205 g", "volume": "500 ml", @@ -5596,8 +5527,7 @@ { "id": "leotard", "type": "ARMOR", - "name": "leotard", - "name_plural": "leotard", + "name": { "str": "leotard", "str_pl": "leotard" }, "description": "A skin-tight spandex garment, covering the body from the groin to the shoulders. With its deep scoop-cut back and high waist cuts, this garment is perfect for showcasing your physique on the stage.", "weight": "60 g", "volume": "500 ml", @@ -5836,8 +5766,7 @@ "id": "lsurvivor_pants", "type": "ARMOR", "category": "armor", - "name": "light survivor cargo pants", - "name_plural": "light survivor cargo pants", + "name": { "str": "light survivor cargo pants", "str_pl": "light survivor cargo pants" }, "description": "Lightweight, Kevlar armored cargo pants designed to hold as much as possible. Strong and mostly waterproof.", "weight": "920 g", "volume": "3500 ml", @@ -5880,8 +5809,7 @@ { "id": "maid_dress", "type": "ARMOR", - "name": "French maid clothes", - "name_plural": "French maid clothes", + "name": { "str": "French maid clothes", "str_pl": "French maid clothes" }, "description": "The French maid dress, blue with a frilly white apron.", "weight": "100 g", "volume": "250 ml", @@ -6050,8 +5978,7 @@ { "id": "motorbike_pants", "type": "ARMOR", - "name": "motorcycle pants", - "name_plural": "pairs of motorcycle pants", + "name": { "str": "motorcycle pants", "str_pl": "pairs of motorcycle pants" }, "description": "A pair of pants designed for dirt bikers and motorcyclists.", "weight": "1340 g", "volume": "750 ml", @@ -6187,8 +6114,7 @@ { "id": "panties", "type": "ARMOR", - "name": "panties", - "name_plural": "panties", + "name": { "str": "panties", "str_pl": "panties" }, "description": "Underwear designed to be worn by women. Preserves your modesty in desperate times.", "weight": "32 g", "volume": "250 ml", @@ -6206,8 +6132,7 @@ { "id": "pants", "type": "ARMOR", - "name": "pants", - "name_plural": "pants", + "name": { "str": "pants", "str_pl": "pants" }, "description": "A pair of khaki pants. Slightly warmer than jeans.", "weight": "560 g", "volume": "2 L", @@ -6228,8 +6153,7 @@ { "id": "pants_army", "type": "ARMOR", - "name": "army pants", - "name_plural": "army pants", + "name": { "str": "army pants", "str_pl": "army pants" }, "description": "A tough pair of pants lined with pockets. Favored by the military.", "weight": "720 g", "volume": "2500 ml", @@ -6249,8 +6173,7 @@ { "id": "pants_cargo", "type": "ARMOR", - "name": "cargo pants", - "name_plural": "cargo pants", + "name": { "str": "cargo pants", "str_pl": "cargo pants" }, "description": "A pair of pants lined with pockets, offering lots of storage.", "weight": "670 g", "volume": "2250 ml", @@ -6270,8 +6193,7 @@ { "id": "pants_checkered", "type": "ARMOR", - "name": "checkered pants", - "name_plural": "checkered pants", + "name": { "str": "checkered pants", "str_pl": "checkered pants" }, "description": "In a pinch, these pants can be used for an impromptu game of checkers.", "weight": "630 g", "volume": "1250 ml", @@ -6291,8 +6213,7 @@ { "id": "leg_warmers_f", "type": "ARMOR", - "name": "pair of fur leggings", - "name_plural": "pairs of fur leggings", + "name": { "str": "pair of fur leggings", "str_pl": "pairs of fur leggings" }, "description": "Snug fur sleeves to keep your legs warm. Simple yet effective since prehistoric times.", "weight": "694 g", "volume": "1500 ml", @@ -6311,8 +6232,7 @@ { "id": "pants_fur", "type": "ARMOR", - "name": "fur pants", - "name_plural": "fur pants", + "name": { "str": "fur pants", "str_pl": "fur pants" }, "description": "A hefty pair of fur-lined pants.", "weight": "920 g", "volume": "4 L", @@ -6336,8 +6256,7 @@ "id": "pants_faux_fur", "type": "ARMOR", "copy-from": "pants_fur", - "name": "faux fur pants", - "name_plural": "faux fur pants", + "name": { "str": "faux fur pants", "str_pl": "faux fur pants" }, "description": "A pair of long cotton pants lined with warm imitation fur.", "material": [ "faux_fur", "cotton" ], "covers": [ "LEGS" ], @@ -6346,8 +6265,7 @@ { "id": "pants_leather", "type": "ARMOR", - "name": "leather pants", - "name_plural": "leather pants", + "name": { "str": "leather pants", "str_pl": "leather pants" }, "description": "A pair of black leather pants. Very tough, but cumbersome and without much storage.", "weight": "980 g", "volume": "2500 ml", @@ -6369,8 +6287,7 @@ { "id": "pants_ski", "type": "ARMOR", - "name": "ski pants", - "name_plural": "ski pants", + "name": { "str": "ski pants", "str_pl": "ski pants" }, "description": "A pair of pants meant for alpine skiing.", "weight": "450 g", "volume": "2 L", @@ -6392,8 +6309,7 @@ "id": "pants_survivor", "type": "ARMOR", "category": "armor", - "name": "survivor cargo pants", - "name_plural": "survivor cargo pants", + "name": { "str": "survivor cargo pants", "str_pl": "survivor cargo pants" }, "description": "A pair of Kevlar armored pants covered with pouches and pockets. Custom built to be durable, comfortable, and easy to wear.", "weight": "2100 g", "volume": "3 L", @@ -6452,8 +6368,7 @@ "id": "pickelhaube", "type": "ARMOR", "category": "armor", - "name": "pickelhaube", - "name_plural": "pickelhauben", + "name": { "str": "pickelhaube", "str_pl": "pickelhauben" }, "description": "A spiked helmet once worn by German military officers. The spike is very sharp.", "weight": "980 g", "volume": "1750 ml", @@ -6620,8 +6535,7 @@ { "id": "postman_shorts", "type": "ARMOR", - "name": "mail carrier shorts", - "name_plural": "mail carrier shorts", + "name": { "str": "mail carrier shorts", "str_pl": "mail carrier shorts" }, "description": "A pair of dark blue shorts, the kind used by postal service workers.", "weight": "230 g", "volume": "1 L", @@ -6743,8 +6657,7 @@ { "id": "ragpouch", "type": "ARMOR", - "name": "pouch", - "name_plural": "pouches", + "name": { "str": "pouch", "str_pl": "pouches" }, "description": "A makeshift bag, cobbled together from rags. Really gets in the way, but provides a decent amount of storage.", "weight": "560 g", "volume": "500 ml", @@ -6764,8 +6677,7 @@ { "id": "robe", "type": "ARMOR", - "name": "robe", - "name_plural": "robes", + "name": { "str": "robe", "str_pl": "robes" }, "description": "A loose-fitting outer garment with sleeves, and a mysterious amount of well-hidden pockets.", "weight": "1000 g", "volume": "5 L", @@ -6812,8 +6724,7 @@ { "id": "sheath", "type": "ARMOR", - "name": "sheath", - "name_plural": "sheathes", + "name": { "str": "sheath", "str_pl": "sheathes" }, "description": "A leather sheath for holding knives and other small blades. It is easy to use without much practice. Activate to sheathe/draw a weapon.", "weight": "200 g", "volume": "500 ml", @@ -6878,8 +6789,7 @@ { "id": "shorts", "type": "ARMOR", - "name": "shorts", - "name_plural": "shorts", + "name": { "str": "shorts", "str_pl": "shorts" }, "description": "A pair of khaki shorts.", "weight": "230 g", "volume": "1 L", @@ -6900,8 +6810,7 @@ { "id": "shorts_cargo", "type": "ARMOR", - "name": "cargo shorts", - "name_plural": "cargo shorts", + "name": { "str": "cargo shorts", "str_pl": "cargo shorts" }, "description": "A pair of shorts lined with pockets, offering decent storage.", "weight": "340 g", "volume": "1500 ml", @@ -6922,8 +6831,7 @@ { "id": "shorts_denim", "type": "ARMOR", - "name": "denim shorts", - "name_plural": "denim shorts", + "name": { "str": "denim shorts", "str_pl": "denim shorts" }, "description": "A pair of denim shorts. Thick and tough, they provide excellent protection from cuts.", "weight": "260 g", "volume": "1250 ml", @@ -7464,8 +7372,7 @@ { "id": "striped_pants", "type": "ARMOR", - "name": "striped pants", - "name_plural": "striped pants", + "name": { "str": "striped pants", "str_pl": "striped pants" }, "description": "A pair of pants with horizontal black and white stripes.", "weight": "560 g", "volume": "2 L", @@ -7586,8 +7493,7 @@ { "id": "sundress", "type": "ARMOR", - "name": "sundress", - "name_plural": "sundresses", + "name": { "str": "sundress", "str_pl": "sundresses" }, "description": "A light and breezy cotton dress. Though cool and comfortable to wear, it lacks any storage space.", "weight": "60 g", "volume": "1 L", @@ -7605,8 +7511,7 @@ { "id": "sunglasses", "type": "ARMOR", - "name": "pair of sunglasses", - "name_plural": "pairs of sunglasses", + "name": { "str": "pair of sunglasses", "str_pl": "pairs of sunglasses" }, "description": "A pair of sunglasses, good for keeping the glare out of your eyes.", "weight": "35 g", "volume": "250 ml", @@ -7655,8 +7560,7 @@ { "id": "survivor_goggles", "type": "ARMOR", - "name": "survivor goggles", - "name_plural": "pairs of survivor goggles", + "name": { "str": "survivor goggles", "str_pl": "pairs of survivor goggles" }, "description": "A custom-built pair of armored goggles with tinted lenses. Comfortable and built to last, they provide excellent protection from environmental dangers.", "weight": "212 g", "volume": "250 ml", @@ -7851,8 +7755,7 @@ { "id": "technician_pants_gray", "type": "ARMOR", - "name": "work pants", - "name_plural": "pairs of work pants", + "name": { "str": "work pants", "str_pl": "pairs of work pants" }, "description": "A pair of gray work pants.", "weight": "520 g", "volume": "2 L", @@ -7903,8 +7806,7 @@ { "id": "thawb", "type": "ARMOR", - "name": "thawb", - "name_plural": "thawb", + "name": { "str": "thawb", "str_pl": "thawb" }, "description": "A long, loose-fitting robe with wide sleeves, a traditional Arab garment.", "weight": "1200 g", "volume": "4500 ml", @@ -7964,8 +7866,7 @@ { "id": "tights", "type": "ARMOR", - "name": "tights", - "name_plural": "tights", + "name": { "str": "tights", "str_pl": "tights" }, "description": "A snug cloth garment which clings tightly to the legs and feet to protect them from the cold.", "weight": "114 g", "volume": "250 ml", @@ -8403,8 +8304,7 @@ { "id": "under_armor_shorts", "type": "ARMOR", - "name": "compression shorts", - "name_plural": "compression shorts", + "name": { "str": "compression shorts", "str_pl": "compression shorts" }, "description": "Nylon sportswear that clings to your upper legs, aiding muscle tone and maintaining warmth.", "weight": "82 g", "volume": "250 ml", @@ -8460,8 +8360,7 @@ "id": "vambrace_larmor", "type": "ARMOR", "category": "armor", - "name": "pair of leather vambraces", - "name_plural": "pairs of leather vambraces", + "name": { "str": "pair of leather vambraces", "str_pl": "pairs of leather vambraces" }, "description": "A pair of light leather arm guards, made for archery.", "weight": "362 g", "volume": "1 L", @@ -8482,8 +8381,7 @@ { "id": "veil_wedding", "type": "ARMOR", - "name": "wedding veil", - "name_plural": "wedding veils", + "name": { "str": "wedding veil", "str_pl": "wedding veils" }, "description": "A lacy white wedding veil.", "weight": "78 g", "volume": "750 ml", @@ -8588,8 +8486,7 @@ { "id": "winter_jacket_army", "type": "ARMOR", - "name": "army winter jacket", - "name_plural": "army winter jackets", + "name": { "str": "army winter jacket", "str_pl": "army winter jackets" }, "description": "A tough hooded jacket with lots of pockets, thickly padded for warmth. Favored by the military.", "weight": "1000 g", "volume": "3 L", @@ -8610,8 +8507,7 @@ { "id": "winter_pants_army", "type": "ARMOR", - "name": "army winter pants", - "name_plural": "army winter pants", + "name": { "str": "army winter pants", "str_pl": "army winter pants" }, "description": "A tough pair of pants lined with pockets, thickly padded for warmth. Favored by the military.", "weight": "1000 g", "volume": "2500 ml", @@ -8911,8 +8807,7 @@ { "id": "javelin_bag", "type": "ARMOR", - "name": "javelin bag", - "name_plural": "javelin bags", + "name": { "str": "javelin bag", "str_pl": "javelin bags" }, "description": "An open medieval-looking bag, designed to store javelins for easy reach.", "weight": "600 g", "volume": "1250 ml", @@ -9008,8 +8903,7 @@ "id": "legguard_bronze", "type": "ARMOR", "category": "armor", - "name": "pair of bronze greaves", - "name_plural": "pairs of bronze greaves", + "name": { "str": "pair of bronze greaves", "str_pl": "pairs of bronze greaves" }, "description": "A pair of bronze leg guards with a simple leather lining.", "weight": "2520 g", "volume": "5500 ml", diff --git a/data/json/items/armor/ammo_pouch.json b/data/json/items/armor/ammo_pouch.json index f2f81f5026b52..38b635d70db13 100644 --- a/data/json/items/armor/ammo_pouch.json +++ b/data/json/items/armor/ammo_pouch.json @@ -29,8 +29,7 @@ { "id": "chestpouch", "type": "ARMOR", - "name": "chest ammo pouch", - "name_plural": "chest ammo pouches", + "name": { "str": "chest ammo pouch", "str_pl": "chest ammo pouches" }, "description": "A fabric ammo pouch that can be strapped to your chest which is capable of holding a single magazine close at hand.", "weight": "140 g", "volume": "250 ml", @@ -57,8 +56,7 @@ { "id": "chestrig", "type": "ARMOR", - "name": "chest rig", - "name_plural": "chest rig", + "name": { "str": "chest rig", "str_pl": "chest rig" }, "description": "Popularized during the Vietnam War, chest rigs like these are typically plain, barebones affairs consisting of three or more pouches in a row, with straps to secure them on your chest. This one can hold four magazines in its pouches.", "weight": "425 g", "volume": "500 ml", @@ -117,8 +115,7 @@ { "id": "legpouch", "type": "ARMOR", - "name": "ankle ammo pouch", - "name_plural": "ankle ammo pouches", + "name": { "str": "ankle ammo pouch", "str_pl": "ankle ammo pouches" }, "description": "A small fabric ammo pouch that can be strapped to your ankle which is capable of holding a single small magazine close at hand.", "volume": "250 ml", "weight": "60 g", @@ -145,8 +142,7 @@ { "type": "ARMOR", "id": "legpouch_large", - "name": "leg ammo pouch", - "name_plural": "leg ammo pouches", + "name": { "str": "leg ammo pouch", "str_pl": "leg ammo pouches" }, "description": "A fabric ammo pouch that can be strapped to your leg and capable of holding two magazine close at hand.", "weight": "120 g", "volume": "250 ml", @@ -175,8 +171,7 @@ "id": "modularvest", "type": "ARMOR", "category": "armor", - "name": "MBR vest (empty)", - "name_plural": "MBR vests (empty)", + "name": { "str": "MBR vest (empty)", "str_pl": "MBR vests (empty)" }, "description": "A Modular Bullet Resistant Vest. It has pouches for extra armor inserts, but without them provides little more protection over a regular vest. It has four pouches capable of carrying magazines.", "weight": "2860 g", "volume": "6 L", @@ -210,8 +205,7 @@ "id": "modularvestceramic", "type": "ARMOR", "category": "armor", - "name": "MBR vest (ceramic plates)", - "name_plural": "MBR vests (ceramic plates)", + "name": { "str": "MBR vest (ceramic plates)", "str_pl": "MBR vests (ceramic plates)" }, "description": "A Modular Bullet Resistant Vest. Ceramic plates have been inserted to improve its protection. The ceramic plates cannot be repaired, only replaced. It has four pouches capable of carrying magazines.", "weight": "4308 g", "volume": "6 L", @@ -245,8 +239,7 @@ "id": "modularvesthard", "type": "ARMOR", "category": "armor", - "name": "MBR vest (hard plates)", - "name_plural": "MBR vests (hard plates)", + "name": { "str": "MBR vest (hard plates)", "str_pl": "MBR vests (hard plates)" }, "description": "A Modular Bullet Resistant Vest. Hardened steel plates have been inserted, greatly increasing its protection at the cost of a great deal of weight and loss of flexibility. It has four pouches capable of carrying magazines.", "weight": "14860 g", "volume": "6 L", @@ -280,8 +273,7 @@ "id": "modularvestkevlar", "type": "ARMOR", "category": "armor", - "name": "MBR vest (Kevlar plates)", - "name_plural": "MBR vests (Kevlar plates)", + "name": { "str": "MBR vest (Kevlar plates)", "str_pl": "MBR vests (Kevlar plates)" }, "description": "A Modular Bullet Resistant Vest. Kevlar plates have been inserted to improve its protection. It has four pouches capable of carrying magazines.", "weight": "5721 g", "volume": "6 L", @@ -315,8 +307,7 @@ "id": "modularveststeel", "type": "ARMOR", "category": "armor", - "name": "MBR vest (steel plating)", - "name_plural": "MBR vests (steel plating)", + "name": { "str": "MBR vest (steel plating)", "str_pl": "MBR vests (steel plating)" }, "description": "A Modular Bullet Resistant Vest. Its armor pouches have steel plates in them; this improves protection, but makes the vest much heavier and encumbering. It has four pouches capable of carrying magazines.", "weight": "10860 g", "volume": "6 L", @@ -350,8 +341,7 @@ "id": "modularvestsuper", "type": "ARMOR", "category": "armor", - "name": "MBR vest (superalloy)", - "name_plural": "MBR vests (superalloy)", + "name": { "str": "MBR vest (superalloy)", "str_pl": "MBR vests (superalloy)" }, "description": "A Modular Bullet Resistant Vest. Its armor pouches have superalloy plating in them, giving it extra protection with marginal flexibility loss and additional weight. It has four pouches capable of carrying magazines.", "weight": "6460 g", "volume": "6 L", diff --git a/data/json/items/armor/bandolier.json b/data/json/items/armor/bandolier.json index a352b31a8c050..3ce8fcda054f4 100644 --- a/data/json/items/armor/bandolier.json +++ b/data/json/items/armor/bandolier.json @@ -128,8 +128,7 @@ { "id": "flintlock_pouch", "type": "ARMOR", - "name": "paper cartridge pouch", - "name_plural": "paper cartridge pouches", + "name": { "str": "paper cartridge pouch", "str_pl": "paper cartridge pouches" }, "description": "A covered leather pouch, worn at the waist to store and protect prepared blackpowder cartridges.", "weight": "160 g", "volume": "500 ml", @@ -195,8 +194,7 @@ { "id": "grenade_pouch", "type": "ARMOR", - "name": "grenade pouch", - "name_plural": "grenade pouches", + "name": { "str": "grenade pouch", "str_pl": "grenade pouches" }, "description": "A small pouch for storing cartridge grenades with straps for attaching it to your belt or other webbing.", "weight": "90 g", "volume": "250 ml", @@ -216,8 +214,7 @@ { "id": "stone_pouch", "type": "ARMOR", - "name": "stone pouch", - "name_plural": "stone pouches", + "name": { "str": "stone pouch", "str_pl": "stone pouches" }, "description": "A medium-sized pouch for storing rocks, with straps for attaching it to your belt or other webbing.", "weight": "90 g", "volume": "250 ml", @@ -238,8 +235,7 @@ { "id": "grenadebandolier", "type": "ARMOR", - "name": "large grenade pouch", - "name_plural": "large grenade pouches", + "name": { "str": "large grenade pouch", "str_pl": "large grenade pouches" }, "description": "A pouch for holding up to four full-sized grenades of various types.", "weight": "600 g", "volume": "1250 ml", diff --git a/data/json/items/armor/boots.json b/data/json/items/armor/boots.json index 7a4270f2bea8c..3ef7d158054e6 100644 --- a/data/json/items/armor/boots.json +++ b/data/json/items/armor/boots.json @@ -2,8 +2,7 @@ { "id": "bastsandals", "type": "ARMOR", - "name": "pair of cord sandals", - "name_plural": "pairs of cord sandals", + "name": { "str": "pair of cord sandals", "str_pl": "pairs of cord sandals" }, "description": "Lightweight sandals made from wound cord. They offer little in the way of protection, but keep you cool during warmer months.", "weight": "68 g", "volume": "250 ml", @@ -23,8 +22,7 @@ { "id": "boots", "type": "ARMOR", - "name": "pair of boots", - "name_plural": "pairs of boots", + "name": { "str": "pair of boots", "str_pl": "pairs of boots" }, "description": "Tough leather boots. Very durable.", "weight": "1060 g", "volume": "2500 ml", @@ -48,8 +46,7 @@ "id": "boots_bone", "type": "ARMOR", "category": "armor", - "name": "pair of bone armor boots", - "name_plural": "pairs of bone armor boots", + "name": { "str": "pair of bone armor boots", "str_pl": "pairs of bone armor boots" }, "description": "Leather boots armored with reinforcements made from bone. Light and strong.", "weight": "1824 g", "volume": "4250 ml", @@ -73,8 +70,7 @@ "id": "boots_bunker", "type": "ARMOR", "category": "armor", - "name": "pair of turnout boots", - "name_plural": "pairs of turnout boots", + "name": { "str": "pair of turnout boots", "str_pl": "pairs of turnout boots" }, "description": "A pair of steel-toed rubber boots, the sort worn by firefighters. Highly resistant to heat and flame, they provide excellent protection from injury.", "weight": "1930 g", "volume": "3500 ml", @@ -97,8 +93,7 @@ "id": "boots_chitin", "type": "ARMOR", "category": "armor", - "name": "pair of chitinous boots", - "name_plural": "pairs of chitinous boots", + "name": { "str": "pair of chitinous boots", "str_pl": "pairs of chitinous boots" }, "description": "Boots made from the exoskeletons of insects. Light and durable.", "weight": "1620 g", "volume": "4250 ml", @@ -122,8 +117,7 @@ "id": "boots_acidchitin", "copy-from": "boots_chitin", "type": "ARMOR", - "name": "pair of biosilicified chitin boots", - "name_plural": "pairs of biosilicified chitin boots", + "name": { "str": "pair of biosilicified chitin boots", "str_pl": "pairs of biosilicified chitin boots" }, "description": "Boots crafted from carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Acid-resistant and very durable.", "material": [ "acidchitin" ], "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25, "encumbrance": 1.5, "warmth": 1.5 }, @@ -133,8 +127,7 @@ "id": "boots_combat", "type": "ARMOR", "category": "armor", - "name": "pair of combat boots", - "name_plural": "pairs of combat boots", + "name": { "str": "pair of combat boots", "str_pl": "pairs of combat boots" }, "description": "Modern reinforced tactical combat boots. Very durable.", "weight": "1060 g", "volume": "2 L", @@ -158,8 +151,7 @@ "id": "boots_fsurvivor", "type": "ARMOR", "category": "armor", - "name": "pair of survivor fireboots", - "name_plural": "pairs of survivor fireboots", + "name": { "str": "pair of survivor fireboots", "str_pl": "pairs of survivor fireboots" }, "description": "A pair of customized, Kevlar armored Nomex boots, modified to provide maximum protection from harm and the elements, even when knee-deep in the dead.", "weight": "1980 g", "volume": "3 L", @@ -182,8 +174,7 @@ { "id": "boots_fur", "type": "ARMOR", - "name": "pair of fur boots", - "name_plural": "pairs of fur boots", + "name": { "str": "pair of fur boots", "str_pl": "pairs of fur boots" }, "description": "Boots lined with fur for warmth.", "weight": "1890 g", "volume": "4500 ml", @@ -207,8 +198,7 @@ "id": "boots_h20survivor", "type": "ARMOR", "category": "armor", - "name": "pair of survivor wetsuit boots", - "name_plural": "pairs of survivor wetsuit boots", + "name": { "str": "pair of survivor wetsuit boots", "str_pl": "pairs of survivor wetsuit boots" }, "description": "A pair of customized, kevlar armored neoprene boots, modified to provide maximum protection from harm and the elements, even when knee-deep in the dead.", "weight": "1180 g", "volume": "1500 ml", @@ -231,8 +221,7 @@ { "id": "boots_hiking", "type": "ARMOR", - "name": "pair of hiking boots", - "name_plural": "pairs of hiking boots", + "name": { "str": "pair of hiking boots", "str_pl": "pairs of hiking boots" }, "description": "Tough yet light leather boots. Durable and comfortable.", "weight": "960 g", "volume": "2 L", @@ -256,8 +245,7 @@ "id": "boots_hsurvivor", "type": "ARMOR", "category": "armor", - "name": "pair of heavy survivor boots", - "name_plural": "pairs of heavy survivor boots", + "name": { "str": "pair of heavy survivor boots", "str_pl": "pairs of heavy survivor boots" }, "description": "A pair of customized kevlar boots, heavily armored with steel and modified to provide maximum protection from harm, even when knee-deep in the dead.", "weight": "1610 g", "volume": "3 L", @@ -281,8 +269,7 @@ "id": "boots_larmor", "type": "ARMOR", "category": "armor", - "name": "pair of leather armor boots", - "name_plural": "pairs of leather armor boots", + "name": { "str": "pair of leather armor boots", "str_pl": "pairs of leather armor boots" }, "description": "Thick leather boots made specifically to protect the feet. Light and tough.", "weight": "902 g", "volume": "2 L", @@ -306,8 +293,7 @@ "id": "boots_lsurvivor", "type": "ARMOR", "category": "armor", - "name": "pair of light survivor boots", - "name_plural": "pairs of light survivor boots", + "name": { "str": "pair of light survivor boots", "str_pl": "pairs of light survivor boots" }, "description": "A pair of customized, kevlar armored cloth boots, modified to provide maximum protection from harm, even when knee-deep in the dead.", "weight": "1120 g", "volume": "2 L", @@ -331,8 +317,7 @@ "id": "boots_plate", "type": "ARMOR", "category": "armor", - "name": "pair of armored boots", - "name_plural": "pairs of armored boots", + "name": { "str": "pair of armored boots", "str_pl": "pairs of armored boots" }, "description": "An extremely heavy set of armor plated boots.", "weight": "1890 g", "volume": "3250 ml", @@ -355,8 +340,7 @@ { "id": "boots_rubber", "type": "ARMOR", - "name": "pair of rubber boots", - "name_plural": "pairs of rubber boots", + "name": { "str": "pair of rubber boots", "str_pl": "pairs of rubber boots" }, "description": "A pair of rubber boots, often used while cleaning with caustic materials.", "weight": "980 g", "volume": "3500 ml", @@ -379,8 +363,7 @@ "id": "boots_scrap", "type": "ARMOR", "category": "armor", - "name": "pair of scrap boots", - "name_plural": "pairs of scrap boots", + "name": { "str": "pair of scrap boots", "str_pl": "pairs of scrap boots" }, "description": "Boots made of random scraps.", "weight": "1845 g", "volume": "3 L", @@ -403,8 +386,7 @@ "id": "boots_steel", "type": "ARMOR", "category": "armor", - "name": "pair of steeltoed boots", - "name_plural": "pairs of steeltoed boots", + "name": { "str": "pair of steeltoed boots", "str_pl": "pairs of steeltoed boots" }, "description": "Leather boots with a steel toe. Extremely durable.", "weight": "1320 g", "volume": "3 L", @@ -428,8 +410,7 @@ "id": "boots_survivor", "type": "ARMOR", "category": "armor", - "name": "pair of survivor boots", - "name_plural": "pairs of survivor boots", + "name": { "str": "pair of survivor boots", "str_pl": "pairs of survivor boots" }, "description": "A pair of customized leather boots, armored with kevlar and modified to provide maximum protection from harm, even when knee-deep in the dead.", "weight": "1330 g", "volume": "2500 ml", @@ -453,8 +434,7 @@ "id": "boots_western", "copy-from": "boots", "type": "ARMOR", - "name": "pair of western boots", - "name_plural": "pairs of western boots", + "name": { "str": "pair of western boots", "str_pl": "pairs of western boots" }, "description": "Stiff leather boots with intricate embroidery and one-inch heels. They look good, but aren't made for running. Each boot is large enough to conceal a small holdout pistol.", "coverage": 95, "proportional": { "weight": 1.2, "volume": 1.2, "price": 2, "encumbrance": 2 }, @@ -464,8 +444,7 @@ { "id": "boots_winter", "type": "ARMOR", - "name": "pair of winter boots", - "name_plural": "pairs of winter boots", + "name": { "str": "pair of winter boots", "str_pl": "pairs of winter boots" }, "description": "Cumbersome boots designed for warmth.", "weight": "1640 g", "volume": "3500 ml", @@ -488,8 +467,7 @@ "id": "boots_wsurvivor", "type": "ARMOR", "category": "armor", - "name": "pair of winter survivor boots", - "name_plural": "pairs of winter survivor boots", + "name": { "str": "pair of winter survivor boots", "str_pl": "pairs of winter survivor boots" }, "description": "A pair of customized, Kevlar armored fur boots, modified to provide maximum protection from harm and the elements, even when knee-deep in the dead.", "weight": "1760 g", "volume": "3500 ml", @@ -513,8 +491,7 @@ "id": "boots_xlsurvivor", "type": "ARMOR", "category": "armor", - "name": "pair of XL survivor boots", - "name_plural": "pairs of XL survivor boots", + "name": { "str": "pair of XL survivor boots", "str_pl": "pairs of XL survivor boots" }, "description": "A massive pair of customized leather boots, armored with kevlar and modified to provide maximum protection from harm and the elements, even when knee-deep in the dead.", "weight": "2460 g", "volume": "5 L", @@ -537,8 +514,7 @@ { "id": "cleats", "type": "ARMOR", - "name": "pair of cleats", - "name_plural": "pairs of cleats", + "name": { "str": "pair of cleats", "str_pl": "pairs of cleats" }, "description": "Sport shoes with hard undersides, and studs on the bottom designed to dig into the grass.", "weight": "860 g", "volume": "1500 ml", @@ -559,8 +535,7 @@ { "id": "golf_shoes", "type": "ARMOR", - "name": "pair of golf shoes", - "name_plural": "pairs of golf shoes", + "name": { "str": "pair of golf shoes", "str_pl": "pairs of golf shoes" }, "description": "Snug fit sport shoes with hard ridges on the bottom.", "weight": "820 g", "volume": "1500 ml", @@ -581,8 +556,7 @@ { "id": "clogs", "type": "ARMOR", - "name": "pair of wooden clogs", - "name_plural": "pairs of wooden clogs", + "name": { "str": "pair of wooden clogs", "str_pl": "pairs of wooden clogs" }, "description": "Known as klompen in the Netherlands and sabots in France, these wooden shoes have endured through the ages due to their simple design and durability.", "weight": "916 g", "volume": "1250 ml", @@ -605,8 +579,7 @@ { "id": "clownshoes", "type": "ARMOR", - "name": "pair of clown shoes", - "name_plural": "pairs of clown shoes", + "name": { "str": "pair of clown shoes", "str_pl": "pairs of clown shoes" }, "description": "Gigantic shoes fit for a clown. Incredibly difficult to walk in.", "weight": "1140 g", "volume": "3500 ml", @@ -629,8 +602,7 @@ { "id": "dance_shoes", "type": "ARMOR", - "name": "pair of dance shoes", - "name_plural": "pairs of dance shoes", + "name": { "str": "pair of dance shoes", "str_pl": "pairs of dance shoes" }, "description": "Expensive black dance shoes with large heels.", "weight": "870 g", "volume": "1500 ml", @@ -652,8 +624,7 @@ { "id": "dress_shoes", "type": "ARMOR", - "name": "pair of dress shoes", - "name_plural": "pairs of dress shoes", + "name": { "str": "pair of dress shoes", "str_pl": "pairs of dress shoes" }, "description": "Fancy patent leather shoes. Not designed for running in.", "weight": "870 g", "volume": "1500 ml", @@ -675,8 +646,7 @@ { "id": "flip_flops", "type": "ARMOR", - "name": "pair of flip-flops", - "name_plural": "pairs of flip-flops", + "name": { "str": "pair of flip-flops", "str_pl": "pairs of flip-flops" }, "description": "Simple sandals. Very difficult to run in.", "weight": "62 g", "volume": "250 ml", @@ -696,8 +666,7 @@ { "id": "footrags", "type": "ARMOR", - "name": "pair of foot rags", - "name_plural": "pairs of foot rags", + "name": { "str": "pair of foot rags", "str_pl": "pairs of foot rags" }, "description": "Rags tied around your feet. Not much of an improvement over being barefoot, still better than nothing.", "weight": "56 g", "volume": "250 ml", @@ -717,8 +686,7 @@ { "id": "footrags_fur", "type": "ARMOR", - "name": "pair of fur foot wraps", - "name_plural": "pairs of fur foot wraps", + "name": { "str": "pair of fur foot wraps", "str_pl": "pairs of fur foot wraps" }, "description": "Fur pelts tied around your feet. Not much of an improvement over being barefoot, still better than nothing.", "weight": "135 g", "volume": "500 ml", @@ -738,8 +706,7 @@ { "id": "footrags_leather", "type": "ARMOR", - "name": "pair of leather foot wraps", - "name_plural": "pairs of leather foot wraps", + "name": { "str": "pair of leather foot wraps", "str_pl": "pairs of leather foot wraps" }, "description": "Leather patches tied around your feet. Not much of an improvement over being barefoot, still better than nothing.", "weight": "120 g", "volume": "500 ml", @@ -759,8 +726,7 @@ { "id": "footrags_wool", "type": "ARMOR", - "name": "pair of wool foot wraps", - "name_plural": "pairs of wool foot wraps", + "name": { "str": "pair of wool foot wraps", "str_pl": "pairs of wool foot wraps" }, "description": "Felt patches tied around your feet. Not much of an improvement over being barefoot, still better than nothing.", "weight": "56 g", "volume": "250 ml", @@ -780,8 +746,7 @@ { "id": "geta", "type": "ARMOR", - "name": "pair of geta", - "name_plural": "pairs of geta", + "name": { "str": "pair of geta", "str_pl": "pairs of geta" }, "description": "Simple wooden geta.", "weight": "460 g", "volume": "1 L", @@ -804,8 +769,7 @@ { "id": "heels", "type": "ARMOR", - "name": "pair of heels", - "name_plural": "pairs of heels", + "name": { "str": "pair of heels", "str_pl": "pairs of heels" }, "description": "A pair of high heels. Difficult to even walk in.", "weight": "640 g", "volume": "750 ml", @@ -826,8 +790,7 @@ { "id": "knee_high_boots", "type": "ARMOR", - "name": "pair of knee-high boots", - "name_plural": "pairs of knee-high boots", + "name": { "str": "pair of knee-high boots", "str_pl": "pairs of knee-high boots" }, "description": "Very long leather boots that cover the lower legs. Difficult to wear but extremely durable.", "weight": "1520 g", "volume": "3750 ml", @@ -850,8 +813,7 @@ { "id": "leathersandals", "type": "ARMOR", - "name": "pair of leather sandals", - "name_plural": "pairs of leather sandals", + "name": { "str": "pair of leather sandals", "str_pl": "pairs of leather sandals" }, "description": "Sturdy leather hiking sandals with a heel strap. Offers little in the way of protection, but keeps you cool during warmer months.", "weight": "94 g", "volume": "250 ml", @@ -871,8 +833,7 @@ { "id": "lowtops", "type": "ARMOR", - "name": "pair of lowtop tennis shoes", - "name_plural": "pairs of lowtop tennis shoes", + "name": { "str": "pair of lowtop tennis shoes", "str_pl": "pairs of lowtop tennis shoes" }, "description": "Lightweight shoes made of cloth and rubber.", "weight": "114 g", "volume": "750 ml", @@ -892,8 +853,7 @@ { "id": "mocassins", "type": "ARMOR", - "name": "pair of moccasins", - "name_plural": "pairs of moccasins", + "name": { "str": "pair of moccasins", "str_pl": "pairs of moccasins" }, "description": "Simple shoes made from animal pelts.", "weight": "230 g", "volume": "500 ml", @@ -913,8 +873,7 @@ { "id": "motorbike_boots", "type": "ARMOR", - "name": "pair of motorcycle boots", - "name_plural": "pairs of motorcycle boots", + "name": { "str": "pair of motorcycle boots", "str_pl": "pairs of motorcycle boots" }, "description": "A pair of durable boots to be used by dirt bikers and motorcyclists.", "weight": "2125 g", "volume": "2 L", @@ -936,8 +895,7 @@ { "id": "roller_blades", "type": "ARMOR", - "name": "pair of rollerblades", - "name_plural": "pairs of rollerblades", + "name": { "str": "pair of rollerblades", "str_pl": "pairs of rollerblades" }, "description": "A pair of inline skates. Very fast on flat floors, but they make it hard to move on rough terrain, take hits, or to dodge effectively.", "weight": "1640 g", "volume": "3750 ml", @@ -959,8 +917,7 @@ { "id": "rollerskates", "type": "ARMOR", - "name": "pair of rollerskates", - "name_plural": "pairs of rollerskates", + "name": { "str": "pair of rollerskates", "str_pl": "pairs of rollerskates" }, "description": "An old-fashioned pair of leather rollerskates with steel frames. While quite fast on flat floors, they make it difficult to take hits or to move on rough terrain.", "weight": "2720 g", "volume": "3 L", @@ -983,8 +940,7 @@ { "id": "shoes_birchbark", "type": "ARMOR", - "name": "pair of birchbark shoes", - "name_plural": "pairs of birchbark shoes", + "name": { "str": "pair of birchbark shoes", "str_pl": "pairs of birchbark shoes" }, "description": "Simple shoes woven from strips of birch bark. Not very comfortable, but better than going barefoot.", "weight": "345 g", "volume": "500 ml", @@ -1004,8 +960,7 @@ { "id": "shoes_bowling", "type": "ARMOR", - "name": "pair of bowling shoes", - "name_plural": "pairs of bowling shoes", + "name": { "str": "pair of bowling shoes", "str_pl": "pairs of bowling shoes" }, "description": "A pair of flat-soled shoes designed to give you a grip on slippery surfaces.", "weight": "840 g", "volume": "1500 ml", @@ -1025,8 +980,7 @@ { "id": "slippers", "type": "ARMOR", - "name": "pair of slippers", - "name_plural": "pairs of slippers", + "name": { "str": "pair of slippers", "str_pl": "pairs of slippers" }, "description": "Soft shoes that keep your feet warm. Not suitable for running.", "weight": "70 g", "volume": "250 ml", @@ -1047,8 +1001,7 @@ { "id": "sneakers", "type": "ARMOR", - "name": "pair of sneakers", - "name_plural": "pairs of sneakers", + "name": { "str": "pair of sneakers", "str_pl": "pairs of sneakers" }, "description": "Guaranteed to make you run faster and jump higher!", "weight": "840 g", "volume": "1500 ml", @@ -1068,8 +1021,7 @@ { "id": "straw_sandals", "type": "ARMOR", - "name": "pair of straw sandals", - "name_plural": "pairs of straw sandals", + "name": { "str": "pair of straw sandals", "str_pl": "pairs of straw sandals" }, "description": "Sandals made from straw rope. Not very comfortable, but can keep your feet safe.", "weight": "70 g", "volume": "500 ml", @@ -1089,8 +1041,7 @@ { "id": "swim_fins", "type": "ARMOR", - "name": "pair of swim fins", - "name_plural": "pairs of swim fins", + "name": { "str": "pair of swim fins", "str_pl": "pairs of swim fins" }, "description": "A pair of rubber flippers worn on the feet which improve swimming speed while greatly impeding the wearer's ability to walk.", "weight": "680 g", "volume": "1250 ml", @@ -1110,8 +1061,7 @@ { "id": "thigh_high_boots", "type": "ARMOR", - "name": "pair of thigh-high boots", - "name_plural": "pairs of thigh-high boots", + "name": { "str": "pair of thigh-high boots", "str_pl": "pairs of thigh-high boots" }, "description": "Very long leather boots that reach past the knees. Difficult to wear but extremely durable.", "weight": "1540 g", "volume": "4250 ml", @@ -1134,8 +1084,7 @@ { "id": "wetsuit_booties", "type": "ARMOR", - "name": "pair of swimming booties", - "name_plural": "pairs of swimming booties", + "name": { "str": "pair of swimming booties", "str_pl": "pairs of swimming booties" }, "description": "A pair of neoprene swimming booties, with individual toes.", "weight": "310 g", "volume": "1 L", @@ -1156,8 +1105,7 @@ { "id": "roller_shoes_off", "type": "ARMOR", - "name": "pair of heelys (off)", - "name_plural": "pairs of heelys (off)", + "name": { "str": "pair of heelys (off)", "str_pl": "pairs of heelys (off)" }, "description": "A pair of sneakers with wheels, currently the wheels are hidden.", "weight": "840 g", "volume": "1500 ml", @@ -1178,8 +1126,7 @@ { "id": "roller_shoes_on", "type": "ARMOR", - "name": "pair of heelys (on)", - "name_plural": "pairs of heelys (on)", + "name": { "str": "pair of heelys (on)", "str_pl": "pairs of heelys (on)" }, "description": "A pair of sneakers with wheels, currently the wheels are out.", "weight": "840 g", "volume": "1500 ml", @@ -1201,8 +1148,7 @@ "id": "chainmail_feet", "type": "ARMOR", "category": "armor", - "name": "pair of chainmail chausses", - "name_plural": "pairs of chainmail chausses", + "name": { "str": "pair of chainmail chausses", "str_pl": "pairs of chainmail chausses" }, "description": "Customized chainmail chausses that cover the feet, like booties made of chainmail.", "weight": "2006 g", "volume": "500 ml", @@ -1220,8 +1166,7 @@ { "id": "leg_warmers_xlf", "type": "ARMOR", - "name": "pair of fetlock furs", - "name_plural": "pairs of fetlock furs", + "name": { "str": "pair of fetlock furs", "str_pl": "pairs of fetlock furs" }, "description": "Snug fur sleeves to keep your fetlocks warm.", "weight": "66 g", "volume": "750 ml", @@ -1240,8 +1185,7 @@ { "id": "nomex_socks", "type": "ARMOR", - "name": "pair of flame-resistant socks", - "name_plural": "pairs of flame-resistant socks", + "name": { "str": "pair of flame-resistant socks", "str_pl": "pairs of flame-resistant socks" }, "description": "A snug fitting pair of stockings made from thin and lightweight Nomex fire-resistant fabric. Tough yet breathable, they are light and comfortable to wear under clothing.", "weight": "200 g", "volume": "750 ml", @@ -1262,8 +1206,7 @@ { "id": "socks", "type": "ARMOR", - "name": "pair of socks", - "name_plural": "pairs of socks", + "name": { "str": "pair of socks", "str_pl": "pairs of socks" }, "description": "Socks. Put 'em on your feet.", "weight": "32 g", "volume": "250 ml", @@ -1281,8 +1224,7 @@ { "id": "socks_ankle", "type": "ARMOR", - "name": "pair of ankle socks", - "name_plural": "pairs of ankle socks", + "name": { "str": "pair of ankle socks", "str_pl": "pairs of ankle socks" }, "description": "Short socks, commonly used for sports. These are designed to protect your feet from friction, not temperature", "weight": "25 g", "volume": "200 ml", @@ -1299,8 +1241,7 @@ { "id": "socks_bag", "type": "ARMOR", - "name": "pair of bag socks", - "name_plural": "pairs of bag socks", + "name": { "str": "pair of bag socks", "str_pl": "pairs of bag socks" }, "description": "A pair of disposable plastic bags, adapted to be used as socks.", "weight": "6 g", "volume": "250 ml", @@ -1318,8 +1259,7 @@ { "id": "socks_bowling", "type": "ARMOR", - "name": "pair of disposable bowling socks", - "name_plural": "pairs of disposable bowling socks", + "name": { "str": "pair of disposable bowling socks", "str_pl": "pairs of disposable bowling socks" }, "description": "Cheap one time socks. Can keep your feet clean, but too thin to give any protection.", "weight": "20 g", "volume": "250 ml", @@ -1336,8 +1276,7 @@ { "id": "socks_wool", "type": "ARMOR", - "name": "pair of wool socks", - "name_plural": "pairs of wool socks", + "name": { "str": "pair of wool socks", "str_pl": "pairs of wool socks" }, "description": "Warm socks made of wool.", "weight": "44 g", "volume": "250 ml", @@ -1356,8 +1295,7 @@ { "id": "stockings", "type": "ARMOR", - "name": "pair of stockings", - "name_plural": "pairs of stockings", + "name": { "str": "pair of stockings", "str_pl": "pairs of stockings" }, "description": "Long cotton socks that reach above the knees to help protect from the cold.", "weight": "90 g", "volume": "250 ml", @@ -1376,8 +1314,7 @@ { "id": "stockings_tent_legs", "type": "ARMOR", - "name": "pair of tentacle stockings", - "name_plural": "pairs of tentacle stockings", + "name": { "str": "pair of tentacle stockings", "str_pl": "pairs of tentacle stockings" }, "description": "Six long cotton tubes sized to fit over tentacles and help protect them from the cold.", "weight": "270 g", "volume": "1500 ml", @@ -1396,8 +1333,7 @@ { "id": "tabi_dress", "type": "ARMOR", - "name": "pair of tabi", - "name_plural": "pairs of tabi", + "name": { "str": "pair of tabi", "str_pl": "pairs of tabi" }, "description": "A pair of black tabi, as worn with traditional Japanese clothes.", "weight": "50 g", "volume": "250 ml", @@ -1415,8 +1351,7 @@ { "id": "tabi_gi", "type": "ARMOR", - "name": "pair of gi tabi", - "name_plural": "pairs of gi tabi", + "name": { "str": "pair of gi tabi", "str_pl": "pairs of gi tabi" }, "description": "A pair of white tabi, as used by martial arts practitioners.", "weight": "50 g", "volume": "250 ml", diff --git a/data/json/items/armor/gloves.json b/data/json/items/armor/gloves.json index 3068b3db9ade6..7be9ac25df6da 100644 --- a/data/json/items/armor/gloves.json +++ b/data/json/items/armor/gloves.json @@ -2,8 +2,7 @@ { "id": "beekeeping_gloves", "type": "ARMOR", - "name": "pair of beekeeping gloves", - "name_plural": "pairs of beekeeping gloves", + "name": { "str": "pair of beekeeping gloves", "str_pl": "pairs of beekeeping gloves" }, "description": "A pair of white beekeeping gloves made out of smooth leather.", "weight": "120 g", "volume": "250 ml", @@ -24,8 +23,7 @@ { "id": "boxing_gloves", "type": "ARMOR", - "name": "pair of boxing gloves", - "name_plural": "pairs of boxing gloves", + "name": { "str": "pair of boxing gloves", "str_pl": "pairs of boxing gloves" }, "description": "A pair of big, red, 8 oz. boxing gloves. They make dexterous tasks near impossible, but provide ample protection.", "weight": "453 g", "volume": "1 L", @@ -47,8 +45,7 @@ "id": "chainmail_hands", "type": "ARMOR", "category": "armor", - "name": "pair of chainmail gloves", - "name_plural": "pairs of chainmail gloves", + "name": { "str": "pair of chainmail gloves", "str_pl": "pairs of chainmail gloves" }, "description": "Customized chainmail gloves. They fully enclose the fingers and provide excellent protection, but are somewhat cumbersome.", "weight": "2006 g", "volume": "500 ml", @@ -67,8 +64,7 @@ "id": "fire_gauntlets", "type": "ARMOR", "category": "armor", - "name": "pair of fire gauntlets", - "name_plural": "pairs of fire gauntlets", + "name": { "str": "pair of fire gauntlets", "str_pl": "pairs of fire gauntlets" }, "description": "A heavy pair of gloves, used by firefighters and metalworkers for heat protection. Highly resistant to heat and flame, they provide excellent protection from injury.", "weight": "572 g", "volume": "1 L", @@ -90,8 +86,7 @@ "id": "gauntlets_chitin", "type": "ARMOR", "category": "armor", - "name": "pair of chitinous gauntlets", - "name_plural": "pairs of chitinous gauntlets", + "name": { "str": "pair of chitinous gauntlets", "str_pl": "pairs of chitinous gauntlets" }, "description": "Gauntlets made from the exoskeletons of insects. Very light and durable.", "weight": "760 g", "volume": "1750 ml", @@ -115,8 +110,7 @@ "copy-from": "gauntlets_chitin", "looks_like": "gauntlets_chitin", "type": "ARMOR", - "name": "pair of biosilicified chitin gauntlets", - "name_plural": "pairs of biosilicified chitin gauntlets", + "name": { "str": "pair of biosilicified chitin gauntlets", "str_pl": "pairs of biosilicified chitin gauntlets" }, "description": "Gauntlets crafted from the carefully cleaned and pruned biosilicified exoskeletons of acidic ants. Acid-resistant and very durable.", "material": [ "acidchitin" ], "proportional": { "weight": 1.125, "volume": 1.13, "price": 1.25, "encumbrance": 1.5, "warmth": 1.5 }, @@ -166,8 +160,7 @@ "id": "gauntlets_larmor", "type": "ARMOR", "category": "armor", - "name": "pair of leather armor gauntlets", - "name_plural": "pairs of leather armor gauntlets", + "name": { "str": "pair of leather armor gauntlets", "str_pl": "pairs of leather armor gauntlets" }, "description": "Heavy fingerless leather gloves. Very flexible and comfortable.", "weight": "350 g", "volume": "750 ml", @@ -189,8 +182,7 @@ { "id": "gloves_bag", "type": "ARMOR", - "name": "pair of bag gloves", - "name_plural": "pairs of bag gloves", + "name": { "str": "pair of bag gloves", "str_pl": "pairs of bag gloves" }, "description": "A pair of disposable plastic bags, adapted to be used as gloves.", "weight": "6 g", "volume": "250 ml", @@ -209,8 +201,7 @@ { "id": "gloves_fingerless", "type": "ARMOR", - "name": "pair of fingerless gloves", - "name_plural": "pairs of fingerless gloves", + "name": { "str": "pair of fingerless gloves", "str_pl": "pairs of fingerless gloves" }, "description": "A pair of leather gloves with no fingers, allowing greater manual dexterity.", "weight": "100 g", "volume": "250 ml", @@ -230,8 +221,7 @@ "id": "gloves_fingerless_mod", "type": "ARMOR", "category": "armor", - "name": "pair of armored fingerless gloves", - "name_plural": "pairs of armored fingerless gloves", + "name": { "str": "pair of armored fingerless gloves", "str_pl": "pairs of armored fingerless gloves" }, "description": "A pair of leather gloves with no fingers, allowing greater manual dexterity. These have been crudely reinforced with steel guards across the back.", "weight": "380 g", "volume": "500 ml", @@ -252,8 +242,7 @@ "id": "gloves_fsurvivor", "type": "ARMOR", "category": "armor", - "name": "pair of survivor firegloves", - "name_plural": "pairs of survivor firegloves", + "name": { "str": "pair of survivor firegloves", "str_pl": "pairs of survivor firegloves" }, "description": "A pair of customized, Kevlar armored Nomex gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", "weight": "410 g", "volume": "1 L", @@ -274,8 +263,7 @@ { "id": "gloves_fur", "type": "ARMOR", - "name": "pair of fur gloves", - "name_plural": "pairs of fur gloves", + "name": { "str": "pair of fur gloves", "str_pl": "pairs of fur gloves" }, "description": "A pair of warm fur gloves. They are somewhat cumbersome.", "weight": "410 g", "volume": "1 L", @@ -295,8 +283,7 @@ "id": "gloves_hsurvivor", "type": "ARMOR", "category": "armor", - "name": "pair of heavy survivor gloves", - "name_plural": "pairs of heavy survivor gloves", + "name": { "str": "pair of heavy survivor gloves", "str_pl": "pairs of heavy survivor gloves" }, "description": "A pair of heavily customized, steel-backed armored Kevlar gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", "weight": "380 g", "volume": "1 L", @@ -317,8 +304,7 @@ { "id": "glove_jackson", "type": "ARMOR", - "name": "white glove", - "name_plural": "white gloves", + "name": { "str": "white glove", "str_pl": "white gloves" }, "description": "A single white glove covered with hundreds of rhinestones.", "weight": "59 g", "volume": "250 ml", @@ -337,8 +323,7 @@ { "id": "gloves_leather", "type": "ARMOR", - "name": "pair of leather gloves", - "name_plural": "pairs of leather gloves", + "name": { "str": "pair of leather gloves", "str_pl": "pairs of leather gloves" }, "description": "A thin pair of black leather gloves.", "weight": "160 g", "volume": "250 ml", @@ -359,8 +344,7 @@ { "id": "gloves_light", "type": "ARMOR", - "name": "pair of light gloves", - "name_plural": "pairs of light gloves", + "name": { "str": "pair of light gloves", "str_pl": "pairs of light gloves" }, "description": "A pair of cotton gloves.", "weight": "118 g", "volume": "250 ml", @@ -380,8 +364,7 @@ { "id": "gloves_liner", "type": "ARMOR", - "name": "pair of glove liners", - "name_plural": "pairs of glove liners", + "name": { "str": "pair of glove liners", "str_pl": "pairs of glove liners" }, "description": "A pair of thin cotton gloves. Often used as a liner beneath other gloves.", "weight": "63 g", "volume": "250 ml", @@ -402,8 +385,7 @@ "id": "gloves_lsurvivor", "type": "ARMOR", "category": "armor", - "name": "pair of light survivor gloves", - "name_plural": "pairs of light survivor gloves", + "name": { "str": "pair of light survivor gloves", "str_pl": "pairs of light survivor gloves" }, "description": "A pair of customized, Kevlar armored cloth gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", "weight": "190 g", "volume": "750 ml", @@ -426,8 +408,7 @@ "type": "ARMOR", "looks_like": "gloves_lsurvivor", "category": "armor", - "name": "pair of fingerless survivor gloves", - "name_plural": "pairs of fingerless survivor gloves", + "name": { "str": "pair of fingerless survivor gloves", "str_pl": "pairs of fingerless survivor gloves" }, "description": "A pair of customized, Kevlar armored cloth gloves with no fingers, modified to be easy to wear while providing maximum protection under extreme conditions.", "weight": "160 g", "volume": "700 ml", @@ -447,8 +428,7 @@ { "id": "gloves_medical", "type": "ARMOR", - "name": "pair of medical gloves", - "name_plural": "pairs of medical gloves", + "name": { "str": "pair of medical gloves", "str_pl": "pairs of medical gloves" }, "description": "A pair of thin latex gloves, designed to limit the spread of disease.", "weight": "10 g", "volume": 0, @@ -469,8 +449,7 @@ "id": "gloves_plate", "type": "ARMOR", "category": "armor", - "name": "pair of armored gauntlets", - "name_plural": "pairs of armored gauntlets", + "name": { "str": "pair of armored gauntlets", "str_pl": "pairs of armored gauntlets" }, "description": "An extremely heavy set of armor-plated leather gloves.", "weight": "980 g", "volume": "1500 ml", @@ -492,8 +471,7 @@ { "id": "gloves_rubber", "type": "ARMOR", - "name": "pair of rubber gloves", - "name_plural": "pairs of rubber gloves", + "name": { "str": "pair of rubber gloves", "str_pl": "pairs of rubber gloves" }, "description": "A pair of rubber gloves, often used while cleaning with caustic materials.", "weight": "20 g", "volume": "1 L", @@ -515,8 +493,7 @@ "id": "gloves_survivor", "type": "ARMOR", "category": "armor", - "name": "pair of survivor gloves", - "name_plural": "pairs of survivor gloves", + "name": { "str": "pair of survivor gloves", "str_pl": "pairs of survivor gloves" }, "description": "A pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", "weight": "230 g", "volume": "750 ml", @@ -538,8 +515,7 @@ "id": "gloves_tactical", "type": "ARMOR", "category": "armor", - "name": "pair of tactical gloves", - "name_plural": "pairs of tactical gloves", + "name": { "str": "pair of tactical gloves", "str_pl": "pairs of tactical gloves" }, "description": "A pair of reinforced Kevlar tactical gloves. Commonly used by police and military units.", "weight": "220 g", "volume": "500 ml", @@ -559,8 +535,7 @@ { "id": "gloves_winter", "type": "ARMOR", - "name": "pair of winter gloves", - "name_plural": "pairs of winter gloves", + "name": { "str": "pair of winter gloves", "str_pl": "pairs of winter gloves" }, "description": "A pair of padded gloves. Cumbersome, but warm.", "weight": "218 g", "volume": "750 ml", @@ -579,8 +554,7 @@ { "id": "gloves_wool", "type": "ARMOR", - "name": "pair of wool gloves", - "name_plural": "pairs of wool gloves", + "name": { "str": "pair of wool gloves", "str_pl": "pairs of wool gloves" }, "description": "A thick pair of wool gloves. Cumbersome, but warm.", "weight": "240 g", "volume": "250 ml", @@ -599,8 +573,7 @@ { "id": "gloves_work", "type": "ARMOR", - "name": "pair of work gloves", - "name_plural": "pairs of work gloves", + "name": { "str": "pair of work gloves", "str_pl": "pairs of work gloves" }, "description": "A tough pair of gloves, for tough everyday work.", "weight": "195 g", "volume": "250 ml", @@ -621,8 +594,7 @@ { "id": "gloves_cut_resistant", "type": "ARMOR", - "name": "pair of cut resistant gloves", - "name_plural": "pairs of cut resistant gloves", + "name": { "str": "pair of cut resistant gloves", "str_pl": "pairs of cut resistant gloves" }, "description": "A pair of cut resistant gloves, useful when rapidly breaking down carcasses.", "weight": "240 g", "volume": "250 ml", @@ -643,8 +615,7 @@ { "id": "gloves_wraps", "type": "ARMOR", - "name": "pair of hand wraps", - "name_plural": "pairs of hand wraps", + "name": { "str": "pair of hand wraps", "str_pl": "pairs of hand wraps" }, "description": "Long pieces of cloth that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.", "weight": "100 g", "volume": "250 ml", @@ -663,8 +634,7 @@ { "id": "gloves_wraps_fur", "type": "ARMOR", - "name": "pair of fur hand wraps", - "name_plural": "pairs of fur hand wraps", + "name": { "str": "pair of fur hand wraps", "str_pl": "pairs of fur hand wraps" }, "description": "Pieces of animal pelt that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.", "weight": "250 g", "volume": "500 ml", @@ -684,8 +654,7 @@ { "id": "gloves_wraps_leather", "type": "ARMOR", - "name": "pair of leather hand wraps", - "name_plural": "pairs of leather hand wraps", + "name": { "str": "pair of leather hand wraps", "str_pl": "pairs of leather hand wraps" }, "description": "Pieces of leather that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.", "weight": "200 g", "volume": "500 ml", @@ -705,8 +674,7 @@ { "id": "gloves_wraps_wool", "type": "ARMOR", - "name": "pair of wool hand wraps", - "name_plural": "pairs of wool hand wraps", + "name": { "str": "pair of wool hand wraps", "str_pl": "pairs of wool hand wraps" }, "description": "Long pieces of wool that are meant to be wrapped around your hands. Provide small amounts of protection while punching and performing other general mischief.", "weight": "100 g", "volume": "250 ml", @@ -727,8 +695,7 @@ "id": "gloves_wsurvivor", "type": "ARMOR", "category": "armor", - "name": "pair of winter survivor gloves", - "name_plural": "pairs of winter survivor gloves", + "name": { "str": "pair of winter survivor gloves", "str_pl": "pairs of winter survivor gloves" }, "description": "A pair of customized, Kevlar armored fur gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", "weight": "300 g", "volume": "1250 ml", @@ -750,8 +717,7 @@ "id": "gloves_xlsurvivor", "type": "ARMOR", "category": "armor", - "name": "pair of XL survivor gloves", - "name_plural": "pairs of XL survivor gloves", + "name": { "str": "pair of XL survivor gloves", "str_pl": "pairs of XL survivor gloves" }, "description": "A massive pair of customized, Kevlar armored leather gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", "weight": "480 g", "volume": "1500 ml", @@ -772,8 +738,7 @@ { "id": "long_glove_white", "type": "ARMOR", - "name": "pair of extra long white gloves", - "name_plural": "pairs of extra long white gloves", + "name": { "str": "pair of extra long white gloves", "str_pl": "pairs of extra long white gloves" }, "description": "Long white costume gloves.", "weight": "400 g", "volume": "1 L", @@ -792,8 +757,7 @@ { "id": "mittens", "type": "ARMOR", - "name": "pair of mittens", - "name_plural": "pairs of mittens", + "name": { "str": "pair of mittens", "str_pl": "pairs of mittens" }, "description": "A pair of warm mittens. They are extremely cumbersome.", "weight": "364 g", "volume": "750 ml", @@ -813,8 +777,7 @@ { "id": "nomex_gloves", "type": "ARMOR", - "name": "pair of flame-resistant gloves", - "name_plural": "pairs of flame-resistant gloves", + "name": { "str": "pair of flame-resistant gloves", "str_pl": "pairs of flame-resistant gloves" }, "description": "A snug fitting pair of gloves made from thin and lightweight Nomex fire-resistant fabric. Tough yet breathable, they are light and comfortable to wear under clothing.", "weight": "190 g", "volume": "500 ml", @@ -835,8 +798,7 @@ { "id": "sockmitts", "type": "ARMOR", - "name": "pair of sock mitts", - "name_plural": "pairs of sock mitts", + "name": { "str": "pair of sock mitts", "str_pl": "pairs of sock mitts" }, "description": "A pair of improvised gloves made from socks with holes poked through them.", "weight": "32 g", "volume": "250 ml", @@ -854,8 +816,7 @@ { "id": "stockings_tent_arms", "type": "ARMOR", - "name": "pair of tentacle sleeves", - "name_plural": "pairs of tentacle sleeves", + "name": { "str": "pair of tentacle sleeves", "str_pl": "pairs of tentacle sleeves" }, "description": "Long cotton tubes sized to fit over tentacles and help protect them from the cold.", "weight": "360 g", "volume": "1500 ml", @@ -874,8 +835,7 @@ { "id": "winter_gloves_army", "type": "ARMOR", - "name": "pair of army winter gloves", - "name_plural": "pairs of army winter gloves", + "name": { "str": "pair of army winter gloves", "str_pl": "pairs of army winter gloves" }, "description": "A pair of padded gloves. Favored by the military.", "weight": "218 g", "volume": "750 ml", @@ -894,8 +854,7 @@ { "id": "gloves_golf", "type": "ARMOR", - "name": "pair of golfing gloves", - "name_plural": "pairs of golfing gloves", + "name": { "str": "pair of golfing gloves", "str_pl": "pairs of golfing gloves" }, "description": "A thin pair of black leather golfing gloves.", "weight": "150 g", "volume": "250 ml", diff --git a/data/json/items/armor/holster.json b/data/json/items/armor/holster.json index d9eac312df66a..b886417777e61 100644 --- a/data/json/items/armor/holster.json +++ b/data/json/items/armor/holster.json @@ -49,8 +49,7 @@ { "id": "bow_sling", "type": "ARMOR", - "name": "bow sling", - "name_plural": "bow slings", + "name": { "str": "bow sling", "str_pl": "bow slings" }, "description": "A somewhat complicated set of straps and fabric to keep your bow close to hand and (mostly) out of harms way. Activate to holster/draw your bow.", "weight": "320 g", "volume": "500 ml", @@ -122,8 +121,7 @@ { "id": "survivor_vest", "type": "ARMOR", - "name": "survivor harness", - "name_plural": "survivor harnesses", + "name": { "str": "survivor harness", "str_pl": "survivor harnesses" }, "description": "A custom-built light harness covered with pouches and including an integral tactical sling for a small rifle or other such weapon. Durable and carefully crafted to be comfortable to wear. Activate to holster/draw your weapon.", "weight": "320 g", "volume": "1250 ml", diff --git a/data/json/items/armor/jewelry.json b/data/json/items/armor/jewelry.json index 4a2581bf3ae82..13a296fd974de 100644 --- a/data/json/items/armor/jewelry.json +++ b/data/json/items/armor/jewelry.json @@ -18,8 +18,7 @@ { "id": "bead_ear", "type": "ARMOR", - "name": "pair of beaded earrings", - "name_plural": "pairs of beaded earrings", + "name": { "str": "pair of beaded earrings", "str_pl": "pairs of beaded earrings" }, "description": "A simple pair of earrings made of string and wooden beads. You can wear it if you like, but it won't provide any effects.", "weight": "7 g", "volume": 0, @@ -211,8 +210,7 @@ { "id": "diving_watch", "type": "ARMOR", - "name": "diver's watch", - "name_plural": "diver's watches", + "name": { "str": "diver's watch", "str_pl": "diver's watches" }, "description": "A waterproof, self-winding watch on a stainless steel watchband. Tells the time and current temperature. Activate to check the digital thermometer.", "weight": "65 g", "volume": "250 ml", @@ -260,8 +258,7 @@ { "id": "copper_ear", "type": "ARMOR", - "name": "pair of copper earrings", - "name_plural": "pairs of copper earrings", + "name": { "str": "pair of copper earrings", "str_pl": "pairs of copper earrings" }, "description": "A pair of copper earrings. It's pretty heavy. You can wear it if you like, but it won't provide any effects.", "weight": "50 g", "volume": 0, @@ -759,8 +756,7 @@ { "id": "gold_ear", "type": "ARMOR", - "name": "pair of gold earrings", - "name_plural": "pairs of gold earrings", + "name": { "str": "pair of gold earrings", "str_pl": "pairs of gold earrings" }, "description": "A pair of shiny gold earrings. You can wear it if you like, but it won't provide any effects.", "weight": "10 g", "volume": 0, @@ -843,8 +839,7 @@ { "id": "gold_watch", "type": "ARMOR", - "name": "gold watch", - "name_plural": "gold watches", + "name": { "str": "gold watch", "str_pl": "gold watches" }, "description": "A gold-plated steel self-winding wristwatch, suitable for a retirement present. Tells the time and looks good.", "weight": "60 g", "volume": "250 ml", @@ -874,8 +869,7 @@ { "id": "silver_watch", "type": "ARMOR", - "name": "silver watch", - "name_plural": "silver watches", + "name": { "str": "silver watch", "str_pl": "silver watches" }, "description": "An elegant silver watch, crafted from silver-plated stainless steel. It's much cheaper than other metal watches, and more classy than an ordinary wristwatch.", "weight": "80 g", "volume": "250 ml", @@ -906,8 +900,7 @@ { "id": "silver_ear", "type": "ARMOR", - "name": "pair of silver earrings", - "name_plural": "pairs of silver earrings", + "name": { "str": "pair of silver earrings", "str_pl": "pairs of silver earrings" }, "description": "A pair of beautiful silver earrings. You can wear it if you like, but it won't provide any effects.", "weight": "9 g", "volume": 0, @@ -921,8 +914,7 @@ { "id": "sf_watch", "type": "ARMOR", - "name": "fancy watch", - "name_plural": "fancy watches", + "name": { "str": "fancy watch", "str_pl": "fancy watches" }, "//": "That's about the midpoint for a rolex.", "description": "A rather large and expensively made wristwatch. Tells the time in elegantly wrought gold with silver detailing. It's really the only timepiece suitable for someone of your exquisitely discerning tastes.", "weight": "80 g", @@ -984,8 +976,7 @@ { "id": "jade_brooch", "type": "ARMOR", - "name": "jade brooch", - "name_plural": "jade brooches", + "name": { "str": "jade brooch", "str_pl": "jade brooches" }, "description": "A hand-crafted jade brooch of Oriental origin. You can wear it if you like, but it won't provide any effects.", "weight": "26 g", "volume": 0, @@ -999,8 +990,7 @@ { "id": "platinum_watch", "type": "ARMOR", - "name": "platinum watch", - "name_plural": "platinum watches", + "name": { "str": "platinum watch", "str_pl": "platinum watches" }, "description": "Flex on those gold-watch wearers with the rare, expensive and superior platinum watch. This one is made from solid platinum.", "weight": "80 g", "volume": "250 ml", @@ -1049,8 +1039,7 @@ { "id": "platinum_ear", "type": "ARMOR", - "name": "pair of platinum earrings", - "name_plural": "pairs of platinum earrings", + "name": { "str": "pair of platinum earrings", "str_pl": "pairs of platinum earrings" }, "description": "A pair of plain platinum earrings - if gold is getting boring, just use another rare metal. You can wear it if you like, but it won't provide any effects.", "weight": "15 g", "volume": 0, @@ -1260,8 +1249,7 @@ { "id": "wristwatch", "type": "ARMOR", - "name": "wrist watch", - "name_plural": "wrist watches", + "name": { "str": "wrist watch", "str_pl": "wrist watches" }, "description": "A simple wristwatch on a plastic band. Tells the time and has an alarm clock feature.", "weight": "50 g", "volume": "250 ml", @@ -1369,8 +1357,7 @@ { "id": "fur_cat_ears", "type": "ARMOR", - "name": "pair of fuzzy cat ears", - "name_plural": "pairs of fuzzy cat ears", + "name": { "str": "pair of fuzzy cat ears", "str_pl": "pairs of fuzzy cat ears" }, "description": "A fuzzy pair of brownish cat ears on a headband. It does nothing, but there's no reason not to look good even if no one's looking.", "weight": "20 g", "volume": "250 ml", @@ -1385,8 +1372,7 @@ "id": "faux_fur_cat_ears", "type": "ARMOR", "copy-from": "fur_cat_ears", - "name": "pair of faux fur cat ears", - "name_plural": "pairs of faux fur cat ears", + "name": { "str": "pair of faux fur cat ears", "str_pl": "pairs of faux fur cat ears" }, "description": "A fuzzy pair of garishly colored cat ears on a headband. It does nothing, but there's no reason not to look good even if no one's looking.", "material": [ "faux_fur" ], "color": "pink" @@ -1441,8 +1427,7 @@ { "id": "leather_cat_ears", "type": "ARMOR", - "name": "pair of leather cat ears", - "name_plural": "pairs of leather cat ears", + "name": { "str": "pair of leather cat ears", "str_pl": "pairs of leather cat ears" }, "description": "A shiny pair of black cat ears on a headband. It does nothing, but there's no reason not to look good even if no one's looking.", "weight": "20 g", "volume": "250 ml", diff --git a/data/json/items/armor/pets_dog_armor.json b/data/json/items/armor/pets_dog_armor.json index 32b4ed40e3dce..9de7f5431ea4b 100644 --- a/data/json/items/armor/pets_dog_armor.json +++ b/data/json/items/armor/pets_dog_armor.json @@ -5,8 +5,7 @@ "symbol": "[", "looks_like": "tacvest", "color": "blue", - "name": "Kevlar dog harness", - "name_plural": "Kevlar dog harnesses", + "name": { "str": "Kevlar dog harness", "str_pl": "Kevlar dog harnesses" }, "description": "A blue bulletproof harness, designed to be worn by canines in the service of local law enforcement, that protects from shoulders to abdomen. You could put this on a friendly dog.", "price": 30000, "price_postapoc": 3000, @@ -27,8 +26,7 @@ "id": "acidchitin_harness_dog", "copy-from": "kevlar_harness", "color": "green", - "name": "biosilicified chitin dog mesh harness", - "name_plural": "biosilicified chitin dog mesh harnesses", + "name": { "str": "biosilicified chitin dog mesh harness", "str_pl": "biosilicified chitin dog mesh harnesses" }, "description": "A makeshift harness of biosilicified chitin fitted to a thin mesh protecting the neck to flank of canines. You could put this on a friendly dog.", "price": 50000, "price_postapoc": 5000, @@ -40,8 +38,7 @@ "type": "PET_ARMOR", "id": "chitin_harness_dog", "copy-from": "acidchitin_harness_dog", - "name": "chitin dog mesh harness", - "name_plural": "chitin dog mesh harnesses", + "name": { "str": "chitin dog mesh harness", "str_pl": "chitin dog mesh harnesses" }, "description": "A makeshift harness of chitin fitted to a thin mesh protecting the neck to flank of canines. You could put this on a friendly dog.", "price": 35000, "price_postapoc": 3500, @@ -67,8 +64,7 @@ "id": "leather_harness_dog", "copy-from": "kevlar_harness", "color": "brown", - "name": "leather dog harness", - "name_plural": "leather dog harnesses", + "name": { "str": "leather dog harness", "str_pl": "leather dog harnesses" }, "description": "A neck to hip harness made from leather that can be attached to a canine for protection. You could put this on a friendly dog.", "price": 17500, "price_postapoc": 1750, @@ -80,8 +76,7 @@ "type": "PET_ARMOR", "id": "leatherbone_harness_dog", "copy-from": "leather_harness_dog", - "name": "leather dog harness with bones", - "name_plural": "leather dog harnesses with bones", + "name": { "str": "leather dog harness with bones", "str_pl": "leather dog harnesses with bones" }, "description": "Decorative bones affixed to a leather dog harness for that true post-apocalyptic style, even with a skull bone headpiece! You could put this on a friendly dog.", "price": 19000, "price_postapoc": 1900, diff --git a/data/json/items/armor/swimming.json b/data/json/items/armor/swimming.json index 9b38db838f1f8..86e1d237f63c7 100644 --- a/data/json/items/armor/swimming.json +++ b/data/json/items/armor/swimming.json @@ -2,8 +2,7 @@ { "id": "trunks", "type": "ARMOR", - "name": "pair of swimming trunks", - "name_plural": "pairs of swimming trunks", + "name": { "str": "pair of swimming trunks", "str_pl": "pairs of swimming trunks" }, "description": "A pair of swimming trunks, with netting.", "weight": "210 g", "volume": "750 ml", @@ -111,8 +110,7 @@ "id": "gloves_h20survivor", "type": "ARMOR", "category": "armor", - "name": "pair of survivor wetsuit gloves", - "name_plural": "pairs of survivor wetsuit gloves", + "name": { "str": "pair of survivor wetsuit gloves", "str_pl": "pairs of survivor wetsuit gloves" }, "description": "A pair of customized, Kevlar armored neoprene gloves, modified to be easy to wear while providing maximum protection under extreme conditions.", "weight": "390 g", "volume": "750 ml", @@ -195,8 +193,7 @@ { "id": "goggles_swim", "type": "ARMOR", - "name": "pair of swim goggles", - "name_plural": "pairs of swim goggles", + "name": { "str": "pair of swim goggles", "str_pl": "pairs of swim goggles" }, "description": "A small pair of goggles made for swimming.", "weight": "81 g", "volume": "250 ml", @@ -217,8 +214,7 @@ { "id": "wetsuit_gloves", "type": "ARMOR", - "name": "pair of swimming gloves", - "name_plural": "pairs of swimming gloves", + "name": { "str": "pair of swimming gloves", "str_pl": "pairs of swimming gloves" }, "description": "A pair of very flexible neoprene-silicone rubber gloves, suitable for underwater use.", "weight": "93 g", "volume": "500 ml", diff --git a/data/json/items/battery.json b/data/json/items/battery.json index 17b23244fb097..536286054ebca 100644 --- a/data/json/items/battery.json +++ b/data/json/items/battery.json @@ -3,8 +3,7 @@ "id": "battery_test", "type": "BATTERY", "category": "spare_parts", - "name": "test battery", - "name_plural": "test batteries", + "name": { "str": "test battery", "str_pl": "test batteries" }, "description": "This is a testing item for the BATTERY item type. If you found one in game it's a bug.", "weight": "200 g", "volume": "250 ml", @@ -20,8 +19,7 @@ "id": "light_minus_battery_cell", "type": "MAGAZINE", "category": "spare_parts", - "name": "ultra-light battery", - "name_plural": "ultra-light batteries", + "name": { "str": "ultra-light battery", "str_pl": "ultra-light batteries" }, "description": "This is a light battery cell designed for small size over everything else. It retains its universal compatibility, though.", "weight": "5 g", "volume": 0, @@ -38,8 +36,7 @@ "id": "light_minus_atomic_battery_cell", "type": "MAGAZINE", "category": "spare_parts", - "name": "ultra-light plutonium fuel battery", - "name_plural": "ultra-light plutonium fuel batteries", + "name": { "str": "ultra-light plutonium fuel battery", "str_pl": "ultra-light plutonium fuel batteries" }, "description": "This battery uses a thin plutonium-244 rod to stablize an exotic nanocompound. It is universally compatible with small devices. Although it stores a huge amount of power, it cannot be recharged.", "weight": "80 g", "volume": 0, @@ -57,8 +54,7 @@ "id": "light_minus_disposable_cell", "type": "MAGAZINE", "category": "spare_parts", - "name": "ultra-light disposable battery", - "name_plural": "ultra-light disposable batteries", + "name": { "str": "ultra-light disposable battery", "str_pl": "ultra-light disposable batteries" }, "description": "This is a light battery cell designed for small size over everything else. It retains its universal compatibility, though. The battery's chemistry means that it has a very high capacity, but cannot be recharged.", "weight": "5 g", "volume": 0, @@ -76,8 +72,7 @@ "id": "light_battery_cell", "type": "MAGAZINE", "category": "spare_parts", - "name": "light battery", - "name_plural": "light batteries", + "name": { "str": "light battery", "str_pl": "light batteries" }, "description": "This is a light battery cell, universally compatible with all kinds of small devices.", "weight": "50 g", "volume": "75ml", @@ -94,8 +89,7 @@ "id": "light_plus_battery_cell", "type": "MAGAZINE", "category": "spare_parts", - "name": "light battery (high-capacity)", - "name_plural": "light batteries (high-capacity)", + "name": { "str": "light battery (high-capacity)", "str_pl": "light batteries (high-capacity)" }, "description": "This is a high-capacity light battery cell, universally compatible with all kinds of small devices.", "weight": "75 g", "volume": "115ml", @@ -112,8 +106,7 @@ "id": "light_atomic_battery_cell", "type": "MAGAZINE", "category": "spare_parts", - "name": "light plutonium fuel battery", - "name_plural": "light plutonium fuel batteries", + "name": { "str": "light plutonium fuel battery", "str_pl": "light plutonium fuel batteries" }, "description": "This battery uses a thin plutonium-244 rod to stabilize an exotic nanocompound. It is universally compatible with all kinds of personal electronic devices. Although it stores a huge amount of power, it cannot be recharged.", "weight": "160 g", "volume": "115ml", @@ -131,8 +124,7 @@ "id": "light_disposable_cell", "type": "MAGAZINE", "category": "spare_parts", - "name": "light disposable battery", - "name_plural": "light disposable batteries", + "name": { "str": "light disposable battery", "str_pl": "light disposable batteries" }, "description": "This is a light battery cell, universally compatible with all kinds of small devices. The battery's chemistry means that it has a very high capacity, but cannot be recharged.", "weight": "75 g", "volume": "115ml", @@ -150,8 +142,7 @@ "id": "medium_battery_cell", "type": "MAGAZINE", "category": "spare_parts", - "name": "medium battery", - "name_plural": "medium batteries", + "name": { "str": "medium battery", "str_pl": "medium batteries" }, "description": "This is a medium battery cell, universally compatible with all kinds of appliances and power tools.", "weight": "250 g", "volume": "375ml", @@ -168,8 +159,7 @@ "id": "medium_plus_battery_cell", "type": "MAGAZINE", "category": "spare_parts", - "name": "medium battery (high-capacity)", - "name_plural": "medium batteries (high-capacity)", + "name": { "str": "medium battery (high-capacity)", "str_pl": "medium batteries (high-capacity)" }, "description": "This is a high-capacity medium battery cell, universally compatible with all kinds of appliances and power tools.", "weight": "350 g", "volume": "450ml", @@ -186,8 +176,7 @@ "id": "medium_atomic_battery_cell", "type": "MAGAZINE", "category": "spare_parts", - "name": "medium plutonium fuel battery", - "name_plural": "medium plutonium fuel batteries", + "name": { "str": "medium plutonium fuel battery", "str_pl": "medium plutonium fuel batteries" }, "description": "This battery uses a thin plutonium-244 rod to stablize an exotic nanocompound. It is universally compatible with all kinds of appliances and power tools. Although it stores a huge amount of power, it cannot be recharged.", "weight": "800 g", "volume": "375ml", @@ -205,8 +194,7 @@ "id": "medium_disposable_cell", "type": "MAGAZINE", "category": "spare_parts", - "name": "medium disposable battery", - "name_plural": "medium disposable batteries", + "name": { "str": "medium disposable battery", "str_pl": "medium disposable batteries" }, "description": "This is a medium battery cell, universally compatible with all kinds of appliances and power tools. The battery's chemistry means that it has a very high capacity, but cannot be recharged.", "weight": "350 g", "volume": "450ml", @@ -224,8 +212,7 @@ "id": "heavy_battery_cell", "type": "MAGAZINE", "category": "spare_parts", - "name": "heavy battery", - "name_plural": "heavy batteries", + "name": { "str": "heavy battery", "str_pl": "heavy batteries" }, "description": "This is a heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools.", "weight": "500 g", "volume": "750ml", @@ -242,8 +229,7 @@ "id": "heavy_plus_battery_cell", "type": "MAGAZINE", "category": "spare_parts", - "name": "heavy battery (high-capacity)", - "name_plural": "heavy batteries (high-capacity)", + "name": { "str": "heavy battery (high-capacity)", "str_pl": "heavy batteries (high-capacity)" }, "description": "This is a high-capacity heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools.", "weight": "950 g", "volume": "1000ml", @@ -260,8 +246,7 @@ "id": "heavy_atomic_battery_cell", "type": "MAGAZINE", "category": "spare_parts", - "name": "heavy plutonium fuel battery", - "name_plural": "heavy plutonium fuel batteries", + "name": { "str": "heavy plutonium fuel battery", "str_pl": "heavy plutonium fuel batteries" }, "description": "This battery uses a thin plutonium-244 rod to stablize an exotic nanocompound. It is universally compatible with all kinds of industrial-grade equipment and large tools. Although it stores a huge amount of power, it cannot be recharged.", "weight": "1600 g", "volume": "750ml", @@ -297,8 +282,7 @@ "id": "heavy_disposable_cell", "type": "MAGAZINE", "category": "spare_parts", - "name": "heavy disposable battery", - "name_plural": "heavy disposable batteries", + "name": { "str": "heavy disposable battery", "str_pl": "heavy disposable batteries" }, "description": "This is a heavy battery cell, universally compatible with all kinds of industrial-grade equipment and large tools. The battery's chemistry means that it has a very high capacity, but cannot be recharged.", "weight": "950 g", "volume": "1000ml", diff --git a/data/json/items/bionics.json b/data/json/items/bionics.json index 26e58bd1dc69e..b2270cad628f1 100644 --- a/data/json/items/bionics.json +++ b/data/json/items/bionics.json @@ -678,8 +678,7 @@ "id": "bio_power_storage_mkII", "copy-from": "bionic_general_npc_usable", "type": "BIONIC_ITEM", - "name": "Power Storage CBM Mk. II", - "name_plural": "Power Storage CBM Mk. II", + "name": { "str": "Power Storage CBM Mk. II", "str_pl": "Power Storage CBM Mk. II" }, "looks_like": "bio_int_enhancer", "description": "A Compact Bionics Module developed at DoubleTech Industries as a replacement for the highly successful Power Storage CBM. Increases the user's power capacity by 250 units.", "price": 1000000, @@ -1037,8 +1036,7 @@ "id": "bio_ankles", "copy-from": "bionic_general_faulty", "type": "BIONIC_ITEM", - "name": "Squeaky Ankles", - "name_plural": "Squeaky Ankles", + "name": { "str": "Squeaky Ankles", "str_pl": "Squeaky Ankles" }, "description": "A pair of defective bionics that make squeaking noises.", "weight": "100 g", "difficulty": 4 @@ -1047,8 +1045,7 @@ "id": "bio_deformity", "copy-from": "bionic_general_faulty", "type": "BIONIC_ITEM", - "name": "Pieces Of Junk", - "name_plural": "Pieces of Junk", + "name": { "str": "Pieces Of Junk", "str_pl": "Pieces of Junk" }, "description": "A jumble of broken metal pieces that were removed during reconstructive surgery.", "difficulty": 5 }, @@ -1170,8 +1167,7 @@ "id": "bio_stiff", "copy-from": "bionic_general_faulty", "type": "BIONIC_ITEM", - "name": "Wire-Induced Stiffness", - "name_plural": "Wire-Induced Stiffnesses", + "name": { "str": "Wire-Induced Stiffness", "str_pl": "Wire-Induced Stiffnesses" }, "description": "A length of poorly installed wiring that would cause stiffness.", "difficulty": 7 }, @@ -1179,8 +1175,7 @@ "id": "bio_thumbs", "copy-from": "bionic_general_faulty", "type": "BIONIC_ITEM", - "name": "Self-Locking Thumbs", - "name_plural": "Self-Locking Thumbs", + "name": { "str": "Self-Locking Thumbs", "str_pl": "Self-Locking Thumbs" }, "description": "A pair of faulty, self-locking thumb bionics.", "weight": "50 g", "difficulty": 5 diff --git a/data/json/items/book/martial.json b/data/json/items/book/martial.json index 044b573d37cde..f38542d2bd578 100644 --- a/data/json/items/book/martial.json +++ b/data/json/items/book/martial.json @@ -3,8 +3,7 @@ "id": "manual_aikido", "copy-from": "book_martial", "type": "GENERIC", - "name": "The Spirit of Aikido", - "name_plural": "The Spirit of Aikido", + "name": { "str": "The Spirit of Aikido", "str_pl": "The Spirit of Aikido" }, "description": "A complete guide to Aikido.", "book_data": { "martial_art": "style_aikido" } }, @@ -12,8 +11,7 @@ "id": "manual_boxing", "copy-from": "book_martial", "type": "GENERIC", - "name": "Practical Pugilism", - "name_plural": "Practical Pugilism", + "name": { "str": "Practical Pugilism", "str_pl": "Practical Pugilism" }, "description": "A complete guide to boxing. Let's get ready to rough-up some ruffians!", "book_data": { "martial_art": "style_boxing" } }, @@ -21,8 +19,7 @@ "id": "manual_capoeira", "copy-from": "book_martial", "type": "GENERIC", - "name": "Capoeira 100", - "name_plural": "Capoeira 100", + "name": { "str": "Capoeira 100", "str_pl": "Capoeira 100" }, "description": "A complete guide to Capoeira.", "book_data": { "martial_art": "style_capoeira" } }, @@ -30,8 +27,7 @@ "id": "manual_centipede", "copy-from": "book_martial", "type": "GENERIC", - "name": "The Centipede Lu Feng", - "name_plural": "The Centipede Lu Feng", + "name": { "str": "The Centipede Lu Feng", "str_pl": "The Centipede Lu Feng" }, "description": "A complete guide to Centipede Kung Fu.", "book_data": { "martial_art": "style_centipede" } }, @@ -39,8 +35,7 @@ "id": "manual_crane", "copy-from": "book_martial", "type": "GENERIC", - "name": "The Red Crane", - "name_plural": "The Red Crane", + "name": { "str": "The Red Crane", "str_pl": "The Red Crane" }, "description": "A complete guide to Crane Kung Fu.", "book_data": { "martial_art": "style_crane" } }, @@ -48,8 +43,7 @@ "id": "manual_dragon", "copy-from": "book_martial", "type": "GENERIC", - "name": "The Jade Dragon", - "name_plural": "The Jade Dragon", + "name": { "str": "The Jade Dragon", "str_pl": "The Jade Dragon" }, "description": "A complete guide to Dragon Kung Fu.", "book_data": { "martial_art": "style_dragon" } }, @@ -57,8 +51,7 @@ "id": "manual_eskrima", "copy-from": "book_martial", "type": "GENERIC", - "name": "Practical Eskrima", - "name_plural": "Practical Eskrima", + "name": { "str": "Practical Eskrima", "str_pl": "Practical Eskrima" }, "description": "A complete guide to Eskrima.", "book_data": { "martial_art": "style_eskrima" } }, @@ -66,8 +59,7 @@ "id": "manual_fencing", "copy-from": "book_martial", "type": "GENERIC", - "name": "The Modern Swordsman", - "name_plural": "The Modern Swordsman", + "name": { "str": "The Modern Swordsman", "str_pl": "The Modern Swordsman" }, "description": "A complete guide to Fencing.", "book_data": { "martial_art": "style_fencing" } }, @@ -75,8 +67,7 @@ "id": "manual_judo", "copy-from": "book_martial", "type": "GENERIC", - "name": "Kodokan Judo", - "name_plural": "Kodokan Judo", + "name": { "str": "Kodokan Judo", "str_pl": "Kodokan Judo" }, "description": "A complete guide to Judo.", "book_data": { "martial_art": "style_judo" } }, @@ -84,8 +75,7 @@ "id": "manual_karate", "copy-from": "book_martial", "type": "GENERIC", - "name": "The Shotokan Karate Handbook", - "name_plural": "The Shotokan Karate Handbook", + "name": { "str": "The Shotokan Karate Handbook", "str_pl": "The Shotokan Karate Handbook" }, "description": "A complete guide to Shotokan Karate.", "book_data": { "martial_art": "style_karate" } }, @@ -93,8 +83,7 @@ "id": "manual_krav_maga", "copy-from": "book_martial", "type": "GENERIC", - "name": "Complete Krav Maga", - "name_plural": "Complete Krav Maga", + "name": { "str": "Complete Krav Maga", "str_pl": "Complete Krav Maga" }, "description": "A complete guide to Krav Maga.", "book_data": { "martial_art": "style_krav_maga" } }, @@ -102,8 +91,7 @@ "id": "manual_leopard", "copy-from": "book_martial", "type": "GENERIC", - "name": "The Deaf Leopard", - "name_plural": "The Deaf Leopard", + "name": { "str": "The Deaf Leopard", "str_pl": "The Deaf Leopard" }, "description": "A complete guide to Leopard Kung Fu.", "book_data": { "martial_art": "style_leopard" } }, @@ -111,8 +99,7 @@ "id": "manual_lizard", "copy-from": "book_martial", "type": "GENERIC", - "name": "The Lizard Kuo Chui", - "name_plural": "The Lizard Kuo Chui", + "name": { "str": "The Lizard Kuo Chui", "str_pl": "The Lizard Kuo Chui" }, "description": "A complete guide to Lizard Kung Fu.", "book_data": { "martial_art": "style_lizard" } }, @@ -120,8 +107,7 @@ "id": "manual_muay_thai", "copy-from": "book_martial", "type": "GENERIC", - "name": "Ultimate Muay Thai", - "name_plural": "Ultimate Muay Thai", + "name": { "str": "Ultimate Muay Thai", "str_pl": "Ultimate Muay Thai" }, "description": "A complete guide to Muay Thai.", "book_data": { "martial_art": "style_muay_thai" } }, @@ -129,8 +115,7 @@ "id": "manual_ninjutsu", "copy-from": "book_martial", "type": "GENERIC", - "name": "Essence of Ninjutsu", - "name_plural": "Essence of Ninjutsu", + "name": { "str": "Essence of Ninjutsu", "str_pl": "Essence of Ninjutsu" }, "description": "A complete guide to Ninjutsu.", "book_data": { "martial_art": "style_ninjutsu" } }, @@ -138,8 +123,7 @@ "id": "manual_niten", "copy-from": "book_martial", "type": "GENERIC", - "name": "The Book of Five Rings", - "name_plural": "The Book of Five Rings", + "name": { "str": "The Book of Five Rings", "str_pl": "The Book of Five Rings" }, "description": "A primer on Miyamoto Musashi's style of combat and philosophy, Niten Ichi-Ryu.", "book_data": { "martial_art": "style_niten" } }, @@ -147,8 +131,7 @@ "id": "manual_pankration", "copy-from": "book_martial", "type": "GENERIC", - "name": "The Modern Pankratiast", - "name_plural": "The Modern Pankratiast", + "name": { "str": "The Modern Pankratiast", "str_pl": "The Modern Pankratiast" }, "description": "A complete guide to Pankration.", "book_data": { "martial_art": "style_pankration" } }, @@ -156,8 +139,7 @@ "id": "manual_scorpion", "copy-from": "book_martial", "type": "GENERIC", - "name": "The Scorpion Sun Chien", - "name_plural": "The Scorpion Sun Chien", + "name": { "str": "The Scorpion Sun Chien", "str_pl": "The Scorpion Sun Chien" }, "description": "A complete guide to Scorpion Kung Fu.", "book_data": { "martial_art": "style_scorpion" } }, @@ -165,8 +147,7 @@ "id": "manual_silat", "copy-from": "book_martial", "type": "GENERIC", - "name": "The Indonesian Warrior", - "name_plural": "The Indonesian Warrior", + "name": { "str": "The Indonesian Warrior", "str_pl": "The Indonesian Warrior" }, "description": "A complete guide to Pentjak Silat.", "book_data": { "martial_art": "style_silat" } }, @@ -174,8 +155,7 @@ "id": "manual_snake", "copy-from": "book_martial", "type": "GENERIC", - "name": "The Black Snake", - "name_plural": "The Black Snake", + "name": { "str": "The Black Snake", "str_pl": "The Black Snake" }, "description": "A complete guide to Snake Kung Fu.", "book_data": { "martial_art": "style_snake" } }, @@ -183,8 +163,7 @@ "id": "manual_taekwondo", "copy-from": "book_martial", "type": "GENERIC", - "name": "Official Taekwondo Training Manual", - "name_plural": "Official Taekwondo Training Manual", + "name": { "str": "Official Taekwondo Training Manual", "str_pl": "Official Taekwondo Training Manual" }, "description": "A complete guide to Taekwondo.", "book_data": { "martial_art": "style_taekwondo" } }, @@ -192,8 +171,7 @@ "id": "manual_tai_chi", "copy-from": "book_martial", "type": "GENERIC", - "name": "Becoming One with the Tao", - "name_plural": "Becoming One with the Tao", + "name": { "str": "Becoming One with the Tao", "str_pl": "Becoming One with the Tao" }, "description": "A complete guide to T'ai Chi Ch'uan.", "book_data": { "martial_art": "style_tai_chi" } }, @@ -201,8 +179,7 @@ "id": "manual_tiger", "copy-from": "book_martial", "type": "GENERIC", - "name": "The White Tiger", - "name_plural": "The White Tiger", + "name": { "str": "The White Tiger", "str_pl": "The White Tiger" }, "description": "A complete guide to Tiger Kung Fu.", "book_data": { "martial_art": "style_tiger" } }, @@ -210,8 +187,7 @@ "id": "manual_toad", "copy-from": "book_martial", "type": "GENERIC", - "name": "The Toad Lo Mang", - "name_plural": "The Toad Lo Mang", + "name": { "str": "The Toad Lo Mang", "str_pl": "The Toad Lo Mang" }, "description": "A complete guide to Toad Kung Fu.", "book_data": { "martial_art": "style_toad" } }, @@ -219,8 +195,7 @@ "id": "manual_venom_snake", "copy-from": "book_martial", "type": "GENERIC", - "name": "The Viper Wei Pai", - "name_plural": "The Viper Wei Pai", + "name": { "str": "The Viper Wei Pai", "str_pl": "The Viper Wei Pai" }, "description": "A complete guide to Viper Kung Fu.", "book_data": { "martial_art": "style_venom_snake" } }, @@ -228,8 +203,7 @@ "id": "manual_zui_quan", "copy-from": "book_martial", "type": "GENERIC", - "name": "Zui Quan and You", - "name_plural": "Zui Quan and You", + "name": { "str": "Zui Quan and You", "str_pl": "Zui Quan and You" }, "description": "A complete guide to Zui Quan.", "book_data": { "martial_art": "style_zui_quan" } }, @@ -237,8 +211,7 @@ "id": "manual_sojutsu", "copy-from": "book_martial", "type": "GENERIC", - "name": "The Way of the Spear", - "name_plural": "The Way of the Spear", + "name": { "str": "The Way of the Spear", "str_pl": "The Way of the Spear" }, "description": "A complete guide to Sōjutsu.", "book_data": { "martial_art": "style_sojutsu" } }, @@ -246,8 +219,7 @@ "id": "manual_wingchun", "copy-from": "book_martial", "type": "GENERIC", - "name": "Beautiful Springtime", - "name_plural": "Beautiful Springtime", + "name": { "str": "Beautiful Springtime", "str_pl": "Beautiful Springtime" }, "description": "A complete guide to Wing Chun Kung-fu.", "book_data": { "martial_art": "style_wingchun" } }, @@ -255,8 +227,7 @@ "id": "manual_medievalpole", "copy-from": "book_martial", "type": "GENERIC", - "name": "Fior Di Battaglia", - "name_plural": "Fior Di Battaglia", + "name": { "str": "Fior Di Battaglia", "str_pl": "Fior Di Battaglia" }, "description": "A completely translated medieval guide teaching various techniques with polearms, there is a chapter about the many variations of common polearms… there are even pictures!", "book_data": { "martial_art": "style_medievalpole" } }, @@ -264,8 +235,7 @@ "id": "manual_swordsmanship", "copy-from": "book_martial", "type": "GENERIC", - "name": "Historic European Swordfighting", - "name_plural": "Historic European Swordfighting", + "name": { "str": "Historic European Swordfighting", "str_pl": "Historic European Swordfighting" }, "description": "A complete guide to medieval swordsmanship. Compares the German and Italian traditions for longsword and side sword, in and out of armor, with and without shield.", "book_data": { "martial_art": "style_swordsmanship" } } diff --git a/data/json/items/book/tailor.json b/data/json/items/book/tailor.json index eab063753efe9..c3ada56e9b200 100644 --- a/data/json/items/book/tailor.json +++ b/data/json/items/book/tailor.json @@ -3,8 +3,7 @@ "id": "mag_animecon", "copy-from": "mag_tailor", "type": "BOOK", - "name": "Boston AnimeCon magazine", - "name_plural": "Boston AnimeCon magazines", + "name": { "str": "Boston AnimeCon magazine", "str_pl": "Boston AnimeCon magazines" }, "description": "A short magazine printed as an advertisement for the now canceled Boston AnimeCon. A few costume ideas are intermixed with miscellaneous information about the event." }, { diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index cb5246679b4b8..2a0b5bd97f8d5 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -21,8 +21,7 @@ "id": "chem_sulphur", "category": "chems", "price": 50, - "name": "sulfur", - "name_plural": "sulfur", + "name": { "str": "sulfur", "str_pl": "sulfur" }, "symbol": "=", "color": "yellow", "description": "A handful of pure sulfur. Primarily used to make battery acid, sulfur is sometimes used as fuel for explosives. Can be burned to produce acidic smoke, that is deadly to bacteria and humans alike, or oxidized to make paper-bleaching agents.", @@ -40,8 +39,7 @@ "id": "chunk_sulfur", "category": "spare_parts", "price": 50, - "name": "chunk of sulfur", - "name_plural": "chunks of sulfur", + "name": { "str": "chunk of sulfur", "str_pl": "chunks of sulfur" }, "symbol": "*", "color": "yellow", "description": "A chunk of pure sulfur. Break it up to use it.", @@ -57,8 +55,7 @@ "id": "material_cement", "category": "spare_parts", "price": 200, - "name": "cement", - "name_plural": "cement", + "name": { "str": "cement", "str_pl": "cement" }, "symbol": "=", "color": "dark_gray", "description": "Portland is most likely long gone, but its memory persists in cement. This ubiquitous binder can be used for all kinds of advanced masonry. Just add water.", @@ -74,8 +71,7 @@ "id": "material_limestone", "category": "spare_parts", "price": 50, - "name": "limestone", - "name_plural": "limestone", + "name": { "str": "limestone", "str_pl": "limestone" }, "symbol": "=", "color": "dark_gray", "description": "A handful of small chunks of limestone. Useful for experiments at science fairs, but pretty useless as ammo. Maybe something could be crafted from this stuff…", @@ -91,8 +87,7 @@ "id": "material_quicklime", "category": "spare_parts", "price": 100, - "name": "quicklime", - "name_plural": "quicklime", + "name": { "str": "quicklime", "str_pl": "quicklime" }, "symbol": "=", "color": "dark_gray", "description": "The product of burning limestone, this white powder is a crucial ingredient in making cement. That said, it is also extremely caustic and will cause severe burns to any tissue it comes in contact with. This property could probably be exploited.", @@ -108,8 +103,7 @@ "id": "material_sand", "category": "spare_parts", "price": 0, - "name": "sand", - "name_plural": "sand", + "name": { "str": "sand", "str_pl": "sand" }, "symbol": "=", "color": "dark_gray", "description": "A handful of New England sand. If you had a stoked furnace, you could turn it into glass. Otherwise, it's only good for making cement.", @@ -125,8 +119,7 @@ "id": "material_soil", "category": "spare_parts", "price": 0, - "name": "soil", - "name_plural": "soil", + "name": { "str": "soil", "str_pl": "soil" }, "symbol": "=", "color": "brown", "description": "A pile of loosely packed, slightly damp loamy soil. This mixture of sand, silt and clay is ideal for growing plants.", @@ -158,8 +151,7 @@ "id": "material_rocksalt", "category": "food", "price": 50, - "name": "rock salt", - "name_plural": "rock salt", + "name": { "str": "rock salt", "str_pl": "rock salt" }, "symbol": "*", "color": "light_gray", "description": "A handful of rock salt crystals. Could be refined into table salt.", @@ -173,8 +165,7 @@ "id": "material_rhodonite", "category": "spare_parts", "price": 250, - "name": "rhodonite", - "name_plural": "rhodonite", + "name": { "str": "rhodonite", "str_pl": "rhodonite" }, "symbol": "*", "color": "red", "description": "A chunk of rhodonite. It has manganese dioxide covering and going through it in veins, which can be obtained using a chisel.", @@ -189,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.", @@ -203,8 +193,7 @@ { "type": "COMESTIBLE", "id": "bleach", - "name": "bleach", - "name_plural": "bleach", + "name": { "str": "bleach", "str_pl": "bleach" }, "weight": "138 g", "color": "white", "use_action": "BLECH", @@ -226,8 +215,7 @@ { "type": "COMESTIBLE", "id": "ammonia", - "name": "ammonia", - "name_plural": "ammonia", + "name": { "str": "ammonia", "str_pl": "ammonia" }, "weight": "124 g", "color": "white", "use_action": "BLECH", @@ -248,8 +236,7 @@ { "type": "COMESTIBLE", "id": "fertilizer_liquid", - "name": "liquid fertilizer", - "name_plural": "liquid fertilizer", + "name": { "str": "liquid fertilizer", "str_pl": "liquid fertilizer" }, "weight": "67 g", "color": "yellow", "flags": [ "FERTILIZER", "NUTRIENT_OVERRIDE" ], @@ -271,8 +258,7 @@ { "type": "COMESTIBLE", "id": "fertilizer_commercial", - "name": "commercial fertilizer", - "name_plural": "commercial fertilizer", + "name": { "str": "commercial fertilizer", "str_pl": "commercial fertilizer" }, "weight": "350 g", "color": "yellow", "flags": [ "FERTILIZER" ], @@ -296,8 +282,7 @@ "type": "COMESTIBLE", "id": "fungicide", "category": "chems", - "name": "fungicide", - "name_plural": "fungicide", + "name": { "str": "fungicide", "str_pl": "fungicide" }, "weight": "1 g", "//": "Typically sold in larger quantities, but that's handed in the charge count.", "color": "pink", @@ -321,8 +306,7 @@ "type": "COMESTIBLE", "id": "insecticide", "category": "chems", - "name": "insecticide", - "name_plural": "insecticide", + "name": { "str": "insecticide", "str_pl": "insecticide" }, "weight": "1 g", "//": "Typically sold in larger quantities, but that's handed in the charge count.", "color": "pink", @@ -345,8 +329,7 @@ { "type": "COMESTIBLE", "id": "salt_water", - "name": "salt water", - "name_plural": "salt water", + "name": { "str": "salt water", "str_pl": "salt water" }, "weight": "260 g", "color": "light_cyan", "container": "bottle_plastic", @@ -365,8 +348,7 @@ { "type": "COMESTIBLE", "id": "soapy_water", - "name": "soapy water", - "name_plural": "soapy water", + "name": { "str": "soapy water", "str_pl": "soapy water" }, "weight": "260 g", "color": "light_cyan", "container": "bottle_plastic", @@ -385,8 +367,7 @@ { "type": "COMESTIBLE", "id": "water_acid", - "name": "acid water", - "name_plural": "acid water", + "name": { "str": "acid water", "str_pl": "acid water" }, "weight": "260 g", "color": "light_green", "flags": [ "ACID" ], @@ -406,8 +387,7 @@ { "type": "COMESTIBLE", "id": "water_acid_weak", - "name": "weak acid water", - "name_plural": "weak acid water", + "name": { "str": "weak acid water", "str_pl": "weak acid water" }, "weight": "255 g", "color": "light_green", "flags": [ "ACID" ], @@ -427,8 +407,7 @@ { "type": "COMESTIBLE", "id": "acid", - "name": "concentrated acid", - "name_plural": "concentrated acid", + "name": { "str": "concentrated acid", "str_pl": "concentrated acid" }, "weight": "250 g", "color": "green", "flags": [ "ACID", "DROP_ACTION_ONLY_IF_LIQUID" ], @@ -471,8 +450,7 @@ "id": "chem_aluminium_powder", "category": "chems", "price": 500, - "name": "aluminum powder", - "name_plural": "aluminum powder", + "name": { "str": "aluminum powder", "str_pl": "aluminum powder" }, "symbol": "=", "color": "white", "description": "A handful of finely ground aluminum powder. This strong reducing agent was used in combination with various oxidants for chemical welding and explosives alike. Just before the Cataclysm, however, it was the basis of virtually all commercial metallic-hued paints and anti-corrosive coatings.", @@ -490,8 +468,7 @@ "id": "chem_zinc_powder", "category": "chems", "price": 600, - "name": "zinc powder", - "name_plural": "zinc powder", + "name": { "str": "zinc powder", "str_pl": "zinc powder" }, "symbol": "=", "color": "white", "description": "A handful of zinc powder. While commercially used mostly in cosmetics and for paints, hobbyists used to mix it with sulfur to make basic rocket fuel / smokescreen. When treated with a strong acid, it will produce hydrogen.", @@ -509,8 +486,7 @@ "id": "chem_zinc", "category": "chems", "price": 200, - "name": "zinc oxide", - "name_plural": "zinc oxide", + "name": { "str": "zinc oxide", "str_pl": "zinc oxide" }, "symbol": "=", "color": "white", "description": "A handful of zinc oxide. It can be reduced into zinc, or used for some other reactions of its own.", @@ -528,8 +504,7 @@ "id": "chem_manganese_dioxide", "category": "chems", "price": 600, - "name": "manganese dioxide", - "name_plural": "manganese dioxide", + "name": { "str": "manganese dioxide", "str_pl": "manganese dioxide" }, "symbol": "=", "color": "white", "description": "A handful of manganese dioxide powder. Occurring naturally in the mineral pyrolusite, it is used commercially in the production of alkaline and zinc-carbon batteries.", @@ -547,8 +522,7 @@ "id": "chem_potassium_chloride", "category": "chems", "price": 600, - "name": "potassium chloride", - "name_plural": "potassium chloride", + "name": { "str": "potassium chloride", "str_pl": "potassium chloride" }, "symbol": "=", "color": "white", "description": "A handful of potassium chloride. Although it occurs naturally in the mineral sylvite, it can be produced as a byproduct of the reaction of saltpeter and hydrochloric acid. It can be used for making fertilizer, or potassium hydroxide by way of electrolysis.", @@ -566,8 +540,7 @@ "id": "chem_potassium_hydroxide", "category": "chems", "price": 600, - "name": "potassium hydroxide", - "name_plural": "potassium hydroxide", + "name": { "str": "potassium hydroxide", "str_pl": "potassium hydroxide" }, "symbol": "=", "color": "white", "description": "A handful of potassium hydroxide. Commonly called caustic potash, it was mainly used industrially for its caustic nature. It can be used as an electrolyte in alkaline batteries, among other applications.", @@ -585,8 +558,7 @@ "id": "chem_sulphuric_acid", "category": "chems", "price": 250, - "name": "sulfuric acid", - "name_plural": "sulfuric acid", + "name": { "str": "sulfuric acid", "str_pl": "sulfuric acid" }, "symbol": "=", "color": "white", "flags": [ "DROP_ACTION_ONLY_IF_LIQUID" ], @@ -605,8 +577,7 @@ "id": "chem_muriatic_acid", "category": "chems", "price": 250, - "name": "hydrochloric acid", - "name_plural": "hydrochloric acid", + "name": { "str": "hydrochloric acid", "str_pl": "hydrochloric acid" }, "symbol": "=", "color": "white", "flags": [ "DROP_ACTION_ONLY_IF_LIQUID" ], @@ -625,8 +596,7 @@ "id": "chem_acetone", "category": "chems", "price": 50, - "name": "acetone", - "name_plural": "acetone", + "name": { "str": "acetone", "str_pl": "acetone" }, "symbol": "=", "color": "white", "description": "Acetone, best known as the primary constituent of most nail polish removers. Flammable and can be easily used for potent home-made explosives, as demonstrated by the terrorist attacks of 2016.", @@ -642,8 +612,7 @@ "id": "chem_nitric_acid", "category": "chems", "price": 300, - "name": "nitric acid", - "name_plural": "nitric acid", + "name": { "str": "nitric acid", "str_pl": "nitric acid" }, "symbol": "=", "color": "white", "flags": [ "DROP_ACTION_ONLY_IF_LIQUID" ], @@ -662,8 +631,7 @@ "id": "chem_chromium_oxide", "category": "chems", "price": 500, - "name": "chromium oxide", - "name_plural": "chromium oxide", + "name": { "str": "chromium oxide", "str_pl": "chromium oxide" }, "symbol": "=", "color": "green", "description": "A handful of chromium oxide. This substance, typically known as the only stable green pigment for paints, is also a mild oxidizer, which can be mixed with aluminum powder to make thermite for welding. If one had access to a CVD machine and a laboratory worth of reagents, they might be able to produce very durable ceramic layers.", @@ -681,8 +649,7 @@ "id": "chem_carbide", "category": "chems", "price": 75, - "name": "calcium carbide", - "name_plural": "calcium carbide", + "name": { "str": "calcium carbide", "str_pl": "calcium carbide" }, "symbol": "=", "color": "white", "description": "A handful of calcium carbide, giving off a faint, garlic-like smell. Commercially, calcium carbide was used for on-the-spot manufacture of acetylene and historically to power acetylene lamps. If mixed with water and sealed, it will explode with little strength, but with relatively loud noise and could maybe be used as a decoy.", @@ -700,8 +667,7 @@ "id": "chem_hexamine", "category": "chems", "price": 900, - "name": "hexamine", - "name_plural": "hexamine", + "name": { "str": "hexamine", "str_pl": "hexamine" }, "symbol": "=", "color": "red", "description": "A handful of waxy hexamine tablets. This ubiquitous fuel was used to start up almost every garden grill and no 'real' camping trip could do its cooking without it, until the Cataclysm. Nowadays, it is even more valuable then before, being the key component in the preparation of several military-grade explosives.", @@ -718,8 +684,7 @@ "id": "chem_hydrogen_peroxide_conc", "category": "chems", "price": 1000, - "name": "hydrogen peroxide (concentrated)", - "name_plural": "hydrogen peroxide (concentrated)", + "name": { "str": "hydrogen peroxide (concentrated)", "str_pl": "hydrogen peroxide (concentrated)" }, "symbol": "~", "color": "white", "description": "Concentrated hydrogen peroxide is a powerful oxidant, violently decomposing in contact with most reducing agents. Can be used as rocket fuel or to make high explosives. Causes severe burns to any organic matter and may ignite it on contact.", @@ -735,8 +700,7 @@ "id": "chem_ammonium_nitrate", "category": "chems", "price": 100, - "name": "ammonium nitrate", - "name_plural": "ammonium nitrate", + "name": { "str": "ammonium nitrate", "str_pl": "ammonium nitrate" }, "symbol": "=", "color": "white", "description": "A handful of ammonium nitrate. This white, crystalline powder is commonly used as a component of fertilizers and explosives. Could also be dissolved in water to sharply lower its temperature, but is there any use for this quality in this new world?", @@ -753,8 +717,7 @@ "id": "chem_saltpetre", "category": "chems", "price": 200, - "name": "saltpeter", - "name_plural": "saltpeter", + "name": { "str": "saltpeter", "str_pl": "saltpeter" }, "symbol": "=", "color": "white", "description": "A handful of saltpeter. Sometimes used as a fertilizer, this ubiquitous nitrate is the principal constituent of black gunpowder and simple rocket propellants, such as rocket candy.", @@ -771,8 +734,7 @@ "id": "material_niter", "category": "spare_parts", "price": 75, - "name": "niter", - "name_plural": "niter", + "name": { "str": "niter", "str_pl": "niter" }, "symbol": "*", "color": "white", "description": "A large crystal of niter, the mineral form of potassium nitrate. It can be processed into saltpeter.", @@ -787,8 +749,7 @@ "id": "chem_aluminium_sulphate", "category": "chems", "price": 300, - "name": "aluminum sulfate", - "name_plural": "aluminum sulfate", + "name": { "str": "aluminum sulfate", "str_pl": "aluminum sulfate" }, "symbol": "=", "color": "white", "description": "Several crystals of aluminum sulfate. Historically, an agent for purifying water and as molluscicide, due to the fact that it degenerates their slime. Just before the Cataclysm, its main uses were for adjusting the acidity of the soil and as an additive to baking powder. If mixed with a strong acid, it could be used to saturate the soil with aluminum, causing all but the most resistant of plants to wither and die.", @@ -805,8 +766,7 @@ "id": "chem_acetic_acid", "category": "chems", "price": 200, - "name": "acetic acid", - "name_plural": "acetic acid", + "name": { "str": "acetic acid", "str_pl": "acetic acid" }, "symbol": "~", "color": "white", "description": "Concentrated acetic acid, typically used as a chemical reagent and antifungal agent. Despite its horrid smell, it was used to prepare several types of perfumes, but would making perfume not be too fancy for postapocalyptic New England?", @@ -822,8 +782,7 @@ "id": "chem_formaldehyde", "category": "chems", "price": 200, - "name": "formaldehyde", - "name_plural": "formaldehyde", + "name": { "str": "formaldehyde", "str_pl": "formaldehyde" }, "symbol": "~", "color": "white", "description": "Formaldehyde, here dissolved in water, was widely used before the Cataclysm as a precursor to production of many chemicals and materials and as an embalming agent. Easily identifiable by its pungent odor. Terribly toxic, carcinogenic, and volatile.", @@ -839,8 +798,7 @@ "id": "chem_thermite", "category": "chems", "price": 2500, - "name": "thermite", - "name_plural": "thermite", + "name": { "str": "thermite", "str_pl": "thermite" }, "symbol": "=", "color": "white", "description": "A handful of silvery-greenish powder, produced by mixing aluminum and chromium oxide. This mixture, burning at a constant pace and at extremely high temperature, was once used for on-the-spot welding. Can be used as an incendiary material in a pinch.", @@ -858,8 +816,7 @@ "id": "chem_anfo", "category": "chems", "price": 5000, - "name": "ANFO", - "name_plural": "ANFO", + "name": { "str": "ANFO", "str_pl": "ANFO" }, "symbol": "=", "color": "red", "description": "Several brownish pellets that were made by absorbing organic fuel on ammonium nitrate. This ammonium nitrate-fuel oil or ANFO, as it is called, mixture is a common industrial explosive due to its stability and low price. Burns fast, but needs an explosive primer to detonate.", @@ -876,8 +833,7 @@ "id": "chem_black_powder", "category": "chems", "price": 2000, - "name": "black gunpowder", - "name_plural": "black gunpowder", + "name": { "str": "black gunpowder", "str_pl": "black gunpowder" }, "symbol": "=", "color": "dark_gray", "description": "A handful of black gunpowder, made by mixing charcoal and sulfur with saltpeter. Pretty useless for making modern cartridges, as the soot produced when it burns will quickly clog any firearm, but it could be used to make some vicious bombs.", @@ -894,8 +850,7 @@ "id": "chem_match_head_powder", "category": "chems", "price": 50, - "name": "match head powder", - "name_plural": "match head powder", + "name": { "str": "match head powder", "str_pl": "match head powder" }, "symbol": "=", "color": "light_red", "description": "Some match head powder from match heads, similar to black gunpowder but a bit weaker. It can be used in crafting explosives and fuses when other more suitable candidates are less available.", @@ -912,8 +867,7 @@ "id": "chem_rdx", "category": "chems", "price": 7500, - "name": "RDX", - "name_plural": "RDX", + "name": { "str": "RDX", "str_pl": "RDX" }, "symbol": "=", "color": "white", "description": "Several off-white crystals of RDX or hexogen: a military-grade, shelf-stable high explosive. Can be cast into shaped charges or mixed with scrap to pepper the blast area with high-velocity shrapnel.", @@ -930,8 +884,7 @@ "id": "chem_hmtd", "category": "chems", "price": 5000, - "name": "HMTD", - "name_plural": "HMTD", + "name": { "str": "HMTD", "str_pl": "HMTD" }, "symbol": "=", "color": "white", "description": "Hexamine peroxide: this fine, yellowish powder is a powerful primary explosive, used to initiate detonation of more stable explosives, such as RDX. Relatively stable, but best not store it for too long.", @@ -949,8 +902,7 @@ "id": "chem_rocket_fuel", "category": "chems", "price": 500, - "name": "rocket fuel", - "name_plural": "rocket fuel", + "name": { "str": "rocket fuel", "str_pl": "rocket fuel" }, "symbol": "=", "color": "white", "description": "A chunk of a zinc powder and sulfur mixture, bound together by superglue, that can be used as an impromptu rocket fuel.", @@ -1109,8 +1061,7 @@ { "type": "COMESTIBLE", "id": "water_sewage", - "name": "sewage water", - "name_plural": "sewage water", + "name": { "str": "sewage water", "str_pl": "sewage water" }, "weight": "280 g", "color": "green", "container": "bottle_plastic", @@ -1146,8 +1097,7 @@ "id": "soap_flakes", "category": "chems", "price": 500, - "name": "soap flakes", - "name_plural": "soap flakes", + "name": { "str": "soap flakes", "str_pl": "soap flakes" }, "looks_like": "detergent", "symbol": "=", "color": "white", @@ -1161,8 +1111,7 @@ { "type": "COMESTIBLE", "id": "lye", - "name": "lye", - "name_plural": "lye", + "name": { "str": "lye", "str_pl": "lye" }, "weight": "125 g", "color": "white", "container": "bottle_plastic", @@ -1198,8 +1147,7 @@ "id": "ash", "category": "chems", "price": 0, - "name": "wood ash", - "name_plural": "wood ashes", + "name": { "str": "wood ash", "str_pl": "wood ashes" }, "symbol": "=", "looks_like": "f_ash", "color": "light_gray", @@ -1215,8 +1163,7 @@ "id": "ether", "category": "chems", "price": 10, - "name": "ether", - "name_plural": "ether", + "name": { "str": "ether", "str_pl": "ether" }, "symbol": "!", "quench": -96, "healthy": -20, @@ -1232,8 +1179,7 @@ "id": "chem_DMSO", "category": "chems", "price": 10, - "name": "dimethyl sulfoxide", - "name_plural": "dimethyl sulfoxide", + "name": { "str": "dimethyl sulfoxide", "str_pl": "dimethyl sulfoxide" }, "symbol": "~", "quench": -96, "healthy": -20, @@ -1249,8 +1195,7 @@ "id": "chem_chloroform", "category": "chems", "price": 20, - "name": "chloroform", - "name_plural": "chloroform", + "name": { "str": "chloroform", "str_pl": "chloroform" }, "symbol": "~", "color": "light_cyan", "container": "bottle_glass", @@ -1266,8 +1211,7 @@ "id": "chem_phenol", "category": "chems", "price": 10, - "name": "phenol", - "name_plural": "phenol", + "name": { "str": "phenol", "str_pl": "phenol" }, "symbol": "~", "quench": -96, "healthy": -20, @@ -1283,8 +1227,7 @@ "id": "chem_glycerol", "category": "chems", "price": 10, - "name": "glycerol", - "name_plural": "glycerol", + "name": { "str": "glycerol", "str_pl": "glycerol" }, "symbol": "~", "quench": -15, "healthy": -1, @@ -1299,8 +1242,7 @@ "id": "chem_peptone_broth", "category": "chems", "price": 10, - "name": "peptone broth powder", - "name_plural": "peptone broth powder", + "name": { "str": "peptone broth powder", "str_pl": "peptone broth powder" }, "symbol": ";", "quench": -15, "fun": -4, @@ -1319,8 +1261,7 @@ "id": "chem_agar", "category": "chems", "price": 10, - "name": "agar", - "name_plural": "agar", + "name": { "str": "agar", "str_pl": "agar" }, "symbol": ";", "quench": -15, "fun": -6, @@ -1339,8 +1280,7 @@ "id": "chem_acrylamide", "category": "chems", "price": 10, - "name": "acrylamide", - "name_plural": "acrylamide", + "name": { "str": "acrylamide", "str_pl": "acrylamide" }, "symbol": ";", "quench": -15, "healthy": -20, diff --git a/data/json/items/classes/gun.json b/data/json/items/classes/gun.json index 64c8503cf63a2..b6f6c5f2d3d18 100644 --- a/data/json/items/classes/gun.json +++ b/data/json/items/classes/gun.json @@ -139,8 +139,7 @@ "abstract": "rifle_manual", "copy-from": "rifle_base", "type": "GUN", - "name": "rifle with manual actions", - "name_plural": "rifles with manual actions", + "name": { "str": "rifle with manual actions", "str_pl": "rifles with manual actions" }, "//": "Manual actions exclude the magazine location preventing installation of belt-feed adaptors", "faults": [ "fault_gun_blackpowder", "fault_gun_dirt" ], "valid_mod_locations": [ diff --git a/data/json/items/comestibles/alcohol.json b/data/json/items/comestibles/alcohol.json index a7b02aef815f1..84c18f6afb780 100644 --- a/data/json/items/comestibles/alcohol.json +++ b/data/json/items/comestibles/alcohol.json @@ -2,8 +2,7 @@ { "type": "COMESTIBLE", "id": "wine_mycus", - "name": "marloss wine", - "name_plural": "marloss wine", + "name": { "str": "marloss wine", "str_pl": "marloss wine" }, "weight": "33 g", "color": "white", "addiction_type": "alcohol", @@ -29,8 +28,7 @@ { "type": "COMESTIBLE", "id": "wine_riesling", - "name": "Riesling", - "name_plural": "Riesling", + "name": { "str": "Riesling", "str_pl": "Riesling" }, "weight": "50 g", "color": "white", "addiction_type": "alcohol", @@ -57,8 +55,7 @@ { "type": "COMESTIBLE", "id": "wine_chardonnay", - "name": "Chardonnay", - "name_plural": "Chardonnay", + "name": { "str": "Chardonnay", "str_pl": "Chardonnay" }, "weight": "50 g", "color": "white", "addiction_type": "alcohol", @@ -85,8 +82,7 @@ { "type": "COMESTIBLE", "id": "wine_cabernet", - "name": "Cabernet Sauvignon", - "name_plural": "Cabernet Sauvignon", + "name": { "str": "Cabernet Sauvignon", "str_pl": "Cabernet Sauvignon" }, "weight": "50 g", "color": "red", "addiction_type": "alcohol", @@ -111,8 +107,7 @@ { "type": "COMESTIBLE", "id": "wine_noir", - "name": "pinot noir", - "name_plural": "pinot noir", + "name": { "str": "pinot noir", "str_pl": "pinot noir" }, "weight": "50 g", "color": "red", "addiction_type": "alcohol", @@ -138,8 +133,7 @@ { "type": "COMESTIBLE", "id": "wine_marsala", - "name": "marsala", - "name_plural": "marsala", + "name": { "str": "marsala", "str_pl": "marsala" }, "weight": "50 g", "color": "red", "addiction_type": "alcohol", @@ -165,8 +159,7 @@ { "type": "COMESTIBLE", "id": "wine_vermouth", - "name": "vermouth", - "name_plural": "vermouth", + "name": { "str": "vermouth", "str_pl": "vermouth" }, "weight": "50 g", "color": "red", "addiction_type": "alcohol", @@ -192,8 +185,7 @@ { "type": "COMESTIBLE", "id": "wine_barley", - "name": "barley wine", - "name_plural": "barley wine", + "name": { "str": "barley wine", "str_pl": "barley wine" }, "weight": "249 g", "color": "brown", "addiction_type": "alcohol", @@ -220,8 +212,7 @@ { "type": "COMESTIBLE", "id": "whiskey", - "name": "whiskey", - "name_plural": "whiskey", + "name": { "str": "whiskey", "str_pl": "whiskey" }, "weight": "33 g", "color": "brown", "addiction_type": "alcohol", @@ -248,8 +239,7 @@ { "type": "COMESTIBLE", "id": "vodka", - "name": "vodka", - "name_plural": "vodka", + "name": { "str": "vodka", "str_pl": "vodka" }, "weight": "33 g", "color": "light_cyan", "addiction_type": "alcohol", @@ -275,8 +265,7 @@ { "type": "COMESTIBLE", "id": "gin", - "name": "gin", - "name_plural": "gin", + "name": { "str": "gin", "str_pl": "gin" }, "weight": "33 g", "color": "light_cyan", "addiction_type": "alcohol", @@ -302,8 +291,7 @@ { "type": "COMESTIBLE", "id": "rum", - "name": "rum", - "name_plural": "rum", + "name": { "str": "rum", "str_pl": "rum" }, "weight": "33 g", "color": "light_cyan", "addiction_type": "alcohol", @@ -329,8 +317,7 @@ { "type": "COMESTIBLE", "id": "tequila", - "name": "tequila", - "name_plural": "tequila", + "name": { "str": "tequila", "str_pl": "tequila" }, "weight": "34 g", "color": "yellow", "addiction_type": "alcohol", @@ -356,8 +343,7 @@ { "type": "COMESTIBLE", "id": "triple_sec", - "name": "triple sec", - "name_plural": "triple sec", + "name": { "str": "triple sec", "str_pl": "triple sec" }, "weight": "30 g", "color": "light_cyan", "addiction_type": "alcohol", @@ -383,8 +369,7 @@ { "type": "COMESTIBLE", "id": "bum_wine", - "name": "cheap wine", - "name_plural": "cheap wine", + "name": { "str": "cheap wine", "str_pl": "cheap wine" }, "weight": "35 g", "color": "red", "addiction_type": "alcohol", @@ -411,8 +396,7 @@ { "type": "COMESTIBLE", "id": "mixed_alcohol_strong", - "name": "strong mixed alcohol", - "name_plural": "strong mixed alcohol", + "name": { "str": "strong mixed alcohol", "str_pl": "strong mixed alcohol" }, "weight": "34 g", "color": "red", "addiction_type": "alcohol", @@ -438,8 +422,7 @@ { "type": "COMESTIBLE", "id": "mixed_alcohol_weak", - "name": "weak mixed alcohol", - "name_plural": "weak mixed alcohol", + "name": { "str": "weak mixed alcohol", "str_pl": "weak mixed alcohol" }, "weight": "248 g", "color": "light_red", "addiction_type": "alcohol", @@ -465,8 +448,7 @@ { "type": "COMESTIBLE", "id": "fruit_wine", - "name": "fruit wine", - "name_plural": "fruit wine", + "name": { "str": "fruit wine", "str_pl": "fruit wine" }, "weight": "36 g", "color": "light_red", "addiction_type": "alcohol", @@ -493,8 +475,7 @@ { "type": "COMESTIBLE", "id": "brandy", - "name": "brandy", - "name_plural": "brandy", + "name": { "str": "brandy", "str_pl": "brandy" }, "weight": "34 g", "color": "light_red", "addiction_type": "alcohol", @@ -520,8 +501,7 @@ { "type": "COMESTIBLE", "id": "irish_coffee", - "name": "Irish coffee", - "name_plural": "Irish coffee", + "name": { "str": "Irish coffee", "str_pl": "Irish coffee" }, "weight": "260 g", "color": "brown", "addiction_type": "alcohol", @@ -546,8 +526,7 @@ { "type": "COMESTIBLE", "id": "long_island", - "name": "Long Island iced tea", - "name_plural": "Long Island iced tea", + "name": { "str": "Long Island iced tea", "str_pl": "Long Island iced tea" }, "weight": "232 g", "color": "brown", "addiction_type": "alcohol", @@ -601,8 +580,7 @@ { "type": "COMESTIBLE", "id": "drink_wild_apple", - "name": "wild apple", - "name_plural": "wild apple", + "name": { "str": "wild apple", "str_pl": "wild apple" }, "weight": "258 g", "color": "brown", "addiction_type": "alcohol", @@ -629,8 +607,7 @@ { "type": "COMESTIBLE", "id": "drink_rumcola", - "name": "rum & cola", - "name_plural": "rum & cola", + "name": { "str": "rum & cola", "str_pl": "rum & cola" }, "weight": "251 g", "color": "brown", "addiction_type": "alcohol", @@ -656,8 +633,7 @@ { "type": "COMESTIBLE", "id": "beer", - "name": "beer", - "name_plural": "beer", + "name": { "str": "beer", "str_pl": "beer" }, "weight": "251 g", "color": "brown", "addiction_type": "alcohol", @@ -683,8 +659,7 @@ { "type": "COMESTIBLE", "id": "mead", - "name": "spiced mead", - "name_plural": "spiced mead", + "name": { "str": "spiced mead", "str_pl": "spiced mead" }, "weight": "36 g", "color": "yellow", "addiction_type": "alcohol", @@ -710,8 +685,7 @@ { "type": "COMESTIBLE", "id": "dandelion_wine", - "name": "dandelion wine", - "name_plural": "dandelion wine", + "name": { "str": "dandelion wine", "str_pl": "dandelion wine" }, "weight": "35 g", "color": "yellow", "addiction_type": "alcohol", @@ -738,8 +712,7 @@ { "type": "COMESTIBLE", "id": "pine_wine", - "name": "pine wine", - "name_plural": "pine wine", + "name": { "str": "pine wine", "str_pl": "pine wine" }, "weight": "35 g", "color": "light_green", "addiction_type": "alcohol", @@ -766,8 +739,7 @@ { "type": "COMESTIBLE", "id": "hb_beer", - "name": "homebrew beer", - "name_plural": "homebrew beer", + "name": { "str": "homebrew beer", "str_pl": "homebrew beer" }, "weight": "249 g", "color": "brown", "addiction_type": "alcohol", @@ -793,8 +765,7 @@ { "type": "COMESTIBLE", "id": "moonshine", - "name": "moonshine", - "name_plural": "moonshine", + "name": { "str": "moonshine", "str_pl": "moonshine" }, "weight": "35 g", "color": "brown", "addiction_type": "alcohol", @@ -820,8 +791,7 @@ { "type": "COMESTIBLE", "id": "european_pilsner", - "name": "European pilsner", - "name_plural": "European pilsner", + "name": { "str": "European pilsner", "str_pl": "European pilsner" }, "weight": "249 g", "color": "brown", "addiction_type": "alcohol", @@ -848,8 +818,7 @@ { "type": "COMESTIBLE", "id": "pale_ale", - "name": "American pale ale", - "name_plural": "American pale ale", + "name": { "str": "American pale ale", "str_pl": "American pale ale" }, "weight": "249 g", "color": "brown", "addiction_type": "alcohol", @@ -876,8 +845,7 @@ { "type": "COMESTIBLE", "id": "india_pale_ale", - "name": "India pale ale", - "name_plural": "India pale ale", + "name": { "str": "India pale ale", "str_pl": "India pale ale" }, "weight": "249 g", "color": "brown", "addiction_type": "alcohol", @@ -904,8 +872,7 @@ { "type": "COMESTIBLE", "id": "stout", - "name": "stout", - "name_plural": "stout", + "name": { "str": "stout", "str_pl": "stout" }, "weight": "205 g", "color": "brown", "addiction_type": "alcohol", @@ -932,8 +899,7 @@ { "type": "COMESTIBLE", "id": "belgian_ale", - "name": "Belgian ale", - "name_plural": "Belgian ale", + "name": { "str": "Belgian ale", "str_pl": "Belgian ale" }, "weight": "249 g", "color": "brown", "addiction_type": "alcohol", @@ -960,8 +926,7 @@ { "type": "COMESTIBLE", "id": "imperial_stout", - "name": "imperial stout", - "name_plural": "imperial stout", + "name": { "str": "imperial stout", "str_pl": "imperial stout" }, "weight": "249 g", "color": "brown", "addiction_type": "alcohol", @@ -1016,8 +981,7 @@ { "type": "COMESTIBLE", "id": "drink_boozeberry", - "name": "boozeberry", - "name_plural": "boozeberries", + "name": { "str": "boozeberry", "str_pl": "boozeberries" }, "weight": "43 g", "color": "cyan", "addiction_type": "alcohol", @@ -1045,8 +1009,7 @@ { "type": "COMESTIBLE", "id": "single_malt_whiskey", - "name": "single malt whiskey", - "name_plural": "single malt whiskey", + "name": { "str": "single malt whiskey", "str_pl": "single malt whiskey" }, "weight": "33 g", "color": "brown", "addiction_type": "alcohol", @@ -1074,8 +1037,7 @@ "type": "COMESTIBLE", "id": "single_pot_whiskey", "copy-from": "whiskey", - "name": "single pot still Irish whiskey", - "name_plural": "single pot still Irish whiskey", + "name": { "str": "single pot still Irish whiskey", "str_pl": "single pot still Irish whiskey" }, "description": "A whiskey made from a mixed mash of malted and unmalted barley.", "price": 2600, "fun": 20 @@ -1084,8 +1046,7 @@ "type": "COMESTIBLE", "id": "cheap_whiskey", "copy-from": "whiskey", - "name": "cheap whiskey", - "name_plural": "cheap whiskey", + "name": { "str": "cheap whiskey", "str_pl": "cheap whiskey" }, "description": "Really cheap blended whiskey.", "price": 1800, "fun": 12 @@ -1094,8 +1055,7 @@ "type": "COMESTIBLE", "id": "canadian_whiskey", "copy-from": "whiskey", - "name": "Canadian whiskey", - "name_plural": "Canadian whiskey", + "name": { "str": "Canadian whiskey", "str_pl": "Canadian whiskey" }, "description": "A multi-grain liquor made from a mash of corn and rye.", "price": 2400, "fun": 17 @@ -1103,8 +1063,7 @@ { "type": "COMESTIBLE", "id": "sherry", - "name": "sherry", - "name_plural": "sherry", + "name": { "str": "sherry", "str_pl": "sherry" }, "weight": "120 g", "color": "brown", "addiction_type": "alcohol", @@ -1131,8 +1090,7 @@ "type": "COMESTIBLE", "id": "bristol_sherry", "copy-from": "sherry", - "name": "Bristol Cream", - "name_plural": "Bristol Cream", + "name": { "str": "Bristol Cream", "str_pl": "Bristol Cream" }, "description": "A fine sherry that was been aged in American oak casks and bottled in Bristol, England.", "price": 2800, "fun": 18 @@ -1141,8 +1099,7 @@ "type": "COMESTIBLE", "id": "madeira", "copy-from": "sherry", - "name": "Madeira wine", - "name_plural": "Madeira wine", + "name": { "str": "Madeira wine", "str_pl": "Madeira wine" }, "description": "Fortified wine from Madeira. A true Royal Navy drink.", "price": 2400, "fun": 15 diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index 6178bd53d7619..97e2d22538779 100644 --- a/data/json/items/comestibles/bread.json +++ b/data/json/items/comestibles/bread.json @@ -2,8 +2,7 @@ { "id": "donut_holes", "type": "COMESTIBLE", - "name": "donut holes", - "name_plural": "donut holes", + "name": { "str": "donut holes", "str_pl": "donut holes" }, "weight": "226 g", "color": "yellow", "spoils_in": "10 days", diff --git a/data/json/items/comestibles/brewing.json b/data/json/items/comestibles/brewing.json index ace7f9a88528a..0e54c9140ef77 100644 --- a/data/json/items/comestibles/brewing.json +++ b/data/json/items/comestibles/brewing.json @@ -42,8 +42,7 @@ { "type": "COMESTIBLE", "id": "wash_whiskey", - "name": "whiskey wash", - "name_plural": "whiskey washes", + "name": { "str": "whiskey wash", "str_pl": "whiskey washes" }, "description": "Fermented, but not distilled whiskey. No longer tastes sweet.", "weight": "33 g", "color": "brown", @@ -67,8 +66,7 @@ { "type": "COMESTIBLE", "id": "brew_gin", - "name": "fermenting gin mash", - "name_plural": "fermenting gin mashes", + "name": { "str": "fermenting gin mash", "str_pl": "fermenting gin mashes" }, "description": "Undistilled gin mash. Distilling it will produce gin.", "weight": "33 g", "color": "brown", @@ -88,8 +86,7 @@ { "type": "COMESTIBLE", "id": "gin_mash", - "name": "gin mash", - "name_plural": "gin mashes", + "name": { "str": "gin mash", "str_pl": "gin mashes" }, "description": "Gin mash, after the junipers have had time to add flavor, ready to be distilled or drunk as is.", "weight": "33 g", "color": "yellow", @@ -133,8 +130,7 @@ { "type": "COMESTIBLE", "id": "wash_vodka", - "name": "vodka wash", - "name_plural": "vodka washes", + "name": { "str": "vodka wash", "str_pl": "vodka washes" }, "description": "Fermented, but not distilled vodka. No longer tastes sweet.", "weight": "33 g", "color": "light_cyan", @@ -178,8 +174,7 @@ { "type": "COMESTIBLE", "id": "wash_rum", - "name": "rum wash", - "name_plural": "rum washes", + "name": { "str": "rum wash", "str_pl": "rum washes" }, "description": "Fermented, but not distilled rum. No longer tastes sweet.", "weight": "50 g", "color": "light_cyan", @@ -305,8 +300,7 @@ { "type": "COMESTIBLE", "id": "brew_moonshine", - "name": "moonshine mash", - "name_plural": "moonshine mashes", + "name": { "str": "moonshine mash", "str_pl": "moonshine mashes" }, "description": "Unfermented moonshine. Just some water, sugar and corn, like good ol' aunt's recipe.", "weight": "50 g", "color": "brown", @@ -326,8 +320,7 @@ { "type": "COMESTIBLE", "id": "wash_moonshine", - "name": "moonshine wash", - "name_plural": "moonshine washes", + "name": { "str": "moonshine wash", "str_pl": "moonshine washes" }, "description": "Fermented, but not distilled moonshine. Contains all the contaminants you don't want in your moonshine.", "weight": "50 g", "color": "brown", diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index 56a002e66981e..3dd244c29259e 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -15,8 +15,7 @@ "id": "fish", "copy-from": "flesh", "type": "COMESTIBLE", - "name": "fillet of fish", - "name_plural": "fillets of fish", + "name": { "str": "fillet of fish", "str_pl": "fillets of fish" }, "description": "Freshly caught fish. Makes a passable meal raw.", "//": "Nutrition information based on cod", "weight": "148 g", @@ -32,8 +31,7 @@ "id": "fish_cooked", "copy-from": "fish", "type": "COMESTIBLE", - "name": "cooked fish", - "name_plural": "cooked fish", + "name": { "str": "cooked fish", "str_pl": "cooked fish" }, "description": "Freshly cooked fish. Very nutritious.", "proportional": { "price": 1.5 }, "spoils_in": "1 day", @@ -60,8 +58,7 @@ "id": "human_fat", "copy-from": "fat", "type": "COMESTIBLE", - "name": "chunk of human fat", - "name_plural": "chunks of human fat", + "name": { "str": "chunk of human fat", "str_pl": "chunks of human fat" }, "description": "Freshly harvested from a human body.", "material": "hflesh" }, @@ -87,8 +84,7 @@ "copy-from": "meat", "type": "COMESTIBLE", "cooks_like": "human_cooked", - "name": "human flesh", - "name_plural": "human fleshes", + "name": { "str": "human flesh", "str_pl": "human fleshes" }, "description": "Freshly butchered from a human body.", "material": "hflesh" }, @@ -108,8 +104,7 @@ "id": "meat", "copy-from": "flesh", "type": "COMESTIBLE", - "name": "chunk of meat", - "name_plural": "chunks of meat", + "name": { "str": "chunk of meat", "str_pl": "chunks of meat" }, "description": "Freshly butchered meat. You could eat it raw, but cooking it is better.", "weight": "296 g", "volume": "250 ml", @@ -127,8 +122,7 @@ "id": "meat_scrap", "copy-from": "meat", "type": "COMESTIBLE", - "name": "scrap of meat", - "name_plural": "scraps of meat", + "name": { "str": "scrap of meat", "str_pl": "scraps of meat" }, "description": "This is a tiny scrap of edible meat. It's not much, but it'll do in a pinch.", "cooks_like": "meat_scrap_cooked", "proportional": { "weight": 0.1, "volume": 0.1, "price": 0.1, "calories": 0.1 }, @@ -139,8 +133,7 @@ "id": "mutant_meat", "type": "COMESTIBLE", "copy-from": "meat", - "name": "chunk of mutant meat", - "name_plural": "chunks of mutant meat", + "name": { "str": "chunk of mutant meat", "str_pl": "chunks of mutant meat" }, "description": "Meat from a heavily mutated animal. It has an unsettling loose and spongy texture, but smells… mostly normal. There are strange tangles and formations in it that don't appear natural at all: bits of bone and hair crusted up inside the muscle, as if trying to form another organism. Still, seems digestible at least, if you cook it and remove the worst parts.", "looks_like": "meat", "cooks_like": "mutant_meat_cooked", @@ -152,8 +145,7 @@ "id": "mutant_meat_scrap", "type": "COMESTIBLE", "copy-from": "meat_scrap", - "name": "scrap of mutant meat", - "name_plural": "scraps of mutant meat", + "name": { "str": "scrap of mutant meat", "str_pl": "scraps of mutant meat" }, "description": "A tiny scrap of meat from a heavily mutated animal. It smells a bit odd, and has bits of hair and bone mixed in that seem like they grew inside the muscle itself. Still, seems digestible at least, if you cook it and remove the worst parts.", "looks_like": "meat_scrap", "cooks_like": "mutant_meat_scrap_cooked", @@ -189,8 +181,7 @@ "id": "ruined_chunks", "//": "This item should not get any use whatsoever, it is merely conservation of mass and an attractor for carrion.", "symbol": "¨", - "name": "butchery refuse", - "name_plural": "butchery refuse", + "name": { "str": "butchery refuse", "str_pl": "butchery refuse" }, "charges": 15, "volume": "2500 ml", "weight": "250 g", @@ -223,8 +214,7 @@ "id": "meat_scrap_cooked", "copy-from": "meat_scrap", "type": "COMESTIBLE", - "name": "cooked scrap of meat", - "name_plural": "cooked scraps of meat", + "name": { "str": "cooked scrap of meat", "str_pl": "cooked scraps of meat" }, "parasites": 0, "fun": 0, "healthy": 0, @@ -248,8 +238,7 @@ "id": "mutant_meat_scrap_cooked", "type": "COMESTIBLE", "copy-from": "mutant_meat_scrap", - "name": "cooked scrap of mutant meat", - "name_plural": "cooked scraps of mutant meat", + "name": { "str": "cooked scrap of mutant meat", "str_pl": "cooked scraps of mutant meat" }, "looks_like": "meat_scrap_cooked", "parasites": 0, "calories": 25, @@ -271,8 +260,7 @@ "id": "offal_cooked", "copy-from": "offal", "type": "COMESTIBLE", - "name": "cooked offal", - "name_plural": "cooked offal", + "name": { "str": "cooked offal", "str_pl": "cooked offal" }, "description": "This is freshly cooked organ meat and entrails. It's filled with essential vitamins, but most people consider it a bit gross unless very carefully prepared.", "parasites": 0, "healthy": 1, @@ -283,8 +271,7 @@ "id": "offal_pickled", "copy-from": "offal", "type": "COMESTIBLE", - "name": "pickled offal", - "name_plural": "pickled offal", + "name": { "str": "pickled offal", "str_pl": "pickled offal" }, "description": "This is a mass of entrails and organ meat, preserved in brine. Packed with essential vitamins, and although it looks like a lab specimen, it actually tastes pretty palatable.", "volume": "500 ml", "stack_size": 2, @@ -300,8 +287,7 @@ "id": "offal_canned", "copy-from": "offal", "type": "COMESTIBLE", - "name": "canned offal", - "name_plural": "canned offal", + "name": { "str": "canned offal", "str_pl": "canned offal" }, "description": "Freshly cooked organ meat and entrails, preserved by canning. Unappetizing, but filled with essential vitamins.", "volume": "500 ml", "stack_size": 2, @@ -338,8 +324,7 @@ "id": "jerky", "copy-from": "flesh", "type": "COMESTIBLE", - "name": "meat jerky", - "name_plural": "meat jerky", + "name": { "str": "meat jerky", "str_pl": "meat jerky" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "jerk jerky", "str_pl": "jerk jerky" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "monster jerky", "str_pl": "monster jerky" } } @@ -363,8 +348,7 @@ "id": "salted_fish", "copy-from": "fish", "type": "COMESTIBLE", - "name": "salted fish", - "name_plural": "salted fish", + "name": { "str": "salted fish", "str_pl": "salted fish" }, "description": "Salty dried fish that lasts for a long time, but will make you thirsty.", "primary_material": "cured_meat", "container": "bag_plastic", @@ -399,8 +383,7 @@ "id": "fish_smoked", "copy-from": "fish_cooked", "type": "COMESTIBLE", - "name": "smoked fish", - "name_plural": "smoked fish", + "name": { "str": "smoked fish", "str_pl": "smoked fish" }, "description": "Tasty fish that has been heavily smoked for long term preservation. It could be further smoked to dehydrate it completely.", "color": "brown", "spoils_in": "24 days", @@ -413,8 +396,7 @@ "type": "COMESTIBLE", "copy-from": "flesh", "looks_like": "offal", - "name": "piece of raw lung", - "name_plural": "pieces of raw lung", + "name": { "str": "piece of raw lung", "str_pl": "pieces of raw lung" }, "description": "A portion of lung from an animal. It's spongy and pink, and spoils very quickly. It can be a delicacy if properly prepared - but if improperly prepared, it's a chewy lump of flavorless connective tissue.", "weight": "56 g", "volume": "250 ml", @@ -432,8 +414,7 @@ "type": "COMESTIBLE", "copy-from": "lung", "looks_like": "offal_cooked", - "name": "cooked piece of lung", - "name_plural": "cooked pieces of lung", + "name": { "str": "cooked piece of lung", "str_pl": "cooked pieces of lung" }, "description": " Prepared in this way, it's a chewy grayish lump of flavorless connective tissue. It doesn't look any tastier than it did raw, but the parasites are all cooked out.", "parasites": 0, "delete": { "flags": [ "RAW" ] } @@ -466,8 +447,7 @@ "type": "COMESTIBLE", "copy-from": "lung", "looks_like": "offal", - "name": "raw brains", - "name_plural": "raw brains", + "name": { "str": "raw brains", "str_pl": "raw brains" }, "description": "The brain from an animal. You wouldn't want to eat this raw…", "color": "light_gray", "healthy": -15, @@ -482,8 +462,7 @@ "type": "COMESTIBLE", "copy-from": "brain", "looks_like": "offal_cooked", - "name": "cooked brains", - "name_plural": "cooked brains", + "name": { "str": "cooked brains", "str_pl": "cooked brains" }, "description": "Now you can emulate those zombies you love so much! Preparing brain for eating is challenging, and this doesn't seem to be the best way to do it.", "parasites": 0, "healthy": -2, @@ -543,8 +522,7 @@ { "type": "COMESTIBLE", "id": "blood", - "name": "blood", - "name_plural": "blood", + "name": { "str": "blood", "str_pl": "blood" }, "weight": "265 g", "color": "red", "container": "flask_glass", @@ -577,8 +555,7 @@ { "type": "COMESTIBLE", "id": "fat", - "name": "chunk of fat", - "name_plural": "chunks of fat", + "name": { "str": "chunk of fat", "str_pl": "chunks of fat" }, "weight": "220 g", "color": "pink", "spoils_in": "7 days", @@ -628,8 +605,7 @@ "id": "mutant_fat", "type": "COMESTIBLE", "copy-from": "fat", - "name": "chunk of mutant fat", - "name_plural": "chunks of mutant fat", + "name": { "str": "chunk of mutant fat", "str_pl": "chunks of mutant fat" }, "description": "Freshly butchered fat from a heavily mutated animal. You could eat it raw, but it is better used as an ingredient in other foods or projects.", "looks_like": "fat", "proportional": { "price": 0.2 }, @@ -656,8 +632,7 @@ "id": "mutant_human_fat", "type": "COMESTIBLE", "copy-from": "mutant_fat", - "name": "chunk of mutant humanoid fat", - "name_plural": "chunks of mutant humanoid fat", + "name": { "str": "chunk of mutant humanoid fat", "str_pl": "chunks of mutant humanoid fat" }, "description": "Freshly butchered fat from a heavily mutated humanoid.", "material": "hflesh" }, @@ -680,8 +655,7 @@ "type": "COMESTIBLE", "id": "meat_tainted", "category": "other", - "name": "chunk of tainted meat", - "name_plural": "chunks of tainted meat", + "name": { "str": "chunk of tainted meat", "str_pl": "chunks of tainted meat" }, "weight": "238 g", "color": "red", "spoils_in": "4 hours", diff --git a/data/json/items/comestibles/dairy.json b/data/json/items/comestibles/dairy.json index 1802ea232a579..071a84e080f3a 100644 --- a/data/json/items/comestibles/dairy.json +++ b/data/json/items/comestibles/dairy.json @@ -2,8 +2,7 @@ { "type": "COMESTIBLE", "id": "milk_raw", - "name": "raw milk", - "name_plural": "raw milk", + "name": { "str": "raw milk", "str_pl": "raw milk" }, "copy-from": "milk", "spoils_in": "12 hours", "price": 19, @@ -13,8 +12,7 @@ { "type": "COMESTIBLE", "id": "milk_UHT", - "name": "shelf stable milk", - "name_plural": "shelf stable milk", + "name": { "str": "shelf stable milk", "str_pl": "shelf stable milk" }, "spoils_in": "2 d", "copy-from": "milk", "container": "carton_sealed", @@ -24,8 +22,7 @@ { "type": "COMESTIBLE", "id": "milk_evap", - "name": "evaporated milk", - "name_plural": "evaporated milk", + "name": { "str": "evaporated milk", "str_pl": "evaporated milk" }, "weight": "266 g", "color": "white", "spoils_in": "1 day", @@ -48,8 +45,7 @@ { "type": "COMESTIBLE", "id": "buttermilk", - "name": "buttermilk", - "name_plural": "buttermilk", + "name": { "str": "buttermilk", "str_pl": "buttermilk" }, "weight": "258 g", "color": "white", "spoils_in": "2 d", @@ -90,8 +86,7 @@ { "type": "COMESTIBLE", "id": "butter", - "name": "butter", - "name_plural": "butter", + "name": { "str": "butter", "str_pl": "butter" }, "weight": "14180 mg", "color": "yellow", "spoils_in": "14 days", @@ -111,8 +106,7 @@ { "type": "COMESTIBLE", "id": "raw_butter", - "name": "raw butter", - "name_plural": "raw butter", + "name": { "str": "raw butter", "str_pl": "raw butter" }, "weight": "14 g", "color": "white", "spoils_in": "10 days", @@ -131,8 +125,7 @@ { "type": "COMESTIBLE", "id": "ghee", - "name": "ghee", - "name_plural": "ghee", + "name": { "str": "ghee", "str_pl": "ghee" }, "copy-from": "butter", "weight": "13500 mg", "spoils_in": "90 days", @@ -183,8 +176,7 @@ { "type": "COMESTIBLE", "id": "cheese_hard", - "name": "hard cheese", - "name_plural": "hard cheese", + "name": { "str": "hard cheese", "str_pl": "hard cheese" }, "weight": "34 g", "color": "yellow", "spoils_in": "180 days", @@ -205,8 +197,7 @@ { "type": "COMESTIBLE", "id": "cheese", - "name": "cheese", - "name_plural": "cheese", + "name": { "str": "cheese", "str_pl": "cheese" }, "weight": "30 g", "color": "yellow", "spoils_in": "28 days", @@ -247,8 +238,7 @@ { "type": "COMESTIBLE", "id": "milk_powder", - "name": "powdered milk", - "name_plural": "powdered milk", + "name": { "str": "powdered milk", "str_pl": "powdered milk" }, "weight": "30 g", "color": "white", "container": "bag_plastic", @@ -270,8 +260,7 @@ { "type": "COMESTIBLE", "id": "con_milk", - "name": "condensed milk", - "name_plural": "condensed milk", + "name": { "str": "condensed milk", "str_pl": "condensed milk" }, "weight": "32 g", "color": "white", "spoils_in": "1 day", @@ -293,8 +282,7 @@ { "type": "COMESTIBLE", "id": "milk_cream", - "name": "heavy cream", - "name_plural": "heavy cream", + "name": { "str": "heavy cream", "str_pl": "heavy cream" }, "weight": "254 g", "color": "white", "spoils_in": "1 day", diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json index e3e3de982c868..c66b983ffba07 100644 --- a/data/json/items/comestibles/drink.json +++ b/data/json/items/comestibles/drink.json @@ -2,8 +2,7 @@ { "type": "COMESTIBLE", "id": "apple_cider", - "name": "apple cider", - "name_plural": "apple cider", + "name": { "str": "apple cider", "str_pl": "apple cider" }, "weight": "263 g", "color": "brown", "spoils_in": "6 days", @@ -70,8 +69,7 @@ { "type": "COMESTIBLE", "id": "atomic_coffee", - "name": "atomic coffee", - "name_plural": "atomic coffee", + "name": { "str": "atomic coffee", "str_pl": "atomic coffee" }, "copy-from": "coffee", "addiction_type": "caffeine", "use_action": "ATOMIC_CAFF", @@ -88,8 +86,7 @@ { "type": "COMESTIBLE", "id": "bee_balm_tea", - "name": "bee balm tea", - "name_plural": "bee balm tea", + "name": { "str": "bee balm tea", "str_pl": "bee balm tea" }, "copy-from": "tea", "color": "green", "use_action": "FLUMED", @@ -125,8 +122,7 @@ { "type": "COMESTIBLE", "id": "chai_tea", - "name": "chai tea", - "name_plural": "chai tea", + "name": { "str": "chai tea", "str_pl": "chai tea" }, "weight": "259 g", "color": "brown", "spoils_in": "12 hours", @@ -149,8 +145,7 @@ { "type": "COMESTIBLE", "id": "chamomile_tea", - "name": "chamomile tea", - "name_plural": "chamomile tea", + "name": { "str": "chamomile tea", "str_pl": "chamomile tea" }, "copy-from": "tea", "color": "green", "use_action": "SLEEP", @@ -184,8 +179,7 @@ { "type": "COMESTIBLE", "id": "coffee", - "name": "coffee", - "name_plural": "coffee", + "name": { "str": "coffee", "str_pl": "coffee" }, "weight": "250 g", "color": "brown", "addiction_type": "caffeine", @@ -208,8 +202,7 @@ { "type": "COMESTIBLE", "id": "coffee_substitute", - "name": "coffee substitute", - "name_plural": "coffee substitute", + "name": { "str": "coffee substitute", "str_pl": "coffee substitute" }, "weight": "250 g", "color": "brown", "container": "bottle_plastic", @@ -229,8 +222,7 @@ { "type": "COMESTIBLE", "id": "chicory_coffee", - "name": "chicory brew", - "name_plural": "chicory brew", + "name": { "str": "chicory brew", "str_pl": "chicory brew" }, "weight": "252 g", "color": "brown", "comestible_type": "DRINK", @@ -347,8 +339,7 @@ { "type": "COMESTIBLE", "id": "crispycran", - "name": "crispy cranberry", - "name_plural": "crispy cranberries", + "name": { "str": "crispy cranberry", "str_pl": "crispy cranberries" }, "weight": "250 g", "color": "pink", "container": "can_drink", @@ -369,8 +360,7 @@ { "type": "COMESTIBLE", "id": "dandelion_tea", - "name": "dandelion tea", - "name_plural": "dandelion tea", + "name": { "str": "dandelion tea", "str_pl": "dandelion tea" }, "weight": "252 g", "color": "yellow", "comestible_type": "DRINK", @@ -453,8 +443,7 @@ { "type": "COMESTIBLE", "id": "herbal_tea", - "name": "herbal tea", - "name_plural": "herbal tea", + "name": { "str": "herbal tea", "str_pl": "herbal tea" }, "weight": "250 g", "color": "green", "container": "bottle_plastic", @@ -476,8 +465,7 @@ "id": "hot_chocolate", "type": "COMESTIBLE", "category": "food", - "name": "hot chocolate", - "name_plural": "hot chocolate", + "name": { "str": "hot chocolate", "str_pl": "hot chocolate" }, "description": "Also known as hot cocoa, this heated chocolate beverage is perfect for a cold winter day.", "weight": "289 g", "volume": "250 ml", @@ -546,8 +534,7 @@ { "type": "COMESTIBLE", "id": "lemonade", - "name": "lemonade", - "name_plural": "lemonade", + "name": { "str": "lemonade", "str_pl": "lemonade" }, "weight": "260 g", "color": "yellow", "container": "bottle_plastic", @@ -591,8 +578,7 @@ "id": "mex_chocolate", "type": "COMESTIBLE", "category": "food", - "name": "Mexican hot chocolate", - "name_plural": "Mexican hot chocolate", + "name": { "str": "Mexican hot chocolate", "str_pl": "Mexican hot chocolate" }, "description": "This semi-bitter chocolate drink made from cocoa, cinnamon, and chilies, traces its history to the Maya and Aztecs. Perfect for a cold winter day.", "weight": "263 g", "volume": "250 ml", @@ -613,8 +599,7 @@ { "type": "COMESTIBLE", "id": "milk", - "name": "milk", - "name_plural": "milk", + "name": { "str": "milk", "str_pl": "milk" }, "weight": "258 g", "color": "white", "spoils_in": "1 d", @@ -637,8 +622,7 @@ { "type": "COMESTIBLE", "id": "milk_reconstituted", - "name": "reconstituted milk", - "name_plural": "reconstituted milk", + "name": { "str": "reconstituted milk", "str_pl": "reconstituted milk" }, "copy-from": "milk", "description": "Baby cow food, appropriated for adult humans. This milk has been reconstituted from a processed milk. Spoils rapidly." }, @@ -741,8 +725,7 @@ { "type": "COMESTIBLE", "id": "pine_tea", - "name": "pine needle tea", - "name_plural": "pine needle tea", + "name": { "str": "pine needle tea", "str_pl": "pine needle tea" }, "weight": "268 g", "color": "light_green", "comestible_type": "DRINK", @@ -784,8 +767,7 @@ { "type": "COMESTIBLE", "id": "rootbeer", - "name": "root beer", - "name_plural": "root beer", + "name": { "str": "root beer", "str_pl": "root beer" }, "weight": "260 g", "color": "brown", "container": "can_drink", @@ -850,8 +832,7 @@ { "type": "COMESTIBLE", "id": "sweet_water", - "name": "sweet water", - "name_plural": "sweet water", + "name": { "str": "sweet water", "str_pl": "sweet water" }, "weight": "260 g", "color": "light_cyan", "container": "bottle_plastic", @@ -934,8 +915,7 @@ "id": "water_clean", "copy-from": "water", "type": "COMESTIBLE", - "name": "clean water", - "name_plural": "clean water", + "name": { "str": "clean water", "str_pl": "clean water" }, "description": "Fresh, clean water. Truly the best thing to quench your thirst.", "color": "light_cyan", "use_action": [ ] @@ -944,8 +924,7 @@ "id": "water_mineral", "copy-from": "water", "type": "COMESTIBLE", - "name": "mineral water", - "name_plural": "mineral water", + "name": { "str": "mineral water", "str_pl": "mineral water" }, "description": "Fancy mineral water, so fancy it makes you feel fancy just holding it.", "container": "bottle_plastic", "proportional": { "quench": 1.2 }, diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json index f4829595f651b..3e64b6ff14ad9 100644 --- a/data/json/items/comestibles/drink_other.json +++ b/data/json/items/comestibles/drink_other.json @@ -26,8 +26,7 @@ "type": "COMESTIBLE", "symbol": "~", "color": "light_cyan", - "name": "maple sap", - "name_plural": "maple sap", + "name": { "str": "maple sap", "str_pl": "maple sap" }, "copy-from": "syrup", "description": "A water and sugar solution that has been extracted from a maple tree.", "price": 50, @@ -51,8 +50,7 @@ "type": "COMESTIBLE", "symbol": "~", "color": "white", - "name": "mayonnaise", - "name_plural": "mayonnaise", + "name": { "str": "mayonnaise", "str_pl": "mayonnaise" }, "description": "A gloppy mix of egg, oil, and salt that is traditionally used to moisten sandwiches.", "price": 187, "material": [ "junk", "egg" ], @@ -92,8 +90,7 @@ "type": "COMESTIBLE", "symbol": "~", "color": "yellow", - "name": "mustard", - "name_plural": "mustard", + "name": { "str": "mustard", "str_pl": "mustard" }, "description": "A condiment made from the seeds of a mustard plant (/Brassica/ or /Sinapis/), vinegar, salt, and spices.", "price": 50, "material": "junk", @@ -112,8 +109,7 @@ "type": "COMESTIBLE", "symbol": "~", "color": "yellow", - "name": "forest honey", - "name_plural": "forest honey", + "name": { "str": "forest honey", "str_pl": "forest honey" }, "description": "Honey, that stuff bees make. This one is \"forest honey\", a liquid form of honey. This honey won't spoil and is good for your digestion.", "price": 250, "material": "honey", @@ -163,8 +159,7 @@ { "type": "COMESTIBLE", "id": "vinegar", - "name": "vinegar", - "name_plural": "vinegar", + "name": { "str": "vinegar", "str_pl": "vinegar" }, "weight": "15 g", "color": "white", "container": "jug_plastic", @@ -182,8 +177,7 @@ { "type": "COMESTIBLE", "id": "cooking_oil", - "name": "vegetable cooking oil", - "name_plural": "vegetable cooking oil", + "name": { "str": "vegetable cooking oil", "str_pl": "vegetable cooking oil" }, "weight": "15 g", "color": "yellow", "container": "jug_plastic", @@ -214,8 +208,7 @@ { "type": "COMESTIBLE", "id": "molasses", - "name": "molasses", - "name_plural": "molasses", + "name": { "str": "molasses", "str_pl": "molasses" }, "weight": "89 g", "color": "brown", "container": "jar_glass", @@ -240,8 +233,7 @@ "type": "COMESTIBLE", "symbol": "~", "color": "white", - "name": "horseradish", - "name_plural": "horseradish", + "name": { "str": "horseradish", "str_pl": "horseradish" }, "description": "A spicy grated root vegetable packed in vinegared brine.", "price": 75, "material": "veggy", @@ -259,8 +251,7 @@ { "type": "COMESTIBLE", "id": "coffee_syrup", - "name": "coffee syrup", - "name_plural": "coffee syrup", + "name": { "str": "coffee syrup", "str_pl": "coffee syrup" }, "weight": "32 g", "color": "brown", "addiction_type": "caffeine", diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index f107b6685a2b5..c116f3cdb7a25 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -227,8 +227,7 @@ { "type": "COMESTIBLE", "id": "powder_eggs", - "name": "powdered egg", - "name_plural": "powdered eggs", + "name": { "str": "powdered egg", "str_pl": "powdered eggs" }, "weight": "7 g", "color": "yellow", "container": "bottle_plastic_small", @@ -249,8 +248,7 @@ { "type": "COMESTIBLE", "id": "scrambled_eggs", - "name": "scrambled eggs", - "name_plural": "scrambled eggs", + "name": { "str": "scrambled eggs", "str_pl": "scrambled eggs" }, "copy-from": "egg_chicken", "color": "yellow", "spoils_in": "2 days", @@ -266,8 +264,7 @@ { "type": "COMESTIBLE", "id": "boiled_egg", - "name": "boiled egg", - "name_plural": "boiled eggs", + "name": { "str": "boiled egg", "str_pl": "boiled eggs" }, "copy-from": "egg_chicken", "color": "white", "symbol": "o", diff --git a/data/json/items/comestibles/frozen.json b/data/json/items/comestibles/frozen.json index c84cb49bc2477..970d5e2c48d64 100644 --- a/data/json/items/comestibles/frozen.json +++ b/data/json/items/comestibles/frozen.json @@ -2,8 +2,7 @@ { "type": "COMESTIBLE", "id": "milkshake", - "name": "milkshake", - "name_plural": "milkshakes", + "name": { "str": "milkshake", "str_pl": "milkshakes" }, "//": "they bring the boys to the yard", "description": "An all-natural cold beverage made with milk and sweeteners. Tastes great when frozen.", "weight": "160 g", @@ -28,8 +27,7 @@ "type": "COMESTIBLE", "copy-from": "milkshake", "id": "milkshake_fastfood", - "name": "fast food milkshake", - "name_plural": "fast food milkshakes", + "name": { "str": "fast food milkshake", "str_pl": "fast food milkshakes" }, "description": "A milkshake made by freezing a premade mix. Tastes better due to how much sugar is in it, but is bad for your health.", "calories": 175, "fun": 23, @@ -42,8 +40,7 @@ "type": "COMESTIBLE", "copy-from": "milkshake", "id": "milkshake_deluxe", - "name": "deluxe milkshake", - "name_plural": "deluxe milkshakes", + "name": { "str": "deluxe milkshake", "str_pl": "deluxe milkshakes" }, "description": "This milkshake has been enhanced with added sweeteners, and even has a cherry on top. Tastes great, but is fairly awful for your health.", "calories": 265, "quench": 40, @@ -56,8 +53,7 @@ { "type": "COMESTIBLE", "id": "icecream", - "name": "ice cream", - "name_plural": "ice cream scoops", + "name": { "str": "ice cream", "str_pl": "ice cream scoops" }, "description": "A sweet, frozen food made of milk with liberal amounts of sugar.", "weight": "70 g", "volume": "250 ml", @@ -82,8 +78,7 @@ "type": "COMESTIBLE", "copy-from": "icecream", "id": "icecream_artificial", - "name": "dairy dessert", - "name_plural": "dairy dessert scoops", + "name": { "str": "dairy dessert", "str_pl": "dairy dessert scoops" }, "description": "Government regulations dictate that since this isn't *technically* ice cream, it be called a dairy dessert instead. It still tastes good, but your body won't like you.", "healthy": -2, "price": 200, @@ -94,8 +89,7 @@ "type": "COMESTIBLE", "copy-from": "icecream", "id": "icecream_candy", - "name": "candy ice cream", - "name_plural": "candy ice cream scoops", + "name": { "str": "candy ice cream", "str_pl": "candy ice cream scoops" }, "description": "Ice cream with bits of chocolate, caramel, or other flavoring mixed in.", "fun": 20, "healthy": -3, @@ -109,8 +103,7 @@ "type": "COMESTIBLE", "copy-from": "icecream", "id": "icecream_fruit", - "name": "fruity ice cream", - "name_plural": "fruity ice cream scoops", + "name": { "str": "fruity ice cream", "str_pl": "fruity ice cream scoops" }, "description": "Small bits of sweet fruit have been tossed into this ice cream, making it slightly less terrible for you.", "healthy": 0, "calories": 224, @@ -124,8 +117,7 @@ "type": "COMESTIBLE", "copy-from": "icecream", "id": "icecream_custard", - "name": "frozen custard", - "name_plural": "frozen custard scoops", + "name": { "str": "frozen custard", "str_pl": "frozen custard scoops" }, "description": "Similar to ice cream, this treat made famous in Coney Island is made like ice cream, but with egg yolk added in. Its storing temperature is warmer, and it lasts a little longer than regular ice cream.", "spoils_in": "2 days", "calories": 328, @@ -138,8 +130,7 @@ "type": "COMESTIBLE", "copy-from": "icecream", "id": "icecream_yogurt", - "name": "frozen yogurt", - "name_plural": "frozen yogurt", + "name": { "str": "frozen yogurt", "str_pl": "frozen yogurt" }, "description": "Tarter than ice cream, this is made with yogurt and other dairy products, and is generally low-fat compared to ice cream itself.", "calories": 127, "price": 275, @@ -152,8 +143,7 @@ "type": "COMESTIBLE", "copy-from": "icecream", "id": "icecream_sorbet", - "name": "sorbet", - "name_plural": "sorbet scoops", + "name": { "str": "sorbet", "str_pl": "sorbet scoops" }, "description": "A simple frozen dessert food made from water and fruit juice.", "spoils_in": 336, "calories": 116, @@ -168,8 +158,7 @@ "type": "COMESTIBLE", "copy-from": "icecream", "id": "icecream_gelato", - "name": "gelato", - "name_plural": "gelato scoops", + "name": { "str": "gelato", "str_pl": "gelato scoops" }, "description": "Italian-style ice cream. Less airy, and more dense, giving it a richer flavor and texture.", "calories": 240, "price": 300, diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json index 17006885feefc..49e6caf94e7b8 100644 --- a/data/json/items/comestibles/fruit_dishes.json +++ b/data/json/items/comestibles/fruit_dishes.json @@ -2,8 +2,7 @@ { "type": "COMESTIBLE", "id": "strawberries_cooked", - "name": "cooked strawberry", - "name_plural": "cooked strawberries", + "name": { "str": "cooked strawberry", "str_pl": "cooked strawberries" }, "copy-from": "strawberries", "color": "red", "spoils_in": "3 days 18 hours", @@ -42,8 +41,7 @@ { "type": "COMESTIBLE", "id": "blueberries_cooked", - "name": "cooked blueberry", - "name_plural": "cooked blueberries", + "name": { "str": "cooked blueberry", "str_pl": "cooked blueberries" }, "copy-from": "blueberries", "color": "blue", "spoils_in": "3 days 18 hours", @@ -60,8 +58,7 @@ { "type": "COMESTIBLE", "id": "can_peach", - "name": "peaches in syrup", - "name_plural": "peaches in syrup", + "name": { "str": "peaches in syrup", "str_pl": "peaches in syrup" }, "weight": "277 g", "color": "yellow", "spoils_in": "1 day 6 hours", @@ -163,8 +160,7 @@ { "type": "COMESTIBLE", "id": "dry_fruit", - "name": "dehydrated fruit", - "name_plural": "dehydrated fruit", + "name": { "str": "dehydrated fruit", "str_pl": "dehydrated fruit" }, "weight": "75 g", "color": "magenta", "spoils_in": "360 days", @@ -185,8 +181,7 @@ { "type": "COMESTIBLE", "id": "rehydrated_fruit", - "name": "rehydrated fruit", - "name_plural": "rehydrated fruit", + "name": { "str": "rehydrated fruit", "str_pl": "rehydrated fruit" }, "weight": "150 g", "color": "pink", "spoils_in": "18 hours", @@ -225,8 +220,7 @@ { "type": "COMESTIBLE", "id": "apple_canned", - "name": "canned fruit", - "name_plural": "canned fruit", + "name": { "str": "canned fruit", "str_pl": "canned fruit" }, "weight": "170 g", "color": "red", "spoils_in": "7 days 12 hours", diff --git a/data/json/items/comestibles/irradiated_fruit.json b/data/json/items/comestibles/irradiated_fruit.json index 0a37c1b9ee347..80c840f9564f1 100644 --- a/data/json/items/comestibles/irradiated_fruit.json +++ b/data/json/items/comestibles/irradiated_fruit.json @@ -3,8 +3,7 @@ "type": "COMESTIBLE", "id": "irradiated_rose_hips", "copy-from": "rose_hips", - "name": "irradiated rose hips", - "name_plural": "irradiated rose hips", + "name": { "str": "irradiated rose hips", "str_pl": "irradiated rose hips" }, "description": "An irradiated rose hips will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2 }, "spoils_in": "0 hours", @@ -14,8 +13,7 @@ "type": "COMESTIBLE", "id": "irradiated_elderberries", "copy-from": "elderberries", - "name": "irradiated elderberry", - "name_plural": "irradiated elderberries", + "name": { "str": "irradiated elderberry", "str_pl": "irradiated elderberries" }, "description": "An irradiated elderberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2 }, "spoils_in": "0 hours", @@ -25,8 +23,7 @@ "type": "COMESTIBLE", "id": "irradiated_mulberries", "copy-from": "mulberries", - "name": "irradiated mulberry", - "name_plural": "irradiated mulberries", + "name": { "str": "irradiated mulberry", "str_pl": "irradiated mulberries" }, "description": "An irradiated mulberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2 }, "spoils_in": "0 hours", @@ -36,8 +33,7 @@ "type": "COMESTIBLE", "id": "irradiated_huckleberries", "copy-from": "huckleberries", - "name": "irradiated huckleberry", - "name_plural": "irradiated huckleberries", + "name": { "str": "irradiated huckleberry", "str_pl": "irradiated huckleberries" }, "description": "An irradiated huckleberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2 }, "spoils_in": "0 hours", @@ -47,8 +43,7 @@ "type": "COMESTIBLE", "id": "irradiated_raspberries", "copy-from": "raspberries", - "name": "irradiated raspberry", - "name_plural": "irradiated raspberries", + "name": { "str": "irradiated raspberry", "str_pl": "irradiated raspberries" }, "description": "An irradiated raspberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2 }, "spoils_in": "0 hours", @@ -58,8 +53,7 @@ "type": "COMESTIBLE", "id": "irradiated_cranberries", "copy-from": "cranberries", - "name": "irradiated cranberry", - "name_plural": "irradiated cranberries", + "name": { "str": "irradiated cranberry", "str_pl": "irradiated cranberries" }, "description": "An irradiated cranberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2 }, "spoils_in": "0 hours", @@ -69,8 +63,7 @@ "type": "COMESTIBLE", "id": "irradiated_strawberries", "copy-from": "strawberries", - "name": "irradiated strawberry", - "name_plural": "irradiated strawberries", + "name": { "str": "irradiated strawberry", "str_pl": "irradiated strawberries" }, "description": "An irradiated strawberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2 }, "spoils_in": "0 hours", @@ -80,8 +73,7 @@ "type": "COMESTIBLE", "id": "irradiated_blueberries", "copy-from": "blueberries", - "name": "irradiated blueberry", - "name_plural": "irradiated blueberries", + "name": { "str": "irradiated blueberry", "str_pl": "irradiated blueberries" }, "description": "An irradiated blueberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2 }, "spoils_in": "0 hours", @@ -152,8 +144,7 @@ "type": "COMESTIBLE", "id": "irradiated_cherries", "copy-from": "cherries", - "name": "irradiated cherry", - "name_plural": "irradiated cherries", + "name": { "str": "irradiated cherry", "str_pl": "irradiated cherries" }, "description": "An irradiated cherry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2 }, "spoils_in": "0 hours", @@ -173,8 +164,7 @@ "type": "COMESTIBLE", "id": "irradiated_grapes", "copy-from": "grapes", - "name": "irradiated grape", - "name_plural": "irradiated grapes", + "name": { "str": "irradiated grape", "str_pl": "irradiated grapes" }, "description": "An irradiated grape will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2 }, "spoils_in": "0 hours", @@ -194,8 +184,7 @@ "type": "COMESTIBLE", "id": "irradiated_peach", "copy-from": "peach", - "name": "irradiated peach", - "name_plural": "irradiated peaches", + "name": { "str": "irradiated peach", "str_pl": "irradiated peaches" }, "description": "An irradiated peach will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2 }, "spoils_in": "0 hours", @@ -226,8 +215,7 @@ "type": "COMESTIBLE", "id": "irradiated_blackberries", "copy-from": "blackberries", - "name": "irradiated blackberry", - "name_plural": "irradiated blackberries", + "name": { "str": "irradiated blackberry", "str_pl": "irradiated blackberries" }, "description": "An irradiated blackberry will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2 }, "spoils_in": "0 hours", diff --git a/data/json/items/comestibles/irradiated_veggy.json b/data/json/items/comestibles/irradiated_veggy.json index c7b62d534e3c7..c08afa2d4114a 100644 --- a/data/json/items/comestibles/irradiated_veggy.json +++ b/data/json/items/comestibles/irradiated_veggy.json @@ -23,8 +23,7 @@ "type": "COMESTIBLE", "id": "irradiated_tomato", "copy-from": "tomato", - "name": "irradiated tomato", - "name_plural": "irradiated tomatoes", + "name": { "str": "irradiated tomato", "str_pl": "irradiated tomatoes" }, "description": "An irradiated tomato will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2 }, "spoils_in": "0 hours", @@ -34,8 +33,7 @@ "type": "COMESTIBLE", "id": "irradiated_broccoli", "copy-from": "broccoli", - "name": "irradiated broccoli", - "name_plural": "irradiated broccoli", + "name": { "str": "irradiated broccoli", "str_pl": "irradiated broccoli" }, "description": "An irradiated cluster of broccoli will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2 }, "spoils_in": "0 hours", @@ -75,8 +73,7 @@ "type": "COMESTIBLE", "id": "irradiated_corn", "copy-from": "corn", - "name": "irradiated corn", - "name_plural": "irradiated corn", + "name": { "str": "irradiated corn", "str_pl": "irradiated corn" }, "description": "An irradiated ear of corn will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2 }, "spoils_in": "0 hours", @@ -96,8 +93,7 @@ "type": "COMESTIBLE", "id": "irradiated_potato", "copy-from": "potato", - "name": "irradiated potato", - "name_plural": "irradiated potatoes", + "name": { "str": "irradiated potato", "str_pl": "irradiated potatoes" }, "description": "An irradiated potato will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2 }, "spoils_in": "0 hours", diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index 8fb06ab7f402f..27f40202bbca5 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -39,8 +39,7 @@ { "type": "COMESTIBLE", "id": "toasterpastryfrozen", - "name": "toaster pastry (uncooked)", - "name_plural": "toaster pastries (uncooked)", + "name": { "str": "toaster pastry (uncooked)", "str_pl": "toaster pastries (uncooked)" }, "weight": "52 g", "color": "red", "spoils_in": "2 days 12 hours", @@ -61,8 +60,7 @@ { "type": "COMESTIBLE", "id": "toasterpastry", - "name": "toaster pastry", - "name_plural": "toaster pastries", + "name": { "str": "toaster pastry", "str_pl": "toaster pastries" }, "copy-from": "toasterpastryfrozen", "quench": 4, "description": "A delicious fruit-filled pastry that you've cooked. It even comes with frosting!", @@ -71,8 +69,7 @@ { "type": "COMESTIBLE", "id": "chips2", - "name": "potato chips", - "name_plural": "potato chips", + "name": { "str": "potato chips", "str_pl": "potato chips" }, "copy-from": "chips", "description": "Some plain, salted potato chips.", "fun": 3 @@ -80,8 +77,7 @@ { "type": "COMESTIBLE", "id": "chips3", - "name": "potato chips", - "name_plural": "potato chips", + "name": { "str": "potato chips", "str_pl": "potato chips" }, "copy-from": "chips", "description": "Oh man, you love these chips! Score!", "//": "Favorite flavor varies.", @@ -90,8 +86,7 @@ { "type": "COMESTIBLE", "id": "kernels", - "name": "popcorn kernels", - "name_plural": "popcorn kernels", + "name": { "str": "popcorn kernels", "str_pl": "popcorn kernels" }, "weight": "32 g", "color": "brown", "container": "bag_plastic", @@ -109,8 +104,7 @@ { "type": "COMESTIBLE", "id": "popcorn", - "name": "popcorn", - "name_plural": "popcorn", + "name": { "str": "popcorn", "str_pl": "popcorn" }, "weight": "8 g", "color": "white", "spoils_in": "360 days", @@ -132,8 +126,7 @@ { "type": "COMESTIBLE", "id": "popcorn2", - "name": "salted popcorn", - "name_plural": "salted popcorn", + "name": { "str": "salted popcorn", "str_pl": "salted popcorn" }, "copy-from": "popcorn", "quench": -3, "healthy": -1, @@ -144,8 +137,7 @@ { "type": "COMESTIBLE", "id": "popcorn3", - "name": "buttered popcorn", - "name_plural": "buttered popcorn", + "name": { "str": "buttered popcorn", "str_pl": "buttered popcorn" }, "copy-from": "popcorn", "healthy": -1, "description": "Popcorn with a light covering of butter for extra flavor.", @@ -155,8 +147,7 @@ { "type": "COMESTIBLE", "id": "pretzels", - "name": "pretzels", - "name_plural": "pretzels", + "name": { "str": "pretzels", "str_pl": "pretzels" }, "weight": "62 g", "color": "brown", "spoils_in": "90 days", @@ -216,8 +207,7 @@ { "type": "COMESTIBLE", "id": "marshmallow", - "name": "marshmallows", - "name_plural": "marshmallows", + "name": { "str": "marshmallows", "str_pl": "marshmallows" }, "weight": "53 g", "color": "white", "spoils_in": "90 days", @@ -235,8 +225,7 @@ { "type": "COMESTIBLE", "id": "smores", - "name": "s'mores", - "name_plural": "s'mores", + "name": { "str": "s'mores", "str_pl": "s'mores" }, "weight": "180 g", "color": "brown", "spoils_in": "90 days", @@ -255,8 +244,7 @@ { "type": "COMESTIBLE", "id": "candy", - "name": "peanut butter candy", - "name_plural": "peanut butter candies", + "name": { "str": "peanut butter candy", "str_pl": "peanut butter candies" }, "weight": "39 g", "color": "brown", "spoils_in": "360 days", @@ -277,8 +265,7 @@ { "type": "COMESTIBLE", "id": "candy2", - "name": "chocolate candy", - "name_plural": "chocolate candies", + "name": { "str": "chocolate candy", "str_pl": "chocolate candies" }, "weight": "57 g", "color": "red", "spoils_in": "360 days", @@ -299,8 +286,7 @@ { "type": "COMESTIBLE", "id": "candy3", - "name": "chewy candy", - "name_plural": "chewy candies", + "name": { "str": "chewy candy", "str_pl": "chewy candies" }, "weight": "46 g", "color": "yellow", "spoils_in": "360 days", @@ -320,8 +306,7 @@ { "type": "COMESTIBLE", "id": "powder_candy", - "name": "powder candy sticks", - "name_plural": "powder candy sticks", + "name": { "str": "powder candy sticks", "str_pl": "powder candy sticks" }, "weight": "46 g", "color": "red", "spoils_in": "360 days", @@ -341,8 +326,7 @@ { "type": "COMESTIBLE", "id": "maple_candy", - "name": "maple syrup candy", - "name_plural": "maple syrup candies", + "name": { "str": "maple syrup candy", "str_pl": "maple syrup candies" }, "weight": "18 g", "color": "brown", "spoils_in": "360 days", @@ -406,8 +390,7 @@ { "type": "COMESTIBLE", "id": "syrup", - "name": "maple syrup", - "name_plural": "maple syrup", + "name": { "str": "maple syrup", "str_pl": "maple syrup" }, "weight": "21 g", "color": "brown", "container": "bottle_glass", @@ -428,8 +411,7 @@ { "type": "COMESTIBLE", "id": "beet_syrup", - "name": "sugar beet syrup", - "name_plural": "sugar beet syrup", + "name": { "str": "sugar beet syrup", "str_pl": "sugar beet syrup" }, "weight": "15 g", "color": "brown", "container": "bottle_glass", @@ -509,8 +491,7 @@ { "type": "COMESTIBLE", "id": "fries", - "name": "fast-food French fries", - "name_plural": "fast-food French fries", + "name": { "str": "fast-food French fries", "str_pl": "fast-food French fries" }, "weight": "71 g", "color": "yellow", "container": "box_small", @@ -530,8 +511,7 @@ { "type": "COMESTIBLE", "id": "fresh_fries", - "name": "French fries", - "name_plural": "French fries", + "name": { "str": "French fries", "str_pl": "French fries" }, "copy-from": "fries", "spoils_in": "3 days", "description": "Deep fried potatoes with a touch of salt. Crunchy and delicious.", @@ -540,8 +520,7 @@ { "type": "COMESTIBLE", "id": "mintpatties", - "name": "peppermint patty", - "name_plural": "peppermint patties", + "name": { "str": "peppermint patty", "str_pl": "peppermint patties" }, "weight": "43 g", "color": "brown", "spoils_in": "180 days", @@ -561,8 +540,7 @@ { "type": "COMESTIBLE", "id": "neccowafers", - "name": "Necco wafers", - "name_plural": "Necco wafers", + "name": { "str": "Necco wafers", "str_pl": "Necco wafers" }, "weight": "60 g", "color": "magenta", "spoils_in": "180 days", @@ -603,8 +581,7 @@ { "type": "COMESTIBLE", "id": "sugar_fried", - "name": "caramel", - "name_plural": "caramel", + "name": { "str": "caramel", "str_pl": "caramel" }, "weight": "67 g", "color": "white", "container": "box_small", @@ -624,8 +601,7 @@ { "type": "COMESTIBLE", "id": "chips", - "name": "potato chips", - "name_plural": "potato chips", + "name": { "str": "potato chips", "str_pl": "potato chips" }, "weight": "28 g", "color": "yellow", "spoils_in": "30 days", @@ -686,8 +662,7 @@ { "type": "COMESTIBLE", "id": "nachos", - "name": "tortilla chips", - "name_plural": "tortilla chips", + "name": { "str": "tortilla chips", "str_pl": "tortilla chips" }, "weight": "80 g", "color": "yellow", "spoils_in": "30 days", @@ -707,8 +682,7 @@ { "type": "COMESTIBLE", "id": "nachosc", - "name": "cheese nachos", - "name_plural": "cheese nachos", + "name": { "str": "cheese nachos", "str_pl": "cheese nachos" }, "weight": "85 g", "color": "yellow", "spoils_in": "1 day", @@ -729,8 +703,7 @@ { "type": "COMESTIBLE", "id": "nachosm", - "name": "meat nachos", - "name_plural": "meat nachos", + "name": { "str": "meat nachos", "str_pl": "meat nachos" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "niño nachos", "str_pl": "niño nachos" } }, { @@ -759,8 +732,7 @@ { "type": "COMESTIBLE", "id": "nachosmc", - "name": "meat nachos with cheese", - "name_plural": "meat nachos with cheese", + "name": { "str": "meat nachos with cheese", "str_pl": "meat nachos with cheese" }, "conditional_names": [ { "type": "FLAG", @@ -897,8 +869,7 @@ { "type": "COMESTIBLE", "id": "chilidogs", - "name": "chili dogs", - "name_plural": "chili dogs", + "name": { "str": "chili dogs", "str_pl": "chili dogs" }, "weight": "318 g", "color": "red", "spoils_in": "1 day", @@ -919,8 +890,7 @@ { "type": "COMESTIBLE", "id": "corndogs_frozen", - "name": "uncooked corn dogs", - "name_plural": "uncooked corn dogs", + "name": { "str": "uncooked corn dogs", "str_pl": "uncooked corn dogs" }, "weight": "78 g", "color": "yellow", "spoils_in": "11 days 16 hours", @@ -953,8 +923,7 @@ "type": "COMESTIBLE", "id": "choc_pancakes", "copy-from": "pancakes", - "name": "chocolate pancake", - "name_plural": "chocolate pancakes", + "name": { "str": "chocolate pancake", "str_pl": "chocolate pancakes" }, "weight": "78 g", "healthy": 0, "calories": 219, @@ -1008,8 +977,7 @@ { "type": "COMESTIBLE", "id": "cheese_fries", - "name": "cheese fries", - "name_plural": "cheese fries", + "name": { "str": "cheese fries", "str_pl": "cheese fries" }, "weight": "101 g", "color": "yellow", "spoils_in": "3 days", @@ -1050,8 +1018,7 @@ { "type": "COMESTIBLE", "id": "hotdogs_frozen", - "name": "uncooked hot dog", - "name_plural": "uncooked hot dogs", + "name": { "str": "uncooked hot dog", "str_pl": "uncooked hot dogs" }, "weight": "43 g", "color": "red", "spoils_in": "11 days 16 hours", @@ -1072,8 +1039,7 @@ { "id": "hotdogs_campfire", "type": "COMESTIBLE", - "name": "campfire hot dog", - "name_plural": "campfire hot dogs", + "name": { "str": "campfire hot dog", "str_pl": "campfire hot dogs" }, "copy-from": "hotdogs_frozen", "description": "The simple hot dog, cooked over an open fire. Would be better on a bun, but it's quite an improvement over eating it uncooked", "stack_size": 4, @@ -1083,8 +1049,7 @@ { "type": "COMESTIBLE", "id": "hotdogs_cooked", - "name": "cooked hot dog", - "name_plural": "cooked hot dogs", + "name": { "str": "cooked hot dog", "str_pl": "cooked hot dogs" }, "weight": "383 g", "color": "red", "spoils_in": "1 day", diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json index f960fef8bb777..211b2c004bcaf 100644 --- a/data/json/items/comestibles/meat_dishes.json +++ b/data/json/items/comestibles/meat_dishes.json @@ -60,8 +60,7 @@ { "type": "COMESTIBLE", "id": "sweet_sausage", - "name": "sweet sausage", - "name_plural": "sweet sausages", + "name": { "str": "sweet sausage", "str_pl": "sweet sausages" }, "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "sinister %s", "str_pl": "sinister %s" } } ], "weight": "148 g", "color": "brown", @@ -80,8 +79,7 @@ { "type": "COMESTIBLE", "id": "bratwurst_sausage", - "name": "bratwurst", - "name_plural": "bratwursts", + "name": { "str": "bratwurst", "str_pl": "bratwursts" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": "Mannbrat" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "baleful %s", "str_pl": "baleful %s" } } @@ -123,8 +121,7 @@ { "type": "COMESTIBLE", "id": "bacon", - "name": "bacon", - "name_plural": "pieces of bacon", + "name": { "str": "bacon", "str_pl": "pieces of bacon" }, "weight": "85 g", "color": "pink", "spoils_in": "24 days", @@ -170,8 +167,7 @@ { "type": "COMESTIBLE", "id": "cracklins", - "name": "cracklins", - "name_plural": "cracklins", + "name": { "str": "cracklins", "str_pl": "cracklins" }, "weight": "42 g", "color": "brown", "spoils_in": "7 days", @@ -266,8 +262,7 @@ { "type": "COMESTIBLE", "id": "dry_fish", - "name": "dehydrated fish", - "name_plural": "dehydrated fish", + "name": { "str": "dehydrated fish", "str_pl": "dehydrated fish" }, "copy-from": "fish_cooked", "primary_material": "cured_meat", "weight": "85 g", @@ -282,8 +277,7 @@ { "type": "COMESTIBLE", "id": "rehydrated_fish", - "name": "rehydrated fish", - "name_plural": "rehydrated fish", + "name": { "str": "rehydrated fish", "str_pl": "rehydrated fish" }, "copy-from": "fish_cooked", "color": "white", "description": "Reconstituted fish flakes, which are much more enjoyable to eat now that they have been rehydrated.", @@ -293,8 +287,7 @@ { "type": "COMESTIBLE", "id": "fish_pickled", - "name": "pickled fish", - "name_plural": "pickled fish", + "name": { "str": "pickled fish", "str_pl": "pickled fish" }, "copy-from": "fish_cooked", "color": "white", "spoils_in": "4 days", @@ -308,8 +301,7 @@ { "type": "COMESTIBLE", "id": "fish_canned", - "name": "canned fish", - "name_plural": "canned fish", + "name": { "str": "canned fish", "str_pl": "canned fish" }, "copy-from": "fish_cooked", "color": "light_gray", "spoils_in": "1 day 16 hours", @@ -322,8 +314,7 @@ { "type": "COMESTIBLE", "id": "fish_fried", - "name": "batter fried fish", - "name_plural": "batter fried fish", + "name": { "str": "batter fried fish", "str_pl": "batter fried fish" }, "weight": "201 g", "color": "yellow", "spoils_in": "1 day", @@ -460,8 +451,7 @@ { "type": "COMESTIBLE", "id": "sausagegravy", - "name": "sausage gravy", - "name_plural": "sausage gravies", + "name": { "str": "sausage gravy", "str_pl": "sausage gravies" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "Mannwurst gravy", "str_pl": "Mannwurst gravies" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "ghastly %s", "str_pl": "ghastly %s" } } @@ -551,8 +541,7 @@ { "type": "COMESTIBLE", "id": "chili", - "name": "chili con carne", - "name_plural": "chilis con carne", + "name": { "str": "chili con carne", "str_pl": "chilis con carne" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "chili con cabron", "str_pl": "chilis con cabron" } }, { @@ -581,8 +570,7 @@ { "type": "COMESTIBLE", "id": "pork_beans", - "name": "pork and beans", - "name_plural": "pork and beans", + "name": { "str": "pork and beans", "str_pl": "pork and beans" }, "weight": "267 g", "color": "brown", "spoils_in": "1 day 12 hours", @@ -603,8 +591,7 @@ { "type": "COMESTIBLE", "id": "can_tuna", - "name": "canned tuna fish", - "name_plural": "canned tuna fish", + "name": { "str": "canned tuna fish", "str_pl": "canned tuna fish" }, "weight": "154 g", "color": "light_gray", "spoils_in": "1 day", @@ -678,8 +665,7 @@ { "type": "COMESTIBLE", "id": "can_clams", - "name": "canned clam", - "name_plural": "canned clams", + "name": { "str": "canned clam", "str_pl": "canned clams" }, "weight": "169 g", "color": "light_gray", "spoils_in": "1 day", @@ -723,8 +709,7 @@ { "type": "COMESTIBLE", "id": "deluxe_beans", - "name": "baked beans", - "name_plural": "baked beans", + "name": { "str": "baked beans", "str_pl": "baked beans" }, "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "ork and beans", "str_pl": "ork and beans" } } ], "weight": "293 g", "color": "brown", @@ -745,8 +730,7 @@ { "type": "COMESTIBLE", "id": "deluxe_rice", - "name": "meat fried rice", - "name_plural": "meat fried rice", + "name": { "str": "meat fried rice", "str_pl": "meat fried rice" }, "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "mutant fried rice", "str_pl": "mutant fried rice" } } ], @@ -769,8 +753,7 @@ { "type": "COMESTIBLE", "id": "deluxe_beansnrice", - "name": "deluxe beans and rice", - "name_plural": "deluxe beans and rice", + "name": { "str": "deluxe beans and rice", "str_pl": "deluxe beans and rice" }, "conditional_names": [ { "type": "COMPONENT_ID", @@ -861,8 +844,7 @@ { "type": "COMESTIBLE", "id": "deluxe_eggs", - "name": "deluxe scrambled eggs", - "name_plural": "deluxe scrambled eggs", + "name": { "str": "deluxe scrambled eggs", "str_pl": "deluxe scrambled eggs" }, "conditional_names": [ { "type": "COMPONENT_ID", @@ -926,8 +908,7 @@ { "type": "COMESTIBLE", "id": "spaghetti_bolognese", - "name": "spaghetti bolognese", - "name_plural": "spaghetti bolognese", + "name": { "str": "spaghetti bolognese", "str_pl": "spaghetti bolognese" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": "scoundrel spaghetti" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "gnarly %s", "str_pl": "gnarly %s" } } @@ -1136,8 +1117,7 @@ { "type": "COMESTIBLE", "id": "haggis", - "name": "haggis", - "name_plural": "haggii", + "name": { "str": "haggis", "str_pl": "haggii" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "human %s", "str_pl": "human %s" } } ], "//": "That's whisky without an 'e' because we're talking about Scotch whisky.", "weight": "156 g", @@ -1159,8 +1139,7 @@ { "type": "COMESTIBLE", "id": "sushi_fishroll", - "name": "fish makizushi", - "name_plural": "fish makizushi", + "name": { "str": "fish makizushi", "str_pl": "fish makizushi" }, "weight": "159 g", "color": "green", "spoils_in": "12 hours", @@ -1179,8 +1158,7 @@ { "type": "COMESTIBLE", "id": "sushi_meatroll", - "name": "meat temaki", - "name_plural": "meat temaki", + "name": { "str": "meat temaki", "str_pl": "meat temaki" }, "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "troubling %s", "str_pl": "troubling %s" } } ], "weight": "273 g", "color": "green", @@ -1200,8 +1178,7 @@ { "type": "COMESTIBLE", "id": "sashimi", - "name": "sashimi", - "name_plural": "sashimi", + "name": { "str": "sashimi", "str_pl": "sashimi" }, "copy-from": "fish_cooked", "color": "white", "spoils_in": "12 hours", diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json index e7e5f47836d9a..2f74414c13dca 100644 --- a/data/json/items/comestibles/med.json +++ b/data/json/items/comestibles/med.json @@ -18,8 +18,7 @@ "id": "adderall", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "Adderall", - "name_plural": "Adderall", + "name": { "str": "Adderall", "str_pl": "Adderall" }, "description": "Medical grade amphetamine salts mixed with Dextroamphetamine salts, commonly prescribed to treat hyperactive attention deficits. It suppresses the appetite, and is quite addictive.", "weight": "1 g", "volume": "250 ml", @@ -38,8 +37,7 @@ "id": "adrenaline_injector", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "syringe of adrenaline", - "name_plural": "syringes of adrenaline", + "name": { "str": "syringe of adrenaline", "str_pl": "syringes of adrenaline" }, "description": "A syringe filled with a shot of adrenaline. It serves as a powerful stimulant when you inject yourself with it. Asthmatics can use it in an emergency to clear their asthma.", "weight": "12 g", "volume": "10ml", @@ -54,8 +52,7 @@ "id": "antibiotics", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "antibiotics", - "name_plural": "antibiotics", + "name": { "str": "antibiotics", "str_pl": "antibiotics" }, "description": "A strong antibacterial medication designed to prevent or stop the spread of infection. It's the safest way to cure any infections you might have. One dose lasts twelve hours.", "weight": "1 g", "volume": "250 ml", @@ -171,8 +168,7 @@ "id": "bfipowder", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "antiseptic powder", - "name_plural": "antiseptic powder", + "name": { "str": "antiseptic powder", "str_pl": "antiseptic powder" }, "description": "A powdered form of chemical antiseptic, this bismuth formic iodide cleans wounds quickly and painlessly.", "weight": "6 g", "volume": "250 ml", @@ -252,8 +248,7 @@ "id": "chem_hydrogen_peroxide", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "hydrogen peroxide", - "name_plural": "hydrogen peroxide", + "name": { "str": "hydrogen peroxide", "str_pl": "hydrogen peroxide" }, "description": "Dilute hydrogen peroxide, for use as an antiseptic and for bleaching hair or textiles. Foams a little when in contact with organic matter, but otherwise harmless.", "weight": "28 g", "volume": "250 ml", @@ -327,8 +322,7 @@ "id": "codeine", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "codeine", - "name_plural": "codeine", + "name": { "str": "codeine", "str_pl": "codeine" }, "description": "A mild opiate used in the suppression of pain, cough, and other ailments. While relatively weak for a narcotic, it is still addictive, with a potential for overdose.", "weight": "1 g", "volume": "250 ml", @@ -351,8 +345,7 @@ "id": "coke", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "cocaine", - "name_plural": "cocaine", + "name": { "str": "cocaine", "str_pl": "cocaine" }, "description": "Crystalline extract of the coca leaf, or at least, a white powder with some of that in it. A topical analgesic, it is more commonly used for its stimulatory properties. Highly addictive.", "weight": "1 g", "volume": "250 ml", @@ -402,8 +395,7 @@ "id": "contacts", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "pair of contact lenses", - "name_plural": "pairs of contact lenses", + "name": { "str": "pair of contact lenses", "str_pl": "pairs of contact lenses" }, "description": "A pair of extended wear contacts with soft lenses designed to be discarded after a week of use. They are a great replacement to wearing glasses and sit comfortably on the surface of the eye.", "weight": "1 g", "volume": "250 ml", @@ -420,8 +412,7 @@ "id": "cotton_ball", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "cotton balls", - "name_plural": "cotton balls", + "name": { "str": "cotton balls", "str_pl": "cotton balls" }, "description": "Fluffy balls of clean white cotton. Can serve as makeshift bandages in an emergency.", "category": "spare_parts", "weight": "22 g", @@ -439,8 +430,7 @@ "id": "crack", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "crack", - "name_plural": "crack", + "name": { "str": "crack", "str_pl": "crack" }, "description": "Deprotonated cocaine crystals, incredibly addictive and deleterious to brain chemistry.", "weight": "1 g", "volume": "250 ml", @@ -471,8 +461,7 @@ "id": "dayquil", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "non-drowsy cough syrup", - "name_plural": "non-drowsy cough syrup", + "name": { "str": "non-drowsy cough syrup", "str_pl": "non-drowsy cough syrup" }, "description": "Daytime cold and flu medication. Non-drowsy formula. Will suppress coughing, aching, headaches and runny noses, but you'll still need lots of fluids and rest.", "weight": "48 g", "volume": "250 ml", @@ -515,8 +504,7 @@ "id": "diazepam", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "diazepam", - "name_plural": "diazepam", + "name": { "str": "diazepam", "str_pl": "diazepam" }, "description": "A strong benzodiazepine drug used to treat muscle spasms, anxiety, seizures, and panic attacks.", "weight": "1 g", "volume": "250 ml", @@ -556,8 +544,7 @@ "id": "eyedrops", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "saline eye drop", - "name_plural": "saline eye drops", + "name": { "str": "saline eye drop", "str_pl": "saline eye drops" }, "description": "Sterile saline eye drops. Can be used to treat dry eyes, or to wash out contaminants.", "volume": "10ml", "weight": "3 g", @@ -587,8 +574,7 @@ "id": "gum", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "chewing gum", - "name_plural": "chewing gum", + "name": { "str": "chewing gum", "str_pl": "chewing gum" }, "description": "Bright pink chewing gum. Sugary, sweet, and bad for your teeth.", "category": "food", "weight": "3 g", @@ -629,8 +615,7 @@ "id": "heroin", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "heroin", - "name_plural": "heroin", + "name": { "str": "heroin", "str_pl": "heroin" }, "description": "An extremely strong opioid narcotic derived from morphine. Incredibly addictive, the risk of overdose is extreme, and the drug is contraindicated for nearly all medical purposes.", "weight": "1 g", "volume": "250 ml", @@ -737,8 +722,7 @@ "id": "meth", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "low-grade methamphetamine", - "name_plural": "low-grade methamphetamine", + "name": { "str": "low-grade methamphetamine", "str_pl": "low-grade methamphetamine" }, "description": "A profoundly addictive and powerful stimulant. While extremely effective at enhancing alertness, it is hazardous to health and the risk of an adverse reaction is great.", "weight": "1 g", "volume": "250 ml", @@ -827,8 +811,7 @@ "id": "nyquil", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "cough syrup", - "name_plural": "cough syrup", + "name": { "str": "cough syrup", "str_pl": "cough syrup" }, "description": "Nighttime cold and flu medication. Useful when trying to sleep with a head full of virions. Will cause drowsiness.", "weight": "48 g", "volume": "250 ml", @@ -933,8 +916,7 @@ "id": "poppysyrup", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "poppy cough syrup", - "name_plural": "poppy cough syrup", + "name": { "str": "poppy cough syrup", "str_pl": "poppy cough syrup" }, "description": "Cough syrup made from mutated poppy. Will make you sleepy.", "weight": "48 g", "volume": "250 ml", @@ -994,8 +976,7 @@ "id": "quikclot", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "hemostatic powder", - "name_plural": "hemostatic powder", + "name": { "str": "hemostatic powder", "str_pl": "hemostatic powder" }, "description": "A powdered antihemorrhagic compound that reacts with blood to immediately form a gel-like substance that stops bleeding.", "weight": "5 g", "volume": "250 ml", @@ -1259,8 +1240,7 @@ "id": "weed", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "marijuana", - "name_plural": "marijuana", + "name": { "str": "marijuana", "str_pl": "marijuana" }, "description": "The dried flower buds and leaves harvested from a psychoactive variety of hemp plant. Used to reduce nausea, stimulate appetite and elevate mood. It can be habit-forming, and adverse reactions are possible.", "weight": "1 g", "volume": "250 ml", @@ -1290,8 +1270,7 @@ "id": "xanax", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "Xanax", - "name_plural": "Xanax", + "name": { "str": "Xanax", "str_pl": "Xanax" }, "description": "Anti-anxiety agent with a powerful sedative effect. May cause dissociation and loss of memory. It is dangerously addictive, and withdrawal from regular use should be gradual. Its generic name is alprazolam.", "weight": "1 g", "volume": "250 ml", @@ -1312,8 +1291,7 @@ "id": "disinrag", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "antiseptic soaked rag", - "name_plural": "antiseptic soaked rags", + "name": { "str": "antiseptic soaked rag", "str_pl": "antiseptic soaked rags" }, "description": "A rag soaked in antiseptic. Useful for light wounds, probaby won't help with deep bites.", "weight": "80 g", "//": "Can't copy-from rag, it breaks the stacking for some reason!", @@ -1335,8 +1313,7 @@ "id": "disincotton_ball", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "antiseptic soaked cotton balls", - "name_plural": "antiseptic soaked cotton balls", + "name": { "str": "antiseptic soaked cotton balls", "str_pl": "antiseptic soaked cotton balls" }, "description": "Fluffy balls of clean white cotton. Now soaked with antiseptic, they are somewhat useful to disinfect a wound.", "weight": "25 g", "//": "Can't copy-from cotton_ball, breaks volume", @@ -1359,8 +1336,7 @@ "id": "weak_antibiotic", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "Atreyupan", - "name_plural": "Atreyupan", + "name": { "str": "Atreyupan", "str_pl": "Atreyupan" }, "description": "A broad-spectrum antibiotic used to suppress infections and prevent them from setting in. It isn't strong enough to purge infections outright, but it boosts the body's resistance against them. One dose lasts twelve hours.", "weight": "15 g", "volume": "250 ml", @@ -1399,8 +1375,7 @@ "id": "panacea", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "Panaceus", - "name_plural": "Panaceii", + "name": { "str": "Panaceus", "str_pl": "Panaceii" }, "description": "An apple-red gel capsule the size of your thumbnail, filled with a thick oily liquid that shifts from black to purple at unpredictable intervals, flecked with tiny gray dots. Given the place you got it from, it's either very potent, or highly experimental. Holding it, all the little aches and pains seem to fade, just for a moment…", "weight": "15 g", "volume": "5 ml", @@ -1417,8 +1392,7 @@ "id": "cattail_jelly", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "cattail jelly", - "name_plural": "cattail jellies", + "name": { "str": "cattail jelly", "str_pl": "cattail jellies" }, "description": "Clear jelly harvested from cattail, has antiseptic properties and works as a painkiller.", "container": "bottle_plastic_small", "weight": "50 g", diff --git a/data/json/items/comestibles/mre.json b/data/json/items/comestibles/mre.json index 84d4ac85fc7fb..e007acfedea03 100644 --- a/data/json/items/comestibles/mre.json +++ b/data/json/items/comestibles/mre.json @@ -52,48 +52,42 @@ "id": "mre_accessory", "type": "GENERIC", "copy-from": "mre_smallbox", - "name": "MRE - Accessory Pack", - "name_plural": "MREs - Accessory Packs", + "name": { "str": "MRE - Accessory Pack", "str_pl": "MREs - Accessory Packs" }, "description": "An MRE accessory pack containing a variety of utensils and drinks. Activate or disassemble it to get to its contents." }, { "id": "mre_dessert", "type": "GENERIC", "copy-from": "mre_smallbox", - "name": "MRE - Dessert Pack", - "name_plural": "MREs - Dessert Packs", + "name": { "str": "MRE - Dessert Pack", "str_pl": "MREs - Dessert Packs" }, "description": "A sealed plastic bag containing an array of desserts. Activate or disassemble it to get to its contents." }, { "id": "mre_chilibeans_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Chili & Beans", - "name_plural": "MREs - Chili & Beans", + "name": { "str": "MRE - Chili & Beans", "str_pl": "MREs - Chili & Beans" }, "description": "A 'Meal Ready to Eat' with a chili & beans entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents." }, { "id": "mre_bbqbeef_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - BBQ Beef", - "name_plural": "MREs - BBQ Beef", + "name": { "str": "MRE - BBQ Beef", "str_pl": "MREs - BBQ Beef" }, "description": "A 'Meal Ready to Eat' with a BBQ beef entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents." }, { "id": "mre_chickennoodle_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Chicken & Noodles", - "name_plural": "MREs - Chicken & Noodles", + "name": { "str": "MRE - Chicken & Noodles", "str_pl": "MREs - Chicken & Noodles" }, "description": "A 'Meal Ready to Eat' with a chicken & noodles entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents." }, { "id": "mre_spaghetti_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Spaghetti", - "name_plural": "MREs - Spaghetti", + "name": { "str": "MRE - Spaghetti", "str_pl": "MREs - Spaghetti" }, "description": "A 'Meal Ready to Eat' with a spaghetti entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents.", "looks_like": "mre_veggy_box" }, @@ -101,48 +95,42 @@ "id": "mre_chicken_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Chicken Chunks", - "name_plural": "MREs - Chicken Chunks", + "name": { "str": "MRE - Chicken Chunks", "str_pl": "MREs - Chicken Chunks" }, "description": "A 'Meal Ready to Eat' with a chicken chunk entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents." }, { "id": "mre_beeftaco_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Beef Taco", - "name_plural": "MREs - Beef Taco", + "name": { "str": "MRE - Beef Taco", "str_pl": "MREs - Beef Taco" }, "description": "A 'Meal Ready to Eat' with a beef taco entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents." }, { "id": "mre_beef_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Beef Brisket", - "name_plural": "MREs - Beef Brisket", + "name": { "str": "MRE - Beef Brisket", "str_pl": "MREs - Beef Brisket" }, "description": "A 'Meal Ready to Eat' with a beef brisket entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents." }, { "id": "mre_meatball_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Meatballs & Marinara", - "name_plural": "MREs - Meatballs & Marinara", + "name": { "str": "MRE - Meatballs & Marinara", "str_pl": "MREs - Meatballs & Marinara" }, "description": "A 'Meal Ready to Eat' with a meatball entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents." }, { "id": "mre_beefstew_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Beef Stew", - "name_plural": "MREs - Beef Stew", + "name": { "str": "MRE - Beef Stew", "str_pl": "MREs - Beef Stew" }, "description": "A 'Meal Ready to Eat' with a beef stew entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents." }, { "id": "mre_chilimac_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Chili & Macaroni", - "name_plural": "MREs - Chili & Macaroni", + "name": { "str": "MRE - Chili & Macaroni", "str_pl": "MREs - Chili & Macaroni" }, "description": "A 'Meal Ready to Eat' with a chili & macaroni entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents.", "looks_like": "mre_veggy_box" }, @@ -150,16 +138,14 @@ "id": "mre_veggy_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Vegetarian Taco", - "name_plural": "MREs - Vegetarian Taco", + "name": { "str": "MRE - Vegetarian Taco", "str_pl": "MREs - Vegetarian Taco" }, "description": "A 'Meal Ready to Eat' with a vegetarian taco entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents." }, { "id": "mre_macaronimarinara_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Macaroni Marinara", - "name_plural": "MREs - Macaroni Marinara", + "name": { "str": "MRE - Macaroni Marinara", "str_pl": "MREs - Macaroni Marinara" }, "description": "A 'Meal Ready to Eat' with a macaroni marinara entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents.", "looks_like": "mre_veggy_box" }, @@ -167,8 +153,7 @@ "id": "mre_cheesetort_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Cheese Tortellini", - "name_plural": "MREs - Cheese Tortellini", + "name": { "str": "MRE - Cheese Tortellini", "str_pl": "MREs - Cheese Tortellini" }, "description": "A 'Meal Ready to Eat' with a cheese tortellini entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents.", "looks_like": "mre_veggy_box" }, @@ -176,8 +161,7 @@ "id": "mre_mushroomfettuccine_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Mushroom Fettuccine", - "name_plural": "MREs - Mushroom Fettuccine", + "name": { "str": "MRE - Mushroom Fettuccine", "str_pl": "MREs - Mushroom Fettuccine" }, "description": "A 'Meal Ready to Eat' with a mushroom fettuccine entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents.", "looks_like": "mre_veggy_box" }, @@ -185,8 +169,7 @@ "id": "mre_mexicanchickenstew_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Mexican Chicken Stew", - "name_plural": "MREs - Mexican Chicken Stew", + "name": { "str": "MRE - Mexican Chicken Stew", "str_pl": "MREs - Mexican Chicken Stew" }, "description": "A 'Meal Ready to Eat' with a Mexican chicken stew entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents.", "looks_like": "mre_beef_box" }, @@ -194,80 +177,70 @@ "id": "mre_chickenburritobowl_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Chicken Burrito Bowl", - "name_plural": "MREs - Chicken Burrito Bowl", + "name": { "str": "MRE - Chicken Burrito Bowl", "str_pl": "MREs - Chicken Burrito Bowl" }, "description": "A 'Meal Ready to Eat' with a chicken burrito bowl entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents." }, { "id": "mre_maplesausage_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Maple Sausage", - "name_plural": "MREs - Maple Sausage", + "name": { "str": "MRE - Maple Sausage", "str_pl": "MREs - Maple Sausage" }, "description": "A 'Meal Ready to Eat' with a maple sausage entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents." }, { "id": "mre_ravioli_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Ravioli", - "name_plural": "MREs - Ravioli", + "name": { "str": "MRE - Ravioli", "str_pl": "MREs - Ravioli" }, "description": "A 'Meal Ready to Eat' with a ravioli entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents." }, { "id": "mre_pepperjackbeef_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Pepper Jack Beef", - "name_plural": "MREs - Pepper Jack Beef", + "name": { "str": "MRE - Pepper Jack Beef", "str_pl": "MREs - Pepper Jack Beef" }, "description": "A 'Meal Ready to Eat' with a pepper jack beef entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents." }, { "id": "mre_hashbrownbacon_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Hash Browns & Bacon", - "name_plural": "MREs - Hash Browns & Bacon", + "name": { "str": "MRE - Hash Browns & Bacon", "str_pl": "MREs - Hash Browns & Bacon" }, "description": "A 'Meal Ready to Eat' with a hash browns & bacon entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents." }, { "id": "mre_lemontuna_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Lemon Pepper Tuna", - "name_plural": "MREs - Lemon Pepper Tuna", + "name": { "str": "MRE - Lemon Pepper Tuna", "str_pl": "MREs - Lemon Pepper Tuna" }, "description": "A 'Meal Ready to Eat' with a lemon pepper tuna entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents." }, { "id": "mre_asianbeef_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Asian Beef & Vegetables", - "name_plural": "MREs - Asian Beef & Vegetables", + "name": { "str": "MRE - Asian Beef & Vegetables", "str_pl": "MREs - Asian Beef & Vegetables" }, "description": "A 'Meal Ready to Eat' with an asian beef & vegetables entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents." }, { "id": "mre_chickenpesto_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Chicken Pesto & Pasta", - "name_plural": "MREs - Chicken Pesto & Pasta", + "name": { "str": "MRE - Chicken Pesto & Pasta", "str_pl": "MREs - Chicken Pesto & Pasta" }, "description": "A 'Meal Ready to Eat' with a chicken pesto entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents." }, { "id": "mre_southwestbeef_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Southwest Beef & Beans", - "name_plural": "MREs - Southwest Beef & Beans", + "name": { "str": "MRE - Southwest Beef & Beans", "str_pl": "MREs - Southwest Beef & Beans" }, "description": "A 'Meal Ready to Eat' with a southwest beef & beans entree and everything a hungry soldier needs. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents." }, { "id": "mre_hotdog_box", "type": "GENERIC", "copy-from": "mre_box", - "name": "MRE - Frankfurters & Beans", - "name_plural": "MREs - Frankfurters & Beans", + "name": { "str": "MRE - Frankfurters & Beans", "str_pl": "MREs - Frankfurters & Beans" }, "description": "A vintage MRE, still perfectly preserved and edible. The contents will begin to rot once they're removed from this sealed bag. Activate or disassemble it to get to its contents.", "price": 1000 }, diff --git a/data/json/items/comestibles/mutagen.json b/data/json/items/comestibles/mutagen.json index d5d73d6249337..f40a28ced9e58 100644 --- a/data/json/items/comestibles/mutagen.json +++ b/data/json/items/comestibles/mutagen.json @@ -475,8 +475,7 @@ "type": "COMESTIBLE", "id": "fetus", "category": "other", - "name": "misshapen fetus", - "name_plural": "misshapen fetuses", + "name": { "str": "misshapen fetus", "str_pl": "misshapen fetuses" }, "weight": "760 g", "color": "pink", "spoils_in": "2 days", diff --git a/data/json/items/comestibles/nuts.json b/data/json/items/comestibles/nuts.json index ea70cbbd4db47..0a4d430289f60 100644 --- a/data/json/items/comestibles/nuts.json +++ b/data/json/items/comestibles/nuts.json @@ -97,8 +97,7 @@ { "type": "COMESTIBLE", "id": "almond_pulp", - "name": "almond pulp", - "name_plural": "almond pulp", + "name": { "str": "almond pulp", "str_pl": "almond pulp" }, "looks_like": "granola", "weight": "30 g", "color": "brown", @@ -448,8 +447,7 @@ { "type": "COMESTIBLE", "id": "acorns_cooked", - "name": "cooked acorn meal", - "name_plural": "cooked acorn meal", + "name": { "str": "cooked acorn meal", "str_pl": "cooked acorn meal" }, "weight": "22 g", "color": "brown", "spoils_in": "30 days", diff --git a/data/json/items/comestibles/offal_dishes.json b/data/json/items/comestibles/offal_dishes.json index e2ce88b2aef52..2382e8f1725d4 100644 --- a/data/json/items/comestibles/offal_dishes.json +++ b/data/json/items/comestibles/offal_dishes.json @@ -3,8 +3,7 @@ "id": "foie_gras", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "foie gras", - "name_plural": "foie gras", + "name": { "str": "foie gras", "str_pl": "foie gras" }, "symbol": "%", "looks_like": "meat_cooked", "description": "Thought it's not technically foie gras, you don't have to think about that.", @@ -25,8 +24,7 @@ "id": "liver_onion", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "liver & onions", - "name_plural": "liver & onions", + "name": { "str": "liver & onions", "str_pl": "liver & onions" }, "symbol": "%", "looks_like": "meat_cooked", "description": "A classic way to serve liver.", @@ -128,8 +126,7 @@ "id": "leverpostej", "type": "COMESTIBLE", "comestible_type": "DRINK", - "name": "leverpostej", - "name_plural": "leverpostej", + "name": { "str": "leverpostej", "str_pl": "leverpostej" }, "symbol": "%", "looks_like": "peanutbutter", "quench": -2, diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json index baf34aa146f2b..aa1fcecd6153e 100644 --- a/data/json/items/comestibles/other.json +++ b/data/json/items/comestibles/other.json @@ -50,8 +50,7 @@ { "type": "COMESTIBLE", "id": "wax", - "name": "wax", - "name_plural": "waxes", + "name": { "str": "wax", "str_pl": "waxes" }, "weight": "97 g", "color": "white", "comestible_type": "FOOD", @@ -67,8 +66,7 @@ { "type": "COMESTIBLE", "id": "royal_jelly", - "name": "royal jelly", - "name_plural": "royal jellies", + "name": { "str": "royal jelly", "str_pl": "royal jellies" }, "category": "drugs", "weight": "150 g", "color": "white", @@ -87,8 +85,7 @@ { "type": "COMESTIBLE", "id": "marloss_berry", - "name": "marloss berry", - "name_plural": "marloss berries", + "name": { "str": "marloss berry", "str_pl": "marloss berries" }, "weight": "177 g", "color": "pink", "addiction_type": "marloss_r", @@ -110,8 +107,7 @@ { "type": "COMESTIBLE", "id": "marloss_gel", - "name": "marloss gelatin", - "name_plural": "marloss gelatin", + "name": { "str": "marloss gelatin", "str_pl": "marloss gelatin" }, "weight": "177 g", "color": "yellow", "addiction_type": "marloss_y", @@ -132,8 +128,7 @@ { "type": "COMESTIBLE", "id": "mycus_fruit", - "name": "mycus fruit", - "name_plural": "mycus fruits", + "name": { "str": "mycus fruit", "str_pl": "mycus fruits" }, "weight": "354 g", "color": "light_gray", "use_action": "MYCUS", @@ -206,8 +201,7 @@ { "type": "COMESTIBLE", "id": "meal_chitin_piece", - "name": "chitin powder", - "name_plural": "chitin powder", + "name": { "str": "chitin powder", "str_pl": "chitin powder" }, "weight": "112 g", "color": "brown", "comestible_type": "FOOD", @@ -242,8 +236,7 @@ { "type": "COMESTIBLE", "id": "can_beans", - "name": "canned beans", - "name_plural": "beans", + "name": { "str": "canned beans", "str_pl": "beans" }, "weight": "256 g", "color": "brown", "spoils_in": "2 days", @@ -263,8 +256,7 @@ { "type": "COMESTIBLE", "id": "dry_beans", - "name": "dried beans", - "name_plural": "dried beans", + "name": { "str": "dried beans", "str_pl": "dried beans" }, "weight": "56 g", "color": "light_gray", "spoils_in": "360 days", @@ -287,8 +279,7 @@ { "type": "COMESTIBLE", "id": "beans_cooked", - "name": "cooked beans", - "name_plural": "cooked beans", + "name": { "str": "cooked beans", "str_pl": "cooked beans" }, "weight": "270 g", "color": "light_gray", "spoils_in": "10 days", @@ -308,8 +299,7 @@ { "type": "COMESTIBLE", "id": "tofu", - "name": "tofu", - "name_plural": "tofu", + "name": { "str": "tofu", "str_pl": "tofu" }, "weight": "85 g", "color": "white", "spoils_in": "4 days", @@ -329,8 +319,7 @@ { "type": "COMESTIBLE", "id": "tofu_fried", - "name": "fried tofu", - "name_plural": "fried tofu", + "name": { "str": "fried tofu", "str_pl": "fried tofu" }, "weight": "85 g", "color": "white", "spoils_in": "4 days", @@ -349,8 +338,7 @@ { "type": "COMESTIBLE", "id": "dry_tofu", - "name": "dehydrated tofu", - "name_plural": "dehydrated tofu", + "name": { "str": "dehydrated tofu", "str_pl": "dehydrated tofu" }, "weight": "65 g", "color": "white", "spoils_in": "360 days", @@ -367,8 +355,7 @@ { "type": "COMESTIBLE", "id": "soybean", - "name": "soybeans", - "name_plural": "soybeans", + "name": { "str": "soybeans", "str_pl": "soybeans" }, "copy-from": "seed", "weight": "160 g", "symbol": ".", @@ -402,8 +389,7 @@ { "type": "COMESTIBLE", "id": "dry_lentils", - "name": "dried lentils", - "name_plural": "dried lentils", + "name": { "str": "dried lentils", "str_pl": "dried lentils" }, "weight": "132 g", "color": "light_gray", "comestible_type": "FOOD", @@ -423,8 +409,7 @@ { "type": "COMESTIBLE", "id": "lentils_cooked", - "name": "cooked lentils", - "name_plural": "cooked lentils", + "name": { "str": "cooked lentils", "str_pl": "cooked lentils" }, "weight": "198 g", "copy-from": "dry_lentils", "color": "light_gray", @@ -441,8 +426,7 @@ { "type": "COMESTIBLE", "id": "coffee_raw", - "name": "coffee powder", - "name_plural": "coffee powder", + "name": { "str": "coffee powder", "str_pl": "coffee powder" }, "weight": "14 g", "color": "brown", "addiction_type": "caffeine", @@ -465,8 +449,7 @@ "type": "COMESTIBLE", "id": "coffee_raw_kentucky", "copy-from": "coffee_raw", - "name": "Kentucky coffee grounds", - "name_plural": "Kentucky coffee grounds", + "name": { "str": "Kentucky coffee grounds", "str_pl": "Kentucky coffee grounds" }, "container": "bag_plastic", "description": "Coffee grounds created through washing, cleaning, and roasting the pods from a Kentucky coffeetree. They can be used to create coffee.", "flags": [ "EDIBLE_FROZEN", "NUTRIENT_OVERRIDE" ], @@ -478,8 +461,7 @@ "type": "COMESTIBLE", "symbol": "~", "color": "yellow", - "name": "candied honey", - "name_plural": "candied honey", + "name": { "str": "candied honey", "str_pl": "candied honey" }, "description": "Honey, that stuff the bees make. This variant is \"candied honey\", a variant of very thick consistence. This honey won't spoil and is good for your digestion.", "price": 800, "material": "honey", @@ -496,8 +478,7 @@ { "type": "COMESTIBLE", "id": "can_tomato", - "name": "canned tomato", - "name_plural": "canned tomatoes", + "name": { "str": "canned tomato", "str_pl": "canned tomatoes" }, "weight": "128 g", "color": "red", "spoils_in": "3 days 18 hours", @@ -518,8 +499,7 @@ { "type": "COMESTIBLE", "id": "human_brain_embalmed", - "name": "embalmed human brain", - "name_plural": "embalmed human brains", + "name": { "str": "embalmed human brain", "str_pl": "embalmed human brains" }, "weight": "56 g", "color": "pink", "looks_like": "offal", @@ -541,8 +521,7 @@ "id": "cattlefodder", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "cattle fodder", - "name_plural": "cattle fodder", + "name": { "str": "cattle fodder", "str_pl": "cattle fodder" }, "description": "What cattle eat. Mainly made of grass, silage or legumes. It's perfect for ruminants.", "weight": "300 g", "volume": "250 ml", @@ -563,8 +542,7 @@ "id": "birdfood", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "bird food", - "name_plural": "bird food", + "name": { "str": "bird food", "str_pl": "bird food" }, "description": "What birds eat. Mainly made of seeds, silage or legumes. It's perfect for small birds.", "weight": "60 g", "volume": "250 ml", @@ -584,8 +562,7 @@ "id": "dogfood", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "dog food", - "name_plural": "dog food", + "name": { "str": "dog food", "str_pl": "dog food" }, "description": "This is food for dogs. It smells strange, but dogs seem to love it.", "weight": "554 g", "spoils_in": "1 day", @@ -608,8 +585,7 @@ "id": "catfood", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "cat food", - "name_plural": "cat food", + "name": { "str": "cat food", "str_pl": "cat food" }, "description": "This is food for cats. It smells strange, but cats seem to love it.", "weight": "223 g", "spoils_in": "1 day", @@ -631,8 +607,7 @@ { "type": "COMESTIBLE", "id": "grass", - "name": "grass", - "name_plural": "grasses", + "name": { "str": "grass", "str_pl": "grasses" }, "weight": "100 g", "color": "green", "comestible_type": "FOOD", @@ -648,8 +623,7 @@ { "type": "COMESTIBLE", "id": "underbrush", - "name": "underbrush", - "name_plural": "underbrushes", + "name": { "str": "underbrush", "str_pl": "underbrushes" }, "weight": "100 g", "color": "green", "comestible_type": "FOOD", @@ -665,8 +639,7 @@ { "type": "COMESTIBLE", "id": "nectar", - "name": "nectar", - "name_plural": "nectars", + "name": { "str": "nectar", "str_pl": "nectars" }, "weight": "100 g", "color": "green", "comestible_type": "FOOD", diff --git a/data/json/items/comestibles/raw_fruit.json b/data/json/items/comestibles/raw_fruit.json index 85403756aa7a9..b770da793e667 100644 --- a/data/json/items/comestibles/raw_fruit.json +++ b/data/json/items/comestibles/raw_fruit.json @@ -422,8 +422,7 @@ { "type": "COMESTIBLE", "id": "peach", - "name": "peach", - "name_plural": "peaches", + "name": { "str": "peach", "str_pl": "peaches" }, "weight": "163 g", "color": "yellow", "spoils_in": "3 days", diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json index 0aa6ecd7198d6..f6887d74c8f4a 100644 --- a/data/json/items/comestibles/raw_veggy.json +++ b/data/json/items/comestibles/raw_veggy.json @@ -38,8 +38,7 @@ { "type": "COMESTIBLE", "id": "broccoli", - "name": "broccoli", - "name_plural": "broccoli", + "name": { "str": "broccoli", "str_pl": "broccoli" }, "weight": "96 g", "color": "green", "spoils_in": "6 days 16 hours", @@ -58,8 +57,7 @@ { "type": "COMESTIBLE", "id": "buckwheat", - "name": "buckwheat", - "name_plural": "buckwheat", + "name": { "str": "buckwheat", "str_pl": "buckwheat" }, "weight": "180 g", "color": "brown", "comestible_type": "FOOD", @@ -101,8 +99,7 @@ { "type": "COMESTIBLE", "id": "spinach", - "name": "spinach", - "name_plural": "spinach", + "name": { "str": "spinach", "str_pl": "spinach" }, "weight": "139 g", "color": "green", "spoils_in": "8 days", @@ -123,8 +120,7 @@ { "type": "COMESTIBLE", "id": "carrot", - "name": "carrot", - "name_plural": "carrots", + "name": { "str": "carrot", "str_pl": "carrots" }, "weight": "68 g", "color": "light_red", "spoils_in": "5 days", @@ -145,8 +141,7 @@ { "type": "COMESTIBLE", "id": "cattail_rhizome", - "name": "cattail rhizome", - "name_plural": "cattail rhizomes", + "name": { "str": "cattail rhizome", "str_pl": "cattail rhizomes" }, "weight": "209 g", "color": "brown", "spoils_in": "3 days 8 hours", @@ -164,8 +159,7 @@ { "type": "COMESTIBLE", "id": "cattail_stalk", - "name": "cattail stalk", - "name_plural": "cattail stalks", + "name": { "str": "cattail stalk", "str_pl": "cattail stalks" }, "weight": "100 g", "color": "green", "spoils_in": "3 days 8 hours", @@ -203,8 +197,7 @@ { "type": "COMESTIBLE", "id": "corn", - "name": "corn", - "name_plural": "corn", + "name": { "str": "corn", "str_pl": "corn" }, "weight": "153 g", "color": "light_green", "spoils_in": "5 days", @@ -224,8 +217,7 @@ { "type": "COMESTIBLE", "id": "cotton_boll", - "name": "cotton boll", - "name_plural": "cotton bolls", + "name": { "str": "cotton boll", "str_pl": "cotton bolls" }, "category": "other", "weight": "26 g", "color": "light_green", @@ -342,8 +334,7 @@ { "type": "COMESTIBLE", "id": "carrot_wild", - "name": "wild root", - "name_plural": "wild roots", + "name": { "str": "wild root", "str_pl": "wild roots" }, "copy-from": "carrot", "color": "white", "description": "A weed with a cluster of tiny white flowers. These are often wild carrots, but beware of poisonous lookalikes.", @@ -395,8 +386,7 @@ { "type": "COMESTIBLE", "id": "hops", - "name": "hops flower", - "name_plural": "hops flowers", + "name": { "str": "hops flower", "str_pl": "hops flowers" }, "weight": "92 g", "color": "light_green", "comestible_type": "FOOD", @@ -494,8 +484,7 @@ { "type": "COMESTIBLE", "id": "potato", - "name": "raw potato", - "name_plural": "raw potatoes", + "name": { "str": "raw potato", "str_pl": "raw potatoes" }, "weight": "210 g", "color": "brown", "spoils_in": "60 days", @@ -599,8 +588,7 @@ { "type": "COMESTIBLE", "id": "tea_raw", - "name": "tea leaf", - "name_plural": "tea leaves", + "name": { "str": "tea leaf", "str_pl": "tea leaves" }, "weight": "14 g", "color": "green", "use_action": "CAFF", @@ -621,8 +609,7 @@ { "type": "COMESTIBLE", "id": "tomato", - "name": "tomato", - "name_plural": "tomatoes", + "name": { "str": "tomato", "str_pl": "tomatoes" }, "weight": "231 g", "color": "red", "spoils_in": "3 days 18 hours", @@ -676,8 +663,7 @@ { "type": "COMESTIBLE", "id": "veggy_wild", - "name": "wild vegetables", - "name_plural": "wild vegetables", + "name": { "str": "wild vegetables", "str_pl": "wild vegetables" }, "copy-from": "veggy", "description": "An assortment of edible-looking wild plants. Most are quite bitter-tasting. Some are inedible until cooked.", "//": "In real life many root vegetables are mildly toxic until cooked", @@ -722,8 +708,7 @@ { "type": "COMESTIBLE", "id": "raw_beans", - "name": "raw beans", - "name_plural": "raw beans", + "name": { "str": "raw beans", "str_pl": "raw beans" }, "color": "brown", "spoils_in": "2 days", "comestible_type": "FOOD", @@ -743,8 +728,7 @@ { "type": "COMESTIBLE", "id": "raw_lentils", - "name": "raw lentils", - "name_plural": "raw lentils", + "name": { "str": "raw lentils", "str_pl": "raw lentils" }, "color": "light_green", "spoils_in": "2 days", "comestible_type": "FOOD", diff --git a/data/json/items/comestibles/sandwich.json b/data/json/items/comestibles/sandwich.json index b888bcc788ff5..311e6537e818b 100644 --- a/data/json/items/comestibles/sandwich.json +++ b/data/json/items/comestibles/sandwich.json @@ -2,8 +2,7 @@ { "type": "COMESTIBLE", "id": "sandwich_cheese_grilled", - "name": "grilled cheese sandwich", - "name_plural": "grilled cheese sandwiches", + "name": { "str": "grilled cheese sandwich", "str_pl": "grilled cheese sandwiches" }, "weight": "106 g", "color": "brown", "spoils_in": "1 day 10 hours", @@ -24,8 +23,7 @@ { "type": "COMESTIBLE", "id": "sandwich_deluxe", - "name": "deluxe sandwich", - "name_plural": "deluxe sandwiches", + "name": { "str": "deluxe sandwich", "str_pl": "deluxe sandwiches" }, "conditional_names": [ { "type": "COMPONENT_ID", @@ -54,8 +52,7 @@ { "type": "COMESTIBLE", "id": "sandwich_cucumber", - "name": "cucumber sandwich", - "name_plural": "cucumber sandwiches", + "name": { "str": "cucumber sandwich", "str_pl": "cucumber sandwiches" }, "weight": "500 g", "color": "light_green", "spoils_in": "1 day 12 hours", @@ -76,8 +73,7 @@ { "type": "COMESTIBLE", "id": "sandwich_cheese", - "name": "cheese sandwich", - "name_plural": "cheese sandwiches", + "name": { "str": "cheese sandwich", "str_pl": "cheese sandwiches" }, "weight": "106 g", "color": "brown", "spoils_in": "1 day 12 hours", @@ -96,8 +92,7 @@ { "type": "COMESTIBLE", "id": "sandwich_jam", - "name": "jam sandwich", - "name_plural": "jam sandwiches", + "name": { "str": "jam sandwich", "str_pl": "jam sandwiches" }, "weight": "97 g", "color": "brown", "spoils_in": "1 day 13 hours", @@ -117,8 +112,7 @@ { "type": "COMESTIBLE", "id": "sandwich_fairy", - "name": "fairy bread", - "name_plural": "fairy bread", + "name": { "str": "fairy bread", "str_pl": "fairy bread" }, "weight": "114 g", "color": "brown", "spoils_in": "3 days", @@ -136,8 +130,7 @@ { "type": "COMESTIBLE", "id": "sandwich_honey", - "name": "honey sandwich", - "name_plural": "honey sandwiches", + "name": { "str": "honey sandwich", "str_pl": "honey sandwiches" }, "weight": "192 g", "color": "brown", "spoils_in": "10 days", @@ -158,8 +151,7 @@ { "type": "COMESTIBLE", "id": "sandwich_sauce", - "name": "boring sandwich", - "name_plural": "boring sandwiches", + "name": { "str": "boring sandwich", "str_pl": "boring sandwiches" }, "copy-from": "bread", "proportional": { "weight": 2, "calories": 2, "volume": 2 }, "color": "brown", @@ -173,8 +165,7 @@ { "type": "COMESTIBLE", "id": "sandwich_veggy", - "name": "vegetable sandwich", - "name_plural": "vegetable sandwiches", + "name": { "str": "vegetable sandwich", "str_pl": "vegetable sandwiches" }, "weight": "289 g", "color": "light_gray", "spoils_in": "2 days", @@ -195,8 +186,7 @@ { "type": "COMESTIBLE", "id": "sandwich_t", - "name": "meat sandwich", - "name_plural": "meat sandwiches", + "name": { "str": "meat sandwich", "str_pl": "meat sandwiches" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "slob sandwich", "str_pl": "slob sandwiches" } }, { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "mutant %s", "str_pl": "mutant %s" } } @@ -219,8 +209,7 @@ { "type": "COMESTIBLE", "id": "sandwich_pb", - "name": "peanut butter sandwich", - "name_plural": "peanut butter sandwiches", + "name": { "str": "peanut butter sandwich", "str_pl": "peanut butter sandwiches" }, "weight": "204 g", "color": "brown", "spoils_in": "1 day 12 hours", @@ -239,8 +228,7 @@ { "type": "COMESTIBLE", "id": "sandwich_pbj", - "name": "PB&J sandwich", - "name_plural": "PB&J sandwiches", + "name": { "str": "PB&J sandwich", "str_pl": "PB&J sandwiches" }, "weight": "102 g", "color": "brown", "spoils_in": "1 day 12 hours", @@ -260,8 +248,7 @@ { "type": "COMESTIBLE", "id": "sandwich_pbh", - "name": "PB&H sandwich", - "name_plural": "PB&H sandwiches", + "name": { "str": "PB&H sandwich", "str_pl": "PB&H sandwiches" }, "weight": "97 g", "color": "brown", "spoils_in": "1 day 12 hours", @@ -281,8 +268,7 @@ { "type": "COMESTIBLE", "id": "sandwich_pbm", - "name": "PB&M sandwich", - "name_plural": "PB&M sandwiches", + "name": { "str": "PB&M sandwich", "str_pl": "PB&M sandwiches" }, "weight": "225 g", "color": "brown", "spoils_in": "1 day 12 hours", @@ -301,8 +287,7 @@ { "type": "COMESTIBLE", "id": "fish_sandwich", - "name": "fish sandwich", - "name_plural": "fish sandwiches", + "name": { "str": "fish sandwich", "str_pl": "fish sandwiches" }, "weight": "201 g", "color": "yellow", "spoils_in": "1 day", @@ -320,8 +305,7 @@ { "type": "COMESTIBLE", "id": "fish_bagel", - "name": "fish and spinach bagel", - "name_plural": "fish and spinach bagels", + "name": { "str": "fish and spinach bagel", "str_pl": "fish and spinach bagels" }, "weight": "201 g", "color": "magenta", "spoils_in": "1 day", diff --git a/data/json/items/comestibles/seed.json b/data/json/items/comestibles/seed.json index b5c0caeb583b3..92777b917596c 100644 --- a/data/json/items/comestibles/seed.json +++ b/data/json/items/comestibles/seed.json @@ -3,8 +3,7 @@ "abstract": "seed", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "seeds", - "name_plural": "seeds", + "name": { "str": "seeds", "str_pl": "seeds" }, "category": "seeds", "volume": "250 ml", "weight": "1 g", @@ -29,8 +28,7 @@ "abstract": "seed_mushroom_base", "type": "COMESTIBLE", "copy-from": "seed", - "name": "mushroom spores", - "name_plural": "mushroom spores", + "name": { "str": "mushroom spores", "str_pl": "mushroom spores" }, "description": "Some mushroom spores.", "charges": 2, "color": "green" @@ -39,8 +37,7 @@ "id": "seed_hops", "copy-from": "seed", "type": "COMESTIBLE", - "name": "hop rhizomes", - "name_plural": "hop rhizomes", + "name": { "str": "hop rhizomes", "str_pl": "hop rhizomes" }, "description": "Roots of a hop plant, for growing your own.", "weight": "152 g", "price": 160, @@ -52,8 +49,7 @@ "id": "seed_blackberries", "copy-from": "seed_fruit", "type": "COMESTIBLE", - "name": "blackberry seeds", - "name_plural": "blackberry seeds", + "name": { "str": "blackberry seeds", "str_pl": "blackberry seeds" }, "description": "Some blackberry seeds.", "seed_data": { "plant_name": "blackberry", "fruit": "blackberries", "byproducts": [ "withered" ], "grow": "91 days" } }, @@ -61,8 +57,7 @@ "id": "seed_blueberries", "copy-from": "seed_fruit", "type": "COMESTIBLE", - "name": "blueberry seeds", - "name_plural": "blueberry seeds", + "name": { "str": "blueberry seeds", "str_pl": "blueberry seeds" }, "description": "Some blueberry seeds.", "seed_data": { "plant_name": "blueberry", "fruit": "blueberries", "byproducts": [ "withered" ], "grow": "91 days" } }, @@ -70,8 +65,7 @@ "id": "seed_cranberries", "copy-from": "seed_fruit", "type": "COMESTIBLE", - "name": "cranberry seeds", - "name_plural": "cranberry seeds", + "name": { "str": "cranberry seeds", "str_pl": "cranberry seeds" }, "description": "Some cranberry seeds.", "seed_data": { "plant_name": "cranberry", "fruit": "cranberries", "byproducts": [ "withered" ], "grow": "91 days" } }, @@ -79,8 +73,7 @@ "id": "seed_huckleberries", "copy-from": "seed_fruit", "type": "COMESTIBLE", - "name": "huckleberry seeds", - "name_plural": "huckleberry seeds", + "name": { "str": "huckleberry seeds", "str_pl": "huckleberry seeds" }, "description": "Some huckleberry seeds.", "seed_data": { "plant_name": "huckleberry", "fruit": "huckleberries", "byproducts": [ "withered" ], "grow": "91 days" } }, @@ -88,8 +81,7 @@ "id": "seed_mulberries", "copy-from": "seed_fruit", "type": "COMESTIBLE", - "name": "mulberry seeds", - "name_plural": "mulberry seeds", + "name": { "str": "mulberry seeds", "str_pl": "mulberry seeds" }, "description": "Some mulberry seeds.", "seed_data": { "plant_name": "mulberry", "fruit": "mulberries", "byproducts": [ "withered" ], "grow": "91 days" } }, @@ -97,8 +89,7 @@ "id": "seed_elderberries", "copy-from": "seed_fruit", "type": "COMESTIBLE", - "name": "elderberry seeds", - "name_plural": "elderberry seeds", + "name": { "str": "elderberry seeds", "str_pl": "elderberry seeds" }, "description": "Some elderberry seeds.", "seed_data": { "plant_name": "elderberry", "fruit": "elderberries", "byproducts": [ "withered" ], "grow": "91 days" } }, @@ -106,8 +97,7 @@ "id": "seed_raspberries", "copy-from": "seed_fruit", "type": "COMESTIBLE", - "name": "raspberry seeds", - "name_plural": "raspberry seeds", + "name": { "str": "raspberry seeds", "str_pl": "raspberry seeds" }, "description": "Some raspberry seeds.", "seed_data": { "plant_name": "raspberry", "fruit": "raspberries", "byproducts": [ "withered" ], "grow": "91 days" } }, @@ -115,8 +105,7 @@ "id": "seed_strawberries", "copy-from": "seed_fruit", "type": "COMESTIBLE", - "name": "strawberry seeds", - "name_plural": "strawberry seeds", + "name": { "str": "strawberry seeds", "str_pl": "strawberry seeds" }, "description": "Some strawberry seeds.", "seed_data": { "plant_name": "strawberry", "fruit": "strawberries", "byproducts": [ "withered" ], "grow": "91 days" } }, @@ -124,8 +113,7 @@ "id": "seed_grapes", "copy-from": "seed_fruit", "type": "COMESTIBLE", - "name": "grape seeds", - "name_plural": "grape seeds", + "name": { "str": "grape seeds", "str_pl": "grape seeds" }, "description": "Some grape seeds.", "seed_data": { "plant_name": "grape", "fruit": "grapes", "byproducts": [ "withered" ], "grow": "91 days" } }, @@ -133,8 +121,7 @@ "id": "seed_rose", "copy-from": "seed_fruit", "type": "COMESTIBLE", - "name": "rose seeds", - "name_plural": "rose seeds", + "name": { "str": "rose seeds", "str_pl": "rose seeds" }, "description": "Some rose seeds.", "seed_data": { "plant_name": "rose", "fruit": "rose_hips", "byproducts": [ "withered" ], "grow": "91 days" } }, @@ -142,8 +129,7 @@ "type": "COMESTIBLE", "id": "seed_tobacco", "copy-from": "seed", - "name": "tobacco seeds", - "name_plural": "tobacco seeds", + "name": { "str": "tobacco seeds", "str_pl": "tobacco seeds" }, "description": "Some tobacco seeds.", "seed_data": { "plant_name": "tobacco", "fruit": "tobacco_raw", "grow": "91 days" } }, @@ -152,8 +138,7 @@ "id": "seed_barley", "copy-from": "seed", "price": 160, - "name": "barley seeds", - "name_plural": "barley seeds", + "name": { "str": "barley seeds", "str_pl": "barley seeds" }, "description": "Some barley seeds.", "weight": "5 g", "charges": 2, @@ -165,8 +150,7 @@ "id": "seed_sugar_beet", "copy-from": "seed", "price": 120, - "name": "sugar beet seeds", - "name_plural": "sugar beet seeds", + "name": { "str": "sugar beet seeds", "str_pl": "sugar beet seeds" }, "description": "Some sugar beet seeds.", "volume": 0, "weight": "5 g", @@ -178,8 +162,7 @@ "id": "seed_lettuce", "copy-from": "seed", "price": 50, - "name": "lettuce seeds", - "name_plural": "lettuce seeds", + "name": { "str": "lettuce seeds", "str_pl": "lettuce seeds" }, "description": "Some lettuce seeds.", "seed_data": { "plant_name": "lettuce", "fruit": "lettuce", "byproducts": [ "withered" ], "grow": "85 days" } }, @@ -188,8 +171,7 @@ "id": "seed_cabbage", "copy-from": "seed", "price": 50, - "name": "cabbage seeds", - "name_plural": "cabbage seeds", + "name": { "str": "cabbage seeds", "str_pl": "cabbage seeds" }, "color": "light_gray", "description": "Some white cabbage seeds.", "seed_data": { "plant_name": "cabbage", "fruit": "cabbage", "byproducts": [ "withered" ], "grow": "85 days" } @@ -199,8 +181,7 @@ "id": "seed_tomato", "copy-from": "seed", "price": 50, - "name": "tomato seeds", - "name_plural": "tomato seeds", + "name": { "str": "tomato seeds", "str_pl": "tomato seeds" }, "description": "Some tomato seeds.", "seed_data": { "plant_name": "tomato", "fruit": "tomato", "byproducts": [ "withered" ], "grow": "65 days" } }, @@ -209,8 +190,7 @@ "id": "seed_cotton_boll", "copy-from": "seed", "price": 50, - "name": "cotton seeds", - "name_plural": "cotton seeds", + "name": { "str": "cotton seeds", "str_pl": "cotton seeds" }, "description": "Some cotton seeds. Can be processed to produce an edible oil.", "weight": "5 g", "charges": 8, @@ -222,8 +202,7 @@ "id": "seed_broccoli", "copy-from": "seed", "price": 50, - "name": "broccoli seeds", - "name_plural": "broccoli seeds", + "name": { "str": "broccoli seeds", "str_pl": "broccoli seeds" }, "description": "Some broccoli seeds.", "seed_data": { "plant_name": "broccoli", "fruit": "broccoli", "byproducts": [ "withered" ], "grow": "75 days" } }, @@ -232,8 +211,7 @@ "id": "seed_zucchini", "copy-from": "seed", "price": 50, - "name": "zucchini seeds", - "name_plural": "zucchini seeds", + "name": { "str": "zucchini seeds", "str_pl": "zucchini seeds" }, "description": "Some zucchini seeds.", "seed_data": { "plant_name": "zucchini", "fruit": "zucchini", "byproducts": [ "withered" ], "grow": "47 days" } }, @@ -242,8 +220,7 @@ "id": "seed_onion", "copy-from": "seed", "price": 50, - "name": "onion seeds", - "name_plural": "onion seeds", + "name": { "str": "onion seeds", "str_pl": "onion seeds" }, "description": "Some onion seeds.", "seed_data": { "plant_name": "onion", "fruit": "onion", "byproducts": [ "withered" ], "grow": "65 days" } }, @@ -252,8 +229,7 @@ "id": "seed_garlic", "copy-from": "seed", "price": 50, - "name": "garlic seeds", - "name_plural": "garlic seeds", + "name": { "str": "garlic seeds", "str_pl": "garlic seeds" }, "description": "Some garlic seeds.", "seed_data": { "plant_name": "garlic", "fruit": "garlic", "byproducts": [ "withered" ], "grow": "65 days" } }, @@ -261,8 +237,7 @@ "type": "COMESTIBLE", "id": "seed_cattail", "copy-from": "seed", - "name": "cattail seeds", - "name_plural": "cattail seeds", + "name": { "str": "cattail seeds", "str_pl": "cattail seeds" }, "color": "green", "description": "Some cattail seeds.", "seed_data": { "plant_name": "cattail", "fruit": "cattail_stalk", "byproducts": [ "cattail_rhizome" ], "grow": "91 days" } @@ -271,8 +246,7 @@ "type": "COMESTIBLE", "id": "seed_dahlia", "copy-from": "seed", - "name": "dahlia seeds", - "name_plural": "dahlia seeds", + "name": { "str": "dahlia seeds", "str_pl": "dahlia seeds" }, "color": "green", "description": "Some dahlia seeds.", "seed_data": { "plant_name": "dahlia", "fruit": "dahlia_root", "byproducts": [ "withered" ], "grow": "91 days" } @@ -281,8 +255,7 @@ "type": "COMESTIBLE", "id": "seed_salsify_raw", "copy-from": "seed", - "name": "salsify seeds", - "name_plural": "salsify seeds", + "name": { "str": "salsify seeds", "str_pl": "salsify seeds" }, "color": "green", "description": "Some salsify seeds.", "charges": 2, @@ -292,8 +265,7 @@ "type": "COMESTIBLE", "id": "seed_chicory", "copy-from": "seed", - "name": "chicory seeds", - "name_plural": "chicory seeds", + "name": { "str": "chicory seeds", "str_pl": "chicory seeds" }, "color": "green", "description": "Some chicory seeds.", "charges": 2, @@ -304,8 +276,7 @@ "id": "seed_wildcarrot", "copy-from": "seed", "price": 50, - "name": "wild root seeds", - "name_plural": "wild root seeds", + "name": { "str": "wild root seeds", "str_pl": "wild root seeds" }, "description": "Some seeds from a white flower.", "seed_data": { "plant_name": "wild root", "fruit": "carrot_wild", "byproducts": [ "withered" ], "grow": "65 days" } }, @@ -313,8 +284,7 @@ "type": "COMESTIBLE", "id": "seed_flower", "copy-from": "seed", - "name": "decorative plant seeds", - "name_plural": "decorative plant seeds", + "name": { "str": "decorative plant seeds", "str_pl": "decorative plant seeds" }, "color": "green", "description": "Some small decorative plant seeds, likely grass or flower. Don't expect them to be useful for anything other than dry plant material.", "seed_data": { "plant_name": "decorative plant", "fruit": "withered", "grow": "91 days" } @@ -323,8 +293,7 @@ "type": "COMESTIBLE", "id": "seed_cactus", "copy-from": "seed", - "name": "cactus seeds", - "name_plural": "cactus seeds", + "name": { "str": "cactus seeds", "str_pl": "cactus seeds" }, "color": "green", "description": "Some cactus seeds.", "seed_data": { "plant_name": "cactus", "fruit": "cactus_pad", "grow": "91 days" } @@ -332,8 +301,7 @@ { "type": "COMESTIBLE", "id": "garlic_clove", - "name": "garlic clove", - "name_plural": "garlic cloves", + "name": { "str": "garlic clove", "str_pl": "garlic cloves" }, "weight": "3 g", "color": "white", "spoils_in": "360 days", @@ -356,8 +324,7 @@ "id": "seed_carrot", "copy-from": "seed", "price": 50, - "name": "carrot seeds", - "name_plural": "carrot seeds", + "name": { "str": "carrot seeds", "str_pl": "carrot seeds" }, "description": "Some carrot seeds.", "seed_data": { "plant_name": "carrot", "fruit": "carrot", "byproducts": [ "withered" ], "grow": "65 days" } }, @@ -366,8 +333,7 @@ "id": "seed_corn", "copy-from": "seed", "price": 50, - "name": "corn seeds", - "name_plural": "corn seeds", + "name": { "str": "corn seeds", "str_pl": "corn seeds" }, "description": "Some corn seeds.", "seed_data": { "plant_name": "corn", "fruit": "corn", "byproducts": [ "withered" ], "grow": "80 days" } }, @@ -376,8 +342,7 @@ "id": "seed_chili_pepper", "copy-from": "seed", "price": 50, - "name": "chili pepper seeds", - "name_plural": "chili pepper seeds", + "name": { "str": "chili pepper seeds", "str_pl": "chili pepper seeds" }, "color": "white", "description": "Some chili pepper seeds.", "seed_data": { "plant_name": "chili pepper", "fruit": "chili_pepper", "byproducts": [ "withered" ], "grow": "65 days" } @@ -387,8 +352,7 @@ "id": "seed_cucumber", "copy-from": "seed", "price": 50, - "name": "cucumber seeds", - "name_plural": "cucumber seeds", + "name": { "str": "cucumber seeds", "str_pl": "cucumber seeds" }, "description": "Some cucumber seeds.", "seed_data": { "plant_name": "cucumber", "fruit": "cucumber", "byproducts": [ "withered" ], "grow": "60 days" } }, @@ -397,8 +361,7 @@ "id": "seed_potato_raw", "copy-from": "seed", "price": 50, - "name": "seed potato", - "name_plural": "seed potatoes", + "name": { "str": "seed potato", "str_pl": "seed potatoes" }, "description": "A raw potato, cut into pieces, separating each bud for planting.", "weight": "20 g", "stack_size": 10, @@ -408,8 +371,7 @@ "type": "COMESTIBLE", "id": "seed_weed", "copy-from": "seed", - "name": "cannabis seeds", - "name_plural": "cannabis seeds", + "name": { "str": "cannabis seeds", "str_pl": "cannabis seeds" }, "color": "green", "use_action": "SEED", "quench": -1, @@ -427,8 +389,7 @@ "id": "fungal_seeds", "copy-from": "seed", "price": 100, - "name": "fungal seeds", - "name_plural": "fungal seeds", + "name": { "str": "fungal seeds", "str_pl": "fungal seeds" }, "color": "dark_gray", "description": "Some fungal seeds.", "ammo_type": "NULL", @@ -439,8 +400,7 @@ "type": "COMESTIBLE", "id": "marloss_seed", "category": "seeds", - "name": "marloss seed", - "name_plural": "marloss seeds", + "name": { "str": "marloss seed", "str_pl": "marloss seeds" }, "weight": "177 g", "color": "cyan", "addiction_type": "marloss_b", @@ -464,8 +424,7 @@ "type": "COMESTIBLE", "id": "seed_beans", "copy-from": "seed", - "name": "bean seeds", - "name_plural": "bean seeds", + "name": { "str": "bean seeds", "str_pl": "bean seeds" }, "weight": "194 g", "symbol": "%", "description": "Raw, uncooked beans, ready for planting.", @@ -477,8 +436,7 @@ "type": "COMESTIBLE", "id": "soybean_seed", "copy-from": "seed", - "name": "soybean seeds", - "name_plural": "soybean seeds", + "name": { "str": "soybean seeds", "str_pl": "soybean seeds" }, "weight": "160 g", "symbol": ".", "color": "yellow", @@ -490,8 +448,7 @@ "type": "COMESTIBLE", "id": "seed_lentils", "copy-from": "seed", - "name": "raw lentils", - "name_plural": "raw lentils", + "name": { "str": "raw lentils", "str_pl": "raw lentils" }, "weight": "194 g", "symbol": "%", "description": "Raw, uncooked lentils, ready for planting.", @@ -504,8 +461,7 @@ "id": "seed_thyme", "copy-from": "seed", "price": 120, - "name": "thyme seeds", - "name_plural": "thyme seeds", + "name": { "str": "thyme seeds", "str_pl": "thyme seeds" }, "color": "green", "description": "Some thyme seeds.", "charges": 2, @@ -515,8 +471,7 @@ "type": "COMESTIBLE", "id": "seed_canola", "copy-from": "seed", - "name": "canola seeds", - "name_plural": "canola seeds", + "name": { "str": "canola seeds", "str_pl": "canola seeds" }, "color": "green", "description": "Some canola seeds. You could press them into oil.", "charges": 2, @@ -526,8 +481,7 @@ "type": "COMESTIBLE", "id": "seed_pumpkin", "copy-from": "seed", - "name": "pumpkin seeds", - "name_plural": "pumpkin seeds", + "name": { "str": "pumpkin seeds", "str_pl": "pumpkin seeds" }, "weight": "2 g", "color": "green", "use_action": "SEED", @@ -541,8 +495,7 @@ "type": "COMESTIBLE", "id": "seed_sunflower", "copy-from": "seed", - "name": "sunflower seeds", - "name_plural": "sunflower seeds", + "name": { "str": "sunflower seeds", "str_pl": "sunflower seeds" }, "weight": "2 g", "color": "green", "use_action": "SEED", @@ -556,8 +509,7 @@ "type": "COMESTIBLE", "id": "seed_dogbane", "copy-from": "seed", - "name": "dogbane seeds", - "name_plural": "dogbane seeds", + "name": { "str": "dogbane seeds", "str_pl": "dogbane seeds" }, "color": "green", "description": "Some dogbane seeds.", "charges": 2, @@ -567,8 +519,7 @@ "type": "COMESTIBLE", "id": "seed_bee_balm", "copy-from": "seed", - "name": "bee balm seeds", - "name_plural": "bee balm seeds", + "name": { "str": "bee balm seeds", "str_pl": "bee balm seeds" }, "color": "green", "description": "Some bee balm seeds.", "charges": 2, @@ -578,8 +529,7 @@ "type": "COMESTIBLE", "id": "seed_mugwort", "copy-from": "seed", - "name": "mugwort seeds", - "name_plural": "mugwort seeds", + "name": { "str": "mugwort seeds", "str_pl": "mugwort seeds" }, "color": "green", "description": "Some mugwort seeds.", "charges": 2, @@ -589,8 +539,7 @@ "type": "COMESTIBLE", "id": "seed_buckwheat", "copy-from": "seed", - "name": "buckwheat seeds", - "name_plural": "buckwheat seeds", + "name": { "str": "buckwheat seeds", "str_pl": "buckwheat seeds" }, "color": "green", "description": "Some buckwheat seeds.", "charges": 2, @@ -600,8 +549,7 @@ "type": "COMESTIBLE", "id": "seed_wild_herbs", "copy-from": "seed", - "name": "wild herb seeds", - "name_plural": "wild herb seeds", + "name": { "str": "wild herb seeds", "str_pl": "wild herb seeds" }, "color": "green", "description": "Some seeds harvested from wild herbs.", "charges": 2, @@ -611,8 +559,7 @@ "type": "COMESTIBLE", "id": "seed_veggy_wild", "copy-from": "seed", - "name": "wild vegetable stems", - "name_plural": "wild vegetable stems", + "name": { "str": "wild vegetable stems", "str_pl": "wild vegetable stems" }, "color": "green", "description": "Some wild vegetable stems.", "charges": 2, @@ -622,8 +569,7 @@ "type": "COMESTIBLE", "id": "seed_raw_dandelion", "copy-from": "seed", - "name": "dandelion seeds", - "name_plural": "dandelion seeds", + "name": { "str": "dandelion seeds", "str_pl": "dandelion seeds" }, "color": "green", "description": "Some dandelion seeds.", "charges": 2, @@ -633,8 +579,7 @@ "type": "COMESTIBLE", "id": "seed_rhubarb", "copy-from": "seed", - "name": "rhubarb stems", - "name_plural": "rhubarb stems", + "name": { "str": "rhubarb stems", "str_pl": "rhubarb stems" }, "color": "green", "description": "Some rhubarb stems.", "charges": 2, @@ -644,16 +589,14 @@ "type": "COMESTIBLE", "id": "seed_mushroom", "copy-from": "seed_mushroom_base", - "name": "mushroom spores", - "name_plural": "mushroom spores", + "name": { "str": "mushroom spores", "str_pl": "mushroom spores" }, "seed_data": { "plant_name": "mushroom", "fruit": "mushroom", "grow": "91 days" } }, { "type": "COMESTIBLE", "id": "seed_mushroom_morel", "copy-from": "seed_mushroom_base", - "name": "morel mushroom spores", - "name_plural": "morel mushroom spores", + "name": { "str": "morel mushroom spores", "str_pl": "morel mushroom spores" }, "description": "Some morel mushroom spores.", "seed_data": { "plant_name": "morel mushroom", "fruit": "mushroom_morel", "grow": "91 days" } }, @@ -662,8 +605,7 @@ "type": "COMESTIBLE", "copy-from": "seed", "comestible_type": "MED", - "name": "datura seeds", - "name_plural": "datura seeds", + "name": { "str": "datura seeds", "str_pl": "datura seeds" }, "description": "Small, dark seeds from the spiny pods of a datura plant. Full of powerful psychoactive chemicals, these tiny seeds are a potent analgesic and deliriant, and can be deadly in cases of overdose.", "weight": "2 g", "price": 0, @@ -678,8 +620,7 @@ "id": "seed_celery", "copy-from": "seed", "price": 50, - "name": "celery seeds", - "name_plural": "celery seeds", + "name": { "str": "celery seeds", "str_pl": "celery seeds" }, "description": "Some celery seeds.", "seed_data": { "plant_name": "celery", "fruit": "celery", "byproducts": [ "withered" ], "grow": "130 days" } }, @@ -688,8 +629,7 @@ "id": "seed_oats", "copy-from": "seed", "price": 50, - "name": "oat seeds", - "name_plural": "oat seeds", + "name": { "str": "oat seeds", "str_pl": "oat seeds" }, "description": "Some oat seeds.", "material": "wheat", "primary_material": "dried_vegetable", @@ -701,8 +641,7 @@ "id": "seed_wheat", "copy-from": "seed", "type": "COMESTIBLE", - "name": "wheat seeds", - "name_plural": "wheat seeds", + "name": { "str": "wheat seeds", "str_pl": "wheat seeds" }, "description": "Some wheat seeds.", "weight": "5 g", "price": 50, @@ -714,8 +653,7 @@ { "type": "COMESTIBLE", "id": "fried_seeds", - "name": "fried seeds", - "name_plural": "fried seeds", + "name": { "str": "fried seeds", "str_pl": "fried seeds" }, "weight": "32 g", "color": "yellow", "container": "bag_plastic", @@ -735,8 +673,7 @@ { "type": "COMESTIBLE", "id": "coffee_pod", - "name": "Kentucky coffee pod", - "name_plural": "Kentucky coffee pods", + "name": { "str": "Kentucky coffee pod", "str_pl": "Kentucky coffee pods" }, "category": "other", "weight": "26 g", "color": "light_green", @@ -765,8 +702,7 @@ "price": 50, "material": "veggy", "primary_material": "dried_vegetable", - "name": "coffee beans", - "name_plural": "coffee beans", + "name": { "str": "coffee beans", "str_pl": "coffee beans" }, "symbol": ".", "color": "brown", "description": "Some coffee beans, can be roasted.", @@ -786,8 +722,7 @@ "copy-from": "coffee_bean", "category": "other", "container": "bag_plastic", - "name": "roasted coffee beans", - "name_plural": "roasted coffee beans", + "name": { "str": "roasted coffee beans", "str_pl": "roasted coffee beans" }, "description": "Some roasted coffee beans, can be ground into powder.", "addiction_type": "caffeine", "flags": [ "EDIBLE_FROZEN" ] @@ -797,8 +732,7 @@ "id": "seed_chamomile", "copy-from": "seed", "looks_like": "seed_raw_dandelion", - "name": "chamomile seeds", - "name_plural": "chamomile seeds", + "name": { "str": "chamomile seeds", "str_pl": "chamomile seeds" }, "description": "Some chamomile seeds.", "seed_data": { "plant_name": "chamomile", "fruit": "chamomile", "byproducts": [ "withered" ], "grow": "91 days" } } diff --git a/data/json/items/comestibles/soup.json b/data/json/items/comestibles/soup.json index 158b11d59fbec..57cdf4e3bb44d 100644 --- a/data/json/items/comestibles/soup.json +++ b/data/json/items/comestibles/soup.json @@ -121,8 +121,7 @@ { "type": "COMESTIBLE", "id": "curry_veggy", - "name": "curry", - "name_plural": "curries", + "name": { "str": "curry", "str_pl": "curries" }, "weight": "263 g", "color": "red", "spoils_in": "5 days", @@ -145,8 +144,7 @@ { "type": "COMESTIBLE", "id": "curry_meat", - "name": "curry with meat", - "name_plural": "curries with meat", + "name": { "str": "curry with meat", "str_pl": "curries with meat" }, "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str": "creature curry", "str_pl": "creature curries" } } ], "weight": "289 g", "color": "red", @@ -263,8 +261,7 @@ { "type": "COMESTIBLE", "id": "soup_dumplings", - "name": "chicken and dumplings", - "name_plural": "chicken and dumplings", + "name": { "str": "chicken and dumplings", "str_pl": "chicken and dumplings" }, "weight": "263 g", "color": "light_gray", "spoils_in": "6 days 16 hours", diff --git a/data/json/items/comestibles/spice.json b/data/json/items/comestibles/spice.json index bf2d3478413d3..8b78c101632da 100644 --- a/data/json/items/comestibles/spice.json +++ b/data/json/items/comestibles/spice.json @@ -3,8 +3,7 @@ "id": "chilly-p", "copy-from": "spice", "type": "COMESTIBLE", - "name": "chili powder", - "name_plural": "chili powder", + "name": { "str": "chili powder", "str_pl": "chili powder" }, "description": "Chilly P, Yo! Not edible on its own, but it could be used to make seasoning.", "color": "red" }, @@ -12,8 +11,7 @@ "id": "cinnamon", "copy-from": "spice", "type": "COMESTIBLE", - "name": "cinnamon", - "name_plural": "cinnamon", + "name": { "str": "cinnamon", "str_pl": "cinnamon" }, "description": "Ground cinnamon bark with a sweet but slightly spicy aroma.", "color": "brown" }, @@ -21,8 +19,7 @@ "id": "curry_powder", "copy-from": "spice", "type": "COMESTIBLE", - "name": "curry powder", - "name_plural": "curry powder", + "name": { "str": "curry powder", "str_pl": "curry powder" }, "description": "A blend of spices meant to be used in some South Asian dishes. Can't be eaten raw, why would you even try that?", "color": "red" }, @@ -30,8 +27,7 @@ "id": "pepper", "copy-from": "spice", "type": "COMESTIBLE", - "name": "black pepper", - "name_plural": "black pepper", + "name": { "str": "black pepper", "str_pl": "black pepper" }, "description": "Ground black spice berries with a pungent aroma.", "color": "dark_gray" }, @@ -39,8 +35,7 @@ "id": "salt", "copy-from": "spice", "type": "COMESTIBLE", - "name": "salt", - "name_plural": "salt", + "name": { "str": "salt", "str_pl": "salt" }, "description": "Yuck! You surely wouldn't want to eat this. It's good for preserving meat and cooking, though.", "color": "white" }, @@ -48,8 +43,7 @@ "id": "seasoning_italian", "copy-from": "spice", "type": "COMESTIBLE", - "name": "Italian seasoning", - "name_plural": "Italian seasoning", + "name": { "str": "Italian seasoning", "str_pl": "Italian seasoning" }, "description": "A fragrant mix of dried oregano, basil, thyme and other spices.", "color": "green" }, @@ -57,16 +51,14 @@ "id": "seasoning_salt", "copy-from": "salt", "type": "COMESTIBLE", - "name": "seasoned salt", - "name_plural": "seasoned salt", + "name": { "str": "seasoned salt", "str_pl": "seasoned salt" }, "description": "Salt mixed with a fragrant blend of secret herbs and spices.", "color": "brown" }, { "type": "COMESTIBLE", "id": "sugar", - "name": "sugar", - "name_plural": "sugar", + "name": { "str": "sugar", "str_pl": "sugar" }, "weight": "5 g", "color": "white", "container": "box_small", @@ -85,8 +77,7 @@ { "type": "COMESTIBLE", "id": "sprinkles", - "name": "sprinkles", - "name_plural": "sprinkles", + "name": { "str": "sprinkles", "str_pl": "sprinkles" }, "weight": "4 g", "copy-from": "sugar", "container": "bottle_plastic_small", @@ -98,8 +89,7 @@ { "type": "COMESTIBLE", "id": "wild_herbs", - "name": "wild herbs", - "name_plural": "wild herbs", + "name": { "str": "wild herbs", "str_pl": "wild herbs" }, "weight": "7 g", "color": "green", "comestible_type": "FOOD", @@ -120,8 +110,7 @@ "type": "COMESTIBLE", "symbol": "~", "color": "brown", - "name": "soy sauce", - "name_plural": "soy sauce", + "name": { "str": "soy sauce", "str_pl": "soy sauce" }, "description": "Salty fermented soybean sauce.", "price": 190, "weight": "24 g", diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json index 1f67351f049f9..b1e9bfae00b3c 100644 --- a/data/json/items/comestibles/veggy_dishes.json +++ b/data/json/items/comestibles/veggy_dishes.json @@ -2,8 +2,7 @@ { "type": "COMESTIBLE", "id": "cooked_cattail_stalk", - "name": "cooked cattail stalk", - "name_plural": "cooked cattail stalks", + "name": { "str": "cooked cattail stalk", "str_pl": "cooked cattail stalks" }, "copy-from": "cattail_stalk", "color": "white", "spoils_in": "2 days 12 hours", @@ -15,8 +14,7 @@ { "type": "COMESTIBLE", "id": "starch", - "name": "starch", - "name_plural": "starch", + "name": { "str": "starch", "str_pl": "starch" }, "weight": "180 g", "color": "light_gray", "spoils_in": "1 day 6 hours", @@ -35,8 +33,7 @@ { "type": "COMESTIBLE", "id": "dandelion_cooked", - "name": "cooked dandelion greens", - "name_plural": "cooked dandelion greens", + "name": { "str": "cooked dandelion greens", "str_pl": "cooked dandelion greens" }, "copy-from": "raw_dandelion", "spoils_in": "2 days", "healthy": 2, @@ -48,8 +45,7 @@ { "type": "COMESTIBLE", "id": "dandelion_fried", - "name": "fried dandelions", - "name_plural": "fried dandelions", + "name": { "str": "fried dandelions", "str_pl": "fried dandelions" }, "copy-from": "raw_dandelion", "color": "yellow", "spoils_in": "3 days", @@ -71,8 +67,7 @@ { "type": "COMESTIBLE", "id": "veggy_wild_cooked", - "name": "cooked wild vegetables", - "name_plural": "cooked wild vegetables", + "name": { "str": "cooked wild vegetables", "str_pl": "cooked wild vegetables" }, "copy-from": "veggy", "spoils_in": "2 days 2 hours", "description": "Cooked wild edible plants. An interesting mix of flavors.", @@ -100,8 +95,7 @@ { "type": "COMESTIBLE", "id": "buckwheat_cooked", - "name": "cooked buckwheat", - "name_plural": "cooked buckwheat", + "name": { "str": "cooked buckwheat", "str_pl": "cooked buckwheat" }, "copy-from": "buckwheat", "spoils_in": "20 days", "healthy": 2, @@ -112,8 +106,7 @@ { "type": "COMESTIBLE", "id": "can_corn", - "name": "corn", - "name_plural": "corn", + "name": { "str": "corn", "str_pl": "corn" }, "comestible_type": "FOOD", "weight": "178 g", "color": "yellow", @@ -154,8 +147,7 @@ { "type": "COMESTIBLE", "id": "deluxe_veggy_beans", - "name": "vegetarian baked beans", - "name_plural": "vegetarian baked beans", + "name": { "str": "vegetarian baked beans", "str_pl": "vegetarian baked beans" }, "weight": "270 g", "color": "brown", "spoils_in": "15 days", @@ -175,8 +167,7 @@ { "type": "COMESTIBLE", "id": "dry_rice", - "name": "dried rice", - "name_plural": "dried rice", + "name": { "str": "dried rice", "str_pl": "dried rice" }, "weight": "40 g", "color": "white", "spoils_in": "360 days", @@ -199,8 +190,7 @@ { "type": "COMESTIBLE", "id": "rice_cooked", - "name": "cooked rice", - "name_plural": "cooked rice", + "name": { "str": "cooked rice", "str_pl": "cooked rice" }, "copy-from": "dry_rice", "weight": "62 g", "color": "light_gray", @@ -218,8 +208,7 @@ { "type": "COMESTIBLE", "id": "deluxe_veggy_rice", - "name": "fried rice", - "name_plural": "fried rice", + "name": { "str": "fried rice", "str_pl": "fried rice" }, "weight": "135 g", "color": "yellow", "spoils_in": "15 days", @@ -238,8 +227,7 @@ { "type": "COMESTIBLE", "id": "beansnrice", - "name": "beans and rice", - "name_plural": "beans and rice", + "name": { "str": "beans and rice", "str_pl": "beans and rice" }, "weight": "70 g", "color": "light_gray", "spoils_in": "10 days", @@ -258,8 +246,7 @@ { "type": "COMESTIBLE", "id": "tofu_rice", - "name": "tofu fried rice", - "name_plural": "tofu fried rice", + "name": { "str": "tofu fried rice", "str_pl": "tofu fried rice" }, "weight": "135 g", "color": "yellow", "spoils_in": "15 days", @@ -278,8 +265,7 @@ { "type": "COMESTIBLE", "id": "tofu_stirfry", - "name": "tofu stirfry", - "name_plural": "tofu stirfry", + "name": { "str": "tofu stirfry", "str_pl": "tofu stirfry" }, "weight": "135 g", "color": "yellow", "spoils_in": "4 days", @@ -299,8 +285,7 @@ { "type": "COMESTIBLE", "id": "deluxe_veggy_beansnrice", - "name": "deluxe vegetarian beans and rice", - "name_plural": "deluxe vegetarian beans and rice", + "name": { "str": "deluxe vegetarian beans and rice", "str_pl": "deluxe vegetarian beans and rice" }, "weight": "140 g", "color": "brown", "spoils_in": "15 days", @@ -320,8 +305,7 @@ { "type": "COMESTIBLE", "id": "potato_baked", - "name": "baked potato", - "name_plural": "baked potatoes", + "name": { "str": "baked potato", "str_pl": "baked potatoes" }, "weight": "170 g", "color": "brown", "spoils_in": "2 days", @@ -419,8 +403,7 @@ { "type": "COMESTIBLE", "id": "veggy_canned", - "name": "canned veggy", - "name_plural": "canned veggies", + "name": { "str": "canned veggy", "str_pl": "canned veggies" }, "weight": "259 g", "color": "green", "spoils_in": "2 days 12 hours", @@ -457,8 +440,7 @@ { "type": "COMESTIBLE", "id": "spaghetti_pesto", - "name": "spaghetti al pesto", - "name_plural": "spaghetti al pesto", + "name": { "str": "spaghetti al pesto", "str_pl": "spaghetti al pesto" }, "weight": "80 g", "color": "green", "spoils_in": "2 days", @@ -492,8 +474,7 @@ { "type": "COMESTIBLE", "id": "sauerkraut_onions", - "name": "sauerkraut w/ sautee'd onions", - "name_plural": "sauerkraut w/ sautee'd onions", + "name": { "str": "sauerkraut w/ sautee'd onions", "str_pl": "sauerkraut w/ sautee'd onions" }, "weight": "424 g", "color": "light_gray", "spoils_in": "5 days", @@ -514,8 +495,7 @@ { "type": "COMESTIBLE", "id": "veggy_pickled", - "name": "pickled veggy", - "name_plural": "pickled veggies", + "name": { "str": "pickled veggy", "str_pl": "pickled veggies" }, "copy-from": "veggy", "color": "light_green", "spoils_in": "30 days", @@ -629,8 +609,7 @@ { "type": "COMESTIBLE", "id": "sushi_rice", - "name": "sushi rice", - "name_plural": "sushi rice", + "name": { "str": "sushi rice", "str_pl": "sushi rice" }, "weight": "55 g", "color": "white", "spoils_in": "3 days", @@ -650,8 +629,7 @@ { "type": "COMESTIBLE", "id": "onigiri", - "name": "onigiri", - "name_plural": "onigiri", + "name": { "str": "onigiri", "str_pl": "onigiri" }, "weight": "99 g", "color": "white", "spoils_in": "1 day 12 hours", @@ -671,8 +649,7 @@ { "type": "COMESTIBLE", "id": "sushi_veggyroll", - "name": "vegetable hosomaki", - "name_plural": "vegetable hosomaki", + "name": { "str": "vegetable hosomaki", "str_pl": "vegetable hosomaki" }, "weight": "312 g", "color": "green", "spoils_in": "1 day 12 hours", @@ -703,8 +680,7 @@ { "type": "COMESTIBLE", "id": "sauerkraut", - "name": "sauerkraut", - "name_plural": "sauerkraut", + "name": { "str": "sauerkraut", "str_pl": "sauerkraut" }, "weight": "255 g", "color": "green", "spoils_in": "30 days", @@ -742,8 +718,7 @@ { "type": "COMESTIBLE", "id": "fiddlehead_boiled", - "name": "boiled fiddleheads", - "name_plural": "boiled fiddleheads", + "name": { "str": "boiled fiddleheads", "str_pl": "boiled fiddleheads" }, "weight": "50 g", "flags": [ "FREEZERBURN", "EATEN_HOT" ], "color": "light_green", @@ -763,8 +738,7 @@ { "type": "COMESTIBLE", "id": "fiddlehead_sauteed", - "name": "sauteed fiddleheads", - "name_plural": "sauteed fiddleheads", + "name": { "str": "sauteed fiddleheads", "str_pl": "sauteed fiddleheads" }, "weight": "100 g", "flags": [ "FREEZERBURN", "EATEN_HOT" ], "color": "light_green", diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json index be234030715c1..48e9204a55e54 100644 --- a/data/json/items/comestibles/wheat.json +++ b/data/json/items/comestibles/wheat.json @@ -24,8 +24,7 @@ { "type": "COMESTIBLE", "id": "wheat", - "name": "wheat", - "name_plural": "wheat", + "name": { "str": "wheat", "str_pl": "wheat" }, "weight": "203 g", "color": "brown", "comestible_type": "FOOD", @@ -44,8 +43,7 @@ { "type": "COMESTIBLE", "id": "spaghetti_raw", - "name": "raw spaghetti pasta", - "name_plural": "raw spaghetti pasta", + "name": { "str": "raw spaghetti pasta", "str_pl": "raw spaghetti pasta" }, "weight": "60 g", "color": "yellow", "spoils_in": "360 days", @@ -64,8 +62,7 @@ { "type": "COMESTIBLE", "id": "lasagne_raw", - "name": "raw lasagne pasta", - "name_plural": "raw lasagne pasta", + "name": { "str": "raw lasagne pasta", "str_pl": "raw lasagne pasta" }, "spoils_in": "360 days", "weight": "60 g", "color": "yellow", @@ -84,8 +81,7 @@ { "type": "COMESTIBLE", "id": "spaghetti_cooked", - "name": "boiled noodles", - "name_plural": "boiled noodles", + "name": { "str": "boiled noodles", "str_pl": "boiled noodles" }, "weight": "148 g", "color": "yellow", "spoils_in": "20 hours", @@ -104,8 +100,7 @@ { "type": "COMESTIBLE", "id": "macaroni_raw", - "name": "raw macaroni", - "name_plural": "raw macaroni", + "name": { "str": "raw macaroni", "str_pl": "raw macaroni" }, "weight": "60 g", "color": "yellow", "spoils_in": "360 days", @@ -124,8 +119,7 @@ { "type": "COMESTIBLE", "id": "macaroni_cooked", - "name": "mac & cheese", - "name_plural": "mac & cheese", + "name": { "str": "mac & cheese", "str_pl": "mac & cheese" }, "weight": "209 g", "color": "yellow", "spoils_in": "10 hours", @@ -145,8 +139,7 @@ { "type": "COMESTIBLE", "id": "flour", - "name": "flour", - "name_plural": "flour", + "name": { "str": "flour", "str_pl": "flour" }, "weight": "13 g", "color": "white", "spoils_in": "360 days", @@ -188,8 +181,7 @@ { "type": "COMESTIBLE", "id": "oats", - "name": "oats", - "name_plural": "oats", + "name": { "str": "oats", "str_pl": "oats" }, "weight": "86 g", "color": "brown", "comestible_type": "FOOD", @@ -247,8 +239,7 @@ { "type": "COMESTIBLE", "id": "pancakes", - "name": "pancake", - "name_plural": "pancakes", + "name": { "str": "pancake", "str_pl": "pancakes" }, "weight": "40 g", "color": "brown", "spoils_in": "10 days", @@ -270,8 +261,7 @@ "type": "COMESTIBLE", "id": "fruit_pancakes", "copy-from": "pancakes", - "name": "fruit pancake", - "name_plural": "fruit pancakes", + "name": { "str": "fruit pancake", "str_pl": "fruit pancakes" }, "weight": "80 g", "color": "brown", "calories": 113, @@ -283,8 +273,7 @@ { "type": "COMESTIBLE", "id": "frenchtoast", - "name": "French toast", - "name_plural": "French toasts", + "name": { "str": "French toast", "str_pl": "French toasts" }, "weight": "42 g", "color": "brown", "spoils_in": "10 days", @@ -455,8 +444,7 @@ { "type": "COMESTIBLE", "id": "noodles_fast", - "name": "fast noodles", - "name_plural": "fast noodles", + "name": { "str": "fast noodles", "str_pl": "fast noodles" }, "weight": "81 g", "color": "yellow", "spoils_in": "360 days", diff --git a/data/json/items/containers.json b/data/json/items/containers.json index 45c7e36feed1b..f80a17bc4fc3a 100644 --- a/data/json/items/containers.json +++ b/data/json/items/containers.json @@ -42,8 +42,7 @@ "id": "30gal_drum", "type": "CONTAINER", "category": "container", - "name": "steel drum (100L)", - "name_plural": "steel drums (100L)", + "name": { "str": "steel drum (100L)", "str_pl": "steel drums (100L)" }, "description": "A huge steel barrel with a resealable lid.", "weight": "12000 g", "volume": "100 L", @@ -62,8 +61,7 @@ "id": "55gal_drum", "type": "CONTAINER", "category": "container", - "name": "steel drum (200L)", - "name_plural": "steel drums (200L)", + "name": { "str": "steel drum (200L)", "str_pl": "steel drums (200L)" }, "description": "A massive steel barrel with a resealable lid.", "weight": "20000 g", "volume": "200 L", @@ -257,8 +255,7 @@ "id": "box_cigarette", "type": "CONTAINER", "category": "container", - "name": "pack", - "name_plural": "packs", + "name": { "str": "pack", "str_pl": "packs" }, "description": "SURGEON GENERAL'S WARNING: Smoking Causes Lung Cancer, Heart Disease, Emphysema And May Complicate Pregnancy.", "weight": "15 g", "volume": "250 ml", @@ -272,8 +269,7 @@ "id": "box_small", "type": "CONTAINER", "category": "container", - "name": "small cardboard box", - "name_plural": "small cardboard boxes", + "name": { "str": "small cardboard box", "str_pl": "small cardboard boxes" }, "description": "A small cardboard box. No bigger than a foot in dimension.", "weight": "151 g", "volume": "1 L", @@ -287,8 +283,7 @@ "id": "box_medium", "type": "CONTAINER", "category": "container", - "name": "cardboard box", - "name_plural": "cardboard boxes", + "name": { "str": "cardboard box", "str_pl": "cardboard boxes" }, "description": "A sturdy cardboard box, about the size of a banana box. Great for packing.", "weight": "850 g", "volume": "2 L", @@ -303,8 +298,7 @@ "id": "box_large", "type": "CONTAINER", "category": "container", - "name": "large cardboard box", - "name_plural": "large cardboard boxes", + "name": { "str": "large cardboard box", "str_pl": "large cardboard boxes" }, "description": "A very large cardboard box, the sort children would have loved to hide in, when there were still children.", "weight": "1250 g", "volume": "3 L", @@ -320,8 +314,7 @@ "id": "bucket", "type": "CONTAINER", "category": "container", - "name": "bucket", - "name_plural": "buckets", + "name": { "str": "bucket", "str_pl": "buckets" }, "description": "A galvanized bucket for peanuts, chilled wine, iced beer, lobster, crab legs, French fries, animal feed, farm use, tailgating, crafts, planting flowers, holding gift baskets, containing a fruit basket and herbs, loose item storage or as an ice bucket.", "weight": "725 g", "volume": "5 L", @@ -511,8 +504,7 @@ "id": "thermos", "type": "CONTAINER", "category": "container", - "name": "thermos", - "name_plural": "thermoses", + "name": { "str": "thermos", "str_pl": "thermoses" }, "description": "A Thermos brand vacuum flask. Built for temperature retention, helps keep things hot or cold. Contains 1L of liquid.", "weight": "530 g", "price": 1595, @@ -915,8 +907,7 @@ "id": "metal_tank", "type": "CONTAINER", "category": "container", - "name": "metal tank (60L)", - "name_plural": "metal tanks (60L)", + "name": { "str": "metal tank (60L)", "str_pl": "metal tanks (60L)" }, "description": "A large metal tank for holding liquids. Useful for crafting.", "weight": "5668 g", "volume": "60L", @@ -935,8 +926,7 @@ "id": "metal_tank_little", "type": "CONTAINER", "category": "container", - "name": "metal tank (2L)", - "name_plural": "metal tanks (2L)", + "name": { "str": "metal tank (2L)", "str_pl": "metal tanks (2L)" }, "description": "A small metal tank for gas or liquids. Useful for crafting.", "weight": "800 g", "volume": "2L", diff --git a/data/json/items/fake.json b/data/json/items/fake.json index 129c3a737ca04..4a274f6173083 100644 --- a/data/json/items/fake.json +++ b/data/json/items/fake.json @@ -50,8 +50,7 @@ "id": "fake_goggles", "copy-from": "fake_item", "type": "TOOL", - "name": "bionic goggles", - "name_plural": "bionic goggles", + "name": { "str": "bionic goggles", "str_pl": "bionic goggles" }, "qualities": [ [ "GLARE", 2 ] ] }, { @@ -132,8 +131,7 @@ "id": "fake_milling_item", "copy-from": "fake_item", "type": "GENERIC", - "name": "semi ground grains", - "name_plural": "semi ground grains", + "name": { "str": "semi ground grains", "str_pl": "semi ground grains" }, "description": "A paste of half-finished milled grains, not yet flour.", "flags": [ "TRADER_AVOID", "FAKE_MILL" ] }, @@ -141,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/fluff.json b/data/json/items/fluff.json index 8ab793fe26a5f..0b8a523de31dc 100644 --- a/data/json/items/fluff.json +++ b/data/json/items/fluff.json @@ -3,8 +3,7 @@ "id": "magic_8_ball", "type": "GENERIC", "category": "other", - "name": "Magic 8-Ball", - "name_plural": "Magic 8-Balls", + "name": { "str": "Magic 8-Ball", "str_pl": "Magic 8-Balls" }, "description": "A fortune-telling device from the 1950s. The kind of moral support you didn't know you needed.", "weight": "40 g", "volume": "250 ml", @@ -33,8 +32,7 @@ "id": "coin_quarter", "type": "GENERIC", "category": "other", - "name": "coin", - "name_plural": "coins", + "name": { "str": "coin", "str_pl": "coins" }, "description": "A now-ancient form of currency. Stripped of its original purpose, it now serves, faithfully, flippant Flippists for free.", "weight": "6 g", "volume": 0, diff --git a/data/json/items/fuel.json b/data/json/items/fuel.json index 83269a7369a35..12c10dd1f0dcd 100644 --- a/data/json/items/fuel.json +++ b/data/json/items/fuel.json @@ -2,8 +2,7 @@ { "id": "chem_ethanol", "type": "AMMO", - "name": "ethanol", - "name_plural": "ethanol", + "name": { "str": "ethanol", "str_pl": "ethanol" }, "description": "Extremely pure alcohol suitable for use as a component in chemical reactions. You could also water it down and drink it, or use it as fuel in alcohol-burning stoves.", "weight": "1 g", "volume": "200ml", @@ -44,8 +43,7 @@ { "id": "diesel", "type": "AMMO", - "name": "diesel", - "name_plural": "diesel", + "name": { "str": "diesel", "str_pl": "diesel" }, "description": "Petroleum-based fuel made from a byproduct of the gasoline making process.", "category": "fuel", "weight": "1 g", @@ -72,8 +70,7 @@ }, { "id": "biodiesel", - "name": "biodiesel", - "name_plural": "biodiesel", + "name": { "str": "biodiesel", "str_pl": "biodiesel" }, "copy-from": "diesel", "type": "AMMO", "description": "Vegetable oil- or animal fat-based diesel fuel consisting of long-chain alkyl (methyl, ethyl, or propyl) esters.", @@ -87,8 +84,7 @@ { "id": "gasoline", "type": "AMMO", - "name": "gasoline", - "name_plural": "gasoline", + "name": { "str": "gasoline", "str_pl": "gasoline" }, "description": "Gasoline is a highly flammable liquid. When under pressure, it has the potential for violent explosion.", "category": "fuel", "weight": "1 g", @@ -116,8 +112,7 @@ { "id": "lamp_oil", "type": "AMMO", - "name": "lamp oil", - "name_plural": "lamp oil", + "name": { "str": "lamp oil", "str_pl": "lamp oil" }, "description": "A thin and clean-burning oil made for use in oil lamps.", "category": "fuel", "weight": "1 g", @@ -145,8 +140,7 @@ { "id": "motor_oil", "type": "AMMO", - "name": "motor oil", - "name_plural": "motor oil", + "name": { "str": "motor oil", "str_pl": "motor oil" }, "description": "An oil made for use in car engines.", "category": "fuel", "weight": "1 g", @@ -174,8 +168,7 @@ { "id": "napalm", "type": "AMMO", - "name": "napalm", - "name_plural": "napalm", + "name": { "str": "napalm", "str_pl": "napalm" }, "description": "This is gasoline mixed with some other components to make it stick to the surface and increase burning temperature, meant to be used with a flamethrower.", "category": "fuel", "weight": "1 g", @@ -197,8 +190,7 @@ { "id": "gelled_gasoline", "type": "AMMO", - "name": "gelled gasoline", - "name_plural": "gelled gasoline", + "name": { "str": "gelled gasoline", "str_pl": "gelled gasoline" }, "copy-from": "gasoline", "description": "A flammable gel composed of gasoline and dissolved shavings of polystyrene, roughly similar in properties to napalm b. It's meant to be used with a flamethrower.", "price": 400, @@ -210,8 +202,7 @@ { "id": "flamethrower_fuel", "type": "AMMO", - "name": "flamethrower fuel", - "name_plural": "flamethrower fuel", + "name": { "str": "flamethrower fuel", "str_pl": "flamethrower fuel" }, "copy-from": "gasoline", "description": "A mixture of gasoline and diesel oil in equal parts. Its combustion properties make it unfit for applications where you would use any of them separately, but it can be used to feed a flamethrower.", "price": 400, diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 5409521be1f0e..4ffaac094f039 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -5,8 +5,7 @@ "id": "animal", "symbol": "?", "color": "white", - "name": "animal", - "name_plural": "none", + "name": { "str": "animal", "str_pl": "none" }, "description": "seeing this is a bug", "stackable": true, "price": 0, @@ -20,8 +19,7 @@ "id": "fire", "symbol": "$", "color": "red", - "name": "nearby fire", - "name_plural": "none", + "name": { "str": "nearby fire", "str_pl": "none" }, "description": "seeing this is a bug", "price": 0, "volume": 0, @@ -33,8 +31,7 @@ "id": "muscle", "symbol": "?", "color": "white", - "name": "muscle", - "name_plural": "none", + "name": { "str": "muscle", "str_pl": "none" }, "description": "seeing this is a bug", "stackable": true, "price": 0, @@ -48,8 +45,7 @@ "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, @@ -63,8 +59,7 @@ "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, @@ -92,8 +87,7 @@ "id": "apparatus", "symbol": "$", "color": "red", - "name": "a smoking device and a source of flame", - "name_plural": "none", + "name": { "str": "a smoking device and a source of flame", "str_pl": "none" }, "description": "seeing this is a bug", "price": 0, "volume": 0, @@ -104,8 +98,7 @@ "id": "null", "symbol": "$", "color": "red", - "name": "none", - "name_plural": "none", + "name": { "str": "none", "str_pl": "none" }, "description": "seeing this is a bug", "price": 0, "volume": 0, @@ -204,8 +197,7 @@ "id": "leather", "symbol": ",", "color": "brown", - "name": "leather patch", - "name_plural": "leather patches", + "name": { "str": "leather patch", "str_pl": "leather patches" }, "description": "A smallish patch of leather, could be used to make tough clothing.", "price": 2000, "material": [ "leather", "flesh" ], @@ -220,8 +212,7 @@ "id": "felt_patch", "symbol": ",", "color": "white", - "name": "felt patch", - "name_plural": "felt patches", + "name": { "str": "felt patch", "str_pl": "felt patches" }, "description": "A smallish patch of felt, could be disassembled for wool fiber.", "price": 2000, "material": [ "wool" ], @@ -237,8 +228,7 @@ "category": "spare_parts", "symbol": ",", "color": "light_gray", - "name": "Nomex patch", - "name_plural": "Nomex patches", + "name": { "str": "Nomex patch", "str_pl": "Nomex patches" }, "description": "A small bolt of Nomex fire-resistant fabric.", "price": 4000, "price_postapoc": 200, @@ -307,8 +297,7 @@ "category": "spare_parts", "symbol": ",", "color": "light_gray", - "name": "chunk of chitin", - "name_plural": "chunks of chitin", + "name": { "str": "chunk of chitin", "str_pl": "chunks of chitin" }, "description": "A piece of an insect's exoskeleton. It is light and very durable.", "price": 0, "material": "chitin", @@ -324,8 +313,7 @@ "category": "spare_parts", "symbol": ",", "color": "light_gray", - "name": "set of 100 ceramic disk", - "name_plural": "ceramic disks", + "name": { "str": "set of 100 ceramic disk", "str_pl": "ceramic disks" }, "description": "A set of small slightly elongated disks, made of high-grade ceramic. They remind you of scales.", "price": 0, "material": "lightceramic", @@ -338,8 +326,7 @@ "type": "GENERIC", "id": "acidchitin_piece", "copy-from": "chitin_piece", - "name": "chunk of biosilicified chitin", - "name_plural": "chunks of biosilicified chitin", + "name": { "str": "chunk of biosilicified chitin", "str_pl": "chunks of biosilicified chitin" }, "description": "A lump of exoskeleton that has undergone biosilicification. It is acid-resistant and remarkably sturdy.", "material": "acidchitin", "flags": [ "NO_SALVAGE" ], @@ -350,8 +337,7 @@ "id": "bundle_rag", "type": "GENERIC", "category": "spare_parts", - "name": "bundle of rags", - "name_plural": "bundles of rags", + "name": { "str": "bundle of rags", "str_pl": "bundles of rags" }, "description": "Cotton rags, bundled tightly together for storage. Disassemble to unpack.", "weight": "800 g", "volume": "750 ml", @@ -364,8 +350,7 @@ "id": "bundle_leather", "type": "GENERIC", "category": "spare_parts", - "name": "bundle of leather", - "name_plural": "bundles of leather", + "name": { "str": "bundle of leather", "str_pl": "bundles of leather" }, "description": "Leather patches, bundled tightly together for storage. Disassemble to unpack.", "weight": "1000 g", "volume": "1 L", @@ -378,8 +363,7 @@ "id": "bundle_wool", "type": "GENERIC", "category": "spare_parts", - "name": "bundle of felt", - "name_plural": "bundles of felt", + "name": { "str": "bundle of felt", "str_pl": "bundles of felt" }, "description": "Felt patches, bundled tightly together for storage. Disassemble to unpack.", "weight": "1000 g", "volume": "1 L", @@ -652,8 +636,7 @@ "id": "concrete", "symbol": "%", "color": "light_gray", - "name": "concrete", - "name_plural": "concrete", + "name": { "str": "concrete", "str_pl": "concrete" }, "description": "Some concrete, ready to be used in a construction project.", "category": "spare_parts", "container": "bag_canvas", @@ -684,8 +667,7 @@ "id": "torch_done", "symbol": "/", "color": "brown", - "name": "burnt out torch", - "name_plural": "burnt out torches", + "name": { "str": "burnt out torch", "str_pl": "burnt out torches" }, "description": "A torch that has consumed all its fuel; it can be recrafted into another torch.", "category": "other", "material": "wood", @@ -701,8 +683,7 @@ "category": "other", "symbol": ";", "color": "red", - "name": "dead flare", - "name_plural": "dead flares", + "name": { "str": "dead flare", "str_pl": "dead flares" }, "description": "This is a spent magnesium flare. It is essentially trash.", "material": "plastic", "flags": "TRADER_AVOID", @@ -1369,8 +1350,7 @@ "id": "lens", "symbol": ".", "color": "light_cyan", - "name": "high-quality lens", - "name_plural": "high-quality lenses", + "name": { "str": "high-quality lens", "str_pl": "high-quality lenses" }, "category": "spare_parts", "description": "A high-quality lens, useful for focusing or diffusing light. Might be useful for starting a fire.", "price": 120000, @@ -1386,8 +1366,7 @@ "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, @@ -1400,8 +1379,7 @@ "id": "glass_tinted", "symbol": ".", "color": "dark_gray", - "name": "pair of tinted glass", - "name_plural": "pairs of tinted glass", + "name": { "str": "pair of tinted glass", "str_pl": "pairs of tinted glass" }, "category": "spare_parts", "description": "A pair of small darkened glass, like the one that sunglasses are made of.", "price": 1000, @@ -1556,8 +1534,7 @@ "id": "fish_bowl", "symbol": "u", "color": "light_cyan", - "name": "fish bowl", - "name_plural": "fish bowls", + "name": { "str": "fish bowl", "str_pl": "fish bowls" }, "description": "A filled fish bowl, the tag says 'to Ed' and the fish's name, 'Hoss'. The fish appears to have tiny antlers.", "price": 100, "material": "glass", @@ -1610,8 +1587,7 @@ "category": "spare_parts", "symbol": ";", "color": "light_gray", - "name": "clockworks", - "name_plural": "clockworks", + "name": { "str": "clockworks", "str_pl": "clockworks" }, "description": "A small assortment of gears and other clockwork gubbins.", "price": 200, "price_postapoc": 0, @@ -1624,8 +1600,7 @@ "type": "GENERIC", "symbol": ")", "color": "brown", - "name": "Home Frontier Starter Pack", - "name_plural": "Home Frontier Starter Packs", + "name": { "str": "Home Frontier Starter Pack", "str_pl": "Home Frontier Starter Packs" }, "category": "other", "description": "This not-so-little bundle of joy contains Leadworks, LLC's premier offerings: the Enforcer autorevolver (with holster) and Long Ranger rifle. Maintenance kit, batteries for same, and a complimentary copy of the Gun Owner's Handbook are included. The perfect investment for a new family starting out! Disassemble to unpack and enjoy.", "price": 463500, @@ -1639,8 +1614,7 @@ "type": "GENERIC", "symbol": ")", "color": "light_gray", - "name": "Mosin-Nagant classic conversion kit", - "name_plural": "Mosin-Nagant classic conversion kits", + "name": { "str": "Mosin-Nagant classic conversion kit", "str_pl": "Mosin-Nagant classic conversion kits" }, "category": "other", "description": "A beautiful wooden stock and hardware built to support common Mosin-Nagant actions. With gunsmithing tools, some skill, and a few hours, you could take a 'tacti-cool' rifle and convert it to the classic Russian design.", "price": 12000, @@ -1654,8 +1628,7 @@ "type": "GENERIC", "symbol": ")", "color": "light_gray", - "name": "Mosin-Nagant EBR conversion kit", - "name_plural": "Mosin-Nagant EBR conversion kits", + "name": { "str": "Mosin-Nagant EBR conversion kit", "str_pl": "Mosin-Nagant EBR conversion kits" }, "category": "spare_parts", "description": "A synthetic stock and hardware designed to accommodate common Mosin-Nagant actions. With gunsmithing tools, some skill, and a few hours, you could give the classic Russian design modern furniture and customization capacity.", "price": 12000, @@ -1669,8 +1642,7 @@ "type": "GENERIC", "symbol": ")", "color": "light_gray", - "name": "L523-CAR conversion", - "name_plural": "L523-CAR conversions", + "name": { "str": "L523-CAR conversion", "str_pl": "L523-CAR conversions" }, "category": "spare_parts", "description": "All the parts necessary to convert an L523 to the Carbine configuration, Leadworks LLC's choice for close-quarters work. In order to reconfigure an already-configured L523, you'll need to disassemble it to the base platform, then assemble with the parts you prefer.", "price": 170000, @@ -1684,8 +1656,7 @@ "type": "GENERIC", "symbol": ")", "color": "light_gray", - "name": "L523-MBR conversion", - "name_plural": "L523-MBR conversions", + "name": { "str": "L523-MBR conversion", "str_pl": "L523-MBR conversions" }, "category": "spare_parts", "description": "All the parts necessary to convert an L523 to a Main Battle Rifle, a balanced weapon for all situations. In order to reconfigure an already-configured L523, you'll need to disassemble it to the base platform, then assemble with the parts you prefer.", "price": 170000, @@ -1699,8 +1670,7 @@ "type": "GENERIC", "symbol": ")", "color": "light_gray", - "name": "L523-DSR conversion", - "name_plural": "L523-DSR conversions", + "name": { "str": "L523-DSR conversion", "str_pl": "L523-DSR conversions" }, "category": "spare_parts", "description": "All the parts necessary to convert an L523 to a Designated Shootist Rifle, suitable for long-ranged work. In order to reconfigure an already-configured L523, you'll need to disassemble it to the base platform, then assemble with the parts you prefer.", "price": 200000, @@ -1714,8 +1684,7 @@ "type": "GENERIC", "symbol": ")", "color": "light_gray", - "name": "L523-LMG conversion", - "name_plural": "L523-LMG conversions", + "name": { "str": "L523-LMG conversion", "str_pl": "L523-LMG conversions" }, "category": "spare_parts", "description": "All the parts necessary to convert an L523 to a light machine gun. In order to reconfigure an already-configured L523, you'll need to disassemble it to the base platform, then assemble with the parts you prefer.", "price": 270000, @@ -1743,8 +1712,7 @@ "id": "mobile_memory_card_used", "symbol": ",", "color": "white", - "name": "SD-Memory card (clean)", - "name_plural": "SD-Memory cards (clean)", + "name": { "str": "SD-Memory card (clean)", "str_pl": "SD-Memory cards (clean)" }, "description": "This memory card is either unused or has been wiped clean. You could use it to store your data, though!", "price": 500, "price_postapoc": 0, @@ -1758,8 +1726,7 @@ "id": "mobile_memory_card_encrypted", "symbol": ",", "color": "white", - "name": "SD-Memory card (encrypted)", - "name_plural": "SD-Memory cards (encrypted)", + "name": { "str": "SD-Memory card (encrypted)", "str_pl": "SD-Memory cards (encrypted)" }, "description": "This memory card appears to have the firmware encryption set. Hopefully it contains something worth encrypting.", "price": 2000, "price_postapoc": 0, @@ -1773,8 +1740,7 @@ "id": "mobile_memory_card_science", "symbol": ",", "color": "white", - "name": "Science SD-Memory card", - "name_plural": "Science SD-Memory cards", + "name": { "str": "Science SD-Memory card", "str_pl": "Science SD-Memory cards" }, "description": "This memory card appears to be related to 'XEDRA', and is certainly encrypted. Looks *Interesting*, though…", "price": 10000, "price_postapoc": 0, @@ -1881,8 +1847,7 @@ "id": "clay_lump", "symbol": ",", "color": "brown", - "name": "lump of clay", - "name_plural": "lumps of clay", + "name": { "str": "lump of clay", "str_pl": "lumps of clay" }, "category": "spare_parts", "description": "A fresh piece of clay. Useful for some crafting recipes.", "price": 531, @@ -1912,8 +1877,7 @@ "id": "mortar_build", "symbol": "%", "color": "light_gray", - "name": "mortar", - "name_plural": "mortar", + "name": { "str": "mortar", "str_pl": "mortar" }, "description": "Some mortar, ready to be used in building projects.", "category": "spare_parts", "container": "bag_canvas", @@ -1929,8 +1893,7 @@ "category": "spare_parts", "symbol": ",", "color": "brown", - "name": "soft adobe brick", - "name_plural": "soft adobe bricks", + "name": { "str": "soft adobe brick", "str_pl": "soft adobe bricks" }, "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", @@ -1971,8 +1934,7 @@ "id": "mortar_adobe", "symbol": "%", "color": "brown", - "name": "adobe mortar", - "name_plural": "adobe mortar", + "name": { "str": "adobe mortar", "str_pl": "adobe mortar" }, "description": "A thick, pasty mud, low in sand content to reduce crumbling once dry. Used to glue larger, heavier pieces of mud and clay together.", "category": "spare_parts", "container": "bag_canvas", @@ -2153,8 +2115,7 @@ "id": "cured_hide", "symbol": ",", "color": "white", - "name": "cured hide", - "name_plural": "cured hides", + "name": { "str": "cured hide", "str_pl": "cured hides" }, "description": "A rolled up animal hide which has been scraped of extraneous hair and flesh and treated to prevent decay. It still requires tanning to become usable leather.", "price": 200, "material": [ "flesh" ], @@ -2169,8 +2130,7 @@ "id": "tanned_hide", "symbol": ",", "color": "brown", - "name": "tanned hide", - "name_plural": "tanned hides", + "name": { "str": "tanned hide", "str_pl": "tanned hides" }, "description": "A folded sheet of leather made from carefully tanned animal hide. Can be cut up or used as is.", "price": 5000, "material": [ "leather" ], @@ -2184,8 +2144,7 @@ "id": "cured_pelt", "symbol": ",", "color": "brown", - "name": "cured pelt", - "name_plural": "cured pelts", + "name": { "str": "cured pelt", "str_pl": "cured pelts" }, "description": "A rolled up animal hide which has been scraped of extraneous hair and flesh and treated to prevent decay. It still requires tanning to become usable fur.", "price": 200, "material": [ "fur", "flesh" ], @@ -2200,8 +2159,7 @@ "id": "tanned_pelt", "symbol": ",", "color": "brown", - "name": "tanned pelt", - "name_plural": "tanned pelts", + "name": { "str": "tanned pelt", "str_pl": "tanned pelts" }, "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" ], @@ -2215,8 +2173,7 @@ "id": "straw_pile", "symbol": ",", "color": "light_gray", - "name": "pile of straw", - "name_plural": "piles of straw", + "name": { "str": "pile of straw", "str_pl": "piles of straw" }, "category": "spare_parts", "description": "A pile of dry grass. Can be used to craft a straw bed if there is nothing else to sleep on.", "material": [ "paper" ], @@ -2230,8 +2187,7 @@ "id": "straw_doll", "symbol": "o", "color": "light_gray", - "name": "straw doll", - "name_plural": "straw dolls", + "name": { "str": "straw doll", "str_pl": "straw dolls" }, "description": "Old straw doll. Represents a woman in a dress.", "price": 100, "material": [ "paper" ], @@ -2324,8 +2280,7 @@ "type": "AMMO", "ammo_type": "NULL", "category": "other", - "name": "autoclave pouch", - "name_plural": "autoclave pouches", + "name": { "str": "autoclave pouch", "str_pl": "autoclave pouches" }, "description": "This is a medical device that bears the approval of the FDA (Food and Drug Administration). If used properly, these pouches can keep things sterile indefinitely.", "weight": "2 g", "volume": 0, @@ -2425,8 +2380,7 @@ { "type": "GENERIC", "id": "joint_roach", - "name": "joint roach", - "name_plural": "joint roaches", + "name": { "str": "joint roach", "str_pl": "joint roaches" }, "color": "green", "symbol": "!", "description": "The smoked-down butt of a joint, a reminder of some good times. Pretty much trash now. Bummer, man.\nA few of these could probably be used to roll another joint.", @@ -2744,8 +2698,7 @@ { "id": "refrigerant_tank", "type": "GENERIC", - "name": "refrigerant tank", - "name_plural": "refrigerant tanks", + "name": { "str": "refrigerant tank", "str_pl": "refrigerant tanks" }, "description": "A small tank containing some sort of refrigerant often used in devices such as freezers. Hermetically sealed to prevent evaporation - cannot be opened without prior connection to compatible valve.", "weight": "410 g", "volume": "1L", diff --git a/data/json/items/generic/dining_kitchen.json b/data/json/items/generic/dining_kitchen.json index f11865e156157..fe53f949d177a 100644 --- a/data/json/items/generic/dining_kitchen.json +++ b/data/json/items/generic/dining_kitchen.json @@ -239,8 +239,7 @@ "type": "GENERIC", "category": "other", "id": "glass", - "name": "drinking glass", - "name_plural": "drinking glasses", + "name": { "str": "drinking glass", "str_pl": "drinking glasses" }, "symbol": "U", "description": "A tall drinking glass.", "copy-from": "base_glass_dish", @@ -251,8 +250,7 @@ "type": "GENERIC", "category": "other", "id": "wine_glass", - "name": "wine glass", - "name_plural": "wine glasses", + "name": { "str": "wine glass", "str_pl": "wine glasses" }, "proportional": { "weight": 0.5 }, "symbol": "Y", "description": "A stemmed drinking glass that makes you feel very fancy when you drink from it.", @@ -413,8 +411,7 @@ "type": "GENERIC", "category": "other", "id": "knife_butter", - "name": "butter knife", - "name_plural": "butter knives", + "name": { "str": "butter knife", "str_pl": "butter knives" }, "description": "A dull knife, absolutely worthless in combat. Excellent for spreading soft things on bread.", "flags": [ "STAB", "SHEATH_KNIFE" ], "copy-from": "base_silverware" @@ -423,8 +420,7 @@ "type": "GENERIC", "category": "other", "id": "plastic_knife", - "name": "plastic knife", - "name_plural": "plastic knives", + "name": { "str": "plastic knife", "str_pl": "plastic knives" }, "description": "A plastic butter knife. It's actually a bit sharper than its metal counterpart, but that doesn't make it any more effective as a weapon.", "looks_like": "knife_butter", "flags": [ "STAB", "SHEATH_KNIFE" ], @@ -508,8 +504,7 @@ "type": "GENERIC", "category": "other", "id": "chopsticks", - "name": "chopsticks", - "name_plural": "pairs of chopsticks", + "name": { "str": "chopsticks", "str_pl": "pairs of chopsticks" }, "description": "One of the most popular eating utensils in the world. Does double duty as a way of dealing with especially fragile vampires.", "flags": [ "STAB" ], "symbol": "X", @@ -554,8 +549,7 @@ "type": "GENERIC", "category": "other", "id": "garlic_press", - "name": "garlic press", - "name_plural": "garlic presses", + "name": { "str": "garlic press", "str_pl": "garlic presses" }, "description": "This tool can squash a clove or two of garlic into a fine paste.", "looks_like": "spoon", "copy-from": "base_utensil" 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/gun/22.json b/data/json/items/gun/22.json index 1bc6e5e48784b..bf8f6088f5f12 100644 --- a/data/json/items/gun/22.json +++ b/data/json/items/gun/22.json @@ -4,8 +4,7 @@ "looks_like": "hk_mp5", "type": "GUN", "reload_noise_volume": 10, - "name": "American-180", - "name_plural": "American-180", + "name": { "str": "American-180", "str_pl": "American-180" }, "description": "The American-180 is a submachine gun developed in the 1960's that fires .22 LR, unusual for an SMG. Though the round is low-powered, the high rate of fire and large magazine makes the 180 a formidable weapon.", "weight": "2600 g", "volume": "1250 ml", @@ -45,8 +44,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "Marlin 39A", - "name_plural": "Marlin 39A", + "name": { "str": "Marlin 39A", "str_pl": "Marlin 39A" }, "description": "The oldest and longest-produced shoulder firearm in the world. Though it fires the weak .22 round, it is highly accurate and damaging, and has essentially no recoil.", "weight": "2948 g", "volume": "2500 ml", @@ -86,8 +84,7 @@ "looks_like": "glock_17", "copy-from": "pistol_base", "type": "GUN", - "name": "Mossberg Brownie", - "name_plural": "Mossberg Brownie", + "name": { "str": "Mossberg Brownie", "str_pl": "Mossberg Brownie" }, "description": "The first gun produced by O.F. Mossberg & Sons. A small pocket pistol, marketed to trappers during the early 20th century. Its four barrels can accept .22 Short and .22 LR cartridges.", "weight": "280 g", "volume": "137ml", @@ -120,8 +117,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "pipe rifle: .22", - "name_plural": "pipe rifles: .22", + "name": { "str": "pipe rifle: .22", "str_pl": "pipe rifles: .22" }, "description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", "weight": "1953 g", "volume": "1750 ml", @@ -198,8 +194,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "Ruger 10/22", - "name_plural": "Ruger 10/22", + "name": { "str": "Ruger 10/22", "str_pl": "Ruger 10/22" }, "description": "A combination of negligible recoil, high customization, and inexpensive ammunition made the Ruger 10/22 a popular choice among enthusiasts and small game hunters. Even though it fires the weak .22 round, it's perfectly capable of killing.", "weight": "2270 g", "volume": "2500 ml", @@ -239,8 +234,7 @@ "looks_like": "sw_619", "copy-from": "ruger_lcr_38", "type": "GUN", - "name": "Ruger LCR .22", - "name_plural": "Ruger LCR .22", + "name": { "str": "Ruger LCR .22", "str_pl": "Ruger LCR .22" }, "weight": "420 g", "ammo": "22", "clip_size": 8, @@ -251,8 +245,7 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": "SIG Mosquito", - "name_plural": "SIG Mosquito", + "name": { "str": "SIG Mosquito", "str_pl": "SIG Mosquito" }, "description": "A popular, small .22 LR pistol. One of the many polymer frame pistols produced during the latter 20th-early 21st centuries; it has an underbarrel rail.", "weight": "700 g", "volume": "250 ml", @@ -290,8 +283,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "S&W 22A", - "name_plural": "S&W 22A", + "name": { "str": "S&W 22A", "str_pl": "S&W 22A" }, "description": "A popular .22 pistol.", "weight": "1000 g", "volume": "500 ml", diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json index f860b767ee070..44d78e87028a9 100644 --- a/data/json/items/gun/223.json +++ b/data/json/items/gun/223.json @@ -96,8 +96,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": "L2037 Backup", - "name_plural": "L2037 Backups", + "name": { "str": "L2037 Backup", "str_pl": "L2037 Backups" }, "//": "Most real-life autorevolvers use 6-7.5 inch barrel, but this one's mentioned to be particularly massive.", "description": "The logical extension of Leadworks' autorevolver series, this massive 'sidearm' fires 5.56 NATO to share ammo with a soldier's rifle. The muzzle flash and report of this 5-shot revolver are incredible, producing ballistics similar to .357 Magnum. Similar to other Leadworks products it doesn't accept third-party modifications.", "weight": "2370 g", @@ -331,8 +330,7 @@ "copy-from": "gun_base", "looks_like": "ar15", "type": "GUN", - "name": "pipe rifle: .223", - "name_plural": "pipe rifles: .223", + "name": { "str": "pipe rifle: .223", "str_pl": "pipe rifles: .223" }, "description": "A homemade rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", "weight": "4080 g", "volume": "3 L", diff --git a/data/json/items/gun/300.json b/data/json/items/gun/300.json index 8e39f3dcf759e..d993caaea80b8 100644 --- a/data/json/items/gun/300.json +++ b/data/json/items/gun/300.json @@ -4,8 +4,7 @@ "copy-from": "rifle_base", "looks_like": "ar15", "type": "GUN", - "name": "M2010 ESR", - "name_plural": "M2010 ESR", + "name": { "str": "M2010 ESR", "str_pl": "M2010 ESR" }, "//": "http://www.guns.com/2012/05/17/remington-xm2010-army-sniper-system-esr-now-in-stores/.", "description": "A bolt-action, box-magazine-fed, sniper rifle chambered in the powerful .300 Winchester Magnum round. The M2010 had completely replaced the M24 rifle series by 2017.", "weight": "5500 g", @@ -27,8 +26,7 @@ "copy-from": "rifle_manual", "looks_like": "ar15", "type": "GUN", - "name": "Weatherby Mark V", - "name_plural": "Weatherby Mark V", + "name": { "str": "Weatherby Mark V", "str_pl": "Weatherby Mark V" }, "//": "MSRP, believe it or not.", "description": "The Weatherby Mark V is one of the finest bolt action rifles. Designed in 1955 by Roy Weatherby and Fred Jennie, it has a strong action designed to safely fire high-pressure cartridges. These rifles were presented to celebrities as part of a marketing campaign.", "weight": "3730 g", @@ -51,8 +49,7 @@ "copy-from": "rifle_manual", "looks_like": "ar15", "type": "GUN", - "name": "Winchester Model 70", - "name_plural": "Winchester Model 70", + "name": { "str": "Winchester Model 70", "str_pl": "Winchester Model 70" }, "description": "The Winchester Model 70 is a bolt action sporting rifle. It has an iconic place in American sporting culture and has been held in high regard by shooters since it was introduced in 1936.", "weight": "3520 g", "volume": "3 L", diff --git a/data/json/items/gun/3006.json b/data/json/items/gun/3006.json index a6eab50cbf6b6..e7f0058e8f1d4 100644 --- a/data/json/items/gun/3006.json +++ b/data/json/items/gun/3006.json @@ -4,8 +4,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "Browning BLR", - "name_plural": "Browning BLR", + "name": { "str": "Browning BLR", "str_pl": "Browning BLR" }, "description": "A highly accurate lever-action hunting rifle chambered for the powerful .30-06 round. Notable for using a detachable magazine instead of a traditional tube.", "weight": "3300 g", "volume": "3 L", @@ -159,8 +158,7 @@ "copy-from": "rifle_manual", "looks_like": "ar15", "type": "GUN", - "name": "Remington 700", - "name_plural": "Remington 700", + "name": { "str": "Remington 700", "str_pl": "Remington 700" }, "description": "A very popular and durable hunting or sniping rifle. Popular among SWAT and US Marine snipers. Highly damaging, but perhaps not as accurate as the competing Browning BLR.", "weight": "3410 g", "volume": "3 L", @@ -182,8 +180,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "pipe rifle: .30-06", - "name_plural": "pipe rifles: .30-06", + "name": { "str": "pipe rifle: .30-06", "str_pl": "pipe rifles: .30-06" }, "//": "It's the same size as the others, but it's still a scrap weapon.", "description": "A homemade rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", "weight": "4080 g", diff --git a/data/json/items/gun/308.json b/data/json/items/gun/308.json index 919d1f8c725df..7505b7f563f9d 100644 --- a/data/json/items/gun/308.json +++ b/data/json/items/gun/308.json @@ -4,8 +4,7 @@ "copy-from": "rifle_auto", "looks_like": "ar15", "type": "GUN", - "name": "FN FAL", - "name_plural": "FN FAL", + "name": { "str": "FN FAL", "str_pl": "FN FAL" }, "description": "Originally designed during the Cold War, the FN FAL is probably the most successful battle rifle ever designed. Even though often labeled as obsolete, its high rate of fire and powerful ammunition make it perfectly capable of holding its ground against modern competitors.", "weight": "4250 g", "volume": "2 L", @@ -29,8 +28,7 @@ "copy-from": "rifle_auto", "looks_like": "ar15", "type": "GUN", - "name": "H&K G3", - "name_plural": "H&K G3", + "name": { "str": "H&K G3", "str_pl": "H&K G3" }, "description": "An early battle rifle developed after the end of WWII. The G3 is designed to unload large amounts of deadly ammunition, but it is less suitable over long ranges.", "weight": "4380 g", "volume": "2 L", @@ -81,8 +79,7 @@ "id": "m14ebr", "copy-from": "m1a", "type": "GUN", - "name": "M14 EBR-RI", - "name_plural": "M14 EBR-RI", + "name": { "str": "M14 EBR-RI", "str_pl": "M14 EBR-RI" }, "description": "A highly modified version of the M14 rifle designed to cover both CQB and designated marksman roles. A very powerful and versatile rifle, if somewhat heavy.", "weight": "5070 g", "price": 195000, @@ -108,8 +105,7 @@ "copy-from": "rifle_semi", "looks_like": "ar15", "type": "GUN", - "name": "M1A", - "name_plural": "M1A", + "name": { "str": "M1A", "str_pl": "M1A" }, "description": "The child of the M1 Garand World War 2 rifle, the M1A is a semi-automatic variant of the M14, favored for its accuracy and modular use.", "weight": "4230 g", "volume": "2250 ml", @@ -221,8 +217,7 @@ "copy-from": "rifle_manual", "looks_like": "ar15", "type": "GUN", - "name": "handmade heavy carbine", - "name_plural": "handmade heavy carbines", + "name": { "str": "handmade heavy carbine", "str_pl": "handmade heavy carbines" }, "//": "It's amongst the smallest of the .308 firearms, and a scrap weapon as well. This means a short handmade barrel, and considerable loss of energy.", "description": "A homemade lever-action magazine-fed smoothbore rifle. While still a primitive pipe and 2x4 design, some minor improvements have been made, such as being able to accept G3 compatible magazines, and chambering the more powerful .308 rounds.", "weight": "2311 g", @@ -261,8 +256,7 @@ "copy-from": "rifle_manual", "looks_like": "ar15", "type": "GUN", - "name": "Savage 111F", - "name_plural": "Savage 111F", + "name": { "str": "Savage 111F", "str_pl": "Savage 111F" }, "description": "A very accurate rifle chambered for the powerful .308 round. Its very low ammo capacity is offset by its accuracy and near-complete lack of recoil.", "weight": "2993 g", "volume": "3 L", @@ -285,8 +279,7 @@ "copy-from": "scar_l", "looks_like": "ar15", "type": "GUN", - "name": "FN SCAR-H", - "name_plural": "FN SCAR-H", + "name": { "str": "FN SCAR-H", "str_pl": "FN SCAR-H" }, "description": "A highly accurate and modular battle rifle specially designed for the United States Special Operations Command. The 'H' in its name stands for heavy, as it uses the powerful .308 round.", "weight": "3640 g", "ammo": "308", @@ -300,8 +293,7 @@ "copy-from": "rifle_manual", "looks_like": "ar15", "type": "GUN", - "name": "M24", - "name_plural": "M24", + "name": { "str": "M24", "str_pl": "M24" }, "description": "The M24 Sniper is the military and police version of the Remington Model 700 rifle, M24 being the model name assigned by the United States Army after adoption as their standard sniper rifle in 1988. The M24 is referred to as a 'weapon system' because it consists of not only a rifle, but also a detachable telescopic sight and other accessories.", "weight": "5000 g", "volume": "2750 ml", diff --git a/data/json/items/gun/32.json b/data/json/items/gun/32.json index 3c01b063ddc6f..a17d7204dcbbc 100644 --- a/data/json/items/gun/32.json +++ b/data/json/items/gun/32.json @@ -4,8 +4,7 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": "SIG Sauer P230", - "name_plural": "SIG Sauer P230", + "name": { "str": "SIG Sauer P230", "str_pl": "SIG Sauer P230" }, "description": "The SIG Sauer P230 is a small, semi-automatic handgun chambered in .32 ACP. Due to its small dimensions, it was often carried as a backup weapon.", "weight": "460 g", "volume": "250 ml", @@ -82,8 +81,7 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": "Walther PPK", - "name_plural": "Walther PPK", + "name": { "str": "Walther PPK", "str_pl": "Walther PPK" }, "description": "One of the most famous handguns of the 20th century. Your name is not Bond, but you might find this little gun still useful.", "weight": "540 g", "volume": "250 ml", diff --git a/data/json/items/gun/36paper.json b/data/json/items/gun/36paper.json index 893f3d27446bb..efd458c22020e 100644 --- a/data/json/items/gun/36paper.json +++ b/data/json/items/gun/36paper.json @@ -4,8 +4,7 @@ "copy-from": "pistol_revolver_cap_ball", "looks_like": "sw_619", "type": "GUN", - "name": "Colt M1861 Navy", - "name_plural": "Colt M1861 Navy", + "name": { "str": "Colt M1861 Navy", "str_pl": "Colt M1861 Navy" }, "description": "The Colt Model 1861 Navy cap & ball .36-caliber revolver was a six-shot, single-action percussion weapon produced by Colt's Manufacturing Company from 1861 until 1873.", "weight": "1190 g", "volume": "750 ml", diff --git a/data/json/items/gun/38.json b/data/json/items/gun/38.json index dac2a1ef0d441..1832693ff18c0 100644 --- a/data/json/items/gun/38.json +++ b/data/json/items/gun/38.json @@ -71,8 +71,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": "S&W Model 10", - "name_plural": "S&W Model 10", + "name": { "str": "S&W Model 10", "str_pl": "S&W Model 10" }, "description": "A six-shot revolver, produced since 1899 and known as the most popular handgun of the 20th century. It has a swing-out cylinder for ease of reloading.", "weight": "907 g", "volume": "500 ml", @@ -93,8 +92,7 @@ "copy-from": "gun_base", "looks_like": "ar15", "type": "GUN", - "name": "pipe rifle: .38 Special", - "name_plural": "pipe rifles: .38 Special", + "name": { "str": "pipe rifle: .38 Special", "str_pl": "pipe rifles: .38 Special" }, "description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", "weight": "2114 g", "volume": "2 L", @@ -131,8 +129,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": "Ruger LCR .38", - "name_plural": "Ruger LCR .38", + "name": { "str": "Ruger LCR .38", "str_pl": "Ruger LCR .38" }, "description": "A compact, double-action-only revolver designed for easy concealment, with a stainless steel cylinder and aluminum frame.", "weight": "382 g", "volume": "250 ml", @@ -166,8 +163,7 @@ "copy-from": "pistol_revolver", "//": "Tileset whitelist for revolvers.", "type": "GUN", - "name": "S&W 619", - "name_plural": "S&W 619", + "name": { "str": "S&W 619", "str_pl": "S&W 619" }, "description": "A seven-round .38 revolver sold by Smith & Wesson. It features a fixed rear sight and a reinforced frame.", "weight": "1074 g", "volume": "500 ml", diff --git a/data/json/items/gun/380.json b/data/json/items/gun/380.json index e0acdf714ab7a..c345dda67969e 100644 --- a/data/json/items/gun/380.json +++ b/data/json/items/gun/380.json @@ -93,8 +93,7 @@ "copy-from": "pistol_backup", "looks_like": "glock_17", "type": "GUN", - "name": "Taurus Spectrum", - "name_plural": "Taurus Spectrum", + "name": { "str": "Taurus Spectrum", "str_pl": "Taurus Spectrum" }, "description": "A .380 subcompact pistol. Designed for concealed carry and built from high-quality, durable materials.", "weight": "283 g", "volume": "187 ml", diff --git a/data/json/items/gun/38super.json b/data/json/items/gun/38super.json index b4b58f0e27b59..c32fd49abd07e 100644 --- a/data/json/items/gun/38super.json +++ b/data/json/items/gun/38super.json @@ -4,8 +4,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "AF2011A1 .38 Super", - "name_plural": "AF2011A1 .38 Super", + "name": { "str": "AF2011A1 .38 Super", "str_pl": "AF2011A1 .38 Super" }, "description": "A double-barrel semi-automatic pistol of Italian origin, firing two bullets per shot, a derivative of the M1911 pistol.", "weight": "1710 g", "volume": "1 L", diff --git a/data/json/items/gun/40.json b/data/json/items/gun/40.json index 2cad78a994ae0..c36a109e1bb68 100644 --- a/data/json/items/gun/40.json +++ b/data/json/items/gun/40.json @@ -4,8 +4,7 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": "Glock 22", - "name_plural": "Glock 22", + "name": { "str": "Glock 22", "str_pl": "Glock 22" }, "description": "A .40 S&W variant of the popular Glock 17 pistol. The standard-issue firearm of the FBI and of countless other law enforcement agencies worldwide.", "weight": "650 g", "volume": "500 ml", @@ -44,8 +43,7 @@ "copy-from": "gun_base", "looks_like": "ar15", "type": "GUN", - "name": "pipe rifle: .40 S&W", - "name_plural": "pipe rifles: .40 S&W", + "name": { "str": "pipe rifle: .40 S&W", "str_pl": "pipe rifles: .40 S&W" }, "description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", "weight": "2114 g", "volume": "2 L", @@ -82,8 +80,7 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": "SIG Pro .40", - "name_plural": "SIG Pro .40", + "name": { "str": "SIG Pro .40", "str_pl": "SIG Pro .40" }, "description": "Originally marketed as a lightweight and compact alternative to older SIG handguns, the Pro .40 is popular among European police forces.", "weight": "820 g", "volume": "500 ml", @@ -120,8 +117,7 @@ "copy-from": "smg_base", "looks_like": "hk_mp5", "type": "GUN", - "name": "Luty SMG: .40 S&W", - "name_plural": "Luty SMGs: .40 S&W", + "name": { "str": "Luty SMG: .40 S&W", "str_pl": "Luty SMGs: .40 S&W" }, "description": "A Luty pattern makeshift smoothbore SMG crudely constructed out of various steel parts using some of the more advanced powered hand tools; likely one of the most complex guns that are feasible to make outside of a machine shop, but still very unreliable. This one is chambered for .40 S&W cartridges and accepts Glock 22 magazines, or alternatively custom-made makeshift ones.", "//": "Crafting recipe must make use of angle grinder, bench grinder, set square and vise, which don't yet exist in game. No factory mags until UMP40, mp5/40, or other straight .40 mags are implemented.", "weight": "3274 g", @@ -197,8 +193,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": "S&W 610", - "name_plural": "S&W 610", + "name": { "str": "S&W 610", "str_pl": "S&W 610" }, "description": "The Smith and Wesson 610 is a classic six-shooter revolver chambered for 10mm rounds, or for S&W's own .40 round.", "weight": "1200 g", "volume": "500 ml", diff --git a/data/json/items/gun/40x46mm.json b/data/json/items/gun/40x46mm.json index ffab267ece3c2..c0a330a0eb38f 100644 --- a/data/json/items/gun/40x46mm.json +++ b/data/json/items/gun/40x46mm.json @@ -83,8 +83,7 @@ "copy-from": "launcher_base", "looks_like": "m79", "type": "GUN", - "name": "Milkor MGL", - "name_plural": "Milkor MGL", + "name": { "str": "Milkor MGL", "str_pl": "Milkor MGL" }, "description": "The Milkor Multi-Grenade Launcher is designed to compensate for the drawback of single-shot grenade launchers by allowing sustained heavy firepower. However, it is still slow to reload and must be used with careful planning.", "weight": "5300 g", "volume": "2250 ml", diff --git a/data/json/items/gun/44.json b/data/json/items/gun/44.json index 162da16e8edff..f7a7a71b353b7 100644 --- a/data/json/items/gun/44.json +++ b/data/json/items/gun/44.json @@ -4,8 +4,7 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": "Desert Eagle .44", - "name_plural": "Desert Eagle .44", + "name": { "str": "Desert Eagle .44", "str_pl": "Desert Eagle .44" }, "description": "One of the most recognizable handguns due to its popularity in movies and video games, the Desert Eagle is better known for its menacing appearance than its performance. It's a large pistol, but its heavy weight reduces recoil.", "weight": "1700 g", "volume": "750 ml", @@ -43,8 +42,7 @@ "copy-from": "rifle_manual", "looks_like": "ar15", "type": "GUN", - "name": "Henry Big Boy .44", - "name_plural": "Henry Big Boy .44", + "name": { "str": "Henry Big Boy .44", "str_pl": "Henry Big Boy .44" }, "description": "This fine lever action rifle is chambered in the powerful .44 magnum cartridge and features a sleek octagonal barrel with a tube fed magazine. Go get 'em cowboy!", "weight": "3937 g", "volume": "3 L", @@ -79,8 +77,7 @@ "copy-from": "gun_base", "looks_like": "ar15", "type": "GUN", - "name": "pipe rifle: .44 Magnum", - "name_plural": "pipe rifles: .44 Magnum", + "name": { "str": "pipe rifle: .44 Magnum", "str_pl": "pipe rifles: .44 Magnum" }, "description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", "weight": "2114 g", "volume": "2 L", @@ -117,8 +114,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": "Ruger Redhawk", - "name_plural": "Ruger Redhawk", + "name": { "str": "Ruger Redhawk", "str_pl": "Ruger Redhawk" }, "description": "One of the most powerful handguns in the world when it was released in 1979, the Redhawk offers very sturdy construction, with an appearance that is reminiscent of \"Wild West\" revolvers.", "weight": "1386 g", "volume": "750 ml", @@ -151,8 +147,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": "S&W 629", - "name_plural": "S&W 629", + "name": { "str": "S&W 629", "str_pl": "S&W 629" }, "description": "A stainless steel, six-shot, double-action revolver with a matte black plastic handle manufactured by Smith & Wesson. Though hardly the most powerful handgun in the world any more, it could still blow a zombie's head clean off.", "weight": "1267 g", "volume": "750 ml", diff --git a/data/json/items/gun/44paper.json b/data/json/items/gun/44paper.json index 05f9b27b4f78c..73f3f34eb0bb4 100644 --- a/data/json/items/gun/44paper.json +++ b/data/json/items/gun/44paper.json @@ -4,8 +4,7 @@ "copy-from": "pistol_revolver_cap_ball", "looks_like": "sw_619", "type": "GUN", - "name": "Colt M1860 Army", - "name_plural": "Colt M1860 Army", + "name": { "str": "Colt M1860 Army", "str_pl": "Colt M1860 Army" }, "description": "The Colt Army Model 1860 is a cap & ball .44-caliber revolver. It was used during the American Civil War, and made by Colt's Manufacturing Company.", "weight": "1200 g", "volume": "750 ml", diff --git a/data/json/items/gun/45.json b/data/json/items/gun/45.json index 488353a01e8e8..2b5da989ff6c1 100644 --- a/data/json/items/gun/45.json +++ b/data/json/items/gun/45.json @@ -159,8 +159,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "pipe rifle: .45", - "name_plural": "pipe rifles: .45", + "name": { "str": "pipe rifle: .45", "str_pl": "pipe rifles: .45" }, "description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", "weight": "2114 g", "volume": "2 L", @@ -198,8 +197,7 @@ "copy-from": "smg_base", "looks_like": "hk_mp5", "type": "GUN", - "name": "Luty SMG: .45", - "name_plural": "Luty SMGs: .45", + "name": { "str": "Luty SMG: .45", "str_pl": "Luty SMGs: .45" }, "description": "A Luty pattern makeshift smoothbore SMG crudely constructed out of various steel parts using some of the more advanced powered hand tools; likely one of the most complex guns that are feasible to make outside of a machine shop, but still very unreliable. This one is chambered for .45 ACP cartridges and accepts MAC-10 compatible magazines.", "//": "Crafting recipe must make use of angle grinder, bench grinder, set square and vise, which don't yet exist in game.", "weight": "3274 g", diff --git a/data/json/items/gun/454.json b/data/json/items/gun/454.json index 7398e6764dd45..568043f537bf8 100644 --- a/data/json/items/gun/454.json +++ b/data/json/items/gun/454.json @@ -4,8 +4,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": "Taurus Raging Bull", - "name_plural": "Taurus Raging Bull", + "name": { "str": "Taurus Raging Bull", "str_pl": "Taurus Raging Bull" }, "description": "The Taurus Raging Bull is a 5-shot revolver chambered in .454 Casull. It has impressive stopping power.", "weight": "1790 g", "volume": "750 ml", @@ -36,8 +35,7 @@ "copy-from": "raging_bull", "looks_like": "sw_619", "type": "GUN", - "name": "Taurus Raging Judge Magnum", - "name_plural": "Taurus Raging Judge Magnum", + "name": { "str": "Taurus Raging Judge Magnum", "str_pl": "Taurus Raging Judge Magnum" }, "description": "The Taurus Raging Judge Magnum is a 5-shot revolver chambered in .454 Casull. It can fire .410 shotshells and .45 Colt cartridges as well.", "weight": "2041 g", "ammo": [ "454", "45colt", "410shot" ] diff --git a/data/json/items/gun/4570.json b/data/json/items/gun/4570.json index 3047760e6add6..ca39057f7e38f 100644 --- a/data/json/items/gun/4570.json +++ b/data/json/items/gun/4570.json @@ -68,8 +68,7 @@ "copy-from": "gun_base", "looks_like": "ar15", "type": "GUN", - "name": "1874 Sharps", - "name_plural": "1874 Sharps", + "name": { "str": "1874 Sharps", "str_pl": "1874 Sharps" }, "description": "A reproduction of an antique single-shot .45-70 rifle once used to hunt buffalo and other large game in the late 19th Century. Highly accurate and powerful for the time, this one is made to handle modern smokeless ammunition.", "weight": "5000 g", "volume": "3250 ml", diff --git a/data/json/items/gun/45colt.json b/data/json/items/gun/45colt.json index 5a940b86ce696..28992f6257d25 100644 --- a/data/json/items/gun/45colt.json +++ b/data/json/items/gun/45colt.json @@ -61,8 +61,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": "Uberti Cattleman", - "name_plural": "Uberti Cattleman", + "name": { "str": "Uberti Cattleman", "str_pl": "Uberti Cattleman" }, "description": "This 7.5\" barreled Uberti Cattleman is a modern reproduction of the legendary Colt Single Action Army, or Colt Peacemaker, one of the first revolvers to use a modern self-contained cartridge. Made famous by westerns, it is still in demand for Cowboy Action Shooting, reenactors and collectors. Unlike modern revolvers, the cylinder cannot swing out for loading, and spent brass must be ejected one at a time.", "weight": "1048 g", "volume": "500 ml", diff --git a/data/json/items/gun/460.json b/data/json/items/gun/460.json index 2e3772e6522ff..51ca34faf3c97 100644 --- a/data/json/items/gun/460.json +++ b/data/json/items/gun/460.json @@ -29,8 +29,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": "L2031 Enforcer", - "name_plural": "L2031 Enforcer", + "name": { "str": "L2031 Enforcer", "str_pl": "L2031 Enforcer" }, "//": "Real-life Autorevolvers tended to vary between 6-7.5 inch barrels, so we'll err on the side of a +1 here.", "description": "An \"autorevolver\", this Leadworks LLC six-shooter combines the ease-of-action of a semi-auto with the ease-of-reloading and style of a revolver. In addition to ubiquitous .45 ACP, the Enforcer also fires powerful .460 Rowland, offering .44 Magnum performance in a smaller package. It achieved overnight stardom when it appeared in \"Treasure Trail\", a popular space-Western series. Comes with built in holographic and laser sights. Similar to other Leadworks products it doesn't accept third-party modifications.", "weight": "1370 g", @@ -63,8 +62,7 @@ "looks_like": "sw_619", "type": "GUN", "reload_noise_volume": 10, - "name": "L1820 Long Ranger", - "name_plural": "L1820 Long Ranger", + "name": { "str": "L1820 Long Ranger", "str_pl": "L1820 Long Ranger" }, "//": "If it's based off the Winchester 94, it's likely got a 20 inch barrel. For sanity's sake though, let's cap it at +4.", "description": "The Leadworks Long Ranger was designed to give Enforcer users (or anyone using .460/.45 caliber cartridges) a little extra reach while using the same ammunition. Loaded with powerful .460 Rowland ammunition, this rifle offers a competitive replacement to the AR-15 in politically restrictive climates, but was met with disgust from lever action purists because of its synthetic furniture and built in holographic and laser sights. Similar to other Leadworks products it doesn't accept third-party modifications.", "weight": "4175 g", diff --git a/data/json/items/gun/50.json b/data/json/items/gun/50.json index 8a94e4a05488c..e565790b878d0 100644 --- a/data/json/items/gun/50.json +++ b/data/json/items/gun/50.json @@ -4,8 +4,7 @@ "copy-from": "rifle_base", "looks_like": "ar15", "type": "GUN", - "name": "Barrett M107A1", - "name_plural": "Barrett M107A1", + "name": { "str": "Barrett M107A1", "str_pl": "Barrett M107A1" }, "//": "Price based on unit cost quote for fiscal year 2005 listed at inetres.com, with gunmod modifiers to be added later.", "description": "A large, shoulder-fired, .50 caliber anti-materiel rifle. Its large size, recoil, and noise is offset by its damage and range.", "weight": "12602 g", @@ -30,8 +29,7 @@ "copy-from": "gun_base", "looks_like": "ar15", "type": "GUN", - "name": "M2HB Browning HMG", - "name_plural": "M2HB Browning HMG", + "name": { "str": "M2HB Browning HMG", "str_pl": "M2HB Browning HMG" }, "description": "A heavy machine gun used by the US Military from its inception to the Cataclysm, and even rarely by Cataclysm survivors. Its massive size and design make it impossible to use unless deployed or mounted to a vehicle.", "weight": "38000 g", "volume": "5 L", diff --git a/data/json/items/gun/500.json b/data/json/items/gun/500.json index acc3f00276d54..151619416c6a8 100644 --- a/data/json/items/gun/500.json +++ b/data/json/items/gun/500.json @@ -4,8 +4,7 @@ "copy-from": "rifle_manual", "looks_like": "ar15", "type": "GUN", - "name": "Big Horn Model 89", - "name_plural": "Big Horn Model 89", + "name": { "str": "Big Horn Model 89", "str_pl": "Big Horn Model 89" }, "description": "Built in the image of the venerable Winchester Model 1886, Big Horn Armory's Model 89 rifle packs all the power of the .500 S&W Magnum cartridge in to a package less likely to break one's wrist.", "weight": "3447 g", "volume": "3 L", @@ -40,8 +39,7 @@ "copy-from": "pistol_revolver", "looks_like": "sw_619", "type": "GUN", - "name": "S&W 500", - "name_plural": "S&W 500", + "name": { "str": "S&W 500", "str_pl": "S&W 500" }, "description": "The 5-shot Smith and Wesson 500 revolver fires the comparably-named .500 S&W Magnum. It's an impressive weapon.", "weight": "1960 g", "volume": "750 ml", diff --git a/data/json/items/gun/66mm.json b/data/json/items/gun/66mm.json index 80d5c0b625ab5..44e0fefaf0fb8 100644 --- a/data/json/items/gun/66mm.json +++ b/data/json/items/gun/66mm.json @@ -5,8 +5,7 @@ "type": "GUN", "symbol": "(", "color": "dark_gray", - "name": "M202A1 FLASH", - "name_plural": "M202A1 FLASH", + "name": { "str": "M202A1 FLASH", "str_pl": "M202A1 FLASH" }, "description": "An American rocket launcher designed in the 1970s to replace WW2 era flamethrowers still in use in Vietnam. It has four barrels sharing the 66mm caliber of the M72 LAW.", "price": 2900000, "material": "steel", diff --git a/data/json/items/gun/762.json b/data/json/items/gun/762.json index f99818dbc6bb1..3b80bea66f411 100644 --- a/data/json/items/gun/762.json +++ b/data/json/items/gun/762.json @@ -42,8 +42,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "Beretta ARX-160", - "name_plural": "Beretta ARX-160", + "name": { "str": "Beretta ARX-160", "str_pl": "Beretta ARX-160" }, "//": "Total unloaded weight of gun 3000 grams. Current weight of folding stock 200 grams.", "description": "The Beretta ARX-160 was a Phase II contender in the United States Army Individual Carbine competition to replace the M4 carbine. It failed to replace it, but it is widely used by military all around the world. This version is chambered for 7.62x39mm.", "weight": "3450 g", diff --git a/data/json/items/gun/762R.json b/data/json/items/gun/762R.json index 7a9dc055a6545..2cb2c4976f67b 100644 --- a/data/json/items/gun/762R.json +++ b/data/json/items/gun/762R.json @@ -3,8 +3,7 @@ "id": "mosin44", "copy-from": "mosin91_30", "type": "GUN", - "name": "Mosin-Nagant M44", - "name_plural": "Mosin-Nagant M44", + "name": { "str": "Mosin-Nagant M44", "str_pl": "Mosin-Nagant M44" }, "description": "The Model 44 is the carbine sized variant of the standard 1891/30. It has a shorter barrel, therefore it is weaker than the 1891/30, but easier to carry.", "weight": "4100 g", "price": 23000, @@ -14,8 +13,7 @@ "id": "mosin44_ebr", "copy-from": "mosin44", "type": "GUN", - "name": "Mosin-Nagant M44-EBR", - "name_plural": "Mosin-Nagant M44-EBR", + "name": { "str": "Mosin-Nagant M44-EBR", "str_pl": "Mosin-Nagant M44-EBR" }, "description": "This carbine packs the classic Mosin-Nagant model 44 action in a modern-day stock capable of accepting modifications.", "weight": "4330 g", "material": [ "steel", "plastic" ], @@ -40,8 +38,7 @@ "copy-from": "rifle_manual", "looks_like": "ar15", "type": "GUN", - "name": "Mosin-Nagant 1891/30", - "name_plural": "Mosin-Nagant 1891/30", + "name": { "str": "Mosin-Nagant 1891/30", "str_pl": "Mosin-Nagant 1891/30" }, "description": "The Mosin-Nagant 1891/30 is a bolt action, internal magazine-fed, military rifle, developed by the Russian Empire, and later used and perfected by the Soviet Union.", "weight": "4000 g", "volume": "3 L", @@ -72,8 +69,7 @@ "id": "mosin91_30_ebr", "copy-from": "mosin91_30", "type": "GUN", - "name": "Mosin-Nagant 1891/30-EBR", - "name_plural": "Mosin-Nagant 1891/30-EBR", + "name": { "str": "Mosin-Nagant 1891/30-EBR", "str_pl": "Mosin-Nagant 1891/30-EBR" }, "description": "This Mosin-Nagant has exchanged the classic wooden stock for a modern synthetic model, carefully balanced to the same weight and handling yet offering support for modern accessories.", "weight": "4230 g", "material": [ "steel", "plastic" ], diff --git a/data/json/items/gun/762x25.json b/data/json/items/gun/762x25.json index b2a196d0ac7b0..a7ab587f9b115 100644 --- a/data/json/items/gun/762x25.json +++ b/data/json/items/gun/762x25.json @@ -44,8 +44,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "Tokarev TT-33", - "name_plural": "Tokarev TT-33", + "name": { "str": "Tokarev TT-33", "str_pl": "Tokarev TT-33" }, "//": "And it's therefore expensive.", "description": "The Tokarev TT-33 is an antique Russian semiautomatic pistol, famous for its durability, accuracy, and uncomfortable grip angle. It was chambered for the 7.62x25mm due to the popularity of the C96 pistol among Russian revolutionaries.", "weight": "870 g", diff --git a/data/json/items/gun/9mm.json b/data/json/items/gun/9mm.json index 6db4ec28df1d3..28d57c341a11f 100644 --- a/data/json/items/gun/9mm.json +++ b/data/json/items/gun/9mm.json @@ -4,8 +4,7 @@ "looks_like": "hk_mp5", "type": "GUN", "reload_noise_volume": 10, - "name": "Calico M960", - "name_plural": "Calico M960", + "name": { "str": "Calico M960", "str_pl": "Calico M960" }, "//": "Automatic variant. Cyclic fire rate: 750 rpm", "description": "The Calico M960 is an automatic carbine with a unique circular magazine that allows for high capacities and reduced recoil.", "weight": "2270 g", @@ -246,8 +245,7 @@ "looks_like": "hk_mp5", "type": "GUN", "reload_noise_volume": 10, - "name": "Kel-Tec SUB-2000", - "name_plural": "Kel-Tec SUB-2000", + "name": { "str": "Kel-Tec SUB-2000", "str_pl": "Kel-Tec SUB-2000" }, "description": "A uniquely designed pistol caliber carbine with an integral folding stock and that makes use of 9x19mm Glock magazines.", "weight": "1930 g", "volume": "1750 ml", @@ -287,8 +285,7 @@ "copy-from": "l_enforcer_45", "looks_like": "sw_619", "type": "GUN", - "name": "L2032 Lookout", - "name_plural": "L2032 Lookout", + "name": { "str": "L2032 Lookout", "str_pl": "L2032 Lookout" }, "description": "After the Enforcer's success, Leadworks LLC reworked their autorevolver design to cater to the 9x19mm market. The Lookout takes advantage of the smaller 9x19mm to hold a seventh round, without sacrificing the ease of handling or reloading the Enforcer made legendary. Comes with built in holographic and laser sights. Similar to other Leadworks products it doesn't accept third-party modifications.", "ammo": "9mm", "clip_size": 7, @@ -369,8 +366,7 @@ "looks_like": "ar15", "type": "GUN", "reload_noise_volume": 10, - "name": "pipe rifle: 9x19mm", - "name_plural": "pipe rifles: 9x19mm", + "name": { "str": "pipe rifle: 9x19mm", "str_pl": "pipe rifles: 9x19mm" }, "//": "Despite its quality, it IS a small rifle, although not as effective as a genuine pistol carbine.", "description": "A home-made rifle. It is simply a pipe attached to a stock, with a hammer to strike the single round it holds.", "weight": "2114 g", @@ -409,8 +405,7 @@ "copy-from": "smg_base", "looks_like": "hk_mp5", "type": "GUN", - "name": "Luty SMG: 9x19mm", - "name_plural": "Luty SMGs: 9x19mm", + "name": { "str": "Luty SMG: 9x19mm", "str_pl": "Luty SMGs: 9x19mm" }, "description": "A Luty pattern makeshift smoothbore SMG crudely constructed out of various steel parts using some of the more advanced powered hand tools; likely one of the most complex guns that are feasible to make outside of a machine shop, but still very unreliable. This one is chambered for 9x19mm cartridges and accepts STEN magazines, or alternatively custom-made makeshift ones.", "//": "Crafting recipe must make use of angle grinder, bench grinder, set square and vise, which don't yet exist in game.", "weight": "3274 g", @@ -484,8 +479,7 @@ "looks_like": "glock_17", "type": "GUN", "reload_noise_volume": 10, - "name": "TEC-9", - "name_plural": "TEC-9", + "name": { "str": "TEC-9", "str_pl": "TEC-9" }, "description": "The TEC-9 is a machine pistol made of cheap polymers and machine stamped parts. Its rise in popularity among criminals is largely due to its intimidating looks and low cost.", "weight": "1400 g", "volume": "500 ml", @@ -524,8 +518,7 @@ "copy-from": "pistol_base", "looks_like": "glock_17", "type": "GUN", - "name": "USP 9mm", - "name_plural": "USP 9mm", + "name": { "str": "USP 9mm", "str_pl": "USP 9mm" }, "description": "A popular pistol, widely used among law enforcement. Extensively tested for durability, it has been found to stay accurate even after being subjected to extreme abuse.", "weight": "770 g", "volume": "500 ml", @@ -549,8 +542,7 @@ "copy-from": "smg_base", "looks_like": "hk_mp5", "type": "GUN", - "name": "Uzi 9mm", - "name_plural": "Uzi 9mm", + "name": { "str": "Uzi 9mm", "str_pl": "Uzi 9mm" }, "//": "SMGs aren't as commercially traded as rifles/handguns/SGs, so no cite for price points. Total weight of gun 3500 grams. Current weight of folding stock 200 grams.", "description": "The Uzi 9x19mm has enjoyed immense popularity, selling more units than any other submachine gun. It is widely used as a personal defense weapon, or as a primary weapon by elite frontline forces.", "weight": "2700 g", diff --git a/data/json/items/gun/atgm.json b/data/json/items/gun/atgm.json index d40799d31dffb..c982061846071 100644 --- a/data/json/items/gun/atgm.json +++ b/data/json/items/gun/atgm.json @@ -4,8 +4,7 @@ "copy-from": "gun_base", "looks_like": "m79", "type": "GUN", - "name": "BGM-71F TOW", - "name_plural": "BGM-71F TOW", + "name": { "str": "BGM-71F TOW", "str_pl": "BGM-71F TOW" }, "description": "A launcher for anti-tank guided missiles, capable of being deployed as a crew-served weapon or mounted on vehicles. While fairly accurate, it isn't fire-and-forget.", "weight": "93000 g", "volume": "25 L", diff --git a/data/json/items/gun/bio.json b/data/json/items/gun/bio.json index 421e1f75697e7..5aa5835c8f2cd 100644 --- a/data/json/items/gun/bio.json +++ b/data/json/items/gun/bio.json @@ -88,8 +88,7 @@ { "id": "mut_quills", "type": "GUN", - "name": "Assault barbs", - "name_plural": "Assault barbs", + "name": { "str": "Assault barbs", "str_pl": "Assault barbs" }, "description": "this a pseudo item", "volume": "3 L", "price": 0, diff --git a/data/json/items/gun/blunderbuss.json b/data/json/items/gun/blunderbuss.json index cbd6e016dbf9f..16b77cea3666c 100644 --- a/data/json/items/gun/blunderbuss.json +++ b/data/json/items/gun/blunderbuss.json @@ -4,8 +4,7 @@ "looks_like": "remington_870", "type": "GUN", "reload_noise_volume": 10, - "name": "blunderbuss", - "name_plural": "blunderbusses", + "name": { "str": "blunderbuss", "str_pl": "blunderbusses" }, "description": "A homemade version of a crude precursor to the shotgun. Able to fire just about anything you put down the barrel, but it will degrade pretty quick.", "weight": "8267 g", "volume": "3 L", diff --git a/data/json/items/gun/shot.json b/data/json/items/gun/shot.json index 6e2a1db29ef91..ebc48a259e966 100644 --- a/data/json/items/gun/shot.json +++ b/data/json/items/gun/shot.json @@ -78,8 +78,7 @@ "copy-from": "shotgun_pump", "looks_like": "remington_870", "type": "GUN", - "name": "Kel-Tec KSG", - "name_plural": "Kel-Tec KSG", + "name": { "str": "Kel-Tec KSG", "str_pl": "Kel-Tec KSG" }, "description": "A bullpup pump-action shotgun, the Kel-Tec KSG uses a pair of magazine tubes to increase its capacity. Each tube has to be loaded separately, but this offers the option of loading different ammunition for different situations.", "weight": "1550 g", "volume": "4784 ml", @@ -112,8 +111,7 @@ "copy-from": "shotgun_base", "looks_like": "remington_870", "type": "GUN", - "name": "M1014 shotgun", - "name_plural": "M1014 shotguns", + "name": { "str": "M1014 shotgun", "str_pl": "M1014 shotguns" }, "description": "Benelli's first gas-operated shotgun, featuring dual pistons for enhanced reliability with various loads and a collapsible buttstock that reduces length by almost 8 inches. Adopted in 1999 as the M1014 Joint Service Combat Shotgun, the Benelli M4 is one of the finest combat shotguns available.", "weight": "3550 g", "volume": "2500 ml", @@ -143,8 +141,7 @@ "copy-from": "shotgun_pump_3gun", "looks_like": "remington_870", "type": "GUN", - "name": "Mossberg 500 Field", - "name_plural": "Mossberg 500 Field", + "name": { "str": "Mossberg 500 Field", "str_pl": "Mossberg 500 Field" }, "description": "The Mossberg 500 is a popular series of pump-action shotguns, often acquired for military use. It is noted for its high durability and low recoil. This one is fitted with a 28 inch barrel with sight rib.", "weight": "3180 g", "volume": "2500 ml", @@ -162,8 +159,7 @@ "id": "mossberg_500_security", "copy-from": "mossberg_500", "type": "GUN", - "name": "Mossberg 500 Security", - "name_plural": "Mossberg 500 Security", + "name": { "str": "Mossberg 500 Security", "str_pl": "Mossberg 500 Security" }, "description": "The Mossberg 500 is a popular series of pump-action shotguns, often acquired for military use. It is noted for its high durability and low recoil. This one is fitted with an 18.5 inch barrel.", "weight": "3062 g", "volume": "2900 ml", @@ -178,8 +174,7 @@ "id": "mossberg_590", "copy-from": "mossberg_500_security", "type": "GUN", - "name": "Mossberg 590A1", - "name_plural": "Mossberg 590A1", + "name": { "str": "Mossberg 590A1", "str_pl": "Mossberg 590A1" }, "description": "The Mossberg 590A1 is a military and police oriented version of the Mossberg 500. It features a heavier barrel, a bayonet lug, and a different magazine tube for easier cleaning and maintenance.", "weight": "3289 g", "volume": "2990 ml", @@ -281,8 +276,7 @@ "copy-from": "shotgun_pump_3gun", "//": "Tileset whitelist for shotguns.", "type": "GUN", - "name": "Remington 870 Wingmaster", - "name_plural": "Remington 870 Wingmaster", + "name": { "str": "Remington 870 Wingmaster", "str_pl": "Remington 870 Wingmaster" }, "description": "With over 10 million made, the Remington 870 is one of the most popular shotguns on the market, and finds use with hunters and law enforcement agencies alike thanks to its high accuracy and muzzle velocity. This one is a 28 inch barreled model for hunting fowl and game.", "weight": "3400 g", "volume": "2765 ml", diff --git a/data/json/items/gunmod/rail.json b/data/json/items/gunmod/rail.json index 7d4bdb2f6fa34..d4535c1dabc07 100644 --- a/data/json/items/gunmod/rail.json +++ b/data/json/items/gunmod/rail.json @@ -37,8 +37,7 @@ "id": "offset_sights", "copy-from": "improve_sights", "type": "GUNMOD", - "name": "offset iron sights", - "name_plural": "offset iron sights", + "name": { "str": "offset iron sights", "str_pl": "offset iron sights" }, "description": "An alternative set of iron sights mounted at 45° for use when a scope or other modification prevents use of the primary sights.", "location": "rail", "mod_targets": [ "smg", "rifle", "shotgun" ], diff --git a/data/json/items/gunmod/sights.json b/data/json/items/gunmod/sights.json index cc63410396543..69ff19c9ae92d 100644 --- a/data/json/items/gunmod/sights.json +++ b/data/json/items/gunmod/sights.json @@ -75,8 +75,7 @@ { "id": "improve_sights", "type": "GUNMOD", - "name": "iron sights", - "name_plural": "iron sights", + "name": { "str": "iron sights", "str_pl": "iron sights" }, "description": "A basic set of iron sights", "weight": "60 g", "volume": "250 ml", diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json index b90b613fe1bc7..89b8a605b4ee8 100644 --- a/data/json/items/gunmod/underbarrel.json +++ b/data/json/items/gunmod/underbarrel.json @@ -245,8 +245,7 @@ { "id": "m203", "type": "GUNMOD", - "name": "M203", - "name_plural": "M203", + "name": { "str": "M203", "str_pl": "M203" }, "description": "The M203 was originally designed for use with M16 variants but today can be attached to almost any rifle. It allows a single 40mm grenade to be loaded and fired.", "weight": "1360 g", "volume": "500 ml", @@ -271,8 +270,7 @@ { "id": "m320_mod", "type": "GUNMOD", - "name": "M320 GLM", - "name_plural": "M320 GLM", + "name": { "str": "M320 GLM", "str_pl": "M320 GLM" }, "description": "The M320 Grenade Launcher Module offers the functionality of larger launchers in a very small package at the cost of decreased accuracy. It can be either attached to a rifle or combined with a buttstock for stand alone use.", "weight": "1500 g", "volume": "500 ml", @@ -482,8 +480,7 @@ "id": "lead_glm", "copy-from": "m320_mod", "type": "GUNMOD", - "name": "LW GLM", - "name_plural": "LW GLM", + "name": { "str": "LW GLM", "str_pl": "LW GLM" }, "description": "The Leadworks built in Grenade Launcher Module offers the functionality of larger launchers in a very small package.", "weight": "0 g", "volume": 0, diff --git a/data/json/items/items_holiday.json b/data/json/items/items_holiday.json index a8d7f1ca215fc..c4d403f8246ed 100644 --- a/data/json/items/items_holiday.json +++ b/data/json/items/items_holiday.json @@ -27,8 +27,7 @@ { "id": "plastic_jack_o_lantern_lit", "type": "TOOL", - "name": "spooky jack o'lantern", - "name_plural": "jack o'lanterns", + "name": { "str": "spooky jack o'lantern", "str_pl": "jack o'lanterns" }, "description": "There is a thick LED candle inside the pumpkin face. It doesn't provide very much light, but it can burn for quite a long time. This candle is lit. The face shifts.", "weight": "113 g", "volume": "3964 ml", diff --git a/data/json/items/melee.json b/data/json/items/melee.json index 144c9e295d29e..59f447a5d56d1 100644 --- a/data/json/items/melee.json +++ b/data/json/items/melee.json @@ -19,8 +19,7 @@ "id": "bolas", "type": "AMMO", "category": "weapons", - "name": "bolas", - "name_plural": "bolases", + "name": { "str": "bolas", "str_pl": "bolases" }, "description": "Some ropes with weights, designed to tangle the legs of a target when thrown, usually at an animal. Used by the Gauchos of Argentina.", "weight": "400 g", "volume": "750 ml", @@ -170,8 +169,7 @@ { "type": "GENERIC", "id": "bowling_axe", - "name": "The 7-10 Split", - "name_plural": "7-10 Splits", + "name": { "str": "The 7-10 Split", "str_pl": "7-10 Splits" }, "description": "An improvised weapon, made from two spikes attached to a bowling pin in the shape of a 'T'.", "weight": "2433 g", "to_hit": -1, @@ -191,8 +189,7 @@ "id": "knuckle_nail", "symbol": "]", "color": "brown", - "name": "pair of nail knuckles", - "name_plural": "pairs of nail knuckles", + "name": { "str": "pair of nail knuckles", "str_pl": "pairs of nail knuckles" }, "description": "A pair of knuckles consisting of two small squares of wood with several nails coming through them. Useful in nasty street fights.", "material": "wood", "volume": "250 ml", @@ -314,8 +311,7 @@ { "type": "GENERIC", "id": "bio_claws_weapon", - "name": "bionic claws", - "name_plural": "bionic claws", + "name": { "str": "bionic claws", "str_pl": "bionic claws" }, "description": "Short and sharp claws made from a high-tech metal.", "to_hit": 4, "color": "light_gray", @@ -363,8 +359,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, @@ -382,8 +377,7 @@ "id": "knuckle_steel", "symbol": "3", "color": "dark_gray", - "name": "pair of steel knuckles", - "name_plural": "pairs of steel knuckles", + "name": { "str": "pair of steel knuckles", "str_pl": "pairs of steel knuckles" }, "description": "A mass of scrap metal crudely beat into shape, with folded rags underneath to protect the wearers knuckles. A good, quick weapon - but you have to get within punching range to use it.", "material": "steel", "volume": "250 ml", @@ -413,8 +407,7 @@ "id": "cestus", "symbol": "3", "color": "light_gray", - "name": "cestus", - "name_plural": "cestuses", + "name": { "str": "cestus", "str_pl": "cestuses" }, "description": "A leather hand and arm wrap incorporating metal plates over the knuckles to improve punching power and defence.", "material": [ "leather", "steel" ], "volume": "100 ml", @@ -427,8 +420,7 @@ "id": "knuckle_brass", "symbol": "3", "color": "yellow", - "name": "pair of brass knuckles", - "name_plural": "pairs of brass knuckles", + "name": { "str": "pair of brass knuckles", "str_pl": "pairs of brass knuckles" }, "category": "weapons", "description": "A metal weapon made of brass, designed to be gripped in the palm and cause punches to do extra damage. A good, quick weapon - but you have to get within punching range to use it.", "material": "brass", @@ -474,8 +466,7 @@ "id": "rock_sock", "symbol": ";", "color": "white", - "name": "rock in a sock", - "name_plural": "rocks in socks", + "name": { "str": "rock in a sock", "str_pl": "rocks in socks" }, "description": "A pair of nested socks filled with a stone. A true weapon of despair.", "price": 1000, "price_postapoc": 300, @@ -505,8 +496,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/bludgeons.json b/data/json/items/melee/bludgeons.json index e40977b669065..e6e0566ede4ae 100644 --- a/data/json/items/melee/bludgeons.json +++ b/data/json/items/melee/bludgeons.json @@ -106,8 +106,7 @@ "type": "GENERIC", "id": "baton-extended", "category": "weapons", - "name": "expandable baton (extended)", - "name_plural": "expandable batons (extended)", + "name": { "str": "expandable baton (extended)", "str_pl": "expandable batons (extended)" }, "description": "A telescoping baton that collapses for easy storage. Makes an excellent melee weapon. Activate to collapse.", "weight": "725 g", "to_hit": 2, @@ -126,8 +125,7 @@ "id": "q_staff", "symbol": "/", "color": "brown", - "name": "quarterstaff", - "name_plural": "quarterstaves", + "name": { "str": "quarterstaff", "str_pl": "quarterstaves" }, "description": "A smooth and sturdy staff with a leather-wrapped grip. Light and well-balanced, it is surprisingly easy to handle.", "price": 4000, "material": "wood", @@ -144,8 +142,7 @@ "id": "i_staff", "symbol": "/", "color": "brown", - "name": "ironshod quarterstaff", - "name_plural": "ironshod quarterstaves", + "name": { "str": "ironshod quarterstaff", "str_pl": "ironshod quarterstaves" }, "description": "A smooth and sturdy staff with a leather-wrapped grip, which has been reinforced with metal bands and caps. Durable and well-balanced, it is surprisingly easy to handle.", "price": 6000, "material": [ "wood", "iron" ], @@ -162,8 +159,7 @@ "id": "shock_staff", "type": "TOOL", "category": "weapons", - "name": "powered quarterstaff", - "name_plural": "powered quarterstaves", + "name": { "str": "powered quarterstaff", "str_pl": "powered quarterstaves" }, "description": "This is an ironshod quarterstaff that has a high-voltage stun gun built into the handle. The stun gun is wired to the metal caps at either end of the staff, allowing you to zap a dangerous opponent should beating them senseless with it prove too hazardous.", "weight": "2351 g", "volume": "3250 ml", @@ -191,8 +187,7 @@ "id": "shocktonfa_off", "type": "TOOL", "category": "weapons", - "name": "tactical tonfa (off)", - "name_plural": "tactical tonfas (off)", + "name": { "str": "tactical tonfa (off)", "str_pl": "tactical tonfas (off)" }, "description": "This is a reinforced plastic tonfa; the core is hollowed out and is filled with capacitors and a high-yield rechargeable storage battery. When a switch on the handle is pressed, a high-voltage current is transmitted to the two electrodes mounted in the end of the tonfa, and by extension to anyone unfortunate enough to be in contact with them. It also has a nifty flashlight, which is off at the moment.", "weight": "726 g", "volume": "2250 ml", @@ -219,8 +214,7 @@ "id": "shocktonfa_on", "copy-from": "shocktonfa_off", "type": "TOOL", - "name": "tactical tonfa (on)", - "name_plural": "tactical tonfas (on)", + "name": { "str": "tactical tonfa (on)", "str_pl": "tactical tonfas (on)" }, "description": "This is a reinforced plastic tonfa; the core is hollowed out and is filled with capacitors and a high-yield rechargeable storage battery. When a switch on the handle is pressed, a high-voltage current is transmitted to the two electrodes mounted in the end of the weapon, and by extension to anyone unfortunate enough to be in contact with them. The integral flashlight is turned on, continually draining power and lighting the surrounding area.", "power_draw": 15000, "revert_to": "shocktonfa_off", @@ -422,8 +416,7 @@ "type": "GENERIC", "id": "PR24-retracted", "category": "weapons", - "name": "PR-24 baton (retracted)", - "name_plural": "PR-24 batons (retracted)", + "name": { "str": "PR-24 baton (retracted)", "str_pl": "PR-24 batons (retracted)" }, "description": "The Monadnock PR-24 baton is a collapsible, lightweight, side-handle baton used by law enforcement all over the world. The PR designation is rumored to mean Public Relations. Activate to extend.", "weight": "680 g", "to_hit": 1, @@ -441,8 +434,7 @@ "type": "GENERIC", "id": "PR24-extended", "category": "weapons", - "name": "PR-24 baton (extended)", - "name_plural": "PR-24 batons (extended)", + "name": { "str": "PR-24 baton (extended)", "str_pl": "PR-24 batons (extended)" }, "description": "The Monadnock PR-24 baton is a collapsible, lightweight, side-handle baton used by law enforcement all over the world. The PR designation is rumored to mean Public Relations. Activate to retract.", "weight": "680 g", "to_hit": 2, @@ -517,8 +509,7 @@ "id": "l-stick", "type": "TOOL", "category": "weapons", - "name": "L-stick (off)", - "name_plural": "L-sticks (off)", + "name": { "str": "L-stick (off)", "str_pl": "L-sticks (off)" }, "description": "Produced by the Light corporation, this stylish staff not only functions as a light source, but doubles as a light-weight weapon, due to the superalloy materials it is made of. Due to proprietary efficiency improvements over standard light sources, the L-stick or light stick as it is commonly called, batteries last longer than other light sources.", "weight": "1000 g", "volume": "3 L", @@ -552,8 +543,7 @@ "id": "l-stick_on", "copy-from": "l-stick", "type": "TOOL", - "name": "L-stick (on)", - "name_plural": "L-sticks (on)", + "name": { "str": "L-stick (on)", "str_pl": "L-sticks (on)" }, "description": "Produced by the Light corporation, this stylish staff not only functions as a light source, but doubles as a light-weight weapon, due to the superalloy materials it is made of. Due to proprietary efficiency improvements over standard light sources, the L-stick or light stick as it is commonly called, batteries last longer than other light sources. The staff is glowing brightly, which is slowly draining the batteries.", "material": [ "superalloy", "steel" ], "revert_to": "l-stick", @@ -610,8 +600,7 @@ "id": "battletorch_lit", "type": "TOOL", "category": "weapons", - "name": "Louisville Slaughterer", - "name_plural": "Louisville Slaughterers", + "name": { "str": "Louisville Slaughterer", "str_pl": "Louisville Slaughterers" }, "description": "This is a sturdy wood bat, wrapped in gasoline-soaked rags and flame-resistant Nomex fabric. It is burning brightly, and makes it much easier to see the baselines at night games (It also makes the umpire FAR more likely to call a ball instead of a strike).", "weight": "1485 g", "volume": "2 L", diff --git a/data/json/items/melee/knives_kitchen.json b/data/json/items/melee/knives_kitchen.json index 03be51eec5b49..dfd089c8b249d 100644 --- a/data/json/items/melee/knives_kitchen.json +++ b/data/json/items/melee/knives_kitchen.json @@ -10,8 +10,7 @@ }, { "id": "knife_butcher", - "name": "butcher knife", - "name_plural": "butcher knives", + "name": { "str": "butcher knife", "str_pl": "butcher knives" }, "type": "TOOL", "category": "weapons", "description": "This is a sharp, heavy knife. It makes a good melee weapon, and is an ideal item for butchering corpses.", @@ -26,8 +25,7 @@ }, { "id": "knife_steak", - "name": "steak knife", - "name_plural": "steak knives", + "name": { "str": "steak knife", "str_pl": "steak knives" }, "type": "TOOL", "category": "weapons", "description": "This is a sharp knife, designed for cutting meat. It makes a poor melee weapon, but is decent at butchering corpses.", @@ -43,8 +41,7 @@ }, { "id": "knife_paring", - "name": "paring knife", - "name_plural": "paring knives", + "name": { "str": "paring knife", "str_pl": "paring knives" }, "type": "TOOL", "category": "weapons", "description": "This is a short-bladed knife with a sharp blade, made for fine controlled cuts to vegetables without using a cutting board.", @@ -61,8 +58,7 @@ }, { "id": "knife_chef", - "name": "chef knife", - "name_plural": "chef knives", + "name": { "str": "chef knife", "str_pl": "chef knives" }, "type": "TOOL", "category": "weapons", "description": "This is a long-bladed kitchen knife. The blade is wider than the handle, giving room for the wielder's knuckles, and it has a characteristic curve for a fast rocking action for chopping vegetables. It makes a good melee weapon, but the wide blade is unwieldy for butchering.", @@ -78,8 +74,7 @@ }, { "id": "knife_carving", - "name": "carving knife", - "name_plural": "carving knives", + "name": { "str": "carving knife", "str_pl": "carving knives" }, "type": "TOOL", "category": "weapons", "description": "This is a long-bladed kitchen knife with a thin, slightly curved blade for deftly slicing meat either in flat sheets or around the bone. It would be a decent melee weapon, and excellent for butchery.", @@ -95,8 +90,7 @@ }, { "id": "knife_bread", - "name": "bread knife", - "name_plural": "bread knives", + "name": { "str": "bread knife", "str_pl": "bread knives" }, "type": "TOOL", "category": "weapons", "description": "This knife has quite a long blade with a scalloped edge for cutting bread. It's not that sharp, but its length and heft mean it could do a bit of damage and cause some nasty tearing.", diff --git a/data/json/items/melee/spears_and_polearms.json b/data/json/items/melee/spears_and_polearms.json index ab84ca79b7891..6c868fe2744c3 100644 --- a/data/json/items/melee/spears_and_polearms.json +++ b/data/json/items/melee/spears_and_polearms.json @@ -294,8 +294,7 @@ { "type": "GENERIC", "id": "naginata", - "name": "naginata", - "name_plural": "naginata", + "name": { "str": "naginata", "str_pl": "naginata" }, "description": "A sturdy polearm with a curved blade, made in the same manner as the katana and other Japanese blades. Occasionally used by samurai in early periods, or by their wives in defense of the household.", "weight": "1700 g", "to_hit": 2, @@ -313,8 +312,7 @@ { "type": "GENERIC", "id": "naginata_inferior", - "name": "naginata", - "name_plural": "naginata", + "name": { "str": "naginata", "str_pl": "naginata" }, "description": "A sturdy polearm with a curved blade, made in the same manner as the katana and other Japanese blades. This one has a bit of wiggle to its blade and feels a bit shoddily made.", "weight": "1700 g", "color": "light_gray", @@ -332,8 +330,7 @@ { "type": "GENERIC", "id": "naginata_fake", - "name": "naginata", - "name_plural": "naginata", + "name": { "str": "naginata", "str_pl": "naginata" }, "description": "This is a dull, slightly floppy replica of a Japanese polearm with a curved blade. With a little difficulty, you could use it administer a solid slap from a distance.", "weight": "1400 g", "color": "light_gray", @@ -350,8 +347,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, @@ -485,8 +481,7 @@ { "id": "spear_dory", "type": "GENERIC", - "name": "dory", - "name_plural": "dories", + "name": { "str": "dory", "str_pl": "dories" }, "description": "A well-made spear with a bronze head, Greek in origin.", "weight": "1598 g", "volume": "3500 ml", @@ -504,8 +499,7 @@ { "id": "ji", "type": "GENERIC", - "name": "ji", - "name_plural": "ji", + "name": { "str": "ji", "str_pl": "ji" }, "//": "Couldn't find a good way to pluralize the transliteration.", "description": "This is a bronze polearm that originated in the Shang dynasty of China, if not earlier. It combines a spear head with the perpendicular blade of the earlier ge or dagger-axe.", "weight": "3175 g", diff --git a/data/json/items/melee/swords_and_blades.json b/data/json/items/melee/swords_and_blades.json index a7238c8428c8d..4636ea3b67e3a 100644 --- a/data/json/items/melee/swords_and_blades.json +++ b/data/json/items/melee/swords_and_blades.json @@ -67,8 +67,7 @@ { "id": "knife_folding", "type": "TOOL", - "name": "folding knife", - "name_plural": "folding knives", + "name": { "str": "folding knife", "str_pl": "folding knives" }, "description": "This is a small folding knife, with a locking blade and a pocket clip. Not as good a weapon as a solid fixed-blade knife, but better than a penknife.", "weight": "256 g", "volume": "250 ml", @@ -85,8 +84,7 @@ "id": "knife_combat", "type": "TOOL", "category": "weapons", - "name": "combat knife", - "name_plural": "combat knives", + "name": { "str": "combat knife", "str_pl": "combat knives" }, "description": "This is a military combat knife. It is light and extremely sharp, and could be deadly in either the right hands or when attached as a bayonet.", "weight": "558 g", "volume": "500 ml", @@ -112,8 +110,7 @@ "id": "knife_combat_mod", "copy-from": "knife_combat", "type": "TOOL", - "name": "modified combat knife", - "name_plural": "modified combat knives", + "name": { "str": "modified combat knife", "str_pl": "modified combat knives" }, "description": "This is a military combat knife. It is light and extremely sharp, and could be deadly in either the right hands or when attached as a bayonet. This one was modified and customized to mount on pretty much any weapon other than pistols, if you so want.", "gunmod_data": { "location": "underbarrel", @@ -126,8 +123,7 @@ "id": "knife_hunting", "type": "TOOL", "category": "weapons", - "name": "hunting knife", - "name_plural": "hunting knives", + "name": { "str": "hunting knife", "str_pl": "hunting knives" }, "//": "Highest non-powertool butchering quality. It's made for skinning and butchering game, which is what you're generally doing.", "description": "Commonly used by hunters, this single-edge sheath knife is designed for cutting and skinning game rather than combat.", "weight": "390 g", @@ -144,8 +140,7 @@ "id": "knife_rambo", "type": "TOOL", "category": "weapons", - "name": "survival knife", - "name_plural": "survival knives", + "name": { "str": "survival knife", "str_pl": "survival knives" }, "//": "This isn't really supposed to be a very good knife, or a very good saw. It's more for looking scary.", "description": "This massive knife features a hollow handle with a compass built into the pommel and a row of fearsome looking saw teeth along the back of its blade.", "weight": "612 g", @@ -164,8 +159,7 @@ "id": "knife_rm42", "type": "TOOL", "category": "weapons", - "name": "RM42 fighting knife", - "name_plural": "RM42 fighting knives", + "name": { "str": "RM42 fighting knife", "str_pl": "RM42 fighting knives" }, "description": "This sturdy matte black Rivtech combat dagger features a long and slim double-edged blade with a spear-point and a distinctive slip-resistant grip which can also be used to affix it to a suitable firearm. Originally manufactured for the military, it was very popular in films and among collectors due to its fearsome appearance.", "weight": "188 g", "volume": "750 ml", @@ -190,8 +184,7 @@ { "id": "knife_swissarmy", "type": "TOOL", - "name": "Swiss Army knife", - "name_plural": "Swiss Army knives", + "name": { "str": "Swiss Army knife", "str_pl": "Swiss Army knives" }, "//": "The swiss army knife is a bit more of a knife than a toolkit.", "description": "An iconic pocket knife imported from Europe. Its red plastic handle conceals many small tools.", "weight": "246 g", @@ -209,8 +202,7 @@ "id": "knife_trench", "type": "TOOL", "category": "weapons", - "name": "trench knife", - "name_plural": "trench knives", + "name": { "str": "trench knife", "str_pl": "trench knives" }, "description": "This stout combat knife features a steel guard to protect the user's knuckles. The guard can also be used for striking or blocking, and the knife can also be used to butcher corpses.", "weight": "608 g", "volume": "500 ml", @@ -228,8 +220,7 @@ { "id": "makeshift_knife", "type": "TOOL", - "name": "makeshift knife", - "name_plural": "makeshift knives", + "name": { "str": "makeshift knife", "str_pl": "makeshift knives" }, "description": "A knife consisting of a long, somewhat sharpened, spike and a tightly wrapped rag as a handle. It makes a good melee weapon.", "weight": "550 g", "volume": "500 ml", @@ -285,8 +276,7 @@ "id": "firemachete_off", "type": "TOOL", "category": "weapons", - "name": "No. 9", - "name_plural": "No. 9's", + "name": { "str": "No. 9", "str_pl": "No. 9's" }, "description": "This huge steel knife has been modified with a fuel tank, insulated handguard, and ignition system. When filled with gasoline, a system of torches heats the blade, burning your target.", "weight": "1814 g", "volume": "1500 ml", @@ -318,8 +308,7 @@ "id": "firemachete_on", "type": "TOOL", "category": "weapons", - "name": "No. 9", - "name_plural": "No. 9's", + "name": { "str": "No. 9", "str_pl": "No. 9's" }, "description": "This huge steel knife has been modified with a fuel tank, insulated handguard, and ignition system. The blade is glowing with heat, making it a great plant scorcher and nightlight.", "weight": "1814 g", "volume": "1500 ml", @@ -374,8 +363,7 @@ "id": "kris", "type": "TOOL", "category": "weapons", - "name": "kris", - "name_plural": "krises", + "name": { "str": "kris", "str_pl": "krises" }, "description": "This wavy bladed dagger comes from Southeast Asia. The design of the blade causes it to make broad, painful wounds.", "weight": "558 g", "volume": "750 ml", @@ -414,8 +402,7 @@ "type": "TOOL", "symbol": "/", "color": "light_gray", - "name": "jian", - "name_plural": "jian", + "name": { "str": "jian", "str_pl": "jian" }, "description": "This is an ancient Chinese doubled-edged straight sword, with an ornate guard and a tassel attached to the pommel. One of the four major weapons in folklore, alongside the dao sabre, qiang spear, and gun staff.", "price": 100000, "material": "steel", @@ -434,8 +421,7 @@ "type": "TOOL", "symbol": "/", "color": "light_gray", - "name": "jian", - "name_plural": "jian", + "name": { "str": "jian", "str_pl": "jian" }, "description": "This is an ancient Chinese doubled-edged straight sword. The sword is quite worn, and bent at an odd angle.", "price": 100000, "material": "budget_steel", @@ -454,8 +440,7 @@ "type": "GENERIC", "symbol": "/", "color": "light_gray", - "name": "jian", - "name_plural": "jian", + "name": { "str": "jian", "str_pl": "jian" }, "description": "This is a dull, cheaply made replica of an ancient Chinese doubled-edged straight sword, with an ornate guard.", "price": 10000, "price_postapoc": 0, @@ -703,8 +688,7 @@ "id": "sword_xiphos", "type": "TOOL", "category": "weapons", - "name": "xiphos", - "name_plural": "xiphoses", + "name": { "str": "xiphos", "str_pl": "xiphoses" }, "description": "A bronze sword of ancient Greek origin, wielded as a sidearm to the dory spear.", "weight": "800 g", "volume": "2 L", @@ -723,8 +707,7 @@ "id": "khopesh", "type": "TOOL", "category": "weapons", - "name": "khopesh", - "name_plural": "khopeshes", + "name": { "str": "khopesh", "str_pl": "khopeshes" }, "description": "This ancient bronze weapon features a curved, sickle-like blade sharpened on the outside edge. Associated with the New Kingdom period of ancient Egypt, it was designed mainly to hack through the light armor common to the region.", "weight": "750 g", "volume": "1750 ml", @@ -743,8 +726,7 @@ "id": "dao", "type": "TOOL", "category": "weapons", - "name": "dao", - "name_plural": "dao", + "name": { "str": "dao", "str_pl": "dao" }, "description": "An ancient Chinese sword consisting of a curved blade and a guard with a cupped design. Existing since the Shang dynasty, this one is made of bronze. One of the four major weapons in folklore, alongside the jian sword, qiang spear, and gun staff.", "weight": "850 g", "volume": "1750 ml", @@ -834,8 +816,7 @@ "id": "wakizashi", "type": "TOOL", "category": "weapons", - "name": "wakizashi", - "name_plural": "wakizashi", + "name": { "str": "wakizashi", "str_pl": "wakizashi" }, "description": "This is a comparatively-common Japanese short sword. Smaller and lighter than a katana, but still effective in combat.", "weight": "835 g", "volume": "1500 ml", @@ -854,8 +835,7 @@ "id": "zweifire_off", "type": "TOOL", "category": "weapons", - "name": "flammenschwert (aus)", - "name_plural": "flammenschwerter (aus)", + "name": { "str": "flammenschwert (aus)", "str_pl": "flammenschwerter (aus)" }, "//": "All of this is SUPPOSED to be in German.", "description": "Ein großes zweihändiges Schwert aus Deutschland, an dessen Klinge sich, unter Zuführung von Benzin, eine anhaltende Flamme erzeugen lässt. Es ist eine sehr mächtige Waffe.", "weight": "3400 g", @@ -885,8 +865,7 @@ "id": "zweifire_on", "type": "TOOL", "category": "weapons", - "name": "flammenschwert", - "name_plural": "flammenschwerter", + "name": { "str": "flammenschwert", "str_pl": "flammenschwerter" }, "//": "All of this is SUPPOSED to be in German.", "description": "Ein großes zweihändiges Schwert aus Deutschland, an dessen Klinge sich, unter Zuführung von Benzin, eine anhaltende Flamme erzeugen lässt. Es ist eine sehr mächtige Waffe.", "weight": "3400 g", @@ -1015,8 +994,7 @@ "id": "nodachi", "type": "TOOL", "category": "weapons", - "name": "nodachi", - "name_plural": "nodachi", + "name": { "str": "nodachi", "str_pl": "nodachi" }, "description": "This is a huge, curved, two-handed sword from Japan. It is surprisingly light for its size.", "weight": "2822 g", "volume": "3250 ml", @@ -1036,8 +1014,7 @@ "type": "GENERIC", "symbol": "/", "color": "light_gray", - "name": "nodachi", - "name_plural": "nodachi", + "name": { "str": "nodachi", "str_pl": "nodachi" }, "description": "This is a dull, cheaply made replica of a huge, curved, two-handed sword from Japan. It is surprisingly light for its size.", "price": 15000, "price_postapoc": 0, @@ -1056,8 +1033,7 @@ "type": "GENERIC", "symbol": "/", "color": "light_gray", - "name": "nodachi", - "name_plural": "nodachi", + "name": { "str": "nodachi", "str_pl": "nodachi" }, "description": "This is a huge, curved, two-handed sword from Japan. It is surprisingly light for its size, but also much bendier than a sword should be.", "price": 15000, "price_postapoc": 0, @@ -1296,8 +1272,7 @@ "id": "broadfire_off", "type": "TOOL", "category": "weapons", - "name": "firebrand (off)", - "name_plural": "firebrands (off)", + "name": { "str": "firebrand (off)", "str_pl": "firebrands (off)" }, "description": "This is a combination of two Dark Age conflict-resolution classics, the broadsword and the torch. Use to light it up and show those heathen zombies who's Lord around here.", "weight": "1474 g", "volume": "2250 ml", @@ -1327,8 +1302,7 @@ "id": "broadfire_on", "copy-from": "broadfire_off", "type": "TOOL", - "name": "firebrand (on)", - "name_plural": "firebrands (on)", + "name": { "str": "firebrand (on)", "str_pl": "firebrands (on)" }, "description": "This is a combination of two Dark Age conflict-resolution classics, the broadsword and the torch. The blade is glowing with heat. Excalibur can eat its heart out. Use to shut it off.", "turns_per_charge": 30, "revert_to": "broadfire_off", @@ -1350,8 +1324,7 @@ "type": "GENERIC", "symbol": "/", "color": "dark_gray", - "name": "cutlass", - "name_plural": "cutlasses", + "name": { "str": "cutlass", "str_pl": "cutlasses" }, "description": "This is a dull, cheaply made replica of a broad saber known for its use by sailors and pirates.", "price": 9600, "price_postapoc": 0, @@ -1370,8 +1343,7 @@ "type": "TOOL", "symbol": "/", "color": "dark_gray", - "name": "cutlass", - "name_plural": "cutlasses", + "name": { "str": "cutlass", "str_pl": "cutlasses" }, "description": "This is a broad saber known for its use by sailors and pirates. This sword appears to be made very poorly, but it should still stand up to a few swings.", "price": 96000, "material": "budget_steel", @@ -1465,8 +1437,7 @@ "id": "firekatana_off", "type": "TOOL", "category": "weapons", - "name": "Rising Sun", - "name_plural": "Rising Suns", + "name": { "str": "Rising Sun", "str_pl": "Rising Suns" }, "description": "This is a katana with a nozzle just behind the cutting edge of the blade. People love fire, and people love katanas, so why not put them together? The gas burners attached to this blade can really turn up the heat on your foes. Use to ignite.", "weight": "1400 g", "volume": "2250 ml", @@ -1495,8 +1466,7 @@ "id": "firekatana_on", "type": "TOOL", "category": "weapons", - "name": "Rising Sun", - "name_plural": "Rising Suns", + "name": { "str": "Rising Sun", "str_pl": "Rising Suns" }, "description": "This is a katana that glows with the fury and heat of the SUN! Well, okay it's not THAT hot, but getting hit with it still stings like the dickens. Use to shut off the gas.", "weight": "1400 g", "volume": "2250 ml", @@ -1643,8 +1613,7 @@ "type": "TOOL", "symbol": "/", "color": "light_gray", - "name": "wakizashi", - "name_plural": "wakizashi", + "name": { "str": "wakizashi", "str_pl": "wakizashi" }, "description": "This is a comparatively-common Japanese short sword. There's something not quite right about this sword.", "price": 17800, "material": "budget_steel", @@ -1663,8 +1632,7 @@ "type": "GENERIC", "symbol": "/", "color": "dark_gray", - "name": "kris", - "name_plural": "krises", + "name": { "str": "kris", "str_pl": "krises" }, "description": "This is a dull, cheap replica of a wavy bladed dagger that comes from Southeast Asia.", "price": 3800, "price_postapoc": 0, @@ -1683,8 +1651,7 @@ "type": "TOOL", "symbol": "/", "color": "light_gray", - "name": "pair of butterfly swords", - "name_plural": "pairs of butterfly swords", + "name": { "str": "pair of butterfly swords", "str_pl": "pairs of butterfly swords" }, "description": "This is a matched pair of traditional Shaolin butterfly swords. They are about the size of machetes but have hand guards and wider blades.", "//": "basically 2x the weight, 1.3x the damage, 2.5x the resources of a single machete to cover the fact that it's two weapons, each with a hand guard", "price": 50000, @@ -1704,8 +1671,7 @@ "id": "cs_lajatang_off", "type": "TOOL", "category": "weapons", - "name": "chainsaw lajatang (off)", - "name_plural": "chainsaw lajatangs (off)", + "name": { "str": "chainsaw lajatang (off)", "str_pl": "chainsaw lajatangs (off)" }, "description": "A long wooden pole with chainsaws impractically attached to both ends. The product of either genius or insanity, but not both; the weight ensures that only someone both strong and very skilled could possibly hope to use it.", "weight": "14254 g", "volume": "7500 ml", @@ -1726,8 +1692,7 @@ "id": "cs_lajatang_on", "copy-from": "cs_lajatang_off", "type": "TOOL", - "name": "chainsaw lajatang (on)", - "name_plural": "chainsaw lajatangs (on)", + "name": { "str": "chainsaw lajatang (on)", "str_pl": "chainsaw lajatangs (on)" }, "description": "A long wooden pole with chainsaws impractically attached to both ends. They are currently on and draining gasoline; use this item to turn them off.", "bashing": 4, "cutting": 140, @@ -1741,8 +1706,7 @@ { "id": "ecs_lajatang_off", "type": "TOOL", - "name": "electric chainsaw lajatang (off)", - "name_plural": "electric chainsaw lajatangs (off)", + "name": { "str": "electric chainsaw lajatang (off)", "str_pl": "electric chainsaw lajatangs (off)" }, "description": "A long wooden pole with electric chainsaws impractically attached to both ends. The product of either genius or insanity, but not both; the weight ensures that only someone both strong and very skilled could possibly hope to use it.", "weight": "14254 g", "volume": "7500 ml", @@ -1766,8 +1730,7 @@ "id": "ecs_lajatang_on", "copy-from": "ecs_lajatang_off", "type": "TOOL", - "name": "electric chainsaw lajatang (on)", - "name_plural": "electric chainsaw lajatangs (on)", + "name": { "str": "electric chainsaw lajatang (on)", "str_pl": "electric chainsaw lajatangs (on)" }, "description": "A long wooden pole with electric chainsaws impractically attached to both ends. They are currently on and draining power; use this item to turn them off.", "bashing": 4, "cutting": 140, @@ -1782,8 +1745,7 @@ "id": "cutlass", "type": "TOOL", "category": "weapons", - "name": "cutlass", - "name_plural": "cutlasses", + "name": { "str": "cutlass", "str_pl": "cutlasses" }, "description": "This is a broad saber known for its use by sailors and pirates, as its short blade is easy to handle in close quarters.", "weight": "955 g", "volume": "1250 ml", @@ -1820,8 +1782,7 @@ "id": "combatsaw_off", "type": "TOOL", "category": "weapons", - "name": "combat chainsaw (off)", - "name_plural": "combat chainsaws (off)", + "name": { "str": "combat chainsaw (off)", "str_pl": "combat chainsaws (off)" }, "description": "This is a chainsaw that has been lightened, tuned, and extensively modified to be a more effective weapon. Unfortunately these modifications have rendered it much less effective as a woodcutting tool.", "weight": "5122 g", "volume": "2250 ml", @@ -1842,8 +1803,7 @@ "id": "combatsaw_on", "copy-from": "combatsaw_off", "type": "TOOL", - "name": "combat chainsaw (on)", - "name_plural": "combat chainsaws (on)", + "name": { "str": "combat chainsaw (on)", "str_pl": "combat chainsaws (on)" }, "description": "This combat chainsaw is on, and is continuously draining gasoline. Use it to turn it off.", "to_hit": -4, "cutting": 82, @@ -1858,8 +1818,7 @@ "id": "e_combatsaw_off", "type": "TOOL", "category": "weapons", - "name": "electric combat chainsaw (off)", - "name_plural": "electric combat chainsaws (off)", + "name": { "str": "electric combat chainsaw (off)", "str_pl": "electric combat chainsaws (off)" }, "description": "This is an electric chainsaw that has been lightened, tuned, and extensively modified to be a more effective weapon. Unfortunately these modifications have rendered it much less effective as a woodcutting tool.", "weight": "5122 g", "volume": "2250 ml", @@ -1886,8 +1845,7 @@ "id": "e_combatsaw_on", "copy-from": "e_combatsaw_off", "type": "TOOL", - "name": "electric combat chainsaw (on)", - "name_plural": "electric combat chainsaws (on)", + "name": { "str": "electric combat chainsaw (on)", "str_pl": "electric combat chainsaws (on)" }, "description": "This electric combat chainsaw is on, and is continuously draining power. Use it to turn it off.", "to_hit": -4, "cutting": 82, diff --git a/data/json/items/newspaper.json b/data/json/items/newspaper.json index 26faaa09f1ce8..f4e21e0e327d9 100644 --- a/data/json/items/newspaper.json +++ b/data/json/items/newspaper.json @@ -5,8 +5,7 @@ "category": "books", "symbol": ",", "color": "white", - "name": "flyer", - "name_plural": "flyers", + "name": { "str": "flyer", "str_pl": "flyers" }, "snippet_category": "flier", "description": "A scrap of paper.", "price": 0, @@ -20,8 +19,7 @@ "category": "books", "symbol": ",", "color": "white", - "name": "survivor's note", - "name_plural": "survivor's notes", + "name": { "str": "survivor's note", "str_pl": "survivor's notes" }, "snippet_category": "note", "description": "A scrap of paper. Something's written on it, scrawled in bad handwriting.", "price": 0, @@ -52,8 +50,7 @@ "category": "other", "symbol": ",", "color": "dark_gray", - "name": "score card", - "name_plural": "score cards", + "name": { "str": "score card", "str_pl": "score cards" }, "snippet_category": "scores", "description": "A colorfully printed score card.", "price": 0, @@ -68,8 +65,7 @@ "category": "books", "symbol": ",", "color": "white", - "name": "newspaper page", - "name_plural": "newspaper pages", + "name": { "str": "newspaper page", "str_pl": "newspaper pages" }, "snippet_category": "newest_news", "description": "A single sheet of newspaper broadsheet. It is possibly one of the last issues printed before New England was overwhelmed. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.", "price": 0, @@ -83,8 +79,7 @@ "category": "books", "symbol": ",", "color": "white", - "name": "newspaper page", - "name_plural": "newspaper pages", + "name": { "str": "newspaper page", "str_pl": "newspaper pages" }, "snippet_category": "many_years_old_news", "description": "A single sheet of newspaper broadsheet. It seems to date from several years ago, and you've NO idea how it lasted this long. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.", "price": 0, @@ -98,8 +93,7 @@ "category": "books", "symbol": ",", "color": "white", - "name": "newspaper page", - "name_plural": "newspaper pages", + "name": { "str": "newspaper page", "str_pl": "newspaper pages" }, "snippet_category": "years_old_news", "description": "A single sheet of newspaper broadsheet. It seems to date from a few years ago--amazing it has lasted this long. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.", "price": 0, @@ -113,8 +107,7 @@ "category": "books", "symbol": ",", "color": "white", - "name": "newspaper page", - "name_plural": "newspaper pages", + "name": { "str": "newspaper page", "str_pl": "newspaper pages" }, "snippet_category": "one_year_old_news", "description": "A single sheet of newspaper broadsheet. It was printed more than a year ago. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.", "price": 0, @@ -128,8 +121,7 @@ "category": "books", "symbol": ",", "color": "white", - "name": "newspaper page", - "name_plural": "newspaper pages", + "name": { "str": "newspaper page", "str_pl": "newspaper pages" }, "snippet_category": "months_old_news", "description": "A single sheet of newspaper broadsheet. It was printed in the months leading up to the Cataclysm. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.", "price": 0, @@ -143,8 +135,7 @@ "category": "books", "symbol": ",", "color": "white", - "name": "newspaper page", - "name_plural": "newspaper pages", + "name": { "str": "newspaper page", "str_pl": "newspaper pages" }, "snippet_category": "weeks_old_news", "description": "A single sheet of newspaper broadsheet. It was printed in the weeks leading up to the Cataclysm. Most of the information on there is terribly trivial, or out of date, but one thing catches your eye briefly.", "price": 0, @@ -158,8 +149,7 @@ "category": "books", "symbol": ",", "color": "white", - "name": "vault leaflet", - "name_plural": "vault leaflets", + "name": { "str": "vault leaflet", "str_pl": "vault leaflets" }, "snippet_category": "necropolis_intro", "description": "A folded glossy handout that appears to be an introduction to living in a massive underground complex.", "price": 0, diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json index 9d277916da7da..b5e388155a42e 100644 --- a/data/json/items/obsolete.json +++ b/data/json/items/obsolete.json @@ -465,8 +465,7 @@ "id": "armguard_bone", "type": "ARMOR", "category": "armor", - "name": "pair of bone arm guards", - "name_plural": "pairs of bone arm guards", + "name": { "str": "pair of bone arm guards", "str_pl": "pairs of bone arm guards" }, "description": "A pair of arm guards made from leather, reinforced with bone. Light and strong.", "weight": "645 g", "volume": "3 L", @@ -508,8 +507,7 @@ "id": "gauntlets_bone", "type": "ARMOR", "category": "armor", - "name": "pair of bone armor gauntlets", - "name_plural": "pairs of bone armor gauntlets", + "name": { "str": "pair of bone armor gauntlets", "str_pl": "pairs of bone armor gauntlets" }, "description": "Leather gauntlets with bone armor reinforcement. Very light and strong.", "weight": "690 g", "volume": "1250 ml", @@ -579,8 +577,7 @@ "id": "matchbomb_act", "type": "TOOL", "category": "weapons", - "name": "match head bomb (lit)", - "name_plural": "match head bombs (lit)", + "name": { "str": "match head bomb (lit)", "str_pl": "match head bombs (lit)" }, "description": "This is a bottle filled with match heads and equipped with a fuse. This one has been lit, and its fuse is rapidly burning down. You may not want to hold onto it much longer.", "weight": "412 g", "volume": "500 ml", @@ -934,8 +931,7 @@ { "id": "hobo_stove_on", "type": "TOOL", - "name": "hobo stove (lit)", - "name_plural": "hobo stoves (lit)", + "name": { "str": "hobo stove (lit)", "str_pl": "hobo stoves (lit)" }, "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", @@ -983,8 +979,7 @@ "id": "40mm_incendiary", "copy-from": "40x46mm_grenade", "type": "AMMO", - "name": "40mm incendiary", - "name_plural": "40mm incendiaries", + "name": { "str": "40mm incendiary", "str_pl": "40mm incendiaries" }, "description": "A 40mm grenade with a small napalm load, designed to create a burst of flame.", "extend": { "effects": [ "NAPALM" ] } }, @@ -1010,24 +1005,21 @@ { "id": "schematics_chickenbot", "type": "BOOK", - "name": "chicken walker schematics", - "name_plural": "chicken walker schematics", + "name": { "str": "chicken walker schematics", "str_pl": "chicken walker schematics" }, "description": "Bearing the logo of Northrop, those are assembly plans, design specs, and technical drawings for the chicken walker. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" }, { "id": "schematics_tankbot", "type": "BOOK", - "name": "tank drone schematics", - "name_plural": "tank drone schematics", + "name": { "str": "tank drone schematics", "str_pl": "tank drone schematics" }, "description": "Bearing the logo of Northrop, those are assembly plans, design specs, and technical drawings for the tank drone. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" }, { "id": "schematics_tripod", "type": "BOOK", - "name": "tripod schematics", - "name_plural": "tripod schematics", + "name": { "str": "tripod schematics", "str_pl": "tripod schematics" }, "description": "Bearing the logo of Honda, those are assembly plans, design specs, and technical drawings for the tripod. Most of this is useless to you, but you could use the assembly plans to re-assemble the robot from salvaged parts.", "copy-from": "schematics_generic" }, @@ -1190,8 +1182,7 @@ { "type": "GENERIC", "id": "tripod_chassis", - "name": "tripod chassis", - "name_plural": "tripod chassis", + "name": { "str": "tripod chassis", "str_pl": "tripod chassis" }, "description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the tripod.", "symbol": "c", "color": "light_gray", @@ -1204,8 +1195,7 @@ { "type": "GENERIC", "id": "chickenbot_chassis", - "name": "chicken walker chassis", - "name_plural": "chicken walker chassis", + "name": { "str": "chicken walker chassis", "str_pl": "chicken walker chassis" }, "description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the chicken walker.", "symbol": "c", "color": "light_gray", @@ -1218,8 +1208,7 @@ { "type": "GENERIC", "id": "tankbot_chassis", - "name": "Beagle chassis", - "name_plural": "Beagle chassis", + "name": { "str": "Beagle chassis", "str_pl": "Beagle chassis" }, "description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the Beagle tank.", "symbol": "c", "color": "light_gray", @@ -1235,8 +1224,7 @@ "type": "GUN", "symbol": "(", "color": "green", - "name": "Tankbot Main Gun", - "name_plural": "Tankbot Main Gun", + "name": { "str": "Tankbot Main Gun", "str_pl": "Tankbot Main Gun" }, "description": "The 120mm cannon from a tankbot. If you have this, you'd best be debugging!", "price": 99999999, "material": "steel", @@ -1254,8 +1242,7 @@ { "type": "GENERIC", "id": "spidery_legs_big", - "name": "set of spidery legs", - "name_plural": "sets of spidery legs", + "name": { "str": "set of spidery legs", "str_pl": "sets of spidery legs" }, "description": "A set of big pointy legs, like the ones found under a tripod.", "symbol": "W", "color": "light_gray", diff --git a/data/json/items/ranged.json b/data/json/items/ranged.json index 3da285fbdbe4e..784a82c4b0123 100644 --- a/data/json/items/ranged.json +++ b/data/json/items/ranged.json @@ -177,8 +177,7 @@ "looks_like": "m79", "symbol": "(", "color": "green", - "name": "M72 LAW", - "name_plural": "M72 LAW", + "name": { "str": "M72 LAW", "str_pl": "M72 LAW" }, "description": "A disposable light anti-tank rocket launcher. Once fired, it cannot be reloaded and must be disposed of.", "price": 200000, "//": "A tube with a lever. Unsurprisingly, dirt cheap (at least for a rocket launcher).", @@ -458,8 +457,7 @@ "reload_noise_volume": 10, "symbol": "(", "color": "brown", - "name": "RPG-7", - "name_plural": "RPG-7", + "name": { "str": "RPG-7", "str_pl": "RPG-7" }, "description": "The emblematic RPG-7 launcher. Its simple, inexpensive, and reliable design made it a popular choice among armies and insurgent groups worldwide.", "price": 150000, "//": "Like the LAW, this thing is basically a tube with a lever. It's even cheaper in terms of construction, but there's a premium due to being imported. Also not disposable.", diff --git a/data/json/items/resources/glass.json b/data/json/items/resources/glass.json index a38314bc7c187..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, @@ -65,8 +63,7 @@ "id": "reinforced_glass_pane", "symbol": "]", "color": "light_blue", - "name": "pane of reinforced glass", - "name_plural": "panes of reinforced glass", + "name": { "str": "pane of reinforced glass", "str_pl": "panes of reinforced glass" }, "description": "A small pane of glass strengthened with steel wiring.", "category": "spare_parts", "price": 5000, diff --git a/data/json/items/resources/home_improvement.json b/data/json/items/resources/home_improvement.json index 461febfa50716..621ecb37181d5 100644 --- a/data/json/items/resources/home_improvement.json +++ b/data/json/items/resources/home_improvement.json @@ -4,8 +4,7 @@ "id": "r_paint", "category": "other", "price": 120, - "name": "red paint", - "name_plural": "red paint", + "name": { "str": "red paint", "str_pl": "red paint" }, "symbol": "o", "color": "red", "description": "A can of red paint.", @@ -20,8 +19,7 @@ "id": "b_paint", "category": "other", "price": 120, - "name": "blue paint", - "name_plural": "blue paint", + "name": { "str": "blue paint", "str_pl": "blue paint" }, "symbol": "o", "color": "blue", "description": "A can of blue paint.", @@ -36,8 +34,7 @@ "id": "w_paint", "category": "other", "price": 120, - "name": "white paint", - "name_plural": "white paint", + "name": { "str": "white paint", "str_pl": "white paint" }, "symbol": "o", "color": "white", "description": "A can of white paint.", @@ -52,8 +49,7 @@ "id": "g_paint", "category": "other", "price": 120, - "name": "green paint", - "name_plural": "green paint", + "name": { "str": "green paint", "str_pl": "green paint" }, "symbol": "o", "color": "green", "description": "A can of green paint.", @@ -68,8 +64,7 @@ "id": "p_paint", "category": "other", "price": 120, - "name": "purple paint", - "name_plural": "purple paint", + "name": { "str": "purple paint", "str_pl": "purple paint" }, "symbol": "o", "color": "magenta", "description": "A can of purple paint.", @@ -84,8 +79,7 @@ "id": "y_paint", "category": "other", "price": 120, - "name": "yellow paint", - "name_plural": "yellow paint", + "name": { "str": "yellow paint", "str_pl": "yellow paint" }, "symbol": "o", "color": "yellow", "description": "A can of yellow paint.", diff --git a/data/json/items/resources/metal.json b/data/json/items/resources/metal.json index 120f4d8efe35d..7fb8dc0190cf2 100644 --- a/data/json/items/resources/metal.json +++ b/data/json/items/resources/metal.json @@ -89,8 +89,7 @@ "id": "bismuth", "type": "AMMO", "category": "spare_parts", - "name": "bismuth", - "name_plural": "bismuth", + "name": { "str": "bismuth", "str_pl": "bismuth" }, "description": "A dense but brittle metal often used as an alternative to lead.", "weight": "2 g", "//": "Density 9.78g/cm³ ~ 2.4kg/250ml @ stack 1000 = 2g/unit", @@ -107,8 +106,7 @@ "id": "gold_small", "type": "AMMO", "category": "spare_parts", - "name": "gold", - "name_plural": "gold", + "name": { "str": "gold", "str_pl": "gold" }, "description": "A soft shiny metal. Before the apocalypse this would've been worth a small fortune but now its value is greatly diminished.", "weight": "5 g", "//": "Density 19.32g/cm³ ~ 4.8kg/250ml @ stack 1000 = 5g/unit", @@ -126,8 +124,7 @@ "id": "platinum_small", "type": "AMMO", "category": "spare_parts", - "name": "platinum", - "name_plural": "platinum", + "name": { "str": "platinum", "str_pl": "platinum" }, "description": "A soft shiny metal. Before the apocalypse this would've been worth a small fortune but now its value is greatly diminished.", "weight": "5 g", "//": "Density 21.45g/cm³ ~ 5.4kg/250ml @ stack 1000 = 5g/unit", @@ -145,8 +142,7 @@ "id": "zinc_metal", "type": "AMMO", "category": "spare_parts", - "name": "zinc", - "name_plural": "zinc", + "name": { "str": "zinc", "str_pl": "zinc" }, "description": "A slightly brittle metal. Apart from being an essential mineral that the body needs, it reacts readily with acids, alkalis and other non-metals. It can be crushed to make zinc powder, used in the production of batteries, among other things.", "weight": "7 g", "volume": "50ml", @@ -163,8 +159,7 @@ "id": "lead", "type": "AMMO", "category": "spare_parts", - "name": "lead", - "name_plural": "lead", + "name": { "str": "lead", "str_pl": "lead" }, "description": "A soft dull metal known since ancient times. Due to its malleability it has a wide variety of uses including the manufacture of ammunition.", "weight": "3 g", "//": "Density 11.34g/cm³ ~ 2.8kg/250ml @ stack 1000 = 3g/unit", @@ -181,8 +176,7 @@ "id": "magnesium", "type": "AMMO", "category": "spare_parts", - "name": "magnesium powder", - "name_plural": "magnesium powder", + "name": { "str": "magnesium powder", "str_pl": "magnesium powder" }, "description": "A gray powder composed of the highly flammable alkaline earth metal magnesium. Useful for constructing flares and similar items.", "weight": "1120 mg", "//": "Weight should be 1.12g because magnesium is 64% less dense than aluminum (1.74g/cm³ vs 2.70g/cm³), at 250ml aluminium powder has a weight of ~0.176kg at 250ml, assuming same particle size => magnesium powder has a weight of ~0.112kg at 250ml", @@ -200,8 +194,7 @@ "id": "silver_small", "type": "AMMO", "category": "spare_parts", - "name": "silver", - "name_plural": "silver", + "name": { "str": "silver", "str_pl": "silver" }, "description": "A soft shiny metal. Before the Cataclysm it was worth quite a bit but its value is now greatly diminished.", "weight": "3 g", "//": "Density 10.40g/cm³ ~ 2.6kg/250ml @ stack 1000 = 3g/unit", @@ -313,8 +306,7 @@ "id": "scrap_copper", "symbol": ",", "color": "light_gray", - "name": "scrap copper", - "name_plural": "scrap copper", + "name": { "str": "scrap copper", "str_pl": "scrap copper" }, "category": "spare_parts", "description": "A small chunk of copper, usable for crafting or repairs.", "price": 1000, diff --git a/data/json/items/resources/misc.json b/data/json/items/resources/misc.json index 32eeb54d5f63d..c02bf3e02a8d2 100644 --- a/data/json/items/resources/misc.json +++ b/data/json/items/resources/misc.json @@ -3,8 +3,7 @@ "id": "incendiary", "type": "AMMO", "category": "chems", - "name": "incendiary", - "name_plural": "incendiaries", + "name": { "str": "incendiary", "str_pl": "incendiaries" }, "description": "Material from an incendiary round, useful in constructing incendiary ammunition.", "weight": "2 g", "volume": "500 ml", @@ -21,8 +20,7 @@ "id": "mattress", "type": "GENERIC", "category": "spare_parts", - "name": "mattress", - "name_plural": "mattresses", + "name": { "str": "mattress", "str_pl": "mattresses" }, "description": "This is a single, or twin, sized mattress.", "weight": "20000 g", "volume": "300000 ml", @@ -37,8 +35,7 @@ "id": "down_mattress", "type": "GENERIC", "category": "spare_parts", - "name": "down mattress", - "name_plural": "down mattresses", + "name": { "str": "down mattress", "str_pl": "down mattresses" }, "description": "This is a single, or twin, sized down filled mattress.", "weight": "6 kg", "volume": "300000 ml", @@ -52,8 +49,7 @@ "id": "fuse", "type": "AMMO", "category": "spare_parts", - "name": "fuse", - "name_plural": "fuse", + "name": { "str": "fuse", "str_pl": "fuse" }, "description": "A piece of fuse, long enough to give you enough time to get away from most explosions.", "weight": "6 g", "volume": "80 ml", diff --git a/data/json/items/resources/plastic.json b/data/json/items/resources/plastic.json index 6795301d82255..c8f962a8066cf 100644 --- a/data/json/items/resources/plastic.json +++ b/data/json/items/resources/plastic.json @@ -31,8 +31,7 @@ "id": "lycra_patch", "type": "TOOL", "category": "spare_parts", - "name": "lycra patch", - "name_plural": "lycra patches", + "name": { "str": "lycra patch", "str_pl": "lycra patches" }, "description": "This is a small bolt of a synthetic fabric blended with stretchy lycra fibers. It could be used to make flexible yet strong clothing. Stylish, but bad for the environment; at least you're recycling it.", "weight": "87 g", "volume": "250 ml", diff --git a/data/json/items/resources/tailoring.json b/data/json/items/resources/tailoring.json index cfeeb9801300a..471530d35d2c0 100644 --- a/data/json/items/resources/tailoring.json +++ b/data/json/items/resources/tailoring.json @@ -3,8 +3,7 @@ "id": "scrap_cotton", "type": "AMMO", "category": "other", - "name": "cotton scraps", - "name_plural": "cotton scraps", + "name": { "str": "cotton scraps", "str_pl": "cotton scraps" }, "description": "Oddly-shaped smallish bits of cotton, waste material from tailoring projects. Not useful for much and usually disposed of, but can be recycled into some thread if you really want.", "weight": "1 g", "volume": "1 ml", @@ -19,8 +18,7 @@ "id": "scrap_faux_fur", "copy-from": "scrap_cotton", "type": "AMMO", - "name": "faux fur scraps", - "name_plural": "faux fur scraps", + "name": { "str": "faux fur scraps", "str_pl": "faux fur scraps" }, "description": "Oddly-shaped smallish bits of faux fur, waste material from tailoring projects. Not useful for much and usually disposed of.", "price": 0, "material": "faux_fur" @@ -29,8 +27,7 @@ "id": "scrap_felt", "copy-from": "scrap_cotton", "type": "AMMO", - "name": "felt scraps", - "name_plural": "felt scraps", + "name": { "str": "felt scraps", "str_pl": "felt scraps" }, "description": "Oddly-shaped smallish bits of felt, waste material from tailoring projects. Not useful for much and usually disposed of, but can be recycled into some wool fiber if you really want.", "material": "wool" }, @@ -38,8 +35,7 @@ "id": "scrap_fur", "copy-from": "scrap_cotton", "type": "AMMO", - "name": "fur scraps", - "name_plural": "fur scraps", + "name": { "str": "fur scraps", "str_pl": "fur scraps" }, "description": "Oddly-shaped smallish bits of fur, waste material from tailoring projects. Not useful for much and usually disposed of.", "price": 0, "material": "fur" @@ -48,8 +44,7 @@ "id": "scrap_kevlar", "copy-from": "scrap_cotton", "type": "AMMO", - "name": "Kevlar scraps", - "name_plural": "Kevlar scraps", + "name": { "str": "Kevlar scraps", "str_pl": "Kevlar scraps" }, "description": "Oddly-shaped smallish bits of Kevlar fabric, waste material from tailoring projects. Normally it's disposed of, but since Kevlar would be very difficult to make in a post-apocalyptic world, it might be worth recycling it for Kevlar thread.", "price": 5, "material": "kevlar" @@ -58,8 +53,7 @@ "id": "scrap_leather", "copy-from": "scrap_cotton", "type": "AMMO", - "name": "leather scraps", - "name_plural": "leather scraps", + "name": { "str": "leather scraps", "str_pl": "leather scraps" }, "description": "Oddly-shaped smallish bits of leather, waste material from tailoring projects. Not useful for much and usually disposed of.", "price": 0, "material": "leather" @@ -68,8 +62,7 @@ "id": "scrap_lycra", "copy-from": "scrap_cotton", "type": "AMMO", - "name": "lycra scraps", - "name_plural": "lycra scraps", + "name": { "str": "lycra scraps", "str_pl": "lycra scraps" }, "description": "Oddly-shaped smallish bits of lycra, waste material from tailoring projects. Not useful for much and usually disposed of.", "price": 0, "material": "lycra" @@ -78,8 +71,7 @@ "id": "scrap_neoprene", "copy-from": "scrap_cotton", "type": "AMMO", - "name": "neoprene scraps", - "name_plural": "neoprene scraps", + "name": { "str": "neoprene scraps", "str_pl": "neoprene scraps" }, "description": "Oddly-shaped smallish bits of neoprene, waste material from tailoring projects. Not useful for much and usually disposed of.", "price": 0, "material": "neoprene" @@ -88,8 +80,7 @@ "id": "scrap_nylon", "copy-from": "scrap_cotton", "type": "AMMO", - "name": "synthetic fabric scraps", - "name_plural": "synthetic fabric scraps", + "name": { "str": "synthetic fabric scraps", "str_pl": "synthetic fabric scraps" }, "description": "Oddly-shaped smallish bits of synthetic fabric, waste material from tailoring projects. Not useful for much and usually disposed of.", "price": 0, "material": "nylon" @@ -98,8 +89,7 @@ "id": "scrap_nomex", "copy-from": "scrap_cotton", "type": "AMMO", - "name": "Nomex scraps", - "name_plural": "Nomex scraps", + "name": { "str": "Nomex scraps", "str_pl": "Nomex scraps" }, "description": "Oddly-shaped smallish bits of heat-resistant Nomex fabric, waste material from tailoring projects. Normally it's disposed of, but since Nomex would be very difficult to make in a post-apocalyptic world, it might be worth recycling it.", "price": 5, "material": "nomex" @@ -123,8 +113,7 @@ "id": "sheet_cotton_patchwork", "copy-from": "sheet_cotton", "type": "AMMO", - "name": "patchwork cotton clothing parts", - "name_plural": "patchwork cotton clothing parts", + "name": { "str": "patchwork cotton clothing parts", "str_pl": "patchwork cotton clothing parts" }, "description": "A selection of various clothing parts, sewn together from cotton patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", "weight": "100 g", "volume": "60 ml", @@ -150,8 +139,7 @@ "id": "sheet_faux_fur_patchwork", "copy-from": "sheet_faux_fur", "type": "AMMO", - "name": "patchwork faux fur clothing parts", - "name_plural": "patchwork faux fur clothing parts", + "name": { "str": "patchwork faux fur clothing parts", "str_pl": "patchwork faux fur clothing parts" }, "description": "A selection of various clothing parts, sewn together from faux fur patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", "weight": "200 g", "volume": "900 ml", @@ -177,8 +165,7 @@ "id": "sheet_felt_patchwork", "copy-from": "sheet_felt", "type": "AMMO", - "name": "patchwork felt clothing parts", - "name_plural": "patchwork felt clothing parts", + "name": { "str": "patchwork felt clothing parts", "str_pl": "patchwork felt clothing parts" }, "description": "A selection of various clothing parts, sewn together from felt patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", "weight": "160 g", "volume": "360 ml", @@ -219,8 +206,7 @@ "id": "sheet_lycra_patchwork", "copy-from": "sheet_lycra", "type": "AMMO", - "name": "patchwork lycra clothing parts", - "name_plural": "patchwork lycra clothing parts", + "name": { "str": "patchwork lycra clothing parts", "str_pl": "patchwork lycra clothing parts" }, "description": "A selection of various clothing parts, sewn together from lycra patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", "weight": "60 g", "volume": "60 ml", @@ -246,8 +232,7 @@ "id": "sheet_neoprene_patchwork", "copy-from": "sheet_neoprene", "type": "AMMO", - "name": "patchwork neoprene clothing parts", - "name_plural": "patchwork neoprene clothing parts", + "name": { "str": "patchwork neoprene clothing parts", "str_pl": "patchwork neoprene clothing parts" }, "description": "A selection of various clothing parts, sewn together from neoprene patches in a patchwork fashion, with waterproofed seams. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", "weight": "120 g", "volume": "60 ml", @@ -273,8 +258,7 @@ "id": "sheet_nomex_patchwork", "copy-from": "sheet_nomex", "type": "AMMO", - "name": "patchwork Nomex clothing parts", - "name_plural": "patchwork Nomex clothing parts", + "name": { "str": "patchwork Nomex clothing parts", "str_pl": "patchwork Nomex clothing parts" }, "description": "A selection of various clothing parts, sewn together with Nomex thread from Nomex patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", "weight": "100 g", "volume": "60 ml", @@ -300,8 +284,7 @@ "id": "sheet_nylon_patchwork", "copy-from": "sheet_nylon", "type": "AMMO", - "name": "patchwork synthetic fabric clothing parts", - "name_plural": "patchwork synthetic fabric clothing parts", + "name": { "str": "patchwork synthetic fabric clothing parts", "str_pl": "patchwork synthetic fabric clothing parts" }, "description": "A selection of various clothing parts, sewn together from synthetic fabric patches in a patchwork fashion. Suitable for making most clothing, though it's much less time-efficient than if using proper material sheets.", "weight": "60 g", "volume": "60 ml", diff --git a/data/json/items/robot_parts.json b/data/json/items/robot_parts.json index e4038e17414b4..f176bf77a33cf 100644 --- a/data/json/items/robot_parts.json +++ b/data/json/items/robot_parts.json @@ -86,8 +86,7 @@ { "type": "GENERIC", "id": "spidery_legs_small", - "name": "set of tiny spidery legs", - "name_plural": "sets of tiny spidery legs", + "name": { "str": "set of tiny spidery legs", "str_pl": "sets of tiny spidery legs" }, "description": "A set of tiny pointy legs, like the ones found under a skitterbot.", "symbol": "w", "color": "light_gray", @@ -100,8 +99,7 @@ { "type": "GENERIC", "id": "reverse_jointed_legs", - "name": "set of reverse-jointed legs", - "name_plural": "sets of reverse-jointed legs", + "name": { "str": "set of reverse-jointed legs", "str_pl": "sets of reverse-jointed legs" }, "description": "A set of reverse-jointed legs, like the ones found under a chicken walker.", "symbol": "k", "color": "light_gray", @@ -114,8 +112,7 @@ { "type": "GENERIC", "id": "omni_wheel", - "name": "set of omni wheels", - "name_plural": "sets of omni wheels", + "name": { "str": "set of omni wheels", "str_pl": "sets of omni wheels" }, "description": "A set of omni wheels, like the ones found under a police bot.", "symbol": "o", "color": "light_gray", @@ -128,8 +125,7 @@ { "type": "GENERIC", "id": "quad_rotors", - "name": "set of rotors", - "name_plural": "sets of rotors", + "name": { "str": "set of rotors", "str_pl": "sets of rotors" }, "description": "A set of rotors able to lift a small drone.", "symbol": "#", "color": "light_gray", @@ -142,8 +138,7 @@ { "type": "GENERIC", "id": "android_legs", - "name": "set of android legs", - "name_plural": "sets of android legs", + "name": { "str": "set of android legs", "str_pl": "sets of android legs" }, "description": "A set of human-like legs.", "symbol": "M", "color": "light_gray", @@ -156,8 +151,7 @@ { "type": "GENERIC", "id": "android_arms", - "name": "set of android arms", - "name_plural": "sets of android arms", + "name": { "str": "set of android arms", "str_pl": "sets of android arms" }, "description": "A set of human-like arms.", "symbol": "m", "color": "light_gray", @@ -170,8 +164,7 @@ { "type": "GENERIC", "id": "tank_tread", - "name": "set of small tank tread", - "name_plural": "sets of small tank tread", + "name": { "str": "set of small tank tread", "str_pl": "sets of small tank tread" }, "description": "A set of small tank tread, like the one used by the \"Beagle\" mini-tank.", "symbol": "=", "color": "light_gray", @@ -184,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", @@ -198,8 +190,7 @@ { "type": "GENERIC", "id": "copbot_chassis", - "name": "police bot chassis", - "name_plural": "police bot chassis", + "name": { "str": "police bot chassis", "str_pl": "police bot chassis" }, "description": "What's left when you remove all moving parts and electronics. It's the skeleton and armor of the police bot.", "symbol": "c", "color": "light_gray", diff --git a/data/json/items/software.json b/data/json/items/software.json index 7a5a97ebd0d66..fbbdc9630bad6 100644 --- a/data/json/items/software.json +++ b/data/json/items/software.json @@ -12,8 +12,7 @@ "id": "software_useless", "copy-from": "software", "type": "GENERIC", - "name": "misc software", - "name_plural": "misc software", + "name": { "str": "misc software", "str_pl": "misc software" }, "description": "A miscellaneous piece of hobby software. Probably useless.", "price": 300 }, @@ -21,8 +20,7 @@ "id": "software_hacking", "copy-from": "software", "type": "GENERIC", - "name": "hackPRO", - "name_plural": "hackPRO", + "name": { "str": "hackPRO", "str_pl": "hackPRO" }, "description": "A piece of hacking software.", "price": 800 }, @@ -30,8 +28,7 @@ "id": "software_medical", "copy-from": "software", "type": "GENERIC", - "name": "MediSoft", - "name_plural": "MediSoft", + "name": { "str": "MediSoft", "str_pl": "MediSoft" }, "description": "A piece of medical software.", "price": 600 }, @@ -39,8 +36,7 @@ "id": "software_math", "copy-from": "software", "type": "GENERIC", - "name": "MatheMAX", - "name_plural": "MatheMAX", + "name": { "str": "MatheMAX", "str_pl": "MatheMAX" }, "description": "A piece of mathematical software.", "price": 500 }, @@ -48,8 +44,7 @@ "id": "software_blood_data", "copy-from": "software", "type": "GENERIC", - "name": "infection data", - "name_plural": "infection data", + "name": { "str": "infection data", "str_pl": "infection data" }, "description": "Medical data on zombie blood.", "price": 200 }, @@ -57,8 +52,7 @@ "id": "software_lab_data", "copy-from": "software", "type": "GENERIC", - "name": "lab data", - "name_plural": "lab data", + "name": { "str": "lab data", "str_pl": "lab data" }, "description": "Research archives from a government laboratory.", "price": 200 }, @@ -66,16 +60,14 @@ "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 }, { "id": "mind_scan_robofac", "type": "GENERIC", - "name": "neural data", - "name_plural": "neural data", + "name": { "str": "neural data", "str_pl": "neural data" }, "symbol": "#", "container": "data_card", "description": "Data stolen from a dead scientist memory banks. Is the owner of these thoughts still hidden here, amidst the unreadable data; or are these just a collection of the precious moments of someone's life?\n\nWhatever the case, the idea of perpetually keeping a part of you within a metallic pill makes you feel uncomfortable.", @@ -85,8 +77,7 @@ "id": "software_electronics_reference", "copy-from": "software", "type": "GENERIC", - "name": "integrated circuit datasheet archives", - "name_plural": "misc software", + "name": { "str": "integrated circuit datasheet archives", "str_pl": "misc software" }, "description": "Huge archives of numerous IC circuit datasheets from several major manufacturers. Probably valuable to the right person, as it would be hard to salvage and reuse these components without them.", "price": 40000 } diff --git a/data/json/items/tool/deployable.json b/data/json/items/tool/deployable.json index bc74b04e9482b..8c2341f715b97 100644 --- a/data/json/items/tool/deployable.json +++ b/data/json/items/tool/deployable.json @@ -18,8 +18,7 @@ { "id": "55gal_firebarrel", "type": "TOOL", - "name": "fire barrel (200L)", - "name_plural": "fire barrels (200L)", + "name": { "str": "fire barrel (200L)", "str_pl": "fire barrels (200L)" }, "description": "A large metal barrel used to contain a fire. It has multiple holes punched in its walls for air supply. Fires set in a fire barrel will not spread to surrounding flammable objects.", "weight": "20000 g", "volume": "200 L", @@ -35,8 +34,7 @@ { "id": "30gal_firebarrel", "type": "TOOL", - "name": "fire barrel (100L)", - "name_plural": "fire barrels (100L)", + "name": { "str": "fire barrel (100L)", "str_pl": "fire barrels (100L)" }, "description": "A large metal barrel used to contain a fire. It has multiple holes punched in its walls for air supply. Fires set in a fire barrel will not spread to surrounding flammable objects.", "weight": "12000 g", "volume": "100 L", diff --git a/data/json/items/tool/fire.json b/data/json/items/tool/fire.json index 2a5a6689c45de..4cd9d526cf4eb 100644 --- a/data/json/items/tool/fire.json +++ b/data/json/items/tool/fire.json @@ -2,8 +2,7 @@ { "id": "flint_steel", "type": "TOOL", - "name": "flint and steel", - "name_plural": "sets of flint and steel", + "name": { "str": "flint and steel", "str_pl": "sets of flint and steel" }, "description": "This is a magnesium bar and a carbon steel striker. Use it to spark a flame.", "weight": "400 g", "volume": "250 ml", diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json index a0ef935c04922..9466f2a86d5fc 100644 --- a/data/json/items/tool/lighting.json +++ b/data/json/items/tool/lighting.json @@ -2,8 +2,7 @@ { "id": "electric_lantern", "type": "TOOL", - "name": "electric lantern (off)", - "name_plural": "electric lanterns (off)", + "name": { "str": "electric lantern (off)", "str_pl": "electric lanterns (off)" }, "description": "This is a battery-powered lamp. It does not provide much light, but it lasts a long time. Use it to turn it on.", "weight": "980 g", "volume": "1 L", @@ -44,8 +43,7 @@ "id": "electric_lantern_on", "copy-from": "electric_lantern", "type": "TOOL", - "name": "electric lantern (on)", - "name_plural": "electric lanterns (on)", + "name": { "str": "electric lantern (on)", "str_pl": "electric lanterns (on)" }, "power_draw": 1000, "revert_to": "electric_lantern", "use_action": { "menu_text": "Turn off", "type": "transform", "target": "electric_lantern", "msg": "You turn the lamp off." }, @@ -54,8 +52,7 @@ { "id": "flashlight", "type": "TOOL", - "name": "flashlight (off)", - "name_plural": "flashlights (off)", + "name": { "str": "flashlight (off)", "str_pl": "flashlights (off)" }, "description": "This is a typical household flashlight with a plastic handle. Using this flashlight will turn it on and provide light, assuming it is charged with batteries.", "material": [ "plastic", "aluminum" ], "symbol": ";", @@ -93,8 +90,7 @@ "id": "flashlight_on", "copy-from": "flashlight", "type": "TOOL", - "name": "flashlight (on)", - "name_plural": "flashlights (on)", + "name": { "str": "flashlight (on)", "str_pl": "flashlights (on)" }, "power_draw": 10000, "revert_to": "flashlight", "use_action": { "menu_text": "Turn off", "type": "transform", "msg": "You turn the flashlight off.", "target": "flashlight" }, @@ -137,8 +133,7 @@ { "id": "heavy_flashlight", "type": "TOOL", - "name": "heavy duty flashlight (off)", - "name_plural": "heavy duty flashlights (off)", + "name": { "str": "heavy duty flashlight (off)", "str_pl": "heavy duty flashlights (off)" }, "description": "This is a heavy duty tubular aluminum LED flashlight as often used by security guards. Makes for a passable melee weapon. Using this flashlight will turn it on and provide light, assuming it is charged with batteries.", "weight": "650 g", "volume": "750 ml", @@ -178,8 +173,7 @@ "id": "heavy_flashlight_on", "copy-from": "heavy_flashlight", "type": "TOOL", - "name": "heavy duty flashlight (on)", - "name_plural": "heavy duty flashlights (on)", + "name": { "str": "heavy duty flashlight (on)", "str_pl": "heavy duty flashlights (on)" }, "power_draw": 15000, "revert_to": "heavy_flashlight", "use_action": { @@ -193,8 +187,7 @@ { "id": "oxylamp", "type": "TOOL", - "name": "acetylene lamp (off)", - "name_plural": "acetylene lamps (off)", + "name": { "str": "acetylene lamp (off)", "str_pl": "acetylene lamps (off)" }, "description": "An antique brass lamp designed to run from a pressurized cylinder of acetylene. It is an efficient, if not somewhat dangerous light source.", "weight": "800 g", "volume": "500 ml", @@ -218,8 +211,7 @@ "id": "oxylamp_on", "copy-from": "oxylamp", "type": "TOOL", - "name": "acetylene lamp (on)", - "name_plural": "acetylene lamps (on)", + "name": { "str": "acetylene lamp (on)", "str_pl": "acetylene lamps (on)" }, "turns_per_charge": 240, "revert_to": "oxylamp", "use_action": { "menu_text": "Turn off", "type": "transform", "msg": "The %s is extinguished", "target": "oxylamp" }, diff --git a/data/json/items/tool/radio_tools.json b/data/json/items/tool/radio_tools.json index 292fd4a096017..c58834ae3e8a3 100644 --- a/data/json/items/tool/radio_tools.json +++ b/data/json/items/tool/radio_tools.json @@ -3,8 +3,7 @@ "id": "radio_car_box", "type": "GENERIC", "category": "other", - "name": "radio car box", - "name_plural": "radio car boxes", + "name": { "str": "radio car box", "str_pl": "radio car boxes" }, "description": "A RC car, with radio-control and batteries included! Disassemble to unpack and enjoy.", "weight": "3200 g", "volume": "2 L", @@ -62,8 +61,7 @@ "id": "radio_car_on", "copy-from": "radio_car", "type": "TOOL", - "name": "RC car (on)", - "name_plural": "RC cars (on)", + "name": { "str": "RC car (on)", "str_pl": "RC cars (on)" }, "description": "This remote-controlled car is on, and draining its batteries just like a real electric car! Use a remote control to drive it around.", "turns_per_charge": 5, "use_action": "RADIOCARON", @@ -87,8 +85,7 @@ { "id": "radio", "type": "TOOL", - "name": "radio (off)", - "name_plural": "radios (off)", + "name": { "str": "radio (off)", "str_pl": "radios (off)" }, "description": "This is a portable radio. Using this radio turns it on. It will pick up any nearby signals being broadcast and play them audibly.", "weight": "295 g", "volume": "1 L", @@ -121,8 +118,7 @@ "id": "radio_on", "copy-from": "radio", "type": "TOOL", - "name": "radio (on)", - "name_plural": "radios (on)", + "name": { "str": "radio (on)", "str_pl": "radios (on)" }, "description": "This portable radio is turned on, and continually draining its batteries. It is playing the broadcast being sent from any nearby radio towers.", "power_draw": 500, "revert_to": "radio", diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json index 0ff60040f06b5..608bc3ec4e757 100644 --- a/data/json/items/tool/science.json +++ b/data/json/items/tool/science.json @@ -107,8 +107,7 @@ "id": "cuvettes", "type": "TOOL", "category": "tools", - "name": "set of spectrometry cuvettes", - "name_plural": "sets of spectrometry cuvettes", + "name": { "str": "set of spectrometry cuvettes", "str_pl": "sets of spectrometry cuvettes" }, "description": "This is a small box filled with precisely calibrated square plastic tubes for laboratory spectrometer use.", "weight": "500 g", "volume": "250 ml", @@ -185,8 +184,7 @@ "id": "melting_point", "type": "TOOL", "category": "tools", - "name": "melting point apparatus", - "name_plural": "units of melting point apparatus", + "name": { "str": "melting point apparatus", "str_pl": "units of melting point apparatus" }, "description": "This is basically a hot plate, with a metal housing attached. The metal housing has a magnification viewport and a slot into which a capillary tube containing a crystallized sample is inserted. The device lets you precisely measure the melting point of a crystal, a property very useful in identifying what it is and how pure it is.", "weight": "5000 g", "volume": "1500 ml", @@ -358,8 +356,7 @@ "id": "still_lab", "type": "TOOL", "category": "tools", - "name": "fractional distillation apparatus", - "name_plural": "fractional distillation apparati", + "name": { "str": "fractional distillation apparatus", "str_pl": "fractional distillation apparati" }, "description": "One of the classic pieces of mad science glassware, this is basically a small volume still that passes the vapour through a fractional distillation column and then condenses the distillate in a cooled collection column. A grad student or a robot (is there really any difference?) collects the distillate in fractions so that specific contents can be analyzed. Going a few milliliters at a time, it would not be very effective to try to distill whiskey in this thing.", "weight": "1000 g", "volume": "5000ml", @@ -489,8 +486,7 @@ "id": "stand_ring_clamps", "type": "GENERIC", "category": "spare_parts", - "name": "set of ring stand clamps", - "name_plural": "sets of ring stand clamps", + "name": { "str": "set of ring stand clamps", "str_pl": "sets of ring stand clamps" }, "description": "This is a small box with a jumbled assortment of clamps for mounting on ring stands. There seems to be some sort of rule that all of them are missing at least one wing nut for tightening them; it looks like judicious use of twist ties, duct tape, and other random stuff has been used to compensate.", "weight": "300 g", "volume": "450ml", diff --git a/data/json/items/tool/stationary.json b/data/json/items/tool/stationary.json index b7e23b28c5096..1b4433391df45 100644 --- a/data/json/items/tool/stationary.json +++ b/data/json/items/tool/stationary.json @@ -28,8 +28,7 @@ { "id": "scissors", "type": "TOOL", - "name": "pair of scissors", - "name_plural": "pairs of scissors", + "name": { "str": "pair of scissors", "str_pl": "pairs of scissors" }, "description": "These are a long pair of heavy duty scissors. Use scissors to cut items made from cotton (like clothing) into rags.", "weight": "113 g", "volume": "250 ml", diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json index 5ac218ea5d822..4a251c384c015 100644 --- a/data/json/items/tool/workshop.json +++ b/data/json/items/tool/workshop.json @@ -47,8 +47,7 @@ { "id": "oxy_torch", "type": "TOOL", - "name": "acetylene torch", - "name_plural": "acetylene torches", + "name": { "str": "acetylene torch", "str_pl": "acetylene torches" }, "description": "A compact tool kit intended for welding and cutting metal, this portable oxyacetylene torch includes a torch handle and cutting attachment in an easy-to-carry tote. It requires connecting to pressurized cylinders of an appropriate welding gas before use. In addition to its metalworking uses, you can activate it in order to destroy metal barriers.", "weight": "1600 g", "volume": "1 L", diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index 91f065b64932f..8563be8caa152 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -49,8 +49,7 @@ "id": "miner_hat_on", "copy-from": "miner_hat", "type": "TOOL_ARMOR", - "name": "mining helmet (on)", - "name_plural": "mining helmets (on)", + "name": { "str": "mining helmet (on)", "str_pl": "mining helmets (on)" }, "description": "This is a mining helmet with a heavy duty LED flashlight. The flashlight is turned on, and continually draining its batteries. Use it to turn it off.", "flags": [ "LIGHT_450", "CHARGEDIM", "WATERPROOF", "TRADER_AVOID" ], "power_draw": 15000, @@ -110,8 +109,7 @@ { "id": "welding_mask_crude_raised", "type": "ARMOR", - "name": "crude welding mask (raised)", - "name_plural": "crude welding masks (raised)", + "name": { "str": "crude welding mask (raised)", "str_pl": "crude welding masks (raised)" }, "description": "A crude welding mask made from shaped steel. It's less dark than a proper welding mask, and therefore less difficult to see in, but also less protective when welding. Activate it to lower it over your face.", "weight": "4 kg", "volume": "4 L", @@ -135,8 +133,7 @@ { "id": "welding_mask_raised", "type": "ARMOR", - "name": "welding mask (raised)", - "name_plural": "welding masks (raised)", + "name": { "str": "welding mask (raised)", "str_pl": "welding masks (raised)" }, "description": "A plastic mask with a very dark visor, meant to protect the entire face while welding. It also serves as somewhat good armor, but makes it hard to see. Activate it to lower it over your face.", "weight": "1 kg", "volume": "4 L", @@ -160,8 +157,7 @@ { "type": "TOOL_ARMOR", "id": "game_watch", - "name": "game watch", - "name_plural": "game watches", + "name": { "str": "game watch", "str_pl": "game watches" }, "category": "clothing", "volume": "250 ml", "description": "A waterproof digital watch with a built-in electronic game system, powered by standard batteries. Activate to play.", @@ -230,8 +226,7 @@ "category": "clothing", "symbol": "[", "color": "light_gray", - "name": "pair of thermal electric socks", - "name_plural": "pairs of thermal electric socks", + "name": { "str": "pair of thermal electric socks", "str_pl": "pairs of thermal electric socks" }, "description": "This is a pair of socks with internal battery-powered heating elements. Use it to turn it on.", "flags": [ "VARSIZE", "SKINTIGHT" ], "price": 5000, @@ -272,8 +267,7 @@ "id": "thermal_socks_on", "copy-from": "thermal_socks", "type": "TOOL_ARMOR", - "name": "pair of thermal electric socks (on)", - "name_plural": "pairs of thermal electric socks (on)", + "name": { "str": "pair of thermal electric socks (on)", "str_pl": "pairs of thermal electric socks (on)" }, "description": "This is a pair of socks with internal battery-powered heating elements. They are currently on, and continually draining batteries. Use it to turn them off.", "flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID" ], "power_draw": 7500, @@ -329,8 +323,7 @@ "id": "thermal_suit_on", "copy-from": "thermal_suit", "type": "TOOL_ARMOR", - "name": "thermal electric suit (on)", - "name_plural": "thermal electric suits (on)", + "name": { "str": "thermal electric suit (on)", "str_pl": "thermal electric suits (on)" }, "description": "This is a full-body suit of thin thermal underwear equipped with internal battery-powered heating elements. It is currently on, and continually draining batteries. Use it to turn it off.", "flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID" ], "power_draw": 120000, @@ -345,8 +338,7 @@ "category": "clothing", "symbol": "[", "color": "light_gray", - "name": "pair of thermal electric gloves", - "name_plural": "pairs of thermal electric gloves", + "name": { "str": "pair of thermal electric gloves", "str_pl": "pairs of thermal electric gloves" }, "description": "This is a pair of gloves with internal battery-powered heating elements. Use it to turn it on.", "flags": [ "VARSIZE", "SKINTIGHT" ], "price": 5000, @@ -387,8 +379,7 @@ "id": "thermal_gloves_on", "copy-from": "thermal_gloves", "type": "TOOL_ARMOR", - "name": "pair of thermal electric gloves (on)", - "name_plural": "pairs of thermal electric gloves (on)", + "name": { "str": "pair of thermal electric gloves (on)", "str_pl": "pairs of thermal electric gloves (on)" }, "description": "This is a pair of gloves with internal battery-powered heating elements. They are currently on, and continually draining batteries. Use it to turn them off.", "flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID" ], "power_draw": 7500, @@ -444,8 +435,7 @@ "id": "thermal_mask_on", "copy-from": "thermal_mask", "type": "TOOL_ARMOR", - "name": "thermal electric balaclava (on)", - "name_plural": "thermal electric balaclavas (on)", + "name": { "str": "thermal electric balaclava (on)", "str_pl": "thermal electric balaclavas (on)" }, "description": "This is a snug cloth mask with internal battery-powered heating elements. It is are currently on, and continually draining batteries. Use it to turn it off.", "flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID" ], "power_draw": 7500, @@ -460,8 +450,7 @@ "category": "clothing", "symbol": ";", "color": "dark_gray", - "name": "pair of binoculars", - "name_plural": "pairs of binoculars", + "name": { "str": "pair of binoculars", "str_pl": "pairs of binoculars" }, "description": "A pair of optics with a neck strap attached. Useful for seeing long distances. Wearing this item or carrying it in your inventory will double the distance around you that is mapped during your travels. You could also use them to focus the sunlight.", "price": 30000, "material": [ "plastic", "glass" ], @@ -523,8 +512,7 @@ "id": "wearable_light_on", "copy-from": "wearable_light", "type": "TOOL_ARMOR", - "name": "headlamp (on)", - "name_plural": "headlamps (on)", + "name": { "str": "headlamp (on)", "str_pl": "headlamps (on)" }, "description": "This is an LED headlamp with an adjustable strap so as to be comfortably worn on your head or attached to your helmet. It is turned on, and continually draining batteries. Use it to turn it off.", "flags": [ "LIGHT_300", "CHARGEDIM", "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS", "TRADER_AVOID" ], "power_draw": 10000, @@ -580,8 +568,7 @@ "id": "survivor_light_on", "copy-from": "survivor_light", "type": "TOOL_ARMOR", - "name": "survivor headlamp (on)", - "name_plural": "survivor headlamps (on)", + "name": { "str": "survivor headlamp (on)", "str_pl": "survivor headlamps (on)" }, "description": "This is a custom made LED headlamp reinforced to be more durable, brighter, and with a larger and more efficient battery pack. The adjustable strap allows it to be comfortably worn on your head or attached to your helmet. It is turned on, and continually draining batteries. Use it to turn it off.", "flags": [ "LIGHT_350", "CHARGEDIM", "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS" ], "power_draw": 10000, @@ -622,8 +609,7 @@ "copy-from": "wearable_atomic_light", "type": "TOOL_ARMOR", "looks_like": "survivor_light", - "name": "atomic headlamp (covered)", - "name_plural": "atomic headlamps (covered)", + "name": { "str": "atomic headlamp (covered)", "str_pl": "atomic headlamps (covered)" }, "description": "This is a custom made reinforced headlamp powered by the magic of nuclear decay, focused for more usable brightness. The adjustable strap allows it to be comfortably worn on your head or attached to your helmet. Use it to open the cover and show the light.", "flags": [ "LEAK_DAM", "RADIOACTIVE", "DURABLE_MELEE", "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS" ], "use_action": { @@ -663,8 +649,7 @@ "id": "rm13_armor_on", "copy-from": "rm13_armor", "type": "TOOL_ARMOR", - "name": "RM13 combat armor (on)", - "name_plural": "RM13 combat armors (on)", + "name": { "str": "RM13 combat armor (on)", "str_pl": "RM13 combat armors (on)" }, "description": "Internally powered by a maximum of ten plutonium fuel cells, this full-body suit of sleek black military armor represents the pinnacle of Rivtech's non-rigid powered armor technology. It is turned on, and continually draining power. Use it to turn it off.", "flags": [ "VARSIZE", @@ -725,8 +710,7 @@ "id": "dimensional_anchor_on", "copy-from": "dimensional_anchor", "type": "TOOL_ARMOR", - "name": "5-point anchor (on)", - "name_plural": "5-point anchors (on)", + "name": { "str": "5-point anchor (on)", "str_pl": "5-point anchors (on)" }, "looks_like": "dimensional_anchor", "description": "The harness' shoulder mounted LED glows with a soft green hue. Theres no further indication of anything happening.", "turns_per_charge": 100, @@ -789,8 +773,7 @@ "id": "phase_immersion_suit_on", "copy-from": "phase_immersion_suit", "type": "TOOL_ARMOR", - "name": "phase immersion suit (on)", - "name_plural": "phase immersion suits (on)", + "name": { "str": "phase immersion suit (on)", "str_pl": "phase immersion suits (on)" }, "looks_like": "phase_immersion_suit", "description": "Covered in interlocking plates of reflective metal, this advanced suit resembles both plate armor and an astronaut's spacesuit. It is turned on, and continually draining power. Use it to turn it off.", "turns_per_charge": 25, @@ -857,8 +840,7 @@ "id": "rebreather_on", "copy-from": "rebreather", "type": "TOOL_ARMOR", - "name": "rebreather mask (on)", - "name_plural": "rebreather masks (on)", + "name": { "str": "rebreather mask (on)", "str_pl": "rebreather masks (on)" }, "description": "A mask worn over your mouth which, when loaded with the proper filters, recycles your exhaled breath for rebreathing while underwater. It is turned on, and continually consuming its filter. Use it to turn it off.", "flags": [ "WATER_FRIENDLY", "REBREATHER", "TRADER_AVOID" ], "turns_per_charge": 30, @@ -904,8 +886,7 @@ "id": "rebreather_xl_on", "copy-from": "rebreather_xl", "type": "TOOL_ARMOR", - "name": "XL rebreather mask (on)", - "name_plural": "XL rebreather masks (on)", + "name": { "str": "XL rebreather mask (on)", "str_pl": "XL rebreather masks (on)" }, "description": "A mask worn over your mouth which, when loaded with the proper filters, recycles your exhaled breath for rebreathing while underwater. This model has been expanded substantially and can accommodate exotic anatomy. It is turned on, and continually consuming its filter. Use it to turn it off.", "flags": [ "WATER_FRIENDLY", "REBREATHER", "OVERSIZE", "TRADER_AVOID" ], "turns_per_charge": 30, @@ -1240,8 +1221,7 @@ "category": "clothing", "symbol": "[", "color": "dark_gray", - "name": "pair of light amp goggles", - "name_plural": "pairs of light amp goggles", + "name": { "str": "pair of light amp goggles", "str_pl": "pairs of light amp goggles" }, "description": "A pair of battery-powered goggles that amplify ambient light, allowing you to see in the dark. Use it to turn them on.", "flags": [ "FRAGILE" ], "price": 92000, @@ -1285,8 +1265,7 @@ "id": "goggles_nv_on", "copy-from": "goggles_nv", "type": "TOOL_ARMOR", - "name": "pair of light amp goggles (on)", - "name_plural": "pairs of light amp goggles (on)", + "name": { "str": "pair of light amp goggles (on)", "str_pl": "pairs of light amp goggles (on)" }, "description": "A pair of battery-powered light amplifying goggles with an infrared illuminator, allowing you to see in the dark. It is turned on, and continually draining batteries. Use it to turn them off.", "flags": [ "GNV_EFFECT", "FRAGILE", "TRADER_AVOID" ], "//": "2019 commercial models can operate at under 0.375W with the IR illuminator on", @@ -1303,8 +1282,7 @@ "category": "clothing", "symbol": "[", "color": "dark_gray", - "name": "pair of infrared goggles", - "name_plural": "pairs of infrared goggles", + "name": { "str": "pair of infrared goggles", "str_pl": "pairs of infrared goggles" }, "description": "A pair of battery-powered goggles that grant infrared vision, allowing you to see warm-blooded creatures in the dark. Use it to turn them on.", "flags": [ "FRAGILE" ], "price": 92000, @@ -1348,8 +1326,7 @@ "id": "goggles_ir_on", "copy-from": "goggles_ir", "type": "TOOL_ARMOR", - "name": "pair of infrared goggles (on)", - "name_plural": "pairs of infrared goggles (on)", + "name": { "str": "pair of infrared goggles (on)", "str_pl": "pairs of infrared goggles (on)" }, "description": "A pair of battery-powered goggles that grant infrared vision, allowing you to see warm-blooded creatures in the dark. Use it to turn them off.", "flags": [ "IR_EFFECT", "FRAGILE", "TRADER_AVOID" ], "power_draw": 1000, @@ -1385,8 +1362,7 @@ "category": "clothing", "symbol": "[", "color": "dark_gray", - "name": "RX11 stimulant delivery system", - "name_plural": "RX11 stimulant delivery system", + "name": { "str": "RX11 stimulant delivery system", "str_pl": "RX11 stimulant delivery system" }, "description": "The Rivtech RX11 stimulant delivery system is a jet autoinjector system worn on the user's body. A simple press of its activator injects powerful chemical stimulants into the bloodstream without using a needle.", "price": 40000, "material": [ "superalloy", "kevlar_rigid" ], @@ -1436,8 +1412,7 @@ "id": "mask_h20survivor_on", "copy-from": "mask_h20survivor", "type": "TOOL_ARMOR", - "name": "survivor divemask (on)", - "name_plural": "survivor divemasks (on)", + "name": { "str": "survivor divemask (on)", "str_pl": "survivor divemasks (on)" }, "description": "A custom-built, armored rebreather mask that covers the face and eyes. It provides excellent protection from harm as well providing breathing gas while underwater. It is turned on, and continually consuming its filter. Use it to turn it off.", "flags": [ "VARSIZE", "STURDY", "WATER_FRIENDLY", "REBREATHER", "SWIM_GOGGLES" ], "turns_per_charge": 30, @@ -1482,8 +1457,7 @@ "id": "mask_h20survivorxl_on", "copy-from": "mask_h20survivorxl", "type": "TOOL_ARMOR", - "name": "XL survivor divemask (on)", - "name_plural": "XL survivor divemasks (on)", + "name": { "str": "XL survivor divemask (on)", "str_pl": "XL survivor divemasks (on)" }, "description": "A custom-built, armored rebreather mask that covers the face and eyes regardless of your state of mutation. It provides excellent protection from harm as well providing breathing gas while underwater. It is turned on, and continually consuming its filter. Use it to turn it off.", "flags": [ "VARSIZE", "STURDY", "WATER_FRIENDLY", "REBREATHER", "SWIM_GOGGLES", "OVERSIZE", "TRADER_AVOID" ], "turns_per_charge": 30, @@ -1738,8 +1712,7 @@ "category": "clothing", "symbol": "[", "color": "light_gray", - "name": "simple patchwork scarf", - "name_plural": "simple patchwork scarves", + "name": { "str": "simple patchwork scarf", "str_pl": "simple patchwork scarves" }, "description": "A simple and light cloth scarf, worn over the mouth for warmth. Use it to loosen it if you get too warm.", "price": 1000, "material": [ "cotton" ], @@ -1761,8 +1734,7 @@ "category": "clothing", "symbol": "[", "color": "light_gray", - "name": "simple patchwork scarf (loose)", - "name_plural": "simple patchwork scarves (loose)", + "name": { "str": "simple patchwork scarf (loose)", "str_pl": "simple patchwork scarves (loose)" }, "description": "A simple and light cloth scarf, worn over the mouth for warmth. Use it to wear it tighter if you get too cold.", "price": 1000, "material": [ "cotton" ], @@ -1785,8 +1757,7 @@ "category": "clothing", "symbol": "[", "color": "light_gray", - "name": "long patchwork scarf", - "name_plural": "long patchwork scarves", + "name": { "str": "long patchwork scarf", "str_pl": "long patchwork scarves" }, "description": "A very long light cloth scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to loosen it if you get too warm.", "price": 1500, "material": [ "cotton" ], @@ -1808,8 +1779,7 @@ "category": "clothing", "symbol": "[", "color": "light_gray", - "name": "long patchwork scarf (loose)", - "name_plural": "long patchwork scarves (loose)", + "name": { "str": "long patchwork scarf (loose)", "str_pl": "long patchwork scarves (loose)" }, "description": "A very long light cloth scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it tighter if you get too cold.", "price": 1500, "material": [ "cotton" ], @@ -1837,8 +1807,7 @@ "category": "clothing", "symbol": "[", "color": "dark_gray", - "name": "knit scarf", - "name_plural": "knit scarves", + "name": { "str": "knit scarf", "str_pl": "knit scarves" }, "description": "A long knitted cotton scarf, worn over the mouth for warmth. Use it to loosen it if you get too warm.", "price": 2000, "material": [ "cotton" ], @@ -1860,8 +1829,7 @@ "category": "clothing", "symbol": "[", "color": "dark_gray", - "name": "knit scarf (loose)", - "name_plural": "knit scarves (loose)", + "name": { "str": "knit scarf (loose)", "str_pl": "knit scarves (loose)" }, "description": "A long knitted cotton scarf, worn over the mouth for warmth. Use it to wear it tighter if you get too cold.", "price": 2000, "material": [ "cotton" ], @@ -1884,8 +1852,7 @@ "category": "clothing", "symbol": "[", "color": "dark_gray", - "name": "long knit scarf", - "name_plural": "long knit scarves", + "name": { "str": "long knit scarf", "str_pl": "long knit scarves" }, "description": "A really long knitted cotton scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to loosen it if you get too warm.", "price": 3000, "material": [ "cotton" ], @@ -1907,8 +1874,7 @@ "category": "clothing", "symbol": "[", "color": "dark_gray", - "name": "long knit scarf (loose)", - "name_plural": "long knit scarves (loose)", + "name": { "str": "long knit scarf (loose)", "str_pl": "long knit scarves (loose)" }, "description": "A really long knitted cotton scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it tighter if you get too cold.", "price": 3000, "material": [ "cotton" ], @@ -1931,8 +1897,7 @@ "category": "clothing", "symbol": "[", "color": "brown", - "name": "wool scarf", - "name_plural": "wool scarves", + "name": { "str": "wool scarf", "str_pl": "wool scarves" }, "description": "A long wool scarf, worn over the mouth for warmth. Use it to loosen it if you get too warm.", "price": 3800, "material": [ "wool" ], @@ -1954,8 +1919,7 @@ "category": "clothing", "symbol": "[", "color": "brown", - "name": "wool scarf (loose)", - "name_plural": "wool scarves (loose)", + "name": { "str": "wool scarf (loose)", "str_pl": "wool scarves (loose)" }, "description": "A long wool scarf, worn over the mouth for warmth. Use it to wear it tighter if you get too cold.", "price": 3800, "material": [ "wool" ], @@ -1978,8 +1942,7 @@ "category": "clothing", "symbol": "[", "color": "brown", - "name": "long wool scarf", - "name_plural": "long wool scarves", + "name": { "str": "long wool scarf", "str_pl": "long wool scarves" }, "description": "A really long wool scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to loosen it if you get too warm.", "price": 4500, "material": [ "wool" ], @@ -2001,8 +1964,7 @@ "category": "clothing", "symbol": "[", "color": "brown", - "name": "long wool scarf (loose)", - "name_plural": "long wool scarves (loose)", + "name": { "str": "long wool scarf (loose)", "str_pl": "long wool scarves (loose)" }, "description": "A really long wool scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it tighter if you get too cold.", "price": 4500, "material": [ "wool" ], @@ -2025,8 +1987,7 @@ "category": "clothing", "symbol": "[", "color": "brown", - "name": "fur scarf", - "name_plural": "fur scarves", + "name": { "str": "fur scarf", "str_pl": "fur scarves" }, "description": "A long fur scarf, worn over the mouth for warmth. Use it to loosen it if you get too warm.", "price": 9000, "material": [ "fur" ], @@ -2048,8 +2009,7 @@ "category": "clothing", "symbol": "[", "color": "brown", - "name": "fur scarf (loose)", - "name_plural": "fur scarves (loose)", + "name": { "str": "fur scarf (loose)", "str_pl": "fur scarves (loose)" }, "description": "A long fur scarf, worn over the mouth for warmth. Use it to wear it tighter if you get too cold.", "price": 9000, "material": [ "fur" ], @@ -2072,8 +2032,7 @@ "category": "clothing", "symbol": "[", "color": "brown", - "name": "long fur scarf", - "name_plural": "long fur scarves", + "name": { "str": "long fur scarf", "str_pl": "long fur scarves" }, "description": "A really long fur scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to loosen it if you get too warm.", "price": 17700, "material": [ "fur" ], @@ -2095,8 +2054,7 @@ "category": "clothing", "symbol": "[", "color": "brown", - "name": "long fur scarf (loose)", - "name_plural": "long fur scarves (loose)", + "name": { "str": "long fur scarf (loose)", "str_pl": "long fur scarves (loose)" }, "description": "A really long fur scarf, worn over the mouth for warmth. With the extra length, it's enough to handle nonstandard facial features and accommodate your hands too. Use it to wear it tighter if you get too cold.", "price": 17700, "material": [ "fur" ], @@ -2118,8 +2076,7 @@ "category": "clothing", "symbol": "[", "color": "light_gray", - "name": "thermal electric outfit", - "name_plural": "thermal electric outfits", + "name": { "str": "thermal electric outfit", "str_pl": "thermal electric outfits" }, "description": "This suit of thin thermal underwear covers you from head to toe and is equipped with internal battery-powered heating elements. Use it to turn it on.", "flags": [ "VARSIZE", "SKINTIGHT" ], "price": 30000, @@ -2152,8 +2109,7 @@ "id": "thermal_outfit_on", "copy-from": "thermal_outfit", "type": "TOOL_ARMOR", - "name": "thermal electric outfit (on)", - "name_plural": "thermal electric outfits (on)", + "name": { "str": "thermal electric outfit (on)", "str_pl": "thermal electric outfits (on)" }, "description": "This suit of thin thermal underwear covers you from head to toe and is equipped with internal battery-powered heating elements. It is currently on, and continually draining batteries. Use it to turn it off.", "flags": [ "VARSIZE", "SKINTIGHT", "TRADER_AVOID" ], "power_draw": 130000, @@ -2191,8 +2147,7 @@ { "type": "TOOL_ARMOR", "id": "mask_ski_loose", - "name": "ski mask (open)", - "name_plural": "ski masks (open)", + "name": { "str": "ski mask (open)", "str_pl": "ski masks (open)" }, "category": "clothing", "weight": "86 g", "color": "dark_gray", @@ -2244,8 +2199,7 @@ { "type": "TOOL_ARMOR", "id": "harmonica_holder", - "name": "harmonica with a holder", - "name_plural": "harmonicas with holders", + "name": { "str": "harmonica with a holder", "str_pl": "harmonicas with holders" }, "category": "tools", "weight": "200 g", "color": "brown", @@ -2273,8 +2227,7 @@ { "type": "TOOL_ARMOR", "id": "acoustic_guitar", - "name": "acoustic guitar", - "name_plural": "acoustic guitars", + "name": { "str": "acoustic guitar", "str_pl": "acoustic guitars" }, "category": "tools", "weight": "2500 g", "color": "brown", @@ -2354,8 +2307,7 @@ { "type": "TOOL_ARMOR", "id": "bagpipes", - "name": "bagpipes", - "name_plural": "bagpipes", + "name": { "str": "bagpipes", "str_pl": "bagpipes" }, "category": "tools", "weight": "2300 g", "color": "green", @@ -2395,8 +2347,7 @@ { "type": "TOOL_ARMOR", "id": "tuba", - "name": "tuba", - "name_plural": "tubas", + "name": { "str": "tuba", "str_pl": "tubas" }, "category": "tools", "weight": "10000 g", "color": "yellow", @@ -2431,8 +2382,7 @@ { "type": "TOOL_ARMOR", "id": "saxophone", - "name": "saxophone", - "name_plural": "saxophones", + "name": { "str": "saxophone", "str_pl": "saxophones" }, "category": "tools", "weight": "2000 g", "color": "yellow", @@ -2475,8 +2425,7 @@ "category": "armor", "symbol": "[", "color": "blue", - "name": "shooter's earmuffs", - "name_plural": "shooter's earmuffs", + "name": { "str": "shooter's earmuffs", "str_pl": "shooter's earmuffs" }, "description": "A pair of earmuffs favored by shooters. Without batteries or when turned off they function like normal earmuffs and block all sound. They will block sounds over a certain decibel amount when turned on. The earmuffs are currently off.", "flags": [ "DEAFEN", "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS" ], "price": 12500, @@ -2520,8 +2469,7 @@ "category": "armor", "symbol": "[", "color": "blue", - "name": "shooter's earmuffs", - "name_plural": "shooter's earmuffs", + "name": { "str": "shooter's earmuffs", "str_pl": "shooter's earmuffs" }, "description": "A pair of earmuffs favored by shooters. The earmuffs are turned on. They will block sounds over a certain decibel amount, assuming it is charged with batteries.", "flags": [ "OVERSIZE", "BELTED", "ALLOWS_NATURAL_ATTACKS", "PARTIAL_DEAF" ], "price": 12500, @@ -2575,8 +2523,7 @@ { "id": "solarpack", "type": "TOOL_ARMOR", - "name": "solar backpack (folded)", - "name_plural": "solar backpacks (folded)", + "name": { "str": "solar backpack (folded)", "str_pl": "solar backpacks (folded)" }, "description": "Personal portable charging system consisting of an array of solar panels neatly folded in a form of a large backpack. It can be worn as one, and has an integrated cable to plug it into a cable charger system.", "weight": "7500 g", "volume": "5 L", @@ -2596,8 +2543,7 @@ { "id": "solarpack_on", "type": "TOOL_ARMOR", - "name": "solar backpack (unfolded)", - "name_plural": "solar backpacks (unfolded)", + "name": { "str": "solar backpack (unfolded)", "str_pl": "solar backpacks (unfolded)" }, "description": "Unfolded array of portable solar panels ready to push some power into an active cable charger system.", "weight": "7500 g", "volume": "15 L", @@ -2617,8 +2563,7 @@ { "id": "q_solarpack", "type": "TOOL_ARMOR", - "name": "quantum solar backpack (folded)", - "name_plural": "quantum solar backpacks (folded)", + "name": { "str": "quantum solar backpack (folded)", "str_pl": "quantum solar backpacks (folded)" }, "description": "Personal portable charging system consisting of an array of quantum solar panels neatly folded in a form of a large backpack. It can be worn as one, and has an integrated cable to plug it into a cable charger system. Cutting edge technology.", "weight": "7500 g", "volume": "5 L", @@ -2638,8 +2583,7 @@ { "id": "q_solarpack_on", "type": "TOOL_ARMOR", - "name": "quantum solar backpack (unfolded)", - "name_plural": "quantum solar backpacks (unfolded)", + "name": { "str": "quantum solar backpack (unfolded)", "str_pl": "quantum solar backpacks (unfolded)" }, "description": "Unfolded array of portable quantum solar panels ready to push some power into an active cable charger system.", "weight": "7500 g", "volume": "15 L", @@ -2684,8 +2628,7 @@ "id": "helmet_riot_raised", "type": "TOOL_ARMOR", "category": "armor", - "name": "riot helmet (raised visor)", - "name_plural": "riot helmets (raised visor)", + "name": { "str": "riot helmet (raised visor)", "str_pl": "riot helmets (raised visor)" }, "description": "A riot helmet with a plastic face shield which is raised up. Activate to lower the shield.", "use_action": { "type": "transform", "target": "helmet_riot", "msg": "You put down your visor." }, "weight": "2260 g", @@ -2855,8 +2798,7 @@ { "id": "electric_blanket_on", "type": "TOOL_ARMOR", - "name": "electric blanket (on)", - "name_plural": "electric blankets (on)", + "name": { "str": "electric blanket (on)", "str_pl": "electric blankets (on)" }, "description": "A heated blanket made of polyster. It's turned on, making it nice and toasty while it lasts.", "copy-from": "electric_blanket", "warmth": 90, @@ -2905,8 +2847,7 @@ { "id": "foodperson_mask_on", "type": "TOOL_ARMOR", - "name": "Foodperson mask (on)", - "name_plural": "Foodperson masks (on)", + "name": { "str": "Foodperson mask (on)", "str_pl": "Foodperson masks (on)" }, "copy-from": "foodperson_mask", "turns_per_charge": 60, "revert_to": "foodperson_mask", @@ -2916,8 +2857,7 @@ { "id": "attached_ear_plugs_on", "type": "ARMOR", - "name": "pair of attached ear plugs (in)", - "name_plural": "pairs of attached ear plugs (in)", + "name": { "str": "pair of attached ear plugs (in)", "str_pl": "pairs of attached ear plugs (in)" }, "description": "A pair of industrial grade ear plugs attached together by some string. They are inside your ears, activate them to take them out.", "copy-from": "ear_plugs", "use_action": { @@ -2931,8 +2871,7 @@ { "id": "attached_ear_plugs_off", "type": "ARMOR", - "name": "pair of attached ear plugs (out)", - "name_plural": "pairs of attached ear plugs (out)", + "name": { "str": "pair of attached ear plugs (out)", "str_pl": "pairs of attached ear plugs (out)" }, "description": "A pair of industrial grade ear plugs, they are attached together by some string. They hang around your neck, use them to plug them in.", "copy-from": "attached_ear_plugs_on", "use_action": { diff --git a/data/json/items/tools.json b/data/json/items/tools.json index 772ffb8685549..321489269c6fd 100644 --- a/data/json/items/tools.json +++ b/data/json/items/tools.json @@ -74,8 +74,7 @@ "id": "LAW_Packed", "type": "TOOL", "category": "guns", - "name": "packed M72 LAW", - "name_plural": "packed M72 LAWs", + "name": { "str": "packed M72 LAW", "str_pl": "packed M72 LAWs" }, "description": "This is a M72 LAW, packed in its storage form. Use it to pop it out and make it ready to fire. Once it is activated, it cannot be repacked.", "weight": "2500 g", "volume": "1500 ml", @@ -111,8 +110,7 @@ { "id": "UPS_off", "type": "TOOL", - "name": "UPS", - "name_plural": "UPS's", + "name": { "str": "UPS", "str_pl": "UPS's" }, "description": "This is a unified power supply, or UPS. It is a device developed jointly by military and scientific interests for use in combat and the field. The UPS is designed to power bionics, armor and some guns, but drains batteries quickly.", "weight": "680 g", "volume": "2500 ml", @@ -149,8 +147,7 @@ { "id": "adv_UPS_off", "type": "TOOL", - "name": "advanced UPS", - "name_plural": "advanced UPS's", + "name": { "str": "advanced UPS", "str_pl": "advanced UPS's" }, "description": "This is an advanced version of the unified power supply, or UPS. This device has been significantly redesigned to provide better efficiency as well as to consume plutonium fuel cells rather than batteries. Sadly, its plutonium reactor can't be charged in UPS charging station.", "weight": "453 g", "volume": "2 L", @@ -326,8 +323,7 @@ "id": "atomic_lamp_off", "type": "GENERIC", "category": "tools", - "name": "atomic lamp (covered)", - "name_plural": "atomic lamps (covered)", + "name": { "str": "atomic lamp (covered)", "str_pl": "atomic lamps (covered)" }, "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. The cover is closed. Use it to open the cover and show the light.", "weight": "1438 g", "volume": "1 L", @@ -372,8 +368,7 @@ "id": "atomic_light_off", "type": "GENERIC", "category": "tools", - "name": "atomic reading light (covered)", - "name_plural": "atomic reading lights (covered)", + "name": { "str": "atomic reading light (covered)", "str_pl": "atomic reading lights (covered)" }, "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. The cover is closed. Use it to open the cover and show the light.", "weight": "214 g", "volume": "250 ml", @@ -410,8 +405,7 @@ "id": "banjo", "type": "TOOL", "category": "tools", - "name": "banjo", - "name_plural": "banjos", + "name": { "str": "banjo", "str_pl": "banjos" }, "description": "A standard factory-made banjo. Looks to be in working condition.", "weight": "2000 g", "volume": "3 L", @@ -441,8 +435,7 @@ "id": "barometer", "type": "TOOL", "category": "tools", - "name": "barometer", - "name_plural": "barometers", + "name": { "str": "barometer", "str_pl": "barometers" }, "description": "A plastic barometer that can read the atmospheric pressure.", "weight": "1 g", "volume": "250 ml", @@ -528,8 +521,7 @@ { "id": "boltcutters", "type": "TOOL", - "name": "pair of bolt cutters", - "name_plural": "pairs of bolt cutters", + "name": { "str": "pair of bolt cutters", "str_pl": "pairs of bolt cutters" }, "description": "This is a large pair of bolt cutters. You could use them to cut padlocks or heavy gauge wire.", "weight": "1224 g", "volume": "750 ml", @@ -547,8 +539,7 @@ "id": "bone_flute", "type": "TOOL", "category": "tools", - "name": "bone flute", - "name_plural": "bone flutes", + "name": { "str": "bone flute", "str_pl": "bone flutes" }, "description": "A polished bone flute with five finger holes.", "weight": "250 g", "volume": "500 ml", @@ -670,8 +661,7 @@ "id": "c4armed", "type": "TOOL", "category": "weapons", - "name": "C-4 explosive (armed)", - "name_plural": "C-4 explosives (armed)", + "name": { "str": "C-4 explosive (armed)", "str_pl": "C-4 explosives (armed)" }, "description": "This is military grade RDX composition explosive. A label reads: \"Highly explosive, use with extreme caution!\" It comes with a small timer, which is currently ticking down.", "weight": "1570 g", "volume": "1 L", @@ -695,8 +685,7 @@ { "id": "caltrops", "type": "TOOL", - "name": "loose caltrops", - "name_plural": "loose caltrops", + "name": { "str": "loose caltrops", "str_pl": "loose caltrops" }, "description": "These are small metal objects covered with many sharp points. If an unsuspecting victim steps on one, they'll get a spine through the foot.", "weight": "264 g", "volume": "250 ml", @@ -718,8 +707,7 @@ { "id": "caltrops_glass", "type": "TOOL", - "name": "loose glass caltrops", - "name_plural": "loose glass caltrops", + "name": { "str": "loose glass caltrops", "str_pl": "loose glass caltrops" }, "description": "These are glass shards glued together to expose their sharp edges. If an unsuspecting victim steps on one, they'll get cut.", "weight": "264 g", "volume": "500 ml", @@ -842,8 +830,7 @@ { "id": "candle_lit", "type": "TOOL", - "name": "candle", - "name_plural": "candles", + "name": { "str": "candle", "str_pl": "candles" }, "description": "This is a thick candle. It doesn't provide very much light, but it can burn for quite a long time. This candle is lit.", "weight": "100 g", "volume": "250 ml", @@ -909,8 +896,7 @@ "id": "carding_paddles", "type": "GENERIC", "category": "tools", - "name": "carding paddles", - "name_plural": "pairs of carding paddles", + "name": { "str": "carding paddles", "str_pl": "pairs of carding paddles" }, "description": "A pair of toothy wooden paddles used to clean fibers for use in textile production.", "weight": "360 g", "volume": "500 ml", @@ -924,8 +910,7 @@ { "id": "carver_off", "type": "TOOL", - "name": "electric carver (off)", - "name_plural": "electric carvers (off)", + "name": { "str": "electric carver (off)", "str_pl": "electric carvers (off)" }, "description": "An electric meat carver powered by batteries. Two serrated blades that vibrate together to slice just about anything from turkey to ham… even zombies!", "weight": "1106 g", "volume": "1500 ml", @@ -951,8 +936,7 @@ "id": "carver_on", "copy-from": "carver_off", "type": "TOOL", - "name": "electric carver (on)", - "name_plural": "electric carvers (on)", + "name": { "str": "electric carver (on)", "str_pl": "electric carvers (on)" }, "description": "This carver is on and the blades are buzzing. Use it to turn it off.", "cutting": 30, "power_draw": 150000, @@ -966,8 +950,7 @@ { "id": "cell_phone", "type": "TOOL", - "name": "cellphone", - "name_plural": "cellphones", + "name": { "str": "cellphone", "str_pl": "cellphones" }, "description": "This is a cellphone, an older cousin of a smartphone but still popular in certain circles due to its reliability, sturdiness and the ability to run on common batteries. Using this cellphone will turn it on and provide light, assuming it is sufficiently charged. It also has a clock app that includes an alarm.", "weight": "226 g", "volume": "100 ml", @@ -1007,8 +990,7 @@ "id": "cell_phone_flashlight", "copy-from": "cell_phone", "type": "TOOL", - "name": "cellphone - Flashlight", - "name_plural": "cellphones - Flashlight", + "name": { "str": "cellphone - Flashlight", "str_pl": "cellphones - Flashlight" }, "power_draw": 500, "revert_to": "cell_phone", "use_action": { "target": "cell_phone", "msg": "You stop lighting up the screen.", "menu_text": "Turn off", "type": "transform" }, @@ -1017,8 +999,7 @@ { "id": "smart_phone", "type": "TOOL", - "name": "smartphone", - "name_plural": "smartphones", + "name": { "str": "smartphone", "str_pl": "smartphones" }, "description": "A popular, fancy smartphone. Capable of making photos due to integrated camera and illuminating an area as per flashlight app, assuming it has enough charge. The smartphone also has a clock app that includes an alarm. Runs on a small, rechargeable power cell compatible with Unified Power Supply.", "weight": "230 g", "volume": "100 ml", @@ -1050,8 +1031,7 @@ "id": "smartphone_music", "copy-from": "smart_phone", "type": "TOOL", - "name": "smartphone - music", - "name_plural": "smartphones - music", + "name": { "str": "smartphone - music", "str_pl": "smartphones - music" }, "description": "This phone is playing music, steadily raising your morale. You can't hear anything else while you're listening.", "power_draw": 300, "revert_to": "smart_phone", @@ -1063,8 +1043,7 @@ "id": "smart_phone_flashlight", "copy-from": "smart_phone", "type": "TOOL", - "name": "smartphone - Flashlight", - "name_plural": "smartphones - Flashlight", + "name": { "str": "smartphone - Flashlight", "str_pl": "smartphones - Flashlight" }, "power_draw": 1500, "revert_to": "smart_phone", "use_action": { @@ -1078,8 +1057,7 @@ { "id": "chainsaw_off", "type": "TOOL", - "name": "chainsaw (off)", - "name_plural": "chainsaws (off)", + "name": { "str": "chainsaw (off)", "str_pl": "chainsaws (off)" }, "description": "This is a lumbering tool moonlighting as weapon of opportunity. If loaded with gas, using this item will cause it to turn on, turning it into a very powerful but unwieldy melee weapon.", "weight": "6577 g", "volume": "2500 ml", @@ -1100,8 +1078,7 @@ "id": "chainsaw_on", "copy-from": "chainsaw_off", "type": "TOOL", - "name": "chainsaw (on)", - "name_plural": "chainsaws (on)", + "name": { "str": "chainsaw (on)", "str_pl": "chainsaws (on)" }, "description": "This chainsaw is on and making a lot of noise. Use it to turn it off.", "to_hit": -5, "bashing": 4, @@ -1259,8 +1236,7 @@ { "id": "circsaw_off", "type": "TOOL", - "name": "circular saw (off)", - "name_plural": "circular saws (off)", + "name": { "str": "circular saw (off)", "str_pl": "circular saws (off)" }, "description": "A lightweight handheld cordless circular saw. Spins a circular blade fast enough to cut wood, zombies, or in an emergency, pizza. The blade, while effective in combat, is hard to hit with due to its small size.", "weight": "2940 g", "volume": "750 ml", @@ -1287,8 +1263,7 @@ "id": "circsaw_on", "copy-from": "circsaw_off", "type": "TOOL", - "name": "circular saw (on)", - "name_plural": "circular saws (on)", + "name": { "str": "circular saw (on)", "str_pl": "circular saws (on)" }, "//": "Circular saw would be very fast but imprecise butchering tool - alas the qualities are not separate and so speed is sacrificed.", "description": "A lightweight handheld cordless circular saw. It is currently on and the blade is spinning; use this item to turn it off.", "cutting": 50, @@ -1304,8 +1279,7 @@ "id": "clarinet", "type": "TOOL", "category": "tools", - "name": "clarinet", - "name_plural": "clarinets", + "name": { "str": "clarinet", "str_pl": "clarinets" }, "description": "An ornate clarinet made from wood.", "weight": "550 g", "volume": "1500 ml", @@ -1471,8 +1445,7 @@ { "id": "copper_knife", "type": "TOOL", - "name": "copper knife", - "name_plural": "copper knives", + "name": { "str": "copper knife", "str_pl": "copper knives" }, "description": "A knife consisting of crudely-worked copper, and a simple handle. Primitive, but a step above stone-age.", "weight": "650 g", "volume": "250 ml", @@ -1766,8 +1739,7 @@ "id": "distaff_spindle", "type": "GENERIC", "category": "tools", - "name": "distaff and spindle", - "name_plural": "distaves and spindles", + "name": { "str": "distaff and spindle", "str_pl": "distaves and spindles" }, "description": "A pair of specialized wooden rods used to spin fibers into thread and yarn.", "weight": "612 g", "volume": "1500 ml", @@ -1783,8 +1755,7 @@ "id": "diveknife", "type": "TOOL", "category": "weapons", - "name": "dive knife", - "name_plural": "dive knives", + "name": { "str": "dive knife", "str_pl": "dive knives" }, "//": "Too small to be effectively used for butchering, still not bad at it due to serrated edge.", "description": "This is a short, sturdy knife with a serrated edge for cutting lines and straps, and a blunt tip for prying. Used primarily by divers, it is very light and takes up virtually no space in one's pockets.", "weight": "226 g", @@ -1885,8 +1856,7 @@ "id": "dynamite_act", "type": "TOOL", "category": "weapons", - "name": "dynamite (lit)", - "name_plural": "dynamites (lit)", + "name": { "str": "dynamite (lit)", "str_pl": "dynamites (lit)" }, "description": "The fuse on this dynamite is lit and hissing. It'll explode any moment now.", "weight": "1133 g", "volume": "750 ml", @@ -1911,8 +1881,7 @@ { "id": "e_handcuffs", "type": "TOOL", - "name": "electronic handcuffs", - "name_plural": "electronic handcuffs", + "name": { "str": "electronic handcuffs", "str_pl": "electronic handcuffs" }, "description": "A pair of electronic handcuffs, used by police and riot bots to detain captives. Their continuous siren clearly identifies the wearer as an arrested criminal and alerts human police. Wait for their arrival, don't try to escape or to remove the cuffs - they will administer an electric shock.\nHowever, since the only police likely to respond are undead, you may have a long wait ahead, unless you get creative…", "weight": "2000 g", "volume": "250 ml", @@ -2055,8 +2024,7 @@ { "id": "elec_chainsaw_off", "type": "TOOL", - "name": "electric chainsaw (off)", - "name_plural": "electric chainsaws (off)", + "name": { "str": "electric chainsaw (off)", "str_pl": "electric chainsaws (off)" }, "description": "This is a lumbering tool moonlighting as weapon of opportunity. If loaded with batteries, using this item will cause it to turn on, turning it into a very powerful but unwieldy melee weapon.", "weight": "6577 g", "volume": "2500 ml", @@ -2083,8 +2051,7 @@ "id": "elec_chainsaw_on", "copy-from": "elec_chainsaw_off", "type": "TOOL", - "name": "electric chainsaw (on)", - "name_plural": "electric chainsaws (on)", + "name": { "str": "electric chainsaw (on)", "str_pl": "electric chainsaws (on)" }, "description": "This electric chainsaw is on and making a lot of noise. Use it to turn it off.", "to_hit": -5, "bashing": 4, @@ -2229,8 +2196,7 @@ "id": "fertilizer_bomb_act", "type": "TOOL", "category": "weapons", - "name": "fertilizer bomb (lit)", - "name_plural": "fertilizer bombs (lit)", + "name": { "str": "fertilizer bomb (lit)", "str_pl": "fertilizer bombs (lit)" }, "description": "The fuse on this fertilizer bomb is lit and hissing. It'll explode any moment now.", "weight": "1133 g", "volume": "750 ml", @@ -2325,8 +2291,7 @@ { "id": "firecracker_act", "type": "TOOL", - "name": "firecracker (lit)", - "name_plural": "firecrackers (lit)", + "name": { "str": "firecracker (lit)", "str_pl": "firecrackers (lit)" }, "description": "A firecracker that has been lit; the fuse is hissing. Throw it quickly before it explodes.", "weight": "3 g", "volume": 0, @@ -2343,8 +2308,7 @@ { "id": "firecracker_pack", "type": "TOOL", - "name": "pack of firecrackers", - "name_plural": "packs of firecrackers", + "name": { "str": "pack of firecrackers", "str_pl": "packs of firecrackers" }, "description": "This is a pack of 25 firecrackers with a starter fuse. Use this item to light the fuse. Of course, you will need a lighter or some matches to do so. Shortly after you light the fuse they will begin to explode, so throw them quickly!", "weight": "75 g", "volume": 0, @@ -2362,8 +2326,7 @@ { "id": "firecracker_pack_act", "type": "TOOL", - "name": "pack of firecrackers (lit)", - "name_plural": "packs of firecrackers (lit)", + "name": { "str": "pack of firecrackers (lit)", "str_pl": "packs of firecrackers (lit)" }, "description": "A pack of 25 firecrackers that has been lit; the fuse is hissing. Throw them quickly before the start to explode.", "weight": "75 g", "volume": 0, @@ -2591,8 +2554,7 @@ "id": "flute", "type": "TOOL", "category": "tools", - "name": "flute", - "name_plural": "flutes", + "name": { "str": "flute", "str_pl": "flutes" }, "description": "A simple silver-plated flute.", "weight": "250 g", "volume": "500 ml", @@ -2793,8 +2755,7 @@ { "id": "gasoline_lantern", "type": "TOOL", - "name": "gasoline lantern (off)", - "name_plural": "gasoline lanterns (off)", + "name": { "str": "gasoline lantern (off)", "str_pl": "gasoline lanterns (off)" }, "description": "This is a small gasoline powered lantern. It does not provide much light, but it lasts a long time. Use it to turn it on.", "weight": "1400 g", "volume": "750 ml", @@ -2823,8 +2784,7 @@ "id": "gasoline_lantern_on", "copy-from": "gasoline_lantern", "type": "TOOL", - "name": "gasoline lantern (on)", - "name_plural": "gasoline lanterns (on)", + "name": { "str": "gasoline lantern (on)", "str_pl": "gasoline lanterns (on)" }, "description": "This is a small gasoline powered lantern. It does not provide much light, but it lasts a long time. It is turned on. Use it to turn it off.", "turns_per_charge": 60, "revert_to": "gasoline_lantern", @@ -2834,8 +2794,7 @@ { "id": "geiger_off", "type": "TOOL", - "name": "geiger counter (off)", - "name_plural": "geiger counters (off)", + "name": { "str": "geiger counter (off)", "str_pl": "geiger counters (off)" }, "description": "This is a tool for measuring radiation. Using it will prompt you to choose whether to scan yourself or the terrain, or to turn it on, which will provide continuous feedback on ambient radiation. It is currently off.", "weight": "225 g", "volume": "500 ml", @@ -2867,8 +2826,7 @@ "id": "geiger_on", "copy-from": "geiger_off", "type": "TOOL", - "name": "geiger counter (on)", - "name_plural": "geiger counters (on)", + "name": { "str": "geiger counter (on)", "str_pl": "geiger counters (on)" }, "description": "This is a tool for measuring radiation. It is in continuous scan mode, and will produce quiet clicking sounds in the presence of ambient radiation. Using it allows you to turn it off, or scan yourself or the ground. It is currently on.", "power_draw": 200, "revert_to": "geiger_off", @@ -3214,8 +3172,7 @@ "id": "hygrometer", "type": "TOOL", "category": "tools", - "name": "hygrometer", - "name_plural": "hygrometers", + "name": { "str": "hygrometer", "str_pl": "hygrometers" }, "description": "A plastic hygrometer that can read the relative humidity in the air.", "weight": "1 g", "volume": "250 ml", @@ -3270,8 +3227,7 @@ "id": "jar_pickles_pickled", "type": "GENERIC", "category": "food", - "name": "sealed jar of pickles", - "name_plural": "sealed jars of pickles", + "name": { "str": "sealed jar of pickles", "str_pl": "sealed jars of pickles" }, "description": "This is a sealed glass jar containing pickles. Use to open and eat to enjoy.", "weight": "1750 g", "volume": "500 ml", @@ -3293,8 +3249,7 @@ "id": "jar_sauerkraut_pickled", "type": "GENERIC", "category": "food", - "name": "sealed jar of sauerkraut", - "name_plural": "sealed jars of sauerkraut", + "name": { "str": "sealed jar of sauerkraut", "str_pl": "sealed jars of sauerkraut" }, "description": "This is a sealed glass jar containing sauerkraut. Use to open and eat to enjoy.", "weight": "1750 g", "volume": "500 ml", @@ -3316,8 +3271,7 @@ "id": "jar_eggs_pickled", "type": "GENERIC", "category": "food", - "name": "sealed jar of eggs", - "name_plural": "sealed jars of eggs", + "name": { "str": "sealed jar of eggs", "str_pl": "sealed jars of eggs" }, "description": "This is a sealed glass jar containing pickled eggs. Use to open and eat to enjoy.", "weight": "1750 g", "volume": "500 ml", @@ -3413,8 +3367,7 @@ "id": "knitting_needles", "type": "GENERIC", "category": "tools", - "name": "knitting needles", - "name_plural": "pairs of knitting needles", + "name": { "str": "knitting needles", "str_pl": "pairs of knitting needles" }, "description": "A pair of stout wooden needles with round ends used to turn thread and yarn into cloth.", "weight": "56 g", "volume": 0, @@ -3584,8 +3537,7 @@ { "id": "lightstrip", "type": "TOOL", - "name": "lightstrip", - "name_plural": "lightstrips", + "name": { "str": "lightstrip", "str_pl": "lightstrips" }, "copy-from": "lightstrip_base", "description": "This is a light-emitting circuit that has been wired directly to a battery. It provides some weak light and can't be turned off until the battery dies.", "color": "green", @@ -3598,8 +3550,7 @@ "//": "This doesn't make too much sense, flavor-wise, but it's the best I can come up with. Put it on the todo list.", "id": "lightstrip_inactive", "type": "TOOL", - "name": "lightstrip (inactive)", - "name_plural": "lightstrips (inactive)", + "name": { "str": "lightstrip (inactive)", "str_pl": "lightstrips (inactive)" }, "copy-from": "lightstrip_base", "description": "This is a light-emitting circuit that can be wired directly to a battery. It provides some weak light and can't be turned off until the battery dies.", "color": "white", @@ -3630,8 +3581,7 @@ { "id": "magnifying_glass", "type": "TOOL", - "name": "magnifying glass", - "name_plural": "magnifying glasses", + "name": { "str": "magnifying glass", "str_pl": "magnifying glasses" }, "description": "This is a magnifying glass. May be useful for starting fires during sunny skies.", "weight": "400 g", "volume": "250 ml", @@ -3887,8 +3837,7 @@ "id": "mininuke_act", "type": "TOOL", "category": "weapons", - "name": "mininuke", - "name_plural": "mininukes", + "name": { "str": "mininuke", "str_pl": "mininukes" }, "//": "This is based on the Davy Crockett nuclear artillery shell, all other man-portable nuclear weapons have far too high a yield.", "description": "This miniature nuclear bomb has a light blinking on the side, showing that it will soon explode. You should probably get far, far away from it.", "weight": "23000 g", @@ -3990,8 +3939,7 @@ "id": "molotov_lit", "type": "TOOL", "category": "weapons", - "name": "Molotov cocktail", - "name_plural": "Molotov cocktails", + "name": { "str": "Molotov cocktail", "str_pl": "Molotov cocktails" }, "description": "A bottle of flammable liquid with a flaming rag stoppered in its neck. Throwing it will shatter the bottle on impact and ignite a fireball. Dropping it will set you on fire, so don't do that unless you want to burn to death.", "weight": "742 g", "volume": "750 ml", @@ -4040,8 +3988,7 @@ { "id": "mortar_pestle", "type": "TOOL", - "name": "mortar and pestle", - "name_plural": "sets of mortar and pestle", + "name": { "str": "mortar and pestle", "str_pl": "sets of mortar and pestle" }, "description": "This is a simple combination of a small grindstone and a bowl-shaped stone. Used for grinding grain, but time-consuming compared to more complex methods.", "weight": "1632 g", "volume": "1 L", @@ -4056,8 +4003,7 @@ { "id": "mp3", "type": "TOOL", - "name": "mp3 player (off)", - "name_plural": "mp3 players (off)", + "name": { "str": "mp3 player (off)", "str_pl": "mp3 players (off)" }, "description": "This battery-powered device is loaded up with someone's music collection. Fortunately, there's lots of songs you like, and listening to it will raise your morale slightly. Use it to turn it on.", "weight": "140 g", "volume": "50 ml", @@ -4088,8 +4034,7 @@ "id": "mp3_on", "copy-from": "mp3", "type": "TOOL", - "name": "mp3 player (on)", - "name_plural": "mp3 players (on)", + "name": { "str": "mp3 player (on)", "str_pl": "mp3 players (on)" }, "description": "This mp3 player is turned on and playing some great tunes, raising your morale steadily while on your person. It runs through batteries quickly; you can turn it off by using it. It also obscures your hearing.", "power_draw": 1000, "revert_to": "mp3", @@ -4223,8 +4168,7 @@ { "id": "noise_emitter", "type": "TOOL", - "name": "noise emitter (off)", - "name_plural": "noise emitters (off)", + "name": { "str": "noise emitter (off)", "str_pl": "noise emitters (off)" }, "description": "This device was constructed by 'enhancing' a speaker ripped off from some electronic device with some amplifier circuits. It has now no other use beside emitting loud crackling static noise, that could distract zombies.", "weight": "340 g", "volume": "1 L", @@ -4257,8 +4201,7 @@ "id": "noise_emitter_on", "copy-from": "noise_emitter", "type": "TOOL", - "name": "noise emitter (on)", - "name_plural": "noise emitters (on)", + "name": { "str": "noise emitter (on)", "str_pl": "noise emitters (on)" }, "description": "This device has been turned on and is emitting horrible crackles, pops and other static sounds. Quick, get away from it before it draws zombies to you!", "power_draw": 10000, "revert_to": "noise_emitter", @@ -4288,8 +4231,7 @@ { "id": "oil_lamp", "type": "TOOL", - "name": "oil lamp (off)", - "name_plural": "oil lamps (off)", + "name": { "str": "oil lamp (off)", "str_pl": "oil lamps (off)" }, "description": "This is an oil fueled lamp. It does not provide much light, but it lasts a long time. Use it to turn it on.", "weight": "1720 g", "volume": "1 L", @@ -4318,8 +4260,7 @@ "id": "oil_lamp_on", "copy-from": "oil_lamp", "type": "TOOL", - "name": "oil lamp", - "name_plural": "oil lamps", + "name": { "str": "oil lamp", "str_pl": "oil lamps" }, "description": "This is an oil fueled lamp. It does not provide much light, but it lasts a long time. It is turned on. Use it to turn it off.", "turns_per_charge": 240, "revert_to": "oil_lamp", @@ -4401,8 +4342,7 @@ { "id": "paint_brush", "type": "TOOL", - "name": "paint brush", - "name_plural": "paint brushes", + "name": { "str": "paint brush", "str_pl": "paint brushes" }, "description": "A wide brush, suitable for painting walls.", "weight": "60 g", "volume": "500 ml", @@ -4597,8 +4537,7 @@ { "id": "pliers", "type": "TOOL", - "name": "pliers", - "name_plural": "pliers", + "name": { "str": "pliers", "str_pl": "pliers" }, "description": "This is a basic pair of slip-joint pliers, able to handle basic mechanical work. Anything too complex will require a wrench.", "weight": "807 g", "volume": "250 ml", @@ -4613,8 +4552,7 @@ { "id": "pocketwatch", "type": "TOOL", - "name": "pocket watch", - "name_plural": "pocket watches", + "name": { "str": "pocket watch", "str_pl": "pocket watches" }, "description": "An old fashioned pocket watch. This one tells you the time and looks good doing it. Can also be disassembled into some useful parts.", "weight": "65 g", "volume": 0, @@ -4629,8 +4567,7 @@ { "id": "pockknife", "type": "TOOL", - "name": "pocket knife", - "name_plural": "pocket knives", + "name": { "str": "pocket knife", "str_pl": "pocket knives" }, "description": "This is a small pocket knife. It isn't great for combat, but it's better than nothing. It's sharp enough to butcher with.", "weight": "141 g", "volume": 0, @@ -4793,8 +4730,7 @@ { "id": "primitive_knife", "type": "TOOL", - "name": "stone knife", - "name_plural": "stone knives", + "name": { "str": "stone knife", "str_pl": "stone knives" }, "description": "This is a sharpened stone set into a hollowed handle. Not nearly as usable as a proper knife, but it's better than nothing.", "weight": "453 g", "volume": "250 ml", @@ -4883,8 +4819,7 @@ { "id": "reading_light", "type": "TOOL", - "name": "reading light", - "name_plural": "reading lights", + "name": { "str": "reading light", "str_pl": "reading lights" }, "description": "A little clip-on LED light, meant for reading books in the dark.", "weight": "90 g", "volume": 0, @@ -4909,8 +4844,7 @@ "id": "reading_light_on", "copy-from": "reading_light", "type": "TOOL", - "name": "reading light (active)", - "name_plural": "reading lights (active)", + "name": { "str": "reading light (active)", "str_pl": "reading lights (active)" }, "description": "A little clip-on LED light, meant for reading books in the dark. This one is turned on.", "power_draw": 1000, "revert_to": "reading_light", @@ -4949,8 +4883,7 @@ { "id": "ref_lighter_on", "type": "TOOL", - "name": "refillable lighter", - "name_plural": "refillable lighters", + "name": { "str": "refillable lighter", "str_pl": "refillable lighters" }, "description": "This is a lighter featuring a flip top cover and refuelable tank. It is lit.", "weight": "20 g", "volume": "31 ml", @@ -5051,8 +4984,7 @@ "id": "safe_box", "type": "TOOL", "category": "other", - "name": "safe deposit box", - "name_plural": "safe deposit boxes", + "name": { "str": "safe deposit box", "str_pl": "safe deposit boxes" }, "description": "This is a secure combination lock box. Sadly, you don't know the combination. Breaking inside it would destroy anything of value.", "weight": "2267 g", "volume": "3750 ml", @@ -5277,8 +5209,7 @@ "id": "shishkebab_off", "type": "TOOL", "category": "weapons", - "name": "shishkebab (off)", - "name_plural": "shishkebabs (off)", + "name": { "str": "shishkebab (off)", "str_pl": "shishkebabs (off)" }, "description": "This is a large blade with a fuel pipe on the side, and a small tank and igniter built into the insulated hilt. When filled with gasoline, the blade can be made scorching hot to singe enemies and light your way. Use to ignite.", "weight": "1701 g", "volume": "2500 ml", @@ -5309,8 +5240,7 @@ "id": "shishkebab_on", "copy-from": "shishkebab_off", "type": "TOOL", - "name": "shishkebab (on)", - "name_plural": "shishkebabs (on)", + "name": { "str": "shishkebab (on)", "str_pl": "shishkebabs (on)" }, "description": "This is a large blade with a fuel pipe on the side, and a small tank and igniter built into the insulated hilt. The blade is glowing brightly. Use to shut off the gas.", "turns_per_charge": 20, "revert_to": "shishkebab_off", @@ -5446,8 +5376,7 @@ { "id": "smart_lamp", "type": "TOOL", - "name": "smart lamp (off)", - "name_plural": "smart lamps (off)", + "name": { "str": "smart lamp (off)", "str_pl": "smart lamps (off)" }, "description": "This is a smart lamp, it can be activated remotely.", "weight": "400 g", "volume": "500 ml", @@ -5488,8 +5417,7 @@ "id": "smart_lamp_on", "copy-from": "smart_lamp", "type": "TOOL", - "name": "smart lamp (on)", - "name_plural": "smart lamps (on)", + "name": { "str": "smart lamp (on)", "str_pl": "smart lamps (on)" }, "description": "This is a smart lamp, this smart lamp is turned on. It can be deactivated remotely.", "power_draw": 10000, "revert_to": "smart_lamp", @@ -5683,8 +5611,7 @@ { "id": "survivor_scope", "type": "TOOL", - "name": "survivor telescope", - "name_plural": "survivor telescopes", + "name": { "str": "survivor telescope", "str_pl": "survivor telescopes" }, "description": "A homemade collapsible telescope. Too large and inaccurate to use as a weapon scope, but carrying this item in your inventory will double the distance that is mapped around you during your travels.", "weight": "500 g", "volume": "250 ml", @@ -5934,8 +5861,7 @@ { "id": "testflames", "type": "TOOL", - "name": "Flaming Chunk of Steel +2", - "name_plural": "Flaming Chunks of Steel +2", + "name": { "str": "Flaming Chunk of Steel +2", "str_pl": "Flaming Chunks of Steel +2" }, "description": "HOLY SHIT THIS THING IS ON FIRE", "weight": "64 g", "volume": "250 ml", @@ -5953,8 +5879,7 @@ "id": "thermometer", "type": "TOOL", "category": "tools", - "name": "thermometer", - "name_plural": "thermometers", + "name": { "str": "thermometer", "str_pl": "thermometers" }, "description": "A plastic thermometer that can read the air temperature.", "weight": "1 g", "volume": "250 ml", @@ -5986,8 +5911,7 @@ { "id": "tongs", "type": "TOOL", - "name": "pair of metal tongs", - "name_plural": "pairs of metal tongs", + "name": { "str": "pair of metal tongs", "str_pl": "pairs of metal tongs" }, "description": "These are long, metal tongs. They are commonly used for cooking or in metalworking fabrication recipes.", "weight": "540 g", "volume": "500 ml", @@ -6037,8 +5961,7 @@ "id": "small_space_heater_on", "copy-from": "small_space_heater", "type": "TOOL", - "name": "small space heater (on)", - "name_plural": "small space heaters (on)", + "name": { "str": "small space heater (on)", "str_pl": "small space heaters (on)" }, "description": "A portable electric heater that steadily emits warm air. Raises temperature about 10 degrees C.", "power_draw": 500000, "emits": [ "emit_hot_air2_stream" ], @@ -6080,8 +6003,7 @@ "id": "large_space_heater_on", "copy-from": "large_space_heater", "type": "TOOL", - "name": "large space heater (on)", - "name_plural": "large space heaters (on)", + "name": { "str": "large space heater (on)", "str_pl": "large space heaters (on)" }, "description": "A portable electric heater that steadily emits warm air. Raises temperature about 10 degrees C and fills a larger volume of air than the smaller version.", "power_draw": 1000000, "emits": [ "emit_hot_air2_blast" ], @@ -6324,8 +6246,7 @@ { "id": "toolbox", "type": "TOOL", - "name": "toolbox", - "name_plural": "toolboxes", + "name": { "str": "toolbox", "str_pl": "toolboxes" }, "description": "This is a stout metal box containing a complete tool kit suitable for most household maintenance and construction activities.", "weight": "3522 g", "volume": "2500 ml", @@ -6355,8 +6276,7 @@ { "id": "toolbox_workshop", "type": "TOOL", - "name": "workshop toolbox", - "name_plural": "workshop toolboxes", + "name": { "str": "workshop toolbox", "str_pl": "workshop toolboxes" }, "description": "This is a stout metal box containing a complete tool kit suitable for most household maintenance and construction activities, as well as additional tools used in workshops for advanced fabrication jobs.", "looks_like": "toolbox", "weight": "3994 g", @@ -6435,8 +6355,7 @@ { "id": "torch", "type": "TOOL", - "name": "torch", - "name_plural": "torches", + "name": { "str": "torch", "str_pl": "torches" }, "description": "This is a large stick, wrapped in rags that are soaked with a flammable material. When lit, produces a fair amount of light. You'll need a lighter or matches to light it.", "weight": "831 g", "volume": "750 ml", @@ -6462,8 +6381,7 @@ { "id": "torch_lit", "type": "TOOL", - "name": "torch", - "name_plural": "torches", + "name": { "str": "torch", "str_pl": "torches" }, "description": "This is a large stick, wrapped in rags that are soaked with a flammable material. It is burning, producing plenty of light.", "weight": "831 g", "volume": "750 ml", @@ -6493,8 +6411,7 @@ { "id": "trimmer_off", "type": "TOOL", - "name": "hedge trimmer (off)", - "name_plural": "hedge trimmers (off)", + "name": { "str": "hedge trimmer (off)", "str_pl": "hedge trimmers (off)" }, "description": "A cordless, double-sided, gasoline-powered hedge trimmer. A long line of sharp-edged teeth extends from the engine; turning the trimmer on will make them rapidly vibrate. The poor man's chainsaw as far as the zombies are concerned.", "weight": "4500 g", "volume": "2500 ml", @@ -6515,8 +6432,7 @@ "id": "trimmer_on", "copy-from": "trimmer_off", "type": "TOOL", - "name": "hedge trimmer (on)", - "name_plural": "hedge trimmers (on)", + "name": { "str": "hedge trimmer (on)", "str_pl": "hedge trimmers (on)" }, "description": "A cordless, double-sided, gasoline-powered hedge trimmer. It is currently on, ready to do some zombie topiary; use this item to turn it off.", "cutting": 40, "power_draw": 500000, @@ -6551,8 +6467,7 @@ "id": "trumpet", "type": "TOOL", "category": "tools", - "name": "trumpet", - "name_plural": "trumpets", + "name": { "str": "trumpet", "str_pl": "trumpets" }, "description": "A brass trumpet with only a few dents here and there.", "weight": "1500 g", "volume": "2500 ml", @@ -6582,8 +6497,7 @@ "id": "ukulele", "type": "TOOL", "category": "tools", - "name": "ukulele", - "name_plural": "ukuleles", + "name": { "str": "ukulele", "str_pl": "ukuleles" }, "description": "A small factory made ukulele. Looks to be in working condition.", "weight": "2000 g", "volume": "2500 ml", @@ -6702,8 +6616,7 @@ { "id": "vibrator", "type": "TOOL", - "name": "vibrator", - "name_plural": "vibrators", + "name": { "str": "vibrator", "str_pl": "vibrators" }, "description": "This battery-devouring device is just the thing to knead the tension out and help you relax. Use it to take a break and unwind.", "weight": "453 g", "volume": "500 ml", @@ -6734,8 +6647,7 @@ "id": "violin", "type": "TOOL", "category": "tools", - "name": "violin", - "name_plural": "violins", + "name": { "str": "violin", "str_pl": "violins" }, "description": "A cheap, factory-made violin with a built-in holder for a bow. Still produces a nice sound.", "weight": "1300 g", "volume": "2500 ml", @@ -6765,8 +6677,7 @@ "id": "violin_golden", "type": "TOOL", "category": "tools", - "name": "golden fiddle", - "name_plural": "golden fiddles", + "name": { "str": "golden fiddle", "str_pl": "golden fiddles" }, "description": "A shiny golden fiddle, with a strange aura around it. You feel like it once belonged to the best there's ever been.", "weight": "13000 g", "volume": "2500 ml", @@ -7029,8 +6940,7 @@ { "id": "wrench", "type": "TOOL", - "name": "wrench", - "name_plural": "wrenches", + "name": { "str": "wrench", "str_pl": "wrenches" }, "description": "This is an adjustable crescent wrench. It could be a decent melee weapon, and is used in many mechanics crafting recipes.", "weight": "907 g", "volume": "500 ml", @@ -7046,8 +6956,7 @@ { "id": "xacto", "type": "TOOL", - "name": "X-Acto knife", - "name_plural": "X-Acto knives", + "name": { "str": "X-Acto knife", "str_pl": "X-Acto knives" }, "description": "This is a small, sharp knife, designed for making precise cuts for textiles or crafts. It could cause decent damage, but is difficult to hit things with it. Its small, sharp blade allows for precision strikes in the hands of the skilled. It is too small to butcher corpses with.", "weight": "23 g", "volume": "250 ml", @@ -7212,8 +7121,7 @@ { "id": "tinderbox_on", "type": "TOOL", - "name": "ember carrier (lit)", - "name_plural": "ember carriers (lit)", + "name": { "str": "ember carrier (lit)", "str_pl": "ember carriers (lit)" }, "description": "This is a small container for holding tinder, with holes punched in it to provide a controlled airflow. An ember is smoldering inside it, and can be used to start a campfire.", "weight": "500 g", "volume": "500 ml", @@ -7240,8 +7148,7 @@ { "id": "adobe_pallet_full", "type": "TOOL", - "name": "pallet of wet adobe bricks", - "name_plural": "pallets of wet adobe bricks", + "name": { "str": "pallet of wet adobe bricks", "str_pl": "pallets of wet adobe bricks" }, "description": "A pallet full of heavy mud bricks which need to dry slowly to be usable.", "weight": "35000 g", "volume": "12500 ml", @@ -7266,8 +7173,7 @@ "id": "adobe_pallet_done", "type": "TOOL", "category": "tools", - "name": "pallet of dry adobe bricks", - "name_plural": "pallets of dry adobe bricks", + "name": { "str": "pallet of dry adobe bricks", "str_pl": "pallets of dry adobe bricks" }, "description": "A pallet of humble mud bricks that have dried for a week, while you were out risking your life. Disassemble it to retrieve your frame and building supplies.", "weight": "30000 g", "volume": "12500 ml", diff --git a/data/json/items/vehicle/battery.json b/data/json/items/vehicle/battery.json index 4bc739945d5c4..6d26b9891a6cf 100644 --- a/data/json/items/vehicle/battery.json +++ b/data/json/items/vehicle/battery.json @@ -3,8 +3,7 @@ "id": "battery_car", "type": "MAGAZINE", "category": "veh_parts", - "name": "car battery", - "name_plural": "car batteries", + "name": { "str": "car battery", "str_pl": "car batteries" }, "description": "A 12v lead-acid battery used to power car electrical systems.", "weight": "18000 g", "volume": "6250 ml", @@ -21,8 +20,7 @@ "id": "battery_motorbike", "copy-from": "battery_car", "type": "MAGAZINE", - "name": "motorbike battery", - "name_plural": "motorbike batteries", + "name": { "str": "motorbike battery", "str_pl": "motorbike batteries" }, "description": "A 12v lead-acid battery used to power smaller vehicles' electrical systems.", "weight": "4000 g", "volume": "1250 ml", @@ -34,8 +32,7 @@ "id": "battery_motorbike_small", "copy-from": "battery_car", "type": "MAGAZINE", - "name": "small motorbike battery", - "name_plural": "small motorbike batteries", + "name": { "str": "small motorbike battery", "str_pl": "small motorbike batteries" }, "description": "A miniature 12v lead-acid battery used to power smaller vehicles' electrical systems.", "weight": "1500 g", "volume": "750 ml", @@ -47,8 +44,7 @@ "id": "large_storage_battery", "copy-from": "storage_battery", "type": "MAGAZINE", - "name": "large storage battery", - "name_plural": "large storage batteries", + "name": { "str": "large storage battery", "str_pl": "large storage batteries" }, "description": "A huge storage battery containing many lithium ion cells. Holds a tremendous amount of energy. Could be installed into a storage battery case for easy removal from a vehicle, or just welded straight in.", "weight": "400 kg", "volume": "50 L", @@ -61,8 +57,7 @@ "id": "medium_storage_battery", "copy-from": "storage_battery", "type": "MAGAZINE", - "name": "medium storage battery", - "name_plural": "medium storage batteries", + "name": { "str": "medium storage battery", "str_pl": "medium storage batteries" }, "description": "A medium storage battery containing multiple lithium ion cells.", "weight": "35000 g", "volume": "6250 ml", @@ -75,8 +70,7 @@ "id": "small_storage_battery", "copy-from": "storage_battery", "type": "MAGAZINE", - "name": "small storage battery", - "name_plural": "small storage batteries", + "name": { "str": "small storage battery", "str_pl": "small storage batteries" }, "description": "A small storage battery created with pre-Cataclysm lithium ion technology. Useful for crafting.", "weight": "2500 g", "volume": "500 ml", @@ -89,8 +83,7 @@ "id": "storage_battery", "type": "MAGAZINE", "category": "veh_parts", - "name": "storage battery", - "name_plural": "storage batteries", + "name": { "str": "storage battery", "str_pl": "storage batteries" }, "description": "A large storage battery containing many lithium ion cells. Could be installed into a storage battery case for easy removal from a vehicle, or just welded straight in.", "weight": "200000 g", "volume": "25 L", diff --git a/data/json/items/vehicle/boat.json b/data/json/items/vehicle/boat.json index 8951464d34fa9..444cb25e81f1f 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", "str_pl": "wood boat hulls" }, "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" ], @@ -20,8 +19,7 @@ "id": "plastic_boat_hull", "symbol": "o", "color": "brown", - "name": "plastic boat hull", - "name_plural": "plastic boat hulls", + "name": { "str": "plastic boat hull", "str_pl": "plastic boat hulls" }, "description": "A rigid plastic sheet 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": 16000, "price_postapoc": 8000, @@ -37,8 +35,7 @@ "id": "carbonfiber_boat_hull", "symbol": "o", "color": "brown", - "name": "carbon fiber boat hull", - "name_plural": "carbon fiber boat hulls", + "name": { "str": "carbon fiber boat hull", "str_pl": "carbon fiber boat hulls" }, "description": "A carbon fiber sheet 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": 40000, "price_postapoc": 8000, @@ -52,8 +49,7 @@ { "type": "GENERIC", "id": "hand_paddles", - "name": "oars", - "name_plural": "oars", + "name": { "str": "oars", "str_pl": "oars" }, "description": "Oars for a boat.", "weight": "816 g", "to_hit": -1, @@ -68,8 +64,7 @@ { "type": "GENERIC", "id": "sail", - "name": "sail", - "name_plural": "sails", + "name": { "str": "sail", "str_pl": "sails" }, "description": "Sails for a boat.", "weight": "7904 g", "to_hit": -1, @@ -86,8 +81,7 @@ "id": "inflatable_section", "symbol": "o", "color": "green", - "name": "inflatable section", - "name_plural": "inflatable section", + "name": { "str": "inflatable section", "str_pl": "inflatable section" }, "description": "An inflatable boat section.", "price": 8000, "material": [ "plastic" ], @@ -102,8 +96,7 @@ "id": "inflatable_airbag", "symbol": "o", "color": "dark_gray", - "name": "inflatable airbag", - "name_plural": "inflatable airbag", + "name": { "str": "inflatable airbag", "str_pl": "inflatable airbag" }, "description": "An inflatable airbag.", "price": 8000, "material": [ "plastic" ], diff --git a/data/json/items/vehicle/controls.json b/data/json/items/vehicle/controls.json index 63ec8a5773d16..24cc7efb5ef03 100644 --- a/data/json/items/vehicle/controls.json +++ b/data/json/items/vehicle/controls.json @@ -2,8 +2,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, @@ -45,8 +44,7 @@ { "type": "GENERIC", "id": "drive_by_wire_controls", - "name": "drive by wire controls", - "name_plural": "sets of drive by wire controls", + "name": { "str": "drive by wire controls", "str_pl": "sets of drive by wire controls" }, "description": "Fully electronic vehicle control system. You could control it remotely if you had proper tools.", "weight": "3000 g", "color": "red", @@ -58,8 +56,7 @@ { "type": "GENERIC", "id": "robot_controls", - "name": "robot driving unit", - "name_plural": "robot driving units", + "name": { "str": "robot driving unit", "str_pl": "robot driving units" }, "description": "A set of servos, microcontrollers and other devices, together capable of driving an unmanned vehicle. Its AI is not functional, but it should still have some sort of maintenance mode.", "weight": "2000 g", "color": "white", diff --git a/data/json/items/vehicle/farming.json b/data/json/items/vehicle/farming.json index 4a7f66cd3e4de..054891f8dcdbc 100644 --- a/data/json/items/vehicle/farming.json +++ b/data/json/items/vehicle/farming.json @@ -18,8 +18,7 @@ "type": "GENERIC", "id": "v_planter_item", "symbol": "8", - "name": "seed drill", - "name_plural": "seed drills", + "name": { "str": "seed drill", "str_pl": "seed drills" }, "description": "An assembly of tubes, spikes, and wheels, that when dragged along the ground, allows a vehicle to plant seeds automatically in suitably tilled land.", "material": [ "steel", "plastic" ], "copy-from": "v_scoop_item" @@ -28,8 +27,7 @@ "type": "GENERIC", "id": "v_reaper_item", "symbol": "/", - "name": "reaper", - "name_plural": "reapers", + "name": { "str": "reaper", "str_pl": "reapers" }, "description": "An assembly of a blade, wheels, and a small lever for engaging/disengaging used to cut down crops prior to picking them up.", "material": [ "steel", "plastic" ], "copy-from": "v_scoop_item" @@ -38,8 +36,7 @@ "type": "GENERIC", "id": "v_reaper_item_advanced", "symbol": "/", - "name": "advanced reaper", - "name_plural": "advanced reapers", + "name": { "str": "advanced reaper", "str_pl": "advanced reapers" }, "description": "An advanced electronic device used to cut down, collect and store crops.", "weight": "25000 g", "material": [ "steel", "plastic" ], @@ -51,8 +48,7 @@ "type": "GENERIC", "id": "v_planter_item_advanced", "symbol": "8", - "name": "advanced seed drill", - "name_plural": "advanced seed drills", + "name": { "str": "advanced seed drill", "str_pl": "advanced seed drills" }, "color": "dark_gray", "description": "An assembly of tubes, spikes, and wheels, that when dragged along the ground, allows a vehicle to plant seeds automatically in suitably tilled land. This one is equipped with an electronic control system and will avoid damaging itself when used on untilled land.", "weight": "32666 g", @@ -65,8 +61,7 @@ "type": "GENERIC", "id": "v_plow_item", "symbol": "&", - "name": "plow", - "name_plural": "plows", + "name": { "str": "plow", "str_pl": "plows" }, "color": "dark_gray", "description": "A heavy assembly of wheels and steel blades that turn up the ground.", "weight": "32666 g", diff --git a/data/json/items/vehicle/lights.json b/data/json/items/vehicle/lights.json index 02f39326aad75..ddc6cfe3ab3cc 100644 --- a/data/json/items/vehicle/lights.json +++ b/data/json/items/vehicle/lights.json @@ -59,8 +59,7 @@ { "type": "GENERIC", "id": "light_emergency_red", - "name": "emergency vehicle light (red)", - "name_plural": "emergency vehicle lights (red)", + "name": { "str": "emergency vehicle light (red)", "str_pl": "emergency vehicle lights (red)" }, "description": "One of the red-colored lights from the top of an emergency services vehicle. When turned on, the lights rotate to shine in all directions.", "weight": "500 g", "to_hit": 1, @@ -73,8 +72,7 @@ { "type": "GENERIC", "id": "light_emergency_blue", - "name": "emergency vehicle light (blue)", - "name_plural": "emergency vehicle lights (blue)", + "name": { "str": "emergency vehicle light (blue)", "str_pl": "emergency vehicle lights (blue)" }, "description": "One of the blue-colored lights from the top of an emergency services vehicle. When turned on, the lights rotate to shine in all directions.", "color": "blue", "copy-from": "light_emergency_red" diff --git a/data/json/items/vehicle/manual.json b/data/json/items/vehicle/manual.json index 16e141603e83d..998848560d880 100644 --- a/data/json/items/vehicle/manual.json +++ b/data/json/items/vehicle/manual.json @@ -2,8 +2,7 @@ { "type": "GENERIC", "id": "hand_rims", - "name": "set of hand rims", - "name_plural": "sets of hand rims", + "name": { "str": "set of hand rims", "str_pl": "sets of hand rims" }, "description": "Hand rims for use on a wheelchair.", "weight": "816 g", "to_hit": -1, diff --git a/data/json/items/vehicle/noise.json b/data/json/items/vehicle/noise.json index 30a9cc08ecc54..e5aee4a4ac30a 100644 --- a/data/json/items/vehicle/noise.json +++ b/data/json/items/vehicle/noise.json @@ -48,8 +48,7 @@ { "type": "GENERIC", "id": "chimes", - "name": "chime loudspeakers", - "name_plural": "chime loudspeakers", + "name": { "str": "chime loudspeakers", "str_pl": "chime loudspeakers" }, "description": "A stereo system with loudspeakers and a built-in set of simple melodies that it will play. Commonly used by ice cream trucks to draw the attention of children in the days when children wanted ice cream more than brains.", "weight": "2600 g", "to_hit": -2, diff --git a/data/json/items/vehicle/rigs.json b/data/json/items/vehicle/rigs.json index eab7396b8b93d..04ca713649ead 100644 --- a/data/json/items/vehicle/rigs.json +++ b/data/json/items/vehicle/rigs.json @@ -22,8 +22,7 @@ "id": "craftrig", "copy-from": "vehicle_rig", "type": "GENERIC", - "name": "FOODCO kitchen buddy", - "name_plural": "FOODCO kitchen buddies", + "name": { "str": "FOODCO kitchen buddy", "str_pl": "FOODCO kitchen buddies" }, "description": "Assembled from a set of instructions you found in an old book of DIY projects, the *FOODCO kitchen buddy* claims to be *the perfect solution to all your home-cooking needs!*. While it is surprisingly handy for vacuum-sealing as well as dehydrating food, the cheery sales pitch neglected to mention A - how awkward the damn thing is, B - That you still need a normal kitchen and C - how it doesn't take batteries. You're going to have to weld it to a vehicle, or something else with a supply of electricity, if you want to use it. In addition to the food preservation features, it also has a food processor, a water-purification system, a drawer for holding extra tools, and for some insane reason, a press and die set for hand-loading ammunition." }, { diff --git a/data/json/items/vehicle/wheel.json b/data/json/items/vehicle/wheel.json index 4b9654a0b14cc..be4799cc64155 100644 --- a/data/json/items/vehicle/wheel.json +++ b/data/json/items/vehicle/wheel.json @@ -138,8 +138,7 @@ "id": "wheel_caster", "category": "veh_parts", "type": "WHEEL", - "name": "set of casters", - "name_plural": "sets of casters", + "name": { "str": "set of casters", "str_pl": "sets of casters" }, "description": "A set of casters, like on a shopping cart.", "weight": "1500 g", "volume": "1250 ml", @@ -279,8 +278,7 @@ "id": "wheel_tricycle", "category": "veh_parts", "type": "WHEEL", - "name": "set of tricycle wheels", - "name_plural": "sets of tricycle wheels", + "name": { "str": "set of tricycle wheels", "str_pl": "sets of tricycle wheels" }, "description": "A set of hard plastic wheels with one larger than the other two. Proudly made in the USA by Double Dango Productions.", "weight": "750 g", "volume": "750 ml", @@ -297,8 +295,7 @@ "id": "wheel_wheelchair", "type": "WHEEL", "category": "veh_parts", - "name": "pair of wheelchair wheels", - "name_plural": "pairs of wheelchair wheels", + "name": { "str": "pair of wheelchair wheels", "str_pl": "pairs of wheelchair wheels" }, "description": "A pair of wheels for a wheelchair.", "weight": "3000 g", "volume": "12500 ml", diff --git a/data/json/items/vehicle_parts.json b/data/json/items/vehicle_parts.json index 781f5cf511b21..6902f03a84194 100644 --- a/data/json/items/vehicle_parts.json +++ b/data/json/items/vehicle_parts.json @@ -2,8 +2,7 @@ { "type": "GENERIC", "id": "it_battery_mount", - "name": "storage battery case", - "name_plural": "storage battery cases", + "name": { "str": "storage battery case", "str_pl": "storage battery cases" }, "description": "An empty case that can hold a storage battery. Complete with charging controller chip and connecting wires.", "weight": "1231 g", "to_hit": -3, @@ -19,8 +18,7 @@ "type": "TOOL", "id": "black_box", "category": "other", - "name": "military black box", - "name_plural": "military black boxes", + "name": { "str": "military black box", "str_pl": "military black boxes" }, "description": "This is a black box, seemingly pulled from some sort of military vehicle wreckage. If you can find a system to analyze this you may find something of interest.", "weight": "4535 g", "volume": "2 L", @@ -143,8 +141,7 @@ { "type": "GENERIC", "id": "mountable_heater", - "name": "vehicle heater", - "name_plural": "vehicle heaters", + "name": { "str": "vehicle heater", "str_pl": "vehicle heaters" }, "description": "A vehicle-mounted area heater.", "weight": "12500 g", "to_hit": -4, @@ -159,8 +156,7 @@ { "type": "GENERIC", "id": "mountable_cooler", - "name": "vehicle cooler", - "name_plural": "vehicle coolers", + "name": { "str": "vehicle cooler", "str_pl": "vehicle coolers" }, "description": "A vehicle-mounted area cooler.", "weight": "12500 g", "to_hit": -4, diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json index 6d95772cbe3f3..30169479fac71 100644 --- a/data/json/monsters/mammal.json +++ b/data/json/monsters/mammal.json @@ -1791,8 +1791,7 @@ { "id": "mon_sheep_lamb", "type": "MONSTER", - "name": "lamb", - "name_plural": "lambs", + "name": { "str": "lamb", "str_pl": "lambs" }, "description": "A timid, hooved grazing mammal, and one of the first animals ever domesticated. Its body is covered in a thick layer of wool, and the males have long, spiraling horns.", "default_faction": "herbivore", "bodytype": "dog", diff --git a/data/json/vehicleparts/turret.json b/data/json/vehicleparts/turret.json old mode 100755 new mode 100644