Butter from raw milk and butter churn

data/json/furniture_and_terrain/furniture-storage.json

@@ -845,5 +845,44 @@
         { "item": "pipe", "count": [ 1, 2 ] }
       ]
     }
+  },
+  {
+    "type": "furniture",
+    "id": "f_butter_churn",
+    "name": "butter churn",
+    "description": "A pedal driven butter churn.",
+    "symbol": "H",
+    "color": "light_cyan",
+    "crafting_pseudo_item": "butter_churn",
+    "move_cost_mod": -1,
+    "coverage": 70,
+    "required_str": -1,
+    "flags": [ "NOITEM", "SEALED", "ALLOW_FIELD_EFFECT", "TRANSPARENT", "FLAMMABLE", "CONTAINER", "LIQUIDCONT" ],
+    "examine_action": "keg",
+    "keg_capacity": 45,
+    "deconstruct": {
+      "items": [
+        { "item": "2x4", "count": 18 },
+        { "item": "nail", "charges": [ 7, 14 ] },
+        { "item": "water_faucet", "count": 1 },
+        { "item": "sheet_metal_small", "count": [ 12, 20 ] },
+        { "item": "scrap", "count": [ 5, 10 ] },
+        { "item": "foot_crank", "count": 1 }
+      ]
+    },
+    "bash": {
+      "str_min": 12,
+      "str_max": 50,
+      "sound": "smash!",
+      "sound_fail": "whump.",
+      "items": [
+        { "item": "2x4", "count": [ 6, 12 ] },
+        { "item": "nail", "charges": [ 4, 8 ] },
+        { "item": "water_faucet", "prob": 50 },
+        { "item": "sheet_metal_small", "count": [ 6, 12 ] },
+        { "item": "scrap", "count": [ 10, 20 ] },
+        { "item": "splinter", "count": [ 1, 20 ] }
+      ]
+    }
   }
 ]

data/json/items/comestibles/dairy.json

@@ -58,7 +58,7 @@
     "symbol": "~",
     "quench": 20,
     "healthy": 2,
-    "calories": 1,
+    "calories": 161,
     "description": "This is cultured milk defatted either due to churning or curdling.  Spoils quickly.",
     "price": 1,
     "material": [ "milk" ],
@@ -108,6 +108,26 @@
     "vitamins": [ [ "vitA", 7 ], [ "vitB", 3 ] ],
     "fun": -1
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "raw_butter",
+    "name": "raw butter",
+    "name_plural": "raw butter",
+    "weight": "14 g",
+    "color": "white",
+    "spoils_in": "10 days",
+    "comestible_type": "FOOD",
+    "symbol": "%",
+    "quench": -1,
+    "calories": 110,
+    "description": "A white stick of raw milkfat and milk solids, made directly from cow's milk.",
+    "price": 200,
+    "material": [ "milk" ],
+    "volume": "500 ml",
+    "charges": 33,
+    "vitamins": [ [ "vitA", 7 ], [ "calcium", 3 ] ],
+    "fun": -1
+  },
   {
     "type": "COMESTIBLE",
     "id": "ghee",
@@ -271,5 +291,27 @@
     "charges": 20,
     "vitamins": [ [ "vitA", 2 ], [ "vitB", 1 ], [ "vitC", 1 ], [ "calcium", 7 ] ],
     "fun": 3
+  },
+  {
+    "type": "COMESTIBLE",
+    "id": "milk_cream",
+    "name": "heavy cream",
+    "name_plural": "heavy cream",
+    "weight": "254 g",
+    "color": "white",
+    "spoils_in": "1 day",
+    "comestible_type": "DRINK",
+    "symbol": "~",
+    "quench": 10,
+    "calories": 490,
+    "description": " Cream that has been skimmed from the top of raw milk left to sit.",
+    "price": 70,
+    "price_postapoc": 150,
+    "looks_like": "milk",
+    "material": "milk",
+    "volume": "250 ml",
+    "phase": "liquid",
+    "vitamins": [ [ "vitA", 2 ], [ "calcium", 7 ] ],
+    "fun": 1
   }
 ]

data/json/items/tool/deployable.json

@@ -160,5 +160,23 @@
     "symbol": "*",
     "color": "yellow",
     "use_action": { "type": "deploy_furn", "furn_type": "f_fiber_mat" }
