Whipped cream and frosting requirements (#48067)

* Extend/Delete in requirements

* Revert "Extend/Delete in requirements"

This reverts commit 9da0eae.

* Valentine Cards (#47438)

* Add a proficiency for handloading, and a new profession (#47244)

* Drug Dealer Profession (#47255)

* Adds hallula, a type of bread popular in Bolivia and Chile

* Arm mounted pouch (#46946)

* Tazer drone iii (#47353)

* Added Gelatin and Several Gelatin Based Recipes (#47080)

* Content: bread in a can (#45680)

* New random mission (#44999)

* Mycus fruit Juice (#44952)

* Milleable corn (#46254)

* Talk Tag Additions (#47010)

* Fix typo in Valentines Card (#47583)

* (CrazyCataclysm) Crazy Hallucinations (#47386)

* Mealgurb (#47685)

* Add duct tape blindfold for old reciepe plus tweaks for reciepe (#47527)

* Prepare npc, spell, character, and item for new ai (#47207)

* Make acetylene torch cut metal walls. (#46255)

* Added disassembly recipes for several items (#46316)

* Celsius temperature for freezing point (#47028)

* Stand up peek (#47257)

* [AFTERSHOCK] Basic Ballistic Weapons (#47559)

* makes glass walls and glass doors constructable (#47692)

* Crackers as bread and jam&cheese sandwich (#47649)

* [Aftershock] misc typograpical fixes (#47783)

* Tweaks for teas (#47848)

* Have travis run for 0.F-dev

Currently, .travis.yml has a 'development' branch specified as one to run tests for; the current equivalent is the 0.F-dev branch.

* Tweakes to copper and metal pipes. (#47825)

* Fried eggs deluxe, sandwiches, and condiment list (#47786)

* Homemade toastems, buttercream frosting and recipes (#47696)

* Chocolate Cow don't drop "cow pies"

* Remove unused FATIGUE energy source from spells

* [Magiclysm] add owlbear origin snippet (#47752)

* [Magiclysm] add lesser banishment spell, buff greater banishment (#47537)

* Unhardcode bio_heatsink and bio_climate

* Hunting lodge Location (#44378)

* fungal evolution (#47247)

* Add book strap carrier (#47665)

* Partial mine jsonify; new zombie miner (#47790)

* Moved mine_entrance OMT from the list of hardcoded locations to industial locations

Also removed mine_shaft OMT and replaced it with mine_shaft_middle and mine_shaft_lower OMTs.
Also added mine_entrance_roof OMT.

* Added mine_entrance and mine_shaft to the list of obsoleted terrains

* Added a zombie miner and its death drops

* Created a json-version of mine entrance and its roof

* Created a json-version of mine shaft (middle and lower variants)

* Changed overmap special definition of a mine to include new json chunks

* Applied migration of hardcoded mine_entrance and mine_shaft OMTs to new json variants

* Made hardcoded mine chunks generate to the west of lower section of new mine shaft OMT

Also removed mine_entrance and mine_shaft from the list of hardocoded mapgen.

* Completely removed build_mine_room function as all mine rooms are now defined in json

Also removed hardcoded generation of mine entrance and mine shaft.

* Removed mentions of mine rooms from mapgen.h

* Updated alt_map_key mod

* Updated graphical overmap mod

* Added missing harvest

* Appease clang and constify

* Quickfix

* Appease clang one more time

* Add 0.F-dev to matrix.yml

(Getting 0.F-dev working with Travis appears to require additional settings by someone with permissions.) This change enables both pushes and pull requests of 0.F-dev to get checked by the General Matrix. As it is, if one bases a PR off of 0.F-dev, it doesn't get checked by Github.

* 0.F-dev workflows (#47875)

* Alter brown bread recipe to match canned version

Fixes #47874.

* Mine entrance expand (#47928)

* Added mine_materials item group

* Added Trolley vehicle

* Expanded and tweaked above-ground and underground levels of mine entrance

* [DinoMod] Mushroom Madness (#47907)

* misc typograpical fixes

* body pillow recipe makes makeshift body pillow now (#47917)

* Traffic Bollards and an example of deployment (#48017)

* add description for Uyen's missions

* JSONize some trap features, replace trap int_id externs with string_ids (#47933)

* JSONize trap sonar detectibility

Add trap flags - just the same as normal flags, but for traps! Stick
them in their own separate file to avoid confusion.

* JSONize trap memorial messages

light_snare and heavy_snare seem to no longer exist, or I couldn't find
any reference to them but this and tilesets.

Updated dissector trap message, and added a trap message to some traps
(the hallway ones, one or two of the similar-but-not-the-same variants
of existing traps).

* JSONize trap temperature convection

Not quite sure how to describe it, went the lazy route.

* Move traps externs from int to string ids

When loading the game without this content, these will now only give an
error on the use of these, instead of at the end data loading for traps.

Previously there were performance concerns with this, but this should be
fine since #44261 - see #44500.

tr_null must remain an int id, as it used in the string to int id
conversion. This is fine, as it will always be loaded (it's in
data/core).

Move the ledge trap over to data/core as well, because everything will
need the 'open space' trap.

* Clean up character mutation gain a bit

Reduce duplicated code.
I presume there's a reason that set_mutations didn't just call
set_mutation, and the only difference is that it doesn't do the cache
updates till the end, so preserve that behaviour.

* Allow CBMs to specify mutations that prevent installation. (#47822)

* Move CBM installation checks to Character

Reduce code duplication, encapsulate things better, and make this
available outside of the inventory menus.

* Allow mutations to prevent installing CBMs

Bionics can currently cancel mutations when installed, but can't have
mutations prevent installation.

* Spiral mine jsonify (#48003)

* prevent bell spam (#47987)

* Note that vat is required for fermentation in vinegar brewing

* Unhardcode ease of sleep

* whipped cream

remove aerosol whip cream

frosting requirement

Update slings.json

Update data/json/recipes/recipe_food.json

Update data/json/items/comestibles/dairy.json

Revert "remove aerosol whip cream"

This reverts commit b8570f6.

Update misc.json

Delete recipe_obsolete.json

Delete misc.json

Delete slings.json

Delete ammo_types.json

Delete enchantments.json

Revert "Delete recipe_obsolete.json"

This reverts commit 3119fdc.

Revert "Delete misc.json"

This reverts commit 71b811b.

Revert "Delete ammo_types.json"

This reverts commit 848c739.

Revert "Delete slings.json"

This reverts commit 7c91194.

fixes

Co-Authored-By: actual-nh <[email protected]>
Co-Authored-By: casswedson <[email protected]>

* Update data/json/items/comestibles/dairy.json

Co-authored-by: actual-nh <[email protected]>

* Update slings.json

* Update junkfood.json

Co-authored-by: LaVeyanFiend <[email protected]>
Co-authored-by: slimeboy460 <[email protected]>
Co-authored-by: ToxiClay <[email protected]>
Co-authored-by: Jamuro-g <[email protected]>
Co-authored-by: Xenomorph-III <[email protected]>
Co-authored-by: grawprog <[email protected]>
Co-authored-by: Xaleth <[email protected]>
Co-authored-by: El-Jekozo <[email protected]>
Co-authored-by: RobertoVGoulart <[email protected]>
Co-authored-by: Zukulini <[email protected]>
Co-authored-by: klorpa <[email protected]>
Co-authored-by: UmbralReaper <[email protected]>
Co-authored-by: SariusSkelrets <[email protected]>
Co-authored-by: Fosheze <[email protected]>
Co-authored-by: Lamandus <[email protected]>
Co-authored-by: Curtis Merrill <[email protected]>
Co-authored-by: NeviNovat <[email protected]>
Co-authored-by: Karol1223 <[email protected]>
Co-authored-by: Hirmuolio <[email protected]>
Co-authored-by: Charlie Gardai <[email protected]>
Co-authored-by: Mom-Bun <[email protected]>
Co-authored-by: OromisElf <[email protected]>
Co-authored-by: casswedson <[email protected]>
Co-authored-by: actual-nh <[email protected]>
Co-authored-by: Fris0uman <[email protected]>
Co-authored-by: Ramza13 <[email protected]>
Co-authored-by: LyleSY <[email protected]>
Co-authored-by: FuelType-Memes <[email protected]>
Co-authored-by: Anton Burmistrov <[email protected]>
Co-authored-by: actual-nh <[email protected]>
Co-authored-by: casswedson <[email protected]>
Co-authored-by: akirashirosawa <[email protected]>
Co-authored-by: anothersimulacrum <[email protected]>
Co-authored-by: Jeremy Rose <[email protected]>

data/json/items/comestibles/dairy.json

@@ -297,6 +297,28 @@
     "vitamins": [ [ "vitA", 2 ], [ "vitB", 1 ], [ "vitC", 1 ], [ "calcium", 7 ] ],
     "fun": 3
   },
+  {
+    "type": "COMESTIBLE",
+    "id": "milk_cream_whipped",
+    "name": { "str_sp": "whipped cream" },
+    "weight": "120 g",
+    "color": "white",
+    "spoils_in": "1 day",
+    "comestible_type": "FOOD",
+    "symbol": "~",
+    "quench": 3,
+    "calories": 250,
+    "description": "Cream that has been whipped, perfect for frosting cakes and pies.  Either store-bought or homemade.",
+    "price": 70,
+    "price_postapoc": 150,
+    "looks_like": "milk",
+    "material": [ "milk" ],
+    "volume": "250 ml",
+    "phase": "liquid",
+    "vitamins": [ [ "vitA", 2 ], [ "calcium", 7 ] ],
+    "flags": [ "NUTRIENT_OVERRIDE" ],
+    "fun": 4
+  },
   {
     "type": "COMESTIBLE",
     "id": "milk_cream",

data/json/items/comestibles/junkfood.json

@@ -90,7 +90,8 @@
     "id": "homemade_toasterpastry2",
     "name": { "str": "toaster pastry with buttercream", "str_pl": "toaster pastries with buttercream" },
     "copy-from": "toasterpastryfrozen",
-    "quench": 4,
+    "quench": 6,
+    "calories": 730,
     "description": "A delicious homemade fruit-filled pastry that you've cooked.  It even comes with buttercream!",
     "fun": 30
   },

data/json/recipes/food/dairy_products.json

@@ -27,6 +27,19 @@
     "qualities": [ { "id": "COOK", "level": 3 } ],
     "components": [ [ [ "jar_3l_glass_sealed", 1 ] ], [ [ "milk_raw", 12 ] ] ]
   },
+  {
+    "type": "recipe",
+    "activity_level": "NO_EXERCISE",
+    "result": "milk_cream_whipped",
+    "category": "CC_FOOD",
+    "subcategory": "CSC_FOOD_OTHER",
+    "skill_used": "cooking",
+    "difficulty": 1,
+    "time": "5 m",
+    "autolearn": true,
+    "qualities": [ { "id": "COOK", "level": 1 } ],
+    "components": [ [ [ "milk_cream", 1 ] ], [ [ "sugar", 2 ] ] ]
+  },
   {
     "type": "recipe",
     "activity_level": "LIGHT_EXERCISE",

data/json/recipes/recipe_food.json

@@ -5455,7 +5455,7 @@
     "charges": 1,
     "autolearn": true,
     "tools": [ [ [ "surface_heat", 10, "LIST" ] ] ],
-    "components": [ [ [ "toastem4", 1 ] ], [ [ "buttercream", 1 ] ] ]
+    "components": [ [ [ "toastem4", 1 ] ], [ [ "any_frosting", 1, "LIST" ] ] ]
   },
   {
     "type": "recipe",

data/json/requirements/cooking_components.json

@@ -83,6 +83,12 @@
     "//": "Pasteurized milk, including reconstituted",
     "components": [ [ [ "milk", 1 ], [ "milk_reconstituted", 1 ], [ "milk_UHT", 1 ] ] ]
   },
+  {
+    "id": "any_frosting",
+    "type": "requirement",
+    "//": "Frosting for cakes and treats",
+    "components": [ [ [ "buttercream", 2 ], [ "milk_cream_whipped", 2 ] ] ]
+  },
   {
     "id": "any_butter",
     "type": "requirement",