Added Gelatin and Several Gelatin Based Recipes #47080

grawprog · 2021-01-28T05:06:50Z

Summary

Content "Added several gelatin based items and recipes."

Purpose of change

I felt gelatin and gelatin based products were lacking considering the depth of CDDA's cooking and food.

Describe the solution

Added

Powdered gelatin and recipe to dry fresh gelatin
Fresh gelatin and recipe to extract gelatin from raw hide
4 flavours of gelatin dessert powder
4 flavours of gelatin dessert
2 Homemade gelatin dessert recipes
2 vegan dessert recipes using agar
gummy candies and recipes both from gelatin and agar

Changes

Modified both aspic recipes to use gelatin
added fresh gelatin as a byproduct from making bone broth
added powdered gelatin, gelatin dessert powder and agar to dry food item group
added gelatin dessert cups to fridge item group
added vegan gelatin dessert to vegan SUS fridge item group

Describe alternatives you've considered

I'm unsure about the initial recipes for extracting gelatin. It currently uses the distillation vat. I'm not sure this is the best method. it's the only way i found to have things happen passively over time though.

Testing

Recipes and items all tested and working correctly.

…atin dessert and gelatin dessert powder items and the recipe to craft them, modified bone broth and aspic recipes, added new items to relevant item groups.

…using agar. Added agar to dry foods itemgroupc added vegan gelatin dessert to SUS vegan fridge. Tweaked recipes to make them better.

ghost · 2021-01-28T05:09:17Z

data/json/items/comestibles/junkfood.json

+    "type": "COMESTIBLE",
+    "id": "gelatin_dessert_powder_cherry",
+    "name": "cherry gelatin dessert powder",
+    "color": "red",
+    "description": "A small box of cherry gelatin dessert powder. Just add water and set.",
+    "copy-from": "gelatin_dessert_powder_base"
+  },


This and the other flavors should be compressed into snippets for a single gelatin dessert powder

I'd be happy to change that. I'm not entirely sure how snippets work though.

Does snippets work with recipes?

For a reference, check out cooked mutant meat. Basically you have a generic decription in the item and an added "snippet_category" field, and you define a set of snippets with an id separately. A random snippet will be shown after the generic description and if you set the id up right it will persist between viewing.

data/json/items/comestibles/carnivore.json has some examples of comestibles with snippets. For example, "mutant_meat" has snippet category "mutant_meat_desc". But I don't think that will add the correct snippet based on components used in crafting. It also does not change the item's name.

Conditional names can be used to change the item's name based on its components, but that currently does not change the description. And I don't think you can spawn items with specified components at the moment.

Thank you. I'll have a look through those sections and see what I can do to clean up and compress the different flavours after work today.

ghost · 2021-01-28T05:11:55Z

data/json/items/comestibles/junkfood.json

+  {
+    "type": "COMESTIBLE",
+    "id": "gelatin_dessert_cherry",
+    "name": "cherry gelatin dessert",
+    "color": "red",
+    "description": "A cherry flavored jiggly, sugary treat made from gelatin and sugar. A kid favorite pre-Cataclysm.",
+    "fun": 20,
+    "copy-from": "gelatin_dessert_base"
+  },


This and the other flavored gelatins compressed into snippets for one flavored version in addition to an unflavored, as well.

int-ua · 2021-01-28T16:30:52Z

Resetting Actions after the GitHub incident https://www.githubstatus.com/incidents/tf9v5jjmq2lg by closing and reopening.

int-ua · 2021-01-28T16:35:39Z

@grawprog Please fill in the Summary

BrettDong · 2021-01-28T16:39:32Z

Specifically, please write a category for summary, and quote the subject like

Summary

Content "Added several gelatin based items and recipes."

int-ua · 2021-01-28T16:39:52Z

#### Summary
Content "Added several gelatin based items and recipes"

grawprog · 2021-01-28T16:41:52Z

Sorry i'm trying to edit this on my phone. I think i deleted a bunch of it by accident.

int-ua · 2021-01-28T16:43:48Z

Sorry i'm trying to edit this on my phone. I think i deleted a bunch of it by accident.

That's ok, the history of edits is available to view, please just restore it. And there is no colon after Content, it should be

Content "Added several gelatin based items and recipes"

grawprog · 2021-01-28T16:54:14Z

