From 5b7fd8eee64034c2a0a1f1bc9a6e8e123c01859f Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Mon, 7 Mar 2022 19:53:57 -0600
Subject: [PATCH 1/7] Hellfire Stew

---
 data/json/items/comestibles/bread.json |  4 ++--
 data/json/items/comestibles/soup.json  | 22 ++++++++++++++++++++++
 data/json/recipes/recipe_food.json     | 17 +++++++++++++++++
 3 files changed, 41 insertions(+), 2 deletions(-)

diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json
index 4c6715a83f6df..9ba91ba462884 100644
--- a/data/json/items/comestibles/bread.json
+++ b/data/json/items/comestibles/bread.json
@@ -399,7 +399,7 @@
     "symbol": "%",
     "quench": -2,
     "calories": 280,
-    "description": "A dry and virtually tasteless bread product capable of remaining edible without spoilage for vast lengths of time.",
+    "description": "A dry and virtually tasteless bread product capable of remaining edible without spoilage for vast lengths of time.  So dry it is almost inedible by itself.",
     "price": 125,
     "price_postapoc": 150,
     "material": [ "wheat" ],
@@ -408,7 +408,7 @@
     "flags": [ "EDIBLE_FROZEN" ],
     "vitamins": [ [ "calcium", 2 ], [ "iron", 15 ] ],
     "stack_size": 20,
