Adjust Raw Butter recipes, Adds raw butter to recipes that use butter (…

…#77245)

* Update dairy_products.json

Adjusts the recipes for creating raw milk to correct abnormal calorie outputs of raw butter, also adds salt to the recipe.

* Add raw butter to recipes that use butter

Changed the recipes for:
"condiment", Shillelagh, PBJ Toast, and Lobster Roll to allow for using raw butter as well as regular butter.  It seemed like oversight that these recipes lacked this option.

* Lint Changes

Whoops, forgot to lint, this commit fixes that.

* Fix Array Errors

Game was throwing array errors because I wasn't formatting the recipes correctly, this fixes that.

* Adjust Shake recipe for Raw butter to correct the output calories

Turns out food byproducts aren't counted when comparing recipe input vs output, or they are in the cases of making lard, and making raw butter.  This changes the recipe to magically make more butter, but at least it's within 2% of the nominal calories of raw butter now.

* Lint bread.json

Missed linting this, hopefully this makes the bot happy.

* Update iteminfo_test.cpp to adjust ice cream

Changes the minimum calorie range of ice cream from 52 to 56, so that the iteminfo_test for icecream won't fail.  This change is due to my butter changes.

data/json/recipes/food/bread.json

@@ -227,6 +227,11 @@
  "activity_level": "LIGHT_EXERCISE",
  "result": "PBJ_Toast",
  "copy-from": "buttered_toast",
- "components": [ [ [ "jam_fruit", 1 ] ], [ [ "butter", 1 ] ], [ [ "any_peanutbutter", 1, "LIST" ] ], [ [ "toast", 1 ] ] ]
+ "components": [
+ [ [ "jam_fruit", 1 ] ],
+ [ [ "butter", 1 ], [ "raw_butter", 1 ] ],
+ [ [ "any_peanutbutter", 1, "LIST" ] ],
+ [ [ "toast", 1 ] ]
+ ]
  }
 ]

data/json/recipes/food/dairy_products.json

@@ -12,8 +12,8 @@
  "qualities": [ { "id": "CHURN", "level": 1 } ],
  "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": [ [ [ "milk_cream", 5 ] ] ],
- "charges": 99
+ "components": [ [ [ "milk_cream", 5 ] ], [ [ "salt", 1 ] ] ],
+ "charges": 22
  },
  {
  "type": "recipe",
@@ -29,8 +29,8 @@
  "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.",
  "tools": [ [ [ "jar_glass_sealed", -1 ] ] ],
- "components": [ [ [ "water_clean", 1 ] ], [ [ "milk_cream", 3 ] ] ],
- "charges": 33
+ "components": [ [ [ "water_clean", 1 ] ], [ [ "milk_cream", 3 ] ], [ [ "salt", 1 ] ] ],
+ "charges": 13
  },
  {
  "type": "recipe",

data/json/recipes/recipe_food.json

@@ -6730,6 +6730,7 @@
  [ "honey_mustard", 1 ],
  [ "mustard", 1 ],
  [ "butter", 1 ],
+ [ "raw_butter", 1 ],
  [ "horseradish", 1 ],
  [ "mayonnaise", 1 ],
  [ "bacon", 1 ],
@@ -9677,7 +9678,7 @@
  [ "wild_garlic", 1 ],
  [ "garlic_powder", 1 ]
  ],
- [ [ "butter", 1 ] ],
+ [ [ "butter", 1 ], [ "raw_butter", 1 ] ],
  [ [ "wild_herbs", 6 ] ]
  ],
  "charges": 6

data/json/recipes/weapon/bashing.json

@@ -43,7 +43,7 @@
  "qualities": [ { "id": "SAW_W", "level": 1 }, { "id": "CUT", "level": 2 } ],
  "proficiencies": [ { "proficiency": "prof_carving" } ],
  "tools": [ [ [ "char_smoker", 100 ] ] ],
- "components": [ [ [ "log", 1 ] ], [ [ "butter", 30 ], [ "edible_lard", 4, "LIST" ] ] ]
+ "components": [ [ [ "log", 1 ] ], [ [ "butter", 30 ], [ "raw_butter", 30 ], [ "edible_lard", 4, "LIST" ] ] ]
  },
  {
  "type": "recipe",

data/json/requirements/cooking_components.json

@@ -1034,7 +1034,8 @@
  [ "honey_mustard", 1 ],
  [ "horseradish", 1 ],
  [ "sauerkraut", 1 ],
- [ "butter", 1 ]
+ [ "butter", 1 ],
+ [ "raw_butter", 1 ]
  ]
  ]
  },

tests/iteminfo_test.cpp

@@ -1994,7 +1994,7 @@ TEST_CASE( "nutrients_in_food", "[iteminfo][food]" )
  "--\n"
  "Nutrition will <color_cyan>vary with chosen ingredients</color>.\n"
  "<color_c_white>Calories (kcal)</color>:"
- " <color_c_yellow>52</color>-<color_c_yellow>532</color>"
+ " <color_c_yellow>56</color>-<color_c_yellow>532</color>"
  " Quench: <color_c_yellow>0</color>\n" );
  // Values end up rounded slightly
  CHECK( item_info_str( ice_cream, { iteminfo_parts::FOOD_VITAMINS } ) ==