Repair and balance adjustment of recipes (CleverRaven#51527)

data/json/items/ammo/sling-ready_grenade.json

@@ -4,8 +4,8 @@
     "id": "sling-ready_molotov",
     "name": { "str": "sling-ready Molotov cocktail" },
     "description": "A bottle of flammable liquid with a long fuse inserted ready to be used in a staff sling with a modified cradle.  To throw this item without a sling, use it light the fuse.  You will, of course, need a lighter or matches in your inventory to do this.  After lighting it, throw it to cause fires.",
-    "weight": "742 g",
-    "volume": "750 ml",
+    "weight": "1000 g",
+    "volume": "960 ml",
     "price": 500,
     "price_postapoc": 500,
     "to_hit": 1,
@@ -38,7 +38,7 @@
     "name": { "str": "sling-ready grenade" },
     "description": "This is a military-grade fragmentary hand grenade, modified with a retaining fuse for use in a staff sling with a modified cradle.  To throw this item without a sling, use it to snap the fuse and activate the grenade.  You will then have five seconds before it explodes; throwing it would be a good idea.",
     "weight": "397 g",
-    "volume": "250 ml",
+    "volume": "270 ml",
     "price": 1500,
     "price_postapoc": 1000,
     "to_hit": -1,

data/json/items/comestibles/alcohol.json

@@ -1302,7 +1302,7 @@
     "symbol": "~",
     "quench": 20,
     "healthy": 2,
-    "calories": 347,
+    "calories": 475,
     "description": "A mixed drink containing all the advantages of its ingredients and none of their disadvantages.  It tastes great and it's a good source of nourishment.",
     "price": 350,
     "price_postapoc": 300,

data/json/items/comestibles/bread.json

@@ -26,8 +26,9 @@
     "category": "food",
     "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",
+    "weight": "450 g",
+    "volume": "680 ml",
+    "longest_side": "132 mm",
     "price": 10,
     "price_postapoc": 10,
     "bashing": 8,
@@ -50,8 +51,9 @@
     "category": "food",
     "name": { "str": "freshly fed sourdough starter" },
     "description": "This jar contains a floury paste with sourdough starter mixed in.  It needs a day to recover its strength before it can be used again.",
-    "weight": "52 g",
-    "volume": "250 ml",
+    "weight": "450 g",
+    "volume": "680 ml",
+    "longest_side": "132 mm",
     "price": 10,
     "price_postapoc": 10,
     "bashing": 8,
@@ -74,9 +76,10 @@
     "category": "food",
     "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",
+    "weight": "450 g",
     "looks_like": "jar_glass_sealed",
-    "volume": "250 ml",
+    "volume": "680 ml",
+    "longest_side": "132 mm",
     "price": 50,
     "price_postapoc": 10,
     "bashing": 8,

data/json/items/comestibles/brewing.json

@@ -510,8 +510,8 @@
     "symbol": ",",
     "quench": -10,
     "healthy": 1,
-    "calories": 26,
-    "description": "Malting grain that can be used for brewing.",
+    "calories": 41,
+    "description": "Soaked dandelion that can be used for brewing.",
     "price": 20,
     "price_postapoc": 250,
     "material": [ "veggy" ],

data/json/items/comestibles/carnivore.json

@@ -475,6 +475,17 @@
     "vitamins": [ [ "mutant_toxin", 25 ] ],
     "extend": { "flags": [ "BAD_TASTE" ] }
   },