-    "fun": -1
+    "fun": -4
   },
   {
     "type": "COMESTIBLE",
diff --git a/data/json/items/comestibles/soup.json b/data/json/items/comestibles/soup.json
index a474c53129f96..05158be69fccf 100644
--- a/data/json/items/comestibles/soup.json
+++ b/data/json/items/comestibles/soup.json
@@ -235,6 +235,28 @@
     "vitamins": [ [ "vitC", 9 ], [ "iron", 3 ] ],
     "fun": 1
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "hellfire_stew",
+    "looks_like": "soup_woods",
+    "name": { "str": "hellfire stew" },
+    "weight": "250 g",
+    "color": "brown",
+    "spoils_in": "5 days",
+    "container": "can_medium",
+    "comestible_type": "DRINK",
+    "symbol": "o",
+    "quench": 2,
+    "calories": 504,
+    "description": "An old recipe from the American Civil War.  It's edible.",
+    "price": 50,
+    "price_postapoc": 100,
+    "material": [ "flesh", "wheat" ],
+    "volume": "500 ml",
+    "charges": 4,
+    "phase": "liquid",
+    "flags": [ "EATEN_HOT", "USE_EAT_VERB" ]
+  },
   {
     "type": "COMESTIBLE",
     "id": "soup_chicken",
diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
index 6e34e4d46b631..ae2bac0513589 100644
--- a/data/json/recipes/recipe_food.json
+++ b/data/json/recipes/recipe_food.json
@@ -2942,6 +2942,23 @@
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
     "using": [ [ "woods_soup_ingredients_veggy", 1 ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "hellfire_stew",
+    "charges": 4,
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_MEAT",
+    "skill_used": "cooking",
+    "difficulty": 1,
+    "time": "20 m",
+    "autolearn": true,
+    "batch_time_factors": [ 80, 4 ],
+    "qualities": [ { "id": "COOK", "level": 3 } ],
+    "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
+    "using": [ [ "edible_fat", 1 ] ],
+    "components": [ [ [ "hardtack", 1 ] ], [ [ "water", 1 ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",

From cc1f57b8c02b7128184946faa91c70e2cdc32e2e Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Tue, 8 Mar 2022 09:07:16 -0600
Subject: [PATCH 2/7] Update data/json/recipes/recipe_food.json

Co-authored-by: AtomicFox556 <98733651+AtomicFox556@users.noreply.github.com>
---
 data/json/recipes/recipe_food.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
index ae2bac0513589..36163d9c7c675 100644
--- a/data/json/recipes/recipe_food.json
+++ b/data/json/recipes/recipe_food.json
@@ -2957,7 +2957,7 @@
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
     "using": [ [ "edible_fat", 1 ] ],
-    "components": [ [ [ "hardtack", 1 ] ], [ [ "water", 1 ] ] ]
+    "components": [ [ [ "hardtack", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
   },
   {
     "type": "recipe",

From 9091260ece55c7d2cc918f93b68ed0b26cc07c8e Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Tue, 8 Mar 2022 18:17:08 -0600
Subject: [PATCH 3/7] Hardtack pudding

---
 data/json/items/comestibles/bread.json        |  2 +-
 data/json/items/comestibles/fruit_dishes.json | 23 ++++++++++++++++++
 data/json/items/comestibles/soup.json         |  5 ++--
 data/json/recipes/recipe_food.json            | 24 ++++++++++++++++++-
 4 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json
index 9ba91ba462884..c09877869eed2 100644
--- a/data/json/items/comestibles/bread.json
+++ b/data/json/items/comestibles/bread.json
@@ -406,7 +406,7 @@
     "volume": "250 ml",
     "charges": 2,
     "flags": [ "EDIBLE_FROZEN" ],
-    "vitamins": [ [ "calcium", 2 ], [ "iron", 15 ] ],
+    "vitamins": [ [ "calcium", 2 ], [ "iron", 15 ], [ "bad_food", 10 ] ],
     "stack_size": 20,
     "fun": -4
   },
diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json
index 90e6380315123..425caa66840d4 100644
--- a/data/json/items/comestibles/fruit_dishes.json
+++ b/data/json/items/comestibles/fruit_dishes.json
@@ -469,6 +469,29 @@
     "fun": 3,
     "vitamins": [ [ "vitC", 3 ], [ "calcium", 2 ] ]
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "hardtack_pudding",
+    "looks_like": "biscuit",
+    "name": { "str": "hardtack pudding" },
+    "weight": "250 g",
+    "color": "brown",
+    "spoils_in": "5 days",
+    "container": "can_medium",
+    "comestible_type": "DRINK",
+    "symbol": "o",
+    "quench": 2,
+    "calories": 100,
+    "description": "An old recipe from the American Civil War.  First you crush your hardtack into flour with whatever object you have at hand then combine it with the water and regular flour to make a dough.  You're going to want to knead in the dried fruits.  Boil up your dough into pbread pudding chunks.  Finally you add the sweetener.  Soldiers would call this a dessert.",
+    "price": 50,
+    "price_postapoc": 100,
+    "material": [ "flesh", "wheat" ],
+    "volume": "500 ml",
+    "charges": 4,
+    "phase": "liquid",
+    "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
+    "vitamins": [ [ "vitC", 2 ], [ "iron", 15 ], [ "bad_food", 2 ] ],
+  },
   {
     "type": "COMESTIBLE",
     "id": "brandied_fruit",
diff --git a/data/json/items/comestibles/soup.json b/data/json/items/comestibles/soup.json
index 05158be69fccf..f013583fa47f8 100644
--- a/data/json/items/comestibles/soup.json
+++ b/data/json/items/comestibles/soup.json
@@ -248,14 +248,15 @@
     "symbol": "o",
     "quench": 2,
     "calories": 504,
-    "description": "An old recipe from the American Civil War.  It's edible.",
+    "description": "An old recipe from the American Civil War.  First you crush your hardtack into chunks with whatever object you have at hand then combine it with the water to make the tack soggy.  You're going to want to melt down your fat.  Add salt and pepper.  Then you'll fry up the soggy chunks in the fat til the fat is absorbed into the chunks and browned.  It's edible.",
     "price": 50,
     "price_postapoc": 100,
     "material": [ "flesh", "wheat" ],
     "volume": "500 ml",
     "charges": 4,
     "phase": "liquid",
-    "flags": [ "EATEN_HOT", "USE_EAT_VERB" ]
+    "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
+    "vitamins": [ [ "calcium", 2 ], [ "iron", 15 ], [ "bad_food", 6 ] ]
   },
   {
     "type": "COMESTIBLE",
diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
index 36163d9c7c675..1ae3c20376b06 100644
--- a/data/json/recipes/recipe_food.json
+++ b/data/json/recipes/recipe_food.json
@@ -2957,7 +2957,29 @@
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
     "using": [ [ "edible_fat", 1 ] ],
-    "components": [ [ [ "hardtack", 1 ] ], [ [ "water", 1 ], [ "water_clean", 1 ] ] ]
+    "components": [ [ [ "hardtack", 1 ] ], [ [ "salt", 1 ] ], [ [ "pepper", 1 ] ], [ [ "water", 2 ], [ "water_clean", 2 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "hardtack_pudding",
+    "charges": 4,
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_MEAT",
+    "skill_used": "cooking",
+    "difficulty": 1,
+    "time": "20 m",
+    "autolearn": true,
+    "batch_time_factors": [ 80, 4 ],
+    "qualities": [ { "id": "COOK", "level": 3 } ],
+    "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
+    "components": [
+      [ [ "hardtack", 1 ] ],
+      [ [ "flour_any", 1, "LIST" ] ],
+      [ [ "sugar_standard", 1, "LIST" ] ],
+      [ [ "sweet_fruit_like", 1, "LIST" ] ],
+      [ [ "water", 2 ], [ "water_clean", 2 ] ]
+    ]
   },
   {
     "type": "recipe",

From 507e1d768e6fd34032d1c20f2ef4775f26e8b5f5 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Tue, 8 Mar 2022 18:24:13 -0600
Subject: [PATCH 4/7] Update data/json/items/comestibles/fruit_dishes.json

---
 data/json/items/comestibles/fruit_dishes.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json
index 425caa66840d4..4b468b47c638c 100644
--- a/data/json/items/comestibles/fruit_dishes.json
+++ b/data/json/items/comestibles/fruit_dishes.json
@@ -490,7 +490,7 @@
     "charges": 4,
     "phase": "liquid",
     "flags": [ "EATEN_HOT", "USE_EAT_VERB" ],
-    "vitamins": [ [ "vitC", 2 ], [ "iron", 15 ], [ "bad_food", 2 ] ],
+    "vitamins": [ [ "vitC", 2 ], [ "iron", 15 ], [ "bad_food", 2 ] ]
   },
   {
     "type": "COMESTIBLE",

From e5288e53f3f2340b49684f0ee9d629e909c27cf0 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Tue, 8 Mar 2022 20:36:12 -0600
Subject: [PATCH 5/7] Update data/json/items/comestibles/fruit_dishes.json

Update fruit_dishes.json
---
 data/json/items/comestibles/fruit_dishes.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/data/json/items/comestibles/fruit_dishes.json b/data/json/items/comestibles/fruit_dishes.json
index 4b468b47c638c..d4f6e45a949bd 100644
--- a/data/json/items/comestibles/fruit_dishes.json
+++ b/data/json/items/comestibles/fruit_dishes.json
@@ -481,8 +481,8 @@
     "comestible_type": "DRINK",
     "symbol": "o",
     "quench": 2,
-    "calories": 100,
-    "description": "An old recipe from the American Civil War.  First you crush your hardtack into flour with whatever object you have at hand then combine it with the water and regular flour to make a dough.  You're going to want to knead in the dried fruits.  Boil up your dough into pbread pudding chunks.  Finally you add the sweetener.  Soldiers would call this a dessert.",
+    "calories": 150,
+    "description": "An old recipe from the American Civil War.  First you crush your hardtack into flour with whatever object you have at hand then combine it with the water and regular flour to make a dough.  You're going to want to knead in the dried fruits.  Boil up your dough into bread pudding chunks.  Finally you add the sweetener.  Soldiers would call this a dessert.",
     "price": 50,
     "price_postapoc": 100,
     "material": [ "flesh", "wheat" ],

From 88c9542848c61cc5d66304f574bea226e2bb61b3 Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Fri, 11 Mar 2022 00:22:43 -0600
Subject: [PATCH 6/7] Soggy Hardtack

---
 data/json/items/comestibles/bread.json | 22 ++++++++++++++++++++++
 data/json/recipes/recipe_food.json     | 15 +++++++++++++++
 2 files changed, 37 insertions(+)

diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json
index c09877869eed2..4f61e88a98453 100644
--- a/data/json/items/comestibles/bread.json
+++ b/data/json/items/comestibles/bread.json
@@ -410,6 +410,28 @@
     "stack_size": 20,
     "fun": -4
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "soggy_hardtack",
+    "name": { "str_sp": "soggy hardtack" },
+    "weight": "80 g",
+    "color": "white",
+    "spoils_in": "5 days",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "quench": 0,
+    "calories": 280,
+    "description": "A soggy and virtually tasteless bread product that has soaked up enough water that it won't hurt your teeth chewing.",
+    "price": 125,
+    "price_postapoc": 150,
+    "material": [ "wheat" ],
+    "volume": "250 ml",
+    "charges": 2,
+    "flags": [ "EDIBLE_FROZEN" ],
+    "vitamins": [ [ "calcium", 2 ], [ "iron", 15 ], [ "bad_food", 10 ] ],
+    "stack_size": 20,
+    "fun": -1
+  },
   {
     "type": "COMESTIBLE",
     "id": "biscuit",
diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
index 1ae3c20376b06..a7cd93d209796 100644
--- a/data/json/recipes/recipe_food.json
+++ b/data/json/recipes/recipe_food.json
@@ -2942,6 +2942,21 @@
     "tools": [ [ [ "surface_heat", 5, "LIST" ] ] ],
     "using": [ [ "woods_soup_ingredients_veggy", 1 ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "LIGHT_EXERCISE",
+    "result": "soggy_hardtack",
+    "charges": 2,
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_MEAT",
+    "skill_used": "cooking",
+    "difficulty": 0,
+    "time": "10 m",
+    "autolearn": true,
+    "batch_time_factors": [ 80, 4 ],
+    "qualities": [ { "id": "COOK", "level": 1 } ],
+    "components": [ [ [ "hardtack", 1 ] ], [ [ "water_clean", 2 ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",

From be24ea69ef6224685c519920730360bd0b2a53ee Mon Sep 17 00:00:00 2001
From: Maleclypse <54345792+Maleclypse@users.noreply.github.com>
Date: Thu, 17 Mar 2022 22:10:09 -0500
Subject: [PATCH 7/7] Remove default values

---
 data/json/items/comestibles/bread.json | 1 -
 data/json/recipes/recipe_food.json     | 1 -
 2 files changed, 2 deletions(-)

diff --git a/data/json/items/comestibles/bread.json b/data/json/items/comestibles/bread.json
index 4f61e88a98453..f9b0f6cbbf1fe 100644
--- a/data/json/items/comestibles/bread.json
+++ b/data/json/items/comestibles/bread.json
@@ -419,7 +419,6 @@
     "spoils_in": "5 days",
     "comestible_type": "FOOD",
     "symbol": "%",
-    "quench": 0,
     "calories": 280,
     "description": "A soggy and virtually tasteless bread product that has soaked up enough water that it won't hurt your teeth chewing.",
     "price": 125,
diff --git a/data/json/recipes/recipe_food.json b/data/json/recipes/recipe_food.json
index a7cd93d209796..2aee6b8173830 100644
--- a/data/json/recipes/recipe_food.json
+++ b/data/json/recipes/recipe_food.json
@@ -2950,7 +2950,6 @@
     "category": "CC_FOOD",
     "subcategory": "CSC_FOOD_MEAT",
     "skill_used": "cooking",
-    "difficulty": 0,
     "time": "10 m",
     "autolearn": true,
     "batch_time_factors": [ 80, 4 ],