+  },
+  {
+    "id": "churn",
+    "type": "TOOL",
+    "name": "folded butter churn",
+    "description": "A large wooden container used to turn raw milk into butter and buttermilk.  This model uses a foot crank and holds three gallons of raw milk.",
+    "weight": "6464 g",
+    "volume": "11356 ml",
+    "price": 5000,
+    "price_postapoc": 45000,
+    "to_hit": -4,
+    "bashing": 7,
+    "material": [ "wood" ],
+    "looks_like": [ "f_wood_keg" ],
+    "symbol": "u",
+    "color": "light_gray",
+    "use_action": { "type": "deploy_furn", "furn_type": "f_butter_churn" },
+    "qualities": [ [ "CONTAIN", 1 ], [ "CHURN", 1 ] ]
   }
 ]

data/json/items/tools.json

@@ -1968,6 +1968,60 @@
       "not_ready_msg": "The eggs are not done yet."
     }
   },
+  {
+    "id": "milk_cream_rising",
+    "type": "GENERIC",
+    "category": "food",
+    "name": "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",
+    "price": 10,
+    "bashing": 8,
+    "material": "glass",
+    "symbol": "%",
+    "looks_like": "jar_sauerkraut_pickled",
+    "color": "white",
+    "use_action": {
+      "target": "milk_cream_jar",
+      "msg": "You examine the batch and see that the cream has risen to the top, so you seal the jar up for storage.",
+      "moves": 50,
+      "type": "delayed_transform",
+      "transform_age": 21600,
+      "not_ready_msg": "The cream has not risen yet."
+    }
+  },
+  {
+    "id": "milk_cream_jar",
+    "type": "GENERIC",
+    "category": "food",
+    "name": "milk cream jar",
+    "looks_like": "jar_sauerkraut_pickled",
+    "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",
+    "price": 10,
+    "bashing": 8,
+    "material": "glass",
+    "symbol": "%",
+    "color": "white"
+  },
+  {
+    "id": "butter_churn",
+    "type": "TOOL",
+    "name": "pseudo butter churn",
+    "description": "This is a crafting_pseudo_item if you have it something is wrong.",
+    "weight": "6464 g",
+    "volume": "9 L",
+    "price": 20000,
+    "to_hit": -2,
+    "bashing": 9,
+    "material": "wood",
+    "qualities": [ [ "CHURN", 1 ] ],
+    "symbol": "H",
+    "color": "light_cyan",
+    "flags": [ "ALLOWS_REMOTE_USE" ]
+  },
   {
     "id": "eink_tablet_pc",
     "type": "TOOL",

data/json/recipes/food/dairy_products.json

@@ -0,0 +1,41 @@
+[
+  {
+    "type": "recipe",
+    "result": "raw_butter",
+    "result_mult": 1,
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_DAIRY",
+    "skill_used": "cooking",
+    "difficulty": 5,
+    "time": "30 m",
+    "qualities": [ { "id": "CHURN", "level": 1 } ],
+    "autolearn": true,
+    "components": [ [ [ "milk_cream", 5 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "milk_cream_rising",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_DAIRY",
+    "skill_used": "cooking",
+    "difficulty": 5,
+    "time": "5 m",
+    "autolearn": true,
+    "qualities": [ { "id": "COOK", "level": 3 } ],
+    "components": [ [ [ "jar_3l_glass", 1 ] ], [ [ "milk_raw", 12 ] ] ]
+  },
+  {
+    "type": "recipe",
+    "result": "milk_cream",
+    "result_mult": 5,
+    "byproducts": [ [ "buttermilk", 7 ] ],
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_DAIRY",
+    "skill_used": "cooking",
+    "difficulty": 5,
+    "time": "30 m",
+    "autolearn": true,
+    "qualities": [ { "id": "COOK", "level": 1 } ],
+    "components": [ [ [ "milk_cream_jar", 1 ] ] ]
+  }
+]

data/json/recipes/other/tool.json

@@ -188,6 +188,26 @@
     "tools": [ [ [ "mold_plastic", -1 ] ], [ [ "surface_heat", 50, "LIST" ] ] ],
     "components": [ [ [ "plastic_chunk", 3 ] ], [ [ "wire", 1 ] ], [ [ "scrap", 1 ] ], [ [ "weights", 40, "LIST" ] ] ]
   },
+  {
+    "result": "churn",
+    "type": "recipe",
+    "category": "CC_OTHER",
+    "subcategory": "CSC_OTHER_TOOLS",
+    "skill_used": "fabrication",
+    "difficulty": 3,
+    "skills_required": [ "cooking", 4 ],
+    "time": "300 m",
+    "reversible": true,
+    "book_learn": [ [ "family_cookbook", 4 ], [ "textbook_survival", 4 ] ],
+    "qualities": [ { "id": "HAMMER", "level": 1 }, { "id": "SCREW", "level": 1 } ],
+    "components": [
+      [ [ "2x4", 18 ] ],
+      [ [ "nail", 14 ] ],
+      [ [ "sheet_metal", 1 ] ],
+      [ [ "foot_crank", 1 ] ],
+      [ [ "sheet_metal_small", 1 ] ]
+    ]
+  },
   {
     "result": "riding_saddle",
     "type": "recipe",

data/json/recipes/recipe_food.json

@@ -16,7 +16,7 @@
       [ [ "salt", 12 ] ],
       [ [ "sugar", 24 ] ],
       [ [ "chocolate", 3 ] ],
-      [ [ "cooking_oil", 2 ], [ "cooking_oil2", 2 ], [ "butter", 2 ] ],
+      [ [ "cooking_oil", 2 ], [ "cooking_oil2", 2 ], [ "any_butter", 2, "LIST" ] ],
       [ [ "powder_eggs", 2 ], [ "eggs_bird", 2, "LIST" ], [ "egg_reptile", 2 ] ],
       [ [ "water", 6 ], [ "water_clean", 6 ] ]
     ]
@@ -5665,7 +5665,7 @@
     "book_learn": [ [ "mag_glam", 1 ] ],
     "components": [
       [ [ "flatbread", 1 ], [ "bread", 1 ], [ "cornbread", 1 ], [ "wastebread", 1 ], [ "sourdough_bread", 1 ] ],
-      [ [ "butter", 4 ], [ "ghee", 4 ] ],
+      [ [ "any_butter", 4, "LIST" ], [ "ghee", 4 ] ],
       [ [ "sprinkles", 3 ] ]
     ]
   },
@@ -8273,10 +8273,9 @@
       [
         [ "cooking_oil", 1 ],
         [ "cooking_oil2", 1 ],
-        [ "butter", 1 ],
+        [ "any_butter", 1, "LIST" ],
         [ "edible_fat", 1, "LIST" ],
-        [ "edible_tallow_lard", 1, "LIST" ],
-        [ "ghee", 1 ]
+        [ "edible_tallow_lard", 1, "LIST" ]
       ],
       [ [ "water", 1 ], [ "water_clean", 1 ] ]
     ]
@@ -8299,10 +8298,9 @@
       [
         [ "cooking_oil", 1 ],
         [ "cooking_oil2", 1 ],
-        [ "butter", 1 ],
+        [ "any_butter", 1, "LIST" ],
         [ "edible_fat", 1, "LIST" ],
-        [ "edible_tallow_lard", 1, "LIST" ],
-        [ "ghee", 1 ]
+        [ "edible_tallow_lard", 1, "LIST" ]
       ]
     ]
   }

data/json/requirements/cooking_components.json

@@ -42,6 +42,12 @@
     "//": "Pasteurized milk, including reconstituted",
     "components": [ [ [ "milk", 1 ], [ "milk_reconstituted", 1 ], [ "milk_UHT", 1 ] ] ]
   },
+  {
+    "id": "any_butter",
+    "type": "requirement",
+    "//": "Butter of all types and other future butter substitutes",
+    "components": [ [ [ "raw_butter", 1 ], [ "butter", 1 ], [ "ghee", 1 ] ] ]
+  },
   {
     "id": "milk_standard_raw",
     "type": "requirement",

data/json/tool_qualities.json

@@ -16,6 +16,11 @@
     "id": "GLARE",
     "name": "glare protection"
   },
+  {
+    "type": "tool_quality",
+    "id": "CHURN",
+    "name": "churn"
+  },
   {
     "type": "tool_quality",
     "id": "LEATHER_AWL",