+  {
+    "id": "mutant_bug_organs_cooked",
+    "type": "COMESTIBLE",
+    "copy-from": "mutant_bug_organs",
+    "name": { "str_sp": "cooked mutant bug organs" },
+    "snippet_category": "cooked_bug_organs_desc",
+    "description": "Cooked mutant bug organs.  It looks awful, but if you really eat it, you'll find -- it's worse than it looks.",
+    "looks_like": "offal_cooked",
+    "healthy": -2,
+    "delete": { "flags": [ "RAW" ] }
+  },
   {
     "id": "offal_pickled",
     "copy-from": "offal",

data/json/items/comestibles/drink.json

@@ -414,7 +414,7 @@
     "symbol": "~",
     "quench": 48,
     "healthy": 2,
-    "calories": 77,
+    "calories": 101,
     "description": "A healthy beverage made from dandelion and burdock roots steeped in boiling water.  The additional ingredient makes it slightly healthier and fun.",
     "price": 50,
     "price_postapoc": 25,
@@ -974,7 +974,7 @@
     "comestible_type": "DRINK",
     "symbol": "~",
     "quench": 38,
-    "calories": 17,
+    "calories": 170,
     "description": "Water with sugar or honey added.  Tastes okay.",
     "price": 95,
     "price_postapoc": 10,
@@ -1199,7 +1199,7 @@
     "symbol": "~",
     "quench": 40,
     "healthy": 2,
-    "calories": 36,
+    "calories": 40,
     "description": "A thick red liquid, made from tomatoes.  Not to everyone's taste, it is a healthy and refreshing drink when chilled.",
     "price": 90,
     "price_postapoc": 40,

data/json/items/comestibles/drink_other.json

@@ -10,7 +10,7 @@
     "comestible_type": "FOOD",
     "symbol": "%",
     "healthy": 1,
-    "calories": 21,
+    "calories": 28,
     "sealed": true,
     "description": "A minimally seasoned sauce of cooked tomatoes.",
     "price": 4,
@@ -86,7 +86,7 @@
     "comestible_type": "DRINK",
     "container": "condiment_bottle_sealed",
     "sealed": false,
-    "calories": 21,
+    "calories": 28,
     "spoils_in": 600,
     "charges": 16,
     "fun": -1,
@@ -204,7 +204,7 @@
     "symbol": "~",
     "quench": -2,
     "healthy": 1,
-    "calories": 258,
+    "calories": 205,
     "description": "An extremely sugary tar-like syrup, produced by repeatedly boiling the juice of sugarcane or sugar beets.  It has a slightly bitter aftertaste.",
     "price": 200,
     "price_postapoc": 500,

data/json/items/comestibles/egg.json

@@ -429,6 +429,26 @@
     "freezing_point": -274,
     "vitamins": [ [ "vitB", 2 ] ]
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "rehydrated_eggs",
+    "copy-from": "egg_bird",
+    "name": { "str": "rehydrated egg" },
+    "weight": "50 g",
+    "color": "yellow",
+    "symbol": "%",
+    "looks_like": "powder_egg",
+    "quench": 2,
+    "calories": 80,
+    "description": "Rehydrated eggs.  You can use it instead of an egg when cooking, provided you don't care that it has lost its complete shape.",
+    "price": 22,
+    "price_postapoc": 25,
+    "material": [ "egg" ],
+    "volume": "50 ml",
+    "flags": [  ],
+    "fun": -2,
+    "vitamins": [ [ "vitB", 2 ] ]
+  },
   {
     "type": "COMESTIBLE",
     "id": "scrambled_eggs",

data/json/items/comestibles/junkfood.json

@@ -576,7 +576,7 @@
     "comestible_type": "FOOD",
     "symbol": "%",
     "quench": 3,
-    "calories": 45,
+    "calories": 41,
     "description": "A thick syrup produced from shredded sugar beets.  Useful in cooking as a sweetener.",
     "price": 1500,
     "price_postapoc": 350,
@@ -595,7 +595,7 @@
     "spoils_in": "52 hours",
     "comestible_type": "FOOD",
     "symbol": "%",
-    "calories": 110,
+    "calories": 280,
     "description": "Delicious sponge cake with buttercream icing, it says happy birthday on it.",
     "price": 120,
     "price_postapoc": 200,
@@ -611,6 +611,7 @@
     "name": { "str": "cake" },
     "spoils_in": "4 days",
     "copy-from": "jihelucake",
+    "calories": 280,
     "description": "Delicious chocolate cake.  It has all the icing.  All of it."
   },
   {
@@ -619,6 +620,7 @@
     "name": { "str": "cake" },
     "spoils_in": "4 days",
     "copy-from": "jihelucake",
+    "calories": 295,
     "quench": -5,
     "description": "A cake coated in the thickest icing you've ever seen.  Someone has written guff in quotation marks on it…",
     "fun": 20
@@ -776,7 +778,7 @@
     "quench": 1,
     "healthy": -1,
     "calories": 362,
-    "description": "Some caramel.  Still bad for your health.",
+    "description": "Caramel covered apples.  One of the children's favorite snacks during the festival.  But now they want you.",
     "price": 150,
     "price_postapoc": 500,
     "material": [ "junk", "fruit" ],
@@ -1150,7 +1152,7 @@
     "name": { "str": "chocolate pancake" },
     "weight": "78 g",
     "healthy": 0,
-    "calories": 217,
+    "calories": 201,
     "description": "Fluffy and delicious pancakes with real maple syrup, with delicious chocolate baked right in.",
     "price": 700,
     "price_postapoc": 100,
@@ -1168,7 +1170,7 @@
     "spoils_in": "10 days",
     "comestible_type": "FOOD",
     "symbol": "%",
-    "calories": 120,
+    "calories": 660,
     "description": "Crunchy and delicious waffles with real maple syrup, with delicious chocolate baked right in.",
     "price": 650,
     "price_postapoc": 100,

data/json/items/comestibles/meat_dishes.json

@@ -423,7 +423,7 @@
     "name": { "str": "stuffed clam" },
     "copy-from": "fish_fried",
     "weight": "150 g",
-    "calories": 572,
+    "calories": 115,
     "description": "Quahog clams stuffed with bread crumbs and fried.",
     "volume": "175 ml",
     "looks_like": "fish_fried",

data/json/items/comestibles/nuts.json

@@ -459,7 +459,8 @@
     "type": "COMESTIBLE",
     "name": { "str": "imitation peanutbutter" },
     "description": "A thick, nutty brown paste.",
-    "copy-from": "peanutbutter"
+    "copy-from": "peanutbutter",
+    "calories": 400
   },
   {
     "id": "spread_peanutbutter",

data/json/items/comestibles/other.json

@@ -642,7 +642,7 @@
     "container": "jar_glass_sealed",
     "sealed": false,
     "quench": 1,
-    "calories": 190,
+    "calories": 201,
     "charges": 5,
     "healthy": 1,
     "fun": 2
@@ -660,7 +660,7 @@
     "symbol": "%",
     "quench": 3,
     "healthy": 1,
-    "calories": 41,
+    "calories": 55,
     "description": "Canned tomato.  A staple in many pantries, and useful for many recipes.",
     "price": 350,
     "price_postapoc": 100,