From d4bf0c9a80363c68c3f8d5560dd7687589c4325e Mon Sep 17 00:00:00 2001 From: Jalus Bilieyich Date: Sat, 28 Nov 2020 02:23:49 -0600 Subject: [PATCH 01/15] Canned bread yay --- data/json/itemgroups/Food/food.json | 1 + data/json/items/comestibles/bread.json | 15 ++++++++++++++- data/json/recipes/food/bread.json | 4 ++-- data/json/recipes/food/canned.json | 19 +++++++++++++++++++ 4 files changed, 36 insertions(+), 3 deletions(-) diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json index f7b91d72a34b1..0f19ff080377a 100644 --- a/data/json/itemgroups/Food/food.json +++ b/data/json/itemgroups/Food/food.json @@ -183,6 +183,7 @@ { "item": "can_chowder", "prob": 35 }, { "item": "can_herring", "prob": 30 }, { "item": "can_chicken", "prob": 40 }, + { "item": "bread_canned", "prob": 25 }, { "item": "broth", "prob": 15 }, { "item": "crackers", "prob": 10 }, { "item": "grahmcrackers", "prob": 10 }, diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index 22b8d36eec024..25c57154e8b1d 100644 --- a/data/json/items/comestibles/bread.json +++ b/data/json/items/comestibles/bread.json @@ -296,12 +296,25 @@ "calories": 74, "description": "A sweet bread, like cake.", "price": "272 cent", - "price_postapoc": "4 USD", + "price_postapoc": "2 USD", "material": [ "wheat" ], "volume": "48 ml", "charges": 10, "flags": [ "EATEN_HOT", "EATEN_COLD" ], "fun": 3, "vitamins": [ [ "calcium", 2 ], [ "iron", 6 ] ] + }, + { + "type": "COMESTIBLE", + "id": "bread_canned", + "name": { "str_sp": "canned bread" }, + "copy-from": "brown_bread", + "spoils_in": "2 years", + "container": "can_medium", + "description": "It reads: New England's Finest.", + "price": "3 USD", + "//": "more expensive because it's canned and lasts longer", + "price_postapoc": "5 USD", + "fun": 4 } ] diff --git a/data/json/recipes/food/bread.json b/data/json/recipes/food/bread.json index 63671d90fd276..d1b7b71a45e16 100644 --- a/data/json/recipes/food/bread.json +++ b/data/json/recipes/food/bread.json @@ -33,7 +33,7 @@ "skill_used": "cooking", "difficulty": 3, "charges": 10, - "time": "30 m", + "time": "1 h 30 m", "batch_time_factors": [ 50, 5 ], "book_learn": [ [ "family_cookbook", 1 ], [ "baking_book", 2 ], [ "cookbook", 2 ], [ "cookbook_daintydishes", 2 ] ], "qualities": [ { "id": "COOK", "level": 3 } ], @@ -43,7 +43,7 @@ [ [ "flour", 1 ] ], [ [ "cornmeal", 1 ] ], [ [ "molasses", 1 ] ], - [ [ "water", 1 ] ], + [ [ "water", 1 ], [ "water_clean", 1] ], [ [ "salt", 1 ] ] ], "//": "Later: this needs baking soda. Also possibility of rewrite to use portions of components' charges." diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index f96e822cb2754..300ec8beaa1a3 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -1662,5 +1662,24 @@ "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 ] ] ] + }, + { + "type": "recipe", + "activity_level": "LIGHT_EXERCISE", + "result": "bread_canned", + "id_suffix": "canned", + "container": "can_medium", + "category": "CC_FOOD", + "subcategory": "CSC_FOOD_BREAD", + "skill_used": "cooking", + "skills_required": [ "mechanics", 1 ], + "difficulty": 2, + "time": "20 m", + "charges": 10, + "book_learn": [ [ "manual_canning", 1 ] ], + "batch_time_factors": [ 50, 5 ], + "qualities": [ { "id": "COOK", "level": 2 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], + "tools": [ [ [ "can_sealer", -1 ] ] ], + "components": [ [ [ "can_medium", 1 ] ], [ [ "scrap", 1 ] ], [ [ "brown_bread", 1 ] ] ] } ] From ee6893cb200f1b2c915f2cf047f650c40b4306ab Mon Sep 17 00:00:00 2001 From: Jalus Bilieyich Date: Sat, 28 Nov 2020 11:51:52 -0600 Subject: [PATCH 02/15] Minor fix --- data/json/items/comestibles/bread.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index 25c57154e8b1d..ab4eced215038 100644 --- a/data/json/items/comestibles/bread.json +++ b/data/json/items/comestibles/bread.json @@ -309,7 +309,7 @@ "id": "bread_canned", "name": { "str_sp": "canned bread" }, "copy-from": "brown_bread", - "spoils_in": "2 years", + "spoils_in": "730 days", "container": "can_medium", "description": "It reads: New England's Finest.", "price": "3 USD", From ff6c3f870723e6b4b6f9c15b2a3d3d1a7106c891 Mon Sep 17 00:00:00 2001 From: Jalus Bilieyich Date: Sat, 28 Nov 2020 22:08:18 -0600 Subject: [PATCH 03/15] Fix based on feedback --- data/json/itemgroups/Food/food.json | 5 +++-- data/json/recipes/food/bread.json | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json index 0f19ff080377a..870712769bb04 100644 --- a/data/json/itemgroups/Food/food.json +++ b/data/json/itemgroups/Food/food.json @@ -159,7 +159,8 @@ { "item": "soup_cullenskink", "prob": 1 }, { "item": "can_corn", "prob": 1 }, { "item": "cooked_pumpkin", "prob": 1 }, - { "item": "veggy_canned", "prob": 1 } + { "item": "veggy_canned", "prob": 1 }, + { "item": "bread_canned", "prob": 1 } ] }, { @@ -183,7 +184,7 @@ { "item": "can_chowder", "prob": 35 }, { "item": "can_herring", "prob": 30 }, { "item": "can_chicken", "prob": 40 }, - { "item": "bread_canned", "prob": 25 }, + { "item": "bread_canned", "prob": 5 }, { "item": "broth", "prob": 15 }, { "item": "crackers", "prob": 10 }, { "item": "grahmcrackers", "prob": 10 }, diff --git a/data/json/recipes/food/bread.json b/data/json/recipes/food/bread.json index d1b7b71a45e16..163d947fc8d8b 100644 --- a/data/json/recipes/food/bread.json +++ b/data/json/recipes/food/bread.json @@ -43,7 +43,7 @@ [ [ "flour", 1 ] ], [ [ "cornmeal", 1 ] ], [ [ "molasses", 1 ] ], - [ [ "water", 1 ], [ "water_clean", 1] ], + [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "salt", 1 ] ] ], "//": "Later: this needs baking soda. Also possibility of rewrite to use portions of components' charges." From fc052cdf4058cd14cb8e5db0c00d9d6e6b6b799c Mon Sep 17 00:00:00 2001 From: Jalus Bilieyich Date: Sun, 29 Nov 2020 00:14:31 -0600 Subject: [PATCH 04/15] More adjustments --- data/json/items/comestibles/bread.json | 2 +- data/json/recipes/food/canned.json | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index ab4eced215038..c10a3214f89a0 100644 --- a/data/json/items/comestibles/bread.json +++ b/data/json/items/comestibles/bread.json @@ -298,7 +298,7 @@ "price": "272 cent", "price_postapoc": "2 USD", "material": [ "wheat" ], - "volume": "48 ml", + "volume": "480 ml", "charges": 10, "flags": [ "EATEN_HOT", "EATEN_COLD" ], "fun": 3, diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index 300ec8beaa1a3..6687beaf41ab1 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -1674,12 +1674,12 @@ "skill_used": "cooking", "skills_required": [ "mechanics", 1 ], "difficulty": 2, - "time": "20 m", + "time": "10 m", "charges": 10, "book_learn": [ [ "manual_canning", 1 ] ], "batch_time_factors": [ 50, 5 ], "qualities": [ { "id": "COOK", "level": 2 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], "tools": [ [ [ "can_sealer", -1 ] ] ], - "components": [ [ [ "can_medium", 1 ] ], [ [ "scrap", 1 ] ], [ [ "brown_bread", 1 ] ] ] + "components": [ [ [ "can_medium", 1 ] ], [ [ "brown_bread", 1 ] ] ] } ] From c6df65c05c5bec1eec468d227cbc89ae864f1f83 Mon Sep 17 00:00:00 2001 From: Jalus Bilieyich Date: Sun, 29 Nov 2020 11:17:03 -0600 Subject: [PATCH 05/15] Adjust canned bread (still WIP!) --- data/json/items/comestibles/bread.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index c10a3214f89a0..c699b653439ec 100644 --- a/data/json/items/comestibles/bread.json +++ b/data/json/items/comestibles/bread.json @@ -307,11 +307,11 @@ { "type": "COMESTIBLE", "id": "bread_canned", - "name": { "str_sp": "canned bread" }, + "name": { "str_sp": "canned brown bread" }, "copy-from": "brown_bread", - "spoils_in": "730 days", + "spoils_in": "360 days", "container": "can_medium", - "description": "It reads: New England's Finest.", + "description": "New England's finest. Brown bread in a can, what can get better than this?", "price": "3 USD", "//": "more expensive because it's canned and lasts longer", "price_postapoc": "5 USD", From 25fb27d91f18d05053cf75f997ccc94e64d3ef38 Mon Sep 17 00:00:00 2001 From: Jalus Bilieyich Date: Mon, 30 Nov 2020 01:17:24 -0600 Subject: [PATCH 06/15] Revamp the PR --- data/json/itemgroups/Food/food.json | 8 ++++---- data/json/itemgroups/food_service.json | 2 +- data/json/items/comestibles/bread.json | 15 +-------------- data/json/recipes/food/canned.json | 19 ------------------- 4 files changed, 6 insertions(+), 38 deletions(-) diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json index 870712769bb04..f27f9e5a5ee99 100644 --- a/data/json/itemgroups/Food/food.json +++ b/data/json/itemgroups/Food/food.json @@ -128,6 +128,7 @@ { "item": "apple_canned", "prob": 1 }, { "item": "can_cheese", "prob": 1 }, { "item": "fish_canned", "prob": 1 }, + { "item": "brown_bread", "prob": 1 }, { "item": "can_spam", "prob": 1 }, { "item": "can_sardine", "prob": 1 }, { "item": "ravioli", "prob": 1 }, @@ -159,9 +160,8 @@ { "item": "soup_cullenskink", "prob": 1 }, { "item": "can_corn", "prob": 1 }, { "item": "cooked_pumpkin", "prob": 1 }, - { "item": "veggy_canned", "prob": 1 }, - { "item": "bread_canned", "prob": 1 } - ] + { "item": "veggy_canned", "prob": 1 } + ] }, { "type": "item_group", @@ -184,7 +184,7 @@ { "item": "can_chowder", "prob": 35 }, { "item": "can_herring", "prob": 30 }, { "item": "can_chicken", "prob": 40 }, - { "item": "bread_canned", "prob": 5 }, + { "item": "brown_bread": "prob": 20 }, { "item": "broth", "prob": 15 }, { "item": "crackers", "prob": 10 }, { "item": "grahmcrackers", "prob": 10 }, diff --git a/data/json/itemgroups/food_service.json b/data/json/itemgroups/food_service.json index fd72e18285e71..0863190331f3c 100644 --- a/data/json/itemgroups/food_service.json +++ b/data/json/itemgroups/food_service.json @@ -650,7 +650,7 @@ "subtype": "distribution", "entries": [ { "item": "bread", "prob": 65 }, - { "item": "brown_bread", "prob": 50 }, + { "item": "brown_bread", "prob": 50, "container-item": "bag_plastic" }, { "item": "cake2", "prob": 10 }, { "item": "cake3", "prob": 10 }, { "item": "cornbread", "prob": 35 }, diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index c699b653439ec..4e028010bde31 100644 --- a/data/json/items/comestibles/bread.json +++ b/data/json/items/comestibles/bread.json @@ -289,7 +289,7 @@ "weight": "45 g", "color": "brown", "spoils_in": "10 days", - "container": "bag_plastic", + "container": "can_medium", "comestible_type": "FOOD", "symbol": "%", "healthy": 1, @@ -303,18 +303,5 @@ "flags": [ "EATEN_HOT", "EATEN_COLD" ], "fun": 3, "vitamins": [ [ "calcium", 2 ], [ "iron", 6 ] ] - }, - { - "type": "COMESTIBLE", - "id": "bread_canned", - "name": { "str_sp": "canned brown bread" }, - "copy-from": "brown_bread", - "spoils_in": "360 days", - "container": "can_medium", - "description": "New England's finest. Brown bread in a can, what can get better than this?", - "price": "3 USD", - "//": "more expensive because it's canned and lasts longer", - "price_postapoc": "5 USD", - "fun": 4 } ] diff --git a/data/json/recipes/food/canned.json b/data/json/recipes/food/canned.json index 6687beaf41ab1..f96e822cb2754 100644 --- a/data/json/recipes/food/canned.json +++ b/data/json/recipes/food/canned.json @@ -1662,24 +1662,5 @@ "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 ] ] ] - }, - { - "type": "recipe", - "activity_level": "LIGHT_EXERCISE", - "result": "bread_canned", - "id_suffix": "canned", - "container": "can_medium", - "category": "CC_FOOD", - "subcategory": "CSC_FOOD_BREAD", - "skill_used": "cooking", - "skills_required": [ "mechanics", 1 ], - "difficulty": 2, - "time": "10 m", - "charges": 10, - "book_learn": [ [ "manual_canning", 1 ] ], - "batch_time_factors": [ 50, 5 ], - "qualities": [ { "id": "COOK", "level": 2 }, { "id": "HAMMER", "level": 1 }, { "id": "CONTAIN", "level": 1 } ], - "tools": [ [ [ "can_sealer", -1 ] ] ], - "components": [ [ [ "can_medium", 1 ] ], [ [ "brown_bread", 1 ] ] ] } ] From 23b02be015127d86f062b83926796c5f74c980c5 Mon Sep 17 00:00:00 2001 From: Jalus Bilieyich Date: Mon, 30 Nov 2020 01:20:36 -0600 Subject: [PATCH 07/15] whoops --- data/json/itemgroups/Food/food.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json index f27f9e5a5ee99..7a557b2563313 100644 --- a/data/json/itemgroups/Food/food.json +++ b/data/json/itemgroups/Food/food.json @@ -161,7 +161,7 @@ { "item": "can_corn", "prob": 1 }, { "item": "cooked_pumpkin", "prob": 1 }, { "item": "veggy_canned", "prob": 1 } - ] + ] }, { "type": "item_group", From 4bc7e33cb5f0771b3b038c9fde6d9902d18194b6 Mon Sep 17 00:00:00 2001 From: Jalus Bilieyich Date: Mon, 30 Nov 2020 01:21:43 -0600 Subject: [PATCH 08/15] another whoops --- data/json/itemgroups/Food/food.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/itemgroups/Food/food.json b/data/json/itemgroups/Food/food.json index 7a557b2563313..8ed626ecbe892 100644 --- a/data/json/itemgroups/Food/food.json +++ b/data/json/itemgroups/Food/food.json @@ -184,7 +184,7 @@ { "item": "can_chowder", "prob": 35 }, { "item": "can_herring", "prob": 30 }, { "item": "can_chicken", "prob": 40 }, - { "item": "brown_bread": "prob": 20 }, + { "item": "brown_bread", "prob": 20 }, { "item": "broth", "prob": 15 }, { "item": "crackers", "prob": 10 }, { "item": "grahmcrackers", "prob": 10 }, From e80628f42c22d2f8545f7374e55ada5d4b990cd4 Mon Sep 17 00:00:00 2001 From: Jalus Bilieyich Date: Mon, 30 Nov 2020 16:37:44 -0600 Subject: [PATCH 09/15] Fix the calorie balance in the recipe (hopefully) --- data/json/items/comestibles/wheat.json | 6 +++--- data/json/items/containers.json | 2 +- data/json/recipes/food/bread.json | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json index afa02723a7db7..f5a9b9709ed11 100644 --- a/data/json/items/comestibles/wheat.json +++ b/data/json/items/comestibles/wheat.json @@ -147,19 +147,19 @@ "type": "COMESTIBLE", "id": "bread_flour", "name": { "str_sp": "bread flour" }, - "weight": "13 g", + "weight": "60 g", "color": "white", "spoils_in": "360 days", "container": "bag_paper_powder_small", "comestible_type": "FOOD", "symbol": "%", "quench": -1, - "calories": 55, + "calories": 220, "description": "This white flour is useful for adding more stretch and chew to bread while baking.", "price": "200 cent", "price_postapoc": "95 cent", "material": [ "wheat", "powder" ], - "volume": "250 ml", + "volume": "2400 ml", "flags": [ "EDIBLE_FROZEN", "RAW" ], "charges": 20, "vitamins": [ [ "iron", 4 ] ], diff --git a/data/json/items/containers.json b/data/json/items/containers.json index 5a3d5f4a138cc..3092a6f5ffdc0 100644 --- a/data/json/items/containers.json +++ b/data/json/items/containers.json @@ -177,7 +177,7 @@ { "pocket_type": "CONTAINER", "watertight": false, - "max_contains_volume": "2 L", + "max_contains_volume": "2500 ml", "max_contains_weight": "2 kg", "moves": 200 } diff --git a/data/json/recipes/food/bread.json b/data/json/recipes/food/bread.json index 163d947fc8d8b..c1eea5d4478a2 100644 --- a/data/json/recipes/food/bread.json +++ b/data/json/recipes/food/bread.json @@ -40,9 +40,9 @@ "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "bread_flour", 1 ] ], - [ [ "flour", 1 ] ], - [ [ "cornmeal", 1 ] ], - [ [ "molasses", 1 ] ], + [ [ "flour", 6 ] ], + [ [ "cornmeal", 6 ] ], + [ [ "molasses", 2 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "salt", 1 ] ] ], From b502b94ecb48dd2266b9cf4ec9ff7e224de57677 Mon Sep 17 00:00:00 2001 From: Jalus Bilieyich Date: Tue, 1 Dec 2020 00:48:46 -0600 Subject: [PATCH 10/15] calorie balance, take 2 --- data/json/items/comestibles/wheat.json | 2 +- data/json/recipes/food/bread.json | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json index f5a9b9709ed11..3e4ed21600115 100644 --- a/data/json/items/comestibles/wheat.json +++ b/data/json/items/comestibles/wheat.json @@ -154,7 +154,7 @@ "comestible_type": "FOOD", "symbol": "%", "quench": -1, - "calories": 220, + "calories": 55, "description": "This white flour is useful for adding more stretch and chew to bread while baking.", "price": "200 cent", "price_postapoc": "95 cent", diff --git a/data/json/recipes/food/bread.json b/data/json/recipes/food/bread.json index c1eea5d4478a2..9a8c63fc25c2c 100644 --- a/data/json/recipes/food/bread.json +++ b/data/json/recipes/food/bread.json @@ -40,9 +40,9 @@ "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], "components": [ [ [ "bread_flour", 1 ] ], - [ [ "flour", 6 ] ], - [ [ "cornmeal", 6 ] ], - [ [ "molasses", 2 ] ], + [ [ "flour", 5 ] ], + [ [ "cornmeal", 4 ] ], + [ [ "molasses", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "salt", 1 ] ] ], From f69d974b6b4d2beb2858913b1aa0404c238a242b Mon Sep 17 00:00:00 2001 From: Jalus Bilieyich Date: Wed, 2 Dec 2020 15:13:46 -0600 Subject: [PATCH 11/15] Little recipe bit --- data/json/recipes/food/bread.json | 1 + 1 file changed, 1 insertion(+) diff --git a/data/json/recipes/food/bread.json b/data/json/recipes/food/bread.json index 9a8c63fc25c2c..2c65b4da710c2 100644 --- a/data/json/recipes/food/bread.json +++ b/data/json/recipes/food/bread.json @@ -35,6 +35,7 @@ "charges": 10, "time": "1 h 30 m", "batch_time_factors": [ 50, 5 ], + "autolearn": false, "book_learn": [ [ "family_cookbook", 1 ], [ "baking_book", 2 ], [ "cookbook", 2 ], [ "cookbook_daintydishes", 2 ] ], "qualities": [ { "id": "COOK", "level": 3 } ], "tools": [ [ [ "surface_heat", 8, "LIST" ] ] ], From 1c542e9ed3cdedcd52ca58503f5340b4c96eabd2 Mon Sep 17 00:00:00 2001 From: Jalus Bilieyich Date: Fri, 4 Dec 2020 16:35:27 -0600 Subject: [PATCH 12/15] Calorie fix, take 3 --- data/json/items/comestibles/bread.json | 4 ++-- data/json/recipes/food/bread.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json index 4e028010bde31..e8497ee5513a9 100644 --- a/data/json/items/comestibles/bread.json +++ b/data/json/items/comestibles/bread.json @@ -293,7 +293,7 @@ "comestible_type": "FOOD", "symbol": "%", "healthy": 1, - "calories": 74, + "calories": 130, "description": "A sweet bread, like cake.", "price": "272 cent", "price_postapoc": "2 USD", @@ -302,6 +302,6 @@ "charges": 10, "flags": [ "EATEN_HOT", "EATEN_COLD" ], "fun": 3, - "vitamins": [ [ "calcium", 2 ], [ "iron", 6 ] ] + "vitamins": [ [ "calcium", 4 ], [ "iron", 4 ] ] } ] diff --git a/data/json/recipes/food/bread.json b/data/json/recipes/food/bread.json index 2c65b4da710c2..768da9b0b3e58 100644 --- a/data/json/recipes/food/bread.json +++ b/data/json/recipes/food/bread.json @@ -43,7 +43,7 @@ [ [ "bread_flour", 1 ] ], [ [ "flour", 5 ] ], [ [ "cornmeal", 4 ] ], - [ [ "molasses", 1 ] ], + [ [ "molasses", 2 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "salt", 1 ] ] ], From 9e7911acd24f7add6cdb0d662a9b84a444c84d7e Mon Sep 17 00:00:00 2001 From: Jalus Bilieyich Date: Fri, 4 Dec 2020 17:13:17 -0600 Subject: [PATCH 13/15] FINAL CALORIE FIX, LET'S GOOOO :D --- data/json/recipes/food/bread.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/recipes/food/bread.json b/data/json/recipes/food/bread.json index 768da9b0b3e58..4efb7d851ade5 100644 --- a/data/json/recipes/food/bread.json +++ b/data/json/recipes/food/bread.json @@ -42,7 +42,7 @@ "components": [ [ [ "bread_flour", 1 ] ], [ [ "flour", 5 ] ], - [ [ "cornmeal", 4 ] ], + [ [ "cornmeal", 5 ] ], [ [ "molasses", 2 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ], [ [ "salt", 1 ] ] From e726c97db746815ed804d52cb37ede729ff01959 Mon Sep 17 00:00:00 2001 From: Xaleth Date: Sat, 23 Jan 2021 15:50:54 -0600 Subject: [PATCH 14/15] Update from feedback --- data/json/items/containers.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/containers.json b/data/json/items/containers.json index 3092a6f5ffdc0..a11d5afd8ee49 100644 --- a/data/json/items/containers.json +++ b/data/json/items/containers.json @@ -162,7 +162,7 @@ "flags": [ "TRADER_AVOID" ] }, { - "id": "bag_paper_powder_small", + "id": "bag_paper_powder", "type": "GENERIC", "category": "container", "name": { "str": "small powder paper bag" }, From 4aa0f9660d8868588119dad338e1f6c1bf7943da Mon Sep 17 00:00:00 2001 From: Xaleth Date: Sat, 23 Jan 2021 21:10:48 -0600 Subject: [PATCH 15/15] Update data/json/items/comestibles/wheat.json Co-authored-by: actual-nh <74678550+actual-nh@users.noreply.github.com> --- data/json/items/comestibles/wheat.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/json/items/comestibles/wheat.json b/data/json/items/comestibles/wheat.json index 3e4ed21600115..d350b7f4ce833 100644 --- a/data/json/items/comestibles/wheat.json +++ b/data/json/items/comestibles/wheat.json @@ -150,7 +150,7 @@ "weight": "60 g", "color": "white", "spoils_in": "360 days", - "container": "bag_paper_powder_small", + "container": "bag_paper_powder", "comestible_type": "FOOD", "symbol": "%", "quench": -1,