Ok. I think it's fixed now. Thank you for your patience. I'm pretty new to github. Still figuring.it all out.

BrettDong

JSON styling errors:

data/json/recipes/food/other.json

data/json/requirements/cooking_components.json

Co-authored-by: Binrui Dong <[email protected]>

* 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]>

* 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 * calorie test * Revert "calorie test" This reverts commit e535575. * Arcology Start Adding windows and entrances organization more mapgen organization and more overmaps Update arcology_ground.json Update arcology_ground.json Last of the gates Update arcology_gate_chunks.json city special and terrain chunks Update arcology_ground.json Update arcology_chunks.json Update data/mods/Aftershock/itemgroups/arcology_groups.json Update recipe_obsolete.json chunkening testing fixes Update arcology_ground.json Update arcology_ground.json fixes neverending fixes the lintening Update arcology_gate_chunks.json Update arcology_gate_chunks.json Update arcology_gate_chunks.json Can force spawn now but it is blank Update arcology_chunks.json 15 tons and whadya get reverses north and south Ready for testing Gates open Open and Close gates using console broken metal flooring * Open and Close * Lint * Apply suggestions from code review Co-authored-by: John Candlebury <[email protected]> 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]> Co-authored-by: John Candlebury <[email protected]>

* Extend/Delete in requirements * Revert "Extend/Delete in requirements" This reverts commit 9da0eae. * Valentine Cards (CleverRaven#47438) * Add a proficiency for handloading, and a new profession (CleverRaven#47244) * Drug Dealer Profession (CleverRaven#47255) * Adds hallula, a type of bread popular in Bolivia and Chile * Arm mounted pouch (CleverRaven#46946) * Tazer drone iii (CleverRaven#47353) * Added Gelatin and Several Gelatin Based Recipes (CleverRaven#47080) * Content: bread in a can (CleverRaven#45680) * New random mission (CleverRaven#44999) * Mycus fruit Juice (CleverRaven#44952) * Milleable corn (CleverRaven#46254) * Talk Tag Additions (CleverRaven#47010) * Fix typo in Valentines Card (CleverRaven#47583) * (CrazyCataclysm) Crazy Hallucinations (CleverRaven#47386) * Mealgurb (CleverRaven#47685) * Add duct tape blindfold for old reciepe plus tweaks for reciepe (CleverRaven#47527) * Prepare npc, spell, character, and item for new ai (CleverRaven#47207) * Make acetylene torch cut metal walls. (CleverRaven#46255) * Added disassembly recipes for several items (CleverRaven#46316) * Celsius temperature for freezing point (CleverRaven#47028) * Stand up peek (CleverRaven#47257) * [AFTERSHOCK] Basic Ballistic Weapons (CleverRaven#47559) * makes glass walls and glass doors constructable (CleverRaven#47692) * Crackers as bread and jam&cheese sandwich (CleverRaven#47649) * [Aftershock] misc typograpical fixes (CleverRaven#47783) * Tweaks for teas (CleverRaven#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. (CleverRaven#47825) * Fried eggs deluxe, sandwiches, and condiment list (CleverRaven#47786) * Homemade toastems, buttercream frosting and recipes (CleverRaven#47696) * Chocolate Cow don't drop "cow pies" * Remove unused FATIGUE energy source from spells * [Magiclysm] add owlbear origin snippet (CleverRaven#47752) * [Magiclysm] add lesser banishment spell, buff greater banishment (CleverRaven#47537) * Unhardcode bio_heatsink and bio_climate * Hunting lodge Location (CleverRaven#44378) * fungal evolution (CleverRaven#47247) * Add book strap carrier (CleverRaven#47665) * Partial mine jsonify; new zombie miner (CleverRaven#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 (CleverRaven#47875) * Alter brown bread recipe to match canned version Fixes CleverRaven#47874. * Mine entrance expand (CleverRaven#47928) * Added mine_materials item group * Added Trolley vehicle * Expanded and tweaked above-ground and underground levels of mine entrance * [DinoMod] Mushroom Madness (CleverRaven#47907) * misc typograpical fixes * body pillow recipe makes makeshift body pillow now (CleverRaven#47917) * Traffic Bollards and an example of deployment (CleverRaven#48017) * add description for Uyen's missions * JSONize some trap features, replace trap int_id externs with string_ids (CleverRaven#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 CleverRaven#44261 - see CleverRaven#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. (CleverRaven#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 (CleverRaven#48003) * prevent bell spam (CleverRaven#47987) * Note that vat is required for fermentation in vinegar brewing * Unhardcode ease of sleep * calorie test * Revert "calorie test" This reverts commit e535575. * Arcology Start Adding windows and entrances organization more mapgen organization and more overmaps Update arcology_ground.json Update arcology_ground.json Last of the gates Update arcology_gate_chunks.json city special and terrain chunks Update arcology_ground.json Update arcology_chunks.json Update data/mods/Aftershock/itemgroups/arcology_groups.json Update recipe_obsolete.json chunkening testing fixes Update arcology_ground.json Update arcology_ground.json fixes neverending fixes the lintening Update arcology_gate_chunks.json Update arcology_gate_chunks.json Update arcology_gate_chunks.json Can force spawn now but it is blank Update arcology_chunks.json 15 tons and whadya get reverses north and south Ready for testing Gates open Open and Close gates using console broken metal flooring * Open and Close * Lint * Apply suggestions from code review Co-authored-by: John Candlebury <[email protected]> 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]> Co-authored-by: John Candlebury <[email protected]>

* 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 * calorie test * Revert "calorie test" This reverts commit e535575. * Reuben Sandwiches * Update recipe_food.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]>

