diff --git a/data/json/items/ammo/sling-ready_grenade.json b/data/json/items/ammo/sling-ready_grenade.json index 346c9bfac409c..e475a9339cbc3 100644 --- a/data/json/items/ammo/sling-ready_grenade.json +++ b/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, diff --git a/data/json/items/comestibles/alcohol.json b/data/json/items/comestibles/alcohol.json index 69702782200af..04a31f7560cff 100644 --- a/data/json/items/comestibles/alcohol.json +++ b/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, diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index d9291a570848c..32494256e8bcf 100644 --- a/data/json/items/comestibles/bread.json +++ b/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, diff --git a/data/json/items/comestibles/brewing.json b/data/json/items/comestibles/brewing.json index e20ab1cfcb8a5..fc0f43a6eb73a 100644 --- a/data/json/items/comestibles/brewing.json +++ b/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" ], diff --git a/data/json/items/comestibles/carnivore.json b/data/json/items/comestibles/carnivore.json index 3d426ef9cbed5..8c7df99aaf705 100644 --- a/data/json/items/comestibles/carnivore.json +++ b/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", diff --git a/data/json/items/comestibles/drink.json b/data/json/items/comestibles/drink.json index d35fc373c234c..ab5110964a5b7 100644 --- a/data/json/items/comestibles/drink.json +++ b/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, diff --git a/data/json/items/comestibles/drink_other.json b/data/json/items/comestibles/drink_other.json index 04f104a5f440f..bc730bddfa73c 100644 --- a/data/json/items/comestibles/drink_other.json +++ b/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, diff --git a/data/json/items/comestibles/egg.json b/data/json/items/comestibles/egg.json index 09829e13b5319..7343addfef777 100644 --- a/data/json/items/comestibles/egg.json +++ b/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", diff --git a/data/json/items/comestibles/junkfood.json b/data/json/items/comestibles/junkfood.json index 4f3d434ee159d..a3a63d8774734 100644 --- a/data/json/items/comestibles/junkfood.json +++ b/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, diff --git a/data/json/items/comestibles/meat_dishes.json b/data/json/items/comestibles/meat_dishes.json index d9501b2003111..7fe8ca88c753d 100644 --- a/data/json/items/comestibles/meat_dishes.json +++ b/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", diff --git a/data/json/items/comestibles/nuts.json b/data/json/items/comestibles/nuts.json index 25aab3481bdff..5b05170436f7f 100644 --- a/data/json/items/comestibles/nuts.json +++ b/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", diff --git a/data/json/items/comestibles/other.json b/data/json/items/comestibles/other.json index 8dd68b6657e4c..a55a2f1b567cb 100644 --- a/data/json/items/comestibles/other.json +++ b/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, diff --git a/data/json/items/comestibles/raw_veggy.json b/data/json/items/comestibles/raw_veggy.json index d51eae7ede3ed..d2a42a41424c5 100644 --- a/data/json/items/comestibles/raw_veggy.json +++ b/data/json/items/comestibles/raw_veggy.json @@ -48,12 +48,12 @@ "comestible_type": "FOOD", "symbol": "%", "healthy": 2, - "calories": 66, + "calories": 44, "description": "It's a bit tough, but quite delicious.", "price": 400, "price_postapoc": 50, "material": [ "veggy" ], - "volume": "250 ml", + "volume": "180 ml", "flags": [ "EATEN_HOT", "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", "vitamins": [ [ "vitA", 3 ], [ "vitC", 95 ], [ "calcium", 5 ], [ "iron", 4 ] ] @@ -84,20 +84,20 @@ "type": "COMESTIBLE", "id": "cabbage", "name": { "str": "cabbage" }, - "weight": "139 g", + "weight": "82 g", "color": "white", "spoils_in": "10 days", "comestible_type": "FOOD", "symbol": "%", "quench": 2, "healthy": 1, - "calories": 35, + "calories": 27, "description": "Crisp white cabbage.", "price": 100, "price_postapoc": 100, "material": [ "veggy" ], - "volume": "2250 ml", - "charges": 9, + "volume": "1250 ml", + "charges": 8, "fun": -2, "flags": [ "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", @@ -114,7 +114,7 @@ "symbol": "%", "quench": 2, "healthy": 1, - "calories": 30, + "calories": 43, "description": "A bunch of spinach leaves.", "price": 100, "price_postapoc": 50, @@ -122,7 +122,8 @@ "volume": "2250 ml", "charges": 9, "fun": -2, - "flags": [ "RAW" ], + "flags": [ "SMOKABLE", "RAW" ], + "smoking_result": "dry_veggy", "vitamins": [ [ "calcium", 8 ], [ "iron", 18 ] ] }, { @@ -135,12 +136,12 @@ "comestible_type": "FOOD", "symbol": "%", "healthy": 2, - "calories": 30, + "calories": 39, "description": "A healthy root vegetable. Rich in vitamin A!", "price": 200, "price_postapoc": 50, "material": [ "veggy" ], - "volume": "125 ml", + "volume": "770 ml", "charges": 6, "fun": 1, "flags": [ "SMOKABLE", "RAW" ], @@ -196,12 +197,12 @@ "comestible_type": "FOOD", "symbol": "%", "quench": 3, - "calories": 15, + "calories": 19, "description": "Neither tasty nor very nutritious, but it goes well with salad.", "price": 200, "price_postapoc": 10, "material": [ "veggy" ], - "volume": "1000 ml", + "volume": "190 ml", "flags": [ "FREEZERBURN", "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", "vitamins": [ [ "vitA", 3 ], [ "vitC", 4 ], [ "calcium", 4 ], [ "iron", 1 ] ] @@ -310,19 +311,19 @@ "type": "COMESTIBLE", "id": "cucumber", "name": { "str": "cucumber" }, - "weight": "330 g", + "weight": "185 g", "color": "green", "spoils_in": "6 days 6 hours", "comestible_type": "FOOD", "symbol": "%", "quench": 7, "healthy": 1, - "calories": 48, + "calories": 37, "description": "Comes from the gourd family. Not tasty but very juicy.", "price": 300, "price_postapoc": 50, "material": [ "veggy" ], - "volume": "750 ml", + "volume": "320 ml", "flags": [ "FREEZERBURN", "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", "vitamins": [ [ "vitC", 9 ], [ "calcium", 6 ], [ "iron", 6 ] ] @@ -485,19 +486,19 @@ "type": "COMESTIBLE", "id": "lettuce", "name": { "str": "lettuce" }, - "weight": "38 g", + "weight": "90 g", "color": "light_green", "spoils_in": "10 days", "comestible_type": "FOOD", "symbol": "%", "quench": 2, - "calories": 6, + "calories": 17, "description": "A crisp head of iceberg lettuce.", "price": 100, "price_postapoc": 50, "material": [ "veggy" ], - "volume": "2500 ml", - "charges": 10, + "volume": "850 ml", + "charges": 5, "flags": [ "FREEZERBURN", "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", "vitamins": [ [ "vitA", 16 ], [ "vitC", 4 ], [ "calcium", 1 ], [ "iron", 2 ] ] @@ -530,7 +531,7 @@ "comestible_type": "FOOD", "symbol": "%", "healthy": 1, - "calories": 60, + "calories": 80, "description": "An aromatic onion used in cooking. Cutting these up can make your eyes sting!", "price": 50, "price_postapoc": 50, @@ -592,7 +593,7 @@ "comestible_type": "FOOD", "symbol": "%", "healthy": -2, - "calories": 162, + "calories": 193, "description": "Mildly toxic and not very tasty raw. When cooked, it is delicious.", "price": 90, "price_postapoc": 50, @@ -614,7 +615,7 @@ "symbol": "%", "quench": 5, "healthy": 2, - "calories": 122, + "calories": 27, "description": "A large vegetable, about the size of your head. Not very tasty raw, but is great for cooking.", "price": 250, "price_postapoc": 600, @@ -631,17 +632,17 @@ "type": "COMESTIBLE", "id": "horseradish_greens", "name": { "str_sp": "horseradish greens" }, - "weight": "50 g", + "weight": "70 g", "color": "light_green", "spoils_in": "6 days 16 hours", "comestible_type": "FOOD", "symbol": "%", "healthy": 1, - "calories": 16, + "calories": 22, "description": "Leaves of a horseradish plant with a sharp, bitter and peppery taste. They're edible, but not commonly eaten.", "price": 80, "material": [ "veggy" ], - "volume": "100 ml", + "volume": "140 ml", "fun": -2, "flags": [ "FREEZERBURN", "SMOKABLE", "RAW" ], "smoking_result": "dry_veggy", @@ -650,19 +651,19 @@ { "type": "COMESTIBLE", "id": "raw_dandelion", - "name": { "str_sp": "dandelions" }, - "weight": "58 g", + "name": { "str_sp": "dandelion" }, + "weight": "68 g", "color": "yellow", "spoils_in": "1 day 6 hours", "comestible_type": "FOOD", "symbol": "%", "healthy": 1, - "calories": 26, + "calories": 41, "description": "A collection of freshly picked yellow dandelions. In their current raw state they are quite bitter.", "price": 60, "price_postapoc": 50, "material": [ "veggy" ], - "volume": "250 ml", + "volume": "430 ml", "stack_size": 4, "fun": -12, "flags": [ "FREEZERBURN", "SMOKABLE", "RAW" ], @@ -672,19 +673,19 @@ { "type": "COMESTIBLE", "id": "raw_burdock", - "name": { "str_sp": "burdocks" }, - "weight": "58 g", + "name": { "str_sp": "burdock" }, + "weight": "72 g", "color": "magenta", "spoils_in": "1 day 6 hours", "comestible_type": "FOOD", "symbol": "%", "healthy": 1, - "calories": 51, + "calories": 69, "description": "Burdock, a bitter thistle-like vegetable. Can be eaten raw or cooked.", "price": 60, "price_postapoc": 50, "material": [ "veggy" ], - "volume": "250 ml", + "volume": "470 ml", "stack_size": 4, "fun": -12, "flags": [ "FREEZERBURN", "SMOKABLE", "RAW" ], @@ -702,7 +703,7 @@ "symbol": "%", "quench": 3, "healthy": 3, - "calories": 27, + "calories": 36, "description": "Sour stems of the rhubarb plant, often used in baking pies.", "price": 410, "price_postapoc": 50, @@ -721,7 +722,7 @@ "spoils_in": "95 days", "comestible_type": "FOOD", "symbol": "%", - "calories": 62, + "calories": 82, "description": "This fleshy root is ripe and flowing with sugars; just takes some processing to extract them.", "price": 50, "price_postapoc": 50, @@ -774,7 +775,7 @@ "symbol": "%", "quench": 28, "healthy": 1, - "calories": 41, + "calories": 55, "description": "Juicy red tomato. It gained popularity in Italy after being brought back from the New World.", "price": 90, "price_postapoc": 50, @@ -835,18 +836,18 @@ "type": "COMESTIBLE", "id": "zucchini", "name": { "str": "zucchini" }, - "weight": "196 g", + "weight": "210 g", "color": "light_green", "spoils_in": "5 days", "comestible_type": "FOOD", "symbol": "%", "healthy": 1, - "calories": 33, + "calories": 59, "description": "A tasty summer squash.", "price": 300, "price_postapoc": 50, "material": [ "veggy" ], - "volume": "250 ml", + "volume": "395 ml", "flags": [ "EATEN_HOT", "SMOKABLE" ], "smoking_result": "dry_veggy", "vitamins": [ [ "vitC", 39 ], [ "calcium", 3 ], [ "iron", 4 ] ] @@ -943,7 +944,7 @@ "symbol": "%", "quench": 2, "healthy": 1, - "calories": 31, + "calories": 39, "description": "A green bell pepper. It could be cooked.", "price": 20, "material": [ "veggy" ], diff --git a/data/json/items/comestibles/sandwich.json b/data/json/items/comestibles/sandwich.json index 43eeece5b6e1f..9a00989d5ad2f 100644 --- a/data/json/items/comestibles/sandwich.json +++ b/data/json/items/comestibles/sandwich.json @@ -218,8 +218,7 @@ "healthy": 1, "calories": 328, "description": "A delicious honey sandwich.", - "price": 500, - "price_postapoc": 300, + "price": 175, "material": [ "honey", "wheat" ], "primary_material": "wheat", "volume": "250 ml", @@ -344,7 +343,7 @@ "comestible_type": "FOOD", "symbol": "%", "quench": 2, - "calories": 365, + "calories": 755, "description": "Some damned fool put honey on this peanut butter sandwich, who in their right mind- oh wait this is pretty good.", "price": 175, "price_postapoc": 175, @@ -654,8 +653,7 @@ "healthy": 1, "calories": 328, "description": "A delicious honey sandwich made with wheat-free bread.", - "price": 500, - "price_postapoc": 300, + "price": 175, "material": [ "honey", "veggy" ], "primary_material": "veggy", "volume": "250 ml", @@ -783,7 +781,7 @@ "comestible_type": "FOOD", "symbol": "%", "quench": 2, - "calories": 365, + "calories": 755, "description": "Some damned fool put honey on this peanut butter wheat-free sandwich, who in their right mind- oh wait this is pretty good.", "price": 175, "price_postapoc": 175, diff --git a/data/json/items/comestibles/veggy_dishes.json b/data/json/items/comestibles/veggy_dishes.json index 4fdc147f33e0f..ca51c100c065a 100644 --- a/data/json/items/comestibles/veggy_dishes.json +++ b/data/json/items/comestibles/veggy_dishes.json @@ -650,7 +650,7 @@ "price": 250, "price_postapoc": 50, "material": [ "veggy" ], - "volume": "250 ml", + "volume": "240 ml", "fun": 5 }, { @@ -924,7 +924,7 @@ "price": 450, "price_postapoc": 50, "material": [ "veggy" ], - "volume": "250 ml", + "volume": "240 ml", "vitamins": [ [ "vitC", 85 ], [ "calcium", 17 ] ], "fun": -2 }, diff --git a/data/json/items/containers.json b/data/json/items/containers.json index 21f5f1a7e28e6..2753cdbbbab13 100644 --- a/data/json/items/containers.json +++ b/data/json/items/containers.json @@ -274,7 +274,7 @@ "looks_like": "bottle_plastic", "description": "A watertight glass bottle, holds 750 ml of liquid.", "weight": "450 g", - "volume": "1318 ml", + "volume": "953 ml", "longest_side": "276 mm", "price": 0, "price_postapoc": 10, @@ -304,7 +304,7 @@ "name": { "str": "plastic bottle" }, "description": "A watertight plastic bottle, holds 500 ml of liquid. Some may be factory-sealed to increase shelf life.", "weight": "13 g", - "volume": "502 ml", + "volume": "510 ml", "pocket_data": [ { "pocket_type": "CONTAINER", @@ -363,7 +363,7 @@ "looks_like": "bottle_plastic", "description": "A watertight plastic bottle, holds 250 ml of liquid.", "weight": "7 g", - "volume": "251 ml", + "volume": "255 ml", "pocket_data": [ { "pocket_type": "CONTAINER", @@ -390,7 +390,7 @@ "looks_like": "bottle_plastic", "description": "It's a two-liter plastic bottle that can hold a lot of soda, or, nowadays, boiled water.", "weight": "13 g", - "volume": "2003 ml", + "volume": "2040 ml", "price": 25, "price_postapoc": 10, "material": [ "plastic" ], @@ -416,7 +416,7 @@ "looks_like": "bowl_plastic", "description": "A clay bowl with a waterproofed hide lid. Can be used as a container or as a tool. Holds 250 ml of liquid.", "weight": "60 g", - "volume": "255 ml", + "volume": "295 ml", "price": 100, "price_postapoc": 10, "to_hit": -1, @@ -631,7 +631,7 @@ "name": { "str": "aluminum can" }, "description": "An aluminum can, like what soda comes in.", "weight": "13 g", - "volume": "253 ml", + "volume": "262 ml", "price": 0, "price_postapoc": 0, "to_hit": -3, @@ -765,7 +765,7 @@ "description": "A small tin can, like what tuna comes in.", "//": "Represents a 4 cm radius x 5 cm height steel can.", "weight": "40 g", - "volume": "253 ml", + "volume": "262 ml", "price": 0, "price_postapoc": 0, "material": [ "steel" ], @@ -805,7 +805,7 @@ } ], "qualities": [ [ "BOIL", 1 ] ], - "volume": "503 ml" + "volume": "525 ml" }, { "id": "canteen", @@ -815,7 +815,7 @@ "looks_like": "2lcanteen", "description": "A military-style water canteen with a 1.5 liter capacity. Commonly worn at the hip.", "weight": "155 g", - "volume": "1503 ml", + "volume": "1575 ml", "price": 800, "price_postapoc": 50, "to_hit": 1, @@ -872,7 +872,7 @@ "looks_like": "bowl_clay", "description": "A fragile clay vessel. It can be used to make crude impact grenades or to store liquid.", "weight": "268 g", - "volume": "253 ml", + "volume": "295 ml", "price": 1000, "price_postapoc": 10, "to_hit": 1, @@ -898,7 +898,7 @@ "looks_like": "bowl_clay", "description": "A 15-liter clay pot with three handles for carrying and for pouring.", "weight": "1955 g", - "volume": "15003 ml", + "volume": "17700 ml", "price": 2000, "price_postapoc": 50, "to_hit": -1, @@ -925,7 +925,7 @@ "looks_like": "bowl_clay", "description": "A bulky and heavy clay pot with a waterproofed hide lid, meant to store water, but can carry other liquids in a pinch.", "weight": "4887 g", - "volume": "37500 ml", + "volume": "44250 ml", "price": 10000, "price_postapoc": 10, "to_hit": -2, @@ -937,7 +937,7 @@ "pocket_type": "CONTAINER", "rigid": true, "watertight": true, - "max_contains_volume": "37490 ml", + "max_contains_volume": "37500 ml", "max_contains_weight": "50 kg" } ], @@ -1117,7 +1117,7 @@ "looks_like": "2lcanteen", "description": "A 250 ml metal flask with a hinged screw-on lid, commonly used to discreetly transport alcohol.", "weight": "120 g", - "volume": "251 ml", + "volume": "262 ml", "price": 1000, "price_postapoc": 10, "to_hit": 1, @@ -1201,7 +1201,7 @@ "name": { "str": "plastic jerrycan" }, "description": "A bulky plastic jerrycan, meant to carry fuel, but can carry other liquids in a pinch.", "weight": "1587 g", - "volume": "10003 ml", + "volume": "10500 ml", "price": 1250, "price_postapoc": 50, "to_hit": -2, @@ -1227,7 +1227,7 @@ "looks_like": "jerrycan", "description": "A steel jerrycan, meant to carry fuel, but can carry other liquids in a pinch.", "weight": "4815 g", - "volume": "20002 ml", + "volume": "21000 ml", "price": 5000, "price_postapoc": 100, "to_hit": -3, @@ -1255,7 +1255,7 @@ "looks_like": "bowl_clay", "description": "A clay container with a lid, used to hold and pour liquids.", "weight": "400 g", - "volume": "1002 ml", + "volume": "1180 ml", "price": 100, "price_postapoc": 10, "bashing": 1, @@ -1281,7 +1281,7 @@ "looks_like": "bottle_plastic", "description": "A standard plastic jug used for milk and household cleaning chemicals. Some may be factory-sealed to increase shelf life.", "weight": "190 g", - "volume": "3752 ml", + "volume": "3825 ml", "price": 0, "price_postapoc": 10, "to_hit": 1, @@ -1336,7 +1336,7 @@ "looks_like": "keg", "description": "A reusable heavy steel keg, used for shipping beer. It has a capacity of 50 liters.", "weight": "12600 g", - "volume": "50050 ml", + "volume": "52500 ml", "price": 8000, "price_postapoc": 250, "to_hit": -5, diff --git a/data/json/items/generic.json b/data/json/items/generic.json index e090dfb6d3f91..ea973c1424921 100644 --- a/data/json/items/generic.json +++ b/data/json/items/generic.json @@ -539,10 +539,21 @@ "description": "An empty canister, which may have once held tear gas or other substances.", "material": [ "steel" ], "weight": "40 g", - "volume": "250 ml", + "volume": "263 ml", "bashing": 2, "to_hit": -1, "qualities": [ [ "BOIL", 2 ], [ "CONTAIN", 1 ] ], + "pocket_data": [ + { + "pocket_type": "CONTAINER", + "rigid": true, + "watertight": true, + "open_container": true, + "max_contains_volume": "250 ml", + "max_contains_weight": "1 kg", + "sealed_data": { "spoil_multiplier": 0.0 } + } + ], "flags": [ "TRADER_AVOID" ] }, { diff --git a/data/json/items/ranged/archery.json b/data/json/items/ranged/archery.json index 4ca3e2ebc0d28..3c693c76f1e31 100644 --- a/data/json/items/ranged/archery.json +++ b/data/json/items/ranged/archery.json @@ -326,7 +326,7 @@ "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.1 }, "dispersion": 285, "loudness": 0, - "effects": [ "EXPLOSIVE_SMALL" ] + "effects": [ "COOKOFF", "EXPLOSIVE_SMALL" ] }, { "type": "GENERIC", @@ -340,7 +340,7 @@ "price_postapoc": 250, "material": [ "steel" ], "weight": "562 g", - "volume": "250 ml", + "volume": "90 ml", "bashing": 10, "to_hit": -1 }, diff --git a/data/json/items/ranged/crossbows.json b/data/json/items/ranged/crossbows.json index 865b61a50b558..513cf3977b95d 100644 --- a/data/json/items/ranged/crossbows.json +++ b/data/json/items/ranged/crossbows.json @@ -282,17 +282,16 @@ "color": "green", "description": "A lightweight, sharpened bolt made from some kind of metal. It is fairly unwieldy and only provides moderate accuracy, due to being filled with explosives and fitted with an impact trigger.", "material": [ "steel", "powder" ], - "volume": "250 ml", + "volume": "100 ml", "longest_side": "400 mm", "price_postapoc": 2500, "weight": "620 g", "bashing": 1, "ammo_type": "bolt", - "damage": { "damage_type": "stab", "amount": 12, "armor_penetration": 2 }, - "range": 8, - "dispersion": 135, + "damage": { "damage_type": "stab", "constant_damage_multiplier": 0.1 }, + "range": 0, + "dispersion": 285, "loudness": 0, - "stack_size": 10, "effects": [ "COOKOFF", "EXPLOSIVE_SMALL" ] }, { diff --git a/data/json/items/tool/cooking.json b/data/json/items/tool/cooking.json index 9692dc96ce5ac..2ff8f46fb4613 100644 --- a/data/json/items/tool/cooking.json +++ b/data/json/items/tool/cooking.json @@ -303,8 +303,9 @@ "category": "food", "name": { "str": "fermenting eggs jar" }, "description": "This jar contains a batch of eggs in a pickling solution. You can seal up the jar once the process is completed.", - "weight": "52 g", - "volume": "250 ml", + "weight": "700 g", + "volume": "680 ml", + "longest_side": "132 mm", "price": 10, "price_postapoc": 10, "bashing": 8, @@ -348,8 +349,9 @@ "category": "food", "name": { "str_sp": "sealed yeast culture" }, "description": "A sealed flask holding sanitized yeast wort. You may harvest the yeast inside when it's done culturing.", - "weight": "52 g", - "volume": "250 ml", + "weight": "460 g", + "volume": "680 ml", + "longest_side": "132 mm", "price": 10, "price_postapoc": 10, "bashing": 8, @@ -359,7 +361,7 @@ "use_action": { "target": "yeast", "msg": "You open the flask and harvest the culture.", - "container": "flask_glass", + "container": "jar_glass_sealed", "target_charges": 10, "moves": 50, "type": "delayed_transform", @@ -561,7 +563,8 @@ "looks_like": "jar_glass_sealed", "description": "This jar contains raw milk separated into cream. It is sealed until you are ready to use it.", "weight": "3461 g", - "volume": "3000 ml", + "volume": "3850 ml", + "longest_side": "298 mm", "price": 10, "price_postapoc": 10, "bashing": 8, @@ -576,7 +579,8 @@ "name": { "str": "rising cream jar" }, "description": "This jar contains raw milk separating into cream. You can seal up the jar once the process is completed.", "weight": "3461 g", - "volume": "3000 ml", + "volume": "3850 ml", + "longest_side": "298 mm", "price": 10, "price_postapoc": 10, "bashing": 8, @@ -725,8 +729,9 @@ "category": "food", "name": { "str": "fermenting pickle jar" }, "description": "This jar contains a batch of pickles set to ferment. You can seal up the jar once the process is completed.", - "weight": "52 g", - "volume": "250 ml", + "weight": "850 g", + "volume": "680 ml", + "longest_side": "132 mm", "price": 10, "price_postapoc": 10, "bashing": 8, @@ -807,8 +812,9 @@ "category": "food", "name": { "str": "fermenting sauerkraut jar" }, "description": "This jar contains a batch of sauerkraut set to ferment. You can seal up the jar once the process is completed.", - "weight": "1750 g", - "volume": "500 ml", + "weight": "710 g", + "volume": "680 ml", + "longest_side": "132 mm", "price": 10, "price_postapoc": 10, "bashing": 4, diff --git a/data/json/items/tool/explosives.json b/data/json/items/tool/explosives.json index 66cdc2e07ec0d..31c2df85dc037 100644 --- a/data/json/items/tool/explosives.json +++ b/data/json/items/tool/explosives.json @@ -6,7 +6,8 @@ "name": { "str": "acid bomb" }, "description": "This is a fragile container filled with acid. Throw it to spill out a pool of potent acid.", "weight": "650 g", - "volume": "500 ml", + "volume": "680 ml", + "longest_side": "132 mm", "price": 5000, "price_postapoc": 500, "to_hit": -1, @@ -307,7 +308,7 @@ "name": { "str": "flashbang" }, "description": "This is a military police style flashbang. Use this item to pull the pin and light the fuse. You will then have five seconds before it detonates with intense light and sound, blinding, deafening and disorienting anyone nearby.", "weight": "236 g", - "volume": "250 ml", + "volume": "270 ml", "price": 2000, "price_postapoc": 250, "to_hit": -1, @@ -329,18 +330,11 @@ { "id": "flashbang_act", "type": "TOOL", - "category": "weapons", + "copy-from": "flashbang", "name": { "str": "active flashbang" }, "description": "This flashbang is active, and will soon detonate with intense light and sound, blinding, deafening and disorienting anyone nearby. It may be a good idea to throw it!", - "weight": "236 g", - "volume": "250 ml", "price": 0, "price_postapoc": 0, - "to_hit": -1, - "bashing": 5, - "material": [ "steel", "plastic" ], - "symbol": "*", - "color": "dark_gray", "initial_charges": 5, "max_charges": 5, "turns_per_charge": 1, @@ -355,65 +349,62 @@ }, { "id": "fungicidalbomb", - "copy-from": "grenade_canister", - "looks_like": "smokebomb", + "copy-from": "gasbomb", "type": "GENERIC", "name": { "str": "fungicidal gas grenade" }, "price": 3600, "price_postapoc": 750, "description": "This is a canister grenade filled with fungicidal solution. Use this item to pull the pin and light the fuse, turning it into an active fungicidal grenade. In five seconds it will begin to expel a volatile spray that is highly toxic to fungal life forms.", - "use_action": { "need_wielding": true, "menu_text": "Pull pin", "type": "transform", "target": "fungicidalbomb_act" } + "use_action": { + "need_wielding": true, + "menu_text": "Pull pin", + "msg": "You pull the pin.", + "type": "transform", + "target": "fungicidalbomb_act" + } }, { "id": "fungicidalbomb_act", - "copy-from": "gasbomb", - "looks_like": "smokebomb_act", + "copy-from": "gasbomb_act", "type": "GENERIC", "name": { "str": "armed fungicidal gas canister" }, "description": "This fungicidal bomb has had its pin removed and is expelling highly toxic gas.", - "emits": [ "emit_fungicidal_stream" ], - "countdown_interval": 50, - "countdown_action": { "type": "transform", "target": "canister_empty" }, - "flags": [ "TRADER_AVOID" ] + "emits": [ "emit_fungicidal_stream" ] }, { "id": "fungicidalbomb_makeshift", - "copy-from": "grenade_canister", - "looks_like": "smokebomb", + "copy-from": "gasbomb", "type": "GENERIC", "name": { "str": "makeshift fungicidal gas grenade" }, "price": 3600, "price_postapoc": 500, "description": "This is a makeshift canister grenade filled with fungicidal solution. Use this item to pull the pin and light the fuse, turning it into an active fungicidal grenade. In five seconds it will begin to expel a volatile spray that is highly toxic to fungal life forms.", - "use_action": { "need_wielding": true, "menu_text": "Pull pin", "type": "transform", "target": "fungicidalbomb_makeshift_act" } + "use_action": { + "need_wielding": true, + "menu_text": "Pull pin", + "msg": "You pull the pin.", + "type": "transform", + "target": "fungicidalbomb_makeshift_act" + } }, { "id": "fungicidalbomb_makeshift_act", - "copy-from": "gasbomb", - "looks_like": "smokebomb_act", + "copy-from": "gasbomb_act", "type": "GENERIC", "name": { "str": "armed makeshift fungicidal gas canister" }, "description": "This makeshift fungicidal bomb has had its pin removed and is expelling highly toxic haze.", - "emits": [ "emit_small_fungicidal_stream" ], - "countdown_interval": 50, - "countdown_action": { "type": "transform", "target": "canister_empty" }, - "flags": [ "TRADER_AVOID" ] + "emits": [ "emit_small_fungicidal_stream" ] }, { "id": "gasbomb_makeshift", - "type": "TOOL", - "category": "weapons", + "copy-from": "gasbomb", + "type": "GENERIC", "name": { "str": "makeshift gas canister" }, "description": "This is a crude gasbomb using household chemicals. Use this item to arm it. In three seconds it will begin to expel a highly toxic gas for a short time. This gas poisons those exposed to it, in addition to obscuring vision and scent.", "weight": "1264 g", - "volume": "250 ml", + "volume": "270 ml", "price": 500, "price_postapoc": 250, - "to_hit": -1, - "bashing": 6, - "material": [ "steel" ], - "symbol": "*", - "color": "dark_gray", "use_action": { "need_wielding": true, "target": "gasbomb_makeshift_act", @@ -432,7 +423,7 @@ "name": { "str": "active makeshift gas canister" }, "description": "This homemade canister of poison gas has been unsealed, and is (or will shortly be) expelling highly toxic gas. You should consider getting rid of it soon.", "weight": "1264 g", - "volume": "250 ml", + "volume": "270 ml", "price": 0, "price_postapoc": 0, "to_hit": -1, @@ -454,7 +445,7 @@ "sound_msg": "Hiss.", "no_deactivate_msg": "You've already armed the %s; try throwing it instead." }, - "flags": [ "TRADER_AVOID" ] + "flags": [ "TRADER_AVOID", "DANGEROUS" ] }, { "id": "grenade", @@ -463,7 +454,7 @@ "name": { "str": "grenade" }, "description": "This is a military-grade fragmentary hand grenade. Use this item to pull the pin and light the fuse. You will then have five seconds before it explodes; throwing it would be a good idea.", "weight": "397 g", - "volume": "250 ml", + "volume": "540 ml", "price": 1500, "price_postapoc": 1000, "to_hit": -1, @@ -489,7 +480,7 @@ "name": { "str": "active grenade" }, "description": "This is an active grenade, and will explode any second now. Better throw it!", "weight": "397 g", - "volume": "250 ml", + "volume": "270 ml", "price": 0, "price_postapoc": 0, "to_hit": -1, @@ -507,7 +498,7 @@ "no_deactivate_msg": "You've already pulled the %s's pin; try throwing it instead.", "explosion": { "power": 240, "shrapnel": { "casing_mass": 217, "fragment_mass": 0.08 } } }, - "flags": [ "BOMB", "TRADER_AVOID" ] + "flags": [ "BOMB", "TRADER_AVOID", "DANGEROUS" ] }, { "id": "grenade_emp", @@ -516,7 +507,7 @@ "name": { "str": "EMP grenade" }, "description": "This is a grenade that generates an electromagnetic pulse with a low-inductance capacitor bank discharged into a single-loop antenna. It also produces a mild electric shock cloud. Use this item to pull the pin and light the fuse, turning it into an active EMP grenade. You will then have three seconds before it detonates, creating an EMP field that damages robots and drains bionic energy.", "weight": "400 g", - "volume": "250 ml", + "volume": "270 ml", "price": 6000, "//": "Something this useful doesn't come cheap after the apocalypse", "price_postapoc": 4000, @@ -544,7 +535,7 @@ "name": { "str": "active EMP grenade" }, "description": "This EMP grenade is active, and will shortly detonate, creating a large EMP field that damages robots and drains bionic energy as well as a mild electric shock cloud. You may not want to be holding it much longer.", "weight": "400 g", - "volume": "250 ml", + "volume": "270 ml", "price": 0, "price_postapoc": 0, "to_hit": -1, @@ -575,7 +566,7 @@ "name": { "str": "incendiary grenade" }, "description": "This is a military-grade incendiary hand grenade. Use this item to pull the pin and light the fuse. You will then have five seconds before it explodes into a raging inferno; throwing it would be a good idea.", "weight": "180 g", - "volume": "250 ml", + "volume": "270 ml", "price": 2000, "price_postapoc": 1500, "to_hit": -1, @@ -601,7 +592,7 @@ "name": { "str": "active incendiary grenade" }, "description": "This is an active incendiary grenade, likely to burst into an inferno any second now. Better throw it!", "weight": "180 g", - "volume": "250 ml", + "volume": "270 ml", "price": 0, "price_postapoc": 0, "to_hit": -1, @@ -614,7 +605,7 @@ "turns_per_charge": 1, "revert_to": "canister_empty", "use_action": [ "GRENADE_INC_ACT" ], - "flags": [ "ACT_IN_FIRE", "BOMB", "TRADER_AVOID" ] + "flags": [ "ACT_IN_FIRE", "BOMB", "TRADER_AVOID", "DANGEROUS" ] }, { "abstract": "grenade_canister", @@ -622,7 +613,7 @@ "category": "weapons", "name": { "str": "canister grenade" }, "weight": "1058 g", - "volume": "250 ml", + "volume": "270 ml", "material": [ "steel" ], "symbol": "*", "color": "dark_gray", @@ -633,16 +624,24 @@ { "id": "gasbomb", "copy-from": "grenade_canister", + "looks_like": "smokebomb", "type": "GENERIC", "name": { "str": "tear gas grenade" }, "price": 3600, "price_postapoc": 250, "description": "This is a canister grenade filled with noxious irritant. Use this item to pull the pin and light the fuse, turning it into an active tear gas grenade. In five seconds it will begin to expel a highly toxic gas for some time. This gas damages and slows those who enter it, as well as obscuring vision and scent.", - "use_action": { "need_wielding": true, "menu_text": "Pull pin", "type": "transform", "target": "gasbomb_act" } + "use_action": { + "need_wielding": true, + "menu_text": "Pull pin", + "msg": "You pull the pin.", + "type": "transform", + "target": "gasbomb_act" + } }, { "id": "gasbomb_act", "copy-from": "gasbomb", + "looks_like": "smokebomb_act", "type": "GENERIC", "name": { "str": "armed tear gas canister" }, "price_postapoc": 0, @@ -650,55 +649,55 @@ "emits": [ "emit_tear_gas_stream" ], "countdown_interval": 50, "countdown_action": { "type": "transform", "target": "canister_empty" }, - "flags": [ "TRADER_AVOID" ] + "flags": [ "TRADER_AVOID", "DANGEROUS" ] }, { "id": "insecticidalbomb", - "copy-from": "grenade_canister", - "looks_like": "smokebomb", + "copy-from": "gasbomb", "type": "GENERIC", "name": { "str": "insecticidal gas grenade" }, "price": 3600, "price_postapoc": 750, "description": "This is a canister grenade filled with insecticidal solution. Use this item to pull the pin and light the fuse, turning it into an active insecticidal grenade. In five seconds it will begin to expel a volatile spray that is highly toxic to insect life forms.", - "use_action": { "need_wielding": true, "menu_text": "Pull pin", "type": "transform", "target": "insecticidalbomb_act" } + "use_action": { + "need_wielding": true, + "menu_text": "Pull pin", + "msg": "You pull the pin.", + "type": "transform", + "target": "insecticidalbomb_act" + } }, { "id": "insecticidalbomb_act", - "copy-from": "gasbomb", - "looks_like": "smokebomb_act", + "copy-from": "gasbomb_act", "type": "GENERIC", "name": { "str": "armed insecticidal gas canister" }, - "price_postapoc": 0, "description": "This insecticidal bomb has had its pin removed and is expelling highly toxic haze.", - "emits": [ "emit_insecticidal_stream" ], - "countdown_interval": 50, - "countdown_action": { "type": "transform", "target": "canister_empty" }, - "flags": [ "TRADER_AVOID" ] + "emits": [ "emit_insecticidal_stream" ] }, { "id": "insecticidalbomb_makeshift", - "copy-from": "grenade_canister", - "looks_like": "smokebomb", + "copy-from": "gasbomb", "type": "GENERIC", "name": { "str": "makeshift insecticidal gas grenade" }, "price": 3600, "price_postapoc": 500, "description": "This is a makeshift canister grenade filled with insecticidal solution. Use this item to pull the pin and light the fuse, turning it into an active insecticidal grenade. In five seconds it will begin to expel a volatile spray that is highly toxic to insect life forms.", - "use_action": { "need_wielding": true, "menu_text": "Pull pin", "type": "transform", "target": "insecticidalbomb_makeshift_act" } + "use_action": { + "need_wielding": true, + "menu_text": "Pull pin", + "msg": "You pull the pin.", + "type": "transform", + "target": "insecticidalbomb_makeshift_act" + } }, { "id": "insecticidalbomb_makeshift_act", "copy-from": "gasbomb", - "looks_like": "smokebomb_act", "type": "GENERIC", "name": { "str": "armed makeshift insecticidal gas canister" }, - "price_postapoc": 0, "description": "This makeshift insecticidal bomb has had its pin removed and is expelling highly toxic haze.", - "emits": [ "emit_small_insecticidal_stream" ], - "countdown_interval": 50, - "countdown_action": { "type": "transform", "target": "canister_empty" }, - "flags": [ "TRADER_AVOID" ] + "emits": [ "emit_small_insecticidal_stream" ] }, { "id": "LAW_Packed", @@ -779,8 +778,9 @@ "category": "weapons", "name": { "str": "Molotov cocktail" }, "description": "A bottle of flammable liquid with a rag inserted. Use this item to light the rag. 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", + "longest_side": "276 mm", "price": 500, "price_postapoc": 500, "to_hit": 1, @@ -831,7 +831,7 @@ "name": { "str": "scrambler grenade" }, "description": "This is a specialized grenade, designed to scramble robots' IFF control chips. This converts the robot to your side for a short time, before the backup systems kick in. Use this item to pull the pin and light the fuse, turning it into an active scrambler grenade.", "weight": "500 g", - "volume": "250 ml", + "volume": "270 ml", "price": 6000, "//": "Something this useful doesn't come cheap after the apocalypse", "price_postapoc": 5000, @@ -858,7 +858,7 @@ "name": { "str": "active scrambler grenade" }, "description": "This scrambler grenade is active, and will soon detonate, releasing a control wave that temporarily converts robots to your side.", "weight": "500 g", - "volume": "250 ml", + "volume": "270 ml", "price": 0, "price_postapoc": 0, "to_hit": -1, @@ -882,7 +882,7 @@ }, { "id": "smokebomb", - "copy-from": "grenade_canister", + "copy-from": "gasbomb", "type": "GENERIC", "name": { "str": "smoke bomb" }, "description": "This is a canister grenade filled with a variety of pyrotechnic chemicals. Use this item to pull the pin and light the fuse, turning it into an active smoke bomb. Five seconds after you do that, it will begin to expel a thick black smoke. This smoke will slow those who enter it, as well as obscuring vision and scent.", @@ -957,7 +957,7 @@ "no_deactivate_msg": "You've already lit the fuse - get rid of it immediately!", "explosion": { "power": 1 } }, - "flags": [ "BOMB", "TRADER_AVOID" ] + "flags": [ "BOMB", "TRADER_AVOID", "DANGEROUS" ] }, { "id": "military_explosive_small_grenade", @@ -967,6 +967,7 @@ "looks_like": "grenade", "description": "A improvised explosive device cobbled together from parts. Use this item light the fuse. You will then have some amount of time before it explodes; throwing it would be a good idea.", "weight": "600 g", + "volume": "270 ml", "price": 1500, "material": [ "aluminum", "iron" ], "symbol": "*", @@ -1001,7 +1002,7 @@ "sound_msg": "sssssh.", "no_deactivate_msg": "You've already lit the %s's fuse; try throwing it instead." }, - "flags": [ "BOMB", "TRADER_AVOID" ] + "flags": [ "BOMB", "TRADER_AVOID", "DANGEROUS" ] }, { "id": "military_explosive_grenade", @@ -1011,6 +1012,7 @@ "looks_like": "grenade", "description": "A improvised explosive device cobbled together from parts. Use this item light the fuse. You will then have some amount of time before it explodes; throwing it would be a good idea.", "weight": "1200 g", + "volume": "540 ml", "price": 3000, "material": [ "aluminum", "iron" ], "symbol": "*", @@ -1045,7 +1047,7 @@ "sound_msg": "sssssh.", "no_deactivate_msg": "You've already lit the %s's fuse; try throwing it instead." }, - "flags": [ "BOMB", "TRADER_AVOID" ] + "flags": [ "BOMB", "TRADER_AVOID", "DANGEROUS" ] }, { "id": "military_explosive_pipebomb", @@ -1080,12 +1082,9 @@ "copy-from": "military_explosive_pipebomb", "type": "TOOL", "name": { "str": "active military explosive pipebomb" }, - "looks_like": "pipebomb", + "looks_like": "pipebomb_act", "description": "This pipebomb's pin is pulled, and it will explode any second now. Throw it immediately!", - "volume": "500 ml", "price": 0, - "material": [ "steel" ], - "symbol": "*", "color": "light_gray", "initial_charges": 6, "max_charges": 6, @@ -1105,7 +1104,7 @@ "looks_like": "homemade_bomb", "description": "This is a home-made explosive device, consisting of a large plastic jug filled with military explosives and scrap metal, equipped with a delayed fuse. Use this item to pull the pin. Once you do it should explode in about 20 seconds.", "weight": "8760 g", - "volume": "3750 ml", + "volume": "3900 ml", "price": 20000, "to_hit": -2, "material": [ "steel", "plastic" ], @@ -1124,17 +1123,12 @@ }, { "id": "military_explosive_bomb_act", + "copy-from": "military_explosive_bomb", "type": "TOOL", - "category": "weapons", "name": { "str": "active military explosive bomb" }, "looks_like": "homemade_bomb_act", "description": "This is a home-made explosive device, consisting of a large plastic jug filled with military explosives and scrap metal, whose fuse has been lit, its final countdown starting.", - "weight": "8760 g", - "volume": "3750 ml", "price": 0, - "to_hit": -2, - "material": [ "steel", "plastic" ], - "symbol": "*", "color": "light_red", "initial_charges": 20, "max_charges": 20, @@ -1144,7 +1138,7 @@ "no_deactivate_msg": "You've already pulled the pin - run!", "explosion": { "power": 6970, "shrapnel": { "casing_mass": 3000, "fragment_mass": 0.5, "drop": "scrap", "recovery": 20 } } }, - "flags": [ "BOMB", "TRADER_AVOID" ] + "flags": [ "BOMB", "TRADER_AVOID", "DANGEROUS" ] }, { "id": "military_explosive_half_barrel_bomb", @@ -1154,7 +1148,7 @@ "looks_like": "half_barrel_bomb", "description": "This is a metal keg, filled with a lot of military explosives. Once it has been activated it will explode in 100 seconds, raining fire and steel on everything in sight.", "weight": "92600 g", - "volume": "50 L", + "volume": "52500 ml", "price": 45000, "to_hit": -5, "bashing": 20, @@ -1181,7 +1175,7 @@ "looks_like": "half_barrel_bomb_act", "description": "This is a metal keg, filled with a lot of military explosives. It has been activated and will soon explode, delivering its entire destructive power to everything in sight.", "weight": "92600 g", - "volume": "50 L", + "volume": "52500 ml", "price": 0, "to_hit": -5, "bashing": 20, @@ -1198,7 +1192,7 @@ "no_deactivate_msg": "You've already activated the bomb - clear the area immediately!", "explosion": { "power": 100000, "shrapnel": { "casing_mass": 12600, "fragment_mass": 600 } } }, - "flags": [ "BOMB", "TRADER_AVOID" ] + "flags": [ "BOMB", "TRADER_AVOID", "DANGEROUS" ] }, { "id": "military_explosive_full_barrel_bomb", @@ -1207,7 +1201,7 @@ "name": { "str": "military explosive 100L barrel bomb" }, "description": "This is a 100L metal barrel, filled with a lot of military explosives. Once it has been activated it will explode in 100 seconds, raining fire and steel on everything in sight.", "weight": "172000 g", - "volume": "100 L", + "volume": "105 L", "price": 90000, "to_hit": -5, "bashing": 20, @@ -1233,7 +1227,7 @@ "name": { "str": "active military explosive 100L barrel bomb" }, "description": "This is a 100L metal barrel, filled with a lot of military explosives. It has been activated and will soon explode, delivering its entire destructive power to everything in sight.", "weight": "172000 g", - "volume": "50 L", + "volume": "105 L", "price": 0, "to_hit": -5, "bashing": 20, @@ -1250,7 +1244,7 @@ "no_deactivate_msg": "You've already activated the bomb - clear the area immediately!", "explosion": { "power": 200000, "shrapnel": { "casing_mass": 12600, "fragment_mass": 600 } } }, - "flags": [ "BOMB", "TRADER_AVOID" ] + "flags": [ "BOMB", "TRADER_AVOID", "DANGEROUS" ] }, { "id": "small_homemade_grenade", @@ -1260,6 +1254,7 @@ "looks_like": "homemade_grenade", "description": "An improvised explosive device cobbled together from spare parts. Use this item light the fuse. You will then have 5 seconds before it explodes; throwing it would be a good idea.", "weight": "460 g", + "volume": "270 ml", "price": 750, "material": [ "aluminum", "iron" ], "symbol": "*", @@ -1295,7 +1290,7 @@ "no_deactivate_msg": "You've already lit the %s's fuse; try throwing it instead.", "explosion": { "power": 150, "shrapnel": { "casing_mass": 200, "fragment_mass": 0.4 } } }, - "flags": [ "BOMB", "TRADER_AVOID" ] + "flags": [ "BOMB", "TRADER_AVOID", "DANGEROUS" ] }, { "id": "homemade_grenade", @@ -1339,7 +1334,7 @@ "no_deactivate_msg": "You've already lit the %s's fuse; try throwing it instead.", "explosion": { "power": 300, "shrapnel": { "casing_mass": 400, "fragment_mass": 0.4 } } }, - "flags": [ "BOMB", "TRADER_AVOID" ] + "flags": [ "BOMB", "TRADER_AVOID", "DANGEROUS" ] }, { "id": "pipebomb", @@ -1407,7 +1402,7 @@ "name": { "str": "homemade bomb" }, "description": "This is a home-made explosive device, consisting of a large plastic jug filled with stable explosives and scrap metal, equipped with a long fuse. Use this item to light the fuse. Once you do it should explode in about 20 seconds.", "weight": "6500 g", - "volume": "3750 ml", + "volume": "3900 ml", "price": 10000, "to_hit": -2, "material": [ "steel", "plastic" ], @@ -1433,7 +1428,7 @@ "name": { "str": "homemade bomb" }, "description": "This is a home-made explosive device, consisting of a large plastic jug filled with stable explosives and scrap metal, whose fuse has been lit, its final countdown starting.", "weight": "6500 g", - "volume": "3750 ml", + "volume": "3900 ml", "price": 0, "to_hit": -2, "material": [ "steel", "plastic" ], @@ -1451,7 +1446,7 @@ "no_deactivate_msg": "You've already lit the fuse - run!", "explosion": { "power": 2320, "shrapnel": { "casing_mass": 3000, "fragment_mass": 0.5, "drop": "scrap", "recovery": 20 } } }, - "flags": [ "BOMB", "TRADER_AVOID" ] + "flags": [ "BOMB", "TRADER_AVOID", "DANGEROUS" ] }, { "id": "homemade_demolition_charge", @@ -1460,7 +1455,7 @@ "name": { "str": "homemade demolition charge" }, "description": "This is a improvised demolition charge. Use this item to light the fuse. You will, of course, need a lighter or matches in your inventory to do this. 20 seconds after lighting the fuse, this item will explode, so get away!", "weight": "3875 g", - "volume": "3750 ml", + "volume": "3900 ml", "price": 0, "to_hit": -3, "bashing": 4, @@ -1487,7 +1482,7 @@ "name": { "str": "homemade demolition charge (lit)", "str_pl": "homemade demolition charges (lit)" }, "description": "The fuse on this primitive demolition charge is lit and hissing. It'll explode any moment now.", "weight": "3875 g", - "volume": "3750 ml", + "volume": "3900 ml", "price": 0, "price_postapoc": 0, "to_hit": -3, @@ -1516,7 +1511,7 @@ "name": { "str": "50L barrel bomb" }, "description": "This is a metal keg, filled with a lot of stable explosives. Contains a volatile explosive core so 100 seconds after the fuse has been lit the charge detonates completely and delivers its entire destructive power to everything in sight.", "weight": "61620 g", - "volume": "50 L", + "volume": "52500 ml", "price": 100000, "to_hit": -5, "bashing": 20, @@ -1542,7 +1537,7 @@ "name": { "str": "active 50L barrel bomb" }, "description": "This is a metal keg, filled with a lot of stable explosives. The fuse has been lit and once it ignites the primary explosive, the bomb will detonate and rain fire and steel on everything in sight.", "weight": "61620 g", - "volume": "50 L", + "volume": "52500 ml", "price": 0, "to_hit": -5, "bashing": 20, @@ -1559,7 +1554,7 @@ "no_deactivate_msg": "You've already activated the bomb - clear the area immediately!", "explosion": { "power": 34400, "shrapnel": { "casing_mass": 12600, "fragment_mass": 600 } } }, - "flags": [ "BOMB", "TRADER_AVOID" ] + "flags": [ "BOMB", "TRADER_AVOID", "DANGEROUS" ] }, { "id": "full_barrel_bomb", @@ -1568,7 +1563,7 @@ "name": { "str": "100L barrel bomb" }, "description": "This is a 100L metal barrel, filled with a lot of military explosives. Once it has been activated it will explode in 100 seconds, raining fire and steel on everything in sight.", "weight": "110610 g", - "volume": "100 L", + "volume": "105 L", "price": 90000, "to_hit": -5, "bashing": 20, @@ -1594,7 +1589,7 @@ "name": { "str": "active 100L barrel bomb" }, "description": "This is a 100L metal barrel, filled with a lot of military explosives. It has been activated and will soon explode, delivering its entire destructive power to everything in sight.", "weight": "110610 g", - "volume": "50 L", + "volume": "105 L", "price": 0, "to_hit": -5, "bashing": 20, @@ -1611,6 +1606,6 @@ "no_deactivate_msg": "You've already activated the bomb - clear the area immediately!", "explosion": { "power": 69200, "shrapnel": { "casing_mass": 12000, "fragment_mass": 600 } } }, - "flags": [ "BOMB", "TRADER_AVOID" ] + "flags": [ "BOMB", "TRADER_AVOID", "DANGEROUS" ] } ] diff --git a/data/json/items/tool/fire.json b/data/json/items/tool/fire.json index b9967f3a03193..29709300cdb4b 100644 --- a/data/json/items/tool/fire.json +++ b/data/json/items/tool/fire.json @@ -216,15 +216,15 @@ "type": "TOOL", "name": { "str": "ember carrier" }, "description": "This is a small container for holding tinder, with holes punched in it to provide a controlled airflow. It can nurture a smoldering ember for a long time, to start fires without modern tools.", - "weight": "500 g", - "volume": "500 ml", + "weight": "40 g", + "volume": "263 ml", "price": 1000, "price_postapoc": 100, "material": [ "steel" ], "symbol": ",", "color": "light_gray", "ammo": [ "tinder" ], - "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "tinder": 100 } } ], + "pocket_data": [ { "pocket_type": "MAGAZINE", "rigid": true, "ammo_restriction": { "tinder": 50 } } ], "use_action": { "target": "tinderbox_on", "msg": "You light the tinder.", @@ -241,8 +241,8 @@ "type": "TOOL", "name": { "str": "ember carrier (lit)", "str_pl": "ember carriers (lit)" }, "description": "This is a small container for holding tinder, with holes punched in it to provide a controlled airflow. An ember is smoldering inside it, and can be used to start a campfire.", - "weight": "500 g", - "volume": "500 ml", + "weight": "40 g", + "volume": "263 ml", "price": 1000, "price_postapoc": 100, "material": [ "steel" ], diff --git a/data/json/items/tool/lighting.json b/data/json/items/tool/lighting.json index 00b840cde4474..5be42efa065a9 100644 --- a/data/json/items/tool/lighting.json +++ b/data/json/items/tool/lighting.json @@ -185,7 +185,7 @@ "symbol": ";", "color": "blue", "weight": "280 g", - "volume": "80 ml", + "volume": "270 ml", "longest_side": "14 cm", "price": 500, "price_postapoc": 100, diff --git a/data/json/items/tool/science.json b/data/json/items/tool/science.json index 13818a1d1f254..1ae8a19e5876c 100644 --- a/data/json/items/tool/science.json +++ b/data/json/items/tool/science.json @@ -22,7 +22,7 @@ "name": { "str": "goo canister" }, "description": "There is a label on this canister: \"Warning: contains highly toxic and corrosive materials. Contents may be sentient. Open at your own risk.\" You think you can feel something moving inside it.", "weight": "1596 g", - "volume": "500 ml", + "volume": "270 ml", "price": 35000, "price_postapoc": 1000, "to_hit": 1, diff --git a/data/json/recipes/food/baking.json b/data/json/recipes/food/baking.json index 000c4f3f23f72..ea24c61297b83 100644 --- a/data/json/recipes/food/baking.json +++ b/data/json/recipes/food/baking.json @@ -54,7 +54,7 @@ [ [ "apple_cider", 2 ], [ "apple", 2 ], [ "irradiated_apple", 2 ] ], [ [ "pumpkin", 2 ], [ "irradiated_pumpkin", 2 ] ], [ [ "sugar", 4 ], [ "artificial_sweetener", 4 ] ], - [ [ "powder_eggs", 2 ], [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], + [ [ "eggs_any_shape", 2, "LIST" ] ], [ [ "any_butter_or_oil", 2, "LIST" ] ], [ [ "salt", 2 ] ], [ [ "cinnamon", 2 ] ] diff --git a/data/json/recipes/food/bread.json b/data/json/recipes/food/bread.json index b66cbb0cfec04..32f679bacbffa 100644 --- a/data/json/recipes/food/bread.json +++ b/data/json/recipes/food/bread.json @@ -19,7 +19,7 @@ [ [ "milk_standard_raw", 2, "LIST" ] ], [ [ "pumpkin", 2 ], [ "irradiated_pumpkin", 2 ] ], [ [ "sugar", 4 ], [ "artificial_sweetener", 4 ] ], - [ [ "powder_eggs", 2 ], [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], + [ [ "eggs_any_shape", 2, "LIST" ] ], [ [ "any_butter_or_oil", 2, "LIST" ] ], [ [ "salt", 2 ] ] ] @@ -138,7 +138,7 @@ "batch_time_factors": [ 50, 2 ], "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], - "components": [ [ [ "bread", 1 ] ] ] + "components": [ [ [ "bread_sandwich", 1, "LIST" ] ] ] }, { "type": "recipe", @@ -161,7 +161,7 @@ "activity_level": "LIGHT_EXERCISE", "result": "buttered_toast", "copy-from": "toast", - "components": [ [ [ "bread", 1 ] ], [ [ "butter", 1 ] ] ] + "components": [ [ [ "toast", 1 ] ], [ [ "butter", 1 ] ] ] }, { "type": "recipe", @@ -175,7 +175,7 @@ "activity_level": "LIGHT_EXERCISE", "result": "jam_toast", "copy-from": "toast", - "components": [ [ [ "bread", 1 ] ], [ [ "jam_fruit", 1 ] ] ] + "components": [ [ [ "toast", 1 ] ], [ [ "jam_fruit", 1 ] ] ] }, { "type": "recipe", @@ -189,7 +189,7 @@ "activity_level": "LIGHT_EXERCISE", "result": "peanut_butter_toast", "copy-from": "toast", - "components": [ [ [ "peanutbutter", 1 ] ], [ [ "bread", 1 ] ] ] + "components": [ [ [ "peanutbutter", 1 ] ], [ [ "toast", 1 ] ] ] }, { "type": "recipe", @@ -204,7 +204,7 @@ "result": "toad_in_a_hole", "copy-from": "toast", "time": "10m", - "components": [ [ [ "egg_bird", 1 ] ], [ [ "bread", 1 ] ] ] + "components": [ [ [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], [ [ "bread_sandwich", 1, "LIST" ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/food/brewing.json b/data/json/recipes/food/brewing.json index 5b7926bbaf72f..647467fc7811f 100644 --- a/data/json/recipes/food/brewing.json +++ b/data/json/recipes/food/brewing.json @@ -85,12 +85,12 @@ "components": [ [ [ "water", 3 ], [ "water_clean", 3 ] ], [ - [ "molasses", 2 ], + [ "molasses", 5 ], [ "wheat", 1 ], [ "barley", 1 ], [ "buckwheat", 1 ], [ "sugar", 50 ], - [ "sweet_water", 4 ], + [ "sweet_water", 5 ], [ "sugar_beet", 1 ] ], [ [ "yeast", 1 ] ] @@ -110,7 +110,7 @@ "book_learn": [ [ "distilling_cookbook", 4 ] ], "qualities": [ { "id": "BOIL", "level": 2 } ], "tools": [ [ [ "surface_heat", 6, "LIST" ] ] ], - "components": [ [ [ "water", 3 ], [ "water_clean", 3 ] ], [ [ "molasses", 2 ], [ "sugar_beet", 1 ] ], [ [ "yeast", 1 ] ] ] + "components": [ [ [ "water", 3 ], [ "water_clean", 3 ] ], [ [ "molasses", 2 ], [ "sugar_beet", 5 ] ], [ [ "yeast", 1 ] ] ] }, { "type": "recipe", @@ -196,7 +196,7 @@ "qualities": [ { "id": "CONTAIN", "level": 1 } ], "components": [ [ [ "water_clean", 3 ] ], - [ [ "honey_bottled", 10 ], [ "honeycomb", 2 ], [ "honey_glassed", 10 ] ], + [ [ "honey_bottled", 12 ], [ "honeycomb", 2 ], [ "honey_glassed", 4 ] ], [ [ "yeast", 1 ] ] ] }, @@ -222,7 +222,7 @@ "components": [ [ [ "water_clean", 3 ] ], [ [ "soaked_dandelion", 10 ] ], - [ [ "sugar", 10 ], [ "honeycomb", 1 ], [ "honey_bottled", 2 ], [ "honey_glassed", 2 ], [ "syrup", 2 ] ], + [ [ "sugar_standard", 2, "LIST" ], [ "honeycomb", 1 ] ], [ [ "yeast", 1 ] ] ] }, @@ -249,7 +249,7 @@ "components": [ [ [ "water", 3 ], [ "water_clean", 3 ] ], [ [ "raw_burdock", 10 ] ], - [ [ "sugar", 10 ], [ "honeycomb", 1 ], [ "honey_bottled", 2 ], [ "honey_glassed", 2 ], [ "syrup", 2 ] ], + [ [ "sugar_standard", 2, "LIST" ], [ "honeycomb", 1 ] ], [ [ "yeast", 1 ] ] ] }, @@ -270,7 +270,7 @@ "components": [ [ [ "water", 3 ], [ "water_clean", 3 ] ], [ [ "pine_bough", 5 ] ], - [ [ "sugar", 10 ], [ "honeycomb", 1 ], [ "honey_bottled", 2 ], [ "honey_glassed", 2 ], [ "syrup", 2 ] ], + [ [ "sugar_standard", 2, "LIST" ], [ "honeycomb", 1 ] ], [ [ "yeast", 1 ] ] ] }, diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index b7b1cc73dc979..c6e3c23fd4863 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -16,12 +16,13 @@ "result_mult": 2, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 100, "LIST" ] ], [ [ "pot_canning", -1 ] ] ], - "components": [ [ [ "water", 11 ], [ "water_clean", 11 ] ], [ [ "jar_glass_sealed", 1 ] ], [ [ "meat_offal", 2, "LIST" ] ] ] + "components": [ [ [ "water", 11 ], [ "water_clean", 11 ] ], [ [ "jar_glass", 1 ] ], [ [ "meat_offal", 2, "LIST" ] ] ] }, { "result": "offal_canned", "type": "recipe", "activity_level": "LIGHT_EXERCISE", + "id_suffix": "canned", "category": "CC_FOOD", "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", @@ -38,10 +39,10 @@ ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ], "components": [ - [ [ "canister_empty", 1 ], [ "can_medium", 1 ] ], + [ [ "can_medium", 1 ] ], [ [ "scrap", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], - [ [ "meat_offal", 1, "LIST" ] ] + [ [ "meat_offal", 2, "LIST" ] ] ] }, { @@ -62,11 +63,34 @@ "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ], [ "salt_water", 1 ], [ "saline", 5 ] ], - [ [ "jar_glass_sealed", 1 ] ], + [ [ "jar_glass", 1 ] ], [ [ "meat_offal", 2, "LIST" ] ], [ [ "vinegar", 1 ] ] ] }, + { + "result": "offal_pickled", + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "id_suffix": "jarred_3l", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_MEAT", + "skill_used": "cooking", + "difficulty": 6, + "time": "50 m", + "batch_time_factors": [ 83, 5 ], + "book_learn": [ [ "cookbook", 6 ], [ "manual_canning", 4 ] ], + "container": "jar_3l_glass_sealed", + "result_mult": 12, + "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 3 } ], + "tools": [ [ [ "surface_heat", 100, "LIST" ] ] ], + "components": [ + [ [ "water", 6 ], [ "water_clean", 6 ], [ "salt_water", 6 ], [ "saline", 30 ] ], + [ [ "jar_3l_glass", 1 ] ], + [ [ "meat_offal", 12, "LIST" ] ], + [ [ "vinegar", 6 ] ] + ] + }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -1617,12 +1641,17 @@ "skills_required": [ "mechanics", 1 ], "difficulty": 4, "time": "30 m", - "charges": 2, + "charges": 4, "book_learn": [ [ "preserving_juice", 2 ] ], "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ], - "components": [ [ [ "jar_glass_sealed", 1 ] ], [ [ "sweet_fruit", 2, "LIST" ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] + "components": [ + [ [ "jar_glass_sealed", 1 ] ], + [ [ "sweet_fruit", 2, "LIST" ] ], + [ [ "water", 10 ], [ "water_clean", 10 ] ], + [ [ "water_clean", 2 ] ] + ] }, { "type": "recipe", @@ -1635,13 +1664,14 @@ "subcategory": "CSC_FOOD_VEGGI", "skill_used": "cooking", "difficulty": 4, + "charges": 4, "time": "24 m", "book_learn": [ [ "preserving_juice", 2 ] ], "contained": true, "batch_time_factors": [ 83, 5 ], "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "HAMMER", "level": 1 }, { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ], [ [ "rag", -1 ] ] ], - "components": [ [ [ "can_medium", 1 ] ], [ [ "scrap", 1 ] ], [ [ "sweet_fruit", 2, "LIST" ] ] ] + "components": [ [ [ "can_medium", 1 ] ], [ [ "scrap", 1 ] ], [ [ "sweet_fruit", 2, "LIST" ] ], [ [ "water_clean", 2 ] ] ] }, { "type": "recipe", @@ -1656,11 +1686,16 @@ "skills_required": [ "mechanics", 1 ], "difficulty": 4, "time": "40 m", - "charges": 12, + "charges": 24, "book_learn": [ [ "preserving_juice", 2 ] ], "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 3 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "surface_heat", 200, "LIST" ] ], [ [ "pot_canning", -1 ] ], [ [ "rag", -1 ] ] ], - "components": [ [ [ "jar_3l_glass_sealed", 1 ] ], [ [ "sweet_fruit", 12, "LIST" ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] + "components": [ + [ [ "jar_3l_glass_sealed", 1 ] ], + [ [ "sweet_fruit", 12, "LIST" ] ], + [ [ "water", 10 ], [ "water_clean", 10 ] ], + [ [ "water_clean", 12 ] ] + ] } ] diff --git a/data/json/recipes/food/dairy_products.json b/data/json/recipes/food/dairy_products.json index e988b59060078..27cf6372a50b0 100644 --- a/data/json/recipes/food/dairy_products.json +++ b/data/json/recipes/food/dairy_products.json @@ -20,7 +20,7 @@ "activity_level": "LIGHT_EXERCISE", "result": "raw_butter", "id_suffix": "shake", - "byproducts": [ [ "buttermilk", 3 ], [ "jar_glass_sealed", 1 ] ], + "byproducts": [ [ "buttermilk", 3 ] ], "result_mult": 1, "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", @@ -29,7 +29,8 @@ "time": "20 m", "book_learn": [ [ "dairy_book", 3 ] ], "//": "Book Things to do with milk. Add curdled milk and cheese recipes to the book. Also consider adding to brewing json Airag from this book.", - "components": [ [ [ "jar_glass_sealed", 1 ] ], [ [ "water_clean", 1 ] ], [ [ "milk_cream", 3 ] ] ] + "tools": [ [ [ "jar_glass_sealed", 1 ] ] ], + "components": [ [ [ "water_clean", 1 ] ], [ [ "milk_cream", 3 ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/food/frozen.json b/data/json/recipes/food/frozen.json index bce0bcb7f4a44..130849b4b36d7 100644 --- a/data/json/recipes/food/frozen.json +++ b/data/json/recipes/food/frozen.json @@ -234,6 +234,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "time": "20 m", + "tools": [ [ [ "bag_plastic", 2 ] ] ], "book_learn": [ [ "mag_cooking", 0 ] ], "components": [ [ [ "water_clean", 2 ] ], @@ -258,8 +259,7 @@ [ "irradiated_blackberries", 1 ] ], [ [ "sugar", 20 ], [ "artificial_sweetener", 20 ] ], - [ [ "salt", 30 ] ], - [ [ "bag_plastic", 2 ] ] + [ [ "salt", 5 ] ] ] }, { @@ -268,6 +268,7 @@ "//": "in real life, you can use some plastic bags with the correct materials and shake up to make ice cream!", "copy-from": "icecream_from_bags", "type": "recipe", + "tools": [ [ [ "bag_plastic", 2 ] ] ], "book_learn": [ [ "mag_cooking", 0 ] ], "components": [ [ [ "water_clean", 2 ] ], @@ -292,8 +293,7 @@ [ "irradiated_blackberries", 1 ] ], [ [ "sugar", 20 ], [ "artificial_sweetener", 20 ] ], - [ [ "salt", 30 ] ], - [ [ "bag_plastic", 2 ] ] + [ [ "salt", 5 ] ] ] }, { diff --git a/data/json/recipes/food/offal_dishes.json b/data/json/recipes/food/offal_dishes.json index bfe0cd67d24f6..8ea4a26f7c8cf 100644 --- a/data/json/recipes/food/offal_dishes.json +++ b/data/json/recipes/food/offal_dishes.json @@ -86,6 +86,16 @@ "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ [ [ "mutant_liver", 1 ] ] ] }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "copy-from": "brain_cooked", + "result": "mutant_bug_organs_cooked", + "time": "35 m", + "qualities": [ { "id": "COOK", "level": 1 } ], + "tools": [ [ [ "surface_heat", 30, "LIST" ] ] ], + "components": [ [ [ "mutant_bug_organs", 1 ] ] ] + }, { "type": "recipe", "activity_level": "LIGHT_EXERCISE", @@ -336,7 +346,7 @@ "difficulty": 5, "time": "24 m", "batch_time_factors": [ 83, 5 ], - "container": "can_medium", + "container": "canister_empty", "contained": true, "qualities": [ { "id": "SAW_M", "level": 1 }, @@ -345,12 +355,7 @@ { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ], [ [ "can_sealer", -1 ] ] ], - "components": [ - [ [ "canister_empty", 1 ], [ "can_medium", 1 ] ], - [ [ "scrap", 1 ] ], - [ [ "water", 1 ], [ "water_clean", 1 ] ], - [ [ "liver", 4 ] ] - ], + "components": [ [ [ "small_cans", 1, "LIST" ] ], [ [ "scrap", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "liver", 4 ] ] ], "book_learn": [ [ "cookbook", 6 ], [ "manual_canning", 4 ] ], "charges": 4 }, @@ -423,7 +428,7 @@ "qualities": [ { "id": "COOK", "level": 3 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 50, "LIST" ] ] ], "components": [ - [ [ "eggs_bird", 3, "LIST" ] ], + [ [ "eggs_any_shape", 3, "LIST" ] ], [ [ "garlic_clove", 2 ] ], [ [ "meat_brain", 4, "LIST" ] ], [ [ "batter", 4, "LIST" ] ], diff --git a/data/json/recipes/food/other.json b/data/json/recipes/food/other.json index cb486ae4064c3..70ff84c7031aa 100644 --- a/data/json/recipes/food/other.json +++ b/data/json/recipes/food/other.json @@ -13,7 +13,7 @@ "autolearn": true, "qualities": [ { "id": "BOIL", "level": 2 } ], "tools": [ [ [ "surface_heat", 16, "LIST" ] ] ], - "components": [ [ [ "beet_syrup", 6 ] ] ] + "components": [ [ [ "beet_syrup", 5 ] ] ] }, { "type": "recipe", diff --git a/data/json/recipes/recipe_ammo.json b/data/json/recipes/recipe_ammo.json index dced5e98e77b6..39cca528c487a 100644 --- a/data/json/recipes/recipe_ammo.json +++ b/data/json/recipes/recipe_ammo.json @@ -493,22 +493,20 @@ "skill_used": "fabrication", "skills_required": [ [ "mechanics", 3 ] ], "difficulty": 5, - "time": "10 m", + "time": "2 m", "book_learn": [ [ "recipe_arrows", 7 ], [ "textbook_anarch", 4 ], [ "recipe_bullets", 7 ] ], - "using": [ [ "soldering_standard", 10 ] ], - "qualities": [ { "id": "SAW_M", "level": 1 } ], + "qualities": [ { "id": "SAW_M", "level": 1 }, { "id": "SCREW", "level": 1 } ], "components": [ - [ [ "bolt_metal", 1 ], [ "bolt_steel", 1 ] ], - [ [ "can_food", 1 ], [ "can_drink", 1 ], [ "canister_empty", 1 ] ], - [ [ "superglue", 1 ], [ "cordage", 1, "LIST" ] ], + [ [ "exploding_arrow_warhead", 1 ] ], [ - [ "smpistol_primer", 1 ], - [ "lgpistol_primer", 1 ], - [ "smrifle_primer", 1 ], - [ "lgrifle_primer", 1 ], - [ "shotgun_primer", 1 ] - ], - [ [ "gunpowder", 200 ], [ "chem_black_powder", 200 ] ] + [ "bolt_crude", 1 ], + [ "bolt_wood", 1 ], + [ "bolt_wood_bodkin", 1 ], + [ "bolt_steel", 1 ], + [ "bolt_makeshift", 1 ], + [ "bolt_wood_small_game", 1 ], + [ "bolt_metal", 1 ] + ] ] }, { diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json index b8f2c65080cfd..38dc35ad01c75 100644 --- a/data/json/recipes/recipe_food.json +++ b/data/json/recipes/recipe_food.json @@ -14,13 +14,13 @@ "charges": 12, "proficiencies": [ { "proficiency": "prof_food_prep" }, { "proficiency": "prof_baking" }, { "proficiency": "prof_baking_desserts_1" } ], "components": [ - [ [ "flour", 4 ], [ "flour_wheat_free", 4 ] ], - [ [ "salt", 12 ] ], - [ [ "sugar", 24 ], [ "artificial_sweetener", 24 ] ], + [ [ "flour", 16 ], [ "flour_wheat_free", 16 ] ], + [ [ "salt", 2 ] ], + [ [ "sugar_standard", 2, "LIST" ] ], [ [ "chocolate", 3 ] ], - [ [ "any_butter_or_oil", 2, "LIST" ] ], - [ [ "powder_eggs", 2 ], [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], - [ [ "water", 6 ], [ "water_clean", 6 ] ] + [ [ "any_butter_or_oil", 10, "LIST" ] ], + [ [ "eggs_any_shape", 4, "LIST" ] ], + [ [ "water", 1 ], [ "water_clean", 1 ] ] ] }, { @@ -544,10 +544,24 @@ "skill_used": "cooking", "time": "3 m", "autolearn": true, + "batch_time_factors": [ 95, 1 ], "flags": [ "BLIND_HARD" ], "qualities": [ { "id": "CONTAIN", "level": 1 } ], "components": [ [ [ "dry_corn", 1 ] ], [ [ "water_clean", 1 ] ] ] }, + { + "type": "recipe", + "activity_level": "NO_EXERCISE", + "result": "rehydrated_eggs", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_OTHER", + "skill_used": "cooking", + "time": "3 m", + "autolearn": true, + "flags": [ "BLIND_HARD" ], + "qualities": [ { "id": "CONTAIN", "level": 1 } ], + "components": [ [ [ "powder_eggs", 1 ] ], [ [ "water_clean", 1 ] ] ] + }, { "type": "recipe", "activity_level": "NO_EXERCISE", @@ -577,7 +591,7 @@ "proficiencies": [ { "proficiency": "prof_food_prep" } ], "components": [ [ [ "any_butter_or_oil", 2, "LIST" ] ], - [ [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], + [ [ "eggs_any_shape", 1, "LIST" ] ], [ [ "lemon", 1 ], [ "irradiated_lemon", 1 ], @@ -648,7 +662,7 @@ "subcategory": "CSC_FOOD_MEAT", "skill_used": "cooking", "difficulty": 3, - "charges": 1, + "charges": 5, "autolearn": true, "time": "16 m", "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], @@ -825,15 +839,7 @@ [ [ "tofu", 4 ], [ "dry_tofu", 4 ] ], [ [ "dry_rice", 4 ], [ "sushi_rice", 4 ], [ "rice_cooked", 4 ] ], [ [ "cooking_oil", 1 ] ], - [ - [ "beet_syrup", 1 ], - [ "syrup", 1 ], - [ "sugar", 1 ], - [ "artificial_sweetener", 1 ], - [ "molasses", 1 ], - [ "honeycomb", 1 ], - [ "honey_bottled", 1 ] - ], + [ [ "sugar_standard_half", 1, "LIST" ] ], [ [ "irradiated_broccoli", 2 ], [ "broccoli", 2 ], [ "veggy_wild_cooked", 2 ], [ "veggy_cooked", 2 ] ], [ [ "soysauce", 1 ] ] ] @@ -2063,7 +2069,7 @@ "qualities": [ { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ], "proficiencies": [ { "proficiency": "prof_food_prep" } ], - "components": [ [ [ "sweet_fruit_like", 1, "LIST" ] ], [ [ "sugar", 5 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ] + "components": [ [ [ "sweet_fruit_like", 1, "LIST" ] ], [ [ "sugar_powdered", 5, "LIST" ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ] }, { "type": "recipe", @@ -2309,11 +2315,7 @@ "qualities": [ { "id": "COOK", "level": 3 } ], "proficiencies": [ { "proficiency": "prof_food_prep" } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], - "components": [ - [ [ "coffee_raw", 3 ] ], - [ [ "sugar", 20 ], [ "honeycomb", 2 ], [ "honey_bottled", 6 ], [ "honey_glassed", 2 ], [ "syrup", 6 ] ], - [ [ "water", 1 ], [ "water_clean", 1 ] ] - ] + "components": [ [ [ "coffee_raw", 3 ] ], [ [ "sugar_standard", 2, "LIST" ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ] }, { "type": "recipe", @@ -2397,14 +2399,10 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 1, - "time": "5 m", + "time": "2 m", "autolearn": true, "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "components": [ - [ [ "irradiated_lemon", 1 ], [ "lemon", 1 ] ], - [ [ "sugar", 10 ], [ "artificial_sweetener", 10 ] ], - [ [ "water_clean", 1 ] ] - ] + "components": [ [ [ "irradiated_lemon", 1 ], [ "lemon", 1 ] ], [ [ "sugar_powdered", 10, "LIST" ] ], [ [ "water_clean", 1 ] ] ] }, { "type": "recipe", @@ -2887,14 +2885,8 @@ [ [ "flour", 8 ], [ "flour_wheat_free", 8 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "any_butter_or_oil", 4, "LIST" ] ], - [ - [ "sugar", 10 ], - [ "honey_bottled", 1 ], - [ "honey_glassed", 1 ], - [ "syrup", 1 ], - [ "artificial_sweetener", 10 ] - ], - [ [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ] + [ [ "sugar_standard", 1, "LIST" ] ], + [ [ "eggs_any_shape", 1, "LIST" ] ] ] }, { @@ -2908,14 +2900,8 @@ [ [ "flour", 8 ], [ "flour_wheat_free", 8 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "any_butter_or_oil", 4, "LIST" ] ], - [ - [ "sugar", 10 ], - [ "honey_bottled", 1 ], - [ "honey_glassed", 1 ], - [ "syrup", 1 ], - [ "artificial_sweetener", 10 ] - ], - [ [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], + [ [ "sugar_standard", 1, "LIST" ] ], + [ [ "eggs_any_shape", 1, "LIST" ] ], [ [ "weed", 5 ] ] ] }, @@ -2930,15 +2916,9 @@ [ [ "flour", 6 ], [ "flour_wheat_free", 6 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "any_butter_or_oil", 4, "LIST" ] ], - [ - [ "sugar", 10 ], - [ "honey_bottled", 1 ], - [ "honey_glassed", 1 ], - [ "syrup", 1 ], - [ "artificial_sweetener", 10 ] - ], + [ [ "sugar_standard", 1, "LIST" ] ], [ [ "chocolate", 1 ] ], - [ [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ] + [ [ "eggs_any_shape", 1, "LIST" ] ] ] }, { @@ -2952,15 +2932,9 @@ [ [ "flour", 6 ], [ "flour_wheat_free", 6 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "any_butter_or_oil", 4, "LIST" ] ], - [ - [ "sugar", 10 ], - [ "honey_bottled", 1 ], - [ "honey_glassed", 1 ], - [ "syrup", 1 ], - [ "artificial_sweetener", 10 ] - ], + [ [ "sugar_standard", 1, "LIST" ] ], [ [ "chocolate", 1 ] ], - [ [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], + [ [ "eggs_any_shape", 1, "LIST" ] ], [ [ "weed", 5 ] ] ] }, @@ -3088,15 +3062,7 @@ "qualities": [ { "id": "BUTCHER", "level": 20 }, { "id": "COOK", "level": 3 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 4, "LIST" ] ] ], "components": [ - [ - [ "sugar", 20 ], - [ "syrup", 2 ], - [ "beet_syrup", 2 ], - [ "molasses", 2 ], - [ "honeycomb", 1 ], - [ "honey_bottled", 2 ], - [ "honey_glassed", 2 ] - ], + [ [ "sugar_standard", 2, "LIST" ], [ "honeycomb", 1 ] ], [ [ "meat_raw_steak", 1, "LIST" ] ], [ [ "any_butter_or_oil", 8, "LIST" ] ], [ [ "veggy_any", 1, "LIST" ] ], @@ -3140,12 +3106,12 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 2, - "charges": 7, + "charges": 8, "time": "20 m", "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], - "components": [ [ [ "sugar_beet", 5 ] ], [ [ "water_clean", 1 ], [ "water", 1 ] ] ] + "components": [ [ [ "sugar_beet", 4 ] ], [ [ "water_clean", 1 ], [ "water", 1 ] ] ] }, { "type": "recipe", @@ -3284,39 +3250,8 @@ "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "can_beans", 1 ], [ "beans_cooked", 1 ] ], - [ - [ "meat_red", 1, "LIST" ], - [ "meat_smoked", 1 ], - [ "dry_meat", 1 ], - [ "can_chicken", 1 ], - [ "can_spam", 2 ], - [ "fish", 1 ], - [ "fish_smoked", 1 ], - [ "dry_fish", 1 ], - [ "rehydrated_fish", 1 ], - [ "fish_canned", 1 ], - [ "can_salmon", 1 ], - [ "salted_fish", 1 ], - [ "meat_salted", 1 ], - [ "can_tuna", 1 ], - [ "sausage", 2 ], - [ "sausage_cooked", 2 ], - [ "bratwurst_sausage", 2 ], - [ "bacon", 2 ], - [ "powder_eggs", 2 ], - [ "eggs_bird", 2, "LIST" ], - [ "egg_reptile", 2 ] - ], - [ - [ "sugar", 10 ], - [ "syrup", 1 ], - [ "beet_syrup", 1 ], - [ "molasses", 1 ], - [ "honeycomb", 1 ], - [ "honey_bottled", 1 ], - [ "honey_glassed", 1 ], - [ "artificial_sweetener", 10 ] - ] + [ [ "meat_cooked", 1, "LIST" ], [ "eggs_any_shape", 2, "LIST" ] ], + [ [ "sugar_standard", 1, "LIST" ] ] ] }, { @@ -3331,20 +3266,7 @@ "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 }, { "id": "CUT", "level": 1 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], - "components": [ - [ [ "can_beans", 1 ], [ "beans_cooked", 1 ] ], - [ [ "veggy_any", 1, "LIST" ] ], - [ - [ "sugar", 10 ], - [ "syrup", 1 ], - [ "beet_syrup", 1 ], - [ "molasses", 1 ], - [ "honeycomb", 1 ], - [ "honey_bottled", 1 ], - [ "honey_glassed", 1 ], - [ "artificial_sweetener", 10 ] - ] - ] + "components": [ [ [ "can_beans", 1 ], [ "beans_cooked", 1 ] ], [ [ "veggy_any", 1, "LIST" ] ], [ [ "sugar_standard", 1, "LIST" ] ] ] }, { "type": "recipe", @@ -3374,29 +3296,8 @@ "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], "components": [ [ [ "rice_cooked", 1 ] ], - [ - [ "meat_red", 1, "LIST" ], - [ "meat_smoked", 1 ], - [ "dry_meat", 1 ], - [ "can_chicken", 1 ], - [ "can_spam", 2 ], - [ "fish", 1 ], - [ "fish_smoked", 1 ], - [ "dry_fish", 1 ], - [ "rehydrated_fish", 1 ], - [ "salted_fish", 1 ], - [ "meat_salted", 1 ], - [ "fish_canned", 1 ], - [ "can_salmon", 1 ], - [ "can_tuna", 1 ], - [ "sausage", 2 ], - [ "sausage_cooked", 2 ], - [ "bratwurst_sausage", 2 ], - [ "bacon", 2 ], - [ "powder_eggs", 10 ], - [ "eggs_bird", 2, "LIST" ], - [ "egg_reptile", 2 ] - ], + [ [ "eggs_any_shape", 2, "LIST" ] ], + [ [ "meat_cooked", 1, "LIST" ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ] ] }, @@ -3481,9 +3382,7 @@ [ "sausage_cooked", 2 ], [ "bratwurst_sausage", 2 ], [ "bacon", 2 ], - [ "powder_eggs", 2 ], - [ "eggs_bird", 2, "LIST" ], - [ "egg_reptile", 2 ] + [ "eggs_any_shape", 2, "LIST" ] ], [ [ "salt", 1 ], [ "soysauce", 1 ], [ "seasoning_salt", 1 ], [ "garlic_clove", 1 ], [ "pepper", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] @@ -3556,16 +3455,9 @@ "components": [ [ [ "oatmeal", 1 ] ], [ - [ "sugar", 4 ], - [ "artificial_sweetener", 4 ], - [ "syrup", 1 ], - [ "beet_syrup", 1 ], - [ "molasses", 1 ], + [ "sugar_standard_half", 1, "LIST" ], [ "coffee_syrup", 1 ], [ "con_milk", 1 ], - [ "honeycomb", 1 ], - [ "honey_bottled", 1 ], - [ "honey_glassed", 1 ], [ "jam_fruit", 1 ], [ "irradiated_strawberries", 1 ], [ "strawberries", 1 ], @@ -3812,15 +3704,7 @@ "components": [ [ [ "hickory_nut_shelled", 4 ] ], [ [ "milk_standard_raw", 1, "LIST" ], [ "milk_powder", 1 ], [ "con_milk", 1 ] ], - [ - [ "honeycomb", 1 ], - [ "honey_bottled", 6 ], - [ "honey_glassed", 3 ], - [ "sugar", 20 ], - [ "artificial_sweetener", 20 ], - [ "syrup", 8 ], - [ "beet_syrup", 8 ] - ], + [ [ "sugar_standard", 2, "LIST" ] ], [ [ "water", 10 ], [ "water_clean", 10 ] ] ] }, @@ -3839,16 +3723,7 @@ "tools": [ [ [ "surface_heat", 20, "LIST" ] ] ], "components": [ [ [ "oatmeal", 4 ], [ "dry_rice", 4 ] ], - [ - [ "honeycomb", 1 ], - [ "con_milk", 1 ], - [ "honey_bottled", 1 ], - [ "honey_glassed", 1 ], - [ "sugar", 10 ], - [ "artificial_sweetener", 10 ], - [ "syrup", 3 ], - [ "beet_syrup", 3 ] - ], + [ [ "sugar_standard", 1, "LIST" ], [ "con_milk", 1 ] ], [ [ "sweet_fruit_like", 1, "LIST" ], [ "jam_fruit", 1 ], @@ -3872,23 +3747,7 @@ "batch_time_factors": [ 80, 2 ], "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], - "components": [ [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ] ] - }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "scrambled_eggs", - "id_suffix": "from_powder", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_OTHER", - "skill_used": "cooking", - "difficulty": 1, - "time": "6 m", - "autolearn": true, - "batch_time_factors": [ 80, 2 ], - "qualities": [ { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], - "components": [ [ [ "powder_eggs", 2 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ] + "components": [ [ [ "eggs_any_shape", 2, "LIST" ] ] ] }, { "type": "recipe", @@ -4040,81 +3899,7 @@ "autolearn": true, "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], - "components": [ - [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], - [ - [ "bacon", 2 ], - [ "meat_cooked", 1 ], - [ "human_cooked", 1 ], - [ "demihuman_cooked", 1 ], - [ "mutant_meat_cooked", 1 ], - [ "meat_smoked", 1 ], - [ "dry_meat", 1 ], - [ "rehydrated_meat", 1 ], - [ "sausage", 2 ], - [ "sausage_cooked", 1 ], - [ "bratwurst_sausage", 2 ], - [ "jerky", 1 ], - [ "salted_fish", 1 ], - [ "meat_pickled", 1 ], - [ "meat_salted", 1 ], - [ "meat_canned", 1 ], - [ "can_chicken", 1 ], - [ "can_spam", 2 ], - [ "fish_pickled", 1 ], - [ "fish_canned", 1 ], - [ "cracklins", 2 ], - [ "can_sardine", 1 ], - [ "can_tuna", 1 ], - [ "can_salmon", 1 ], - [ "can_herring", 1 ] - ] - ] - }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "deluxe_eggs", - "id_suffix": "from_powder", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_OTHER", - "skill_used": "cooking", - "difficulty": 1, - "time": "6 m", - "autolearn": true, - "qualities": [ { "id": "COOK", "level": 2 } ], - "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], - "components": [ - [ [ "powder_eggs", 2 ] ], - [ - [ "bacon", 2 ], - [ "meat_cooked", 1 ], - [ "human_cooked", 1 ], - [ "demihuman_cooked", 1 ], - [ "mutant_meat_cooked", 1 ], - [ "meat_smoked", 1 ], - [ "dry_meat", 1 ], - [ "rehydrated_meat", 1 ], - [ "sausage", 2 ], - [ "sausage_cooked", 2 ], - [ "bratwurst_sausage", 2 ], - [ "jerky", 1 ], - [ "salted_fish", 1 ], - [ "meat_pickled", 1 ], - [ "meat_salted", 1 ], - [ "meat_canned", 1 ], - [ "can_chicken", 1 ], - [ "can_spam", 2 ], - [ "fish_pickled", 1 ], - [ "fish_canned", 1 ], - [ "cracklins", 2 ], - [ "can_sardine", 1 ], - [ "can_tuna", 1 ], - [ "can_salmon", 1 ], - [ "can_herring", 1 ] - ], - [ [ "water", 1 ], [ "water_clean", 1 ] ] - ] + "components": [ [ [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ], [ [ "meat_cooked", 1, "LIST" ] ] ] }, { "type": "recipe", @@ -4131,7 +3916,7 @@ "components": [ [ [ "flour", 1 ], [ "flour_wheat_free", 1 ] ], [ [ "milk_standard_raw", 1, "LIST" ], [ "milk_powder", 1 ] ], - [ [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], + [ [ "eggs_any_shape", 1, "LIST" ] ], [ [ "syrup", 1 ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] @@ -4152,7 +3937,7 @@ "components": [ [ [ "flour", 1 ], [ "flour_wheat_free", 6 ] ], [ [ "milk_standard_raw", 1, "LIST" ], [ "milk_powder", 1 ] ], - [ [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], + [ [ "eggs_any_shape", 1, "LIST" ] ], [ [ "syrup", 1 ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], @@ -4174,7 +3959,7 @@ "components": [ [ [ "flour", 1 ], [ "flour_wheat_free", 6 ] ], [ [ "milk_standard_raw", 1, "LIST" ], [ "milk_powder", 1 ] ], - [ [ "powder_eggs", 5 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], + [ [ "eggs_any_shape", 1, "LIST" ] ], [ [ "syrup", 1 ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], @@ -4216,16 +4001,9 @@ "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "milk_standard_raw", 1, "LIST" ] ], - [ [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], + [ [ "eggs_any_shape", 1, "LIST" ] ], [ [ "cinnamon", 2 ] ], - [ - [ "flatbread", 2 ], - [ "bread", 2 ], - [ "cornbread", 2 ], - [ "wastebread", 2 ], - [ "sourdough_bread", 2 ], - [ "hardtack", 2 ] - ] + [ [ "bread_sandwich", 2, "LIST" ] ] ] }, { @@ -4242,7 +4020,7 @@ "components": [ [ [ "flour", 1 ], [ "flour_wheat_free", 1 ] ], [ [ "milk_standard_raw", 1, "LIST" ], [ "milk_powder", 1 ] ], - [ [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], + [ [ "eggs_any_shape", 1, "LIST" ] ], [ [ "syrup", 1 ] ], [ [ "sugar", 2 ], [ "artificial_sweetener", 2 ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ], @@ -4263,7 +4041,7 @@ "components": [ [ [ "flour", 1 ], [ "flour_wheat_free", 1 ] ], [ [ "milk_standard_raw", 1, "LIST" ], [ "milk_powder", 1 ] ], - [ [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], + [ [ "eggs_any_shape", 1, "LIST" ] ], [ [ "syrup", 1 ] ], [ [ "sugar", 2 ], [ "artificial_sweetener", 2 ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ], @@ -4280,13 +4058,12 @@ "skill_used": "cooking", "difficulty": 3, "time": "12 m", - "charges": 5, "autolearn": true, "tools": [ [ [ "surface_heat", 8, "LIST" ] ], [ [ "waffleiron", -1 ] ] ], "components": [ [ [ "flour", 1 ], [ "flour_wheat_free", 1 ] ], [ [ "milk_standard_raw", 1, "LIST" ], [ "milk_powder", 1 ] ], - [ [ "powder_eggs", 1 ], [ "eggs_bird", 1, "LIST" ], [ "egg_reptile", 1 ] ], + [ [ "eggs_any_shape", 1, "LIST" ] ], [ [ "syrup", 1 ] ], [ [ "sugar", 2 ], [ "artificial_sweetener", 2 ] ], [ [ "any_butter_or_oil", 1, "LIST" ] ], @@ -4307,19 +4084,7 @@ "autolearn": true, "qualities": [ { "id": "CUT", "level": 1 }, { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], - "components": [ - [ [ "sweet_fruit", 1, "LIST" ] ], - [ - [ "sugar", 5 ], - [ "artificial_sweetener", 5 ], - [ "honeycomb", 1 ], - [ "honey_bottled", 1 ], - [ "honey_glassed", 1 ], - [ "syrup", 1 ], - [ "beet_syrup", 1 ], - [ "molasses", 1 ] - ] - ] + "components": [ [ [ "sweet_fruit", 1, "LIST" ] ], [ [ "sugar_standard_half", 1, "LIST" ] ] ] }, { "type": "recipe", @@ -4337,19 +4102,13 @@ "components": [ [ [ "flour", 8 ], [ "oatmeal", 8 ], [ "dry_rice", 2 ], [ "flour_wheat_free", 8 ] ], [ - [ "sugar", 16 ], + [ "sugar_standard", 2, "LIST" ], [ "peanutbutter", 4 ], [ "peanutbutter_imitation", 4 ], - [ "artificial_sweetener", 16 ], - [ "syrup", 1 ], - [ "beet_syrup", 1 ], - [ "molasses", 1 ], [ "coffee_syrup", 1 ], [ "con_milk", 1 ], [ "can_coconut", 1 ], - [ "honey_bottled", 1 ], - [ "honeycomb", 1 ], - [ "honey_glassed", 1 ] + [ "honeycomb", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "sweet_fruit_like", 1, "LIST" ], [ "choco_coffee_beans", 5 ], [ "chocolate", 1 ], [ "jam_fruit", 1 ] ] @@ -4414,16 +4173,10 @@ "components": [ [ [ "salt", 50 ] ], [ - [ "sugar", 20 ], - [ "artificial_sweetener", 20 ], + [ "sugar_standard", 2, "LIST" ], [ "honeycomb", 1 ], - [ "honey_bottled", 1 ], - [ "honey_glassed", 1 ], - [ "syrup", 1 ], - [ "beet_syrup", 1 ], - [ "molasses", 1 ], - [ "rehydrated_fruit", 1 ], - [ "dry_fruit", 1 ], + [ "rehydrated_fruit", 2 ], + [ "dry_fruit", 2 ], [ "juice_pulp", 4 ] ], [ @@ -4865,7 +4618,7 @@ "skill_used": "cooking", "difficulty": 4, "time": "24 m", - "charges": 10, + "charges": 11, "autolearn": true, "batch_time_factors": [ 20, 1 ], "qualities": [ { "id": "CHEM", "level": 2 } ], @@ -4904,8 +4657,7 @@ [ "coffee_syrup", 4 ], [ "cola", 5 ], [ "con_milk", 4 ], - [ "honey_bottled", 7 ], - [ "honeycomb", 1 ], + [ "honey_bottled", 6 ], [ "molasses", 2 ], [ "purple_drink", 7 ], [ "rootbeer", 4 ], @@ -4935,6 +4687,7 @@ [ "maltballs", 1 ], [ "mintpatties", 2 ], [ "honey_glassed", 2 ], + [ "honeycomb", 1 ], [ "homeopathic_pills", 120 ], [ "cow_candy", 2 ], [ "candycigarette", 3 ], @@ -4971,6 +4724,7 @@ "skill_used": "cooking", "difficulty": 5, "time": "1 h 30 m", + "charges": 13, "batch_time_factors": [ 20, 1 ], "book_learn": { "adv_chemistry": { "skill_level": 6 }, @@ -4979,7 +4733,7 @@ }, "qualities": [ { "id": "CONTAIN", "level": 1 }, { "id": "BOIL", "level": 2 }, { "id": "CHEM", "level": 1 } ], "tools": [ [ [ "surface_heat", 40, "LIST" ] ] ], - "components": [ [ [ "sugar_beet", 2 ] ], [ [ "water_clean", 1 ], [ "water", 1 ] ], [ [ "lye_powder", 20 ] ] ] + "components": [ [ [ "sugar_beet", 3 ] ], [ [ "water_clean", 1 ], [ "water", 1 ] ], [ [ "lye_powder", 20 ] ] ] }, { "type": "recipe", @@ -6146,7 +5900,7 @@ "autolearn": true, "components": [ [ [ "bread_sandwich", 2, "LIST" ] ], - [ [ "honeycomb", 2 ], [ "honey_bottled", 2 ], [ "honey_glassed", 2 ] ], + [ [ "honey_bottled", 3 ], [ "honey_glassed", 1 ] ], [ [ "any_peanutbutter", 1, "LIST" ] ] ] }, @@ -6161,7 +5915,7 @@ "autolearn": true, "components": [ [ [ "bread_sandwich_wheat_free", 2, "LIST" ] ], - [ [ "honeycomb", 2 ], [ "honey_bottled", 2 ], [ "honey_glassed", 2 ] ], + [ [ "honey_bottled", 3 ], [ "honey_glassed", 1 ] ], [ [ "any_peanutbutter", 1, "LIST" ] ] ] }, @@ -6393,7 +6147,7 @@ [ [ "vinegar", 1 ] ], [ [ "saline", 1 ], [ "salt", 2 ] ], [ [ "jar_glass_sealed", 1 ] ], - [ [ "cucumber", 2 ] ] + [ [ "cucumber", 1 ] ] ] }, { @@ -6547,7 +6301,7 @@ "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "COOK", "level": 2 } ], "tools": [ [ [ "surface_heat", 2, "LIST" ] ] ], - "components": [ [ [ "sweet_fruit", 1, "LIST" ] ], [ [ "sugar", 10 ] ] ] + "components": [ [ [ "sweet_fruit", 1, "LIST" ] ], [ [ "sugar_powdered", 10, "LIST" ] ] ] }, { "type": "recipe", @@ -6688,12 +6442,13 @@ [ [ "water_clean", 1 ] ], [ [ "sugar", 10 ], - [ "artificial_sweetener", 10 ], - [ "honey_bottled", 1 ], + [ "syrup", 4 ], + [ "beet_syrup", 5 ], + [ "molasses", 1 ], + [ "honey_bottled", 3 ], [ "honey_glassed", 1 ], - [ "honeycomb", 1 ], - [ "syrup", 1 ], - [ "beet_syrup", 1 ] + [ "honeydew", 3 ], + [ "artificial_sweetener", 10 ] ] ] }, @@ -6704,12 +6459,13 @@ "category": "CC_FOOD", "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", - "time": "1 h 30 m", + "time": "9 m", "autolearn": true, "batch_time_factors": [ 20, 1 ], + "charges": 10, "qualities": [ { "id": "BOIL", "level": 1 } ], "tools": [ [ [ "water_boiling_heat", 3, "LIST" ] ] ], - "components": [ [ [ "sweet_water", 10 ] ] ] + "components": [ [ [ "sweet_water", 1 ] ] ] }, { "type": "recipe", @@ -7073,7 +6829,7 @@ "skill_used": "cooking", "time": "1 m", "autolearn": true, - "components": [ [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "honeycomb", 1 ], [ "honey_bottled", 1 ] ] ] + "components": [ [ [ "bread_sandwich", 2, "LIST" ] ], [ [ "honey_bottled", 3 ], [ "honey_glassed", 1 ] ] ] }, { "type": "recipe", @@ -7187,6 +6943,7 @@ "subcategory": "CSC_FOOD_DRINKS", "skill_used": "cooking", "difficulty": 2, + "charges": 2, "time": "15 m", "autolearn": true, "batch_time_factors": [ 20, 1 ], @@ -7196,13 +6953,7 @@ [ [ "tea_raw", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "milk_standard_raw", 1, "LIST" ], [ "milk_powder", 1 ], [ "con_milk", 1 ] ], - [ - [ "sugar", 10 ], - [ "honey_bottled", 1 ], - [ "honey_glassed", 1 ], - [ "syrup", 1 ], - [ "artificial_sweetener", 10 ] - ], + [ [ "sugar_standard", 2, "LIST" ] ], [ [ "pepper", 10 ] ], [ [ "cinnamon", 10 ] ] ] @@ -7217,7 +6968,7 @@ "difficulty": 2, "time": "3 m 30 s", "autolearn": true, - "components": [ [ [ "gin", 1 ] ], [ [ "honeycomb", 1 ], [ "honey_bottled", 1 ] ], [ [ "lemonade", 1 ] ] ] + "components": [ [ [ "gin", 1 ] ], [ [ "honey_bottled", 1 ] ], [ [ "lemonade", 1 ] ] ] }, { "type": "recipe", @@ -7293,7 +7044,11 @@ "autolearn": true, "qualities": [ { "id": "BOIL", "level": 1 } ], "tools": [ [ [ "water_boiling_heat", 3, "LIST" ] ] ], - "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "honey_ant", 1 ] ], [ [ "honeycomb", 1 ], [ "honey_bottled", 3 ] ] ] + "components": [ + [ [ "water", 1 ], [ "water_clean", 1 ] ], + [ [ "honey_ant", 1 ] ], + [ [ "honeycomb", 1 ], [ "honey_glassed", 2 ], [ "honey_bottled", 6 ] ] + ] }, { "type": "recipe", @@ -7337,7 +7092,7 @@ "subcategory": "CSC_FOOD_OTHER", "skill_used": "cooking", "difficulty": 1, - "charges": 14, + "charges": 15, "time": "20 m", "batch_time_factors": [ 80, 4 ], "autolearn": true, @@ -7432,17 +7187,7 @@ [ [ "oatmeal", 1 ], [ "flour", 5 ], [ "flour_wheat_free", 5 ], [ "buckwheat", 1 ] ], [ [ "dry_fruit", 1 ] ], [ [ "edible_tallow_lard", 2, "LIST" ] ], - [ - [ "sugar", 10 ], - [ "artificial_sweetener", 10 ], - [ "syrup", 1 ], - [ "beet_syrup", 1 ], - [ "molasses", 1 ], - [ "coffee_syrup", 1 ], - [ "honeycomb", 1 ], - [ "honey_bottled", 1 ], - [ "honey_glassed", 1 ] - ] + [ [ "sugar_standard", 1, "LIST" ] ] ] }, { @@ -7456,7 +7201,7 @@ "time": "10 m", "autolearn": true, "qualities": [ { "id": "CONTAIN", "level": 1 } ], - "components": [ [ [ "honey_bottled", 14 ] ] ] + "components": [ [ [ "honey_bottled", 15 ] ] ] }, { "type": "recipe", @@ -8037,10 +7782,7 @@ "autolearn": true, "qualities": [ { "id": "COOK", "level": 1 } ], "tools": [ [ [ "food_processor", 40 ] ] ], - "components": [ - [ [ "peanut_shelled", 3 ] ], - [ [ "sugar", 10 ], [ "artificial_sweetener", 10 ], [ "honey_bottled", 1 ], [ "honey_glassed", 1 ] ] - ] + "components": [ [ [ "peanut_shelled", 3 ] ], [ [ "sugar_standard", 2, "LIST" ] ] ] }, { "type": "recipe", @@ -8069,14 +7811,7 @@ [ "walnut_shelled", 5 ], [ "acorns", 5 ] ], - [ - [ "sugar", 10 ], - [ "artificial_sweetener", 10 ], - [ "honeycomb", 1 ], - [ "honey_bottled", 1 ], - [ "honey_glassed", 1 ], - [ "syrup", 1 ] - ] + [ [ "sugar_standard", 2, "LIST" ] ] ] }, { @@ -8553,15 +8288,7 @@ "components": [ [ [ "coffee_raw", 1 ], [ "coffee_syrup", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], - [ - [ "sugar", 5 ], - [ "artificial_sweetener", 5 ], - [ "honey_bottled", 1 ], - [ "honey_glassed", 1 ], - [ "honeycomb", 1 ], - [ "syrup", 1 ], - [ "beet_syrup", 1 ] - ] + [ [ "sugar_standard_half", 1, "LIST" ] ] ] }, { @@ -8576,19 +8303,7 @@ "batch_time_factors": [ 80, 4 ], "qualities": [ { "id": "BOIL", "level": 1 } ], "tools": [ [ [ "water_boiling_heat", 3, "LIST" ] ] ], - "components": [ - [ [ "coffee_raw_kentucky", 1 ] ], - [ [ "water", 1 ], [ "water_clean", 1 ] ], - [ - [ "sugar", 5 ], - [ "artificial_sweetener", 5 ], - [ "honey_bottled", 1 ], - [ "honey_glassed", 1 ], - [ "honeycomb", 1 ], - [ "syrup", 1 ], - [ "beet_syrup", 1 ] - ] - ] + "components": [ [ [ "coffee_raw_kentucky", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "sugar_standard_half", 1, "LIST" ] ] ] }, { "type": "recipe", @@ -8603,15 +8318,7 @@ "components": [ [ [ "coffee_syrup", 1 ], [ "coffee", 1 ] ], [ [ "milk_standard", 1, "LIST" ], [ "milk_powder", 1 ], [ "con_milk", 1 ] ], - [ - [ "sugar", 5 ], - [ "artificial_sweetener", 5 ], - [ "honey_bottled", 1 ], - [ "honey_glassed", 1 ], - [ "honeycomb", 1 ], - [ "syrup", 1 ], - [ "beet_syrup", 1 ] - ] + [ [ "sugar_standard_half", 1, "LIST" ] ] ] }, { @@ -8626,19 +8333,7 @@ "batch_time_factors": [ 20, 1 ], "qualities": [ { "id": "BOIL", "level": 1 } ], "tools": [ [ [ "water_boiling_heat", 2, "LIST" ] ] ], - "components": [ - [ [ "tea_raw", 1 ] ], - [ [ "water", 1 ], [ "water_clean", 1 ] ], - [ - [ "sugar", 5 ], - [ "artificial_sweetener", 5 ], - [ "honey_bottled", 1 ], - [ "honey_glassed", 1 ], - [ "honeycomb", 1 ], - [ "syrup", 1 ], - [ "beet_syrup", 1 ] - ] - ] + "components": [ [ [ "tea_raw", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "sugar_standard_half", 1, "LIST" ] ] ] }, { "type": "recipe", @@ -8667,15 +8362,7 @@ "components": [ [ [ "tea", 1 ] ], [ [ "milk_standard", 1, "LIST" ], [ "milk_powder", 1 ], [ "con_milk", 1 ] ], - [ - [ "sugar", 5 ], - [ "artificial_sweetener", 5 ], - [ "honey_bottled", 1 ], - [ "honey_glassed", 1 ], - [ "honeycomb", 1 ], - [ "syrup", 1 ], - [ "beet_syrup", 1 ] - ] + [ [ "sugar_standard_half", 1, "LIST" ] ] ] }, { diff --git a/data/json/recipes/recipe_medsandchemicals.json b/data/json/recipes/recipe_medsandchemicals.json index 57f7290736e0e..f376f4210c840 100644 --- a/data/json/recipes/recipe_medsandchemicals.json +++ b/data/json/recipes/recipe_medsandchemicals.json @@ -661,7 +661,7 @@ "tools": [ [ [ "surface_heat", 7, "LIST" ] ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ] ], - [ [ "flask_glass", 1 ], [ "jar_glass_sealed", 1 ] ], + [ [ "jar_glass_sealed", 1 ] ], [ [ "yeast", 1 ] ], [ [ "sugar", 10 ], [ "honey_bottled", 1 ] ] ] diff --git a/data/json/recipes/weapon/explosive.json b/data/json/recipes/weapon/explosive.json index a2219f1188b26..0b6c43f60d810 100644 --- a/data/json/recipes/weapon/explosive.json +++ b/data/json/recipes/weapon/explosive.json @@ -10,7 +10,7 @@ "reversible": true, "autolearn": true, "components": [ - [ [ "jar_glass_sealed", 1 ], [ "bottle_glass", 1 ], [ "clay_canister", 2 ], [ "flask_glass", 2 ] ], + [ [ "jar_glass_sealed", 1 ], [ "clay_canister", 2 ], [ "flask_glass", 2 ] ], [ [ "any_strong_acid", 2, "LIST" ] ], [ [ "cordage_short", 1, "LIST" ] ] ] @@ -124,7 +124,7 @@ "autolearn": true, "book_learn": [ [ "textbook_gaswarfare", 3 ] ], "qualities": [ { "id": "SCREW", "level": 1 } ], - "using": [ [ "small_grenade_case", 1 ] ], + "using": [ [ "small_gas_canister_case", 1 ] ], "components": [ [ [ "bleach", 2 ], [ "oxy_powder", 200 ] ], [ [ "ammonia", 2 ], [ "lye_powder", 200 ] ], [ [ "superglue", 1 ] ] ] }, { @@ -144,7 +144,7 @@ [ [ "bleach", 2 ], [ "oxy_powder", 200 ] ], [ [ "triffid_fungicide", 1 ], [ "fungicide", 50 ] ], [ [ "chem_sulphur", 150 ] ], - [ [ "canister_empty", 1 ], [ "can_food", 1 ], [ "can_drink", 1 ] ], + [ [ "small_gas_canister_case", 1, "LIST" ] ], [ [ "superglue", 1 ] ] ] }, @@ -165,7 +165,7 @@ [ [ "bleach", 2 ], [ "oxy_powder", 200 ] ], [ [ "insecticide", 50 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ], - [ [ "canister_empty", 1 ], [ "can_food", 1 ], [ "can_drink", 1 ] ], + [ [ "small_gas_canister_case", 1, "LIST" ] ], [ [ "superglue", 1 ] ] ] }, @@ -180,7 +180,7 @@ "reversible": true, "autolearn": true, "using": [ [ "accelerant_liquid", 500 ] ], - "components": [ [ [ "rag", 1 ] ], [ [ "bottle_glass", 1 ], [ "flask_glass", 1 ], [ "clay_canister", 1 ] ] ] + "components": [ [ [ "rag", 1 ] ], [ [ "bottle_glass", 1 ], [ "flask_glass", 2 ], [ "clay_canister", 2 ] ] ] }, { "result": "dynamite_bomb", @@ -210,7 +210,7 @@ "book_learn": [ [ "basic_chemistry", 2 ] ], "time": "7 m 30 s", "qualities": [ { "id": "SCREW", "level": 1 } ], - "using": [ [ "small_grenade_case", 1 ] ], + "using": [ [ "small_gas_canister_case", 1 ] ], "components": [ [ [ "water", 1 ], [ "water_clean", 1 ], [ "salt_water", 1 ], [ "saline", 5 ] ], [ [ "sugar", 16 ] ], @@ -344,27 +344,9 @@ "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 } ], - "using": [ [ "volatile_explosive", 15 ], [ "small_grenade_case", 1 ] ], - "components": [ - [ [ "fuse", 1 ] ], - [ [ "superglue", 1 ], [ "duct_tape", 75 ], [ "cordage", 1, "LIST" ] ], - [ [ "nail", 50 ], [ "scrap", 2 ] ] - ] - }, - { - "result": "small_homemade_grenade", - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_EXPLOSIVE", - "skill_used": "fabrication", - "difficulty": 2, - "time": "5 m", - "reversible": true, - "autolearn": true, - "qualities": [ { "id": "SAW_M", "level": 1 } ], - "using": [ [ "volatile_explosive", 1 ], [ "stable_explosive", 14 ], [ "small_grenade_case", 1 ] ], "components": [ + [ [ "small_grenade_case", 1, "LIST" ] ], + [ [ "stable_explosive", 15, "LIST" ], [ "volatile_explosive", 15, "LIST" ] ], [ [ "fuse", 1 ] ], [ [ "superglue", 1 ], [ "duct_tape", 75 ], [ "cordage", 1, "LIST" ] ], [ [ "nail", 50 ], [ "scrap", 2 ] ] @@ -379,35 +361,15 @@ "subcategory": "CSC_WEAPON_EXPLOSIVE", "skill_used": "fabrication", "difficulty": 2, - "time": "5 m", + "time": "7 m", "reversible": true, "autolearn": true, "qualities": [ { "id": "SAW_M", "level": 1 } ], - "using": [ [ "volatile_explosive", 30 ] ], "components": [ - [ [ "fuse", 1 ] ], - [ [ "superglue", 1 ], [ "duct_tape", 75 ], [ "cordage", 1, "LIST" ] ], [ [ "can_medium", 1 ] ], - [ [ "nail", 100 ], [ "scrap", 4 ] ] - ] - }, - { - "result": "homemade_grenade", - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "category": "CC_WEAPON", - "subcategory": "CSC_WEAPON_EXPLOSIVE", - "skill_used": "fabrication", - "difficulty": 2, - "time": "5 m", - "reversible": true, - "autolearn": true, - "qualities": [ { "id": "SAW_M", "level": 1 } ], - "using": [ [ "volatile_explosive", 1 ], [ "stable_explosive", 29 ] ], - "components": [ + [ [ "stable_explosive", 30, "LIST" ], [ "volatile_explosive", 30, "LIST" ] ], [ [ "fuse", 1 ] ], [ [ "superglue", 1 ], [ "duct_tape", 75 ], [ "cordage", 1, "LIST" ] ], - [ [ "can_medium", 1 ] ], [ [ "nail", 100 ], [ "scrap", 4 ] ] ] }, diff --git a/data/json/requirements/cooking_components.json b/data/json/requirements/cooking_components.json index da00ed49f8bfd..05accd1ed9358 100644 --- a/data/json/requirements/cooking_components.json +++ b/data/json/requirements/cooking_components.json @@ -5,7 +5,7 @@ "//": "Bread type food usable as batter for frying.", "components": [ [ - [ "flour", 1 ], + [ "flour", 2 ], [ "cornmeal", 1 ], [ "flatbread", 1 ], [ "tortilla_corn", 1 ], @@ -93,6 +93,12 @@ ] ] }, + { + "id": "eggs_any_shape", + "type": "requirement", + "//": "When we only need the nutrition of eggs and don't care about their shape. About 0.05L ", + "components": [ [ [ "eggs_bird", 1, "LIST" ], [ "rehydrated_eggs", 1 ], [ "egg_reptile", 1 ] ] ] + }, { "id": "milk_standard", "type": "requirement", @@ -123,19 +129,42 @@ "//": "Equivalent to milk_standard_raw, but without milk_reconstituted", "components": [ [ [ "milk", 1 ], [ "milk_UHT", 1 ], [ "milk_raw", 1 ] ] ] }, + { + "id": "sugar_powdered", + "type": "requirement", + "//": " Only powdered sugar", + "components": [ [ [ "sugar", 1 ], [ "artificial_sweetener", 1 ] ] ] + }, { "id": "sugar_standard", "type": "requirement", - "//": "One unit provides ~260kcal; chosen to match one unit of molasses", + "//": "One unit provides ~200kcal; chosen to match one unit of molasses", "components": [ [ - [ "sugar", 14 ], - [ "syrup", 5 ], - [ "beet_syrup", 6 ], + [ "sugar", 10 ], + [ "syrup", 4 ], + [ "beet_syrup", 5 ], [ "molasses", 1 ], - [ "honey_bottled", 4 ], + [ "honey_bottled", 3 ], [ "honey_glassed", 1 ], - [ "honeydew", 4 ] + [ "sweet_water", 1 ], + [ "honeydew", 3 ], + [ "artificial_sweetener", 10 ] + ] + ] + }, + { + "id": "sugar_standard_half", + "type": "requirement", + "//": "About a little more than half of standard", + "components": [ + [ + [ "sugar", 6 ], + [ "syrup", 2 ], + [ "beet_syrup", 3 ], + [ "honey_bottled", 2 ], + [ "honeydew", 2 ], + [ "artificial_sweetener", 6 ] ] ] }, @@ -300,36 +329,34 @@ "components": [ [ [ "stomach", 1 ], [ "hstomach", 1 ], [ "demihuman_stomach", 1 ] ] ] }, { - "id": "meat_nofish", + "id": "any_cracklins", "type": "requirement", - "//": "Any type of raw meat except for fish. About 300-400kcal of meat.", + "//": "multifarious cracklins", "components": [ [ - [ "meat_red", 1, "LIST" ], - [ "meat_liver", 5, "LIST" ], - [ "meat_kidney", 5, "LIST" ], - [ "meat_lung", 5, "LIST" ], - [ "sweetbread", 5 ], - [ "bacon", 4 ], - [ "lunchmeat", 5 ], - [ "bologna", 5 ], - [ "can_spam", 2 ], - [ "can_chicken", 1 ], - [ "meat_pickled", 1 ], - [ "dry_meat", 1 ], - [ "jerky", 1 ], - [ "meat_smoked", 1 ], - [ "meat_salted", 1 ], - [ "meat_fried", 1 ] + [ "cracklins", 1 ], + [ "human_cracklins", 1 ], + [ "mutant_cracklins", 1 ], + [ "mutant_human_cracklins", 1 ], + [ "demihuman_cracklins", 1 ] ] ] }, + { + "id": "meat_nofish", + "type": "requirement", + "//": "Any type of raw meat except for fish. About 300-400kcal of meat.", + "components": [ + [ [ "meat_red", 1, "LIST" ], [ "meat_offal", 1, "LIST" ], [ "can_spam", 2 ], [ "lunchmeat", 2 ], [ "can_chicken", 1 ] ] + ] + }, { "id": "meat_cooked", "type": "requirement", "//": "meat you'd put on a sandwich", "components": [ [ + [ "any_cracklins", 2, "LIST" ], [ "meat_cooked", 1 ], [ "meat_fatty_cooked", 1 ], [ "meat_scrap_cooked", 10 ], @@ -344,9 +371,9 @@ [ "dry_meat", 1 ], [ "rehydrated_meat", 1 ], [ "jerky", 1 ], - [ "bacon", 1 ], + [ "bacon", 2 ], [ "lunchmeat", 2 ], - [ "bologna", 5 ], + [ "bologna", 2 ], [ "can_spam", 2 ], [ "fried_spam", 2 ], [ "can_chicken", 1 ], @@ -357,11 +384,14 @@ [ "can_tuna", 1 ], [ "can_sardine", 1 ], [ "can_clams", 1 ], + [ "salted_fish", 1 ], + [ "meat_canned", 1 ], + [ "fish_canned", 1 ], [ "fish_pickled", 1 ], - [ "cracklins", 1 ], [ "meat_aspic", 1 ], [ "sausage", 1 ], [ "sausage_cooked", 1 ], + [ "sausage_wasteland", 1 ], [ "bratwurst_sausage", 1 ], [ "meat_fried", 1 ] ] @@ -979,5 +1009,11 @@ [ "kompot", 1 ] ] ] + }, + { + "id": "small_cans", + "type": "requirement", + "//": "Small can, 250ml.", + "components": [ [ [ "canister_empty", 1 ], [ "can_drink", 1 ], [ "can_food", 1 ] ] ] } ] diff --git a/data/json/requirements/explosives.json b/data/json/requirements/explosives.json index 3c8ab68514c99..0abc714dd5e35 100644 --- a/data/json/requirements/explosives.json +++ b/data/json/requirements/explosives.json @@ -71,10 +71,16 @@ "//": "This should contain all the explosives you need to set off with an explosive primer or a fuze, and also need casting in a crucible. 10g tnt equivalent.", "components": [ [ [ "chem_compositionb", 8 ] ] ] }, + { + "id": "small_gas_canister_case", + "type": "requirement", + "//": " Gas canisters, which can be recycled to get empty canisters. containers with an internal volume of 250 ml.", + "components": [ [ [ "canister_empty", 1 ], [ "can_drink", 1 ], [ "can_food", 1 ] ] ] + }, { "id": "small_grenade_case", "type": "requirement", "//": "Hard containers with an internal volume of 250 ml, which can be used in all explosive recipes that call for them.", - "components": [ [ [ "canister_empty", 1 ], [ "can_drink", 1 ], [ "clay_canister", 1 ], [ "can_food", 1 ] ] ] + "components": [ [ [ "clay_canister", 1 ], [ "small_gas_canister_case", 1, "LIST" ] ] ] } ] diff --git a/data/json/snippets/mutant_anatomy.json b/data/json/snippets/mutant_anatomy.json index 72a7ff3868fa3..d9a4ed5e55210 100644 --- a/data/json/snippets/mutant_anatomy.json +++ b/data/json/snippets/mutant_anatomy.json @@ -293,6 +293,36 @@ } ] }, + { + "type": "snippet", + "category": "cooked_bug_organs_desc", + "text": [ + { + "id": "cooked_bug_organs_1", + "text": "Some disturbing hairs have been burned off during cooking, but you still have difficulty convincing yourself to eat them." + }, + { + "id": "cooked_bug_organs_2", + "text": "You have cooked a pile of *things* that used to be green, and it still looks green under the light. You think your face will turn that color after eating them." + }, + { + "id": "cooked_bug_organs_3", + "text": "It's cooked. You can force yourself to believe that the cordlike tissue inside is noodles with ketchup and Italian spices." + }, + { + "id": "cooked_bug_organs_4", + "text": "After you cooked it, you tore this long thing into small pieces. Maybe this can prevent it from reviving in your intestines." + }, + { + "id": "cooked_bug_organs_5", + "text": "You're glad it didn't break your kitchen utensils. Now you hope it won't damage your digestive system." + }, + { + "id": "cooked_bug_organs_6", + "text": "Looking at this pile of biological tissues with strange smell, you don't know what kind of organs they belong to in medicine. Of course, you're pretty sure they're not boiled tomatoes." + } + ] + }, { "type": "snippet", "category": "mutant_bug_lung_desc", diff --git a/data/mods/Aftershock/recipes/recipe_overrides.json b/data/mods/Aftershock/recipes/recipe_overrides.json index 591203751b505..40b3045537b47 100644 --- a/data/mods/Aftershock/recipes/recipe_overrides.json +++ b/data/mods/Aftershock/recipes/recipe_overrides.json @@ -172,10 +172,11 @@ "tools": [ [ [ "surface_heat", 25, "LIST" ] ] ], "components": [ [ [ "brain", 2 ] ], - [ [ "eggs_bird", 1, "LIST" ] ], + [ [ "eggs_any_shape", 1, "LIST" ] ], [ [ "batter", 3, "LIST" ] ], [ [ "salt", 1 ] ], - [ [ "seasoning_mild", 4, "LIST" ] ] + [ [ "seasoning_mild", 4, "LIST" ] ], + [ [ "fry_oil", 4, "LIST" ] ] ] }, { diff --git a/tests/iteminfo_test.cpp b/tests/iteminfo_test.cpp index 0228cf552482d..a29adbd6b9387 100644 --- a/tests/iteminfo_test.cpp +++ b/tests/iteminfo_test.cpp @@ -1775,14 +1775,14 @@ TEST_CASE( "nutrients in food", "[iteminfo][food]" ) "--\n" "Nutrition will vary with chosen ingredients.\n" "Calories (kcal):" - " 126-535" + " 56-532" " Quench: 0\n" ); CHECK( item_info_str( ice_cream, { iteminfo_parts::FOOD_VITAMINS } ) == "--\n" "Nutrition will vary with chosen ingredients.\n" - "Vitamins (RDA): Calcium (7-31%), Iron (0-89%), " - "Vitamin A (3-11%), Vitamin B12 (2-6%), and Vitamin C (1-85%)\n" ); + "Vitamins (RDA): Calcium (7-37%), Iron (0-131%), " + "Vitamin A (3-11%), Vitamin B12 (2-6%), and Vitamin C (1-79%)\n" ); } }