Add Conditional Names for many comestibles, name to object, and small recipe fixes

data/json/items/comestibles/alcohol.json

@@ -553,7 +553,7 @@
   {
     "type": "COMESTIBLE",
     "id": "drink_screwdriver",
-    "name": "screwdriver cocktail",
+    "name": { "str": "screwdriver cocktail" },
     "weight": "258 g",
     "color": "yellow",
     "addiction_type": "alcohol",
@@ -953,7 +953,7 @@
   {
     "type": "COMESTIBLE",
     "id": "drink_strawberry_surprise",
-    "name": "strawberry surprise",
+    "name": { "str": "strawberry surprise" },
     "weight": "43 g",
     "color": "pink",
     "addiction_type": "alcohol",
@@ -1107,7 +1107,7 @@
   {
     "type": "COMESTIBLE",
     "id": "drink_hobo",
-    "name": "fancy hobo",
+    "name": { "str": "fancy hobo" },
     "weight": "50 g",
     "color": "yellow",
     "addiction_type": "alcohol",
@@ -1134,7 +1134,7 @@
   {
     "type": "COMESTIBLE",
     "id": "drink_kalimotxo",
-    "name": "kalimotxo",
+    "name": { "str": "kalimotxo" },
     "weight": "250 g",
     "color": "red",
     "addiction_type": "alcohol",
@@ -1161,7 +1161,7 @@
   {
     "type": "COMESTIBLE",
     "id": "drink_beeknees",
-    "name": "bee's knees",
+    "name": { "str": "bee's knees" },
     "weight": "248 g",
     "color": "yellow",
     "addiction_type": "alcohol",
@@ -1186,7 +1186,7 @@
   {
     "type": "COMESTIBLE",
     "id": "drink_wsour",
-    "name": "whiskey sour",
+    "name": { "str": "whiskey sour" },
     "weight": "249 g",
     "color": "yellow",
     "addiction_type": "alcohol",
@@ -1211,7 +1211,7 @@
   {
     "type": "COMESTIBLE",
     "id": "honey_gold",
-    "name": "honeygold brew",
+    "name": { "str": "honeygold brew" },
     "weight": "259 g",
     "color": "yellow",
     "use_action": "ALCOHOL_WEAK",
@@ -1235,7 +1235,7 @@
   {
     "type": "COMESTIBLE",
     "id": "honey_ant",
-    "name": "honey ball",
+    "name": { "str": "honey ball" },
     "weight": "178 g",
     "color": "yellow",
     "addiction_type": "alcohol",
@@ -1260,7 +1260,7 @@
   {
     "type": "COMESTIBLE",
     "id": "eggnog_spiked",
-    "name": "spiked eggnog",
+    "name": { "str": "spiked eggnog" },
     "weight": "132 g",
     "color": "white",
     "addiction_type": "alcohol",
@@ -1289,7 +1289,7 @@
   {
     "type": "COMESTIBLE",
     "id": "drink_martini",
-    "name": "martini",
+    "name": { "str": "martini" },
     "weight": "49600 mg",
     "color": "white",
     "addiction_type": "alcohol",

data/json/items/comestibles/bread.json

@@ -23,7 +23,7 @@
     "id": "sourdough_young",
     "type": "GENERIC",
     "category": "food",
-    "name": "juvenile sourdough starter",
+    "name": { "str": "juvenile sourdough starter" },
     "description": "This jar contains a floury paste that is slowly going bad.  Someday it will be sourdough.",
     "weight": "52 g",
     "volume": "250 ml",
@@ -46,7 +46,7 @@
     "id": "sourdough_split",
     "type": "GENERIC",
     "category": "food",
-    "name": "freshly fed sourdough starter",
+    "name": { "str": "freshly fed sourdough starter" },
     "description": "This jar contains a floury paste with sourdough starter mixed in.  It needs a few hours to recover its strength before it can be used again.",
     "weight": "52 g",
     "volume": "250 ml",
@@ -69,7 +69,7 @@
     "id": "sourdough_starter",
     "type": "GENERIC",
     "category": "food",
-    "name": "sourdough starter",
+    "name": { "str": "sourdough starter" },
     "description": "This jar contains a precious mix of flour, water, molds and bacteria from the air.  When you add flour and water to it, after a few hours it froths and rises.",
     "weight": "52 g",
     "looks_like": "jar_glass",
@@ -83,7 +83,7 @@
   {
     "type": "COMESTIBLE",
     "id": "sourdough_bread",
-    "name": "sourdough bread",
+    "name": { "str": "sourdough bread" },
     "weight": "56 g",
     "color": "brown",
     "spoils_in": "8 days",
@@ -104,7 +104,7 @@
   {
     "type": "COMESTIBLE",
     "id": "flatbread",
-    "name": "flatbread",
+    "name": { "str": "flatbread" },
     "weight": "85 g",
     "color": "brown",
     "spoils_in": "11 days 16 hours",
@@ -122,7 +122,7 @@
   {
     "type": "COMESTIBLE",
     "id": "bread",
-    "name": "bread",
+    "name": { "str": "bread" },
     "weight": "60 g",
     "color": "brown",
     "spoils_in": "10 days",
@@ -143,7 +143,7 @@
   {
     "type": "COMESTIBLE",
     "id": "cornbread",
-    "name": "cornbread",
+    "name": { "str": "cornbread" },
     "weight": "60 g",
     "color": "yellow",
     "spoils_in": "30 days",
@@ -165,7 +165,7 @@
   {
     "type": "COMESTIBLE",
     "id": "johnnycake",
-    "name": "johnnycake",
+    "name": { "str": "johnnycake" },
     "weight": "49 g",
     "color": "yellow",
     "spoils_in": "20 days",
@@ -185,7 +185,7 @@
   {
     "type": "COMESTIBLE",
     "id": "tortilla_corn",
-    "name": "corn tortilla",
+    "name": { "str": "corn tortilla" },
     "weight": "24 g",
     "color": "brown",
     "spoils_in": "20 days",
@@ -207,7 +207,7 @@
   {
     "type": "COMESTIBLE",
     "id": "hardtack",
-    "name": "hardtack",
+    "name": { "str": "hardtack" },
     "weight": "80 g",
     "color": "white",
     "spoils_in": "360 days",
@@ -228,7 +228,7 @@
   {
     "type": "COMESTIBLE",
     "id": "biscuit",
-    "name": "biscuit",
+    "name": { "str": "biscuit" },
     "weight": "30 g",
     "color": "brown",
     "spoils_in": "7 days 12 hours",
@@ -248,7 +248,14 @@
   {
     "type": "COMESTIBLE",
     "id": "wastebread",
-    "name": "wastebread",
+    "name": { "str": "wastebread" },
+    "conditional_names": [
+      {
+        "type": "COMPONENT_ID",
+        "condition": "chitin",
+        "name": { "str": "bugshell wastebread", "str_pl": "bugshell wastebread" }
+      }
+    ],
     "weight": "60 g",
     "color": "white",
     "spoils_in": 990,

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",
@@ -22,7 +22,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",
@@ -110,7 +110,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",
@@ -154,7 +154,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",
@@ -198,7 +198,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",
@@ -219,7 +219,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",
@@ -241,7 +241,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",
@@ -261,7 +261,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",
@@ -281,7 +281,7 @@
   {
     "type": "COMESTIBLE",
     "id": "brew_hb_beer",
-    "name": "beer wort",
+    "name": { "str": "beer wort" },
     "description": "Unfermented homebrew beer.  A boiled and chilled mash of malted barley, spiced with some fine hops.",
     "weight": "249 g",
     "color": "brown",
@@ -344,7 +344,7 @@
   {
     "type": "COMESTIBLE",
     "id": "brew_milk_curdled",
-    "name": "curdling milk",
+    "name": { "str": "curdling milk" },
     "weight": "236 g",
     "color": "white",
     "spoils_in": "28 days",
@@ -365,7 +365,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",