diff --git a/data/json/artifact/altered_object_active.json b/data/json/artifact/altered_object_active.json index 0327ec34ac6c4..1da3d021c9430 100644 --- a/data/json/artifact/altered_object_active.json +++ b/data/json/artifact/altered_object_active.json @@ -40,7 +40,7 @@ { "id": "AO_FORCE_PULL", "type": "SPELL", - "name": "Artifact Force Pull", + "name": { "str": "Artifact Force Pull" }, "description": "Pull objects.", "effect": "area_pull", "shape": "blast", @@ -55,7 +55,7 @@ { "id": "AO_TELEPORTITIS", "type": "SPELL", - "name": "Artifact Teleportitis", + "name": { "str": "Artifact Teleportitis" }, "description": "Causes you to teleport uncontrollably.", "message": "The world loses coherence, with images of nearby places forming and disappearing around you.", "valid_targets": [ "self" ], @@ -69,7 +69,7 @@ { "id": "AO_SLOW", "type": "SPELL", - "name": "Artifact Slow", + "name": { "str": "Artifact Slow" }, "description": "Slows you for a few turns.", "message": "The world shifts blue, and reality accelerates around you.", "valid_targets": [ "self" ], @@ -83,7 +83,7 @@ { "id": "AO_TIME_STOP", "type": "SPELL", - "name": "Artifact Time Stop", + "name": { "str": "Artifact Time Stop" }, "description": "Grants you a few turns of super speed.", "message": "Stale golden light floods the world, and reality stands still.", "valid_targets": [ "self" ], diff --git a/data/json/artifact/legacy_artifact_passive.json b/data/json/artifact/legacy_artifact_passive.json index a70bab9a5abec..6d702150a721c 100644 --- a/data/json/artifact/legacy_artifact_passive.json +++ b/data/json/artifact/legacy_artifact_passive.json @@ -81,7 +81,7 @@ { "type": "SPELL", "id": "AEP_EVIL_SPELL", - "name": "EEEEEEVVVVVIIIIILLLL!", + "name": { "str": "EEEEEEVVVVVIIIIILLLL!" }, "description": "You debugged in this spell! It makes you evil for 30 minutes.", "valid_targets": [ "hostile", "ally", "self" ], "effect": "attack", diff --git a/data/json/item_actions.json b/data/json/item_actions.json index d9fe76fd2a1e9..05f83cc359da2 100644 --- a/data/json/item_actions.json +++ b/data/json/item_actions.json @@ -742,7 +742,7 @@ { "type": "item_action", "id": "FITNESS_CHECK", - "name": "Check health metrics" + "name": { "str": "Check health metrics" } }, { "type": "item_action", diff --git a/data/json/item_spell_effects.json b/data/json/item_spell_effects.json index 59bbd78e7a13f..99a2d682ea9e3 100644 --- a/data/json/item_spell_effects.json +++ b/data/json/item_spell_effects.json @@ -42,7 +42,7 @@ { "id": "fog_machine", "type": "SPELL", - "name": "fog ex machina", + "name": { "str": "fog ex machina" }, "description": "You see fog bubbling out of the device.", "effect": "attack", "shape": "cone", diff --git a/data/json/items/armor/altered_object_auras.json b/data/json/items/armor/altered_object_auras.json index 3ce449d925f44..f15581b47613a 100644 --- a/data/json/items/armor/altered_object_auras.json +++ b/data/json/items/armor/altered_object_auras.json @@ -12,7 +12,7 @@ { "id": "artifact_teleportitis_aura", "type": "ARMOR", - "name": "strange pressure", + "name": { "str": "strange pressure" }, "description": "You feel a strange force pressing you inwards and inside-out.", "weight": "1g", "volume": "1ml", @@ -25,7 +25,7 @@ { "id": "artifact_slow_aura", "type": "ARMOR", - "name": "temporal distortion", + "name": { "str": "temporal distortion" }, "description": "A slight temporal distortion appears to be centered around you.", "weight": "1g", "volume": "1ml", diff --git a/data/json/items/armor/storage.json b/data/json/items/armor/storage.json index 6f34115933d6b..6433124283214 100644 --- a/data/json/items/armor/storage.json +++ b/data/json/items/armor/storage.json @@ -630,7 +630,7 @@ "copy-from": "raw_leather", "type": "COMESTIBLE", "category": "clothing", - "name": "hide bag", + "name": { "str": "hide bag" }, "description": "The raw skin of an animal, quickly turned into a makeshift bag for storage. It will still rot, and needs to be cured and tanned.", "symbol": "[", "looks_like": "plastic_shopping_bag", @@ -660,7 +660,7 @@ "copy-from": "raw_tainted_leather", "type": "COMESTIBLE", "category": "clothing", - "name": "tainted hide bag", + "name": { "str": "tainted hide bag" }, "description": "The raw skin of a monster, quickly turned into a makeshift bag for storage. It will still rot, and needs to be cured and tanned.", "symbol": "[", "looks_like": "hide_bag", diff --git a/data/json/items/biosignatures.json b/data/json/items/biosignatures.json index 0da54374e8916..2b0c97da94af7 100644 --- a/data/json/items/biosignatures.json +++ b/data/json/items/biosignatures.json @@ -24,7 +24,7 @@ { "type": "COMESTIBLE", "id": "feces_cow", - "name": "cow pie", + "name": { "str": "cow pie" }, "copy-from": "feces_bird", "weight": "750 g", "volume": "1 L", @@ -33,14 +33,14 @@ { "type": "COMESTIBLE", "id": "feces_dog", - "name": "dog dung", + "name": { "str": "dog dung" }, "copy-from": "feces_manure", "description": "Droppings from a canine." }, { "type": "COMESTIBLE", "id": "feces_manure", - "name": "manure", + "name": { "str": "manure" }, "copy-from": "feces_bird", "weight": "250 g", "volume": "500 ml", @@ -49,7 +49,7 @@ { "type": "COMESTIBLE", "id": "feces_roach", - "name": "roach dirt", + "name": { "str": "roach dirt" }, "copy-from": "feces_bird", "description": "Large black pellets of rotting material." }, diff --git a/data/json/items/book/abstract.json b/data/json/items/book/abstract.json index 6d5f454c374ff..3553766b31a41 100644 --- a/data/json/items/book/abstract.json +++ b/data/json/items/book/abstract.json @@ -2,7 +2,7 @@ { "abstract": "book_nonf_tpl", "type": "BOOK", - "name": "Generic Nonfiction Book", + "name": { "str": "Generic Nonfiction Book" }, "description": "template for a manuscript purporting to be factual", "intelligence": 5, "symbol": "?", @@ -13,7 +13,7 @@ { "abstract": "book_fict_tpl", "type": "BOOK", - "name": "Generic Fiction Book", + "name": { "str": "Generic Fiction Book" }, "description": "template for a work of fiction", "intelligence": 5, "symbol": "?", @@ -26,7 +26,7 @@ { "abstract": "book_fict_hard_tpl", "type": "BOOK", - "name": "Generic Hard Bound Fiction Book", + "name": { "str": "Generic Hard Bound Fiction Book" }, "description": "Template for hard bound book of fiction", "weight": "1000 g", "volume": "1100 ml", @@ -55,7 +55,7 @@ { "abstract": "book_nonf_hard_tpl", "type": "BOOK", - "name": "Nonfiction Book", + "name": { "str": "Nonfiction Book" }, "description": "template for hard bound nonfiction book", "weight": "1 kg", "volume": "1100 ml", @@ -69,7 +69,7 @@ { "abstract": "book_nonf_soft_tpl", "type": "BOOK", - "name": "Nonfiction Paperback", + "name": { "str": "Nonfiction Paperback" }, "description": "template for a paperback nonfiction book", "weight": "460 g", "volume": "500 ml", @@ -83,7 +83,7 @@ { "abstract": "book_fict_soft_pulp_tpl", "type": "BOOK", - "name": "Generic Pulp Book", + "name": { "str": "Generic Pulp Book" }, "description": "This is a template for pulp books. Which really all ought to be paperbacks, right?", "looks_like": "novel_pulp", "copy-from": "book_fict_soft_tpl", @@ -92,7 +92,7 @@ { "abstract": "book_fict_soft_scifi_tpl", "type": "BOOK", - "name": "Generic SciFi Book", + "name": { "str": "Generic SciFi Book" }, "description": "This is a template for paperback scifi books.", "copy-from": "book_fict_soft_tpl", "relative": { "intelligence": 1, "chapters": 8, "fun": 1 } @@ -100,7 +100,7 @@ { "abstract": "book_fict_hard_scifi_tpl", "type": "BOOK", - "name": "Generic SciFi Book", + "name": { "str": "Generic SciFi Book" }, "description": "This is a template for a hard cover scifi book.", "copy-from": "book_fict_hard_tpl", "relative": { "intelligence": 1, "chapters": 8, "fun": 1 } @@ -108,7 +108,7 @@ { "abstract": "book_nonf_hard_homemk_tpl", "type": "BOOK", - "name": "Homemaking Book", + "name": { "str": "Homemaking Book" }, "description": "This is a template for books about homemaking, style, home decor, and home economics.", "weight": "1100 g", "copy-from": "book_nonf_hard_tpl", @@ -117,7 +117,7 @@ { "abstract": "book_nonf_hard_cook_tpl", "type": "BOOK", - "name": "Hardcover Cookbook", + "name": { "str": "Hardcover Cookbook" }, "description": "This is a template for books about cooking.", "skill": "cooking", "copy-from": "book_nonf_hard_tpl", @@ -126,7 +126,7 @@ { "abstract": "book_nonf_soft_cook_tpl", "type": "BOOK", - "name": "Softcover Cookbook", + "name": { "str": "Softcover Cookbook" }, "description": "This is a template for books about cooking.", "skill": "cooking", "copy-from": "book_nonf_soft_tpl", @@ -135,7 +135,7 @@ { "abstract": "book_nonf_hard_dodge_tpl", "type": "BOOK", - "name": "dodge skillbook abstract", + "name": { "str": "dodge skillbook abstract" }, "description": "An ordinary book. Or is it? It is.", "weight": "600 g", "price": 1000, @@ -150,7 +150,7 @@ { "abstract": "book_nonf_hard_phil_tpl", "type": "BOOK", - "name": "Hardcover Philosophy", + "name": { "str": "Hardcover Philosophy" }, "description": "This is a template for books about philosophy.", "fun": 1, "time": "36 m", @@ -160,7 +160,7 @@ { "abstract": "book_nonf_soft_phil_tpl", "type": "BOOK", - "name": "Softcover Philosophy.", + "name": { "str": "Softcover Philosophy." }, "description": "This is a template for paperbacks about philosophy.", "fun": 1, "time": "36 m", @@ -170,7 +170,7 @@ { "abstract": "book_nonf_hard_sports_tpl", "type": "BOOK", - "name": "Hardcover Nonfiction Sports Book", + "name": { "str": "Hardcover Nonfiction Sports Book" }, "description": "This is a template.", "fun": 1, "copy-from": "book_nonf_hard_tpl" @@ -178,7 +178,7 @@ { "abstract": "book_nonf_soft_sports_tpl", "type": "BOOK", - "name": "Softcover Nonfiction Sports Book.", + "name": { "str": "Softcover Nonfiction Sports Book." }, "description": "This is a template.", "fun": 1, "copy-from": "book_nonf_soft_tpl" @@ -186,7 +186,7 @@ { "abstract": "book_fict_hard_sports_tpl", "type": "BOOK", - "name": "Hardcover Fictional Sports Book", + "name": { "str": "Hardcover Fictional Sports Book" }, "description": "This is a template.", "fun": 2, "copy-from": "book_fict_hard_tpl" @@ -194,7 +194,7 @@ { "abstract": "book_fict_soft_sports_tpl", "type": "BOOK", - "name": "Softcover Fictional Sports Book.", + "name": { "str": "Softcover Fictional Sports Book." }, "description": "This is a template.", "fun": 2, "copy-from": "book_fict_soft_tpl" @@ -202,7 +202,7 @@ { "abstract": "paperback_occult", "type": "BOOK", - "name": "template for mass produced books on esoteric subjects", + "name": { "str": "template for mass produced books on esoteric subjects" }, "description": "An ordinary paperback book. Or is it? Is that a glimmer of higher truth?", "weight": "371 g", "volume": "700 ml", @@ -222,7 +222,7 @@ { "abstract": "paperback_romance_spb", "type": "BOOK", - "name": "Sweet Providence Romance Novel", + "name": { "str": "Sweet Providence Romance Novel" }, "description": "Sweet Providence Books is a publisher of discount romance paperbacks easily recognized by their blue and yellow cover illustrations. Despite the adult nature of their subject matter, the books tend to be under 250 pages of large print written in a vocabulary consistent with a 4th grade reading level.", "//": "these are books are tiny", "weight": "200 g", @@ -234,7 +234,7 @@ { "abstract": "paperback_romance_lnl", "type": "BOOK", - "name": "Lorn and Loan Romance Novel", + "name": { "str": "Lorn and Loan Romance Novel" }, "description": "Lorn and Loan Press marketed romance paperbacks to a variety of alt demographics, especially those with a penchant for eyeliner. The books are billed as \"provocative,\" but words like \"malingering\" and \"turgid\" also come to mind.", "copy-from": "book_fict_soft_tpl", "relative": { "price_postapoc": -400, "intelligence": 1, "fun": -1 } @@ -242,7 +242,7 @@ { "abstract": "paperback_romance_vanilla", "type": "BOOK", - "name": "Vanilla Romance Novel", + "name": { "str": "Vanilla Romance Novel" }, "description": "Vanilla Media is a mainstream publisher providing romantic literature to everyday readers of taste. These stories contain explicit details only in the odd chapters, and invariably end with a conventionally uplifting moral.", "copy-from": "book_fict_soft_tpl", "relative": { "price_postapoc": -100, "intelligence": -1 } @@ -250,7 +250,7 @@ { "abstract": "paperback_western_em", "type": "BOOK", - "name": "The Everyman Library", + "name": { "str": "The Everyman Library" }, "description": "The Everyman Library is an imprint of Vanilla Media that publishes stories about private eyes, cowboys, quarterbacks, and mobsters.", "copy-from": "book_fict_soft_tpl", "relative": { "price_postapoc": -100, "intelligence": -1 } @@ -258,7 +258,7 @@ { "abstract": "book_fict_soft_ya_vanilla", "type": "BOOK", - "name": "Tween Topics", + "name": { "str": "Tween Topics" }, "description": "Tween Topics is an imprint of Vanilla Media that publishes stories that appeal to the youth of today. Or, failing that, the parents of said youth.", "copy-from": "book_fict_soft_tpl", "relative": { "price_postapoc": -400, "intelligence": -1, "fun": -1 } @@ -266,7 +266,7 @@ { "abstract": "book_fict_soft_ya_quiddity", "type": "BOOK", - "name": "Quiddity Books", + "name": { "str": "Quiddity Books" }, "description": "Quiddity publishes books for young adults. They offer stories about self-discovery, personal identity, and contemporary trends.", "copy-from": "book_fict_soft_tpl", "relative": { "price_postapoc": -400, "chapters": 7 } @@ -274,7 +274,7 @@ { "abstract": "book_fict_hard_ya_quiddity", "type": "BOOK", - "name": "Quiddity Books", + "name": { "str": "Quiddity Books" }, "description": "Quiddity publishes books for young adults. They offer stories about self-discovery, personal identity, and contemporary trends.", "weight": "500 g", "volume": "1014 ml", @@ -285,7 +285,7 @@ { "abstract": "book_fict_soft_satire_tpl", "type": "BOOK", - "name": "Satire Template", + "name": { "str": "Satire Template" }, "description": "template for mass produced satirical fiction", "copy-from": "book_fict_soft_tpl", "time": "20 m", @@ -294,7 +294,7 @@ { "abstract": "book_nonf_zine", "type": "BOOK", - "name": "Magazine Template", + "name": { "str": "Magazine Template" }, "description": "template for magazine", "intelligence": 4, "weight": "60 g", @@ -310,7 +310,7 @@ { "abstract": "book_nonf_zine_news_tpl", "type": "BOOK", - "name": "News Magazine Template", + "name": { "str": "News Magazine Template" }, "description": "template for news magazine", "looks_like": "flyer", "copy-from": "book_nonf_zine", diff --git a/data/json/items/book/archery.json b/data/json/items/book/archery.json index 10829ed239f10..dba77bf45900a 100644 --- a/data/json/items/book/archery.json +++ b/data/json/items/book/archery.json @@ -2,7 +2,7 @@ { "abstract": "book_nonf_hard_arch_tpl", "type": "BOOK", - "name": "archery skill training abstract", + "name": { "str": "archery skill training abstract" }, "description": "template for heavy books that confer archery skill training", "weight": "1454 g", "volume": "1250 ml", diff --git a/data/json/items/book/maps.json b/data/json/items/book/maps.json index b3b8f23881cea..3494ab99db4e6 100644 --- a/data/json/items/book/maps.json +++ b/data/json/items/book/maps.json @@ -81,7 +81,7 @@ "id": "subwaymap", "copy-from": "abstractmap", "type": "GENERIC", - "name": "subway maintenance map", + "name": { "str": "subway maintenance map" }, "looks_like": "roadmap", "description": "This is a map of subway tunnels formerly used by public maintenance workers. Using it will add subway lines and underground stations to your map.", "color": "light_blue", diff --git a/data/json/items/book/spiritual.json b/data/json/items/book/spiritual.json index 6337d85487be0..c9e8d632e0e47 100644 --- a/data/json/items/book/spiritual.json +++ b/data/json/items/book/spiritual.json @@ -2,7 +2,7 @@ { "abstract": "holybook_abstract", "type": "BOOK", - "name": "holybook abstract", + "name": { "str": "holybook abstract" }, "description": "theoretically this isn't a book at all", "price": 550, "price_postapoc": 550, diff --git a/data/json/items/chemicals_and_resources.json b/data/json/items/chemicals_and_resources.json index 450ed24d96c9e..4304f89684bc8 100644 --- a/data/json/items/chemicals_and_resources.json +++ b/data/json/items/chemicals_and_resources.json @@ -392,7 +392,7 @@ { "type": "COMESTIBLE", "id": "sewage", - "name": "sewage sample", + "name": { "str": "sewage sample" }, "weight": "280 g", "color": "green", "use_action": [ "SEWAGE" ], @@ -962,7 +962,7 @@ { "type": "COMESTIBLE", "id": "pur_tablets", - "name": "water purification tablet", + "name": { "str": "water purification tablet" }, "category": "chems", "material": [ "powder" ], "weight": "1 g", diff --git a/data/json/items/comestibles/alcohol.json b/data/json/items/comestibles/alcohol.json index 43b2f26076c7d..f1ae939e677a8 100644 --- a/data/json/items/comestibles/alcohol.json +++ b/data/json/items/comestibles/alcohol.json @@ -576,7 +576,7 @@ { "type": "COMESTIBLE", "id": "drink_screwdriver", - "name": "screwdriver cocktail", + "name": { "str": "screwdriver cocktail" }, "weight": "258 g", "color": "yellow", "addiction_type": "alcohol", @@ -1020,7 +1020,7 @@ { "type": "COMESTIBLE", "id": "drink_strawberry_surprise", - "name": "strawberry surprise", + "name": { "str": "strawberry surprise" }, "weight": "43 g", "color": "pink", "addiction_type": "alcohol", @@ -1265,7 +1265,7 @@ { "type": "COMESTIBLE", "id": "drink_wsour", - "name": "whiskey sour", + "name": { "str": "whiskey sour" }, "weight": "249 g", "color": "yellow", "addiction_type": "alcohol", @@ -1291,7 +1291,7 @@ { "type": "COMESTIBLE", "id": "honey_gold", - "name": "honeygold brew", + "name": { "str": "honeygold brew" }, "weight": "259 g", "color": "yellow", "use_action": [ "ALCOHOL_WEAK" ], @@ -1317,7 +1317,7 @@ { "type": "COMESTIBLE", "id": "honey_ant", - "name": "honey ball", + "name": { "str": "honey ball" }, "weight": "178 g", "color": "yellow", "addiction_type": "alcohol", @@ -1343,7 +1343,7 @@ { "type": "COMESTIBLE", "id": "eggnog_spiked", - "name": "spiked eggnog", + "name": { "str": "spiked eggnog" }, "weight": "132 g", "color": "white", "addiction_type": "alcohol", @@ -1373,7 +1373,7 @@ { "type": "COMESTIBLE", "id": "drink_martini", - "name": "martini", + "name": { "str": "martini" }, "weight": "49600 mg", "color": "white", "addiction_type": "alcohol", @@ -1400,7 +1400,7 @@ { "type": "COMESTIBLE", "id": "drink_bloody_mary", - "name": "bloody mary cocktail", + "name": { "str": "bloody mary cocktail" }, "weight": "258 g", "color": "red", "addiction_type": "alcohol", diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index 22b8d36eec024..f8cc2f178191c 100644 --- a/data/json/items/comestibles/bread.json +++ b/data/json/items/comestibles/bread.json @@ -87,7 +87,7 @@ { "type": "COMESTIBLE", "id": "sourdough_bread", - "name": "sourdough bread", + "name": { "str": "sourdough bread" }, "weight": "56 g", "color": "brown", "spoils_in": "8 days", @@ -109,7 +109,7 @@ { "type": "COMESTIBLE", "id": "flatbread", - "name": "flatbread", + "name": { "str": "flatbread" }, "weight": "85 g", "color": "brown", "spoils_in": "11 days 16 hours", @@ -128,7 +128,7 @@ { "type": "COMESTIBLE", "id": "bread", - "name": "bread", + "name": { "str": "bread" }, "weight": "60 g", "color": "brown", "spoils_in": "10 days", @@ -150,7 +150,7 @@ { "type": "COMESTIBLE", "id": "cornbread", - "name": "cornbread", + "name": { "str": "cornbread" }, "weight": "60 g", "color": "yellow", "spoils_in": "30 days", @@ -173,7 +173,7 @@ { "type": "COMESTIBLE", "id": "johnnycake", - "name": "johnnycake", + "name": { "str": "johnnycake" }, "weight": "49 g", "color": "yellow", "spoils_in": "20 days", @@ -194,7 +194,7 @@ { "type": "COMESTIBLE", "id": "tortilla_corn", - "name": "corn tortilla", + "name": { "str": "corn tortilla" }, "weight": "24 g", "color": "brown", "spoils_in": "20 days", @@ -217,7 +217,7 @@ { "type": "COMESTIBLE", "id": "hardtack", - "name": "hardtack", + "name": { "str": "hardtack" }, "weight": "80 g", "color": "white", "spoils_in": "360 days", @@ -260,7 +260,7 @@ { "type": "COMESTIBLE", "id": "wastebread", - "name": "wastebread", + "name": { "str": "wastebread" }, "weight": "60 g", "color": "white", "spoils_in": 990, diff --git a/data/json/items/comestibles/brewing.json b/data/json/items/comestibles/brewing.json index 9eefe55378a3f..5ed9904171f38 100644 --- a/data/json/items/comestibles/brewing.json +++ b/data/json/items/comestibles/brewing.json @@ -2,7 +2,7 @@ { "type": "COMESTIBLE", "id": "brew_mycus_wine", - "name": "mycus wine must", + "name": { "str": "mycus wine must" }, "description": "Unfermented mycus wine. A goopy white mess, made from fruit of mycus. It smells sweetly of mushrooms.", "weight": "33 g", "color": "white", @@ -23,7 +23,7 @@ { "type": "COMESTIBLE", "id": "brew_whiskey", - "name": "whiskey wort", + "name": { "str": "whiskey wort" }, "description": "Unfermented whiskey. The base of a fine drink. Not the traditional preparation, but you don't have the time.", "weight": "33 g", "color": "brown", @@ -117,7 +117,7 @@ { "type": "COMESTIBLE", "id": "brew_vodka", - "name": "vodka wort", + "name": { "str": "vodka wort" }, "description": "Unfermented vodka. Water with sugar from enzymatic breakdown of malted grains or just added in pure form.", "weight": "50 g", "color": "light_cyan", @@ -164,7 +164,7 @@ { "type": "COMESTIBLE", "id": "brew_rum", - "name": "rum wort", + "name": { "str": "rum wort" }, "description": "Unfermented rum. Sugar caramel or molasses brewed into sweet water. Basically a saccharine soup.", "weight": "33 g", "color": "light_cyan", @@ -211,7 +211,7 @@ { "type": "COMESTIBLE", "id": "brew_fruit_wine", - "name": "fruit wine must", + "name": { "str": "fruit wine must" }, "description": "Unfermented fruit wine. A sweet, boiled juice made from berries or fruit.", "weight": "46 g", "color": "light_red", @@ -233,7 +233,7 @@ { "type": "COMESTIBLE", "id": "brew_mead", - "name": "spiced mead must", + "name": { "str": "spiced mead must" }, "description": "Unfermented spiced mead. Diluted honey and yeast.", "weight": "38 g", "color": "yellow", @@ -256,7 +256,7 @@ { "type": "COMESTIBLE", "id": "brew_dandelion_wine", - "name": "dandelion wine must", + "name": { "str": "dandelion wine must" }, "description": "Unfermented dandelion wine. A sticky mixture of water, sugar, yeast, and dandelion petals.", "weight": "38 g", "color": "yellow", @@ -277,7 +277,7 @@ { "type": "COMESTIBLE", "id": "brew_burdock_wine", - "name": "burdock wine must", + "name": { "str": "burdock wine must" }, "description": "Unfermented burdock wine. A sticky mixture of water, sugar, yeast, and burdock roots.", "weight": "250 g", "color": "yellow", @@ -298,7 +298,7 @@ { "type": "COMESTIBLE", "id": "brew_pine_wine", - "name": "pine wine must", + "name": { "str": "pine wine must" }, "description": "Unfermented pine wine. A sticky mixture of water, sugar, yeast, and pine resins.", "weight": "38 g", "color": "green", @@ -388,7 +388,7 @@ { "type": "COMESTIBLE", "id": "brew_milk_curdled", - "name": "curdling milk", + "name": { "str": "curdling milk" }, "weight": "236 g", "color": "white", "spoils_in": "28 days", @@ -410,7 +410,7 @@ { "type": "COMESTIBLE", "id": "brew_vinegar", - "name": "unfermented vinegar", + "name": { "str": "unfermented vinegar" }, "description": "Mixture of water, alcohol and fruit juice that will eventually become vinegar.", "weight": "15 g", "color": "yellow", @@ -432,7 +432,7 @@ { "type": "COMESTIBLE", "id": "young_yeast", - "name": "growing wild yeast", + "name": { "str": "growing wild yeast" }, "description": "Mixture of water, sugar and fruits with some naturally occurring yeast, that will eventually produce a more sizeable yeast culture.", "weight": "250 g", "color": "yellow", diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index 05a52172f99e5..bd95f5e61225d 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/data/json/items/comestibles/carnivore.json @@ -44,7 +44,7 @@ "id": "hstomach", "copy-from": "stomach", "type": "COMESTIBLE", - "name": "human stomach", + "name": { "str": "human stomach" }, "description": "The stomach of a human. It is surprisingly durable.", "material": [ "hflesh" ], "delete": { "flags": [ "PREDATOR_FUN" ] } @@ -53,7 +53,7 @@ "id": "hstomach_large", "copy-from": "hstomach", "type": "COMESTIBLE", - "name": "large human stomach", + "name": { "str": "large human stomach" }, "description": "The stomach of a large humanoid creature. It is surprisingly durable.", "proportional": { "weight": 2.0, "volume": 2.0, "price": 1.5, "calories": 2.0 } }, @@ -68,7 +68,7 @@ { "type": "COMESTIBLE", "id": "human_tallow", - "name": "human tallow", + "name": { "str": "human tallow" }, "copy-from": "tallow", "description": "A smooth white block of cleaned and rendered human fat. It will remain edible for a very long time, and can be used as an ingredient in many foods and projects.", "price": 500, @@ -78,7 +78,7 @@ { "type": "COMESTIBLE", "id": "human_lard", - "name": "human lard", + "name": { "str": "human lard" }, "copy-from": "human_tallow", "description": "A smooth white block of dry-rendered human fat. It will remain edible for a very long time, and can be used as an ingredient in many foods and projects." }, @@ -96,7 +96,7 @@ "id": "human_cooked", "copy-from": "human_flesh", "type": "COMESTIBLE", - "name": "cooked creep", + "name": { "str": "cooked creep" }, "description": "A freshly cooked slice of some unpleasant person. Tastes great.", "proportional": { "price": 1.5 }, "parasites": 0, @@ -274,7 +274,7 @@ "copy-from": "mutant_meat", "type": "COMESTIBLE", "cooks_like": "mutant_human_cooked", - "name": "mutant humanoid meat", + "name": { "str": "mutant humanoid meat" }, "description": "Freshly butchered from the body of a heavily mutated creature that was unsettlingly humanoid in appearance. It has odd bits of fur and other tissue lodged in it that clearly don't belong. You'd have to be crazy or starving to eat this.", "material": [ "hflesh" ] }, @@ -299,7 +299,7 @@ "copy-from": "mutant_human_flesh", "calories": 402, "type": "COMESTIBLE", - "name": "cooked cretin", + "name": { "str": "cooked cretin" }, "description": "Cooked meat from a heavily mutated humanoid. Now that the worst bits have been picked out, it's probably digestible, if not very appetizing.", "proportional": { "price": 1.5 }, "parasites": 0, @@ -334,7 +334,7 @@ "volume": "250 ml", "spoils_in": "1 day", "type": "COMESTIBLE", - "name": "cooked meat", + "name": { "str": "cooked meat" }, "description": "This is a chunk of freshly cooked meat. It's filling and nutritious, but unseasoned and a bit bland.", "price": 750, "price_postapoc": 100, @@ -350,7 +350,7 @@ "volume": "250 ml", "spoils_in": "1 day", "type": "COMESTIBLE", - "name": "cooked fatty meat", + "name": { "str": "cooked fatty meat" }, "description": "This is a chunk of freshly cooked fatty meat. Although absent of vitamins, it is very filling and delightfully greasy.", "calories": 1300, "price": 900, @@ -377,7 +377,7 @@ "id": "mutant_meat_cooked", "type": "COMESTIBLE", "copy-from": "mutant_meat", - "name": "cooked mutant meat", + "name": { "str": "cooked mutant meat" }, "snippet_category": "cooked_mutant_meat_desc", "description": "This is a cooked chunk of meat from a mutated animal.", "looks_like": "meat_cooked", @@ -404,7 +404,7 @@ "id": "offal", "copy-from": "meat", "type": "COMESTIBLE", - "name": "raw offal", + "name": { "str": "raw offal" }, "description": "Offal is uncooked internal organs and entrails. It's filled with essential vitamins, but most people consider it a bit gross unless very carefully prepared.", "proportional": { "parasites": 2.0 }, "price_postapoc": 25, @@ -471,7 +471,7 @@ "id": "stomach", "copy-from": "flesh", "type": "COMESTIBLE", - "name": "stomach", + "name": { "str": "stomach" }, "description": "The stomach of a woodland creature. It is surprisingly durable.", "weight": "72 g", "volume": "250 ml", @@ -488,7 +488,7 @@ "id": "stomach_large", "copy-from": "stomach", "type": "COMESTIBLE", - "name": "large stomach", + "name": { "str": "large stomach" }, "description": "The stomach of a large woodland creature. It is surprisingly durable.", "proportional": { "weight": 2.0, "volume": 2.0, "price": 1.5, "calories": 2.0 } }, @@ -538,7 +538,7 @@ "id": "meat_smoked", "copy-from": "meat_cooked", "type": "COMESTIBLE", - "name": "smoked meat", + "name": { "str": "smoked meat" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "smoked sucker" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "smoked Narnian" } }, @@ -614,7 +614,7 @@ "type": "COMESTIBLE", "copy-from": "lung", "looks_like": "offal", - "name": "raw liver", + "name": { "str": "raw liver" }, "description": "The liver from an animal. Although many dislike the texture, it's one of the more vitamin rich parts of the animal. It is very good in sausages, but maybe a little less appetizing when cooked on its own.", "price_postapoc": 25, "quench": -4, @@ -626,7 +626,7 @@ "type": "COMESTIBLE", "copy-from": "liver", "looks_like": "meat_cooked", - "name": "cooked liver", + "name": { "str": "cooked liver" }, "description": "Chock-full of B-Vitamins! Cooked liver isn't all that bad, depending on how you feel about the texture, but this is probably the least fancy way to do it.", "parasites": 0, "price_postapoc": 50, @@ -668,7 +668,7 @@ "type": "COMESTIBLE", "copy-from": "lung", "looks_like": "offal", - "name": "raw kidney", + "name": { "str": "raw kidney" }, "description": "The kidney from an animal. Preparing it for cooking is a challenge unless you want the kitchen to smell strongly of urine.", "color": "brown", "healthy": -8, @@ -682,7 +682,7 @@ "type": "COMESTIBLE", "copy-from": "kidney", "looks_like": "offal_cooked", - "name": "cooked kidney", + "name": { "str": "cooked kidney" }, "description": "No, this is not beans.", "healthy": -2, "price_postapoc": 25, @@ -696,7 +696,7 @@ "type": "COMESTIBLE", "copy-from": "lung", "looks_like": "offal", - "name": "raw sweetbread", + "name": { "str": "raw sweetbread" }, "description": "Sweetbreads are the thymus or pancreas of an animal. These are a delicacy, if prepared properly.", "color": "brown", "healthy": 0, @@ -710,7 +710,7 @@ "type": "COMESTIBLE", "copy-from": "sweetbread", "looks_like": "meat_cooked", - "name": "cooked sweetbread", + "name": { "str": "cooked sweetbread" }, "price_postapoc": 50, "fun": -1, "description": "Normally a delicacy, it needs a little… something.", @@ -776,7 +776,7 @@ { "type": "COMESTIBLE", "id": "tallow", - "name": "tallow", + "name": { "str": "tallow" }, "weight": "55 g", "color": "white", "spoils_in": "60 days", @@ -799,7 +799,7 @@ { "type": "COMESTIBLE", "id": "lard", - "name": "lard", + "name": { "str": "lard" }, "copy-from": "tallow", "description": "A smooth white block of dry-rendered animal fat. It will remain edible for a very long time, and can be used as an ingredient in many foods and projects." }, @@ -817,7 +817,7 @@ "id": "mutant_tallow", "type": "COMESTIBLE", "copy-from": "tallow", - "name": "mutant tallow", + "name": { "str": "mutant tallow" }, "description": "A smooth white block of cleaned and rendered fat sourced from a mutant animal. It will remain edible for a very long time, and can be used as an ingredient in many foods and projects.", "looks_like": "tallow", "proportional": { "price": 0.2 }, @@ -827,7 +827,7 @@ "id": "mutant_lard", "type": "COMESTIBLE", "copy-from": "mutant_tallow", - "name": "mutant lard", + "name": { "str": "mutant lard" }, "description": "A smooth white block of dry-rendered fat sourced from a mutant animal. It will remain edible for a very long time, and can be used as an ingredient in many foods and projects." }, { @@ -841,7 +841,7 @@ { "type": "COMESTIBLE", "id": "mutant_human_tallow", - "name": "mutant humanoid tallow", + "name": { "str": "mutant humanoid tallow" }, "copy-from": "mutant_tallow", "description": "A smooth white block of cleaned and rendered fat sourced from a mutant humanoid. It won't rot for a very long time, and can be used as an ingredient in many foods and projects.", "material": [ "hflesh" ] @@ -849,7 +849,7 @@ { "type": "COMESTIBLE", "id": "mutant_human_lard", - "name": "mutant humanoid lard", + "name": { "str": "mutant humanoid lard" }, "copy-from": "mutant_human_tallow", "description": "A smooth white block of dry-rendered fat sourced from a mutant humanoid. It won't rot for a very long time, and can be used as an ingredient in many foods and projects." }, @@ -892,7 +892,7 @@ "type": "COMESTIBLE", "id": "bone_tainted", "category": "other", - "name": "tainted bone", + "name": { "str": "tainted bone" }, "weight": "212 g", "color": "light_gray", "use_action": [ "POISON" ], @@ -929,7 +929,7 @@ "type": "COMESTIBLE", "id": "fat_tainted", "category": "other", - "name": "tainted fat", + "name": { "str": "tainted fat" }, "weight": "192 g", "color": "yellow", "spoils_in": "4 hours", @@ -950,7 +950,7 @@ { "type": "COMESTIBLE", "id": "tallow_tainted", - "name": "tainted tallow", + "name": { "str": "tainted tallow" }, "category": "chems", "weight": "128 g", "color": "light_gray", @@ -974,7 +974,7 @@ "type": "COMESTIBLE", "id": "stomach_boiled", "copy-from": "small_stomach_boiled", - "name": "large boiled stomach", + "name": { "str": "large boiled stomach" }, "description": "A boiled stomach from an animal, nothing else. It looks all but appetizing.", "proportional": { "price": 2.0, "calories": 2.0, "volume": 2.0, "weight": 2.0 }, "fun": -5 @@ -1017,7 +1017,7 @@ "type": "COMESTIBLE", "id": "raw_leather", "category": "spare_parts", - "name": "raw hide", + "name": { "str": "raw hide" }, "weight": "100 g", "volume": "125 ml", "color": "pink", @@ -1039,7 +1039,7 @@ "type": "COMESTIBLE", "id": "raw_tainted_leather", "copy-from": "raw_leather", - "name": "tainted hide", + "name": { "str": "tainted hide" }, "spoils_in": "6 hours", "use_action": [ "POISON" ], "price_postapoc": 10, @@ -1050,7 +1050,7 @@ "type": "COMESTIBLE", "id": "raw_hleather", "copy-from": "raw_leather", - "name": "raw human skin", + "name": { "str": "raw human skin" }, "description": "A carefully folded raw skin harvested from a human. You can cure it for storage and tanning, or eat it if you're desperate enough.", "material": [ "hflesh" ] }, @@ -1058,7 +1058,7 @@ "type": "COMESTIBLE", "id": "raw_demihumanleather", "copy-from": "raw_leather", - "name": "raw demihuman skin", + "name": { "str": "raw demihuman skin" }, "description": "A carefully folded raw skin harvested from a demihuman. You can cure it for storage and tanning, or eat it if you're desperate enough.", "material": [ "flesh" ], "flags": [ "STRICT_HUMANITARIANISM" ] @@ -1067,7 +1067,7 @@ "type": "COMESTIBLE", "id": "raw_fur", "category": "spare_parts", - "name": "raw pelt", + "name": { "str": "raw pelt" }, "weight": "114 g", "volume": "170 ml", "color": "brown", @@ -1088,7 +1088,7 @@ { "type": "COMESTIBLE", "id": "raw_tainted_fur", - "name": "tainted pelt", + "name": { "str": "tainted pelt" }, "copy-from": "raw_fur", "spoils_in": "6 hours", "use_action": [ "POISON" ], @@ -1101,7 +1101,7 @@ "type": "COMESTIBLE", "id": "raw_hfur", "copy-from": "raw_fur", - "name": "raw human pelt", + "name": { "str": "raw human pelt" }, "description": "A carefully folded raw skin harvested from a fur-bearing mutant human. It still has the fur attached. You can cure it for storage and tanning, or eat it if you're desperate enough.", "material": [ "fur", "hflesh" ] }, @@ -1109,7 +1109,7 @@ "type": "COMESTIBLE", "comestible_type": "FOOD", "id": "flesh_golem_heart", - "name": "seeping heart", + "name": { "str": "seeping heart" }, "weight": "2035 g", "color": "black_red", "symbol": "%", @@ -1129,7 +1129,7 @@ "type": "COMESTIBLE", "comestible_type": "FOOD", "id": "jabberwock_heart", - "name": "putrid heart", + "name": { "str": "putrid heart" }, "weight": "4535 g", "color": "black_red", "symbol": "%", @@ -1149,7 +1149,7 @@ "type": "COMESTIBLE", "comestible_type": "FOOD", "id": "jabberwock_heart_desiccated", - "name": "desiccated putrid heart", + "name": { "str": "desiccated putrid heart" }, "weight": "1360 g", "color": "black_red", "symbol": "%", @@ -1177,7 +1177,7 @@ "id": "leech_flower", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "leech flower", + "name": { "str": "leech flower" }, "color": "blue", "weight": "10 g", "volume": "250 ml", @@ -1213,7 +1213,7 @@ "id": "demihuman_stomach", "copy-from": "stomach", "type": "COMESTIBLE", - "name": "demihuman stomach", + "name": { "str": "demihuman stomach" }, "description": "The stomach of an intelligent demihuman. It is surprisingly durable.", "material": [ "flesh" ], "flags": [ "STRICT_HUMANITARIANISM" ] @@ -1222,7 +1222,7 @@ "id": "demihuman_stomach_large", "copy-from": "stomach_large", "type": "COMESTIBLE", - "name": "large demihuman stomach", + "name": { "str": "large demihuman stomach" }, "description": "The stomach of a large humanoid creature. It is surprisingly durable.", "proportional": { "weight": 2.0, "volume": 2.0, "price": 1.5, "calories": 2.0 }, "flags": [ "STRICT_HUMANITARIANISM" ] @@ -1239,7 +1239,7 @@ { "type": "COMESTIBLE", "id": "demihuman_tallow", - "name": "demihuman tallow", + "name": { "str": "demihuman tallow" }, "copy-from": "tallow", "description": "A smooth white block of cleaned and rendered demihuman fat. It will remain edible for a very long time, and can be used as an ingredient in many foods and projects.", "price": 500, @@ -1250,7 +1250,7 @@ { "type": "COMESTIBLE", "id": "demihuman_lard", - "name": "demihuman lard", + "name": { "str": "demihuman lard" }, "copy-from": "human_tallow", "description": "A smooth white block of dry-rendered demihuman fat. It will remain edible for a very long time, and can be used as an ingredient in many foods and projects.", "flags": [ "STRICT_HUMANITARIANISM" ] @@ -1285,7 +1285,7 @@ "id": "demihuman_cooked", "copy-from": "demihuman_flesh", "type": "COMESTIBLE", - "name": "cooked mongrel", + "name": { "str": "cooked mongrel" }, "description": "A freshly cooked slice of something close to being a real person. Tastes like long pig.", "proportional": { "price": 1.5 }, "parasites": 0, @@ -1297,7 +1297,7 @@ "type": "COMESTIBLE", "id": "demihuman_stomach_boiled", "copy-from": "stomach_boiled", - "name": "boiled demihuman stomach", + "name": { "str": "boiled demihuman stomach" }, "calories": 240, "description": "A boiled stomach from a demihuman, nothing else. It looks all but appetizing.", "material": [ "flesh" ], diff --git a/data/json/items/comestibles/cereal.json b/data/json/items/comestibles/cereal.json index d9cfc8f7fb5dc..115bb662a286f 100644 --- a/data/json/items/comestibles/cereal.json +++ b/data/json/items/comestibles/cereal.json @@ -109,7 +109,7 @@ { "type": "COMESTIBLE", "id": "cereal", - "name": "sugary cereal", + "name": { "str": "sugary cereal" }, "weight": "38 g", "color": "yellow", "spoils_in": "90 days", @@ -144,7 +144,7 @@ { "type": "COMESTIBLE", "id": "cereal3", - "name": "corn cereal", + "name": { "str": "corn cereal" }, "weight": "39 g", "color": "yellow", "spoils_in": "90 days", diff --git a/data/json/items/comestibles/dairy.json b/data/json/items/comestibles/dairy.json index 40f556cd4fbc9..d26a4e8df1c1e 100644 --- a/data/json/items/comestibles/dairy.json +++ b/data/json/items/comestibles/dairy.json @@ -71,7 +71,7 @@ { "type": "COMESTIBLE", "id": "yoghurt", - "name": "yogurt", + "name": { "str": "yogurt" }, "weight": "238 g", "color": "magenta", "spoils_in": "20 hours", @@ -147,7 +147,7 @@ { "type": "COMESTIBLE", "id": "pudding", - "name": "pudding", + "name": { "str": "pudding" }, "weight": "232 g", "color": "light_gray", "spoils_in": "7 days 12 hours", @@ -167,7 +167,7 @@ { "type": "COMESTIBLE", "id": "milk_curdled", - "name": "curdled milk", + "name": { "str": "curdled milk" }, "weight": "236 g", "color": "white", "spoils_in": "28 days", @@ -230,7 +230,7 @@ { "type": "COMESTIBLE", "id": "quesadilla_cheese", - "name": "quesadilla", + "name": { "str": "quesadilla" }, "weight": "116 g", "color": "brown", "spoils_in": "20 days", diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json index 4ca83256514e4..a65d3a7656250 100644 --- a/data/json/items/comestibles/drink.json +++ b/data/json/items/comestibles/drink.json @@ -49,7 +49,7 @@ { "type": "COMESTIBLE", "id": "soy_milk", - "name": "soy milk", + "name": { "str": "soy milk" }, "weight": "258 g", "color": "white", "spoils_in": "3 days", @@ -107,7 +107,7 @@ { "type": "COMESTIBLE", "id": "can_coconut", - "name": "coconut milk", + "name": { "str": "coconut milk" }, "weight": "238 g", "color": "white", "spoils_in": "1 day", @@ -171,7 +171,7 @@ { "type": "COMESTIBLE", "id": "choc_drink", - "name": "chocolate drink", + "name": { "str": "chocolate drink" }, "weight": "236 g", "color": "brown", "container": "can_drink", @@ -257,7 +257,7 @@ { "type": "COMESTIBLE", "id": "cola", - "name": "dark cola", + "name": { "str": "dark cola" }, "weight": "248 g", "color": "brown", "addiction_type": "caffeine", @@ -283,7 +283,7 @@ { "type": "COMESTIBLE", "id": "colamdew", - "name": "energy cola", + "name": { "str": "energy cola" }, "weight": "234 g", "color": "light_green", "addiction_type": "caffeine", @@ -309,7 +309,7 @@ { "type": "COMESTIBLE", "id": "creamsoda", - "name": "cream soda", + "name": { "str": "cream soda" }, "weight": "247 g", "color": "light_gray", "addiction_type": "caffeine", @@ -335,7 +335,7 @@ { "type": "COMESTIBLE", "id": "cranberry_juice", - "name": "cranberry juice", + "name": { "str": "cranberry juice" }, "weight": "250 g", "color": "magenta", "spoils_in": "20 d", @@ -421,7 +421,7 @@ { "type": "COMESTIBLE", "id": "eggnog", - "name": "eggnog", + "name": { "str": "eggnog" }, "weight": "134 g", "color": "white", "spoils_in": "8 hours", @@ -444,7 +444,7 @@ { "type": "COMESTIBLE", "id": "energy_drink", - "name": "energy drink", + "name": { "str": "energy drink" }, "weight": "253 g", "color": "magenta", "addiction_type": "caffeine", @@ -533,7 +533,7 @@ { "type": "COMESTIBLE", "id": "juice_pasteurized", - "name": "pasteurized fruit juice", + "name": { "str": "pasteurized fruit juice" }, "copy-from": "juice", "spoils_in": "180 days", "healthy": 0, @@ -546,7 +546,7 @@ { "type": "COMESTIBLE", "id": "juice", - "name": "fruit juice", + "name": { "str": "fruit juice" }, "weight": "125 g", "color": "light_red", "spoils_in": "5 days", @@ -571,7 +571,7 @@ { "type": "COMESTIBLE", "id": "kompot", - "name": "kompot", + "name": { "str": "kompot" }, "weight": "250 g", "color": "red", "spoils_in": "7 days 12 hours", @@ -618,7 +618,7 @@ { "type": "COMESTIBLE", "id": "lemonlime", - "name": "lemon-lime soda", + "name": { "str": "lemon-lime soda" }, "weight": "258 g", "color": "yellow", "container": "can_drink", @@ -720,7 +720,7 @@ { "type": "COMESTIBLE", "id": "milk_coffee", - "name": "coffee milk", + "name": { "str": "coffee milk" }, "weight": "259 g", "color": "brown", "addiction_type": "caffeine", @@ -748,7 +748,7 @@ { "type": "COMESTIBLE", "id": "milk_tea", - "name": "milk tea", + "name": { "str": "milk tea" }, "weight": "259 g", "color": "brown", "spoils_in": "12 hours", @@ -774,7 +774,7 @@ { "type": "COMESTIBLE", "id": "oj", - "name": "orange juice", + "name": { "str": "orange juice" }, "weight": "263 g", "color": "yellow", "spoils_in": "5 days", @@ -799,7 +799,7 @@ { "type": "COMESTIBLE", "id": "orangesoda", - "name": "orange soda", + "name": { "str": "orange soda" }, "weight": "248 g", "color": "yellow", "container": "can_drink", @@ -841,7 +841,7 @@ { "type": "COMESTIBLE", "id": "purple_drink", - "name": "grape drink", + "name": { "str": "grape drink" }, "weight": "260 g", "color": "magenta", "stim": 2, @@ -887,7 +887,7 @@ { "type": "COMESTIBLE", "id": "spezi", - "name": "spezi", + "name": { "str": "spezi" }, "weight": "250 g", "color": "brown", "addiction_type": "caffeine", @@ -912,7 +912,7 @@ { "type": "COMESTIBLE", "id": "sports_drink", - "name": "sports drink", + "name": { "str": "sports drink" }, "weight": "257 g", "color": "light_red", "container": "bottle_plastic", @@ -953,7 +953,7 @@ { "type": "COMESTIBLE", "id": "rehydration_drink", - "name": "rehydration drink", + "name": { "str": "rehydration drink" }, "weight": "257 g", "color": "light_cyan", "container": "bottle_plastic", @@ -993,7 +993,7 @@ { "type": "COMESTIBLE", "id": "tea", - "name": "black tea", + "name": { "str": "black tea" }, "weight": "250 g", "color": "brown", "fatigue_mod": 9, @@ -1103,7 +1103,7 @@ { "type": "COMESTIBLE", "id": "tea_green", - "name": "green tea", + "name": { "str": "green tea" }, "copy-from": "tea", "color": "green", "fatigue_mod": 7, @@ -1114,7 +1114,7 @@ { "type": "COMESTIBLE", "id": "tea_fruit", - "name": "fruit tea", + "name": { "str": "fruit tea" }, "copy-from": "tea", "color": "red", "calories": 0, @@ -1127,7 +1127,7 @@ "type": "COMESTIBLE", "id": "coffee_sweetened", "copy-from": "coffee", - "name": "sweetened coffee", + "name": { "str": "sweetened coffee" }, "calories": 21, "description": "The morning ritual of the pre-apocalyptic world, created from coffee cherries through a complex process of seed removal, roasting, grinding, and brewing. Coffee is substantially richer in caffeine than its rival tea. With added sweetener for better taste.", "price": 110, @@ -1139,7 +1139,7 @@ "type": "COMESTIBLE", "id": "tea_sweetened", "copy-from": "tea", - "name": "sweetened tea", + "name": { "str": "sweetened tea" }, "calories": 21, "description": "The beverage of gentlemen everywhere, made from applying hot water to leaves of the tea plant /Camellia sinensis/. Added sweetener for a better taste.", "price": 100, @@ -1150,7 +1150,7 @@ "type": "COMESTIBLE", "id": "milk_tea_sweetened", "copy-from": "milk_tea", - "name": "sweetened milk tea", + "name": { "str": "sweetened milk tea" }, "calories": 88, "description": "Hot tea with cold milk and added sweetener.", "price": 460, @@ -1162,7 +1162,7 @@ "type": "COMESTIBLE", "id": "coffee_substitute_sweetened", "copy-from": "coffee_substitute", - "name": "sweetened coffee substitute", + "name": { "str": "sweetened coffee substitute" }, "calories": 21, "description": "Homemade not-coffee created from the Kentucky coffeetree, just like the Meskwaki tribe! Doesn't actually have any caffeine, and is very bitter, but it'll pass in a pinch. The added sweetness neutralize the bitterness somewhat.", "price": 110, @@ -1174,7 +1174,7 @@ "type": "COMESTIBLE", "id": "milk_coffee_sweetened", "copy-from": "milk_coffee", - "name": "sweetened coffee milk", + "name": { "str": "sweetened coffee milk" }, "calories": 88, "description": "Coffee syrup mixed into milk. It's been the state drink of Rhode Island since 1993. Added sweetener for those who like it even sweeter.", "price": 490, @@ -1184,7 +1184,7 @@ { "type": "COMESTIBLE", "id": "tomato_juice", - "name": "tomato juice", + "name": { "str": "tomato juice" }, "weight": "243 g", "color": "red", "spoils_in": "5 days", diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json index de3e7a4dfc05a..22e2f5bf7999b 100644 --- a/data/json/items/comestibles/drink_other.json +++ b/data/json/items/comestibles/drink_other.json @@ -2,7 +2,7 @@ { "type": "COMESTIBLE", "id": "sauce_red", - "name": "red sauce", + "name": { "str": "red sauce" }, "weight": "64 g", "color": "red", "spoils_in": "3 days", @@ -75,7 +75,7 @@ "type": "COMESTIBLE", "symbol": "~", "color": "red", - "name": "ketchup", + "name": { "str": "ketchup" }, "description": "A viscous paste of tomato, salt, and vinegar.", "price": 1875, "price_postapoc": 100, diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 21d1e0f236e0b..7e6b40bbbd5ab 100644 --- a/data/json/items/comestibles/egg.json +++ b/data/json/items/comestibles/egg.json @@ -26,7 +26,7 @@ { "type": "COMESTIBLE", "id": "egg_chicken", - "name": "chicken egg", + "name": { "str": "chicken egg" }, "copy-from": "egg_bird", "rot_spawn": "GROUP_EGG_CHICKEN", "rot_spawn_chance": 70 @@ -43,21 +43,21 @@ { "type": "COMESTIBLE", "id": "egg_grouse", - "name": "grouse egg", + "name": { "str": "grouse egg" }, "copy-from": "egg_chicken", "rot_spawn": "GROUP_EGG_GROUSE" }, { "type": "COMESTIBLE", "id": "egg_crow", - "name": "crow egg", + "name": { "str": "crow egg" }, "copy-from": "egg_chicken", "rot_spawn": "GROUP_EGG_CROW" }, { "type": "COMESTIBLE", "id": "egg_duck", - "name": "duck egg", + "name": { "str": "duck egg" }, "copy-from": "egg_chicken", "calories": 130, "volume": "83 ml", @@ -68,7 +68,7 @@ { "type": "COMESTIBLE", "id": "egg_goose_canadian", - "name": "goose egg", + "name": { "str": "goose egg" }, "copy-from": "egg_chicken", "calories": 266, "volume": "125 ml", @@ -79,7 +79,7 @@ { "type": "COMESTIBLE", "id": "egg_turkey", - "name": "turkey egg", + "name": { "str": "turkey egg" }, "copy-from": "egg_chicken", "volume": "83 ml", "weight": "79 g", @@ -90,21 +90,21 @@ { "type": "COMESTIBLE", "id": "egg_pheasant", - "name": "pheasant egg", + "name": { "str": "pheasant egg" }, "copy-from": "egg_chicken", "rot_spawn": "GROUP_EGG_PHEASANT" }, { "type": "COMESTIBLE", "id": "egg_cockatrice", - "name": "cockatrice egg", + "name": { "str": "cockatrice egg" }, "copy-from": "egg_chicken", "rot_spawn": "GROUP_EGG_COCKATRICE" }, { "type": "COMESTIBLE", "id": "egg_reptile", - "name": "reptile egg", + "name": { "str": "reptile egg" }, "weight": "60 g", "color": "white", "spoils_in": "28 days", @@ -127,7 +127,7 @@ { "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "Insect Egg", + "name": { "str": "Insect Egg" }, "abstract": "egg_insect", "//": "5x the weight and 3x the nutrition of real chicken eggs, toxins equal 296g mutant meat", "color": "white", @@ -164,7 +164,7 @@ { "type": "COMESTIBLE", "id": "spider_egg", - "name": "spider egg", + "name": { "str": "spider egg" }, "copy-from": "egg_insect", "color": "white", "symbol": "%", @@ -173,7 +173,7 @@ { "type": "COMESTIBLE", "id": "egg_roach", - "name": "roach egg", + "name": { "str": "roach egg" }, "copy-from": "egg_insect", "color": "white", "symbol": "%", @@ -188,7 +188,7 @@ { "type": "COMESTIBLE", "id": "egg_roach_plague", - "name": "roach egg", + "name": { "str": "roach egg" }, "copy-from": "egg_roach", "healthy": -10, "rot_spawn": "GROUP_EGG_ROACH_PLAGUE" @@ -196,7 +196,7 @@ { "type": "COMESTIBLE", "id": "egg_locust", - "name": "locust egg", + "name": { "str": "locust egg" }, "copy-from": "egg_insect", "color": "green", "symbol": "o", @@ -208,7 +208,7 @@ { "type": "COMESTIBLE", "id": "egg_dragonfly", - "name": "dragonfly egg", + "name": { "str": "dragonfly egg" }, "description": "The still wet egg of a mutated dragonfly. Serves as a disgusting substitute for the real thing, just don't let it hatch in the water.", "copy-from": "egg_insect", "color": "light_green", @@ -220,7 +220,7 @@ { "type": "COMESTIBLE", "id": "egg_firefly", - "name": "firefly egg", + "name": { "str": "firefly egg" }, "copy-from": "egg_insect", "color": "yellow", "symbol": "o", @@ -232,7 +232,7 @@ { "type": "COMESTIBLE", "id": "egg_centipede", - "name": "centipede egg", + "name": { "str": "centipede egg" }, "copy-from": "egg_insect", "color": "light_green", "symbol": "o", @@ -244,7 +244,7 @@ { "type": "COMESTIBLE", "id": "razorclaw_roe", - "name": "razorclaw roe", + "name": { "str": "razorclaw roe" }, "weight": "236 g", "color": "red", "spoils_in": "1 day", @@ -264,7 +264,7 @@ { "type": "COMESTIBLE", "id": "egg_fish", - "name": "roe", + "name": { "str": "roe" }, "weight": "24 g", "color": "red", "spoils_in": "1 day", @@ -356,7 +356,7 @@ { "type": "COMESTIBLE", "id": "pickled_egg", - "name": "pickled egg", + "name": { "str": "pickled egg" }, "copy-from": "egg_chicken", "color": "white", "spoils_in": "30 days", diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json index ed66cfbeb4be0..577605df75007 100644 --- a/data/json/items/comestibles/fruit_dishes.json +++ b/data/json/items/comestibles/fruit_dishes.json @@ -21,7 +21,7 @@ { "type": "COMESTIBLE", "id": "fruit_leather", - "name": "fruit leather", + "name": { "str": "fruit leather" }, "weight": "34 g", "color": "pink", "spoils_in": "360 days", @@ -81,7 +81,7 @@ { "type": "COMESTIBLE", "id": "can_pineapple", - "name": "canned pineapple", + "name": { "str": "canned pineapple" }, "weight": "268 g", "color": "yellow", "spoils_in": "1 day", @@ -125,7 +125,7 @@ { "type": "COMESTIBLE", "id": "fruit_cooked", - "name": "cooked fruit", + "name": { "str": "cooked fruit" }, "weight": "150 g", "color": "red", "spoils_in": "3 days 18 hours", @@ -147,7 +147,7 @@ { "type": "COMESTIBLE", "id": "jam_fruit", - "name": "fruit jam", + "name": { "str": "fruit jam" }, "weight": "15 g", "color": "red", "spoils_in": "10 days", @@ -273,7 +273,7 @@ { "type": "COMESTIBLE", "id": "brandied_fruit", - "name": "brandied fruit", + "name": { "str": "brandied fruit" }, "weight": "180 g", "color": "red", "spoils_in": "365 days", diff --git a/data/json/items/comestibles/irradiated_fruit.json b/data/json/items/comestibles/irradiated_fruit.json index f9b27dde20212..92183b2a77988 100644 --- a/data/json/items/comestibles/irradiated_fruit.json +++ b/data/json/items/comestibles/irradiated_fruit.json @@ -83,7 +83,7 @@ "type": "COMESTIBLE", "id": "irradiated_apple", "copy-from": "apple", - "name": "irradiated apple", + "name": { "str": "irradiated apple" }, "description": "Mmm, irradiated. Will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -93,7 +93,7 @@ "type": "COMESTIBLE", "id": "irradiated_banana", "copy-from": "banana", - "name": "irradiated banana", + "name": { "str": "irradiated banana" }, "description": "An irradiated banana will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -103,7 +103,7 @@ "type": "COMESTIBLE", "id": "irradiated_orange", "copy-from": "orange", - "name": "irradiated orange", + "name": { "str": "irradiated orange" }, "description": "An irradiated orange will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -113,7 +113,7 @@ "type": "COMESTIBLE", "id": "irradiated_lemon", "copy-from": "lemon", - "name": "irradiated lemon", + "name": { "str": "irradiated lemon" }, "description": "An irradiated lemon will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -123,7 +123,7 @@ "type": "COMESTIBLE", "id": "irradiated_grapefruit", "copy-from": "grapefruit", - "name": "irradiated grapefruit", + "name": { "str": "irradiated grapefruit" }, "description": "An irradiated grapefruit will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -133,7 +133,7 @@ "type": "COMESTIBLE", "id": "irradiated_pear", "copy-from": "pear", - "name": "irradiated pear", + "name": { "str": "irradiated pear" }, "description": "An irradiated pear will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -154,7 +154,7 @@ "type": "COMESTIBLE", "id": "irradiated_plums", "copy-from": "plums", - "name": "irradiated plum", + "name": { "str": "irradiated plum" }, "description": "A group of irradiated plums will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -174,7 +174,7 @@ "type": "COMESTIBLE", "id": "irradiated_pineapple", "copy-from": "pineapple", - "name": "irradiated pineapple", + "name": { "str": "irradiated pineapple" }, "description": "An irradiated pineapple will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -194,7 +194,7 @@ "type": "COMESTIBLE", "id": "irradiated_watermelon", "copy-from": "watermelon", - "name": "irradiated watermelon", + "name": { "str": "irradiated watermelon" }, "description": "An irradiated watermelon will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -205,7 +205,7 @@ "type": "COMESTIBLE", "id": "irradiated_melon", "copy-from": "melon", - "name": "irradiated melon", + "name": { "str": "irradiated melon" }, "description": "An irradiated melon will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -225,7 +225,7 @@ "type": "COMESTIBLE", "id": "irradiated_mango", "copy-from": "mango", - "name": "irradiated mango", + "name": { "str": "irradiated mango" }, "description": "An irradiated mango will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -235,7 +235,7 @@ "type": "COMESTIBLE", "id": "irradiated_pomegranate", "copy-from": "pomegranate", - "name": "irradiated pomegranate", + "name": { "str": "irradiated pomegranate" }, "description": "An irradiated pomegranate will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -245,7 +245,7 @@ "type": "COMESTIBLE", "id": "irradiated_papaya", "copy-from": "papaya", - "name": "irradiated papaya", + "name": { "str": "irradiated papaya" }, "description": "An irradiated papaya will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -255,7 +255,7 @@ "type": "COMESTIBLE", "id": "irradiated_kiwi", "copy-from": "kiwi", - "name": "irradiated kiwi", + "name": { "str": "irradiated kiwi" }, "description": "An irradiated kiwi will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -265,7 +265,7 @@ "type": "COMESTIBLE", "id": "irradiated_apricot", "copy-from": "apricot", - "name": "irradiated apricot", + "name": { "str": "irradiated apricot" }, "description": "An irradiated apricot will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", diff --git a/data/json/items/comestibles/irradiated_veggy.json b/data/json/items/comestibles/irradiated_veggy.json index de23b9feba006..cc54e151cbc93 100644 --- a/data/json/items/comestibles/irradiated_veggy.json +++ b/data/json/items/comestibles/irradiated_veggy.json @@ -3,7 +3,7 @@ "type": "COMESTIBLE", "id": "irradiated_lettuce", "copy-from": "lettuce", - "name": "irradiated lettuce", + "name": { "str": "irradiated lettuce" }, "description": "An irradiated head of lettuce will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -13,7 +13,7 @@ "type": "COMESTIBLE", "id": "irradiated_cabbage", "copy-from": "cabbage", - "name": "irradiated cabbage", + "name": { "str": "irradiated cabbage" }, "description": "An irradiated head of cabbage will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -43,7 +43,7 @@ "type": "COMESTIBLE", "id": "irradiated_zucchini", "copy-from": "zucchini", - "name": "irradiated zucchini", + "name": { "str": "irradiated zucchini" }, "description": "An irradiated zucchini will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -53,7 +53,7 @@ "type": "COMESTIBLE", "id": "irradiated_onion", "copy-from": "onion", - "name": "irradiated onion", + "name": { "str": "irradiated onion" }, "description": "An irradiated onion will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -63,7 +63,7 @@ "type": "COMESTIBLE", "id": "irradiated_carrot", "copy-from": "carrot", - "name": "irradiated carrot", + "name": { "str": "irradiated carrot" }, "description": "An irradiated bundle of carrots will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -83,7 +83,7 @@ "type": "COMESTIBLE", "id": "irradiated_pumpkin", "copy-from": "pumpkin", - "name": "irradiated pumpkin", + "name": { "str": "irradiated pumpkin" }, "description": "An irradiated pumpkin will remain edible nearly forever. Sterilized using radiation, so it's safe to eat.", "proportional": { "price": 2.0 }, "spoils_in": "0 hours", @@ -102,7 +102,7 @@ { "type": "COMESTIBLE", "id": "irradiated_cucumber", - "name": "irradiated cucumber", + "name": { "str": "irradiated cucumber" }, "weight": "150 g", "color": "green", "container": "bag_plastic", diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index ff6f1167254be..c8cbbd765e6ee 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/data/json/items/comestibles/junkfood.json @@ -2,7 +2,7 @@ { "type": "COMESTIBLE", "id": "toastem", - "name": "toast-em", + "name": { "str": "toast-em" }, "weight": "50 g", "color": "red", "spoils_in": "90 days", @@ -24,7 +24,7 @@ { "type": "COMESTIBLE", "id": "toastem2", - "name": "toast-em", + "name": { "str": "toast-em" }, "copy-from": "toastem", "description": "Dry toaster pastries, usually coated with solid frosting. These are blueberry flavored!", "fun": 15 @@ -32,7 +32,7 @@ { "type": "COMESTIBLE", "id": "toastem3", - "name": "toast-em", + "name": { "str": "toast-em" }, "copy-from": "toastem", "description": "Dry toaster pastries, usually coated with solid frosting. Sadly, these are not.", "fun": 10 @@ -174,7 +174,7 @@ { "type": "COMESTIBLE", "id": "chocpretzels", - "name": "chocolate-covered pretzel", + "name": { "str": "chocolate-covered pretzel" }, "weight": "96 g", "color": "brown", "spoils_in": "90 days", @@ -195,7 +195,7 @@ { "type": "COMESTIBLE", "id": "chocolate", - "name": "chocolate bar", + "name": { "str": "chocolate bar" }, "weight": "34 g", "color": "brown", "spoils_in": "360 days", @@ -326,7 +326,7 @@ { "type": "COMESTIBLE", "id": "cow_candy", - "name": "candy cattle", + "name": { "str": "candy cattle" }, "description": "A handful of chocolate candies shaped like cows.", "symbol": "*", "copy-from": "candy2", @@ -335,7 +335,7 @@ { "type": "COMESTIBLE", "id": "licorice", - "name": "licorice", + "name": { "str": "licorice" }, "container": "bag_plastic", "symbol": "%", "volume": "40 ml", @@ -398,7 +398,7 @@ { "type": "COMESTIBLE", "id": "grahmcrackers", - "name": "graham cracker", + "name": { "str": "graham cracker" }, "weight": "31 g", "color": "brown", "spoils_in": "90 days", @@ -420,14 +420,14 @@ { "type": "COMESTIBLE", "id": "grahmcrackers_roe", - "name": "graham cracker chunk", + "name": { "str": "graham cracker chunk" }, "copy-from": "grahmcrackers", "description": "Dry and sugary, these cracker pellets will leave you thirsty, but go well with some chocolate and marshmallows. Made by SugarRush!" }, { "type": "COMESTIBLE", "id": "cookies", - "name": "cookie", + "name": { "str": "cookie" }, "weight": "33 g", "color": "brown", "spoils_in": "60 days", @@ -450,7 +450,7 @@ { "type": "COMESTIBLE", "id": "cookies_egg", - "name": "cookie egg", + "name": { "str": "cookie egg" }, "copy-from": "cookies", "description": "Sweet and delicious cookies, shaped like eggs. Made by SugarRush!" }, @@ -499,7 +499,7 @@ { "type": "COMESTIBLE", "id": "jihelucake", - "name": "cake", + "name": { "str": "cake" }, "weight": "38 g", "color": "white", "spoils_in": "52 hours", @@ -518,7 +518,7 @@ { "type": "COMESTIBLE", "id": "cake2", - "name": "cake", + "name": { "str": "cake" }, "spoils_in": "4 days", "copy-from": "jihelucake", "description": "Delicious chocolate cake. It has all the icing. All of it." @@ -526,7 +526,7 @@ { "type": "COMESTIBLE", "id": "cake3", - "name": "cake", + "name": { "str": "cake" }, "spoils_in": "4 days", "copy-from": "jihelucake", "quench": -5, @@ -536,7 +536,7 @@ { "type": "COMESTIBLE", "id": "choco_coffee_beans", - "name": "chocolate-covered coffee bean", + "name": { "str": "chocolate-covered coffee bean" }, "weight": "30 g", "color": "brown", "spoils_in": "360 days", @@ -634,7 +634,7 @@ { "type": "COMESTIBLE", "id": "candycigarette", - "name": "candy cigarette", + "name": { "str": "candy cigarette" }, "weight": "18 g", "color": "white", "spoils_in": "180 days", @@ -858,7 +858,7 @@ { "type": "COMESTIBLE", "id": "porkstick", - "name": "pork stick", + "name": { "str": "pork stick" }, "weight": "56 g", "color": "brown", "spoils_in": "24 days", @@ -880,7 +880,7 @@ { "type": "COMESTIBLE", "id": "junk_burrito", - "name": "microwave burrito", + "name": { "str": "microwave burrito" }, "weight": "142 g", "color": "brown", "spoils_in": "2 days 12 hours", @@ -902,7 +902,7 @@ { "type": "COMESTIBLE", "id": "frozen_dinner", - "name": "uncooked TV dinner", + "name": { "str": "uncooked TV dinner" }, "weight": "453 g", "color": "brown", "spoils_in": "2 days 12 hours", @@ -924,7 +924,7 @@ { "type": "COMESTIBLE", "id": "cooked_dinner", - "name": "cooked TV dinner", + "name": { "str": "cooked TV dinner" }, "weight": "450 g", "color": "brown", "spoils_in": "12 hours", @@ -946,7 +946,7 @@ { "type": "COMESTIBLE", "id": "fchicken", - "name": "deep-fried chicken", + "name": { "str": "deep-fried chicken" }, "weight": "168 g", "color": "red", "spoils_in": "1 day", @@ -1011,7 +1011,7 @@ { "type": "COMESTIBLE", "id": "corndogs_cooked", - "name": "cooked corn dog", + "name": { "str": "cooked corn dog" }, "copy-from": "corndogs_frozen", "spoils_in": "1 day", "container": "wrapper", @@ -1022,7 +1022,7 @@ { "type": "COMESTIBLE", "id": "corndogs_homemade", - "name": "homemade corn dog", + "name": { "str": "homemade corn dog" }, "copy-from": "corndogs_frozen", "spoils_in": "1 day", "healthy": -2, @@ -1050,7 +1050,7 @@ { "type": "COMESTIBLE", "id": "choc_waffles", - "name": "chocolate waffle", + "name": { "str": "chocolate waffle" }, "weight": "70 g", "color": "brown", "spoils_in": "10 days", @@ -1070,7 +1070,7 @@ { "type": "COMESTIBLE", "id": "can_cheese", - "name": "cheese spread", + "name": { "str": "cheese spread" }, "weight": "30 g", "color": "yellow", "spoils_in": "4 days", @@ -1114,7 +1114,7 @@ { "type": "COMESTIBLE", "id": "onion_rings", - "name": "onion ring", + "name": { "str": "onion ring" }, "weight": "166 g", "color": "brown", "spoils_in": "3 days", @@ -1202,7 +1202,7 @@ { "type": "COMESTIBLE", "id": "maltballs", - "name": "malted milk ball", + "name": { "str": "malted milk ball" }, "weight": "40 g", "color": "brown", "spoils_in": "180 days", @@ -1250,7 +1250,7 @@ { "type": "COMESTIBLE", "id": "freeze_dried_meal", - "name": "freeze-dried meal", + "name": { "str": "freeze-dried meal" }, "weight": "175 g", "color": "red", "spoils_in": "1461 days", @@ -1271,7 +1271,7 @@ { "type": "COMESTIBLE", "id": "freeze_dried_meal_hydrated", - "name": "rehydrated freeze-dried meal", + "name": { "str": "rehydrated freeze-dried meal" }, "weight": "675 g", "color": "brown", "spoils_in": "1 day", diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json index 3c34b38bd4499..fe37444b480f9 100644 --- a/data/json/items/comestibles/meat_dishes.json +++ b/data/json/items/comestibles/meat_dishes.json @@ -2,7 +2,7 @@ { "type": "COMESTIBLE", "id": "sausage_raw", - "name": "raw sausage", + "name": { "str": "raw sausage" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": "raw Mannwurst" }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": "raw killbasa" }, @@ -30,7 +30,7 @@ { "type": "COMESTIBLE", "id": "sausage", - "name": "smoked sausage", + "name": { "str": "smoked sausage" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": "smoked Mannwurst" }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": "smoked killbasa" }, @@ -48,7 +48,7 @@ { "type": "COMESTIBLE", "id": "sausage_cooked", - "name": "cooked sausage", + "name": { "str": "cooked sausage" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": "cooked Mannwurst" }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": "cooked killbasa" }, @@ -156,7 +156,7 @@ "id": "sausage_wasteland", "copy-from": "sausage_raw", "type": "COMESTIBLE", - "name": "wasteland sausage", + "name": { "str": "wasteland sausage" }, "description": "Lean sausage made from heavily salt-cured offal, with natural gut casing. Waste not, want not.", "parasites": 0, "healthy": 0, @@ -169,7 +169,7 @@ "id": "sausage_wasteland_raw", "copy-from": "sausage_raw", "type": "COMESTIBLE", - "name": "raw wasteland sausage", + "name": { "str": "raw wasteland sausage" }, "description": "Lean raw sausage made from heavily salt-cured offal, ready to be smoked.", "healthy": 0, "quench": -7, @@ -256,7 +256,7 @@ { "type": "COMESTIBLE", "id": "currywurst", - "name": "currywurst", + "name": { "str": "currywurst" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "cheapskate %s" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "confusing %s" } }, @@ -394,7 +394,7 @@ { "type": "COMESTIBLE", "id": "stuffed_clams", - "name": "stuffed clam", + "name": { "str": "stuffed clam" }, "copy-from": "fish_fried", "weight": "150 g", "calories": 572, @@ -408,7 +408,7 @@ { "type": "COMESTIBLE", "id": "lunchmeat", - "name": "lunch meat", + "name": { "str": "lunch meat" }, "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "loathsome %s" } } ], "weight": "56 g", "color": "red", @@ -455,7 +455,7 @@ { "type": "COMESTIBLE", "id": "lutefisk", - "name": "lutefisk", + "name": { "str": "lutefisk" }, "weight": "175 g", "color": "light_gray", "spoils_in": "360 days", @@ -511,7 +511,7 @@ { "type": "COMESTIBLE", "id": "can_sardine", - "name": "canned sardine", + "name": { "str": "canned sardine" }, "weight": "200 g", "color": "light_gray", "spoils_in": "1 day", @@ -586,7 +586,7 @@ { "type": "COMESTIBLE", "id": "macaroni_helper", - "name": "hamburger helper", + "name": { "str": "hamburger helper" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "hobo helper" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "halfling helper" } }, @@ -613,7 +613,7 @@ { "type": "COMESTIBLE", "id": "ravioli", - "name": "ravioli", + "name": { "str": "ravioli" }, "weight": "170 g", "color": "light_red", "spoils_in": "2 days", @@ -728,7 +728,7 @@ { "type": "COMESTIBLE", "id": "can_chicken", - "name": "canned chicken", + "name": { "str": "canned chicken" }, "weight": "217 g", "color": "pink", "spoils_in": "1 day", @@ -788,7 +788,7 @@ { "type": "COMESTIBLE", "id": "can_chowder", - "name": "clam chowder", + "name": { "str": "clam chowder" }, "conditional_names": [ { "type": "COMPONENT_ID", "condition": "meat", "name": "meat chowder" }, { "type": "COMPONENT_ID", "condition": "mutant", "name": "monster chowder" } @@ -880,7 +880,7 @@ { "type": "COMESTIBLE", "id": "pie_meat", - "name": "meat pie", + "name": { "str": "meat pie" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "prick pie" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "talking animal pie" } }, @@ -908,7 +908,7 @@ { "type": "COMESTIBLE", "id": "pizza_meat", - "name": "meat pizza", + "name": { "str": "meat pizza" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "poser pizza" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "protesting pizza" } }, @@ -934,7 +934,7 @@ { "type": "COMESTIBLE", "id": "pizza_supreme", - "name": "supreme pizza", + "name": { "str": "supreme pizza" }, "copy-from": "pizza_meat", "color": "light_red", "weight": "300 g", @@ -971,7 +971,7 @@ { "type": "COMESTIBLE", "id": "meat_canned", - "name": "canned meat", + "name": { "str": "canned meat" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "soylent slice" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "sapient slice" } }, @@ -990,7 +990,7 @@ { "type": "COMESTIBLE", "id": "meat_salted", - "name": "salted meat slice", + "name": { "str": "salted meat slice" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "salted simpleton slice" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "salted sapient slice" } }, @@ -1038,7 +1038,7 @@ { "type": "COMESTIBLE", "id": "lasagne", - "name": "lasagne", + "name": { "str": "lasagne" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "Luigi %s" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "Lab %s" } }, @@ -1079,7 +1079,7 @@ { "type": "COMESTIBLE", "id": "cheeseburger", - "name": "cheeseburger", + "name": { "str": "cheeseburger" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "chump %s" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "elf %s" } }, @@ -1105,7 +1105,7 @@ { "type": "COMESTIBLE", "id": "hamburger", - "name": "hamburger", + "name": { "str": "hamburger" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "bobburger" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "Moreauburger" } }, @@ -1130,7 +1130,7 @@ { "type": "COMESTIBLE", "id": "sloppyjoe", - "name": "sloppy joe", + "name": { "str": "sloppy joe" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str": "manwich", "str_pl": "manwiches" } }, { @@ -1159,7 +1159,7 @@ { "type": "COMESTIBLE", "id": "taco", - "name": "taco", + "name": { "str": "taco" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "tio %s" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "talking %s" } }, @@ -1184,7 +1184,7 @@ { "type": "COMESTIBLE", "id": "meat_pickled", - "name": "pickled meat", + "name": { "str": "pickled meat" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "pickled punk" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "pickled anthro" } }, @@ -1204,7 +1204,7 @@ { "type": "COMESTIBLE", "id": "dry_meat", - "name": "dehydrated meat", + "name": { "str": "dehydrated meat" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "%s, human" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "%s, demihuman" } }, @@ -1226,7 +1226,7 @@ { "type": "COMESTIBLE", "id": "rehydrated_meat", - "name": "rehydrated meat", + "name": { "str": "rehydrated meat" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "%s, human" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "%s, demihuman" } }, @@ -1325,7 +1325,7 @@ { "type": "COMESTIBLE", "id": "dry_meat_tainted", - "name": "dehydrated tainted meat", + "name": { "str": "dehydrated tainted meat" }, "copy-from": "meat_tainted", "weight": "85 g", "color": "red", @@ -1343,7 +1343,7 @@ { "type": "COMESTIBLE", "id": "pelmeni", - "name": "pelmeni", + "name": { "str": "pelmeni" }, "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": { "str_sp": "perilous %s" } } ], "weight": "151 g", "color": "light_red", @@ -1365,7 +1365,7 @@ { "type": "COMESTIBLE", "id": "homemade_burrito", - "name": "homemade burrito", + "name": { "str": "homemade burrito" }, "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": "bone-chilling burrito" } ], "weight": "142 g", "color": "brown", diff --git a/data/json/items/comestibles/med.json b/data/json/items/comestibles/med.json index 97c087be766b6..f9357cc7d9dbc 100644 --- a/data/json/items/comestibles/med.json +++ b/data/json/items/comestibles/med.json @@ -3,7 +3,7 @@ "id": "melatonin_tablet", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "melatonin tablet", + "name": { "str": "melatonin tablet" }, "description": "Over-the-counter melatonin supplements, commonly prescribed to treat sleep deprivation and to mitigate its effects. One tablet a day combined with a good night's sleep will help you recover faster.", "weight": "1 g", "volume": "250 ml", @@ -175,7 +175,7 @@ { "id": "bandages_makeshift", "type": "COMESTIBLE", - "name": "makeshift bandage", + "name": { "str": "makeshift bandage" }, "copy-from": "bandages", "description": "Simple cloth bandages. Better than nothing.", "price_postapoc": 100, @@ -225,7 +225,7 @@ "id": "caff_gum", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "caffeinated chewing gum", + "name": { "str": "caffeinated chewing gum" }, "description": "Sugar-free chewing gum with added caffeine, it's a nice pick-me-up.", "category": "drugs", "weight": "3 g", @@ -245,7 +245,7 @@ "id": "caffeine", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "caffeine pill", + "name": { "str": "caffeine pill" }, "description": "No-doz brand caffeine pills, maximum strength. Useful in pulling an all-nighter, each pill is equivalent to a strong cup of coffee.", "weight": "100 mg", "volume": "250 ml", @@ -266,7 +266,7 @@ "id": "chaw", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "chewing tobacco", + "name": { "str": "chewing tobacco" }, "description": "Mint flavored chewing tobacco. While still absolutely terrible for your health, it was once a favorite amongst baseball players, cowboys, and other macho types.", "weight": "4 g", "volume": "250 ml", @@ -308,7 +308,7 @@ "id": "cig", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "cigarette", + "name": { "str": "cigarette" }, "description": "A mixture of dried tobacco leaf, pesticides, and chemical additives, rolled into a filtered paper tube. Stimulates mental acuity and reduces appetite. Highly addictive and hazardous to health.", "weight": "1 g", "volume": "250 ml", @@ -331,7 +331,7 @@ "id": "cigar", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "cigar", + "name": { "str": "cigar" }, "description": "Rolled, cured tobacco leaf, addictive and hazardous to health.\nA gentleman's vice, cigars set the civil man apart from the savage.", "weight": "9 g", "volume": "250 ml", @@ -352,7 +352,7 @@ "id": "chloroform_rag", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "chloroform soaked rag", + "name": { "str": "chloroform soaked rag" }, "description": "A debug item that lets you put NPCs (or yourself) to sleep.", "weight": "240 g", "volume": "250 ml", @@ -416,7 +416,7 @@ { "type": "COMESTIBLE", "id": "cola_meth", - "name": "methacola", + "name": { "str": "methacola" }, "category": "drugs", "weight": "61 g", "color": "brown", @@ -549,7 +549,7 @@ { "id": "disinfectant_makeshift", "type": "COMESTIBLE", - "name": "makeshift antiseptic", + "name": { "str": "makeshift antiseptic" }, "price_postapoc": 250, "copy-from": "disinfectant", "description": "Makeshift antiseptic made from ethanol. Can be used to disinfect a wound.", @@ -971,7 +971,7 @@ "id": "ecig", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "electronic cigarette", + "name": { "str": "electronic cigarette" }, "description": "This battery-operated device vaporizes a liquid that contains flavorings and nicotine. A less harmful alternative to traditional cigarettes, but it's still addictive. It can't be reused once it's empty.", "weight": "1 g", "volume": "250 ml", @@ -1008,7 +1008,7 @@ "id": "flu_shot", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "flu shot", + "name": { "str": "flu shot" }, "description": "Pharmaceutical flu shot designed for mass vaccinations, still in the packaging. Purported to provide immunity to influenza, for the flu season for which it was developed.", "weight": "12 g", "volume": "10ml", @@ -1044,7 +1044,7 @@ "id": "handrolled_cig", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "hand-rolled cigarette", + "name": { "str": "hand-rolled cigarette" }, "description": "A roll-your-own made from tobacco and rolling paper. Stimulates mental acuity and reduces appetite. Despite being hand crafted, it's still highly addictive and hazardous to health.", "weight": "1 g", "volume": "250 ml", @@ -1099,7 +1099,7 @@ "id": "iodine", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "potassium iodide tablet", + "name": { "str": "potassium iodide tablet" }, "description": "Potassium iodide tablets. If taken prior to exposure, they help to mitigate injury caused by radiation absorption.", "weight": "1 g", "volume": "250 ml", @@ -1119,7 +1119,7 @@ "id": "joint", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "joint", + "name": { "str": "joint" }, "description": "Marijuana, cannabis, pot. Whatever you want to call it, it's rolled up in a piece of paper and ready for smokin'.", "weight": "1 g", "volume": "250 ml", @@ -1140,7 +1140,7 @@ "id": "lsd", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "pink tab", + "name": { "str": "pink tab" }, "description": "Tiny pink tabs resembling postage stamps, already dosed with some sort of drug. Really only useful for entertainment. Will cause hallucinations.", "weight": "1 g", "volume": "250 ml", @@ -1163,7 +1163,7 @@ "id": "medical_gauze", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "medical gauze", + "name": { "str": "medical gauze" }, "description": "This is decent sized piece of cotton, sterilized and sealed. It's designed for medical purposes.", "weight": "90 g", "volume": "200 ml", @@ -1204,7 +1204,7 @@ "id": "morphine", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "morphine", + "name": { "str": "morphine" }, "description": "A very strong semi-synthetic narcotic used to treat intense pain in hospital settings. This injectable drug is very addictive.", "weight": "1 g", "volume": "250 ml", @@ -1232,7 +1232,7 @@ "id": "mugwort_oil", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "mugwort oil", + "name": { "str": "mugwort oil" }, "description": "Some essential oil made from mugwort, which may kill parasites when ingested. Consume it with water!", "weight": "40 g", "volume": "250 ml", @@ -1252,7 +1252,7 @@ "id": "nic_gum", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "nicotine gum", + "name": { "str": "nicotine gum" }, "description": "Mint flavored sugar-free nicotine chewing gum. For smokers who desire to quit.", "weight": "3 g", "volume": "250 ml", @@ -1293,7 +1293,7 @@ "id": "oxycodone", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "oxycodone", + "name": { "str": "oxycodone" }, "description": "A strong semi-synthetic narcotic used in the treatment of intense pain. Highly addictive.", "weight": "1 g", "volume": "250 ml", @@ -1342,7 +1342,7 @@ "id": "poppy_pain", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "poppy painkiller", + "name": { "str": "poppy painkiller" }, "description": "Potent opioid palliative produced by the refining of the mutated poppy. Notably devoid of euphoric or sedative effects, as an opiate it may still be addictive.", "weight": "1 g", "volume": "250 ml", @@ -1366,7 +1366,7 @@ "id": "poppy_sleep", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "poppy sleep", + "name": { "str": "poppy sleep" }, "description": "A potent sleep aid extracted from mutated poppy seeds. Effective, but as an opiate, it may be addictive.", "weight": "1 g", "volume": "250 ml", @@ -1491,7 +1491,7 @@ "id": "saline", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "saline solution", + "name": { "str": "saline solution" }, "description": "A solution of sterilized water and salt for intravenous infusion or washing contaminants from one's eyes.", "weight": "51 g", "volume": "250 ml", @@ -1527,7 +1527,7 @@ "id": "thyme_oil", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "thyme oil", + "name": { "str": "thyme oil" }, "description": "Some essential oil made from thyme, which can act as a mildly irritating antiseptic.", "weight": "40 g", "volume": "250 ml", @@ -1545,7 +1545,7 @@ "id": "tobacco", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "rolling tobacco", + "name": { "str": "rolling tobacco" }, "description": "Loose, fine-cut tobacco leaves. Popular in Europe and among hipsters. Highly addictive and hazardous to health.\nCan either be rolled into a cigarette with some rolling papers or smoked through a pipe.", "weight": "1 g", "volume": "250 ml", @@ -1577,7 +1577,7 @@ "id": "tramadol", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "tramadol", + "name": { "str": "tramadol" }, "description": "A painkiller used to manage moderate pain. The effects last for several hours, but are relatively subdued for an opioid.", "weight": "1 g", "volume": "250 ml", @@ -1601,7 +1601,7 @@ "id": "vaccine_shot", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "gamma globulin shot", + "name": { "str": "gamma globulin shot" }, "description": "This immunoglobulin booster contains concentrated antibodies prepared for intravenous injection to temporarily strengthen the immune system. It is still in its original packaging.", "weight": "12 g", "volume": "10ml", @@ -1617,7 +1617,7 @@ "id": "vitamins", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "multivitamin", + "name": { "str": "multivitamin" }, "description": "Essential dietary nutrients conveniently packaged in pill form. An option of last resort when a balanced diet is not possible. Excess use can cause hypervitaminosis.", "weight": "1 g", "volume": "100 ml", @@ -1638,7 +1638,7 @@ "id": "calcium_tablet", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "calcium tablet", + "name": { "str": "calcium tablet" }, "description": "White calcium tablets. Widely used by elderly people with osteoporosis as a method to supplement calcium before the apocalypse.", "weight": "1 g", "volume": "100 ml", @@ -1655,7 +1655,7 @@ "id": "bonemeal_tablet", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "bone meal tablet", + "name": { "str": "bone meal tablet" }, "description": "Homemade calcium supplement made out of bone meal. Tastes horrible and is hard to swallow but it does its job.", "weight": "2 g", "volume": "500 ml", @@ -1674,7 +1674,7 @@ "id": "flavored_bonemeal_tablet", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "flavored bone meal tablet", + "name": { "str": "flavored bone meal tablet" }, "description": "Homemade calcium supplement made out of bone meal. Due to some sweetness mixed in to counteract the powdery texture and the taste of ash, it's almost as palatable as the pre-Cataclysm tablets.", "weight": "2 g", "volume": "500 ml", @@ -1693,7 +1693,7 @@ "id": "gummy_vitamins", "copy-from": "vitamins", "type": "COMESTIBLE", - "name": "gummy vitamin", + "name": { "str": "gummy vitamin" }, "description": "Essential dietary nutrients conveniently packaged in a fruit-flavored chewy candy form. An option of last resort when a balanced diet is not possible. Excess use can cause hypervitaminosis.", "price_postapoc": 1000, "fun": 4, @@ -1705,7 +1705,7 @@ "id": "homeopathic_pills", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "homeopathic pill", + "name": { "str": "homeopathic pill" }, "description": "Some homeopathic pills, prepared through the repeated dilution of an active ingredient with water. The label purports that these pills are able to maintain general wellness.", "weight": "1 g", "volume": "100 ml", @@ -1748,7 +1748,7 @@ "id": "inj_vitb", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "injectable vitamin B", + "name": { "str": "injectable vitamin B" }, "description": "Small vials of pale yellow liquid containing soluble vitamin B for injection.", "weight": "40 g", "volume": "250 ml", @@ -1770,7 +1770,7 @@ "id": "inj_iron", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "injectable iron", + "name": { "str": "injectable iron" }, "description": "Small vials of dark yellow liquid containing soluble iron for injection.", "weight": "40 g", "volume": "250 ml", @@ -1912,7 +1912,7 @@ "id": "pepto", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "heartburn medicine", + "name": { "str": "heartburn medicine" }, "description": "Creamy pink heartburn syrup that soothes upset stomachs and quells vomitous urges.", "weight": "1 g", "volume": "250 ml", diff --git a/data/json/items/comestibles/mre.json b/data/json/items/comestibles/mre.json index da5299347a3d9..26a0f465316c0 100644 --- a/data/json/items/comestibles/mre.json +++ b/data/json/items/comestibles/mre.json @@ -267,7 +267,7 @@ "type": "COMESTIBLE", "id": "mre_chilibeans", "copy-from": "mre_entree", - "name": "chili & beans entree", + "name": { "str": "chili & beans entree" }, "description": "The chili & beans entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "veggy", "bean" ], "fun": -2 @@ -285,7 +285,7 @@ "type": "COMESTIBLE", "id": "mre_chickennoodle", "copy-from": "mre_entree", - "name": "chicken noodle entree", + "name": { "str": "chicken noodle entree" }, "description": "The chicken noodle entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "veggy", "wheat" ], "fun": 1 @@ -294,7 +294,7 @@ "type": "COMESTIBLE", "id": "mre_spaghetti", "copy-from": "mre_entree", - "name": "spaghetti entree", + "name": { "str": "spaghetti entree" }, "description": "The spaghetti entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "wheat" ], "fun": 0 @@ -303,7 +303,7 @@ "type": "COMESTIBLE", "id": "mre_chicken", "copy-from": "mre_entree", - "name": "chicken chunks entree", + "name": { "str": "chicken chunks entree" }, "description": "The chicken chunks entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh" ] }, @@ -329,7 +329,7 @@ "type": "COMESTIBLE", "id": "mre_meatball", "copy-from": "mre_entree", - "name": "meatballs & marinara entree", + "name": { "str": "meatballs & marinara entree" }, "description": "The meatballs & marinara entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "tomato" ], "fun": 0 @@ -347,7 +347,7 @@ "type": "COMESTIBLE", "id": "mre_chilimac", "copy-from": "mre_entree", - "name": "chili & macaroni entree", + "name": { "str": "chili & macaroni entree" }, "description": "The chili & macaroni entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "wheat", "veggy" ], "fun": 1 @@ -356,7 +356,7 @@ "type": "COMESTIBLE", "id": "mre_veggy", "copy-from": "mre_entree", - "name": "vegetarian taco entree", + "name": { "str": "vegetarian taco entree" }, "description": "The vegetarian taco entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "veggy", "tomato" ], "fun": -2 @@ -365,7 +365,7 @@ "type": "COMESTIBLE", "id": "mre_macaronimarinara", "copy-from": "mre_entree", - "name": "macaroni & marinara entree", + "name": { "str": "macaroni & marinara entree" }, "description": "The macaroni & marinara entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "tomato", "veggy" ], "fun": 0 @@ -374,7 +374,7 @@ "type": "COMESTIBLE", "id": "mre_sfettuccine", "copy-from": "mre_entree", - "name": "spinach fettuccine entree", + "name": { "str": "spinach fettuccine entree" }, "description": "The creamy spinach fettuccine entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "veggy", "milk" ], "fun": -2 @@ -383,7 +383,7 @@ "type": "COMESTIBLE", "id": "mre_ratatouille", "copy-from": "mre_entree", - "name": "ratatouille entree", + "name": { "str": "ratatouille entree" }, "description": "The ratatouille entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "veggy", "tomato", "wheat" ], "fun": 0 @@ -392,7 +392,7 @@ "type": "COMESTIBLE", "id": "mre_cheesetort", "copy-from": "mre_entree", - "name": "cheese tortellini entree", + "name": { "str": "cheese tortellini entree" }, "description": "The cheese tortellini entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "tomato", "veggy", "milk" ] }, @@ -400,7 +400,7 @@ "type": "COMESTIBLE", "id": "mre_mushroomfettuccine", "copy-from": "mre_entree", - "name": "mushroom fettuccine entree", + "name": { "str": "mushroom fettuccine entree" }, "description": "The mushroom fettuccine entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "mushroom", "veggy", "wheat" ] }, @@ -417,7 +417,7 @@ "type": "COMESTIBLE", "id": "mre_chickenburritobowl", "copy-from": "mre_entree", - "name": "chicken burrito bowl entree", + "name": { "str": "chicken burrito bowl entree" }, "description": "The chicken burrito bowl entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "veggy", "bean" ], "fun": 0 @@ -426,7 +426,7 @@ "type": "COMESTIBLE", "id": "mre_maplesausage", "copy-from": "mre_entree", - "name": "maple sausage entree", + "name": { "str": "maple sausage entree" }, "description": "The maple sausage entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "junk" ], "fun": 1 @@ -435,7 +435,7 @@ "type": "COMESTIBLE", "id": "mre_ravioli", "copy-from": "mre_entree", - "name": "ravioli entree", + "name": { "str": "ravioli entree" }, "description": "The ravioli entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "wheat" ], "fun": 0 @@ -444,7 +444,7 @@ "type": "COMESTIBLE", "id": "mre_pepperjackbeef", "copy-from": "mre_entree", - "name": "pepper jack beef entree", + "name": { "str": "pepper jack beef entree" }, "description": "The pepper jack beef entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "milk" ] }, @@ -452,7 +452,7 @@ "type": "COMESTIBLE", "id": "mre_hashbrownbacon", "copy-from": "mre_entree", - "name": "hash browns & bacon entree", + "name": { "str": "hash browns & bacon entree" }, "description": "The hash browns & bacon entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "veggy" ], "fun": 2 @@ -461,7 +461,7 @@ "type": "COMESTIBLE", "id": "mre_lemontuna", "copy-from": "mre_entree", - "name": "lemon pepper tuna entree", + "name": { "str": "lemon pepper tuna entree" }, "description": "The lemon pepper tuna entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh" ], "fun": 2 @@ -479,7 +479,7 @@ "type": "COMESTIBLE", "id": "mre_chickenpesto", "copy-from": "mre_entree", - "name": "chicken pesto & pasta entree", + "name": { "str": "chicken pesto & pasta entree" }, "description": "The chicken pesto & pasta entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "wheat", "veggy" ], "fun": 0 @@ -488,7 +488,7 @@ "type": "COMESTIBLE", "id": "mre_southwestbeef", "copy-from": "mre_entree", - "name": "southwest beef & beans entree", + "name": { "str": "southwest beef & beans entree" }, "description": "The southwest beef & beans entree from an MRE. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "material": [ "flesh", "bean" ], "fun": 2 @@ -497,7 +497,7 @@ "type": "COMESTIBLE", "id": "mre_hotdog", "copy-from": "mre_entree", - "name": "frankfurters & beans entree", + "name": { "str": "frankfurters & beans entree" }, "description": "The dreaded four fingers of death. It seems to be several decades old. Sterilized using radiation, so it's safe to eat. Exposed to the atmosphere, it has started to go bad.", "price": 850, "material": [ "flesh", "junk", "bean" ], diff --git a/data/json/items/comestibles/mushroom.json b/data/json/items/comestibles/mushroom.json index 6d483228e4597..3035fd161e68c 100644 --- a/data/json/items/comestibles/mushroom.json +++ b/data/json/items/comestibles/mushroom.json @@ -2,7 +2,7 @@ { "type": "COMESTIBLE", "id": "mushroom_cooked", - "name": "cooked mushroom", + "name": { "str": "cooked mushroom" }, "copy-from": "mushroom", "spoils_in": "1 day", "description": "A tasty cooked wild mushroom.", @@ -15,7 +15,7 @@ { "type": "COMESTIBLE", "id": "mushroom_morel", - "name": "morel mushroom", + "name": { "str": "morel mushroom" }, "weight": "78 g", "color": "brown", "spoils_in": "2 days", @@ -37,7 +37,7 @@ { "type": "COMESTIBLE", "id": "morel_cooked", - "name": "cooked morel mushroom", + "name": { "str": "cooked morel mushroom" }, "copy-from": "mushroom_morel", "use_action": [ ], "spoils_in": "1 day", @@ -51,7 +51,7 @@ { "type": "COMESTIBLE", "id": "morel_fried", - "name": "fried morel mushroom", + "name": { "str": "fried morel mushroom" }, "copy-from": "mushroom_morel", "use_action": [ ], "spoils_in": "1 day 12 hours", @@ -66,7 +66,7 @@ { "type": "COMESTIBLE", "id": "dry_mushroom", - "name": "dried mushroom", + "name": { "str": "dried mushroom" }, "weight": "7 g", "color": "brown", "spoils_in": "360 days", @@ -87,7 +87,7 @@ { "type": "COMESTIBLE", "id": "mushroom", - "name": "mushroom", + "name": { "str": "mushroom" }, "weight": "69 g", "color": "brown", "spoils_in": "2 days", diff --git a/data/json/items/comestibles/mutagen.json b/data/json/items/comestibles/mutagen.json index a757cc4867ae0..c61ea57a91b56 100644 --- a/data/json/items/comestibles/mutagen.json +++ b/data/json/items/comestibles/mutagen.json @@ -47,7 +47,7 @@ "id": "iv_mutagen", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "mutagenic serum", + "name": { "str": "mutagenic serum" }, "healthy": -10, "stim": -10, "addiction_potential": 12, @@ -86,7 +86,7 @@ "id": "iv_mutagen_cattle", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "cattle serum", + "name": { "str": "cattle serum" }, "description": "A super-concentrated mutagen the color of grass. You need a syringe to inject it… if you really want to?", "color": "light_green", "use_action": { "type": "mutagen_iv", "mutation_category": "CATTLE" } @@ -95,7 +95,7 @@ "id": "iv_mutagen_cephalopod", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "cephalopod serum", + "name": { "str": "cephalopod serum" }, "description": "A super-concentrated mutagen as black as ink. You need a syringe to inject it… if you really want to?", "color": "dark_gray", "use_action": { "type": "mutagen_iv", "mutation_category": "CEPHALOPOD" } @@ -104,7 +104,7 @@ "id": "iv_mutagen_chimera", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "chimera serum", + "name": { "str": "chimera serum" }, "description": "A super-concentrated mutagen that churns with iridescence. You need a syringe to inject it… if you really want to?", "price": 400000, "color": "red", @@ -117,7 +117,7 @@ "id": "iv_mutagen_elfa", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "elf-a serum", + "name": { "str": "elf-a serum" }, "description": "A super-concentrated mutagen that's a striking sylvan green. You need a syringe to inject it… if you really want to?", "price": 400000, "color": "light_green", @@ -127,7 +127,7 @@ "id": "iv_mutagen_feline", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "feline serum", + "name": { "str": "feline serum" }, "description": "A super-concentrated mutagen, yellow and highly reflective. You need a syringe to inject it… if you really want to?", "color": "yellow", "use_action": { "type": "mutagen_iv", "mutation_category": "FELINE" } @@ -136,7 +136,7 @@ "id": "iv_mutagen_fish", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "fish serum", + "name": { "str": "fish serum" }, "description": "A super-concentrated mutagen the color of the ocean, with white foam at the top. You need a syringe to inject it… if you really want to?", "color": "light_blue", "use_action": { "type": "mutagen_iv", "mutation_category": "FISH" } @@ -145,7 +145,7 @@ "id": "iv_mutagen_insect", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "insect serum", + "name": { "str": "insect serum" }, "description": "A super-concentrated mutagen that's a beautiful amber color. You need a syringe to inject it… if you really want to?", "color": "yellow", "use_action": { "type": "mutagen_iv", "mutation_category": "INSECT" } @@ -154,7 +154,7 @@ "id": "iv_mutagen_lizard", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "lizard serum", + "name": { "str": "lizard serum" }, "description": "A super-concentrated mutagen that shifts between various shades of green. You need a syringe to inject it… if you really want to?", "color": "light_green", "use_action": { "type": "mutagen_iv", "mutation_category": "LIZARD" } @@ -163,7 +163,7 @@ "id": "iv_mutagen_lupine", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "lupine serum", + "name": { "str": "lupine serum" }, "description": "A super-concentrated mutagen as white as a full moon. You need a syringe to inject it… if you really want to?", "color": "white", "use_action": { "type": "mutagen_iv", "mutation_category": "LUPINE" } @@ -172,7 +172,7 @@ "id": "iv_mutagen_medical", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "medical serum", + "name": { "str": "medical serum" }, "description": "A super-concentrated mutagen that looks like a mixture of bodily fluids. You need a syringe to inject it… if you really want to?", "price": 300000, "color": "light_red", @@ -183,7 +183,7 @@ "id": "iv_mutagen_plant", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "plant serum", + "name": { "str": "plant serum" }, "description": "A super-concentrated mutagen that looks like pureed spinach. You need a syringe to inject it… if you really want to?", "color": "green", "use_action": { "type": "mutagen_iv", "mutation_category": "PLANT" } @@ -192,7 +192,7 @@ "id": "iv_mutagen_raptor", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "raptor serum", + "name": { "str": "raptor serum" }, "description": "A super-concentrated mutagen that seems to shift slightly whenever you look at it. You need a syringe to inject it… if you really want to?", "price": 400000, "color": "green", @@ -202,7 +202,7 @@ "id": "iv_mutagen_rat", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "rat serum", + "name": { "str": "rat serum" }, "description": "A super-concentrated mutagen that's a rather unappealing beige. You need a syringe to inject it… if you really want to?", "color": "brown", "use_action": { "type": "mutagen_iv", "mutation_category": "RAT" } @@ -211,7 +211,7 @@ "id": "iv_mutagen_slime", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "slime serum", + "name": { "str": "slime serum" }, "description": "A super-concentrated mutagen that looks very much like the black ooze in the zombies' eyes. You need a syringe to inject it… if you really want to?", "color": "dark_gray", "use_action": { "type": "mutagen_iv", "mutation_category": "SLIME" } @@ -220,7 +220,7 @@ "id": "iv_mutagen_spider", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "spider serum", + "name": { "str": "spider serum" }, "description": "A super-concentrated mutagen with pale filaments suspended in it. You need a syringe to inject it… if you really want to?", "color": "light_gray", "use_action": { "type": "mutagen_iv", "mutation_category": "SPIDER" } @@ -229,7 +229,7 @@ "id": "iv_mutagen_troglobite", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "troglobite serum", + "name": { "str": "troglobite serum" }, "description": "A super-concentrated mutagen that seems to recoil from the light. You need a syringe to inject it… if you really want to?", "color": "dark_gray", "use_action": { "type": "mutagen_iv", "mutation_category": "TROGLOBITE" } @@ -238,7 +238,7 @@ "id": "iv_mutagen_ursine", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "ursine serum", + "name": { "str": "ursine serum" }, "description": "A super-concentrated mutagen that's the color of honey, and is just as thick. You need a syringe to inject it… if you really want to?", "color": "yellow", "use_action": { "type": "mutagen_iv", "mutation_category": "URSINE" } @@ -247,7 +247,7 @@ "id": "iv_mutagen_mouse", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "mouse serum", + "name": { "str": "mouse serum" }, "description": "A super-concentrated mutagen resembling liquefied metal. You need a syringe to inject it… if you really want to?", "color": "light_gray", "use_action": { "type": "mutagen_iv", "mutation_category": "MOUSE" } @@ -256,7 +256,7 @@ "id": "mutagen", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "mutagen", + "name": { "str": "mutagen" }, "addiction_potential": 6, "use_action": { "type": "mutagen", "is_strong": true } }, @@ -264,7 +264,7 @@ "id": "mutagen_jabberblood", "copy-from": "mutagen", "type": "COMESTIBLE", - "name": "congealed blood", + "name": { "str": "congealed blood" }, "description": "A thick, soupy red liquid. It looks and smells disgusting, and seems to bubble with an intelligence of its own…", "color": "red", "addiction_potential": 0, @@ -300,21 +300,21 @@ "id": "mutagen_cattle", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "cattle mutagen", + "name": { "str": "cattle mutagen" }, "use_action": { "type": "mutagen", "mutation_category": "CATTLE" } }, { "id": "mutagen_cephalopod", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "cephalopod mutagen", + "name": { "str": "cephalopod mutagen" }, "use_action": { "type": "mutagen", "mutation_category": "CEPHALOPOD" } }, { "id": "mutagen_chimera", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "chimera mutagen", + "name": { "str": "chimera mutagen" }, "description": "An extremely rare mutagen cocktail.", "price": 200000, "use_action": { "type": "mutagen", "mutation_category": "CHIMERA" } @@ -323,7 +323,7 @@ "id": "mutagen_elfa", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "elf-a mutagen", + "name": { "str": "elf-a mutagen" }, "description": "An extremely rare mutagen cocktail.", "price": 200000, "use_action": { "type": "mutagen", "mutation_category": "ELFA" } @@ -332,42 +332,42 @@ "id": "mutagen_feline", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "feline mutagen", + "name": { "str": "feline mutagen" }, "use_action": { "type": "mutagen", "mutation_category": "FELINE" } }, { "id": "mutagen_fish", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "fish mutagen", + "name": { "str": "fish mutagen" }, "use_action": { "type": "mutagen", "mutation_category": "FISH" } }, { "id": "mutagen_insect", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "insect mutagen", + "name": { "str": "insect mutagen" }, "use_action": { "type": "mutagen", "mutation_category": "INSECT" } }, { "id": "mutagen_lizard", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "lizard mutagen", + "name": { "str": "lizard mutagen" }, "use_action": { "type": "mutagen", "mutation_category": "LIZARD" } }, { "id": "mutagen_lupine", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "lupine mutagen", + "name": { "str": "lupine mutagen" }, "use_action": { "type": "mutagen", "mutation_category": "LUPINE" } }, { "id": "mutagen_medical", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "medical mutagen", + "name": { "str": "medical mutagen" }, "price": 150000, "//": "*May* have been considered for commercial trading.", "use_action": { "type": "mutagen", "mutation_category": "MEDICAL" } @@ -376,14 +376,14 @@ "id": "mutagen_plant", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "plant mutagen", + "name": { "str": "plant mutagen" }, "use_action": { "type": "mutagen", "mutation_category": "PLANT" } }, { "id": "mutagen_raptor", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "raptor mutagen", + "name": { "str": "raptor mutagen" }, "description": "An extremely rare mutagen cocktail.", "price": 200000, "use_action": { "type": "mutagen", "mutation_category": "RAPTOR" } @@ -392,49 +392,49 @@ "id": "mutagen_rat", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "rat mutagen", + "name": { "str": "rat mutagen" }, "use_action": { "type": "mutagen", "mutation_category": "RAT" } }, { "id": "mutagen_slime", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "slime mutagen", + "name": { "str": "slime mutagen" }, "use_action": { "type": "mutagen", "mutation_category": "SLIME" } }, { "id": "mutagen_spider", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "spider mutagen", + "name": { "str": "spider mutagen" }, "use_action": { "type": "mutagen", "mutation_category": "SPIDER" } }, { "id": "mutagen_troglobite", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "troglobite mutagen", + "name": { "str": "troglobite mutagen" }, "use_action": { "type": "mutagen", "mutation_category": "TROGLOBITE" } }, { "id": "mutagen_ursine", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "ursine mutagen", + "name": { "str": "ursine mutagen" }, "use_action": { "type": "mutagen", "mutation_category": "URSINE" } }, { "id": "mutagen_mouse", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "mouse mutagen", + "name": { "str": "mouse mutagen" }, "use_action": { "type": "mutagen", "mutation_category": "MOUSE" } }, { "id": "purifier", "copy-from": "mutagen_flavor", "type": "COMESTIBLE", - "name": "purifier", + "name": { "str": "purifier" }, "description": "A rare stem-cell treatment that causes mutations and other genetic defects to fade away.", "price": 600000, "price_postapoc": 500, @@ -448,7 +448,7 @@ "id": "iv_purifier", "copy-from": "iv_mutagen_flavor", "type": "COMESTIBLE", - "name": "purifier serum", + "name": { "str": "purifier serum" }, "description": "A super-concentrated stem cell treatment. You need a syringe to inject it.", "price": 900000, "price_postapoc": 1000, @@ -462,7 +462,7 @@ "type": "COMESTIBLE", "comestible_type": "MED", "category": "mutagen", - "name": "purifier smart shot", + "name": { "str": "purifier smart shot" }, "description": "An experimental stem cell treatment, offering limited control over which mutations are purified. The liquid sloshes strangely inside of this syringe.", "weight": "12 g", "volume": "10ml", @@ -522,7 +522,7 @@ "type": "COMESTIBLE", "id": "leg", "category": "other", - "name": "mutated leg", + "name": { "str": "mutated leg" }, "weight": "11071 g", "color": "brown", "spoils_in": "2 days", diff --git a/data/json/items/comestibles/nuts.json b/data/json/items/comestibles/nuts.json index 9bc604f032307..cc75f8256ba3e 100644 --- a/data/json/items/comestibles/nuts.json +++ b/data/json/items/comestibles/nuts.json @@ -409,7 +409,7 @@ { "type": "COMESTIBLE", "id": "hickory_nut_ambrosia", - "name": "hickory nut ambrosia", + "name": { "str": "hickory nut ambrosia" }, "weight": "254 g", "color": "brown", "spoils_in": "10 days 19 hours", @@ -436,7 +436,7 @@ "symbol": "~", "color": "brown", "spoils_in": "180 days", - "name": "peanut butter", + "name": { "str": "peanut butter" }, "description": "A brown goo that tastes very little like its namesake. It's not bad, but it'll stick to the roof of your mouth.", "price": 195, "price_postapoc": 1000, @@ -457,7 +457,7 @@ { "id": "peanutbutter_imitation", "type": "COMESTIBLE", - "name": "imitation peanutbutter", + "name": { "str": "imitation peanutbutter" }, "description": "A thick, nutty brown paste.", "copy-from": "peanutbutter" }, @@ -465,7 +465,7 @@ "id": "spread_peanutbutter", "type": "COMESTIBLE", "symbol": "%", - "name": "peanut butter spread", + "name": { "str": "peanut butter spread" }, "description": "Processed peanut butter spread..", "//TODO": "make a container called small sealed plastic tub", "container": "can_food", diff --git a/data/json/items/comestibles/offal_dishes.json b/data/json/items/comestibles/offal_dishes.json index 126d3057ee668..8c840812a0570 100644 --- a/data/json/items/comestibles/offal_dishes.json +++ b/data/json/items/comestibles/offal_dishes.json @@ -45,7 +45,7 @@ "id": "fried_livers", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "fried liver", + "name": { "str": "fried liver" }, "symbol": "%", "looks_like": "meat_cooked", "description": "Nothing tastier than something that's deep-fried!", @@ -68,7 +68,7 @@ "id": "humble_pie", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "humble pie", + "name": { "str": "humble pie" }, "symbol": "%", "looks_like": "pie_meat", "quench": 10, @@ -90,7 +90,7 @@ "id": "stewed_tripe", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "stewed tripe", + "name": { "str": "stewed tripe" }, "symbol": "%", "looks_like": "small_stomach_boiled", "quench": 2, @@ -111,7 +111,7 @@ "id": "fried_tripe", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "deep-fried tripe", + "name": { "str": "deep-fried tripe" }, "symbol": "%", "looks_like": "small_stomach_boiled", "quench": -4, @@ -152,7 +152,7 @@ "id": "fried_brain", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "fried brain", + "name": { "str": "fried brain" }, "symbol": "%", "looks_like": "offal_cooked", "quench": -2, @@ -174,7 +174,7 @@ "id": "deviled_kidney", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "deviled kidney", + "name": { "str": "deviled kidney" }, "symbol": "%", "looks_like": "offal_cooked", "quench": 1, @@ -196,7 +196,7 @@ "id": "grilled_sweetbread", "type": "COMESTIBLE", "copy-from": "sweetbread_cooked", - "name": "grilled sweetbread", + "name": { "str": "grilled sweetbread" }, "fun": 6, "description": "Not sweet, like the name would suggest, but delicious all the same!" }, @@ -204,7 +204,7 @@ "id": "canned_liver", "type": "COMESTIBLE", "copy-from": "liver_cooked", - "name": "canned liver", + "name": { "str": "canned liver" }, "description": "Livers preserved in a can. Chock-full of B vitamins!", "container": "can_food" }, @@ -212,7 +212,7 @@ "id": "lung_provence", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "lung provence", + "name": { "str": "lung provence" }, "symbol": "%", "looks_like": "offal_cooked", "quench": 3, @@ -233,7 +233,7 @@ "id": "tÖttchen", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "tÖttchen", + "name": { "str": "tÖttchen" }, "symbol": "%", "looks_like": "offal_cooked", "quench": 2, @@ -254,7 +254,7 @@ "id": "scrambledeggsandbrain", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "scrambled eggs and brain", + "name": { "str": "scrambled eggs and brain" }, "symbol": "%", "looks_like": "offal_cooked", "quench": 2, diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json index 2be0be56898b6..03a608d7a5027 100644 --- a/data/json/items/comestibles/other.json +++ b/data/json/items/comestibles/other.json @@ -2,7 +2,7 @@ { "type": "COMESTIBLE", "id": "testcomest", - "name": "diet pill", + "name": { "str": "diet pill" }, "weight": "100 g", "color": "red", "spoils_in": "4 days 4 hours", @@ -34,7 +34,7 @@ { "type": "COMESTIBLE", "id": "honeycomb", - "name": "honey comb", + "name": { "str": "honey comb" }, "weight": "150 g", "color": "yellow", "use_action": [ "HONEYCOMB" ], @@ -229,7 +229,7 @@ { "type": "COMESTIBLE", "id": "paper", - "name": "paper", + "name": { "str": "paper" }, "category": "spare_parts", "weight": "3 g", "color": "white", @@ -247,7 +247,7 @@ { "type": "COMESTIBLE", "id": "cardboard", - "name": "cardboard", + "name": { "str": "cardboard" }, "looks_like": "paper", "category": "spare_parts", "weight": "10 g", @@ -410,7 +410,7 @@ { "type": "COMESTIBLE", "id": "raw_edamame", - "name": "raw edamame", + "name": { "str": "raw edamame" }, "copy-from": "seed", "weight": "160 g", "symbol": ".", diff --git a/data/json/items/comestibles/protein.json b/data/json/items/comestibles/protein.json index 9293d47215911..77b5ce30483b0 100644 --- a/data/json/items/comestibles/protein.json +++ b/data/json/items/comestibles/protein.json @@ -3,7 +3,7 @@ "id": "protein_drink", "type": "COMESTIBLE", "comestible_type": "DRINK", - "name": "protein drink", + "name": { "str": "protein drink" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "soylent green drink" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "sapient green drink" } }, @@ -79,7 +79,7 @@ "id": "protein_shake", "copy-from": "protein_drink", "type": "COMESTIBLE", - "name": "protein shake", + "name": { "str": "protein shake" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "soylent green shake" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "sapient green shake" } }, @@ -99,7 +99,7 @@ "id": "protein_shake_fortified", "copy-from": "protein_shake", "type": "COMESTIBLE", - "name": "fortified protein shake", + "name": { "str": "fortified protein shake" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "fortified soylent green shake" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "fortified sapient green shake" } }, diff --git a/data/json/items/comestibles/raw_fruit.json b/data/json/items/comestibles/raw_fruit.json index 7996c2de0f73e..75fcf903f1494 100644 --- a/data/json/items/comestibles/raw_fruit.json +++ b/data/json/items/comestibles/raw_fruit.json @@ -45,7 +45,7 @@ { "type": "COMESTIBLE", "id": "orange", - "name": "orange", + "name": { "str": "orange" }, "weight": "140 g", "color": "light_red", "spoils_in": "21 days", @@ -67,7 +67,7 @@ { "type": "COMESTIBLE", "id": "lemon", - "name": "lemon", + "name": { "str": "lemon" }, "weight": "84 g", "color": "yellow", "spoils_in": "21 days", @@ -266,7 +266,7 @@ { "type": "COMESTIBLE", "id": "juice_pulp", - "name": "juice pulp", + "name": { "str": "juice pulp" }, "weight": "62 g", "color": "light_red", "spoils_in": "2 days 12 hours", @@ -288,7 +288,7 @@ { "type": "COMESTIBLE", "id": "pear", - "name": "pear", + "name": { "str": "pear" }, "weight": "148 g", "color": "yellow", "spoils_in": "4 days", @@ -310,7 +310,7 @@ { "type": "COMESTIBLE", "id": "grapefruit", - "name": "grapefruit", + "name": { "str": "grapefruit" }, "weight": "246 g", "color": "yellow", "spoils_in": 336, @@ -354,7 +354,7 @@ { "type": "COMESTIBLE", "id": "plums", - "name": "plum", + "name": { "str": "plum" }, "weight": "66 g", "color": "magenta", "spoils_in": "2 days 12 hours", @@ -398,7 +398,7 @@ { "type": "COMESTIBLE", "id": "pineapple", - "name": "pineapple", + "name": { "str": "pineapple" }, "weight": "174 g", "color": "brown", "spoils_in": "3 days", @@ -422,7 +422,7 @@ { "type": "COMESTIBLE", "id": "coconut", - "name": "coconut", + "name": { "str": "coconut" }, "weight": "84 g", "color": "brown", "spoils_in": "360 days", @@ -465,7 +465,7 @@ { "type": "COMESTIBLE", "id": "watermelon", - "name": "watermelon", + "name": { "str": "watermelon" }, "weight": "161 g", "color": "green", "spoils_in": "7 days 12 hours", @@ -490,7 +490,7 @@ { "type": "COMESTIBLE", "id": "melon", - "name": "melon", + "name": { "str": "melon" }, "//": "based on a canteloupe", "weight": "165 g", "color": "light_green", @@ -537,7 +537,7 @@ { "type": "COMESTIBLE", "id": "mango", - "name": "mango", + "name": { "str": "mango" }, "weight": "174 g", "color": "red", "spoils_in": "5 days", @@ -561,7 +561,7 @@ { "type": "COMESTIBLE", "id": "pomegranate", - "name": "pomegranate", + "name": { "str": "pomegranate" }, "weight": "184 g", "color": "red", "spoils_in": 336, @@ -584,7 +584,7 @@ { "type": "COMESTIBLE", "id": "papaya", - "name": "papaya", + "name": { "str": "papaya" }, "weight": "243 g", "color": "yellow", "spoils_in": "5 days", @@ -607,7 +607,7 @@ { "type": "COMESTIBLE", "id": "kiwi", - "name": "kiwi", + "name": { "str": "kiwi" }, "weight": "74 g", "color": "brown", "spoils_in": "7 days", @@ -652,7 +652,7 @@ { "type": "COMESTIBLE", "id": "cholla_bud", - "name": "cholla bud", + "name": { "str": "cholla bud" }, "weight": "92 g", "color": "red", "spoils_in": "6 days 16 hours", @@ -674,7 +674,7 @@ { "type": "COMESTIBLE", "id": "cactus_pad", - "name": "cactus pad", + "name": { "str": "cactus pad" }, "weight": "149 g", "color": "green", "spoils_in": "1 days", diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json index 033b45a8cab68..0d08b043f9971 100644 --- a/data/json/items/comestibles/raw_veggy.json +++ b/data/json/items/comestibles/raw_veggy.json @@ -83,7 +83,7 @@ { "type": "COMESTIBLE", "id": "cabbage", - "name": "cabbage", + "name": { "str": "cabbage" }, "weight": "139 g", "color": "white", "spoils_in": "10 days", @@ -250,7 +250,7 @@ { "type": "COMESTIBLE", "id": "chili_pepper", - "name": "chili pepper", + "name": { "str": "chili pepper" }, "weight": "53 g", "color": "red", "spoils_in": "30 days", @@ -271,7 +271,7 @@ { "type": "COMESTIBLE", "id": "cucumber", - "name": "cucumber", + "name": { "str": "cucumber" }, "weight": "330 g", "color": "green", "spoils_in": "6 days 6 hours", @@ -292,7 +292,7 @@ { "type": "COMESTIBLE", "id": "dahlia_root", - "name": "dahlia root", + "name": { "str": "dahlia root" }, "weight": "190 g", "color": "brown", "spoils_in": "30 days", @@ -365,7 +365,7 @@ { "type": "COMESTIBLE", "id": "dogbane", - "name": "dogbane", + "name": { "str": "dogbane" }, "description": "A stalk of dogbane. It has very fibrous stems and is mildly poisonous.", "comestible_type": "FOOD", "use_action": [ "BLECH" ], @@ -384,7 +384,7 @@ { "type": "COMESTIBLE", "id": "garlic", - "name": "garlic bulb", + "name": { "str": "garlic bulb" }, "weight": "18 g", "color": "white", "spoils_in": "360 days", @@ -445,7 +445,7 @@ { "type": "COMESTIBLE", "id": "lettuce", - "name": "lettuce", + "name": { "str": "lettuce" }, "weight": "38 g", "color": "light_green", "spoils_in": "10 days", @@ -466,7 +466,7 @@ { "type": "COMESTIBLE", "id": "mugwort", - "name": "mugwort", + "name": { "str": "mugwort" }, "description": "A stalk of mugwort. Smells wonderful.", "comestible_type": "FOOD", "spoils_in": "10 days", @@ -484,7 +484,7 @@ { "type": "COMESTIBLE", "id": "onion", - "name": "onion", + "name": { "str": "onion" }, "weight": "150 g", "color": "white", "spoils_in": "30 days", @@ -506,7 +506,7 @@ { "type": "COMESTIBLE", "id": "plant_sac", - "name": "fungal fluid sac", + "name": { "str": "fungal fluid sac" }, "weight": "278 g", "color": "light_green", "spoils_in": "3 days 8 hours", @@ -567,7 +567,7 @@ { "type": "COMESTIBLE", "id": "pumpkin", - "name": "pumpkin", + "name": { "str": "pumpkin" }, "weight": "123 g", "color": "light_red", "spoils_in": "60 days", @@ -655,7 +655,7 @@ { "type": "COMESTIBLE", "id": "rhubarb", - "name": "rhubarb", + "name": { "str": "rhubarb" }, "weight": "129 g", "color": "red", "spoils_in": "6 days 16 hours", @@ -676,7 +676,7 @@ { "type": "COMESTIBLE", "id": "sugar_beet", - "name": "sugar beet", + "name": { "str": "sugar beet" }, "weight": "143 g", "color": "brown", "spoils_in": "95 days", @@ -747,7 +747,7 @@ { "type": "COMESTIBLE", "id": "veggy", - "name": "plant marrow", + "name": { "str": "plant marrow" }, "weight": "119 g", "color": "green", "spoils_in": "3 days 8 hours", @@ -794,7 +794,7 @@ { "type": "COMESTIBLE", "id": "zucchini", - "name": "zucchini", + "name": { "str": "zucchini" }, "weight": "196 g", "color": "light_green", "spoils_in": "5 days", @@ -814,7 +814,7 @@ { "type": "COMESTIBLE", "id": "canola", - "name": "canola", + "name": { "str": "canola" }, "description": "A pretty stalk of canola. Its seeds can be pressed into oil.", "comestible_type": "FOOD", "calories": 9, diff --git a/data/json/items/comestibles/soup.json b/data/json/items/comestibles/soup.json index 0e3af642b7858..2d3b66a902d3d 100644 --- a/data/json/items/comestibles/soup.json +++ b/data/json/items/comestibles/soup.json @@ -2,7 +2,7 @@ { "type": "COMESTIBLE", "id": "broth", - "name": "broth", + "name": { "str": "broth" }, "weight": "253 g", "color": "yellow", "spoils_in": "6 days 16 hours", @@ -25,7 +25,7 @@ { "type": "COMESTIBLE", "id": "broth_bone", - "name": "bone broth", + "name": { "str": "bone broth" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "human %s" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "demihuman %s" } } @@ -53,7 +53,7 @@ { "type": "COMESTIBLE", "id": "soup_veggy", - "name": "vegetable soup", + "name": { "str": "vegetable soup" }, "weight": "254 g", "color": "red", "spoils_in": "5 days", @@ -77,7 +77,7 @@ { "type": "COMESTIBLE", "id": "soup_meat", - "name": "meat soup", + "name": { "str": "meat soup" }, "conditional_names": [ { "type": "FLAG", "condition": "CANNIBALISM", "name": { "str_sp": "sap soup" } }, { "type": "FLAG", "condition": "STRICT_HUMANITARIANISM", "name": { "str_sp": "goblin soup" } }, @@ -106,7 +106,7 @@ { "type": "COMESTIBLE", "id": "soup_fish", - "name": "fish soup", + "name": { "str": "fish soup" }, "weight": "265 g", "color": "light_gray", "spoils_in": "5 days", @@ -179,7 +179,7 @@ { "type": "COMESTIBLE", "id": "soup_woods", - "name": "woods soup", + "name": { "str": "woods soup" }, "conditional_names": [ { "type": "COMPONENT_ID", "condition": "mutant", "name": "Mirkwood soup" } ], "weight": "250 g", "color": "red", @@ -204,7 +204,7 @@ { "type": "COMESTIBLE", "id": "soup_chicken", - "name": "chicken noodle soup", + "name": { "str": "chicken noodle soup" }, "weight": "261 g", "color": "light_gray", "spoils_in": "5 days", @@ -229,7 +229,7 @@ { "type": "COMESTIBLE", "id": "soup_mushroom", - "name": "mushroom soup", + "name": { "str": "mushroom soup" }, "weight": "266 g", "color": "light_gray", "spoils_in": "5 days", @@ -253,7 +253,7 @@ { "type": "COMESTIBLE", "id": "soup_tomato", - "name": "tomato soup", + "name": { "str": "tomato soup" }, "weight": "257 g", "color": "red", "spoils_in": "6 days 16 hours", @@ -301,7 +301,7 @@ { "type": "COMESTIBLE", "id": "soup_cullenskink", - "name": "cullen skink", + "name": { "str": "cullen skink" }, "weight": "261 g", "color": "white", "spoils_in": "5 days", diff --git a/data/json/items/comestibles/spice.json b/data/json/items/comestibles/spice.json index 48d9b6c1e0e29..bfc6cd92eb589 100644 --- a/data/json/items/comestibles/spice.json +++ b/data/json/items/comestibles/spice.json @@ -148,7 +148,7 @@ { "type": "COMESTIBLE", "id": "thyme", - "name": "thyme", + "name": { "str": "thyme" }, "description": "A stalk of thyme. Smells delicious.", "comestible_type": "FOOD", "calories": 9, @@ -174,7 +174,7 @@ "id": "artificial_sweetener", "copy-from": "sugar", "type": "COMESTIBLE", - "name": "artificial sweetener", + "name": { "str": "artificial sweetener" }, "description": "Sweet, sweet sugar? No, it is bitter-sweet artificial sweetener. No calories, no worries.", "calories": 0 } diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json index 34600cce9bb14..29486eda7d4c9 100644 --- a/data/json/items/comestibles/veggy_dishes.json +++ b/data/json/items/comestibles/veggy_dishes.json @@ -132,7 +132,7 @@ { "type": "COMESTIBLE", "id": "veggy_cooked", - "name": "cooked plant marrow", + "name": { "str": "cooked plant marrow" }, "copy-from": "veggy", "spoils_in": "2 days 2 hours", "description": "A freshly cooked chunk of plant matter, tasty and nutritious.", @@ -154,7 +154,7 @@ { "type": "COMESTIBLE", "id": "veggy_aspic", - "name": "vegetable aspic", + "name": { "str": "vegetable aspic" }, "weight": "120 g", "color": "green", "spoils_in": "3 days 8 hours", @@ -436,7 +436,7 @@ { "type": "COMESTIBLE", "id": "cooked_pumpkin", - "name": "mashed pumpkin", + "name": { "str": "mashed pumpkin" }, "copy-from": "pumpkin", "color": "light_red", "spoils_in": "1 day 12 hours", @@ -453,7 +453,7 @@ { "type": "COMESTIBLE", "id": "pie_veggy", - "name": "vegetable pie", + "name": { "str": "vegetable pie" }, "weight": "240 g", "color": "brown", "spoils_in": "3 days", @@ -476,7 +476,7 @@ { "type": "COMESTIBLE", "id": "pizza_veggy", - "name": "vegetable pizza", + "name": { "str": "vegetable pizza" }, "weight": "230 g", "color": "light_green", "spoils_in": "2 days", @@ -538,7 +538,7 @@ { "type": "COMESTIBLE", "id": "veggy_salted", - "name": "salted veggy chunk", + "name": { "str": "salted veggy chunk" }, "weight": "192 g", "color": "green", "spoils_in": "3 days", @@ -579,7 +579,7 @@ { "type": "COMESTIBLE", "id": "pickle", - "name": "pickle", + "name": { "str": "pickle" }, "copy-from": "cucumber", "color": "green", "spoils_in": "30 days", @@ -628,7 +628,7 @@ { "type": "COMESTIBLE", "id": "dry_veggy", - "name": "dehydrated vegetable", + "name": { "str": "dehydrated vegetable" }, "copy-from": "veggy", "proportional": { "weight": 0.5 }, "color": "green", @@ -646,7 +646,7 @@ { "type": "COMESTIBLE", "id": "rehydrated_veggy", - "name": "rehydrated vegetable", + "name": { "str": "rehydrated vegetable" }, "copy-from": "veggy", "color": "light_green", "spoils_in": "1 day", @@ -659,7 +659,7 @@ { "type": "COMESTIBLE", "id": "veggy_salad", - "name": "vegetable salad", + "name": { "str": "vegetable salad" }, "weight": "227 g", "color": "green", "spoils_in": "5 days 20 hours", @@ -681,7 +681,7 @@ { "type": "COMESTIBLE", "id": "dried_salad", - "name": "dried salad", + "name": { "str": "dried salad" }, "copy-from": "veggy_salad", "weight": "150 g", "spoils_in": "360 days", @@ -698,7 +698,7 @@ { "type": "COMESTIBLE", "id": "insta_salad", - "name": "insta-salad", + "name": { "str": "insta-salad" }, "copy-from": "veggy_salad", "quench": 16, "description": "Dried salad with water added, not very tasty but still a decent substitution for real salad.", @@ -798,7 +798,7 @@ "type": "COMESTIBLE", "id": "dry_veggy_tainted", "category": "other", - "name": "dehydrated alien fungus chunk", + "name": { "str": "dehydrated alien fungus chunk" }, "copy-from": "dry_veggy", "looks_like": "dry_mushroom", "use_action": [ "POISON" ], @@ -831,7 +831,7 @@ { "type": "COMESTIBLE", "id": "nopalitos", - "name": "nopalito", + "name": { "str": "nopalito" }, "weight": "298 g", "color": "green", "spoils_in": "10 days", diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json index f9581676cb00e..db88bd2b7d909 100644 --- a/data/json/items/comestibles/wheat.json +++ b/data/json/items/comestibles/wheat.json @@ -310,7 +310,7 @@ { "type": "COMESTIBLE", "id": "waffles", - "name": "waffle", + "name": { "str": "waffle" }, "weight": "75 g", "color": "yellow", "spoils_in": "10 days", @@ -330,7 +330,7 @@ { "type": "COMESTIBLE", "id": "fruit_waffles", - "name": "fruit waffle", + "name": { "str": "fruit waffle" }, "weight": "156 g", "color": "yellow", "spoils_in": "10 days", @@ -351,7 +351,7 @@ { "type": "COMESTIBLE", "id": "crackers", - "name": "cracker", + "name": { "str": "cracker" }, "weight": "56 g", "color": "brown", "spoils_in": "90 days", @@ -387,7 +387,7 @@ { "type": "COMESTIBLE", "id": "pie", - "name": "fruit pie", + "name": { "str": "fruit pie" }, "weight": "125 g", "color": "brown", "spoils_in": "3 days", @@ -411,7 +411,7 @@ { "type": "COMESTIBLE", "id": "pizza_cheese", - "name": "cheese pizza", + "name": { "str": "cheese pizza" }, "weight": "170 g", "color": "yellow", "spoils_in": "2 days", @@ -457,7 +457,7 @@ { "type": "COMESTIBLE", "id": "pie_maple", - "name": "maple pie", + "name": { "str": "maple pie" }, "weight": "74 g", "color": "brown", "spoils_in": "3 days", @@ -501,7 +501,7 @@ { "type": "COMESTIBLE", "id": "cloutie_dumpling", - "name": "cloutie dumpling", + "name": { "str": "cloutie dumpling" }, "weight": "91 g", "color": "brown", "spoils_in": "2 days", @@ -522,7 +522,7 @@ { "type": "COMESTIBLE", "id": "brioche", - "name": "brioche", + "name": { "str": "brioche" }, "weight": "77 g", "color": "brown", "spoils_in": "10 days", @@ -546,7 +546,7 @@ "id": "sponge_cake", "type": "COMESTIBLE", "comestible_type": "FOOD", - "name": "sponge cake", + "name": { "str": "sponge cake" }, "description": "Plain, fluffy cake for the proletariat.", "container": "box_small", "weight": "68 g", @@ -566,7 +566,7 @@ { "id": "space_cake", "type": "COMESTIBLE", - "name": "space cake", + "name": { "str": "space cake" }, "copy-from": "sponge_cake", "price_postapoc": 500, "description": "This cake's destiny is to take you on a gnarly trip.", @@ -576,7 +576,7 @@ { "id": "brownie", "type": "COMESTIBLE", - "name": "brownie", + "name": { "str": "brownie" }, "copy-from": "sponge_cake", "description": "A rich chocolate brownie, just like how grandma used to bake them.", "price_postapoc": 400, diff --git a/data/json/items/corpses/dead_exodii.json b/data/json/items/corpses/dead_exodii.json index e9ab4538932a2..d55479b2a6322 100644 --- a/data/json/items/corpses/dead_exodii.json +++ b/data/json/items/corpses/dead_exodii.json @@ -4,7 +4,7 @@ "id": "broken_exodii_worker", "symbol": ",", "color": "light_gray", - "name": "broken exodii worker", + "name": { "str": "broken exodii worker" }, "category": "other", "description": "A broken exodii worker. It's possible it could be gutted for parts.", "price": 1000, @@ -21,7 +21,7 @@ "id": "broken_exodii_quad", "symbol": ",", "color": "light_gray", - "name": "broken exodii quadruped", + "name": { "str": "broken exodii quadruped" }, "category": "other", "description": "A broken exodii walker. Still looks intimidating despite being permanently inoperative, possibly due to the sheer size and mass. Could be gutted for parts.", "price": 1000, @@ -38,7 +38,7 @@ "id": "broken_exodii_turret", "symbol": ",", "color": "yellow", - "name": "broken exodii turret", + "name": { "str": "broken exodii turret" }, "category": "other", "description": "A broken exodii turret. Still looks intimidating despite being permanently inoperative, possibly due to the sheer size and mass. Could be gutted for parts.", "price": 1000, @@ -55,7 +55,7 @@ "id": "broken_exodii_sniper_drone", "symbol": ",", "color": "yellow", - "name": "broken exodii balloon-drone", + "name": { "str": "broken exodii balloon-drone" }, "category": "other", "description": "A broken balloon drone. The balloon has been shredded, but most of the chassis is still intact. Could be gutted for parts.", "price": 1000, diff --git a/data/json/items/generic.json b/data/json/items/generic.json index 9bf712018499c..ef4bdbb66833b 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -978,7 +978,7 @@ "id": "delay_fuze", "symbol": ",", "color": "light_gray", - "name": "delayed fuze", + "name": { "str": "delayed fuze" }, "category": "spare_parts", "description": "A complex mechanical fuze. It seems it can be used to detonate stable explosives after a short time by triggering it.", "price": 1000, @@ -992,7 +992,7 @@ "id": "impact_fuze", "symbol": ",", "color": "light_gray", - "name": "impact fuze", + "name": { "str": "impact fuze" }, "category": "spare_parts", "description": "A complex mechanical fuze. It seems it can be used to detonate stable explosives upon a solid impact.", "price": 1000, diff --git a/data/json/items/generic/bedding.json b/data/json/items/generic/bedding.json index 820f0ea90f726..449722edd4600 100644 --- a/data/json/items/generic/bedding.json +++ b/data/json/items/generic/bedding.json @@ -107,7 +107,7 @@ { "id": "quilt", "type": "ARMOR", - "name": "quilt", + "name": { "str": "quilt" }, "description": "A big, comfy quilt made of thick wool in a triangle pattern. Extremely cozy!", "weight": "1814 g", "volume": "5 L", @@ -129,7 +129,7 @@ "id": "quilt_patchwork", "type": "ARMOR", "copy-from": "quilt", - "name": "patchwork quilt", + "name": { "str": "patchwork quilt" }, "description": "A huge, patchwork wool quilt. Very, very warm.", "encumbrance": 50, "warmth": 70 diff --git a/data/json/items/generic/string.json b/data/json/items/generic/string.json index 124a2804bf1cb..e83a33ef09eb8 100644 --- a/data/json/items/generic/string.json +++ b/data/json/items/generic/string.json @@ -128,7 +128,7 @@ "id": "stick_fiber", "type": "COMESTIBLE", "category": "spare_parts", - "name": "fibrous stalk", + "name": { "str": "fibrous stalk" }, "symbol": "=", "material": [ "dry_plant" ], "description": "A rather green stick. Very fibrous.", diff --git a/data/json/items/gun/223.json b/data/json/items/gun/223.json index b4c0e5f3f6149..b4ba9a5c2aa08 100644 --- a/data/json/items/gun/223.json +++ b/data/json/items/gun/223.json @@ -207,7 +207,7 @@ "copy-from": "rifle_semi", "looks_like": "ar15", "type": "GUN", - "name": "FS2000", + "name": { "str": "FS2000" }, "description": "A sleek bullpup carbine designed by FN Herstal, complete with an integrated sight accessory rail. The forward ejecting action and ambidextrous controls make firing comfortable for both left and right-handed shooting. The whole rifle is well sealed from mud and dust for reliability, but this makes it incompatible with many aftermarket magazines.", "weight": "3319 g", "volume": "7986 ml", diff --git a/data/json/items/gun/flintlock.json b/data/json/items/gun/flintlock.json index 94f998e13baca..9dd5c71b5b305 100644 --- a/data/json/items/gun/flintlock.json +++ b/data/json/items/gun/flintlock.json @@ -117,7 +117,7 @@ "id": "longrifle_flintlock", "copy-from": "rifle_flintlock", "type": "GUN", - "name": "flintlock rifle", + "name": { "str": "flintlock rifle" }, "description": "Also called a Pennsylvania rifle, this long barreled rifled flintlock gun has signficantly increased accuracy at the cost of taking even longer to reload.", "weight": "3700 g", "volume": "1700 ml", diff --git a/data/json/items/gunmod/stock.json b/data/json/items/gunmod/stock.json index 86d47be7e37ad..d4fce9bf161d7 100644 --- a/data/json/items/gunmod/stock.json +++ b/data/json/items/gunmod/stock.json @@ -127,7 +127,7 @@ { "id": "butt_hook", "type": "GUNMOD", - "name": "butt hook", + "name": { "str": "butt hook" }, "description": "An attachment to the butt of the gun that is put under the armpit allowing for greater stability.", "weight": "100 g", "volume": "100 ml", @@ -145,7 +145,7 @@ { "id": "bthk_stock", "type": "GUNMOD", - "name": "butt hook stock", + "name": { "str": "butt hook stock" }, "description": "A replacement stock that partially encloses arm allowing for greater stability. Good fit and padding also helps with recoil control.", "weight": "300 g", "volume": "300 ml", @@ -166,7 +166,7 @@ { "id": "tail_hook_stock", "type": "GUNMOD", - "name": "tail hook stock", + "name": { "str": "tail hook stock" }, "//": "When we get 'rate of angular change' a version for rifles and crossbow can be added. Currently it would be too strong", "description": "A foldable add-on stock for handguns and machine guns with pivoting hook that latches onto forearm allowing for greater stability.", "weight": "150 g", diff --git a/data/json/items/gunmod/underbarrel.json b/data/json/items/gunmod/underbarrel.json index ff8c26517eb33..f8a74502fa3b2 100644 --- a/data/json/items/gunmod/underbarrel.json +++ b/data/json/items/gunmod/underbarrel.json @@ -52,7 +52,7 @@ { "id": "factory_handguard", "type": "GUNMOD", - "name": "factory handguard", + "name": { "str": "factory handguard" }, "description": "A removable molded grip that comes standard on guns without rails. It's not as efficient as a proper forward grip or bipod at controlling recoil, but it's better than nothing.", "weight": "246 g", "volume": "568ml", diff --git a/data/json/items/obsolete.json b/data/json/items/obsolete.json index f410d04e73e57..9c85463b89d9c 100644 --- a/data/json/items/obsolete.json +++ b/data/json/items/obsolete.json @@ -1970,7 +1970,7 @@ { "type": "GENERIC", "id": "solar_panel_v3", - "name": "quantum solar panel", + "name": { "str": "quantum solar panel" }, "description": "This solar panel is obviously cutting-edge technology and given where you found it, should probably provide a LOT of power. It's covered in strange-looking material, but the covering looks rather fragile; it doesn't look like it could support a reinforcing sheet, either.", "to_hit": -5, "material": [ "glass", "steel" ], @@ -2317,7 +2317,7 @@ { "type": "COMESTIBLE", "id": "taint_tornado", - "name": "tainted tornado", + "name": { "str": "tainted tornado" }, "category": "mutagen", "weight": "100 g", "color": "red", @@ -2344,7 +2344,7 @@ { "type": "COMESTIBLE", "id": "drink_sewerbrew", - "name": "sewer brew", + "name": { "str": "sewer brew" }, "weight": "250 g", "color": "yellow", "addiction_type": "alcohol", diff --git a/data/json/items/resources/plastic.json b/data/json/items/resources/plastic.json index 800264d2eee49..c1f69d6d06372 100644 --- a/data/json/items/resources/plastic.json +++ b/data/json/items/resources/plastic.json @@ -64,7 +64,7 @@ "id": "rigid_plastic_sheet", "type": "GENERIC", "category": "spare_parts", - "name": "rigid plastic sheet", + "name": { "str": "rigid plastic sheet" }, "description": "A large, rigid sheet of translucent plastic, useful for all manner of things; from construction to art, or even junior snowboarding.", "weight": "14875 g", "volume": "12500 ml", diff --git a/data/json/items/resources/tailoring.json b/data/json/items/resources/tailoring.json index 75191ccb61d8d..dbc468911f73c 100644 --- a/data/json/items/resources/tailoring.json +++ b/data/json/items/resources/tailoring.json @@ -229,7 +229,7 @@ "id": "sheet_kevlar_layered", "type": "TOOL", "category": "spare_parts", - "name": "layered kevlar panel", + "name": { "str": "layered kevlar panel" }, "description": "This is a small 16-layer thick Kevlar panel. It could be used to repair armor made of Kevlar.", "weight": "80 g", "volume": "600 ml", @@ -243,7 +243,7 @@ "id": "rigid_kevlar_plate", "type": "TOOL", "category": "spare_parts", - "name": "rigid kevlar plate", + "name": { "str": "rigid kevlar plate" }, "description": "This is a compressed panel of Kevlar treated with epoxy or other adhesive. It could be used to repair items made of Kevlar.", "weight": "300 g", "volume": "250 ml", diff --git a/data/json/items/tool/electronics.json b/data/json/items/tool/electronics.json index 7d276c611fce4..92ef8004ec218 100644 --- a/data/json/items/tool/electronics.json +++ b/data/json/items/tool/electronics.json @@ -340,7 +340,7 @@ "id": "laptop", "type": "TOOL", "category": "tools", - "name": "laptop computer", + "name": { "str": "laptop computer" }, "description": "A laptop computer with replaceable batteries.", "symbol": ",", "color": "dark_gray", diff --git a/data/json/items/tool/workshop.json b/data/json/items/tool/workshop.json index f1b8491498625..283b7f47e9541 100644 --- a/data/json/items/tool/workshop.json +++ b/data/json/items/tool/workshop.json @@ -1143,7 +1143,7 @@ { "id": "makeshift_hose", "type": "TOOL", - "name": "leather hose", + "name": { "str": "leather hose" }, "description": "This is a hose made out of leather. Watertight and flexible, it can be used to siphon fuel from a vehicle tank. However, it's not as elastic as a rubber hose.", "weight": "600 g", "volume": "500 ml", diff --git a/data/json/items/tool_armor.json b/data/json/items/tool_armor.json index f7f36182a53b6..5c7f94f825aa2 100644 --- a/data/json/items/tool_armor.json +++ b/data/json/items/tool_armor.json @@ -395,7 +395,7 @@ { "type": "TOOL_ARMOR", "id": "fitness_band", - "name": "fitness band", + "name": { "str": "fitness band" }, "category": "clothing", "volume": "100 ml", "description": "A fitness band that can track your heartbeat, exercise level and also has a clock. Activate to see your metrics.", diff --git a/data/json/items/vehicle/cables.json b/data/json/items/vehicle/cables.json index 7ebf35bd56041..fb3d214a7841e 100644 --- a/data/json/items/vehicle/cables.json +++ b/data/json/items/vehicle/cables.json @@ -22,7 +22,7 @@ { "type": "TOOL", "id": "hd_tow_cable", - "name": "heavy duty tow cable", + "name": { "str": "heavy duty tow cable" }, "description": "An extremely heavy duty tow cable made from thick steel wire. If attached to a vehicle, it could be used to pull another vehicle of any weight.", "to_hit": -1, "color": "light_blue", diff --git a/data/json/monster_special_attacks/spells.json b/data/json/monster_special_attacks/spells.json index 01d6d0fc7395a..e7a239828601c 100644 --- a/data/json/monster_special_attacks/spells.json +++ b/data/json/monster_special_attacks/spells.json @@ -237,7 +237,7 @@ { "type": "SPELL", "id": "centipede_mom_summon", - "name": "Summon Centipede", + "name": { "str": "Summon Centipede" }, "description": "Summons a small, pissed off centipede.", "flags": [ "HOSTILE_SUMMON", "PERMANENT", "RANDOM_TARGET", "NO_PROJECTILE" ], "valid_targets": [ "ground" ], @@ -278,7 +278,7 @@ { "type": "SPELL", "id": "dermatik_emergence", - "name": "Dermatik Emergence", + "name": { "str": "Dermatik Emergence" }, "description": "The incubating dermatik larvae flee their host.", "flags": [ "HOSTILE_SUMMON", "PERMANENT", "RANDOM_DAMAGE" ], "valid_targets": [ "ground", "self" ], diff --git a/data/json/monsters/cyborgs.json b/data/json/monsters/cyborgs.json index c611f0502f100..43c0be01e9b79 100644 --- a/data/json/monsters/cyborgs.json +++ b/data/json/monsters/cyborgs.json @@ -89,7 +89,7 @@ { "id": "mon_exodii_worker", "type": "MONSTER", - "name": "Exodii worker", + "name": { "str": "Exodii worker" }, "description": "This is a mostly humanoid robot equipped with various construction tools.", "default_faction": "exodii", "volume": "119 L", @@ -120,7 +120,7 @@ { "id": "mon_exodii_quad", "type": "MONSTER", - "name": "Exodii quadruped", + "name": { "str": "Exodii quadruped" }, "description": "This enormous quadrupedal robot seems to be cobbled together from parts, most of them unfamiliar to you. It moves with a heavy, oddly graceful gait, its footsteps leaving shallow craters behind. It bristles with an arsenal of weaponry, but doesn't seem in a particular rush to target you.", "default_faction": "exodii", "volume": "413 L", @@ -171,7 +171,7 @@ { "id": "mon_zomborg", "type": "MONSTER", - "name": "zomborg", + "name": { "str": "zomborg" }, "description": "A mix of dead human and even deader technology, this twisted mess of steel and flesh moves like a puppet in the hands of an angry toddler. Its robotic components seem to have shut down, and new bands of flesh have wrapped around them, tugging and pulling them in awkward directions. Bits of metallic skeleton and armor plating jut from its decaying flesh.", "default_faction": "zombie", "looks_like": "mon_exodii_worker", diff --git a/data/json/monsters/mammal.json b/data/json/monsters/mammal.json index 6913a1351de07..5e90403ab7c07 100644 --- a/data/json/monsters/mammal.json +++ b/data/json/monsters/mammal.json @@ -165,7 +165,7 @@ { "id": "mon_boar_wild_piglet", "type": "MONSTER", - "name": "wild boar piglet", + "name": { "str": "wild boar piglet" }, "description": "Originally not native in the US, this wild omnivore is a crossbreed between the Eurasian wild boar escaped from hunting reserves and the domesticated pig went feral in the wilderness. Its population has skyrocketed in the US during the last few decades.", "default_faction": "pig", "bodytype": "pig", @@ -199,7 +199,7 @@ { "id": "mon_boar_wild", "type": "MONSTER", - "name": "wild boar", + "name": { "str": "wild boar" }, "description": "Originally not native in the US, this wild omnivore is a crossbreed between the Eurasian wild boar escaped from hunting reserves and the domesticated pig went feral in the wilderness. Its population has skyrocketed in the US during the last few decades.", "looks_like": "mon_pig", "default_faction": "pig", @@ -348,7 +348,7 @@ "id": "mon_cat_longhair", "type": "MONSTER", "copy-from": "mon_cat", - "name": "longhair cat", + "name": { "str": "longhair cat" }, "description": "This cat's long fur appears difficult to groom, but the cat seems to manage it despite the environmental conditions.", "volume": "6000 ml", "weight": "6 kg", @@ -358,7 +358,7 @@ "id": "mon_cat_longhair_kitten", "type": "MONSTER", "copy-from": "mon_cat_kitten", - "name": "longhair kitten", + "name": { "str": "longhair kitten" }, "description": "Barely more than a ball of fluff with eyes, this kitten looks like a longhair breed.", "upgrades": { "age_grow": 120, "into": "mon_cat_longhair" } }, @@ -366,7 +366,7 @@ "id": "mon_cat_maine_coon", "type": "MONSTER", "copy-from": "mon_cat", - "name": "Maine coon cat", + "name": { "str": "Maine coon cat" }, "description": "Impressively large for a domestic cat, this thick-haired breed was once native to the state of Maine.", "volume": "8000 ml", "weight": "9 kg", @@ -377,7 +377,7 @@ "id": "mon_cat_maine_coon_kitten", "type": "MONSTER", "copy-from": "mon_cat_kitten", - "name": "Maine coon kitten", + "name": { "str": "Maine coon kitten" }, "description": "This young Maine coon has tufted ears and a striking pattern on its face.", "upgrades": { "age_grow": 120, "into": "mon_cat_maine_coon" } }, @@ -385,7 +385,7 @@ "id": "mon_cat_siamese", "type": "MONSTER", "copy-from": "mon_cat", - "name": "Siamese cat", + "name": { "str": "Siamese cat" }, "description": "This cat has the distinctive dark extremities of a Siamese, first native to Asia but a common domestic breed in North America.", "reproduction": { "baby_monster": "mon_cat_siamese_kitten", "baby_count": 4, "baby_timer": 60 } }, @@ -393,7 +393,7 @@ "id": "mon_cat_siamese_kitten", "type": "MONSTER", "copy-from": "mon_cat_kitten", - "name": "Siamese kitten", + "name": { "str": "Siamese kitten" }, "description": "With cream-colored fur and dark points, you guess this kitten must be a young Siamese.", "upgrades": { "age_grow": 120, "into": "mon_cat_siamese" } }, @@ -401,7 +401,7 @@ "id": "mon_cat_persian", "type": "MONSTER", "copy-from": "mon_cat", - "name": "Persian cat", + "name": { "str": "Persian cat" }, "description": "The short nose and rounded face of this cat suggest it comes from the popular Persian breed.", "reproduction": { "baby_monster": "mon_cat_persian_kitten", "baby_count": 4, "baby_timer": 60 } }, @@ -409,7 +409,7 @@ "id": "mon_cat_persian_kitten", "type": "MONSTER", "copy-from": "mon_cat_kitten", - "name": "Persian kitten", + "name": { "str": "Persian kitten" }, "description": "An adorably squashed nose and sad pleading eyes beg you to adopt this tiny Persian.", "upgrades": { "age_grow": 120, "into": "mon_cat_persian" } }, @@ -417,7 +417,7 @@ "id": "mon_cat_bengal", "type": "MONSTER", "copy-from": "mon_cat", - "name": "Bengal cat", + "name": { "str": "Bengal cat" }, "description": "Looking like a spotted wild cat, the Bengal breed derives from the Asian leopard cat and Egyptian Mau.", "volume": "5000 ml", "weight": "5 kg", @@ -427,7 +427,7 @@ "id": "mon_cat_bengal_kitten", "type": "MONSTER", "copy-from": "mon_cat_kitten", - "name": "Bengal kitten", + "name": { "str": "Bengal kitten" }, "description": "You have seen spots like this on Bengal cats, but this one is just a kitten.", "upgrades": { "age_grow": 120, "into": "mon_cat_bengal" } }, @@ -435,7 +435,7 @@ "id": "mon_cat_devon_rex", "type": "MONSTER", "copy-from": "mon_cat", - "name": "Devon Rex cat", + "name": { "str": "Devon Rex cat" }, "description": "An unusual-looking cat with strikingly large eyes and ears, sporting a soft curly coat of fur.", "reproduction": { "baby_monster": "mon_cat_devon_rex_kitten", "baby_count": 4, "baby_timer": 60 } }, @@ -443,7 +443,7 @@ "id": "mon_cat_devon_rex_kitten", "type": "MONSTER", "copy-from": "mon_cat_kitten", - "name": "Devon Rex kitten", + "name": { "str": "Devon Rex kitten" }, "description": "This curly-coated kitten has enormous ears and inquisitive eyes, possibly a Devon Rex.", "upgrades": { "age_grow": 120, "into": "mon_cat_devon_rex" } }, @@ -451,7 +451,7 @@ "id": "mon_cat_sphynx", "type": "MONSTER", "copy-from": "mon_cat", - "name": "Sphynx cat", + "name": { "str": "Sphynx cat" }, "description": "The Sphynx cat has practically no fur on its body, exposing its curiously wrinkled skin.", "reproduction": { "baby_monster": "mon_cat_sphynx_kitten", "baby_count": 4, "baby_timer": 60 } }, @@ -459,7 +459,7 @@ "id": "mon_cat_sphynx_kitten", "type": "MONSTER", "copy-from": "mon_cat_kitten", - "name": "Sphynx kitten", + "name": { "str": "Sphynx kitten" }, "description": "An almost total lack of fur on this kitten suggests it is of the hairless Sphynx breed.", "upgrades": { "age_grow": 120, "into": "mon_cat_sphynx" } }, @@ -467,7 +467,7 @@ "id": "mon_cat_tabby", "type": "MONSTER", "copy-from": "mon_cat", - "name": "tabby cat", + "name": { "str": "tabby cat" }, "description": "Marked with the characteristic 'M' on its forehead and decorated with swirling stripes, the tabby's markings must provide excellent camouflage.", "reproduction": { "baby_monster": "mon_cat_tabby_kitten", "baby_count": 4, "baby_timer": 60 } }, @@ -475,7 +475,7 @@ "id": "mon_cat_tabby_kitten", "type": "MONSTER", "copy-from": "mon_cat_kitten", - "name": "tabby kitten", + "name": { "str": "tabby kitten" }, "description": "Sharp lines around the eyes and familiar wavy stripes mark this kitten as a common tabby.", "upgrades": { "age_grow": 120, "into": "mon_cat_tabby" } }, @@ -483,7 +483,7 @@ "id": "mon_cat_calico", "type": "MONSTER", "copy-from": "mon_cat", - "name": "calico cat", + "name": { "str": "calico cat" }, "description": "Partly white with patches of orange and black, the calico coloring tells you this cat is probably female. The Calico was the Maryland State cat (back when there were still states).", "reproduction": { "baby_monster": "mon_cat_calico_kitten", "baby_count": 4, "baby_timer": 60 } }, @@ -491,7 +491,7 @@ "id": "mon_cat_calico_kitten", "type": "MONSTER", "copy-from": "mon_cat_kitten", - "name": "calico kitten", + "name": { "str": "calico kitten" }, "description": "Splotches of tan and grey mark this young cat as a calico, and probably female.", "upgrades": { "age_grow": 120, "into": "mon_cat_calico" } }, @@ -499,7 +499,7 @@ "id": "mon_cat_chonker", "type": "MONSTER", "copy-from": "mon_cat", - "name": "golden chonker", + "name": { "str": "golden chonker" }, "description": "Lawd, he comin! This impressive feline would once have been celebrated on internet cat forums for its chonkiness and majestic golden mane. Appears surprisingly well-groomed for a feral cat.", "volume": "8000 ml", "weight": "10 kg", @@ -510,7 +510,7 @@ "id": "mon_cat_chonker_kitten", "type": "MONSTER", "copy-from": "mon_cat_kitten", - "name": "yellow kitten", + "name": { "str": "yellow kitten" }, "description": "This poor little kitten is starving! You wonder if you have some cat food around…", "upgrades": { "age_grow": 120, "into": "mon_cat_chonker" } }, diff --git a/data/json/monsters/misc.json b/data/json/monsters/misc.json index 453d2edafec7c..75d1b5ef9e3ed 100644 --- a/data/json/monsters/misc.json +++ b/data/json/monsters/misc.json @@ -144,7 +144,7 @@ { "id": "mon_halloween_dragon", "type": "MONSTER", - "name": "inflatable dragon", + "name": { "str": "inflatable dragon" }, "description": "A giant inflatable dragon for Halloween decorations.", "looks_like": "mon_dragon_dummy", "default_faction": "factionless", @@ -168,7 +168,7 @@ { "id": "mon_halloween_ghost", "type": "MONSTER", - "name": "inflatable ghost", + "name": { "str": "inflatable ghost" }, "description": "A human sized inflatable for Halloween decorations.", "looks_like": "mon_darkman", "default_faction": "factionless", diff --git a/data/json/monsters/power_leech.json b/data/json/monsters/power_leech.json index df598dc2c3a21..da211bd262038 100644 --- a/data/json/monsters/power_leech.json +++ b/data/json/monsters/power_leech.json @@ -80,7 +80,7 @@ { "id": "mon_leech_radio", "type": "MONSTER", - "name": "signal tree", + "name": { "str": "signal tree" }, "description": "A trunk reaches tall into the sky, its topmost branches glowing with yellow light. A low drum periodically shakes its vicinities.", "default_faction": "nether", "species": [ "LEECH_PLANT" ], diff --git a/data/json/monsters/turrets.json b/data/json/monsters/turrets.json index 0b2ba2b7bfd0f..aa1bf09e25515 100644 --- a/data/json/monsters/turrets.json +++ b/data/json/monsters/turrets.json @@ -306,7 +306,7 @@ { "id": "mon_turret_speaker", "type": "MONSTER", - "name": "loudspeaker", + "name": { "str": "loudspeaker" }, "description": "High-powered loudspeaker, repeating loud messages over and over again.", "default_faction": "military", "species": [ "ROBOT" ], @@ -335,7 +335,7 @@ { "id": "mon_exodii_turret", "type": "MONSTER", - "name": "upcycled turret", + "name": { "str": "upcycled turret" }, "description": "This hefty turret appears to be bolted together out of various scraps of technology, many of them extremely foreign looking. It is equipped with a hefty looking machine gun.", "default_faction": "exodii", "weight": "206 kg", diff --git a/data/json/monsters/zed-classic.json b/data/json/monsters/zed-classic.json index 3c0491d1a8d79..16c59a37598f2 100644 --- a/data/json/monsters/zed-classic.json +++ b/data/json/monsters/zed-classic.json @@ -390,7 +390,7 @@ { "id": "mon_zombie_swat", "type": "MONSTER", - "name": "SWAT zombie", + "name": { "str": "SWAT zombie" }, "description": "This zombie was part of a specialized unit of law enforcement. It still wears a battered armor with the SWAT logo emblazoned on the front.", "looks_like": "mon_zombie_cop", "bodytype": "human", diff --git a/data/json/npcs/holdouts/Rural - Cowboy Friendly.json b/data/json/npcs/holdouts/Rural-Cowboy_Friendly.json similarity index 100% rename from data/json/npcs/holdouts/Rural - Cowboy Friendly.json rename to data/json/npcs/holdouts/Rural-Cowboy_Friendly.json diff --git a/data/json/npcs/holdouts/Rural - Cowboy Hostile.json b/data/json/npcs/holdouts/Rural-Cowboy_Hostile.json similarity index 100% rename from data/json/npcs/holdouts/Rural - Cowboy Hostile.json rename to data/json/npcs/holdouts/Rural-Cowboy_Hostile.json diff --git a/data/json/npcs/holdouts/Rural - Cowboy Nihilist.json b/data/json/npcs/holdouts/Rural-Cowboy_Nihilist.json similarity index 100% rename from data/json/npcs/holdouts/Rural - Cowboy Nihilist.json rename to data/json/npcs/holdouts/Rural-Cowboy_Nihilist.json diff --git a/data/json/npcs/holdouts/Rural - Cowboy Trader.json b/data/json/npcs/holdouts/Rural-Cowboy_Trader.json similarity index 98% rename from data/json/npcs/holdouts/Rural - Cowboy Trader.json rename to data/json/npcs/holdouts/Rural-Cowboy_Trader.json index d5e58a8f83941..72f59d9f0dc9f 100644 --- a/data/json/npcs/holdouts/Rural - Cowboy Trader.json +++ b/data/json/npcs/holdouts/Rural-Cowboy_Trader.json @@ -94,7 +94,7 @@ { "id": "MISSION_COWBOYT_SHOTGUN", "type": "mission_definition", - "name": "Obtain a Remington 870 express shotgun", + "name": { "str": "Obtain a Remington 870 express shotgun" }, "goal": "MGOAL_FIND_ITEM", "item": "remington_870_express", "difficulty": 2, diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json index 6c358ad5ac1f8..6b0faabb53ccd 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Boris_Borichenko.json @@ -495,7 +495,7 @@ "id": "laptop_boris", "copy-from": "laptop", "type": "TOOL", - "name": "Ash's laptop computer", + "name": { "str": "Ash's laptop computer" }, "description": "A small, somewhat worn-out laptop computer. The flip-top is decorated with various stickers." } ] diff --git a/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json b/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json index 4ca241197afc7..5a8a7ce490386 100644 --- a/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json +++ b/data/json/npcs/refugee_center/surface_refugees/NPC_Dana_Nunez.json @@ -498,7 +498,7 @@ { "type": "COMESTIBLE", "id": "Dana_sourdough_bread", - "name": "Dana's sourdough bread", + "name": { "str": "Dana's sourdough bread" }, "copy-from": "sourdough_bread", "looks_like": "sourdough_bread", "description": "This round loaf of bread has a thick, dark crust, and smells very enticing.", diff --git a/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json b/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json index 08058a29583c1..1e6654f15c671 100644 --- a/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json +++ b/data/json/npcs/robofac/NPC_ROBOFAC_MERC_1.json @@ -266,7 +266,7 @@ { "id": "MISSION_ROBOFAC_MERC_1_RADIO", "type": "mission_definition", - "name": "Active Noise Control", + "name": { "str": "Active Noise Control" }, "description": "Investigate Hub 01's radio tower, discover the source of the interference, and fix the problem.", "goal": "MGOAL_KILL_MONSTER", "difficulty": 5, @@ -300,7 +300,7 @@ { "id": "MISSION_ROBOFAC_MERC_1_RETURN_TO_HUB", "type": "mission_definition", - "name": "Return to Hub 01", + "name": { "str": "Return to Hub 01" }, "description": "Return to Hub 01.", "goal": "MGOAL_GO_TO_TYPE", "destination": "robofachq_surface_entrance", diff --git a/data/json/tool_qualities.json b/data/json/tool_qualities.json index 85ac73dddc1f8..7989e83239b0b 100644 --- a/data/json/tool_qualities.json +++ b/data/json/tool_qualities.json @@ -143,7 +143,7 @@ { "type": "tool_quality", "id": "SCREW", - "name": "screw driving", + "name": { "str": "screw driving" }, "usages": [ [ 1, [ "REMOVE_ALL_MODS" ] ] ] }, { diff --git a/data/json/vehicleparts/obsolete.json b/data/json/vehicleparts/obsolete.json index 0038fece4f51b..09a4ca9b4edeb 100644 --- a/data/json/vehicleparts/obsolete.json +++ b/data/json/vehicleparts/obsolete.json @@ -4,7 +4,7 @@ "id": "solar_panel_v3", "categories": [ "energy" ], "copy-from": "solar_panel", - "name": "quantum solar panel", + "name": { "str": "quantum solar panel" }, "looks_like": "solar_panel_v2", "proportional": { "epower": 6.0 }, "item": "solar_panel_v3", diff --git a/data/json/vehicleparts/rotor.json b/data/json/vehicleparts/rotor.json index 96b16b50ee639..75033ec23708d 100644 --- a/data/json/vehicleparts/rotor.json +++ b/data/json/vehicleparts/rotor.json @@ -15,7 +15,7 @@ "id": "heavy_duty_military_rotor", "copy-from": "helicopter_rotors", "type": "vehicle_part", - "name": "heavy-duty military rotors", + "name": { "str": "heavy-duty military rotors" }, "item": "heavy_duty_military_rotor", "//": "rotor diameter is in meters", "rotor_diameter": 15, @@ -30,7 +30,7 @@ "id": "small_civilian_rotors", "copy-from": "helicopter_rotors", "type": "vehicle_part", - "name": "small helicopter rotors", + "name": { "str": "small helicopter rotors" }, "item": "small_helicopter_rotor", "//": "rotor diameter is in meters", "rotor_diameter": 8, @@ -45,7 +45,7 @@ "id": "heavy_duty_military_blackhawk_rotors", "copy-from": "heavy_duty_military_rotor", "type": "vehicle_part", - "name": "heavy-duty military Blackhawk rotors", + "name": { "str": "heavy-duty military Blackhawk rotors" }, "item": "heavy_duty_military_rotor", "//": "rotor diameter is in meters", "description": "A set of four military-grade helicopter rotor blades, used to provide lift by rotation.", @@ -55,7 +55,7 @@ "id": "heavy_duty_military_osprey_rotors", "copy-from": "heavy_duty_military_rotor", "type": "vehicle_part", - "name": "heavy-duty military Osprey rotors", + "name": { "str": "heavy-duty military Osprey rotors" }, "item": "heavy_duty_military_rotor", "//": "rotor diameter is in meters", "description": "A set of three military-grade helicopter rotor blades, used to provide lift by rotation.", diff --git a/data/json/vehicleparts/vehicle_parts.json b/data/json/vehicleparts/vehicle_parts.json index 79ad8d1dafc60..683123dd4fd7a 100644 --- a/data/json/vehicleparts/vehicle_parts.json +++ b/data/json/vehicleparts/vehicle_parts.json @@ -2295,7 +2295,7 @@ { "type": "vehicle_part", "id": "hd_tow_cable", - "name": "heavy duty tow cable", + "name": { "str": "heavy duty tow cable" }, "symbol": "{", "categories": [ "other" ], "color": "light_blue", diff --git a/data/legacy/1/obsolete.json b/data/legacy/1/obsolete.json index 7173a9af11555..a6f4351f84e2a 100644 --- a/data/legacy/1/obsolete.json +++ b/data/legacy/1/obsolete.json @@ -25,7 +25,7 @@ "id": "reloaded_22_ratshot", "type": "AMMO", "price": 2300, - "name": "handloaded .22 rat-shot", + "name": { "str": "handloaded .22 rat-shot" }, "symbol": "=", "color": "yellow", "description": "Rat-shot is extremely weak ammunition, designed for killing rats, snakes, or other small vermin while being unable to damage walls. It has an extremely short range and is unable to injure all but the smallest creatures. This one has been handmade using an intact casing.", @@ -47,7 +47,7 @@ "type": "AMMO", "id": "reloaded_shot_beanbag", "price": 50, - "name": "reloaded shotgun beanbag", + "name": { "str": "reloaded shotgun beanbag" }, "symbol": "=", "color": "red", "description": "A hand-reloaded beanbag round for shotguns, not deadly but designed to disable.", @@ -68,7 +68,7 @@ "type": "TOOL", "symbol": ";", "color": "light_green", - "name": "rechargeable battery mod", + "name": { "str": "rechargeable battery mod" }, "description": "A homemade, rechargeable power cell built from salvaged electronics. With enough electronics skill, you could attach it to an electric-powered device to provide it with energy. The power cell is not compatible with standard batteries; it must be re-energized via a special recharging station.", "price": 2000, "material": [ "plastic", "aluminum" ], @@ -80,7 +80,7 @@ { "type": "COMESTIBLE", "id": "brew_bum_wine", - "name": "cheap wine must", + "name": { "str": "cheap wine must" }, "description": "Unfermented grape wine. A hearty mix of pressed grapes, with some added brandy to fortify it.", "weight": "46 g", "color": "red", @@ -104,7 +104,7 @@ "type": "GUN", "symbol": "(", "color": "brown", - "name": "sawn-off shotgun", + "name": { "str": "sawn-off shotgun" }, "description": "The barrels of shotguns are often sawed in half to make it more maneuverable and concealable. This has the added effect of reducing accuracy greatly.", "price": 70000, "material": [ "iron", "wood" ], @@ -139,7 +139,7 @@ "type": "GUN", "symbol": "(", "color": "brown", - "name": "sawn pipe shotgun", + "name": { "str": "sawn pipe shotgun" }, "description": "A home-made sawn off shotgun. It is simply a short pipe attached to a stock, with a hammer to strike the single round it holds.", "price": 15000, "//": "Worth less than the long version, since subtlty is not something that would be valued much any more...", @@ -164,7 +164,7 @@ { "type": "GUNMOD", "id": "spare_mag", - "name": "spare magazine", + "name": { "str": "spare magazine" }, "description": "A spare magazine you can keep on hand to make reloads faster, but must itself be reloaded before it can be used again.", "location": "accessories", "weight": "330 g", @@ -178,7 +178,7 @@ { "type": "GUNMOD", "id": "clip", - "name": "extended magazine", + "name": { "str": "extended magazine" }, "clip_size_modifier": 50, "description": "Increases the ammunition capacity of your firearm by 50%.", "location": "magazine", @@ -194,7 +194,7 @@ { "type": "GUNMOD", "id": "clip2", - "name": "double magazine", + "name": { "str": "double magazine" }, "clip_size_modifier": 100, "description": "Completely doubles the ammunition capacity of your firearm.", "location": "magazine", @@ -223,7 +223,7 @@ { "type": "GUNMOD", "id": "conversion_battle", - "name": "battle rifle conversion", + "name": { "str": "battle rifle conversion" }, "location": "conversion", "dispersion_modifier": 90, "damage_modifier": 6, @@ -244,7 +244,7 @@ { "type": "GUNMOD", "id": "conversion_sniper", - "name": "sniper conversion", + "name": { "str": "sniper conversion" }, "location": "conversion", "dispersion_modifier": -150, "damage_modifier": 8, @@ -266,7 +266,7 @@ "id": "coal", "symbol": "/", "color": "dark_gray", - "name": "coal pallet", + "name": { "str": "coal pallet" }, "category": "other", "description": "A large block of semi-processed coal.", "price": 60000, @@ -313,7 +313,7 @@ "type": "AMMO", "id": "fletching", "price": 300, - "name": "fletching", + "name": { "str": "fletching" }, "symbol": "=", "color": "white", "description": "Also known as a flight, this item provides aerodynamic stabilization of arrows. You'll need to put these on your arrows to make them functional.", @@ -328,7 +328,7 @@ { "type": "ARMOR", "id": "helmet_netting", - "name": "helmet netting", + "name": { "str": "helmet netting" }, "weight": "25 g", "color": "green", "covers": [ "head" ], @@ -347,7 +347,7 @@ "type": "GENERIC", "symbol": "}", "color": "light_cyan", - "name": "small metal tank", + "name": { "str": "small metal tank" }, "category": "other", "description": "A small metal tank for holding gas or liquids. Useful for crafting.", "price": 6000, @@ -362,7 +362,7 @@ "type": "GUN", "symbol": "(", "color": "magenta", - "name": "NX-17 charge rifle", + "name": { "str": "NX-17 charge rifle" }, "description": "A multi-purpose rifle, designed for use in conjunction with a unified power supply, or UPS. It does not reload normally; instead, press fire once to start charging it from your UPS, then again to unload the charge.", "price": 1200000, "material": [ "steel", "plastic" ], @@ -392,7 +392,7 @@ "type": "GENERIC", "id": "laser_capacitor", "price": 20000, - "name": "charged capacitor", + "name": { "str": "charged capacitor" }, "symbol": "=", "color": "yellow", "description": "A single capacitor charged with current to be used by a laser weapon or similar armament.", @@ -404,7 +404,7 @@ "id": "inhaler_stimgas", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "stimgas inhaler", + "name": { "str": "stimgas inhaler" }, "description": "A powerful stimulant with no risk of addiction.", "weight": "10 g", "volume": "250 ml", @@ -421,7 +421,7 @@ "id": "inhaler_sewergas", "type": "COMESTIBLE", "comestible_type": "MED", - "name": "sewagas inhaler", + "name": { "str": "sewagas inhaler" }, "description": "A powerful hallucinogen with low risk of addiction.", "weight": "10 g", "volume": "250 ml", @@ -445,7 +445,7 @@ "type": "GUN", "symbol": "|", "color": "yellow", - "name": "blowgun", + "name": { "str": "blowgun" }, "description": "A wooden blowgun, easy to use and very accurate. It uses darts as ammunition.", "price": 3000, "material": [ "wood" ], @@ -466,7 +466,7 @@ "type": "AMMO", "id": "dart", "price": 100, - "name": "dart", + "name": { "str": "dart" }, "symbol": "-", "color": "yellow", "description": "A handful of darts, useful as ammunition for blowguns.", @@ -486,7 +486,7 @@ "id": "lead_plate", "symbol": ",", "color": "dark_gray", - "name": "lead battery plate", + "name": { "str": "lead battery plate" }, "category": "spare_parts", "description": "An electrode plate from a lead-acid battery.", "price": 10, @@ -499,7 +499,7 @@ { "id": "nail_bomb_act", "type": "TOOL", - "name": "active nail bomb", + "name": { "str": "active nail bomb" }, "description": "This is an active nail bomb, likely to explode any second now. Better throw it!", "category": "weapons", "weight": "290 g", @@ -526,7 +526,7 @@ "id": "sword_forged", "symbol": "!", "color": "dark_gray", - "name": "forged sword", + "name": { "str": "forged sword" }, "description": "A common short sword, forged from several pieces of steel. The pointy end is the dangerous one.", "material": [ "steel" ], "volume": "2 L", @@ -542,7 +542,7 @@ "id": "skewer", "symbol": ",", "color": "brown", - "name": "skewer", + "name": { "str": "skewer" }, "description": "A thin wooden skewer. Squirrel on a stick, anyone?", "category": "other", "material": [ "wood" ], diff --git a/data/legacy/2/makeshift.json b/data/legacy/2/makeshift.json index 098d932861c5c..f215d4f5b4323 100644 --- a/data/legacy/2/makeshift.json +++ b/data/legacy/2/makeshift.json @@ -3,7 +3,7 @@ "id": "makeshift_kevlar", "copy-from": "kevlar", "type": "ARMOR", - "name": "makeshift Kevlar vest", + "name": { "str": "makeshift Kevlar vest" }, "description": "A vest sewn together from Kevlar plates, less durable and protective than a proper Kevlar vest. Suitable for wearing under clothing.", "relative": { "material_thickness": -1 }, "delete": { "flags": [ "STURDY" ] } diff --git a/data/legacy/3/crazy.json b/data/legacy/3/crazy.json index cfb4ffa84e47e..43b0b15a297ae 100644 --- a/data/legacy/3/crazy.json +++ b/data/legacy/3/crazy.json @@ -8,7 +8,7 @@ "id": "granade", "type": "TOOL", "category": "weapons", - "name": "Granade", + "name": { "str": "Granade" }, "description": "Attached to this grenade is a name tag with the name Kevin written on it. Does not seem to work like a grenade, handle with care.", "weight": "180 g", "volume": "250 ml", @@ -24,7 +24,7 @@ "id": "granade_act", "type": "TOOL", "category": "weapons", - "name": "active Granade", + "name": { "str": "active Granade" }, "description": "Attached to this grenade is a name tag with the name Kevin written on it. Does not seem to work like a grenade, handle with care. Better throw it!", "weight": "180 g", "volume": "250 ml", diff --git a/tools/json_tools/name_strings_to_objects.py b/tools/json_tools/name_strings_to_objects.py new file mode 100644 index 0000000000000..08e9a363f92fe --- /dev/null +++ b/tools/json_tools/name_strings_to_objects.py @@ -0,0 +1,76 @@ +#!/usr/bin/env python3 + +# Make sure you have python3 installed. +# Ensure that the json_formatter is kept in Tools with this script. +# For Windows: +# Using command prompt type "python name.py" +# For Max OS X or Linux: +# Swap any "\\" with "/", then run the script as in windows. + +import json +import os + + +def gen_new(path): + change = False + with open(path, "r") as json_file: + try: + json_data = json.load(json_file) + except UnicodeDecodeError: + print(f"UnicodeDecodeError in {path}") + return None + except json.decoder.JSONDecodeError: + print(f"JSONDecodeError in {path}") + return None + for jo in json_data: + # We only want JsonObjects + if type(jo) is str: + continue + if not jo.get('name'): + continue + if type(jo['name']) == dict: + continue + if jo.get('type') not in ['AMMO', 'ARMOR', 'BATTERY', 'bionic', + 'BIONIC_ITEM', 'BIONIC_ITEM', 'BOOK', + 'COMESTIBLE', 'ENGINE', 'fault', + 'GENERIC', 'GUN', 'GUNMOD', + 'item_action', 'ITEM_CATEGORY', + 'MAGAZINE', 'map_extra', 'martial_art', + 'mission_definition', 'MONSTER', + 'mutation', 'npc_class', 'PET_ARMOR', + 'proficiency', 'skill', 'TOOL', + 'TOOL_ARMOR', 'tool_quality', 'TOOLMOD', + 'vehicle_part', 'vehicle_part_category', + 'vitamin', 'WHEEL', 'SPELL']: + continue + if jo.get('name_plural'): + if jo['name'] == jo['name_plural']: + name_obj = {'str_sp': jo['name']} + else: + name_obj = {'str': jo['name'], 'str_pl': jo['name_plural']} + jo['name'] = name_obj + del jo['name_plural'] + change = True + else: + name_obj = {'str': jo['name']} + jo['name'] = name_obj + change = True + + return json_data if change else None + + +def change_file(json_dir): + for root, directories, filenames in os.walk(f"..\\{json_dir}"): + for filename in filenames: + path = os.path.join(root, filename) + if path.endswith(".json"): + new = gen_new(path) + if new is not None: + with open(path, "w") as jf: + json.dump(new, jf, ensure_ascii=False) + os.system(f".\\json_formatter.exe {path}") + + +if __name__ == "__main__": + json_dir = input("What directory are the json files in? ") + change_file(json_dir)