grawprog added 4 commits January 26, 2021 21:04

added gelatin items and recipes to craft them, added 4 flavors of gel…

f666ed1

…atin dessert and gelatin dessert powder items and the recipe to craft them, modified bone broth and aspic recipes, added new items to relevant item groups.

merged files

25c6d57

Finished recipes for gelatin and gummy candies. Added Vegan variants …

76e0195

…using agar. Added agar to dry foods itemgroupc added vegan gelatin dessert to SUS vegan fridge. Tweaked recipes to make them better.

added agar as alternative in aspic recipe

4c45d8b

grawprog requested a review from I-am-Erk as a code owner January 28, 2021 05:06

ghost reviewed Jan 28, 2021

View reviewed changes

grawprog marked this pull request as draft January 28, 2021 05:09

anothersimulacrum added the [JSON] Changes (can be) made in JSON label Jan 28, 2021

ghost reviewed Jan 28, 2021

View reviewed changes

grawprog marked this pull request as ready for review January 28, 2021 05:18

fixed mistake

d115108

int-ua closed this Jan 28, 2021

int-ua reopened this Jan 28, 2021

BrettDong reviewed Jan 28, 2021

View reviewed changes

grawprog and others added 9 commits January 28, 2021 09:41

Update data/json/recipes/food/other.json

fc57134

Co-authored-by: Binrui Dong <[email protected]>

Update data/json/recipes/food/other.json

8da8420

Co-authored-by: Binrui Dong <[email protected]>

Update data/json/recipes/food/other.json

1225269

Co-authored-by: Binrui Dong <[email protected]>

Update data/json/recipes/food/other.json

f2391d2

Co-authored-by: Binrui Dong <[email protected]>

Update data/json/recipes/food/other.json

f1a7fa1

Co-authored-by: Binrui Dong <[email protected]>

Update data/json/recipes/food/other.json

1b26b42

Co-authored-by: Binrui Dong <[email protected]>

Update data/json/recipes/food/other.json

db471be

Co-authored-by: Binrui Dong <[email protected]>

Update data/json/recipes/food/other.json

0929bb8

Co-authored-by: Binrui Dong <[email protected]>

Update data/json/requirements/cooking_components.json

984dc6b

Co-authored-by: Binrui Dong <[email protected]>

ZhilkinSerg pushed a commit that referenced this pull request Mar 21, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

e401033

John-Candlebury pushed a commit to John-Candlebury/Cataclysm-DDA that referenced this pull request Mar 24, 2021

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

f8a2ede

ZhilkinSerg pushed a commit that referenced this pull request Mar 25, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

47de65e

ZhilkinSerg pushed a commit that referenced this pull request Mar 25, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

7031d53

ZhilkinSerg pushed a commit that referenced this pull request Mar 25, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

490f99d

ZhilkinSerg pushed a commit that referenced this pull request Mar 26, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

56f3d92

ZhilkinSerg pushed a commit that referenced this pull request Mar 31, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

c7d5a06

ZhilkinSerg pushed a commit that referenced this pull request Mar 31, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

e55f5dd

ZhilkinSerg pushed a commit that referenced this pull request Mar 31, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

8992153

BrettDong pushed a commit that referenced this pull request Apr 5, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

f926a13

ZhilkinSerg pushed a commit that referenced this pull request Apr 7, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

ce4c34f

ZhilkinSerg pushed a commit that referenced this pull request Apr 9, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

769d122

ZhilkinSerg pushed a commit that referenced this pull request Apr 20, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

9ad02d9

ZhilkinSerg pushed a commit that referenced this pull request Apr 20, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

07f403d

ZhilkinSerg pushed a commit that referenced this pull request May 28, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

a359b34

ZhilkinSerg pushed a commit that referenced this pull request May 28, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

594ff1b

ZhilkinSerg pushed a commit that referenced this pull request May 31, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

7977693

ZhilkinSerg pushed a commit that referenced this pull request Jun 14, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

fb9964f

ZhilkinSerg pushed a commit that referenced this pull request Jun 14, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

dcab37c

ZhilkinSerg pushed a commit that referenced this pull request Jun 14, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

4a2f16c

ZhilkinSerg pushed a commit that referenced this pull request Jun 21, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

0712e15

ZhilkinSerg pushed a commit that referenced this pull request Jul 3, 2021

Added Gelatin and Several Gelatin Based Recipes (#47080)

d99c83a

anothersimulacrum pushed a commit to anothersimulacrum/Cataclysm-DDA that referenced this pull request Jul 3, 2021

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

203792e

KorGgenT pushed a commit to KorGgenT/Cataclysm-DDA that referenced this pull request Jul 4, 2021

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

084bebe

Faalagorn mentioned this pull request Mar 20, 2022

Fix food plurals + minor typos #56255

Merged

Ilysen mentioned this pull request Dec 10, 2022

Fridges no longer spawn loose, container-less eggs #62669

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Added Gelatin and Several Gelatin Based Recipes #47080

Added Gelatin and Several Gelatin Based Recipes #47080

grawprog commented Jan 28, 2021 •

edited

Loading

ghost Jan 28, 2021

grawprog Jan 28, 2021

BrettDong Jan 28, 2021

Venera3 Jan 28, 2021

Qrox Jan 28, 2021 •

edited

Loading

grawprog Jan 28, 2021

ghost Jan 28, 2021 •

edited by ghost

Loading

int-ua commented Jan 28, 2021

int-ua commented Jan 28, 2021

BrettDong commented Jan 28, 2021 •

edited

Loading

int-ua commented Jan 28, 2021

grawprog commented Jan 28, 2021

int-ua commented Jan 28, 2021 •

edited

Loading

grawprog commented Jan 28, 2021

BrettDong left a comment

Added Gelatin and Several Gelatin Based Recipes #47080

Added Gelatin and Several Gelatin Based Recipes #47080

Conversation

grawprog commented Jan 28, 2021 • edited Loading

Summary

Purpose of change

Describe the solution

Describe alternatives you've considered

Testing

ghost Jan 28, 2021

Choose a reason for hiding this comment

grawprog Jan 28, 2021

Choose a reason for hiding this comment

BrettDong Jan 28, 2021

Choose a reason for hiding this comment

Venera3 Jan 28, 2021

Choose a reason for hiding this comment

Qrox Jan 28, 2021 • edited Loading

Choose a reason for hiding this comment

grawprog Jan 28, 2021

Choose a reason for hiding this comment

ghost Jan 28, 2021 • edited by ghost Loading

Choose a reason for hiding this comment

int-ua commented Jan 28, 2021

int-ua commented Jan 28, 2021

BrettDong commented Jan 28, 2021 • edited Loading

Summary

int-ua commented Jan 28, 2021

grawprog commented Jan 28, 2021

int-ua commented Jan 28, 2021 • edited Loading

grawprog commented Jan 28, 2021

BrettDong left a comment

Choose a reason for hiding this comment

grawprog commented Jan 28, 2021 •

edited

Loading

Qrox Jan 28, 2021 •

edited

Loading

ghost Jan 28, 2021 •

edited by ghost

Loading

BrettDong commented Jan 28, 2021 •

edited

Loading

int-ua commented Jan 28, 2021 •

edited

Loading